Merge "Fix volume panel hang"
diff --git a/res/values/config.xml b/res/values/config.xml
index bf1a67c..a329397 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -421,6 +421,7 @@
<!-- Reset application package name -->
<string-array name="config_reset_app_package_name" translatable="false">
<item>com.android.systemui</item>
+ <item>android</item>
</string-array>
<!-- Settings panel keeps observe this uri -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1773314..430819f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -974,7 +974,7 @@
<!-- Dialog title shown when the user removes an enrollment [CHAR LIMIT=35] -->
<string name="security_settings_face_settings_remove_dialog_title">Delete face data?</string>
<!-- Dialog contents shown when the user removes an enrollment [CHAR LIMIT=NONE] -->
- <string name="security_settings_face_settings_remove_dialog_details">The images and face model used by face unlock will be permanently and securely deleted. After removal, you will need your PIN, pattern, or password to unlock your phone, sign in to apps, and confirm payments.</string>
+ <string name="security_settings_face_settings_remove_dialog_details">The face data used by face unlock will be permanently and securely deleted. After removal, you will need your PIN, pattern, or password to unlock your phone, sign in to apps, and confirm payments.</string>
<!-- Subtitle shown for contextual setting face enrollment [CHAR LIMIT=NONE] -->
<string name="security_settings_face_settings_context_subtitle">Use face unlock to unlock your phone</string>
diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java
index ab2c8a3..e203456 100644
--- a/src/com/android/settings/datausage/BillingCycleSettings.java
+++ b/src/com/android/settings/datausage/BillingCycleSettings.java
@@ -26,7 +26,6 @@
import android.net.NetworkTemplate;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
-import android.text.format.Time;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -50,6 +49,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.TimeZone;
@SearchIndexable
public class BillingCycleSettings extends DataUsageBaseFragment implements
@@ -403,7 +403,7 @@
mCycleDayPicker.clearFocus();
final int cycleDay = mCycleDayPicker.getValue();
- final String cycleTimezone = new Time().timezone;
+ final String cycleTimezone = TimeZone.getDefault().getID();
editor.setPolicyCycleDay(template, cycleDay, cycleTimezone);
target.updateDataUsage();
}
diff --git a/src/com/android/settings/panel/PanelFragment.java b/src/com/android/settings/panel/PanelFragment.java
index 1f008f1..006ed00 100644
--- a/src/com/android/settings/panel/PanelFragment.java
+++ b/src/com/android/settings/panel/PanelFragment.java
@@ -285,10 +285,12 @@
.addOnGlobalLayoutListener(mOnGlobalLayoutListener);
mPanelSlices.setVisibility(View.VISIBLE);
- DividerItemDecoration itemDecoration = new DividerItemDecoration(getActivity());
+ final DividerItemDecoration itemDecoration = new DividerItemDecoration(getActivity());
itemDecoration
.setDividerCondition(DividerItemDecoration.DIVIDER_CONDITION_BOTH);
- mPanelSlices.addItemDecoration(itemDecoration);
+ if (mPanelSlices.getItemDecorationCount() == 0) {
+ mPanelSlices.addItemDecoration(itemDecoration);
+ }
}
}