diff options
Diffstat (limited to 'packages')
70 files changed, 85 insertions, 88 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index ade93da..6e2bfdb 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -327,10 +327,7 @@ public class SettingsProvider extends ContentProvider { try { final String value = c.moveToNext() ? c.getString(0) : null; if (value == null) { - final SecureRandom random = SecureRandom.getInstance("SHA1PRNG"); - String serial = SystemProperties.get("ro.serialno", ""); - random.setSeed( - (serial + System.nanoTime() + new SecureRandom().nextLong()).getBytes()); + final SecureRandom random = new SecureRandom(); final String newAndroidIdValue = Long.toHexString(random.nextLong()); Log.d(TAG, "Generated and saved new ANDROID_ID [" + newAndroidIdValue + "]"); final ContentValues values = new ContentValues(); @@ -342,8 +339,6 @@ public class SettingsProvider extends ContentProvider { } } return true; - } catch (NoSuchAlgorithmException e) { - return false; } finally { c.close(); } diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_bluetooth_connected.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_bluetooth_connected.png Binary files differindex 1e4bbf5..18c77df 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_bluetooth_connected.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_bluetooth_connected.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_1x.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_1x.png Binary files differindex bdc8c27..3fe08c2 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_1x.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_1x.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_3g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_3g.png Binary files differindex d0d1345..95866b1 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_3g.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_3g.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_3g_fully.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_3g_fully.png Binary files differindex 5af2b05..5524e26 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_3g_fully.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_3g_fully.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_e.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_e.png Binary files differindex 4211b8c..1a69d13 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_e.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_e.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_g.png Binary files differindex d5ece7a..09094d1 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_g.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_g.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_h.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_h.png Binary files differindex 6687b40..0f64e0f 100755 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_h.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_h.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_1x.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_1x.png Binary files differindex ba24082..90454b0 100755..100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_1x.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_1x.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_3g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_3g.png Binary files differindex 5af2b05..5524e26 100755..100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_3g.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_3g.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_e.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_e.png Binary files differindex 9909b09..a43c233 100755..100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_e.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_e.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_g.png Binary files differindex 0e02b8d..03a06a0 100755..100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_g.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_g.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_h.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_h.png Binary files differindex f84ad32..be7eed4 100755..100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_h.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_h.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_1x.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_1x.png Binary files differindex d80a8ce..2d77956 100755..100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_1x.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_1x.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_3g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_3g.png Binary files differindex 31c976a..a8411fc 100755..100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_3g.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_3g.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_g.png Binary files differindex a487f29..b135a81 100755..100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_g.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_g.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_h.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_h.png Binary files differindex 816085b..9ef67d1d 100755..100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_h.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_in_h.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_1x.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_1x.png Binary files differindex 0132019..c9196b2 100755..100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_1x.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_1x.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_3g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_3g.png Binary files differindex 3903545..f7dda73 100755..100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_3g.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_3g.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_e.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_e.png Binary files differindex ed099ff..cf17eea 100755..100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_e.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_e.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_g.png Binary files differindex c930e4c..9e0d73c 100755..100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_g.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_g.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_h.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_h.png Binary files differindex 407a06c..c506f75 100755..100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_h.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_inandout_h.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_1x.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_1x.png Binary files differindex 6141f72..6258164 100755..100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_1x.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_1x.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_3g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_3g.png Binary files differindex d44a4cf..eb5150f 100755..100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_3g.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_3g.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_e.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_e.png Binary files differindex 54ebd9b..2496714 100755..100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_e.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_e.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_g.png Binary files differindex 2fe0bbf..4aba1b1 100755..100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_g.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_g.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_h.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_h.png Binary files differindex e58e019..3624a8d 100755..100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_h.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_out_h.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_1x.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_1x.png Binary files differindex 00a29a4..720f578 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_1x.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_1x.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_3g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_3g.png Binary files differindex 11ee0f2..07ea499 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_3g.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_3g.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_3g_fully.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_3g_fully.png Binary files differindex 31c976a..a8411fc 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_3g_fully.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_3g_fully.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_e.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_e.png Binary files differindex fc135fc..f8779a6 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_e.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_e.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_e_fully.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_e_fully.png Binary files differindex c299e12..ae90cc8 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_e_fully.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_e_fully.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_g.png Binary files differindex 3d33a62..f6fe4b2 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_g.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_g.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_h.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_h.png Binary files differindex f36e1eb..393963f 100755 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_h.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_h.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_1x.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_1x.png Binary files differindex ef5dbf4..abe961a 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_1x.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_1x.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_3g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_3g.png Binary files differindex dba9675..95bb3cd 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_3g.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_3g.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_3g_fully.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_3g_fully.png Binary files differindex 3903545..f7dda73 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_3g_fully.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_3g_fully.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_e.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_e.png Binary files differindex 2e5d82e..e6e9df4 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_e.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_e.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_g.png Binary files differindex 0985a09..a14e8d6 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_g.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_g.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_h.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_h.png Binary files differindex 7a32c43..404afff 100755 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_h.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_h.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_1x.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_1x.png Binary files differindex b622556..a47a482 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_1x.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_1x.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_3g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_3g.png Binary files differindex 04ec59e..cac7802 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_3g.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_3g.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_3g_fully.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_3g_fully.png Binary files differindex d44a4cf..eb5150f 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_3g_fully.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_3g_fully.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_e.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_e.png Binary files differindex a47b982..41e86cc 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_e.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_e.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_g.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_g.png Binary files differindex 9d90e71..6c4203d 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_g.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_g.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_h.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_h.png Binary files differindex 920f290..9927dbf 100755 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_h.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_h.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_gps_acquiring.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_gps_acquiring.png Binary files differindex e306ad7..56943ea 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_gps_acquiring.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_gps_acquiring.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_gps_on.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_gps_on.png Binary files differdeleted file mode 100644 index 37fb8f7..0000000 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_gps_on.png +++ /dev/null diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_1_fully.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_1_fully.png Binary files differindex adf668d..eeb7f67 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_1_fully.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_1_fully.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_2_fully.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_2_fully.png Binary files differindex 7bf6b51..aee093a 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_2_fully.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_2_fully.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_3_fully.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_3_fully.png Binary files differindex 78738ac..a40017f 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_3_fully.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_3_fully.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_4_fully.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_4_fully.png Binary files differindex ac88143..c3b44ee 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_4_fully.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_r_signal_4_fully.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_0.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_0.png Binary files differindex 55a2ad8..98e874a 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_0.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_0.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1.png Binary files differindex d16b3e8..aea18ed 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2.png Binary files differindex 2511083..77e6ee4 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3.png Binary files differindex e0799a5..c2574e1 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4.png Binary files differindex 2385c3a..55caecf 100644 --- a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4.png +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4.png diff --git a/packages/SystemUI/res/drawable-hdpi/statusbar_background.9.png b/packages/SystemUI/res/drawable-hdpi/statusbar_background.9.png Binary files differindex 67c8b7f..98e5487 100644 --- a/packages/SystemUI/res/drawable-hdpi/statusbar_background.9.png +++ b/packages/SystemUI/res/drawable-hdpi/statusbar_background.9.png diff --git a/packages/SystemUI/res/drawable-mdpi/statusbar_background.9.png b/packages/SystemUI/res/drawable-mdpi/statusbar_background.9.png Binary files differnew file mode 100644 index 0000000..4b5dbe3 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/statusbar_background.9.png diff --git a/packages/SystemUI/res/layout/status_bar.xml b/packages/SystemUI/res/layout/status_bar.xml index 423cf5a..a5d6885 100644 --- a/packages/SystemUI/res/layout/status_bar.xml +++ b/packages/SystemUI/res/layout/status_bar.xml @@ -21,7 +21,7 @@ <!-- android:background="@drawable/status_bar_closed_default_background" --> <com.android.systemui.statusbar.StatusBarView xmlns:android="http://schemas.android.com/apk/res/android" - android:background="@drawable/status_bar_background" + android:background="@drawable/statusbar_background" android:orientation="vertical" android:focusable="true" android:descendantFocusability="afterDescendants" @@ -108,6 +108,6 @@ android:gravity="center_vertical|left" android:paddingLeft="6px" android:paddingRight="6px" - android:background="@drawable/status_bar_background" + android:background="@drawable/statusbar_background" /> </com.android.systemui.statusbar.StatusBarView> diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index b5b1b50..a58e311 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -31,7 +31,7 @@ android:paddingTop="3dp" android:paddingBottom="5dp" android:paddingRight="3dp" - android:background="@drawable/shade_header_background" + android:background="@drawable/title_bar_portrait" > <com.android.systemui.statusbar.CarrierLabel android:layout_width="0dp" @@ -43,7 +43,7 @@ android:paddingBottom="1dp" android:paddingLeft="4dp" android:textAppearance="?android:attr/textAppearanceLarge" - android:textColor="?android:attr/textColorSecondary" + android:textColor="#ffdfdfdf" /> <TextView android:id="@+id/clear_all_button" android:layout_width="wrap_content" @@ -82,7 +82,7 @@ <TextView android:id="@+id/noNotificationsTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/title_bar_portrait" + android:background="@drawable/shade_bgcolor" android:paddingLeft="5dp" android:textAppearance="@style/TextAppearance.StatusBar.Title" android:text="@string/status_bar_no_notifications_title" @@ -91,7 +91,7 @@ <TextView android:id="@+id/ongoingTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/title_bar_portrait" + android:background="@drawable/shade_bgcolor" android:paddingLeft="5dp" android:textAppearance="@style/TextAppearance.StatusBar.Title" android:text="@string/status_bar_ongoing_events_title" @@ -105,7 +105,7 @@ <TextView android:id="@+id/latestTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/title_bar_portrait" + android:background="@drawable/shade_bgcolor" android:paddingLeft="5dp" android:textAppearance="@style/TextAppearance.StatusBar.Title" android:text="@string/status_bar_latest_events_title" diff --git a/packages/SystemUI/res/layout/status_bar_tracking.xml b/packages/SystemUI/res/layout/status_bar_tracking.xml index a2b40e6..3b9b775 100644 --- a/packages/SystemUI/res/layout/status_bar_tracking.xml +++ b/packages/SystemUI/res/layout/status_bar_tracking.xml @@ -26,11 +26,12 @@ android:paddingRight="0px" > - <com.android.systemui.statusbar.TrackingPatternView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - /> + <View + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:background="#ff212121" + /> <com.android.systemui.statusbar.CloseDragHandle android:id="@+id/close" android:layout_width="match_parent" @@ -42,7 +43,7 @@ android:layout_height="wrap_content" android:layout_gravity="bottom" android:scaleType="fitXY" - android:src="@drawable/shade_handlebar" + android:src="@drawable/status_bar_close_on" /> </com.android.systemui.statusbar.CloseDragHandle> diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml new file mode 100644 index 0000000..4b1fcf0f --- /dev/null +++ b/packages/SystemUI/res/values/colors.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* + * Copyright 2010, 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. + */ +--> +<resources> + <drawable name="shade_bgcolor">#ff282828</drawable> + <drawable name="notification_header_text_color">#ff969696</drawable> +</resources> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 816f34a4..86bcf3a 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -19,7 +19,7 @@ <style name="TextAppearance.StatusBar.Title" parent="@android:style/TextAppearance.StatusBar"> <item name="android:textAppearance">?android:attr/textAppearanceSmall</item> <item name="android:textStyle">bold</item> - <item name="android:textColor">?android:attr/textColorPrimary</item> + <item name="android:textColor">@drawable/notification_header_text_color</item> </style> <style name="TextAppearance.StatusBar.IntruderAlert" diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java index f9347b1..4f080d5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java @@ -165,8 +165,10 @@ class CommandQueue extends IStatusBar.Stub { break; } case OP_REMOVE_ICON: - mList.removeIcon(index); - mCallbacks.removeIcon(mList.getSlot(index), index, viewIndex); + if (mList.getIcon(index) != null) { + mList.removeIcon(index); + mCallbacks.removeIcon(mList.getSlot(index), index, viewIndex); + } break; } break; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java index d98bd7d..0ca0572 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java @@ -22,6 +22,7 @@ import android.content.res.Resources; import android.graphics.drawable.Drawable; import android.graphics.Canvas; import android.util.Slog; +import android.util.Log; import android.view.ViewDebug; import android.widget.FrameLayout; @@ -124,4 +125,10 @@ public class StatusBarIconView extends AnimatedImageView { public StatusBarIcon getStatusBarIcon() { return mIcon; } + + protected void debug(int depth) { + super.debug(depth); + Log.d("View", debugIndent(depth) + "slot=" + mSlot); + Log.d("View", debugIndent(depth) + "icon=" + mIcon); + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java index 7ccf210..0309430 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java @@ -711,21 +711,20 @@ public class StatusBarPolicy { ConnectivityManager.EXTRA_NETWORK_INFO)); int connectionStatus = intent.getIntExtra(ConnectivityManager.EXTRA_INET_CONDITION, 0); Slog.d(TAG, "got CONNECTIVITY_ACTION - info=" + info + ", status = " + connectionStatus); - if (info.isConnected() == false) return; + + int inetCondition = (connectionStatus > INET_CONDITION_THRESHOLD ? 1 : 0); switch (info.getType()) { case ConnectivityManager.TYPE_MOBILE: - if (info.isConnected()) { - updateDataNetType(info.getSubtype(), connectionStatus); - updateDataIcon(); - updateSignalStrength(); // apply any change in connectionStatus - } + mInetCondition = inetCondition; + updateDataNetType(info.getSubtype()); + updateDataIcon(); + updateSignalStrength(); // apply any change in connectionStatus break; case ConnectivityManager.TYPE_WIFI: + mInetCondition = inetCondition; if (info.isConnected()) { mIsWifiConnected = true; - mInetCondition = - (connectionStatus > INET_CONDITION_THRESHOLD ? 1 : 0); int iconId; if (mLastWifiSignalLevel == -1) { iconId = sWifiSignalImages[mInetCondition][0]; @@ -738,7 +737,6 @@ public class StatusBarPolicy { } else { mLastWifiSignalLevel = -1; mIsWifiConnected = false; - mInetCondition = 0; int iconId = sWifiSignalImages[0][0]; mService.setIcon("wifi", iconId, 0); @@ -777,9 +775,8 @@ public class StatusBarPolicy { @Override public void onDataConnectionStateChanged(int state, int networkType) { mDataState = state; - updateDataNetType(networkType, 0); + updateDataNetType(networkType); updateDataIcon(); - updateSignalStrength(); // apply the change in connection status } @Override @@ -847,7 +844,7 @@ public class StatusBarPolicy { int[] iconList; // Display signal strength while in "emergency calls only" mode - if (!hasService() && !mServiceState.isEmergencyOnly()) { + if (mServiceState == null || (!hasService() && !mServiceState.isEmergencyOnly())) { //Slog.d(TAG, "updateSignalStrength: no service"); if (Settings.System.getInt(mContext.getContentResolver(), Settings.System.AIRPLANE_MODE_ON, 0) == 1) { @@ -940,8 +937,7 @@ public class StatusBarPolicy { return (levelEvdoDbm < levelEvdoSnr) ? levelEvdoDbm : levelEvdoSnr; } - private final void updateDataNetType(int net, int inetCondition) { - mInetCondition = (inetCondition > INET_CONDITION_THRESHOLD ? 1 : 0); + private final void updateDataNetType(int net) { switch (net) { case TelephonyManager.NETWORK_TYPE_EDGE: mDataIconList = sDataNetType_e[mInetCondition]; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java index af736aa..ea54656 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java @@ -82,6 +82,7 @@ import com.android.systemui.statusbar.policy.StatusBarPolicy; public class StatusBarService extends Service implements CommandQueue.Callbacks { static final String TAG = "StatusBarService"; + static final boolean SPEW_ICONS = false; static final boolean SPEW = false; public static final String ACTION_STATUSBAR_START @@ -346,8 +347,10 @@ public class StatusBarService extends Service implements CommandQueue.Callbacks } public void addIcon(String slot, int index, int viewIndex, StatusBarIcon icon) { - if (SPEW) Slog.d(TAG, "addIcon slot=" + slot + " index=" + index + " viewIndex=" + viewIndex - + " icon=" + icon); + if (SPEW_ICONS) { + Slog.d(TAG, "addIcon slot=" + slot + " index=" + index + " viewIndex=" + viewIndex + + " icon=" + icon); + } StatusBarIconView view = new StatusBarIconView(this, slot); view.set(icon); mStatusIcons.addView(view, viewIndex, new LinearLayout.LayoutParams(mIconSize, mIconSize)); @@ -355,14 +358,18 @@ public class StatusBarService extends Service implements CommandQueue.Callbacks public void updateIcon(String slot, int index, int viewIndex, StatusBarIcon old, StatusBarIcon icon) { - if (SPEW) Slog.d(TAG, "updateIcon slot=" + slot + " index=" + index + " viewIndex=" + viewIndex - + " old=" + old + " icon=" + icon); + if (SPEW_ICONS) { + Slog.d(TAG, "updateIcon slot=" + slot + " index=" + index + " viewIndex=" + viewIndex + + " old=" + old + " icon=" + icon); + } StatusBarIconView view = (StatusBarIconView)mStatusIcons.getChildAt(viewIndex); view.set(icon); } public void removeIcon(String slot, int index, int viewIndex) { - if (SPEW) Slog.d(TAG, "removeIcon slot=" + slot + " index=" + index + " viewIndex=" + viewIndex); + if (SPEW_ICONS) { + Slog.d(TAG, "removeIcon slot=" + slot + " index=" + index + " viewIndex=" + viewIndex); + } mStatusIcons.removeViewAt(viewIndex); } @@ -1175,50 +1182,17 @@ public class StatusBarService extends Service implements CommandQueue.Callbacks + " scroll " + mScrollView.getScrollX() + "," + mScrollView.getScrollY()); pw.println("mNotificationLinearLayout: " + viewInfo(mNotificationLinearLayout)); } - /* - synchronized (mNotificationData) { - int N = mNotificationData.ongoingCount(); - pw.println(" ongoingCount.size=" + N); - for (int i=0; i<N; i++) { - StatusBarNotification n = mNotificationData.getOngoing(i); - pw.println(" [" + i + "] key=" + n.key + " view=" + n.view); - pw.println(" data=" + n.data); - } - N = mNotificationData.latestCount(); - pw.println(" ongoingCount.size=" + N); - for (int i=0; i<N; i++) { - StatusBarNotification n = mNotificationData.getLatest(i); - pw.println(" [" + i + "] key=" + n.key + " view=" + n.view); - pw.println(" data=" + n.data); - } - } - */ - if (false) { - pw.println("see the logcat for a dump of the views we have created."); + if (true) { // must happen on ui thread mHandler.post(new Runnable() { public void run() { - mStatusBarView.getLocationOnScreen(mAbsPos); - Slog.d(TAG, "mStatusBarView: ----- (" + mAbsPos[0] + "," + mAbsPos[1] - + ") " + mStatusBarView.getWidth() + "x" - + mStatusBarView.getHeight()); - mStatusBarView.debug(); - - mExpandedView.getLocationOnScreen(mAbsPos); - Slog.d(TAG, "mExpandedView: ----- (" + mAbsPos[0] + "," + mAbsPos[1] - + ") " + mExpandedView.getWidth() + "x" - + mExpandedView.getHeight()); - mExpandedView.debug(); - - mTrackingView.getLocationOnScreen(mAbsPos); - Slog.d(TAG, "mTrackingView: ----- (" + mAbsPos[0] + "," + mAbsPos[1] - + ") " + mTrackingView.getWidth() + "x" - + mTrackingView.getHeight()); - mTrackingView.debug(); + Slog.d(TAG, "mStatusIcons:"); + mStatusIcons.debug(); } }); } + } void onBarViewAttached() { @@ -1534,4 +1508,3 @@ public class StatusBarService extends Service implements CommandQueue.Callbacks } }; } - diff --git a/packages/SystemUI/src/com/android/systemui/usb/UsbStorageActivity.java b/packages/SystemUI/src/com/android/systemui/usb/UsbStorageActivity.java index 55d31ec..29df28e 100644 --- a/packages/SystemUI/src/com/android/systemui/usb/UsbStorageActivity.java +++ b/packages/SystemUI/src/com/android/systemui/usb/UsbStorageActivity.java @@ -30,6 +30,7 @@ import android.content.DialogInterface.OnCancelListener; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; +import android.hardware.Usb; import android.os.Bundle; import android.os.Environment; import android.os.Handler; @@ -70,11 +71,11 @@ public class UsbStorageActivity extends Activity static final boolean localLOGV = false; /** Used to detect when the USB cable is unplugged, so we can call finish() */ - private BroadcastReceiver mBatteryReceiver = new BroadcastReceiver() { + private BroadcastReceiver mUsbStateReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { - if (intent.getAction() == Intent.ACTION_BATTERY_CHANGED) { - handleBatteryChanged(intent); + if (intent.getAction().equals(Usb.ACTION_USB_STATE)) { + handleUsbStateChanged(intent); } } }; @@ -139,7 +140,7 @@ public class UsbStorageActivity extends Activity super.onResume(); mStorageManager.registerListener(mStorageListener); - registerReceiver(mBatteryReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED)); + registerReceiver(mUsbStateReceiver, new IntentFilter(Usb.ACTION_USB_STATE)); try { switchDisplay(mStorageManager.isUsbMassStorageEnabled()); } catch (Exception ex) { @@ -151,15 +152,15 @@ public class UsbStorageActivity extends Activity protected void onPause() { super.onPause(); - unregisterReceiver(mBatteryReceiver); + unregisterReceiver(mUsbStateReceiver); if (mStorageManager == null && mStorageListener != null) { mStorageManager.unregisterListener(mStorageListener); } } - private void handleBatteryChanged(Intent intent) { - int pluggedType = intent.getIntExtra("plugged", 0); - if (pluggedType == 0) { + private void handleUsbStateChanged(Intent intent) { + boolean connected = intent.getExtras().getBoolean(Usb.USB_CONNECTED); + if (!connected) { // It was disconnected from the plug, so finish finish(); } diff --git a/packages/VpnServices/res/values-fr/strings.xml b/packages/VpnServices/res/values-fr/strings.xml index 80fefa4..69ba34b 100644 --- a/packages/VpnServices/res/values-fr/strings.xml +++ b/packages/VpnServices/res/values-fr/strings.xml @@ -2,7 +2,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="4589592829302498102">"Services VPN"</string> - <string name="vpn_notification_title_connected" msgid="8598654486956133580">"VPN \n<xliff:g id="PROFILENAME">%s</xliff:g> connecté"</string> + <string name="vpn_notification_title_connected" msgid="8598654486956133580">"VPN <xliff:g id="PROFILENAME">%s</xliff:g> connecté"</string> <string name="vpn_notification_title_disconnected" msgid="6216572264382192027">"VPN <xliff:g id="PROFILENAME">%s</xliff:g> déconnecté"</string> <string name="vpn_notification_hint_disconnected" msgid="1952209867082269429">"Touchez l\'écran pour vous reconnecter à un VPN."</string> </resources> |
