diff options
author | Adam Cohen <adamcohen@google.com> | 2012-10-24 19:25:44 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2012-10-26 16:10:51 -0700 |
commit | 9ec871def38079691085a16862c234b98de99362 (patch) | |
tree | 4bd39ac3c2bc9df66bac64da87bc047f7e3e4338 /core/res | |
parent | d3d523da9a9906beb78c1fd9fa90dac7ea10e5ad (diff) | |
download | frameworks_base-9ec871def38079691085a16862c234b98de99362.tar.gz frameworks_base-9ec871def38079691085a16862c234b98de99362.tar.bz2 frameworks_base-9ec871def38079691085a16862c234b98de99362.zip |
3D carousel initial stab -- paging outlines / alpha effects pending design
Change-Id: I2d9851472472a0affa9b46b2508fc7a1cb8c9779
Diffstat (limited to 'core/res')
-rw-r--r-- | core/res/res/layout-land/keyguard_host_view.xml | 14 | ||||
-rw-r--r-- | core/res/res/layout-land/keyguard_widget_pager.xml | 31 | ||||
-rw-r--r-- | core/res/res/layout-port/keyguard_host_view.xml | 7 | ||||
-rw-r--r-- | core/res/res/layout-port/keyguard_widget_pager.xml (renamed from core/res/res/layout/keyguard_widget_pager.xml) | 0 | ||||
-rw-r--r-- | core/res/res/layout-sw600dp-port/keyguard_host_view.xml | 13 | ||||
-rw-r--r-- | core/res/res/values-sw600dp/integers.xml | 21 | ||||
-rw-r--r-- | core/res/res/values/integers.xml | 1 | ||||
-rw-r--r-- | core/res/res/values/symbols.xml | 1 |
8 files changed, 72 insertions, 16 deletions
diff --git a/core/res/res/layout-land/keyguard_host_view.xml b/core/res/res/layout-land/keyguard_host_view.xml index 980f6990b1a..bb455bdecbb 100644 --- a/core/res/res/layout-land/keyguard_host_view.xml +++ b/core/res/res/layout-land/keyguard_host_view.xml @@ -34,13 +34,13 @@ android:clipChildren="false"> <include layout="@layout/keyguard_widget_pager" - android:layout_width="match_parent" - android:layout_height="match_parent" - androidprv:layout_centerWithinArea="0.55" - androidprv:layout_childType="widget" - androidprv:layout_maxWidth="480dp" - androidprv:layout_maxHeight="480dp" /> - + android:id="@+id/app_widget_container" + android:layout_width="match_parent" + android:layout_height="match_parent" + androidprv:layout_centerWithinArea="0.55" + androidprv:layout_childType="widget" + androidprv:layout_maxWidth="480dp" + androidprv:layout_maxHeight="480dp" /> <include layout="@layout/keyguard_multi_user_selector"/> <View android:layout_width="match_parent" diff --git a/core/res/res/layout-land/keyguard_widget_pager.xml b/core/res/res/layout-land/keyguard_widget_pager.xml new file mode 100644 index 00000000000..8b7b9a3fabc --- /dev/null +++ b/core/res/res/layout-land/keyguard_widget_pager.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +** +** Copyright 2012, 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. +*/ +--> + +<!-- This is the selector widget that allows the user to select an action. --> +<com.android.internal.policy.impl.keyguard.KeyguardWidgetCarousel + xmlns:androidprv="http://schemas.android.com/apk/res/android" + xmlns:android="http://schemas.android.com/apk/res/android" + android:paddingLeft="25dp" + android:paddingRight="25dp" + android:paddingTop="25dp" + android:paddingBottom="25dp" + android:clipChildren="false" + android:clipToPadding="false" + androidprv:pageSpacing="10dp"> +</com.android.internal.policy.impl.keyguard.KeyguardWidgetCarousel> diff --git a/core/res/res/layout-port/keyguard_host_view.xml b/core/res/res/layout-port/keyguard_host_view.xml index ccc1692861a..15e98444309 100644 --- a/core/res/res/layout-port/keyguard_host_view.xml +++ b/core/res/res/layout-port/keyguard_host_view.xml @@ -39,9 +39,10 @@ android:layout_width="match_parent" android:layout_height="match_parent"> <include layout="@layout/keyguard_widget_pager" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center"/> + android:id="@+id/app_widget_container" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center"/> </FrameLayout> <View android:layout_width="match_parent" diff --git a/core/res/res/layout/keyguard_widget_pager.xml b/core/res/res/layout-port/keyguard_widget_pager.xml index 6662f83ce62..6662f83ce62 100644 --- a/core/res/res/layout/keyguard_widget_pager.xml +++ b/core/res/res/layout-port/keyguard_widget_pager.xml diff --git a/core/res/res/layout-sw600dp-port/keyguard_host_view.xml b/core/res/res/layout-sw600dp-port/keyguard_host_view.xml index 9e5fc484ef1..3953c95139e 100644 --- a/core/res/res/layout-sw600dp-port/keyguard_host_view.xml +++ b/core/res/res/layout-sw600dp-port/keyguard_host_view.xml @@ -35,12 +35,13 @@ android:orientation="vertical"> <include layout="@layout/keyguard_widget_pager" - android:layout_width="match_parent" - android:layout_height="match_parent" - androidprv:layout_centerWithinArea="0.55" - androidprv:layout_childType="widget" - androidprv:layout_maxWidth="480dp" - androidprv:layout_maxHeight="480dp" /> + android:id="@+id/app_widget_container" + android:layout_width="match_parent" + android:layout_height="match_parent" + androidprv:layout_centerWithinArea="0.55" + androidprv:layout_childType="widget" + androidprv:layout_maxWidth="480dp" + androidprv:layout_maxHeight="480dp" /> <include layout="@layout/keyguard_multi_user_selector"/> diff --git a/core/res/res/values-sw600dp/integers.xml b/core/res/res/values-sw600dp/integers.xml new file mode 100644 index 00000000000..de9829c2cf9 --- /dev/null +++ b/core/res/res/values-sw600dp/integers.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2012, 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. +*/ +--> +<resources> + <integer name="kg_carousel_angle">60</integer> +</resources> diff --git a/core/res/res/values/integers.xml b/core/res/res/values/integers.xml index 6d49a91e4d2..91ad5d8eecf 100644 --- a/core/res/res/values/integers.xml +++ b/core/res/res/values/integers.xml @@ -17,6 +17,7 @@ */ --> <resources> + <integer name="kg_carousel_angle">75</integer> <integer name="kg_security_flip_duration">75</integer> <integer name="kg_security_fade_duration">75</integer> </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index f518e7f3d87..538356d7643 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1334,6 +1334,7 @@ <java-symbol type="integer" name="config_lidOpenRotation" /> <java-symbol type="integer" name="config_longPressOnHomeBehavior" /> <java-symbol type="integer" name="kg_security_flip_duration" /> + <java-symbol type="integer" name="kg_carousel_angle" /> <java-symbol type="layout" name="global_actions_item" /> <java-symbol type="layout" name="global_actions_silent_mode" /> <java-symbol type="layout" name="keyguard_screen_glogin_unlock" /> |