Merge "Avoid NPE when installing app update." into jb-mr1-dev
diff --git a/res/drawable-hdpi/avatar_default_1.png b/res/drawable-hdpi/avatar_default_1.png
new file mode 100644
index 0000000..39ffd73
--- /dev/null
+++ b/res/drawable-hdpi/avatar_default_1.png
Binary files differ
diff --git a/res/drawable-hdpi/avatar_default_2.png b/res/drawable-hdpi/avatar_default_2.png
new file mode 100644
index 0000000..79203c5
--- /dev/null
+++ b/res/drawable-hdpi/avatar_default_2.png
Binary files differ
diff --git a/res/drawable-hdpi/avatar_default_3.png b/res/drawable-hdpi/avatar_default_3.png
new file mode 100644
index 0000000..4d179b3
--- /dev/null
+++ b/res/drawable-hdpi/avatar_default_3.png
Binary files differ
diff --git a/res/drawable-hdpi/avatar_default_4.png b/res/drawable-hdpi/avatar_default_4.png
new file mode 100644
index 0000000..1a0332f
--- /dev/null
+++ b/res/drawable-hdpi/avatar_default_4.png
Binary files differ
diff --git a/res/drawable-hdpi/avatar_default_5.png b/res/drawable-hdpi/avatar_default_5.png
new file mode 100644
index 0000000..2487e66
--- /dev/null
+++ b/res/drawable-hdpi/avatar_default_5.png
Binary files differ
diff --git a/res/drawable-hdpi/avatar_default_6.png b/res/drawable-hdpi/avatar_default_6.png
new file mode 100644
index 0000000..f57e1eb
--- /dev/null
+++ b/res/drawable-hdpi/avatar_default_6.png
Binary files differ
diff --git a/res/drawable-hdpi/avatar_default_7.png b/res/drawable-hdpi/avatar_default_7.png
new file mode 100644
index 0000000..dc4b2ce
--- /dev/null
+++ b/res/drawable-hdpi/avatar_default_7.png
Binary files differ
diff --git a/res/drawable-hdpi/avatar_default_8.png b/res/drawable-hdpi/avatar_default_8.png
new file mode 100644
index 0000000..64e7936
--- /dev/null
+++ b/res/drawable-hdpi/avatar_default_8.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_multiuser.png b/res/drawable-hdpi/ic_settings_multiuser.png
new file mode 100644
index 0000000..74af8ae0
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_multiuser.png
Binary files differ
diff --git a/res/drawable-mdpi/avatar_default_1.png b/res/drawable-mdpi/avatar_default_1.png
new file mode 100644
index 0000000..0d8e3a2
--- /dev/null
+++ b/res/drawable-mdpi/avatar_default_1.png
Binary files differ
diff --git a/res/drawable-mdpi/avatar_default_2.png b/res/drawable-mdpi/avatar_default_2.png
new file mode 100644
index 0000000..0cc4c3d
--- /dev/null
+++ b/res/drawable-mdpi/avatar_default_2.png
Binary files differ
diff --git a/res/drawable-mdpi/avatar_default_3.png b/res/drawable-mdpi/avatar_default_3.png
new file mode 100644
index 0000000..c43ad6f
--- /dev/null
+++ b/res/drawable-mdpi/avatar_default_3.png
Binary files differ
diff --git a/res/drawable-mdpi/avatar_default_4.png b/res/drawable-mdpi/avatar_default_4.png
new file mode 100644
index 0000000..6906489
--- /dev/null
+++ b/res/drawable-mdpi/avatar_default_4.png
Binary files differ
diff --git a/res/drawable-mdpi/avatar_default_5.png b/res/drawable-mdpi/avatar_default_5.png
new file mode 100644
index 0000000..857f277
--- /dev/null
+++ b/res/drawable-mdpi/avatar_default_5.png
Binary files differ
diff --git a/res/drawable-mdpi/avatar_default_6.png b/res/drawable-mdpi/avatar_default_6.png
new file mode 100644
index 0000000..9d0f968
--- /dev/null
+++ b/res/drawable-mdpi/avatar_default_6.png
Binary files differ
diff --git a/res/drawable-mdpi/avatar_default_7.png b/res/drawable-mdpi/avatar_default_7.png
new file mode 100644
index 0000000..7db8864
--- /dev/null
+++ b/res/drawable-mdpi/avatar_default_7.png
Binary files differ
diff --git a/res/drawable-mdpi/avatar_default_8.png b/res/drawable-mdpi/avatar_default_8.png
new file mode 100644
index 0000000..98d67d9
--- /dev/null
+++ b/res/drawable-mdpi/avatar_default_8.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_multiuser.png b/res/drawable-mdpi/ic_settings_multiuser.png
new file mode 100644
index 0000000..758c9ec
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_multiuser.png
Binary files differ
diff --git a/res/drawable-xhdpi/avatar_default_1.png b/res/drawable-xhdpi/avatar_default_1.png
new file mode 100644
index 0000000..6caa06a
--- /dev/null
+++ b/res/drawable-xhdpi/avatar_default_1.png
Binary files differ
diff --git a/res/drawable-xhdpi/avatar_default_2.png b/res/drawable-xhdpi/avatar_default_2.png
new file mode 100644
index 0000000..faf3b15
--- /dev/null
+++ b/res/drawable-xhdpi/avatar_default_2.png
Binary files differ
diff --git a/res/drawable-xhdpi/avatar_default_3.png b/res/drawable-xhdpi/avatar_default_3.png
new file mode 100644
index 0000000..63a80ff
--- /dev/null
+++ b/res/drawable-xhdpi/avatar_default_3.png
Binary files differ
diff --git a/res/drawable-xhdpi/avatar_default_4.png b/res/drawable-xhdpi/avatar_default_4.png
new file mode 100644
index 0000000..d743dc6
--- /dev/null
+++ b/res/drawable-xhdpi/avatar_default_4.png
Binary files differ
diff --git a/res/drawable-xhdpi/avatar_default_5.png b/res/drawable-xhdpi/avatar_default_5.png
new file mode 100644
index 0000000..b7b822b
--- /dev/null
+++ b/res/drawable-xhdpi/avatar_default_5.png
Binary files differ
diff --git a/res/drawable-xhdpi/avatar_default_6.png b/res/drawable-xhdpi/avatar_default_6.png
new file mode 100644
index 0000000..f5b5e84
--- /dev/null
+++ b/res/drawable-xhdpi/avatar_default_6.png
Binary files differ
diff --git a/res/drawable-xhdpi/avatar_default_7.png b/res/drawable-xhdpi/avatar_default_7.png
new file mode 100644
index 0000000..4271c0d
--- /dev/null
+++ b/res/drawable-xhdpi/avatar_default_7.png
Binary files differ
diff --git a/res/drawable-xhdpi/avatar_default_8.png b/res/drawable-xhdpi/avatar_default_8.png
new file mode 100644
index 0000000..27261a5
--- /dev/null
+++ b/res/drawable-xhdpi/avatar_default_8.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_multiuser.png b/res/drawable-xhdpi/ic_settings_multiuser.png
new file mode 100644
index 0000000..dbf8cd4
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_multiuser.png
Binary files differ
diff --git a/res/drawable/ic_user.png b/res/drawable/ic_user.png
deleted file mode 100644
index dc4c390..0000000
--- a/res/drawable/ic_user.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/ic_user_cyan.png b/res/drawable/ic_user_cyan.png
deleted file mode 100644
index c212615..0000000
--- a/res/drawable/ic_user_cyan.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/ic_user_green.png b/res/drawable/ic_user_green.png
deleted file mode 100644
index ca09f85..0000000
--- a/res/drawable/ic_user_green.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/ic_user_orange.png b/res/drawable/ic_user_orange.png
deleted file mode 100644
index 789d892..0000000
--- a/res/drawable/ic_user_orange.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/ic_user_purple.png b/res/drawable/ic_user_purple.png
deleted file mode 100644
index b7bdeb2..0000000
--- a/res/drawable/ic_user_purple.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/ic_user_red.png b/res/drawable/ic_user_red.png
deleted file mode 100644
index c4b4e29..0000000
--- a/res/drawable/ic_user_red.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/ic_user_yellow.png b/res/drawable/ic_user_yellow.png
deleted file mode 100644
index c46838c..0000000
--- a/res/drawable/ic_user_yellow.png
+++ /dev/null
Binary files differ
diff --git a/res/layout/dream_info_row.xml b/res/layout/dream_info_row.xml
index c2d90fb..a2f81c6 100644
--- a/res/layout/dream_info_row.xml
+++ b/res/layout/dream_info_row.xml
@@ -54,7 +54,8 @@
android:ellipsize="end"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:textDirection="locale" />
+ android:textDirection="locale"
+ android:labelFor="@android:id/button2" />
<!-- Dream radio button -->
@@ -64,7 +65,9 @@
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
- android:duplicateParentState="true" />
+ android:duplicateParentState="true"
+ android:clickable="false"
+ android:focusable="false" />
</RelativeLayout>
<!-- Divider -->
@@ -90,7 +93,7 @@
android:layout_centerVertical="true"
android:layout_margin="0dip"
android:background="?android:attr/selectableItemBackground"
- android:contentDescription="@null"
+ android:contentDescription="@string/screensaver_settings_button"
android:padding="8dip"
android:src="@drawable/ic_bt_config" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0d2a983..1f94287 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1793,6 +1793,8 @@
<string name="screensaver_settings_when_to_dream">When to sleep</string>
<!-- Dream settings screen, button label to start dreaming -->
<string name="screensaver_settings_dream_start">Sleep now</string>
+ <!-- Dream settings screen, button label for settings for a specific screensaver -->
+ <string name="screensaver_settings_button">Settings</string>
<!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions -->
<string name="automatic_brightness">Automatic brightness</string>
<!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->
diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
index 6251590..05fa31f 100644
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -100,7 +100,7 @@
<!-- Manage users -->
<header
android:fragment="com.android.settings.users.UserSettings"
- android:icon="@drawable/ic_settings_sync"
+ android:icon="@drawable/ic_settings_multiuser"
android:title="@string/user_settings_title"
android:id="@+id/user_settings" />
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index bcc70bd..984ac08 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -91,12 +91,14 @@
"key_add_user_long_message_displayed";
private static final int[] USER_DRAWABLES = {
- R.drawable.ic_user_orange,
- R.drawable.ic_user_cyan,
- R.drawable.ic_user_green,
- R.drawable.ic_user_purple,
- R.drawable.ic_user_red,
- R.drawable.ic_user_yellow
+ R.drawable.avatar_default_1,
+ R.drawable.avatar_default_2,
+ R.drawable.avatar_default_3,
+ R.drawable.avatar_default_4,
+ R.drawable.avatar_default_5,
+ R.drawable.avatar_default_6,
+ R.drawable.avatar_default_7,
+ R.drawable.avatar_default_8
};
private PreferenceGroup mUserListCategory;
@@ -450,7 +452,7 @@
if (user.iconPath != null) {
if (mUserIcons.get(user.id) == null) {
missingIcons.add(user.id);
- pref.setIcon(R.drawable.ic_user);
+ pref.setIcon(R.drawable.avatar_default_1);
} else {
setPhotoId(pref, user);
}
@@ -463,7 +465,7 @@
pref.setEnabled(false);
pref.setTitle(R.string.user_new_user_name);
pref.setSummary(R.string.user_adding_new_user);
- pref.setIcon(R.drawable.ic_user);
+ pref.setIcon(R.drawable.avatar_default_1);
mUserListCategory.addPreference(pref);
}
getActivity().invalidateOptionsMenu();
