Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev
diff --git a/res/layout/widget_text_views.xml b/res/layout/widget_text_views.xml
index 2e029e8..ea49fa5 100644
--- a/res/layout/widget_text_views.xml
+++ b/res/layout/widget_text_views.xml
@@ -21,7 +21,7 @@
<TextView
android:id="@+id/widget_text1"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="fill_horizontal|top"
@@ -34,7 +34,7 @@
<TextView
android:id="@+id/widget_text2"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginStart="8dip"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6169fc9..292698f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -677,11 +677,11 @@
<!-- Text shown for title of profile info setting [CHAR LIMIT=20]-->
<string name="profile_info_settings_title">Profile info</string>
<!-- Main Settings screen setting option title for the item to take you to the Accounts screen [CHAR LIMIT=22] -->
- <string name="Accounts_settings_title">Account sync</string>
+ <string name="Accounts_settings_title">Accounts</string>
<!-- Main Settings screen setting option title for the item to take you to the location screen -->
<string name="location_settings_title">Location</string>
<!-- Main Settings screen setting option title for the item to take you to the accounts screen [CHAR LIMIT=22] -->
- <string name="account_settings_title">Account sync</string>
+ <string name="account_settings_title">Accounts</string>
<!-- Main Settings screen setting option title for the item to take you to the security screen -->
<string name="security_settings_title">Security</string>
<!-- Main Settings screen setting option summary text for the item tot ake you to the security and location screen -->
diff --git a/res/xml/power_usage_details.xml b/res/xml/power_usage_details.xml
index ad28650..724aae8 100644
--- a/res/xml/power_usage_details.xml
+++ b/res/xml/power_usage_details.xml
@@ -17,9 +17,6 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
- <com.android.settings.fuelgauge.BatteryHistoryPreference
- android:key="battery_history" />
-
<com.android.settings.applications.LayoutPreference
android:key="two_buttons"
android:layout="@layout/two_buttons_panel"
diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
index 5cb6c24..4bc5982 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
@@ -303,7 +303,6 @@
private static final String KEY_CONTROLS_PARENT = "controls_parent";
private static final String KEY_MESSAGES_PARENT = "messages_parent";
private static final String KEY_PACKAGES_PARENT = "packages_parent";
- private static final String KEY_BATTERY_HISTORY = "battery_history";
private static final String KEY_TWO_BUTTONS = "two_buttons";
private static final String KEY_HIGH_POWER = "high_power";
@@ -319,7 +318,6 @@
private BatterySipper.DrainType mDrainType;
private double mNoCoverage; // Percentage of time that there was no coverage
- private BatteryHistoryPreference mHistPref;
private PreferenceCategory mDetailsParent;
private PreferenceCategory mControlsParent;
private PreferenceCategory mMessagesParent;
@@ -341,7 +339,6 @@
mDpm = (DevicePolicyManager)getActivity().getSystemService(Context.DEVICE_POLICY_SERVICE);
addPreferencesFromResource(R.xml.power_usage_details);
- mHistPref = (BatteryHistoryPreference) findPreference(KEY_BATTERY_HISTORY);
mDetailsParent = (PreferenceCategory) findPreference(KEY_DETAILS_PARENT);
mControlsParent = (PreferenceCategory) findPreference(KEY_CONTROLS_PARENT);
mMessagesParent = (PreferenceCategory) findPreference(KEY_MESSAGES_PARENT);
@@ -440,12 +437,6 @@
fillControlsSection(mUid);
fillMessagesSection(mUid);
}
-
- @Override
- protected void refreshStats() {
- super.refreshStats();
- updatePreference(mHistPref);
- }
private void setupHeader() {
final Bundle args = getArguments();