diff options
author | Selim Cinek <cinek@google.com> | 2014-07-24 15:31:05 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-24 15:31:05 +0000 |
commit | e587677d42a0ca046bbf13c38d1d7ed71918529c (patch) | |
tree | 979b2959c77de7e8bb9ee11a22c49c67b60aa65f /packages/SystemUI/res | |
parent | 085951fd70f72761c538bd95e48f24ebfb86b133 (diff) | |
parent | baa23274596246d03741457701ac515a73aa8818 (diff) | |
download | frameworks_base-e587677d42a0ca046bbf13c38d1d7ed71918529c.zip frameworks_base-e587677d42a0ca046bbf13c38d1d7ed71918529c.tar.gz frameworks_base-e587677d42a0ca046bbf13c38d1d7ed71918529c.tar.bz2 |
am 13476f4d: Implemented new camera affordance
* commit '13476f4d7832a2075c99d14217a3f5f47d14bd65':
Implemented new camera affordance
Diffstat (limited to 'packages/SystemUI/res')
-rw-r--r-- | packages/SystemUI/res/drawable/ic_chevron_left.xml | 28 | ||||
-rw-r--r-- | packages/SystemUI/res/layout/keyguard_bottom_area.xml | 6 | ||||
-rw-r--r-- | packages/SystemUI/res/values/dimens.xml | 12 |
3 files changed, 40 insertions, 6 deletions
diff --git a/packages/SystemUI/res/drawable/ic_chevron_left.xml b/packages/SystemUI/res/drawable/ic_chevron_left.xml new file mode 100644 index 0000000..27c2034 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_chevron_left.xml @@ -0,0 +1,28 @@ +<!-- + ~ Copyright (C) 2014 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> +<vector xmlns:android="http://schemas.android.com/apk/res/android" > + <size + android:width="24dp" + android:height="24dp"/> + + <viewport + android:viewportWidth="36.0" + android:viewportHeight="36.0"/> + + <path + android:fill="#ffffffff" + android:pathData="M23.1,11.1l-2.1000004,-2.1000004 -9.0,9.0 9.0,9.0 2.1000004,-2.1000004 -6.8999996,-6.8999996z"/> +</vector> diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml index db5983b..42fb740 100644 --- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml +++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml @@ -22,7 +22,7 @@ android:layout_height="match_parent" android:layout_width="match_parent" > - <com.android.systemui.statusbar.AlphaImageView + <com.android.systemui.statusbar.KeyguardAffordanceView android:id="@+id/camera_button" android:layout_height="64dp" android:layout_width="64dp" @@ -32,7 +32,7 @@ android:scaleType="center" android:contentDescription="@string/accessibility_camera_button" /> - <com.android.systemui.statusbar.AlphaImageView + <com.android.systemui.statusbar.KeyguardAffordanceView android:id="@+id/phone_button" android:layout_height="64dp" android:layout_width="64dp" @@ -52,7 +52,7 @@ android:textColor="#ffffff" android:textAppearance="?android:attr/textAppearanceSmall"/> - <com.android.systemui.statusbar.AlphaImageView + <com.android.systemui.statusbar.KeyguardAffordanceView android:id="@+id/lock_icon" android:layout_width="64dp" android:layout_height="64dp" diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 9bc2b0d..4e536e4 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -295,6 +295,15 @@ <!-- The minimum amount the user needs to swipe to go to the camera / phone. --> <dimen name="keyguard_min_swipe_amount">75dp</dimen> + <!-- The minimum background radius when swiping to a side for the camera / phone affordances. --> + <dimen name="keyguard_affordance_min_background_radius">30dp</dimen> + + <!-- The grow amount for the camera and phone circles when hinting --> + <dimen name="hint_grow_amount_sideways">60dp</dimen> + + <!-- The chevron padding to the circle when hinting --> + <dimen name="hint_chevron_circle_padding">16dp</dimen> + <!-- Volume panel dialog y offset --> <dimen name="volume_panel_top">0dp</dimen> @@ -317,9 +326,6 @@ <!-- Move distance for the unlock hint animation on the lockscreen --> <dimen name="hint_move_distance">75dp</dimen> - <!-- Move distance for the other hint animations on the lockscreen (phone, camera)--> - <dimen name="hint_move_distance_sideways">60dp</dimen> - <!-- The width of the region on the left/right edge of the screen for performing the camera/ phone hints. --> <dimen name="edge_tap_area_width">48dp</dimen> |