diff options
| author | Adrian Roos <roosa@google.com> | 2014-05-26 20:54:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-26 20:54:13 +0000 |
| commit | 41b170d6066cb52bb3e396c608b01f2981b95e5d (patch) | |
| tree | becbc8ba0aa1008b3ab0fd37abc91bdfbe5cc15b /packages/SystemUI/res/layout | |
| parent | 7c1d454da1f052c634c6a95ed3805be34d322765 (diff) | |
| parent | cde52d77ebfee9229fa39cc0d8a0e6ad0c839212 (diff) | |
| download | frameworks_base-41b170d6066cb52bb3e396c608b01f2981b95e5d.zip frameworks_base-41b170d6066cb52bb3e396c608b01f2981b95e5d.tar.gz frameworks_base-41b170d6066cb52bb3e396c608b01f2981b95e5d.tar.bz2 | |
Merge "Replace KeyButtonView's custom glow with Quantum Ripple" into lmp-preview-dev
Diffstat (limited to 'packages/SystemUI/res/layout')
| -rw-r--r-- | packages/SystemUI/res/layout/keyguard_bottom_area.xml | 4 | ||||
| -rw-r--r-- | packages/SystemUI/res/layout/navigation_bar.xml | 20 |
2 files changed, 11 insertions, 13 deletions
diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml index 21e5390..936f73b 100644 --- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml +++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml @@ -31,7 +31,6 @@ android:src="@drawable/ic_camera_alt_24dp" android:scaleType="center" android:contentDescription="@string/accessibility_camera_button" - systemui:glowBackground="@drawable/ic_sysbar_highlight_land" systemui:swipeDirection="start"/> <com.android.systemui.statusbar.phone.SwipeAffordanceView @@ -43,7 +42,6 @@ android:src="@drawable/ic_phone_24dp" android:scaleType="center" android:contentDescription="@string/accessibility_phone_button" - systemui:glowBackground="@drawable/ic_sysbar_highlight_land" systemui:swipeDirection="end"/> <com.android.systemui.statusbar.phone.KeyguardIndicationTextView @@ -67,4 +65,4 @@ android:layerType="hardware" android:tint="#ffffffff"/> -</com.android.systemui.statusbar.phone.KeyguardBottomAreaView>
\ No newline at end of file +</com.android.systemui.statusbar.phone.KeyguardBottomAreaView> diff --git a/packages/SystemUI/res/layout/navigation_bar.xml b/packages/SystemUI/res/layout/navigation_bar.xml index 7470409..fa6f7f5 100644 --- a/packages/SystemUI/res/layout/navigation_bar.xml +++ b/packages/SystemUI/res/layout/navigation_bar.xml @@ -55,7 +55,7 @@ systemui:keyCode="4" android:layout_weight="0" android:scaleType="center" - systemui:glowBackground="@drawable/ic_sysbar_highlight" + android:background="@drawable/ripple_drawable" android:contentDescription="@string/accessibility_back" /> <View @@ -71,7 +71,7 @@ systemui:keyCode="3" systemui:keyRepeat="false" android:layout_weight="0" - systemui:glowBackground="@drawable/ic_sysbar_highlight" + android:background="@drawable/ripple_drawable" android:contentDescription="@string/accessibility_home" /> <View @@ -85,7 +85,7 @@ android:layout_height="match_parent" android:src="@drawable/ic_sysbar_recent" android:layout_weight="0" - systemui:glowBackground="@drawable/ic_sysbar_highlight" + android:background="@drawable/ripple_drawable" android:contentDescription="@string/accessibility_recent" /> <FrameLayout @@ -99,7 +99,7 @@ android:contentDescription="@string/accessibility_menu" android:src="@drawable/ic_sysbar_menu" android:visibility="invisible" - systemui:glowBackground="@drawable/ic_sysbar_highlight" + android:background="@drawable/ripple_drawable" systemui:keyCode="82" /> <com.android.systemui.statusbar.policy.KeyButtonView @@ -110,7 +110,7 @@ android:scaleType="centerInside" android:src="@drawable/ic_ime_switcher_default" android:visibility="invisible" - systemui:glowBackground="@drawable/ic_sysbar_highlight" /> + android:background="@drawable/ripple_drawable" /> </FrameLayout> </LinearLayout> @@ -219,7 +219,7 @@ android:scaleType="centerInside" android:src="@drawable/ic_ime_switcher_default" android:visibility="invisible" - systemui:glowBackground="@drawable/ic_sysbar_highlight" /> + android:background="@drawable/ripple_drawable" /> <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/menu" @@ -228,7 +228,7 @@ android:contentDescription="@string/accessibility_menu" android:src="@drawable/ic_sysbar_menu_land" android:visibility="invisible" - systemui:glowBackground="@drawable/ic_sysbar_highlight_land" + android:background="@drawable/ripple_drawable" systemui:keyCode="82" /> </FrameLayout> @@ -238,7 +238,7 @@ android:src="@drawable/ic_sysbar_recent_land" android:layout_weight="0" android:contentDescription="@string/accessibility_recent" - systemui:glowBackground="@drawable/ic_sysbar_highlight_land" + android:background="@drawable/ripple_drawable" /> <View android:layout_height="match_parent" @@ -254,7 +254,7 @@ systemui:keyRepeat="false" android:layout_weight="0" android:contentDescription="@string/accessibility_home" - systemui:glowBackground="@drawable/ic_sysbar_highlight_land" + android:background="@drawable/ripple_drawable" /> <View android:layout_height="match_parent" @@ -270,7 +270,7 @@ systemui:keyCode="4" android:layout_weight="0" android:contentDescription="@string/accessibility_back" - systemui:glowBackground="@drawable/ic_sysbar_highlight_land" + android:background="@drawable/ripple_drawable" /> <View android:layout_height="40dp" |