diff options
| author | Adrian Roos <roosa@google.com> | 2014-04-10 19:43:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-10 19:43:41 +0000 |
| commit | 0c5c18a2be161d3d3f778c348b6830161c637f81 (patch) | |
| tree | 0026f84d60da815215868802fee024a19a68b4b1 /packages/SystemUI/res | |
| parent | 93a03d9b2462db544fc8b585d3a7125c4d5d912e (diff) | |
| parent | 5e25caae7a440116a3ff494c9ef8ce26ee938612 (diff) | |
| download | frameworks_base-0c5c18a2be161d3d3f778c348b6830161c637f81.zip frameworks_base-0c5c18a2be161d3d3f778c348b6830161c637f81.tar.gz frameworks_base-0c5c18a2be161d3d3f778c348b6830161c637f81.tar.bz2 | |
Merge "Implement camera affordance" into master-lockscreen-dev
Diffstat (limited to 'packages/SystemUI/res')
| -rw-r--r-- | packages/SystemUI/res/layout/navigation_bar.xml | 1 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/dimens.xml | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/packages/SystemUI/res/layout/navigation_bar.xml b/packages/SystemUI/res/layout/navigation_bar.xml index 5488a87..a6fb443 100644 --- a/packages/SystemUI/res/layout/navigation_bar.xml +++ b/packages/SystemUI/res/layout/navigation_bar.xml @@ -169,6 +169,7 @@ android:scaleType="center" android:visibility="gone" android:contentDescription="@string/accessibility_camera_button" + systemui:glowBackground="@drawable/ic_sysbar_highlight_land" /> </FrameLayout> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 4f4b58b..5e7db8b 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -260,4 +260,7 @@ <!-- Width of the zen mode interstitial dialog. --> <dimen name="zen_mode_dialog_width">320dp</dimen> + + <!-- Camera affordance drag distance --> + <dimen name="camera_drag_distance">100dp</dimen> </resources> |