Merge "Don't advance when recreating from bundle"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 030e051..fe55a71 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -97,7 +97,7 @@
</activity>
<activity android:name="CreateShortcut" android:label="@string/settings_shortcut"
- android:theme="@style/Theme.CreateShortCut">
+ android:theme="@style/Theme.SubSettingsDialogWhenLarge">
<intent-filter>
<action android:name="android.intent.action.CREATE_SHORTCUT" />
<category android:name="android.intent.category.DEFAULT" />
@@ -206,7 +206,7 @@
</activity>
<activity android:name=".wifi.WifiInfo"
- android:theme="@android:style/Theme.Quantum.Light.DialogWhenLarge"
+ android:theme="@style/Theme.SubSettingsDialogWhenLarge"
android:taskAffinity="com.android.settings"
android:parentActivityName="Settings$WifiSettingsActivity">
<intent-filter>
@@ -217,7 +217,7 @@
</activity>
<activity android:name=".wifi.WifiConfigInfo"
- android:theme="@android:style/Theme.Quantum.Light.DialogWhenLarge"
+ android:theme="@style/Theme.SubSettingsDialogWhenLarge"
android:taskAffinity="com.android.settings"
android:parentActivityName="Settings$WifiSettingsActivity">
<intent-filter>
@@ -228,7 +228,7 @@
</activity>
<activity android:name=".wifi.WifiAPITest"
- android:theme="@android:style/Theme.Quantum.Light.DialogWhenLarge">
+ android:theme="@style/Theme.SubSettingsDialogWhenLarge">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -237,7 +237,7 @@
</activity>
<activity android:name=".wifi.WifiStatusTest"
- android:theme="@android:style/Theme.Quantum.Light.DialogWhenLarge">
+ android:theme="@style/Theme.SubSettingsDialogWhenLarge">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -298,7 +298,7 @@
</activity-alias>
<activity android:name=".bluetooth.DevicePickerActivity"
- android:theme="@android:style/Theme.Quantum.Light.DialogWhenLarge"
+ android:theme="@style/Theme.SubSettingsDialogWhenLarge"
android:label="@string/device_picker"
android:clearTaskOnLaunch="true">
<intent-filter>
@@ -571,7 +571,7 @@
</activity-alias>
<activity android:name="Settings$DeviceInfoSettingsActivity"
- android:theme="@android:style/Theme.Quantum.Light.DialogWhenLarge"
+ android:theme="@style/Theme.SubSettingsDialogWhenLarge"
android:label="@string/device_info_settings"
android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
@@ -863,7 +863,7 @@
</activity>
<activity android:name="SetFullBackupPassword"
- android:theme="@android:style/Theme.Quantum.Light.DialogWhenLarge"
+ android:theme="@style/Theme.SubSettingsDialogWhenLarge"
android:exported="false">
</activity>
@@ -907,7 +907,7 @@
<activity android:name="DeviceAdminAdd"
android:label="@string/device_admin_add_title"
- android:theme="@android:style/Theme.Quantum.Light.DialogWhenLarge"
+ android:theme="@style/Theme.SubSettingsDialogWhenLarge"
android:clearTaskOnLaunch="true">
<intent-filter>
<action android:name="android.app.action.ADD_DEVICE_ADMIN" />
@@ -917,7 +917,7 @@
<activity android:name="IccLockSettings"
android:label="@string/sim_lock_settings"
- android:theme="@android:style/Theme.Quantum.Light.DialogWhenLarge"
+ android:theme="@style/Theme.SubSettingsDialogWhenLarge"
android:process="com.android.phone">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1034,7 +1034,7 @@
<!-- Runs in the phone process since it needs access to the Phone object -->
<activity android:name=".deviceinfo.Status"
android:label="@string/device_status_activity_title"
- android:theme="@android:style/Theme.Quantum.Light.DialogWhenLarge"
+ android:theme="@style/Theme.SubSettingsDialogWhenLarge"
android:process="com.android.phone">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1061,7 +1061,7 @@
</activity>
<activity android:name=".deviceinfo.MiscFilesHandler"
- android:theme="@android:style/Theme.Quantum.Light.DialogWhenLarge"/>
+ android:theme="@style/Theme.SubSettingsDialogWhenLarge"/>
<activity android:name="ApnEditor"
android:label="@string/apn_edit">
@@ -1505,7 +1505,7 @@
<activity android:name="com.android.settings.accounts.ChooseAccountActivity"
android:label="@string/header_add_an_account"
android:configChanges="orientation|keyboardHidden|screenSize"
- android:theme="@android:style/Theme.Quantum.Light.DialogWhenLarge"/>
+ android:theme="@style/Theme.SubSettingsDialogWhenLarge"/>
<activity android:name=".CryptKeeper"
android:immersive="true"
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_0_dark.png b/res/drawable-hdpi/ic_wifi_lock_signal_0_dark.png
new file mode 100644
index 0000000..57f2839
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_0_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_0_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_0_light.png
new file mode 100644
index 0000000..0bc4109
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_0_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-hdpi/ic_wifi_lock_signal_1_dark.png
index 2ec38ae..d153336 100644
--- a/res/drawable-hdpi/ic_wifi_lock_signal_1_dark.png
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_1_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_1_light.png
index 8b0009b..72ae32f 100644
--- a/res/drawable-hdpi/ic_wifi_lock_signal_1_light.png
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_1_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-hdpi/ic_wifi_lock_signal_2_dark.png
index a3383a8..7ffbc84 100644
--- a/res/drawable-hdpi/ic_wifi_lock_signal_2_dark.png
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_2_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_2_light.png
index b79d3e5..2259d3d 100644
--- a/res/drawable-hdpi/ic_wifi_lock_signal_2_light.png
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_2_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-hdpi/ic_wifi_lock_signal_3_dark.png
index e2cb17e..73ab082 100644
--- a/res/drawable-hdpi/ic_wifi_lock_signal_3_dark.png
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_3_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_3_light.png
index 053c7af..356f2fa 100644
--- a/res/drawable-hdpi/ic_wifi_lock_signal_3_light.png
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_3_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-hdpi/ic_wifi_lock_signal_4_dark.png
index 65b02dd..3b47049 100644
--- a/res/drawable-hdpi/ic_wifi_lock_signal_4_dark.png
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_4_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_4_light.png
index 0516bd4..4f69b27 100644
--- a/res/drawable-hdpi/ic_wifi_lock_signal_4_light.png
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_4_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_0_dark.png b/res/drawable-hdpi/ic_wifi_signal_0_dark.png
new file mode 100644
index 0000000..20519fd
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_signal_0_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_0_light.png b/res/drawable-hdpi/ic_wifi_signal_0_light.png
new file mode 100644
index 0000000..99c4932
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_signal_0_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_1_dark.png b/res/drawable-hdpi/ic_wifi_signal_1_dark.png
index f3f0208..8b055b0 100644
--- a/res/drawable-hdpi/ic_wifi_signal_1_dark.png
+++ b/res/drawable-hdpi/ic_wifi_signal_1_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_1_light.png b/res/drawable-hdpi/ic_wifi_signal_1_light.png
index d9968b9..217b7ff 100644
--- a/res/drawable-hdpi/ic_wifi_signal_1_light.png
+++ b/res/drawable-hdpi/ic_wifi_signal_1_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_2_dark.png b/res/drawable-hdpi/ic_wifi_signal_2_dark.png
index 9541c38..9514eae 100644
--- a/res/drawable-hdpi/ic_wifi_signal_2_dark.png
+++ b/res/drawable-hdpi/ic_wifi_signal_2_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_2_light.png b/res/drawable-hdpi/ic_wifi_signal_2_light.png
index d3065de..a992720 100644
--- a/res/drawable-hdpi/ic_wifi_signal_2_light.png
+++ b/res/drawable-hdpi/ic_wifi_signal_2_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_3_dark.png b/res/drawable-hdpi/ic_wifi_signal_3_dark.png
index be1ba37..b8a4fe7 100644
--- a/res/drawable-hdpi/ic_wifi_signal_3_dark.png
+++ b/res/drawable-hdpi/ic_wifi_signal_3_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_3_light.png b/res/drawable-hdpi/ic_wifi_signal_3_light.png
index 4a6407f..8789d64 100644
--- a/res/drawable-hdpi/ic_wifi_signal_3_light.png
+++ b/res/drawable-hdpi/ic_wifi_signal_3_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_4_dark.png b/res/drawable-hdpi/ic_wifi_signal_4_dark.png
index 3fed8e6..ec697c8 100644
--- a/res/drawable-hdpi/ic_wifi_signal_4_dark.png
+++ b/res/drawable-hdpi/ic_wifi_signal_4_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_signal_4_light.png b/res/drawable-hdpi/ic_wifi_signal_4_light.png
index e52acd6..a8dcaaf 100644
--- a/res/drawable-hdpi/ic_wifi_signal_4_light.png
+++ b/res/drawable-hdpi/ic_wifi_signal_4_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_0_dark.png b/res/drawable-mdpi/ic_wifi_lock_signal_0_dark.png
new file mode 100644
index 0000000..1dcb7ac
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_0_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_0_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_0_light.png
new file mode 100644
index 0000000..df55614
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_0_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-mdpi/ic_wifi_lock_signal_1_dark.png
index d6868aa..03738de 100644
--- a/res/drawable-mdpi/ic_wifi_lock_signal_1_dark.png
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_1_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_1_light.png
index eb41a10..f18211a 100644
--- a/res/drawable-mdpi/ic_wifi_lock_signal_1_light.png
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_1_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-mdpi/ic_wifi_lock_signal_2_dark.png
index ada9739..b37d529 100644
--- a/res/drawable-mdpi/ic_wifi_lock_signal_2_dark.png
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_2_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_2_light.png
index ff041c4..ee212bc 100644
--- a/res/drawable-mdpi/ic_wifi_lock_signal_2_light.png
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_2_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-mdpi/ic_wifi_lock_signal_3_dark.png
index 0a294ff..d456111 100644
--- a/res/drawable-mdpi/ic_wifi_lock_signal_3_dark.png
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_3_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_3_light.png
index 98cf1ff..8ab15d9 100644
--- a/res/drawable-mdpi/ic_wifi_lock_signal_3_light.png
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_3_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-mdpi/ic_wifi_lock_signal_4_dark.png
index ccda2c7..435f768 100644
--- a/res/drawable-mdpi/ic_wifi_lock_signal_4_dark.png
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_4_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_4_light.png
index 83af4de..60a9833 100644
--- a/res/drawable-mdpi/ic_wifi_lock_signal_4_light.png
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_4_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_0_dark.png b/res/drawable-mdpi/ic_wifi_signal_0_dark.png
new file mode 100644
index 0000000..2162d2d
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_signal_0_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_0_light.png b/res/drawable-mdpi/ic_wifi_signal_0_light.png
new file mode 100644
index 0000000..c9f97e9
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_signal_0_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_1_dark.png b/res/drawable-mdpi/ic_wifi_signal_1_dark.png
index 6715c5d..5e186b3 100644
--- a/res/drawable-mdpi/ic_wifi_signal_1_dark.png
+++ b/res/drawable-mdpi/ic_wifi_signal_1_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_1_light.png b/res/drawable-mdpi/ic_wifi_signal_1_light.png
index eec60c0..1f80018 100644
--- a/res/drawable-mdpi/ic_wifi_signal_1_light.png
+++ b/res/drawable-mdpi/ic_wifi_signal_1_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_2_dark.png b/res/drawable-mdpi/ic_wifi_signal_2_dark.png
index e31d19f..eb0b290 100644
--- a/res/drawable-mdpi/ic_wifi_signal_2_dark.png
+++ b/res/drawable-mdpi/ic_wifi_signal_2_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_2_light.png b/res/drawable-mdpi/ic_wifi_signal_2_light.png
index 7caa144..2b1ed62 100644
--- a/res/drawable-mdpi/ic_wifi_signal_2_light.png
+++ b/res/drawable-mdpi/ic_wifi_signal_2_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_3_dark.png b/res/drawable-mdpi/ic_wifi_signal_3_dark.png
index bd6a1e8..47afa46 100644
--- a/res/drawable-mdpi/ic_wifi_signal_3_dark.png
+++ b/res/drawable-mdpi/ic_wifi_signal_3_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_3_light.png b/res/drawable-mdpi/ic_wifi_signal_3_light.png
index 7be2515..ecbe438 100644
--- a/res/drawable-mdpi/ic_wifi_signal_3_light.png
+++ b/res/drawable-mdpi/ic_wifi_signal_3_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_4_dark.png b/res/drawable-mdpi/ic_wifi_signal_4_dark.png
index af125c2..df5cbf5 100644
--- a/res/drawable-mdpi/ic_wifi_signal_4_dark.png
+++ b/res/drawable-mdpi/ic_wifi_signal_4_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_signal_4_light.png b/res/drawable-mdpi/ic_wifi_signal_4_light.png
index 658761a..4832197 100644
--- a/res/drawable-mdpi/ic_wifi_signal_4_light.png
+++ b/res/drawable-mdpi/ic_wifi_signal_4_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_0_dark.png b/res/drawable-xhdpi/ic_wifi_lock_signal_0_dark.png
new file mode 100644
index 0000000..1e29c6a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_0_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_0_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_0_light.png
new file mode 100644
index 0000000..b4bf667
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_0_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-xhdpi/ic_wifi_lock_signal_1_dark.png
index c2be32f..c9dde7b 100644
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_1_dark.png
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_1_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_1_light.png
index 57c8fb2..0328b63 100644
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_1_light.png
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_1_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-xhdpi/ic_wifi_lock_signal_2_dark.png
index 9e65730..4e8f631 100644
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_2_dark.png
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_2_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_2_light.png
index db783f8..5a64d46 100644
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_2_light.png
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_2_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-xhdpi/ic_wifi_lock_signal_3_dark.png
index 5a12175..c50c727 100644
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_3_dark.png
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_3_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_3_light.png
index 8b7df74..5ce95e5 100644
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_3_light.png
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_3_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-xhdpi/ic_wifi_lock_signal_4_dark.png
index 4d2942c..7b3b9e5 100644
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_4_dark.png
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_4_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_4_light.png
index bf26501..91bbbc2 100644
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_4_light.png
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_4_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_0_dark.png b/res/drawable-xhdpi/ic_wifi_signal_0_dark.png
new file mode 100644
index 0000000..cee9e2b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_0_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_0_light.png b/res/drawable-xhdpi/ic_wifi_signal_0_light.png
new file mode 100644
index 0000000..c7cd1ee
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_0_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_1_dark.png b/res/drawable-xhdpi/ic_wifi_signal_1_dark.png
index bf1634c..142db5b 100644
--- a/res/drawable-xhdpi/ic_wifi_signal_1_dark.png
+++ b/res/drawable-xhdpi/ic_wifi_signal_1_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_1_light.png b/res/drawable-xhdpi/ic_wifi_signal_1_light.png
index 0f58f3d..a3c1ce4 100644
--- a/res/drawable-xhdpi/ic_wifi_signal_1_light.png
+++ b/res/drawable-xhdpi/ic_wifi_signal_1_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_2_dark.png b/res/drawable-xhdpi/ic_wifi_signal_2_dark.png
index 5345ff3..0c41ae0 100644
--- a/res/drawable-xhdpi/ic_wifi_signal_2_dark.png
+++ b/res/drawable-xhdpi/ic_wifi_signal_2_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_2_light.png b/res/drawable-xhdpi/ic_wifi_signal_2_light.png
index c5bcc7e..0c0a3d0 100644
--- a/res/drawable-xhdpi/ic_wifi_signal_2_light.png
+++ b/res/drawable-xhdpi/ic_wifi_signal_2_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_3_dark.png b/res/drawable-xhdpi/ic_wifi_signal_3_dark.png
index 8cc3a6e..6f0d944 100644
--- a/res/drawable-xhdpi/ic_wifi_signal_3_dark.png
+++ b/res/drawable-xhdpi/ic_wifi_signal_3_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_3_light.png b/res/drawable-xhdpi/ic_wifi_signal_3_light.png
index 1cdacc5..0ac41ce 100644
--- a/res/drawable-xhdpi/ic_wifi_signal_3_light.png
+++ b/res/drawable-xhdpi/ic_wifi_signal_3_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_4_dark.png b/res/drawable-xhdpi/ic_wifi_signal_4_dark.png
index c9aa4e5..418d53c 100644
--- a/res/drawable-xhdpi/ic_wifi_signal_4_dark.png
+++ b/res/drawable-xhdpi/ic_wifi_signal_4_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_signal_4_light.png b/res/drawable-xhdpi/ic_wifi_signal_4_light.png
index 3cf1c8d..58cf07a 100644
--- a/res/drawable-xhdpi/ic_wifi_signal_4_light.png
+++ b/res/drawable-xhdpi/ic_wifi_signal_4_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_0_dark.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_0_dark.png
new file mode 100644
index 0000000..5cb27ab
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_0_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_0_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_0_light.png
new file mode 100644
index 0000000..22e7f0f
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_0_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_dark.png
index 20739fa..d862a5e 100644
--- a/res/drawable-xxhdpi/ic_wifi_lock_signal_1_dark.png
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_light.png
index c13edff..526bd28 100644
--- a/res/drawable-xxhdpi/ic_wifi_lock_signal_1_light.png
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_dark.png
index 9cd652a..1f5e563 100644
--- a/res/drawable-xxhdpi/ic_wifi_lock_signal_2_dark.png
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_light.png
index cb7f0c2..97a01f7 100644
--- a/res/drawable-xxhdpi/ic_wifi_lock_signal_2_light.png
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_dark.png
index 99097df..e02938b 100644
--- a/res/drawable-xxhdpi/ic_wifi_lock_signal_3_dark.png
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_light.png
index a0961f4..7c34d42 100644
--- a/res/drawable-xxhdpi/ic_wifi_lock_signal_3_light.png
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_dark.png
index 6c00a9c..b312c97 100644
--- a/res/drawable-xxhdpi/ic_wifi_lock_signal_4_dark.png
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_light.png
index 74e1a40..60e39ff 100644
--- a/res/drawable-xxhdpi/ic_wifi_lock_signal_4_light.png
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_0_dark.png b/res/drawable-xxhdpi/ic_wifi_signal_0_dark.png
new file mode 100644
index 0000000..0fd7006
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_signal_0_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_0_light.png b/res/drawable-xxhdpi/ic_wifi_signal_0_light.png
new file mode 100644
index 0000000..678d3c4
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_signal_0_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_1_dark.png b/res/drawable-xxhdpi/ic_wifi_signal_1_dark.png
index b50fda5..45adfbe 100644
--- a/res/drawable-xxhdpi/ic_wifi_signal_1_dark.png
+++ b/res/drawable-xxhdpi/ic_wifi_signal_1_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_1_light.png b/res/drawable-xxhdpi/ic_wifi_signal_1_light.png
index f6fad9d..698cee0 100644
--- a/res/drawable-xxhdpi/ic_wifi_signal_1_light.png
+++ b/res/drawable-xxhdpi/ic_wifi_signal_1_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_2_dark.png b/res/drawable-xxhdpi/ic_wifi_signal_2_dark.png
index f906023..711c1f7 100644
--- a/res/drawable-xxhdpi/ic_wifi_signal_2_dark.png
+++ b/res/drawable-xxhdpi/ic_wifi_signal_2_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_2_light.png b/res/drawable-xxhdpi/ic_wifi_signal_2_light.png
index 7f5859b..9ae3c7c 100644
--- a/res/drawable-xxhdpi/ic_wifi_signal_2_light.png
+++ b/res/drawable-xxhdpi/ic_wifi_signal_2_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_3_dark.png b/res/drawable-xxhdpi/ic_wifi_signal_3_dark.png
index ef40952..b8aef2d 100644
--- a/res/drawable-xxhdpi/ic_wifi_signal_3_dark.png
+++ b/res/drawable-xxhdpi/ic_wifi_signal_3_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_3_light.png b/res/drawable-xxhdpi/ic_wifi_signal_3_light.png
index e3151b3..6b8ef69 100644
--- a/res/drawable-xxhdpi/ic_wifi_signal_3_light.png
+++ b/res/drawable-xxhdpi/ic_wifi_signal_3_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_4_dark.png b/res/drawable-xxhdpi/ic_wifi_signal_4_dark.png
index 13f9425..6166fdc 100644
--- a/res/drawable-xxhdpi/ic_wifi_signal_4_dark.png
+++ b/res/drawable-xxhdpi/ic_wifi_signal_4_dark.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_4_light.png b/res/drawable-xxhdpi/ic_wifi_signal_4_light.png
index 96e25e5..b9d0cf2 100644
--- a/res/drawable-xxhdpi/ic_wifi_signal_4_light.png
+++ b/res/drawable-xxhdpi/ic_wifi_signal_4_light.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_dark.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_dark.png
new file mode 100644
index 0000000..e1e0a11
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_dark.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_light.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_light.png
new file mode 100644
index 0000000..b9ab604
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_lock_signal_0_light.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_1_dark.png
new file mode 100644
index 0000000..dfc176f
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_lock_signal_1_dark.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_1_light.png
new file mode 100644
index 0000000..f31dedf
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_lock_signal_1_light.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_2_dark.png
new file mode 100644
index 0000000..0386e0d
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_lock_signal_2_dark.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_2_light.png
new file mode 100644
index 0000000..8176741
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_lock_signal_2_light.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_3_dark.png
new file mode 100644
index 0000000..7a9349f
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_lock_signal_3_dark.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_3_light.png
new file mode 100644
index 0000000..0c4741e
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_lock_signal_3_light.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_4_dark.png
new file mode 100644
index 0000000..aa2eb6d
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_lock_signal_4_dark.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-xxxhdpi/ic_wifi_lock_signal_4_light.png
new file mode 100644
index 0000000..68b0cb5
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_lock_signal_4_light.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_0_dark.png b/res/drawable-xxxhdpi/ic_wifi_signal_0_dark.png
new file mode 100644
index 0000000..a42a6eb
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_signal_0_dark.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_0_light.png b/res/drawable-xxxhdpi/ic_wifi_signal_0_light.png
new file mode 100644
index 0000000..2e67439
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_signal_0_light.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_1_dark.png b/res/drawable-xxxhdpi/ic_wifi_signal_1_dark.png
new file mode 100644
index 0000000..d8ba287
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_signal_1_dark.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_1_light.png b/res/drawable-xxxhdpi/ic_wifi_signal_1_light.png
new file mode 100644
index 0000000..1b2b597
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_signal_1_light.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_2_dark.png b/res/drawable-xxxhdpi/ic_wifi_signal_2_dark.png
new file mode 100644
index 0000000..e700338
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_signal_2_dark.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_2_light.png b/res/drawable-xxxhdpi/ic_wifi_signal_2_light.png
new file mode 100644
index 0000000..8474c53
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_signal_2_light.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_3_dark.png b/res/drawable-xxxhdpi/ic_wifi_signal_3_dark.png
new file mode 100644
index 0000000..8d3c446
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_signal_3_dark.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_3_light.png b/res/drawable-xxxhdpi/ic_wifi_signal_3_light.png
new file mode 100644
index 0000000..eb41081
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_signal_3_light.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_4_dark.png b/res/drawable-xxxhdpi/ic_wifi_signal_4_dark.png
new file mode 100644
index 0000000..c11b797
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_signal_4_dark.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_signal_4_light.png b/res/drawable-xxxhdpi/ic_wifi_signal_4_light.png
new file mode 100644
index 0000000..62796af
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_signal_4_light.png
Binary files differ
diff --git a/res/drawable/data_usage_bar.xml b/res/drawable/data_usage_bar.xml
index 96f1cae..b98dfb6 100644
--- a/res/drawable/data_usage_bar.xml
+++ b/res/drawable/data_usage_bar.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<!-- Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -16,22 +16,19 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/background">
- <shape>
- <solid android:color="#ff28262c" />
- </shape>
+ <nine-patch android:src="@*android:drawable/progress_qntm_alpha"
+ android:tint="@color/quantum_empty_color_light" />
</item>
<item android:id="@android:id/secondaryProgress">
- <clip>
- <shape>
- <solid android:color="#c050ade5" />
- </shape>
- </clip>
+ <scale android:scaleWidth="100%">
+ <nine-patch android:src="@*android:drawable/progress_qntm_alpha"
+ android:tint="?android:attr/colorControlActivated" />
+ </scale>
</item>
<item android:id="@android:id/progress">
- <clip>
- <shape>
- <solid android:color="#c050ade5" />
- </shape>
- </clip>
+ <scale android:scaleWidth="100%">
+ <nine-patch android:src="@*android:drawable/progress_primary_qntm_alpha"
+ android:tint="?android:attr/colorControlActivated" />
+ </scale>
</item>
</layer-list>
diff --git a/res/drawable/switchbar_background.xml b/res/drawable/switchbar_background.xml
new file mode 100644
index 0000000..d329b6b
--- /dev/null
+++ b/res/drawable/switchbar_background.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:tint="?android:attr/colorControlHighlight">
+ <item>
+ <color android:color="@color/switchbar_background_color" />
+ </item>
+</ripple>
+
diff --git a/res/layout/app_percentage_item.xml b/res/layout/app_percentage_item.xml
index 03226ca..08042a9 100644
--- a/res/layout/app_percentage_item.xml
+++ b/res/layout/app_percentage_item.xml
@@ -45,16 +45,16 @@
<TextView
android:id="@android:id/text1"
- android:layout_marginStart="8dip"
+ android:layout_marginStart="6dip"
android:layout_marginTop="2dip"
android:textAppearance="?android:attr/textAppearanceSmall" />
<ProgressBar
android:id="@android:id/progress"
- android:layout_height="12dip"
+ android:layout_height="8dip"
android:layout_columnSpan="2"
android:layout_gravity="fill_horizontal|top"
- android:layout_marginTop="4dip"
+ android:layout_marginTop="8dip"
android:max="100"
android:progressDrawable="@drawable/data_usage_bar"
style="?android:attr/progressBarStyleHorizontal" />
@@ -64,7 +64,7 @@
android:layout_width="0dip"
android:layout_gravity="fill_horizontal|top"
android:layout_columnSpan="2"
- android:layout_marginTop="4dip"
+ android:layout_marginTop="6dip"
android:visibility="gone"
android:maxLines="2"
android:textAppearance="?android:attr/textAppearanceSmall" />
diff --git a/res/layout/battery_history_chart.xml b/res/layout/battery_history_chart.xml
new file mode 100644
index 0000000..4d87a70
--- /dev/null
+++ b/res/layout/battery_history_chart.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<com.android.settings.fuelgauge.BatteryHistoryChart
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res/com.android.settings"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:id="@+android:id/battery_history_chart"
+ android:paddingEnd="?android:attr/scrollbarSize"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="#ff000000"
+ app:headerAppearance="?android:attr/textAppearanceMedium"
+ android:shadowRadius="4"
+ android:shadowColor="?android:attr/colorBackground"
+ android:shadowDx="2"
+ android:shadowDy="2"
+ app:barPrimaryColor="?android:attr/colorControlActivated"
+ app:barPredictionColor="@color/quantum_empty_color_light"
+ app:chartMinHeight="@dimen/battery_history_chart_height">
+</com.android.settings.fuelgauge.BatteryHistoryChart>
diff --git a/res/layout/dashboard.xml b/res/layout/dashboard.xml
index c6c7292..3c6e096 100644
--- a/res/layout/dashboard.xml
+++ b/res/layout/dashboard.xml
@@ -18,8 +18,8 @@
android:id="@+id/dashboard"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingStart="@*android:dimen/preference_fragment_padding_side"
- android:paddingEnd="@*android:dimen/preference_fragment_padding_side"
+ android:paddingStart="@dimen/dashboard_padding_start"
+ android:paddingEnd="@dimen/dashboard_padding_end"
android:scrollbarStyle="outsideOverlay"
android:background="@color/dashboard_background_color">
diff --git a/res/layout/dashboard_category.xml b/res/layout/dashboard_category.xml
index 1099dda..6e90fa9 100644
--- a/res/layout/dashboard_category.xml
+++ b/res/layout/dashboard_category.xml
@@ -23,10 +23,11 @@
<TextView android:id="@+id/category_title"
android:layout_width="match_parent"
android:layout_height="@dimen/dashboard_category_title_height"
+ android:paddingStart="@dimen/dashboard_category_title_padding_start"
android:singleLine="true"
android:ellipsize="marquee"
android:gravity="center_vertical"
- android:textAppearance="@style/TextAppearance.Small"
+ android:textAppearance="@style/TextAppearance.CategoryTitle"
android:textAlignment="viewStart"
/>
diff --git a/res/layout/dashboard_tile.xml b/res/layout/dashboard_tile.xml
index 2a811b2..5553050 100644
--- a/res/layout/dashboard_tile.xml
+++ b/res/layout/dashboard_tile.xml
@@ -39,7 +39,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:textAppearance="@style/TextAppearance.Medium"
+ android:textAppearance="@style/TextAppearance.TileTitle"
android:ellipsize="marquee"
android:fadingEdge="horizontal" />
diff --git a/res/layout/notification_app.xml b/res/layout/notification_app.xml
index 8f5f8e6..6818a45 100644
--- a/res/layout/notification_app.xml
+++ b/res/layout/notification_app.xml
@@ -53,8 +53,8 @@
android:ellipsize="end"
android:singleLine="true"
android:textAlignment="viewStart"
- android:textColor="#888"
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textColor="?android:attr/textColorSecondary"
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<View
diff --git a/res/layout/preference_batteryhistory.xml b/res/layout/preference_batteryhistory.xml
index a09c6a8..766ec51 100644
--- a/res/layout/preference_batteryhistory.xml
+++ b/res/layout/preference_batteryhistory.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
+<!-- Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -14,19 +14,18 @@
limitations under the License.
-->
-<com.android.settings.fuelgauge.BatteryHistoryChart
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res/com.android.settings"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="@dimen/battery_history_chart_height"
- android:gravity="center_vertical"
- android:id="@+android:id/battery_history_chart"
- android:paddingEnd="?android:attr/scrollbarSize"
- android:textAppearance="?android:attr/textAppearanceSmall"
- app:headerAppearance="?android:attr/textAppearanceMedium"
- android:shadowRadius="4"
- android:shadowColor="?android:attr/colorBackground"
- android:shadowDx="2"
- android:shadowDy="2">
-</com.android.settings.fuelgauge.BatteryHistoryChart>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:minHeight="@dimen/battery_history_chart_height"
+ android:paddingEnd="?android:attr/scrollbarSize">
+ <include layout="@layout/battery_history_chart" />
+ <TextView android:id="@+id/labelsHeader"
+ android:layout_width="match_parent" android:layout_height="48dp"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textSize="14sp"
+ android:textColor="?android:attr/colorControlActivated"
+ android:gravity="left|center_vertical"
+ android:text="@string/power_usage_list_summary" />
+</LinearLayout>
diff --git a/res/layout/search_panel.xml b/res/layout/search_panel.xml
index 8837bc9..1242c73 100644
--- a/res/layout/search_panel.xml
+++ b/res/layout/search_panel.xml
@@ -18,8 +18,8 @@
android:id="@+id/dashboard"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingStart="@*android:dimen/preference_fragment_padding_side"
- android:paddingEnd="@*android:dimen/preference_fragment_padding_side"
+ android:paddingStart="@dimen/search_results_padding_start"
+ android:paddingEnd="@dimen/search_results_padding_end"
android:background="@color/dashboard_background_color">
<LinearLayout android:layout_width="match_parent"
@@ -35,10 +35,11 @@
<TextView android:layout_width="wrap_content"
android:layout_height="@dimen/dashboard_category_title_height"
+ android:paddingStart="@dimen/search_title_padding_start"
android:singleLine="true"
android:ellipsize="marquee"
android:gravity="center_vertical"
- android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textAppearance="@style/TextAppearance.RecentsTitle"
android:textAlignment="viewStart"
android:text="@string/search_recents_queries_label"
/>
@@ -59,10 +60,11 @@
<TextView android:layout_width="wrap_content"
android:layout_height="@dimen/dashboard_category_title_height"
+ android:paddingStart="@dimen/search_title_padding_start"
android:singleLine="true"
android:ellipsize="marquee"
android:gravity="center_vertical"
- android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textAppearance="@style/TextAppearance.ResultTitle"
android:textAlignment="viewStart"
android:text="@string/search_results_label"
/>
diff --git a/res/layout/settings_main.xml b/res/layout/settings_main.xml
index 740932d..46ead18 100644
--- a/res/layout/settings_main.xml
+++ b/res/layout/settings_main.xml
@@ -31,7 +31,7 @@
<com.android.settings.widget.SwitchBar android:id="@+id/switch_bar"
android:layout_height="?android:attr/actionBarSize"
android:layout_width="match_parent"
- android:background="@color/switch_bar_background_color"
+ android:background="@drawable/switchbar_background"
android:theme="@android:style/Theme.Quantum" />
<FrameLayout
diff --git a/res/menu/print_service_settings.xml b/res/menu/print_service_settings.xml
index a9a4aed..f8a7372 100644
--- a/res/menu/print_service_settings.xml
+++ b/res/menu/print_service_settings.xml
@@ -18,9 +18,8 @@
<item
android:id="@+id/print_menu_item_search"
android:title="@string/print_menu_item_search"
- android:icon="@*android:drawable/ic_menu_search_holo_dark"
android:actionViewClass="android.widget.SearchView"
- android:showAsAction="ifRoom|collapseActionView"
+ android:showAsAction="never|collapseActionView"
android:imeOptions="actionSearch">
</item>
<item
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 3ad0375..c1cb5ae 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -43,6 +43,12 @@
<attr name="android:shadowRadius" />
<!-- Text color, typeface, size, and style of header. -->
<attr name="headerAppearance" format="reference" />
+ <!-- Primary color of chart. -->
+ <attr name="barPrimaryColor" format="color|reference" />
+ <!-- Color of predicted future use part of chart. -->
+ <attr name="barPredictionColor" format="color|reference" />
+ <!-- Minimum height of the chart itself. -->
+ <attr name="chartMinHeight" format="dimension|reference" />
</declare-styleable>
<declare-styleable name="PercentageBarChart">
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 8a2c1f5..02e08c6 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -57,8 +57,12 @@
<color name="quantum_orange_A200">#ffffab40</color>
<color name="quantum_orange_A400">#ffff9100</color>
+ <color name="quantum_accent_color_light">#FF009688</color>
+ <color name="quantum_accent_color_dark">#FF80CBC4</color>
+ <color name="quantum_empty_color_light">#FFCED7DB</color>
+
<color name="actionbar_background_color">#ff263238</color>
<color name="dashboard_background_color">#ffe1e1e0</color>
- <color name="switch_bar_background_color">#ff384248</color>
+ <color name="switchbar_background_color">#ff384248</color>
<color name="switch_accent_color">#ff7fcac3</color>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index aa8ab5e..4e4fa8e 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -88,17 +88,31 @@
<dimen name="zen_mode_dropdown_width">160dp</dimen>
<!-- Dashboard padding between each tiles within the layout -->
- <dimen name="dashboard_cell_gap">4dp</dimen>
+ <dimen name="dashboard_cell_gap">1dp</dimen>
+
+ <!-- Dashboard padding in its container -->
+ <dimen name="dashboard_padding_start">1dp</dimen>
+ <dimen name="dashboard_padding_end">1dp</dimen>
<!-- Dashboard category title layout height -->
<dimen name="dashboard_category_title_height">48dp</dimen>
+ <!-- Dashboard category title padding start -->
+ <dimen name="dashboard_category_title_padding_start">12dp</dimen>
+
<!-- SwitchBar padding start -->
- <dimen name="switchbar_padding_start">84dp</dimen>
+ <dimen name="switchbar_padding_start">68dp</dimen>
<!-- SwitchBar padding end. Should be 2 x @*android:dimen/preference_fragment_padding_side -->
<dimen name="switchbar_padding_end">32dp</dimen>
<!-- ActionBar contentInsetStart -->
- <dimen name="actionbar_contentInsetStart">84dp</dimen>
+ <dimen name="actionbar_contentInsetStart">68dp</dimen>
+
+ <!-- Search Results padding in its container -->
+ <dimen name="search_results_padding_start">1dp</dimen>
+ <dimen name="search_results_padding_end">1dp</dimen>
+
+ <!-- Search title (recent / results) padding start -->
+ <dimen name="search_title_padding_start">12dp</dimen>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 575215a..4fc861a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1833,9 +1833,9 @@
<string name="brightness">Brightness level</string>
<!-- Sound & display settings screen, setting option summary to change brightness level -->
<string name="brightness_summary">Adjust the brightness of the screen</string>
- <!-- Sound & display settings screen, setting option name to enable adaptive brightness -->
+ <!-- Sound & display settings screen, setting option name to enable adaptive brightness [CHAR LIMIT=30] -->
<string name="auto_brightness_title">Adaptive brightness</string>
- <!-- Sound & display settings screen, setting option summary to enable adaptive brightness -->
+ <!-- Sound & display settings screen, setting option summary to enable adaptive brightness [CHAR LIMIT=100] -->
<string name="auto_brightness_summary">Optimize brightness level for available light</string>
<!-- Sound & display settings screen, setting option name to change screen timeout -->
<string name="screen_timeout">Sleep</string>
@@ -3539,8 +3539,18 @@
<xliff:g id="state">%2$s</xliff:g></string>
<!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
<string name="power_charging_duration"><xliff:g id="level">%1$d</xliff:g>%% -
- <xliff:g id="state">%2$s</xliff:g>
- (<xliff:g id="time">%3$s</xliff:g> until full)</string>
+ <xliff:g id="time">%2$s</xliff:g> until full</string>
+ <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+ <string name="power_charging_duration_ac"><xliff:g id="level">%1$d</xliff:g>%% -
+ <xliff:g id="time">%2$s</xliff:g> until full on AC</string>
+ <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+ <string name="power_charging_duration_usb"><xliff:g id="level">%1$d</xliff:g>%% -
+ <xliff:g id="time">%2$s</xliff:g> until full over USB</string>
+ <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+ <string name="power_charging_duration_wireless"><xliff:g id="level">%1$d</xliff:g>%% -
+ <xliff:g id="time">%2$s</xliff:g> until full from wireless</string>
+ <!-- [CHAR_LIMIT=40] Label for list of apps using battery in power use UI -->
+ <string name="power_usage_list_summary">Use since last full charge</string>
<!-- Battery usage since unplugged -->
<string name="battery_since_unplugged">Battery use since unplugged</string>
<!-- Battery usage since user reset the stats -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 568297f..79ed972 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -264,4 +264,21 @@
<style name="TextAppearance.Switch" parent="TextAppearance.Medium">
</style>
+ <style name="TextAppearance.CategoryTitle" parent="@android:style/TextAppearance.Quantum.Small">
+ <item name="android:textColor">#FF009688</item>
+ </style>
+
+ <style name="TextAppearance.TileTitle" parent="@android:style/TextAppearance.Quantum.Medium">
+ </style>
+
+ <style name="TextAppearance.TileSubTitle" parent="@android:style/TextAppearance.Quantum.Small">
+ </style>
+
+ <style name="TextAppearance.RecentsTitle" parent="TextAppearance.CategoryTitle">
+ </style>
+
+ <style name="TextAppearance.ResultTitle" parent="TextAppearance.CategoryTitle">
+ </style>
+
+
</resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 366492d..402f6dd 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -59,19 +59,10 @@
<item name="wifi_signal">@drawable/wifi_signal_light</item>
</style>
- <style name="Theme.CreateShortCut" parent="android:Theme.Quantum.Light.DialogWhenLarge">
- <item name="android:actionBarWidgetTheme">@android:style/ThemeOverlay.Quantum.ActionBarWidget</item>
- <item name="android:actionBarTheme">@android:style/ThemeOverlay.Quantum.Dark</item>
+ <!-- Theme with no local references, used by AccountPreferenceBase. -->
+ <style name="Theme.SettingsBase" parent="@android:style/Theme.Quantum.Light.DarkActionBar" />
- <item name="android:colorPrimary">@color/actionbar_background_color</item>
- <!-- Used by the bouncing effect for ListView and ScrollView -->
- <item name="android:colorPrimaryLight">@color/actionbar_background_color</item>
- <!-- Used by the StatusBar and NavBar -->
- <item name="android:colorPrimaryDark">@color/actionbar_background_color</item>
- <item name="android:colorAccent">@color/quantum_orange_A200</item>
- </style>
-
- <style name="Theme.Settings" parent="@android:style/Theme.Quantum.Light.DarkActionBar">
+ <style name="Theme.Settings" parent="Theme.SettingsBase">
<item name="@*android:preferenceHeaderPanelStyle">@style/PreferenceHeaderPanelSinglePane</item>
<item name="@*android:preferencePanelStyle">@style/PreferencePanelSinglePane</item>
<item name="@*android:preferenceListStyle">@style/PreferenceHeaderListSinglePane</item>
@@ -84,17 +75,45 @@
<item name="wifi_signal">@drawable/wifi_signal_dark</item>
<item name="android:colorPrimary">@color/actionbar_background_color</item>
- <!-- Used by the bouncing effect for ListView and ScrollView -->
- <item name="android:colorPrimaryLight">@color/actionbar_background_color</item>
<!-- Used by the StatusBar and NavBar -->
<item name="android:colorPrimaryDark">@color/actionbar_background_color</item>
- <item name="android:colorAccent">@color/quantum_orange_A200</item>
+ <!-- Redefine control activited color for progress bars and the like -->
+ <item name="android:colorAccent">@color/quantum_accent_color_light</item>
<!-- Redefine the ActionBar style for contentInsetStart -->
<item name="android:actionBarStyle">@style/Theme.ActionBar</item>
+
+ <item name="android:alertDialogTheme">@style/Theme.AlertDialog</item>
</style>
<style name="Theme.ActionBar" parent="@android:style/Widget.Quantum.Light.ActionBar.Solid">
<item name="android:contentInsetStart">@dimen/actionbar_contentInsetStart</item>
</style>
+ <style name="Theme.DialogWhenLarge" parent="android:style/Theme.Quantum.Light.DialogWhenLarge">
+ <item name="android:colorPrimary">@color/actionbar_background_color</item>
+ <!-- Used by the StatusBar and NavBar -->
+ <item name="android:colorPrimaryDark">@color/actionbar_background_color</item>
+ <!-- Redefine control activited color for progress bars and the like -->
+ <item name="android:colorAccent">@color/quantum_accent_color_light</item>
+ <!-- Redefine the ActionBar style for contentInsetStart -->
+ <item name="android:actionBarStyle">@style/Theme.ActionBar</item>
+ </style>
+
+ <style name="Theme.SubSettingsDialogWhenLarge" parent="Theme.DialogWhenLarge">
+ <item name="android:actionBarWidgetTheme">@null</item>
+ <item name="android:actionBarTheme">@android:style/ThemeOverlay.Quantum.Dark.ActionBar</item>
+ </style>
+
+ <style name="Theme.AlertDialog" parent="@*android:style/Theme.Quantum.Light.Dialog.Alert">
+ <item name="android:windowSoftInputMode">adjustResize</item>
+
+ <item name="android:colorPrimary">@color/actionbar_background_color</item>
+ <!-- Used by the StatusBar and NavBar -->
+ <item name="android:colorPrimaryDark">@color/actionbar_background_color</item>
+ <!-- Redefine control activited color for progress bars and the like -->
+ <item name="android:colorAccent">@color/quantum_accent_color_light</item>
+ <!-- Redefine the ActionBar style for contentInsetStart -->
+ <item name="android:actionBarStyle">@style/Theme.ActionBar</item>
+ </style>
+
</resources>
diff --git a/res/xml/accessibility_daltonizer_settings.xml b/res/xml/accessibility_daltonizer_settings.xml
index 2e8ad34..30a5444 100644
--- a/res/xml/accessibility_daltonizer_settings.xml
+++ b/res/xml/accessibility_daltonizer_settings.xml
@@ -17,11 +17,6 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/accessibility_display_daltonizer_preference_title" >
- <CheckBoxPreference
- android:key="enable_quick_setting"
- android:persistent="false"
- android:title="@string/enable_quick_setting" />
-
<ListPreference
android:entries="@array/daltonizer_type_entries"
android:entryValues="@array/daltonizer_type_values"
diff --git a/src/com/android/settings/AdvancedSecuritySettings.java b/src/com/android/settings/AdvancedSecuritySettings.java
index c497ac4..2a8c623 100644
--- a/src/com/android/settings/AdvancedSecuritySettings.java
+++ b/src/com/android/settings/AdvancedSecuritySettings.java
@@ -109,6 +109,7 @@
for (ResolveInfo resolveInfo : resolveInfos) {
if (resolveInfo.serviceInfo == null) continue;
+ if (!TrustAgentUtils.checkProvidePermission(resolveInfo, pm)) continue;
ComponentName name = TrustAgentUtils.getComponentName(resolveInfo);
if (!mAvailableAgents.containsKey(name)) {
AgentInfo agentInfo = new AgentInfo();
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 3bf7cce..75236de 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -16,6 +16,9 @@
package com.android.settings;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+
import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
@@ -36,13 +39,15 @@
import android.preference.Preference;
import android.preference.Preference.OnPreferenceClickListener;
import android.preference.PreferenceScreen;
+import android.provider.SearchIndexableResource;
import android.provider.Settings;
import android.util.Log;
import java.util.ArrayList;
+import java.util.List;
public class DisplaySettings extends SettingsPreferenceFragment implements
- Preference.OnPreferenceChangeListener, OnPreferenceClickListener {
+ Preference.OnPreferenceChangeListener, OnPreferenceClickListener, Indexable {
private static final String TAG = "DisplaySettings";
/** If there is no setting in the provider, use this. */
@@ -90,9 +95,7 @@
mFontSizePref.setOnPreferenceChangeListener(this);
mFontSizePref.setOnPreferenceClickListener(this);
- boolean automaticBrightnessAvailable = getResources().getBoolean(
- com.android.internal.R.bool.config_automatic_brightness_available);
- if (automaticBrightnessAvailable) {
+ if (isAutomaticBrightnessAvailable(getResources())) {
mAutoBrightnessPreference = (CheckBoxPreference) findPreference(KEY_AUTO_BRIGHTNESS);
mAutoBrightnessPreference.setOnPreferenceChangeListener(this);
} else {
@@ -100,6 +103,10 @@
}
}
+ private static boolean isAutomaticBrightnessAvailable(Resources res) {
+ return res.getBoolean(com.android.internal.R.bool.config_automatic_brightness_available);
+ }
+
private void updateTimeoutPreferenceDescription(long currentTimeout) {
ListPreference preference = mScreenTimeoutPreference;
String summary;
@@ -286,4 +293,28 @@
}
return false;
}
+
+ public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider() {
+ @Override
+ public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+ boolean enabled) {
+ ArrayList<SearchIndexableResource> result = new ArrayList<>(1);
+
+ SearchIndexableResource sir = new SearchIndexableResource(context);
+ sir.xmlResId = R.xml.display_settings;
+ result.add(sir);
+
+ return result;
+ }
+
+ @Override
+ public List<String> getNonIndexableKeys(Context context) {
+ ArrayList<String> nonIndexableKeys = new ArrayList<>(1);
+ if (!isAutomaticBrightnessAvailable(context.getResources())) {
+ nonIndexableKeys.add(KEY_AUTO_BRIGHTNESS);
+ }
+ return nonIndexableKeys;
+ }
+ };
}
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index ab03853..b35a362 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -317,6 +317,7 @@
PackageManager.GET_META_DATA);
for (ResolveInfo resolveInfo : resolveInfos) {
if (resolveInfo.serviceInfo == null) continue;
+ if (!TrustAgentUtils.checkProvidePermission(resolveInfo, pm)) continue;
TrustAgentUtils.TrustAgentComponentInfo trustAgentComponentInfo =
TrustAgentUtils.getSettingsComponent(pm, resolveInfo);
if (trustAgentComponentInfo.componentName == null ||
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 18bab2c..e602fa6 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -630,6 +630,7 @@
mDevelopmentPreferencesListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+ setNeedToRebuildCategories(true);
invalidateCategories();
}
};
diff --git a/src/com/android/settings/TrustAgentUtils.java b/src/com/android/settings/TrustAgentUtils.java
index 64829a2..31a073c 100644
--- a/src/com/android/settings/TrustAgentUtils.java
+++ b/src/com/android/settings/TrustAgentUtils.java
@@ -24,6 +24,7 @@
import android.content.res.XmlResourceParser;
import android.service.trust.TrustAgentService;
import android.util.AttributeSet;
+import android.util.Log;
import android.util.Slog;
import android.util.Xml;
@@ -36,6 +37,21 @@
static final String TAG = "TrustAgentUtils";
private static final String TRUST_AGENT_META_DATA = TrustAgentService.TRUST_AGENT_META_DATA;
+ private static final String PERMISSION_PROVIDE_AGENT = android.Manifest.permission.PROVIDE_TRUST_AGENT;
+
+ /**
+ * @return true, if the service in resolveInfo has the permission to provide a trust agent.
+ */
+ public static boolean checkProvidePermission(ResolveInfo resolveInfo, PackageManager pm) {
+ String packageName = resolveInfo.serviceInfo.packageName;
+ if (pm.checkPermission(PERMISSION_PROVIDE_AGENT, packageName)
+ != PackageManager.PERMISSION_GRANTED) {
+ Log.w(TAG, "Skipping agent because package " + packageName
+ + " does not have permission " + PERMISSION_PROVIDE_AGENT + ".");
+ return false;
+ }
+ return true;
+ }
public static class TrustAgentComponentInfo {
ComponentName componentName;
diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index b910f796a..54a34f2 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -17,7 +17,6 @@
package com.android.settings.accessibility;
import android.os.Bundle;
-import android.preference.CheckBoxPreference;
import android.preference.ListPreference;
import android.preference.Preference;
import android.provider.Settings;
@@ -32,11 +31,8 @@
implements Preference.OnPreferenceChangeListener, SwitchBar.OnSwitchChangeListener {
private static final String ENABLED = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED;
private static final String TYPE = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER;
- private static final String QUICK_SETTING_ENABLED =
- Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_QUICK_SETTING_ENABLED;
private static final int DEFAULT_TYPE = AccessibilityManager.DALTONIZER_CORRECT_DEUTERANOMALY;
- private CheckBoxPreference mEnableQuickSetting;
private ListPreference mType;
@Override
@@ -45,7 +41,6 @@
addPreferencesFromResource(R.xml.accessibility_daltonizer_settings);
- mEnableQuickSetting = (CheckBoxPreference) findPreference("enable_quick_setting");
mType = (ListPreference) findPreference("type");
initPreferences();
@@ -58,10 +53,7 @@
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
- if (preference == mEnableQuickSetting) {
- Settings.Secure.putInt(
- getContentResolver(), QUICK_SETTING_ENABLED, ((Boolean) newValue) ? 1 : 0);
- } else if (preference == mType) {
+ if (preference == mType) {
Settings.Secure.putInt(getContentResolver(), TYPE, Integer.parseInt((String) newValue));
preference.setSummary("%s");
}
@@ -92,10 +84,6 @@
}
private void initPreferences() {
- mEnableQuickSetting.setChecked(
- Settings.Secure.getInt(getContentResolver(), QUICK_SETTING_ENABLED, 0) == 1);
- mEnableQuickSetting.setOnPreferenceChangeListener(this);
-
final String value = Integer.toString(
Settings.Secure.getInt(getContentResolver(), TYPE, DEFAULT_TYPE));
mType.setValue(value);
diff --git a/src/com/android/settings/accounts/AccountPreferenceBase.java b/src/com/android/settings/accounts/AccountPreferenceBase.java
index f533263..37dffca 100644
--- a/src/com/android/settings/accounts/AccountPreferenceBase.java
+++ b/src/com/android/settings/accounts/AccountPreferenceBase.java
@@ -22,6 +22,7 @@
import java.util.Map;
import com.android.settings.SettingsPreferenceFragment;
+
import com.google.android.collect.Maps;
import android.accounts.Account;
@@ -35,12 +36,14 @@
import android.content.SyncStatusObserver;
import android.content.pm.PackageManager;
import android.content.res.Resources;
+import android.content.res.Resources.Theme;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.Handler;
import android.preference.PreferenceScreen;
import android.text.format.DateFormat;
import android.util.Log;
+import android.view.ContextThemeWrapper;
class AccountPreferenceBase extends SettingsPreferenceFragment
implements OnAccountsUpdateListener {
@@ -147,8 +150,19 @@
try {
desc = mAuthenticatorHelper.getAccountTypeDescription(accountType);
if (desc != null && desc.accountPreferencesId != 0) {
- Context authContext = getActivity().createPackageContext(desc.packageName, 0);
- prefs = getPreferenceManager().inflateFromResource(authContext,
+ // Load the context of the target package, then apply the
+ // base Settings theme (no references to local resources)
+ // and create a context theme wrapper so that we get the
+ // correct text colors. Control colors will still be wrong,
+ // but there's not much we can do about it since we can't
+ // reference local color resources.
+ final Context targetCtx = getActivity().createPackageContext(
+ desc.packageName, 0);
+ final Theme baseTheme = getResources().newTheme();
+ baseTheme.applyStyle(com.android.settings.R.style.Theme_SettingsBase, true);
+ final Context themedCtx = new ContextThemeWrapper(targetCtx, 0);
+ themedCtx.getTheme().setTo(baseTheme);
+ prefs = getPreferenceManager().inflateFromResource(themedCtx,
desc.accountPreferencesId, parent);
}
} catch (PackageManager.NameNotFoundException e) {
diff --git a/src/com/android/settings/dashboard/SearchResultsSummary.java b/src/com/android/settings/dashboard/SearchResultsSummary.java
index 1bd0bf0..387e9bc 100644
--- a/src/com/android/settings/dashboard/SearchResultsSummary.java
+++ b/src/com/android/settings/dashboard/SearchResultsSummary.java
@@ -580,19 +580,18 @@
} else {
view = convertView;
}
+
textTitle = (TextView) view.findViewById(R.id.title);
textSummary = (TextView) view.findViewById(R.id.summary);
imageView = (ImageView) view.findViewById(R.id.icon);
- SearchResult result = (SearchResult) getItem(position);
-
+ final SearchResult result = (SearchResult) getItem(position);
textTitle.setText(result.title);
- String summaryOn = result.summaryOn;
- String entries = result.entries;
+ final String summaryOn = result.summaryOn;
+ final String entries = result.entries;
final StringBuilder sb = new StringBuilder();
-
if (!TextUtils.isEmpty(summaryOn) &&
!summaryOn.contains(PERCENT_RECLACE) && !summaryOn.contains(DOLLAR_REPLACE)) {
sb.append(summaryOn);
@@ -607,7 +606,13 @@
}
sb.append(ELLIPSIS);
}
- textSummary.setText(sb.toString());
+
+ if (TextUtils.isEmpty(sb)) {
+ textSummary.setVisibility(View.GONE);
+ } else {
+ textSummary.setText(sb.toString());
+ textSummary.setVisibility(View.VISIBLE);
+ }
if (result.iconResId != R.drawable.empty_icon) {
final Context packageContext = result.context;
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
index 47e887a..4c6a503 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -117,9 +117,6 @@
static final int SERIF = 2;
static final int MONOSPACE = 3;
- static final int BATTERY_WARN = 29;
- static final int BATTERY_CRITICAL = 14;
-
// First value if for phone off; first value is "scanning"; following values
// are battery stats signal strength buckets.
static final int NUM_PHONE_SIGNALS = 7;
@@ -167,7 +164,13 @@
String mWifiRunningLabel;
String mCpuRunningLabel;
String mPhoneSignalLabel;
-
+
+ int mChartMinHeight;
+ int mHeaderHeight;
+
+ int mBatteryWarnLevel;
+ int mBatteryCriticalLevel;
+
int mTextAscent;
int mTextDescent;
int mHeaderTextAscent;
@@ -352,19 +355,24 @@
public BatteryHistoryChart(Context context, AttributeSet attrs) {
super(context, attrs);
-
+
+ mBatteryWarnLevel = mContext.getResources().getInteger(
+ com.android.internal.R.integer.config_lowBatteryWarningLevel);
+ mBatteryCriticalLevel = mContext.getResources().getInteger(
+ com.android.internal.R.integer.config_criticalBatteryWarningLevel);
+
mThinLineWidth = (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
2, getResources().getDisplayMetrics());
- mBatteryBackgroundPaint.setColor(0xff263238);
+ mBatteryBackgroundPaint.setColor(0xFF009688);
mBatteryBackgroundPaint.setStyle(Paint.Style.FILL);
- mBatteryGoodPaint.setARGB(128, 0, 255, 0);
+ mBatteryGoodPaint.setARGB(128, 0, 128, 0);
mBatteryGoodPaint.setStyle(Paint.Style.STROKE);
- mBatteryWarnPaint.setARGB(128, 255, 255, 0);
+ mBatteryWarnPaint.setARGB(128, 128, 128, 0);
mBatteryWarnPaint.setStyle(Paint.Style.STROKE);
- mBatteryCriticalPaint.setARGB(192, 255, 0, 0);
+ mBatteryCriticalPaint.setARGB(192, 128, 0, 0);
mBatteryCriticalPaint.setStyle(Paint.Style.STROKE);
- mTimeRemainPaint.setColor(0xffA5B1B7);
+ mTimeRemainPaint.setColor(0xFFCED7BB);
mTimeRemainPaint.setStyle(Paint.Style.FILL);
mChargingPaint.setARGB(255, 0, 128, 0);
mChargingPaint.setStyle(Paint.Style.STROKE);
@@ -431,6 +439,18 @@
mainTextAttrs.styleIndex = a.getInt(attr, mainTextAttrs.styleIndex);
headTextAttrs.styleIndex = a.getInt(attr, headTextAttrs.styleIndex);
break;
+
+ case R.styleable.BatteryHistoryChart_barPrimaryColor:
+ mBatteryBackgroundPaint.setColor(a.getInt(attr, 0));
+ break;
+
+ case R.styleable.BatteryHistoryChart_barPredictionColor:
+ mTimeRemainPaint.setColor(a.getInt(attr, 0));
+ break;
+
+ case R.styleable.BatteryHistoryChart_chartMinHeight:
+ mChartMinHeight = a.getDimensionPixelSize(attr, 0);
+ break;
}
}
@@ -502,8 +522,19 @@
remainingTimeUs = chargeTime;
String timeString = Formatter.formatShortElapsedTime(getContext(),
chargeTime / 1000);
+ int plugType = mBatteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0);
+ int resId;
+ if (plugType == BatteryManager.BATTERY_PLUGGED_AC) {
+ resId = R.string.power_charging_duration_ac;
+ } else if (plugType == BatteryManager.BATTERY_PLUGGED_USB) {
+ resId = R.string.power_charging_duration_usb;
+ } else if (plugType == BatteryManager.BATTERY_PLUGGED_WIRELESS) {
+ resId = R.string.power_charging_duration_wireless;
+ } else {
+ resId = R.string.power_charging_duration;
+ }
mChargeLabelString = getContext().getResources().getString(
- R.string.power_charging_duration, batteryLevel, statusLabel, timeString);
+ resId, batteryLevel, timeString);
} else {
mChargeLabelString = getContext().getResources().getString(
R.string.power_charging, batteryLevel, statusLabel);
@@ -562,19 +593,12 @@
mHavePhoneSignal = true;
}
if (mHistEnd <= mHistStart) mHistEnd = mHistStart+1;
-
- //String durationString = Utils.formatElapsedTime(getContext(), mStatsPeriod / 1000, true);
- //mDurationString = getContext().getString(R.string.battery_stats_on_battery,
- // durationString);
- mDurationString = Utils.formatElapsedTime(getContext(), mHistEnd - mHistStart, true);
}
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
- super.onMeasure(widthMeasureSpec, heightMeasureSpec);
mMaxPercentLabelStringWidth = (int)mTextPaint.measureText(mMaxPercentLabelString);
mMinPercentLabelStringWidth = (int)mTextPaint.measureText(mMinPercentLabelString);
- mDurationStringWidth = (int)mTextPaint.measureText(mDurationString);
mDrainStringWidth = (int)mHeaderTextPaint.measureText(mDrainString);
mChargeLabelStringWidth = (int)mHeaderTextPaint.measureText(mChargeLabelString);
mChargeDurationStringWidth = (int)mHeaderTextPaint.measureText(mChargeDurationString);
@@ -582,6 +606,10 @@
mTextDescent = (int)mTextPaint.descent();
mHeaderTextAscent = (int)mHeaderTextPaint.ascent();
mHeaderTextDescent = (int)mHeaderTextPaint.descent();
+ int headerTextHeight = mHeaderTextDescent - mHeaderTextAscent;
+ mHeaderHeight = headerTextHeight*2 - mTextAscent;
+ setMeasuredDimension(getDefaultSize(getSuggestedMinimumWidth(), widthMeasureSpec),
+ getDefaultSize(mChartMinHeight+mHeaderHeight, heightMeasureSpec));
}
void finishPaths(int w, int h, int levelh, int startX, int y, Path curLevelPath,
@@ -669,8 +697,7 @@
mLastHeight = h;
int textHeight = mTextDescent - mTextAscent;
- int headerTextHeight = mHeaderTextDescent - mHeaderTextAscent;
- if (h > (textHeight*12)) {
+ if (h > ((textHeight*10)+mChartMinHeight)) {
mLargeMode = true;
if (h > (textHeight*15)) {
// Plenty of room for the chart.
@@ -693,7 +720,7 @@
}
if (mLineWidth <= 0) mLineWidth = 1;
- mLevelTop = headerTextHeight*2 - mTextAscent;
+ mLevelTop = mHeaderHeight;
mLevelLeft = mMaxPercentLabelStringWidth + mThinLineWidth*3;
mLevelRight = w;
int levelWidth = mLevelRight-mLevelLeft;
@@ -798,17 +825,19 @@
// Don't plot changes within a pixel.
Path path;
byte value = rec.batteryLevel;
- if (value <= BATTERY_CRITICAL) path = mBatCriticalPath;
- else if (value <= BATTERY_WARN) path = mBatWarnPath;
- else path = mBatGoodPath;
+ if (value <= mBatteryCriticalLevel) path = mBatCriticalPath;
+ else if (value <= mBatteryWarnLevel) path = mBatWarnPath;
+ else path = null; //mBatGoodPath;
if (path != lastLinePath) {
if (lastLinePath != null) {
lastLinePath.lineTo(x, y);
}
- path.moveTo(x, y);
+ if (path != null) {
+ path.moveTo(x, y);
+ }
lastLinePath = path;
- } else {
+ } else if (path != null) {
path.lineTo(x, y);
}
@@ -937,54 +966,67 @@
mTimeRemainPath.close();
}
- // Create the time labels at the bottom.
- boolean is24hr = is24Hour();
- Calendar calStart = Calendar.getInstance();
- calStart.setTimeInMillis(mStartWallTime);
- calStart.set(Calendar.MILLISECOND, 0);
- calStart.set(Calendar.SECOND, 0);
- calStart.set(Calendar.MINUTE, 0);
- long startRoundTime = calStart.getTimeInMillis();
- if (startRoundTime < mStartWallTime) {
- calStart.set(Calendar.HOUR_OF_DAY, calStart.get(Calendar.HOUR_OF_DAY)+1);
- startRoundTime = calStart.getTimeInMillis();
- }
- Calendar calEnd = Calendar.getInstance();
- calEnd.setTimeInMillis(mEndWallTime);
- calEnd.set(Calendar.MILLISECOND, 0);
- calEnd.set(Calendar.SECOND, 0);
- calEnd.set(Calendar.MINUTE, 0);
- long endRoundTime = calEnd.getTimeInMillis();
- if (startRoundTime < endRoundTime) {
- addTimeLabel(calStart, mLevelLeft, mLevelRight, is24hr);
- Calendar calMid = Calendar.getInstance();
- calMid.setTimeInMillis(mStartWallTime+((mEndWallTime-mStartWallTime)/2));
- calMid.set(Calendar.MILLISECOND, 0);
- calMid.set(Calendar.SECOND, 0);
- calMid.set(Calendar.MINUTE, 0);
- long calMidMillis = calMid.getTimeInMillis();
- if (calMidMillis > startRoundTime && calMidMillis < endRoundTime) {
- addTimeLabel(calMid, mLevelLeft, mLevelRight, is24hr);
- }
- addTimeLabel(calEnd, mLevelLeft, mLevelRight, is24hr);
- }
-
- // Create the date labels if the chart includes multiple days
- if (calStart.get(Calendar.DAY_OF_YEAR) != calEnd.get(Calendar.DAY_OF_YEAR) ||
- calStart.get(Calendar.YEAR) != calEnd.get(Calendar.YEAR)) {
- boolean isDayFirst = isDayFirst();
- calStart.set(Calendar.HOUR_OF_DAY, 0);
- startRoundTime = calStart.getTimeInMillis();
+ if (mStartWallTime > 0) {
+ // Create the time labels at the bottom.
+ boolean is24hr = is24Hour();
+ Calendar calStart = Calendar.getInstance();
+ calStart.setTimeInMillis(mStartWallTime);
+ calStart.set(Calendar.MILLISECOND, 0);
+ calStart.set(Calendar.SECOND, 0);
+ calStart.set(Calendar.MINUTE, 0);
+ long startRoundTime = calStart.getTimeInMillis();
if (startRoundTime < mStartWallTime) {
- calStart.set(Calendar.DAY_OF_YEAR, calStart.get(Calendar.DAY_OF_YEAR) + 1);
+ calStart.set(Calendar.HOUR_OF_DAY, calStart.get(Calendar.HOUR_OF_DAY)+1);
startRoundTime = calStart.getTimeInMillis();
}
- calEnd.set(Calendar.HOUR_OF_DAY, 0);
- endRoundTime = calEnd.getTimeInMillis();
+ Calendar calEnd = Calendar.getInstance();
+ calEnd.setTimeInMillis(mEndWallTime);
+ calEnd.set(Calendar.MILLISECOND, 0);
+ calEnd.set(Calendar.SECOND, 0);
+ calEnd.set(Calendar.MINUTE, 0);
+ long endRoundTime = calEnd.getTimeInMillis();
if (startRoundTime < endRoundTime) {
- addDateLabel(calStart, mLevelLeft, mLevelRight, isDayFirst);
+ addTimeLabel(calStart, mLevelLeft, mLevelRight, is24hr);
+ Calendar calMid = Calendar.getInstance();
+ calMid.setTimeInMillis(mStartWallTime+((mEndWallTime-mStartWallTime)/2));
+ calMid.set(Calendar.MILLISECOND, 0);
+ calMid.set(Calendar.SECOND, 0);
+ calMid.set(Calendar.MINUTE, 0);
+ long calMidMillis = calMid.getTimeInMillis();
+ if (calMidMillis > startRoundTime && calMidMillis < endRoundTime) {
+ addTimeLabel(calMid, mLevelLeft, mLevelRight, is24hr);
+ }
+ addTimeLabel(calEnd, mLevelLeft, mLevelRight, is24hr);
}
- addDateLabel(calEnd, mLevelLeft, mLevelRight, isDayFirst);
+
+ // Create the date labels if the chart includes multiple days
+ if (calStart.get(Calendar.DAY_OF_YEAR) != calEnd.get(Calendar.DAY_OF_YEAR) ||
+ calStart.get(Calendar.YEAR) != calEnd.get(Calendar.YEAR)) {
+ boolean isDayFirst = isDayFirst();
+ calStart.set(Calendar.HOUR_OF_DAY, 0);
+ startRoundTime = calStart.getTimeInMillis();
+ if (startRoundTime < mStartWallTime) {
+ calStart.set(Calendar.DAY_OF_YEAR, calStart.get(Calendar.DAY_OF_YEAR) + 1);
+ startRoundTime = calStart.getTimeInMillis();
+ }
+ calEnd.set(Calendar.HOUR_OF_DAY, 0);
+ endRoundTime = calEnd.getTimeInMillis();
+ if (startRoundTime < endRoundTime) {
+ addDateLabel(calStart, mLevelLeft, mLevelRight, isDayFirst);
+ }
+ addDateLabel(calEnd, mLevelLeft, mLevelRight, isDayFirst);
+ }
+ }
+
+ if (mTimeLabels.size() < 2) {
+ // If there are fewer than 2 time labels, then they are useless. Just
+ // show an axis label giving the entire duration.
+ mDurationString = Formatter.formatShortElapsedTime(getContext(),
+ mEndWallTime - mStartWallTime);
+ mDurationStringWidth = (int)mTextPaint.measureText(mDurationString);
+ } else {
+ mDurationString = null;
+ mDurationStringWidth = 0;
}
}
@@ -1031,9 +1073,7 @@
if (DEBUG) Log.d(TAG, "Drawing time remain path.");
canvas.drawPath(mTimeRemainPath, mTimeRemainPaint);
}
- int durationHalfWidth = mDurationStringWidth / 2;
- if (layoutRtl) durationHalfWidth = -durationHalfWidth;
- if (mTimeLabels.size() > 0) {
+ if (mTimeLabels.size() > 1) {
int y = mLevelBottom - mTextAscent + (mThinLineWidth*4);
int ytick = mLevelBottom+mThinLineWidth+(mThinLineWidth/2);
mTextPaint.setTextAlign(Paint.Align.LEFT);
@@ -1072,31 +1112,24 @@
canvas.drawLine(label.x, ytick, label.x, ytick+mThinLineWidth, mTextPaint);
}
}
- }
-
- if (false) {
- // Old code for printing label.
- mTextPaint.setTextAlign(textAlignLeft);
- if (mLargeMode) {
- canvas.drawText(mDurationString, (width / 2) - durationHalfWidth,
- mLevelBottom - mTextAscent + mThinLineWidth, mTextPaint);
- } else {
- canvas.drawText(mDurationString, (width / 2) - durationHalfWidth,
- mLevelTop + ((height-mLevelTop) / 2) - ((mTextDescent - mTextAscent) / 2)
- - mTextAscent, mTextPaint);
- }
+ } else if (mDurationString != null) {
+ int y = mLevelBottom - mTextAscent + (mThinLineWidth*4);
+ mTextPaint.setTextAlign(Paint.Align.LEFT);
+ canvas.drawText(mDurationString,
+ mLevelLeft + (mLevelRight-mLevelLeft)/2 - mDurationStringWidth/2,
+ y, mTextPaint);
}
int headerTop = -mHeaderTextAscent + (mHeaderTextDescent-mHeaderTextAscent)/3;
mHeaderTextPaint.setTextAlign(textAlignLeft);
if (DEBUG) Log.d(TAG, "Drawing charge label string: " + mChargeLabelString);
canvas.drawText(mChargeLabelString, textStartX, headerTop, mHeaderTextPaint);
- durationHalfWidth = mChargeDurationStringWidth / 2;
- if (layoutRtl) durationHalfWidth = -durationHalfWidth;
+ int stringHalfWidth = mChargeDurationStringWidth / 2;
+ if (layoutRtl) stringHalfWidth = -stringHalfWidth;
int headerCenter = ((width-mChargeDurationStringWidth-mDrainStringWidth)/2)
+ (layoutRtl ? mDrainStringWidth : mChargeLabelStringWidth);
if (DEBUG) Log.d(TAG, "Drawing charge duration string: " + mChargeDurationString);
- canvas.drawText(mChargeDurationString, headerCenter - durationHalfWidth, headerTop,
+ canvas.drawText(mChargeDurationString, headerCenter - stringHalfWidth, headerTop,
mHeaderTextPaint);
mHeaderTextPaint.setTextAlign(textAlignRight);
if (DEBUG) Log.d(TAG, "Drawing drain string: " + mDrainString);
@@ -1181,7 +1214,7 @@
canvas.drawText(mMinPercentLabelString,
mMaxPercentLabelStringWidth-mMinPercentLabelStringWidth,
mLevelBottom - mThinLineWidth, mTextPaint);
- canvas.drawLine(0, mLevelBottom+mThinLineWidth, width,
+ canvas.drawLine(mLevelLeft/2, mLevelBottom+mThinLineWidth, width,
mLevelBottom+mThinLineWidth, mTextPaint);
if (mDateLabels.size() > 0) {
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
index 0cbb9b7..248d471 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
@@ -48,7 +48,7 @@
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
- View view = inflater.inflate(R.layout.preference_batteryhistory, null);
+ View view = inflater.inflate(R.layout.battery_history_chart, null);
BatteryHistoryChart chart = (BatteryHistoryChart)view.findViewById(
R.id.battery_history_chart);
chart.setStats(mStats, mBatteryBroadcast);
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
index bdea852..fd7d87a 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
@@ -37,6 +37,9 @@
final private BatteryStats mStats;
final private Intent mBatteryBroadcast;
+ private boolean mHideLabels;
+ private View mLabelHeader;
+
public BatteryHistoryPreference(Context context, BatteryStats stats, Intent batteryBroadcast) {
super(context);
setLayoutResource(R.layout.preference_batteryhistory);
@@ -48,6 +51,15 @@
return mStats;
}
+ public void setHideLabels(boolean hide) {
+ if (mHideLabels != hide) {
+ mHideLabels = hide;
+ if (mLabelHeader != null) {
+ mLabelHeader.setVisibility(hide ? View.GONE : View.VISIBLE);
+ }
+ }
+ }
+
@Override
protected void onBindView(View view) {
super.onBindView(view);
@@ -55,5 +67,7 @@
BatteryHistoryChart chart = (BatteryHistoryChart)view.findViewById(
R.id.battery_history_chart);
chart.setStats(mStats, mBatteryBroadcast);
+ mLabelHeader = view.findViewById(R.id.labelsHeader);
+ mLabelHeader.setVisibility(mHideLabels ? View.GONE : View.VISIBLE);
}
}
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index e00e20b..e4e2b0a 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -64,6 +64,7 @@
private UserManager mUm;
+ private BatteryHistoryPreference mHistPref;
private PreferenceGroup mAppListGroup;
private String mBatteryLevel;
private String mBatteryStatus;
@@ -210,6 +211,7 @@
private void addNotAvailableMessage() {
Preference notAvailable = new Preference(getActivity());
notAvailable.setTitle(R.string.power_usage_not_available);
+ mHistPref.setHideLabels(true);
mAppListGroup.addPreference(notAvailable);
}
@@ -233,16 +235,17 @@
mStatsHelper.refreshStats(BatteryStats.STATS_SINCE_CHARGED, UserHandle.myUserId());
- BatteryHistoryPreference hist = new BatteryHistoryPreference(
+ mHistPref = new BatteryHistoryPreference(
getActivity(), mStatsHelper.getStats(), mStatsHelper.getBatteryBroadcast());
- hist.setOrder(-1);
- mAppListGroup.addPreference(hist);
+ mHistPref.setOrder(-1);
+ mAppListGroup.addPreference(mHistPref);
if (mStatsHelper.getPowerProfile().getAveragePower(
PowerProfile.POWER_SCREEN_FULL) < 10) {
addNotAvailableMessage();
return;
}
+ boolean addedSome = false;
final int dischargeAmount = mStatsHelper.getStats().getDischargeAmount(mStatsType);
List<BatterySipper> usageList = mStatsHelper.getUsageList();
for (int i=0; i<usageList.size(); i++) {
@@ -263,9 +266,13 @@
if (sipper.uidObj != null) {
pref.setKey(Integer.toString(sipper.uidObj.getUid()));
}
+ addedSome = true;
mAppListGroup.addPreference(pref);
if (mAppListGroup.getPreferenceCount() > (MAX_ITEMS_TO_LIST+1)) break;
}
+ if (!addedSome) {
+ addNotAvailableMessage();
+ }
BatteryEntry.startRequestQueue();
}
diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index 379b4c7..e9323d8 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -70,6 +70,7 @@
SwitchBar.OnSwitchChangeListener {
private static final String TAG = "ZenModeSettings";
private static final boolean DEBUG = true;
+ private static final boolean SHOW_CONDITION_DIALOG = false;
private static final String KEY_GENERAL = "general";
private static final String KEY_CALLS = "phone_calls";
@@ -136,7 +137,7 @@
final int v = isChecked ? Global.ZEN_MODE_ON : Global.ZEN_MODE_OFF;
putZenModeSetting(v);
final int n = ConditionProviderSettings.getEnabledProviderCount(mContext);
- if (n > 0) {
+ if (SHOW_CONDITION_DIALOG && n > 0) {
mHandler.post(isChecked ? mShowDialog : mHideDialog);
}
}
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index 3f7362c..f512db5 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -154,7 +154,7 @@
Settings.Secure.PRINT_SERVICE_SEARCH_URI);
if (!TextUtils.isEmpty(searchUri)) {
MenuItem menuItem = menu.add(R.string.print_menu_item_add_service);
- menuItem.setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+ menuItem.setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_NEVER);
menuItem.setIntent(new Intent(Intent.ACTION_VIEW, Uri.parse(searchUri)));
}
}
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index 5156648..01d3c07 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -101,7 +101,7 @@
sResMap.put(DisplaySettings.class.getName(),
new SearchIndexableResource(
Ranking.getRankForClassName(DisplaySettings.class.getName()),
- R.xml.display_settings,
+ NO_DATA_RES_ID,
DisplaySettings.class.getName(),
R.drawable.ic_settings_display));
diff --git a/src/com/android/settings/widget/SwitchBar.java b/src/com/android/settings/widget/SwitchBar.java
index 40c8481..bc06d87 100644
--- a/src/com/android/settings/widget/SwitchBar.java
+++ b/src/com/android/settings/widget/SwitchBar.java
@@ -20,6 +20,7 @@
import android.transition.TransitionManager;
import android.util.AttributeSet;
import android.view.LayoutInflater;
+import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.widget.CompoundButton;
@@ -31,7 +32,8 @@
import java.util.ArrayList;
-public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedChangeListener {
+public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedChangeListener,
+ View.OnClickListener {
private ToggleSwitch mSwitch;
private TextView mTextView;
@@ -82,6 +84,8 @@
mSwitch.setTrackResource(R.drawable.switch_track);
mSwitch.setThumbResource(R.drawable.switch_inner);
+ setOnClickListener(this);
+
// Default is hide
setVisibility(View.GONE);
}
@@ -105,13 +109,23 @@
}
@Override
- public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+ public void onClick(View v) {
+ final boolean isChecked = !mSwitch.isChecked();
+ mSwitch.setChecked(isChecked);
+ }
+
+ public void propagateChecked(boolean isChecked) {
final int count = mSwitchChangeListeners.size();
for (int n = 0; n < count; n++) {
- mSwitchChangeListeners.get(n).onSwitchChanged(mSwitch,isChecked);
+ mSwitchChangeListeners.get(n).onSwitchChanged(mSwitch, isChecked);
}
}
+ @Override
+ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+ propagateChecked(isChecked);
+ }
+
public void addOnSwitchChangeListener(OnSwitchChangeListener listener) {
if (mSwitchChangeListeners.contains(listener)) {
throw new IllegalStateException("Cannot add twice the same OnSwitchChangeListener");
