| commit | 1145748e5e00be816b9b555a31b55c8b59b8d9cd | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Wed Sep 10 17:22:51 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Sep 10 17:22:53 2014 +0000 |
| tree | a834b287bce20e3a6efe5268358217de3c891173 | |
| parent | ebd858940634c7d7e51782a9e8c3e8ab44806762 [diff] | |
| parent | 53251ed4ac621b7c403a9d489465117c52a7d53d [diff] |
Merge "Remove some overdraw in Keyguard" into lmp-dev
diff --git a/packages/Keyguard/res/drawable-hdpi/kg_bouncer_bg_white.9.png b/packages/Keyguard/res/drawable-hdpi/kg_bouncer_bg_white.9.png deleted file mode 100644 index cfd5db3..0000000 --- a/packages/Keyguard/res/drawable-hdpi/kg_bouncer_bg_white.9.png +++ /dev/null Binary files differ
diff --git a/packages/Keyguard/res/drawable-mdpi/kg_bouncer_bg_white.9.png b/packages/Keyguard/res/drawable-mdpi/kg_bouncer_bg_white.9.png deleted file mode 100644 index e3cb6db..0000000 --- a/packages/Keyguard/res/drawable-mdpi/kg_bouncer_bg_white.9.png +++ /dev/null Binary files differ
diff --git a/packages/Keyguard/res/drawable-xhdpi/kg_bouncer_bg_white.9.png b/packages/Keyguard/res/drawable-xhdpi/kg_bouncer_bg_white.9.png deleted file mode 100644 index b9e30e2..0000000 --- a/packages/Keyguard/res/drawable-xhdpi/kg_bouncer_bg_white.9.png +++ /dev/null Binary files differ
diff --git a/packages/Keyguard/res/layout/keyguard_face_unlock_view.xml b/packages/Keyguard/res/layout/keyguard_face_unlock_view.xml index 8c8ec7a..0c85dab 100644 --- a/packages/Keyguard/res/layout/keyguard_face_unlock_view.xml +++ b/packages/Keyguard/res/layout/keyguard_face_unlock_view.xml
@@ -36,7 +36,6 @@ <FrameLayout android:id="@+id/keyguard_bouncer_frame" - android:background="@drawable/kg_bouncer_bg_white" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1"
diff --git a/packages/Keyguard/res/layout/keyguard_password_view.xml b/packages/Keyguard/res/layout/keyguard_password_view.xml index 9e886f2..b7d5d30 100644 --- a/packages/Keyguard/res/layout/keyguard_password_view.xml +++ b/packages/Keyguard/res/layout/keyguard_password_view.xml
@@ -42,7 +42,6 @@ <!-- Password entry field --> <FrameLayout android:id="@+id/keyguard_bouncer_frame" - android:background="@drawable/kg_bouncer_bg_white" android:layout_height="wrap_content" android:layout_width="280dp" android:layout_gravity="center_horizontal"
diff --git a/packages/Keyguard/res/layout/keyguard_pattern_view.xml b/packages/Keyguard/res/layout/keyguard_pattern_view.xml index a126465..bd585b5 100644 --- a/packages/Keyguard/res/layout/keyguard_pattern_view.xml +++ b/packages/Keyguard/res/layout/keyguard_pattern_view.xml
@@ -49,7 +49,6 @@ <FrameLayout android:id="@+id/keyguard_bouncer_frame" - android:background="@drawable/kg_bouncer_bg_white" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1"
diff --git a/packages/Keyguard/res/layout/keyguard_selector_view.xml b/packages/Keyguard/res/layout/keyguard_selector_view.xml index d3064ed..5330363 100644 --- a/packages/Keyguard/res/layout/keyguard_selector_view.xml +++ b/packages/Keyguard/res/layout/keyguard_selector_view.xml
@@ -48,8 +48,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" - android:background="@drawable/kg_bouncer_bg_white"/> + android:layout_marginRight="16dp"/> <include layout="@layout/keyguard_glow_pad_container" />
