| commit | f129988a1aa8a210dc125b0f427d848a2aeb8bb2 | [log] [tgz] |
|---|---|---|
| author | Peter Ng <petergng@google.com> | Mon Oct 17 17:24:32 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Oct 17 17:24:32 2011 -0700 |
| tree | e47f949f242fa6352a9336e2a34965bd9d15e057 | |
| parent | e95a1190ff9e15ac0924cd7f294cf6a486e3119f [diff] | |
| parent | 730af2e3ecbda263acb44588903ef5fc3d15cfd4 [diff] |
Merge "Bullet points updated and permission colors are not orange" into ics-mr0
diff --git a/core/res/res/drawable-hdpi/ic_bullet_key_permission.png b/core/res/res/drawable-hdpi/ic_bullet_key_permission.png index 4b9bf53..4cf50ad 100644 --- a/core/res/res/drawable-hdpi/ic_bullet_key_permission.png +++ b/core/res/res/drawable-hdpi/ic_bullet_key_permission.png Binary files differ
diff --git a/core/res/res/drawable-hdpi/ic_text_dot.png b/core/res/res/drawable-hdpi/ic_text_dot.png index a7eaec5..fa69c69 100644 --- a/core/res/res/drawable-hdpi/ic_text_dot.png +++ b/core/res/res/drawable-hdpi/ic_text_dot.png Binary files differ
diff --git a/core/res/res/drawable-mdpi/ic_bullet_key_permission.png b/core/res/res/drawable-mdpi/ic_bullet_key_permission.png index 22f25ca..7fee560 100644 --- a/core/res/res/drawable-mdpi/ic_bullet_key_permission.png +++ b/core/res/res/drawable-mdpi/ic_bullet_key_permission.png Binary files differ
diff --git a/core/res/res/drawable-mdpi/ic_text_dot.png b/core/res/res/drawable-mdpi/ic_text_dot.png index 47913f6..2225bd5 100644 --- a/core/res/res/drawable-mdpi/ic_text_dot.png +++ b/core/res/res/drawable-mdpi/ic_text_dot.png Binary files differ
diff --git a/core/res/res/drawable-xhdpi/ic_bullet_key_permission.png b/core/res/res/drawable-xhdpi/ic_bullet_key_permission.png index ccbdcc3..6a0bdfc 100644 --- a/core/res/res/drawable-xhdpi/ic_bullet_key_permission.png +++ b/core/res/res/drawable-xhdpi/ic_bullet_key_permission.png Binary files differ
diff --git a/core/res/res/drawable-xhdpi/ic_text_dot.png b/core/res/res/drawable-xhdpi/ic_text_dot.png index d316f9a..869dd95 100644 --- a/core/res/res/drawable-xhdpi/ic_text_dot.png +++ b/core/res/res/drawable-xhdpi/ic_text_dot.png Binary files differ
diff --git a/core/res/res/layout/grant_credentials_permission.xml b/core/res/res/layout/grant_credentials_permission.xml index 3313590..dd85b33 100644 --- a/core/res/res/layout/grant_credentials_permission.xml +++ b/core/res/res/layout/grant_credentials_permission.xml
@@ -77,7 +77,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@color/perms_dangerous_perm_color" android:textStyle="bold" - android:paddingLeft="6dip" + android:paddingLeft="16dip" android:layout_toRightOf="@id/permission_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" /> @@ -88,7 +88,7 @@ android:textColor="@color/perms_dangerous_perm_color" android:layout_marginTop="-4dip" android:paddingBottom="8dip" - android:paddingLeft="6dip" + android:paddingLeft="16dip" android:layout_below="@id/account_type" android:layout_toRightOf="@id/permission_icon" android:layout_width="wrap_content" @@ -101,7 +101,7 @@ android:textStyle="bold" android:layout_marginTop="-4dip" android:paddingBottom="8dip" - android:paddingLeft="6dip" + android:paddingLeft="16dip" android:layout_below="@id/account_name" android:layout_toRightOf="@id/permission_icon" android:layout_width="wrap_content"
diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml index a9c603f..c37871b 100644 --- a/core/res/res/values/colors.xml +++ b/core/res/res/values/colors.xml
@@ -85,8 +85,8 @@ <color name="darker_gray">#aaa</color> <!-- For security permissions --> - <color name="perms_dangerous_grp_color">#dd6826</color> - <color name="perms_dangerous_perm_color">#dd6826</color> + <color name="perms_dangerous_grp_color">#33b5e5</color> + <color name="perms_dangerous_perm_color">#33b5e5</color> <color name="shadow">#cc222222</color> <!-- For search-related UIs -->
