diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-09-10 17:31:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-10 17:31:47 +0000 |
| commit | 6e85b712c5a1fc69fa0563f7b53a7281b025741d (patch) | |
| tree | 45e6589dc08a552f5600423aad116a7b5d3e51ea /packages/Keyguard | |
| parent | d75df5fc3a02c5754ac260e0425292f8eab08b0d (diff) | |
| parent | 1145748e5e00be816b9b555a31b55c8b59b8d9cd (diff) | |
| download | frameworks_base-6e85b712c5a1fc69fa0563f7b53a7281b025741d.zip frameworks_base-6e85b712c5a1fc69fa0563f7b53a7281b025741d.tar.gz frameworks_base-6e85b712c5a1fc69fa0563f7b53a7281b025741d.tar.bz2 | |
am bf763e77: Merge "Remove some overdraw in Keyguard" into lmp-dev
* commit 'bf763e77177f172dcb1d7590dd1855d53ff0d2e5':
Remove some overdraw in Keyguard
Diffstat (limited to 'packages/Keyguard')
| -rw-r--r-- | packages/Keyguard/res/drawable-hdpi/kg_bouncer_bg_white.9.png | bin | 546 -> 0 bytes | |||
| -rw-r--r-- | packages/Keyguard/res/drawable-mdpi/kg_bouncer_bg_white.9.png | bin | 397 -> 0 bytes | |||
| -rw-r--r-- | packages/Keyguard/res/drawable-xhdpi/kg_bouncer_bg_white.9.png | bin | 775 -> 0 bytes | |||
| -rw-r--r-- | packages/Keyguard/res/layout/keyguard_face_unlock_view.xml | 1 | ||||
| -rw-r--r-- | packages/Keyguard/res/layout/keyguard_password_view.xml | 1 | ||||
| -rw-r--r-- | packages/Keyguard/res/layout/keyguard_pattern_view.xml | 1 | ||||
| -rw-r--r-- | packages/Keyguard/res/layout/keyguard_selector_view.xml | 3 |
7 files changed, 1 insertions, 5 deletions
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 Binary files differdeleted file mode 100644 index cfd5db3..0000000 --- a/packages/Keyguard/res/drawable-hdpi/kg_bouncer_bg_white.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index e3cb6db..0000000 --- a/packages/Keyguard/res/drawable-mdpi/kg_bouncer_bg_white.9.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index b9e30e2..0000000 --- a/packages/Keyguard/res/drawable-xhdpi/kg_bouncer_bg_white.9.png +++ /dev/null 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" /> |
