diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-12-19 19:26:06 +0100 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2015-01-07 15:00:16 +0100 |
| commit | a29e81bc7f14ce9df1afb5aa5f7d571a3b441aca (patch) | |
| tree | 80738d9d0750e035427655ac0a4961d884d67063 | |
| parent | 5c60b647047f744b78f9ae1b1984a654edbda2c6 (diff) | |
| download | frameworks_base-a29e81bc7f14ce9df1afb5aa5f7d571a3b441aca.zip frameworks_base-a29e81bc7f14ce9df1afb5aa5f7d571a3b441aca.tar.gz frameworks_base-a29e81bc7f14ce9df1afb5aa5f7d571a3b441aca.tar.bz2 | |
Remove dead code #2: Remove unused Keyguard resources
Change-Id: If5e2b62556e6ee158e09e399c7ddec337dba15d5
49 files changed, 7 insertions, 1668 deletions
diff --git a/packages/Keyguard/res/anim/keyguard_action_assist_enter.xml b/packages/Keyguard/res/anim/keyguard_action_assist_enter.xml deleted file mode 100644 index f3333b7..0000000 --- a/packages/Keyguard/res/anim/keyguard_action_assist_enter.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?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. -*/ ---> - -<set xmlns:android="http://schemas.android.com/apk/res/android" - android:shareInterpolator="false" android:zAdjustment="top"> - - <alpha android:fromAlpha="0" android:toAlpha="1.0" - android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:interpolator="@android:interpolator/decelerate_cubic" - android:duration="300"/> - - <translate android:fromYDelta="100%" android:toYDelta="0" - android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:interpolator="@android:interpolator/decelerate_cubic" - android:duration="300" /> -</set> diff --git a/packages/Keyguard/res/anim/keyguard_action_assist_exit.xml b/packages/Keyguard/res/anim/keyguard_action_assist_exit.xml deleted file mode 100644 index b4ed278..0000000 --- a/packages/Keyguard/res/anim/keyguard_action_assist_exit.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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. -*/ ---> - -<translate xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@android:anim/accelerate_interpolator" - android:fromXDelta="0" android:toXDelta="0" - android:duration="300" /> diff --git a/packages/Keyguard/res/anim/lock_screen_enter.xml b/packages/Keyguard/res/anim/lock_screen_enter.xml deleted file mode 100644 index 4344cf9..0000000 --- a/packages/Keyguard/res/anim/lock_screen_enter.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 2007, 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. -*/ ---> - -<set xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@android:interpolator/accelerate_cubic"> - <alpha android:fromAlpha="0.0" android:toAlpha="1.0" - android:duration="@integer/config_activityDefaultDur" /> -</set> diff --git a/packages/Keyguard/res/anim/lock_screen_exit.xml b/packages/Keyguard/res/anim/lock_screen_exit.xml deleted file mode 100644 index c75b3cc..0000000 --- a/packages/Keyguard/res/anim/lock_screen_exit.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 2007, 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. -*/ ---> - - -<set xmlns:android="http://schemas.android.com/apk/res/android" - android:zAdjustment="top" - android:shareInterpolator="false"> - <scale - android:fromXScale="1.0" android:toXScale="1.10" - android:fromYScale="1.0" android:toYScale="1.10" - android:pivotX="50%p" android:pivotY="50%p" - android:fillEnabled="true" android:fillAfter="true" - android:interpolator="@android:interpolator/accelerate_quint" - android:duration="@android:integer/config_shortAnimTime" /> - <alpha - android:fromAlpha="1.0" android:toAlpha="0" - android:fillEnabled="true" android:fillAfter="true" - android:interpolator="@android:interpolator/accelerate_quad" - android:duration="@android:integer/config_shortAnimTime"/> -</set> diff --git a/packages/Keyguard/res/drawable/ic_lockscreen_outerring.xml b/packages/Keyguard/res/drawable/ic_lockscreen_outerring.xml deleted file mode 100644 index 75bea70..0000000 --- a/packages/Keyguard/res/drawable/ic_lockscreen_outerring.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="oval" - > - <size android:height="@dimen/keyguard_lockscreen_outerring_diameter" - android:width="@dimen/keyguard_lockscreen_outerring_diameter" /> - <solid android:color="#00000000" /> - <stroke android:color="#1affffff" android:width="2dp" /> -</shape> diff --git a/packages/Keyguard/res/layout-land/keyguard_host_view.xml b/packages/Keyguard/res/layout-land/keyguard_host_view.xml deleted file mode 100644 index 891910e..0000000 --- a/packages/Keyguard/res/layout-land/keyguard_host_view.xml +++ /dev/null @@ -1,86 +0,0 @@ -<?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 host view that generally contains two sub views: the widget view - and the security view. --> -<com.android.keyguard.KeyguardHostView - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:androidprv="http://schemas.android.com/apk/res-auto" - android:id="@+id/keyguard_host_view" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="horizontal" - android:clipChildren="false" - android:clipToPadding="false"> - - <com.android.keyguard.MultiPaneChallengeLayout - android:id="@+id/multi_pane_challenge" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="horizontal" - android:clipChildren="false" - android:clipToPadding="false"> - - <include layout="@layout/keyguard_widget_remove_drop_target" - android:id="@+id/keyguard_widget_pager_delete_target" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="top|center_horizontal" - androidprv:layout_childType="pageDeleteDropTarget" /> - - <include layout="@layout/keyguard_widget_pager" - 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" - android:layout_height="match_parent" - androidprv:layout_childType="scrim" - android:background="#99000000" /> - - <com.android.keyguard.KeyguardSecurityContainer - android:id="@+id/keyguard_security_container" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:clipChildren="false" - android:clipToPadding="false" - androidprv:layout_childType="challenge" - androidprv:layout_centerWithinArea="0.55"> - <com.android.keyguard.KeyguardSecurityViewFlipper - android:id="@+id/view_flipper" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:clipChildren="false" - android:clipToPadding="false" - android:paddingLeft="@dimen/keyguard_security_view_margin" - android:paddingTop="@dimen/keyguard_security_view_margin" - android:paddingRight="@dimen/keyguard_security_view_margin" - android:paddingBottom="@dimen/keyguard_security_view_margin" - android:gravity="center"> - </com.android.keyguard.KeyguardSecurityViewFlipper> - </com.android.keyguard.KeyguardSecurityContainer> - - </com.android.keyguard.MultiPaneChallengeLayout> -</com.android.keyguard.KeyguardHostView> - diff --git a/packages/Keyguard/res/layout-land/keyguard_widget_pager.xml b/packages/Keyguard/res/layout-land/keyguard_widget_pager.xml deleted file mode 100644 index 50c2709..0000000 --- a/packages/Keyguard/res/layout-land/keyguard_widget_pager.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?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.keyguard.KeyguardWidgetCarousel - xmlns:androidprv="http://schemas.android.com/apk/res-auto" - xmlns:android="http://schemas.android.com/apk/res/android" - android:paddingLeft="25dp" - android:paddingRight="25dp" - android:paddingTop="25dp" - android:paddingBottom="25dp" - android:clipToPadding="false" - androidprv:pageSpacing="10dp"> -</com.android.keyguard.KeyguardWidgetCarousel> diff --git a/packages/Keyguard/res/layout-port/keyguard_host_view.xml b/packages/Keyguard/res/layout-port/keyguard_host_view.xml deleted file mode 100644 index 1b8820b..0000000 --- a/packages/Keyguard/res/layout-port/keyguard_host_view.xml +++ /dev/null @@ -1,100 +0,0 @@ -<?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 host view that generally contains two sub views: the widget view - and the security view. --> -<com.android.keyguard.KeyguardHostView - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:androidprv="http://schemas.android.com/apk/res-auto" - android:id="@+id/keyguard_host_view" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:gravity="center_horizontal" - android:clipChildren="false" - android:clipToPadding="false" - android:orientation="vertical"> - - <com.android.keyguard.SlidingChallengeLayout - android:id="@+id/sliding_layout" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:clipChildren="false" - android:clipToPadding="false"> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - androidprv:layout_childType="pageDeleteDropTarget"> - <include layout="@layout/keyguard_widget_remove_drop_target" - android:id="@+id/keyguard_widget_pager_delete_target" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="top|center_horizontal" /> - </FrameLayout> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - androidprv:layout_childType="widgets"> - <include layout="@layout/keyguard_widget_pager" - 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" - android:layout_height="match_parent" - androidprv:layout_childType="scrim" - android:background="#99000000" /> - - <com.android.keyguard.KeyguardSecurityContainer - android:id="@+id/keyguard_security_container" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:clipChildren="false" - android:clipToPadding="false" - androidprv:layout_maxHeight="@dimen/keyguard_security_height" - androidprv:layout_childType="challenge" - android:padding="0dp" - android:gravity="bottom|center_horizontal"> - <com.android.keyguard.KeyguardSecurityViewFlipper - android:id="@+id/view_flipper" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:clipChildren="false" - android:clipToPadding="false" - android:paddingTop="@dimen/keyguard_security_view_margin" - android:gravity="center"> - </com.android.keyguard.KeyguardSecurityViewFlipper> - </com.android.keyguard.KeyguardSecurityContainer> - - <ImageButton - android:layout_width="match_parent" - android:layout_height="@dimen/kg_widget_pager_bottom_padding" - androidprv:layout_childType="expandChallengeHandle" - android:focusable="true" - android:background="@null" - android:src="@drawable/keyguard_expand_challenge_handle" - android:scaleType="center" - android:contentDescription="@string/keyguard_accessibility_expand_lock_area" /> - - </com.android.keyguard.SlidingChallengeLayout> -</com.android.keyguard.KeyguardHostView> - diff --git a/packages/Keyguard/res/layout-port/keyguard_widget_pager.xml b/packages/Keyguard/res/layout-port/keyguard_widget_pager.xml deleted file mode 100644 index 6d7d864..0000000 --- a/packages/Keyguard/res/layout-port/keyguard_widget_pager.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?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.keyguard.KeyguardWidgetPager - xmlns:androidprv="http://schemas.android.com/apk/res-auto" - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/app_widget_container" - android:paddingLeft="25dp" - android:paddingRight="25dp" - android:paddingTop="25dp" - android:paddingBottom="@dimen/kg_widget_pager_bottom_padding" - android:clipToPadding="false" - androidprv:pageSpacing="10dp"> -</com.android.keyguard.KeyguardWidgetPager> diff --git a/packages/Keyguard/res/layout-sw600dp-port/keyguard_host_view.xml b/packages/Keyguard/res/layout-sw600dp-port/keyguard_host_view.xml deleted file mode 100644 index f2f3981..0000000 --- a/packages/Keyguard/res/layout-sw600dp-port/keyguard_host_view.xml +++ /dev/null @@ -1,87 +0,0 @@ -<?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 host view that generally contains two sub views: the widget view - and the security view. --> -<com.android.keyguard.KeyguardHostView - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:androidprv="http://schemas.android.com/apk/res-auto" - android:id="@+id/keyguard_host_view" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="horizontal" - android:clipChildren="false" - android:clipToPadding="false"> - - <com.android.keyguard.MultiPaneChallengeLayout - android:id="@+id/multi_pane_challenge" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:clipChildren="false" - android:clipToPadding="false" - android:orientation="vertical"> - - <include layout="@layout/keyguard_widget_remove_drop_target" - android:id="@+id/keyguard_widget_pager_delete_target" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="top|center_horizontal" - androidprv:layout_childType="pageDeleteDropTarget" /> - - <include layout="@layout/keyguard_widget_pager" - android:id="@+id/app_widget_container" - android:layout_width="match_parent" - android:layout_height="match_parent" - androidprv:layout_centerWithinArea="0.5" - 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" - android:layout_height="match_parent" - androidprv:layout_childType="scrim" - android:background="#99000000" /> - - <com.android.keyguard.KeyguardSecurityContainer - android:id="@+id/keyguard_security_container" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:clipChildren="false" - android:clipToPadding="false" - androidprv:layout_centerWithinArea="0.5" - androidprv:layout_childType="challenge" - android:layout_gravity="center_horizontal|bottom"> - <com.android.keyguard.KeyguardSecurityViewFlipper - android:id="@+id/view_flipper" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:clipChildren="false" - android:clipToPadding="false" - android:paddingLeft="@dimen/keyguard_security_view_margin" - android:paddingTop="@dimen/keyguard_security_view_margin" - android:paddingRight="@dimen/keyguard_security_view_margin" - android:paddingBottom="@dimen/keyguard_security_view_margin" - android:gravity="center"> - </com.android.keyguard.KeyguardSecurityViewFlipper> - </com.android.keyguard.KeyguardSecurityContainer> - - </com.android.keyguard.MultiPaneChallengeLayout> -</com.android.keyguard.KeyguardHostView> diff --git a/packages/Keyguard/res/layout-sw600dp/keyguard_glow_pad_container.xml b/packages/Keyguard/res/layout-sw600dp/keyguard_glow_pad_container.xml deleted file mode 100644 index 930b14e..0000000 --- a/packages/Keyguard/res/layout-sw600dp/keyguard_glow_pad_container.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?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. -*/ ---> -<merge xmlns:android="http://schemas.android.com/apk/res/android"> - <include layout="@layout/keyguard_glow_pad_view" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" /> -</merge>
\ No newline at end of file diff --git a/packages/Keyguard/res/layout/keyguard_add_widget.xml b/packages/Keyguard/res/layout/keyguard_add_widget.xml deleted file mode 100644 index 01b616c..0000000 --- a/packages/Keyguard/res/layout/keyguard_add_widget.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -** -** Copyright 2009, 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 a view that shows general status information in Keyguard. --> -<com.android.keyguard.KeyguardWidgetFrame - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/keyguard_add_widget" - android:layout_width="match_parent" - android:layout_height="match_parent" - > - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:contentDescription="@string/keyguard_accessibility_widget_empty_slot" - > - <ImageView - android:id="@+id/keyguard_add_widget_view" - android:clickable="true" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:padding="24dp" - android:src="@drawable/keyguard_add_widget_button" - android:contentDescription="@string/keyguard_accessibility_add_widget"/> - </FrameLayout> -</com.android.keyguard.KeyguardWidgetFrame> diff --git a/packages/Keyguard/res/layout/keyguard_face_unlock_view.xml b/packages/Keyguard/res/layout/keyguard_face_unlock_view.xml deleted file mode 100644 index 0c85dab..0000000 --- a/packages/Keyguard/res/layout/keyguard_face_unlock_view.xml +++ /dev/null @@ -1,78 +0,0 @@ -<?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 screen that allows the user to unlock by showing their face. --> -<com.android.keyguard.KeyguardFaceUnlockView - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:androidprv="http://schemas.android.com/apk/res-auto" - android:id="@+id/keyguard_face_unlock_view" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent" - androidprv:layout_maxWidth="@dimen/keyguard_security_width" - androidprv:layout_maxHeight="@dimen/keyguard_security_height" - android:contentDescription="@string/keyguard_accessibility_face_unlock"> - - <include layout="@layout/keyguard_message_area" - android:layout_width="match_parent" - android:layout_height="wrap_content" - /> - - <FrameLayout - android:id="@+id/keyguard_bouncer_frame" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - > - <com.android.internal.widget.FaceUnlockView - android:id="@+id/face_unlock_area_view" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center_horizontal" - android:background="@drawable/intro_bg" - android:gravity="center"> - - <View - android:id="@+id/spotlightMask" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/facelock_spotlight_mask" - /> - - <ImageButton - android:id="@+id/face_unlock_cancel_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="5dip" - android:layout_alignParentTop="true" - android:layout_alignParentEnd="true" - android:background="#00000000" - android:src="@drawable/ic_facial_backup" - /> - </com.android.internal.widget.FaceUnlockView> - </FrameLayout> - - <include layout="@layout/keyguard_eca" - android:id="@+id/keyguard_selector_fade_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:layout_gravity="bottom|center_horizontal" - android:gravity="center_horizontal" /> -</com.android.keyguard.KeyguardFaceUnlockView> diff --git a/packages/Keyguard/res/layout/keyguard_glow_pad_container.xml b/packages/Keyguard/res/layout/keyguard_glow_pad_container.xml deleted file mode 100644 index 07953b4..0000000 --- a/packages/Keyguard/res/layout/keyguard_glow_pad_container.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?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. -*/ ---> - -<merge xmlns:android="http://schemas.android.com/apk/res/android"> - <include layout="@layout/keyguard_glow_pad_view" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="bottom|center_horizontal" - android:layout_marginBottom="@dimen/glowpadcontainer_bottom_margin"/> -</merge> diff --git a/packages/Keyguard/res/layout/keyguard_glow_pad_view.xml b/packages/Keyguard/res/layout/keyguard_glow_pad_view.xml deleted file mode 100644 index 2432336..0000000 --- a/packages/Keyguard/res/layout/keyguard_glow_pad_view.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?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.widget.multiwaveview.GlowPadView - xmlns:prvandroid="http://schemas.android.com/apk/prv/res/android" - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/glow_pad_view" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:orientation="horizontal" - android:gravity="@integer/kg_selector_gravity" - android:contentDescription="@string/keyguard_accessibility_slide_area" - prvandroid:handleDrawable="@drawable/ic_lockscreen_handle" - prvandroid:outerRingDrawable="@drawable/ic_lockscreen_outerring" - prvandroid:outerRadius="@dimen/glowpadview_target_placement_radius" - prvandroid:innerRadius="@dimen/glowpadview_inner_radius" - prvandroid:snapMargin="@dimen/glowpadview_snap_margin" - prvandroid:firstItemOffset="@integer/kg_glowpad_rotation_offset" - prvandroid:magneticTargets="true" - prvandroid:feedbackCount="1" - prvandroid:vibrationDuration="20" - prvandroid:glowRadius="@dimen/glowpadview_glow_radius" - prvandroid:pointDrawable="@drawable/ic_lockscreen_glowdot" - prvandroid:allowScaling="true" /> diff --git a/packages/Keyguard/res/layout/keyguard_multi_user_avatar.xml b/packages/Keyguard/res/layout/keyguard_multi_user_avatar.xml deleted file mode 100644 index 41b0be9..0000000 --- a/packages/Keyguard/res/layout/keyguard_multi_user_avatar.xml +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -** -** Copyright 2009, 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 a view that shows general status information in Keyguard. --> -<com.android.keyguard.KeyguardMultiUserAvatar - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="@dimen/keyguard_avatar_size" - android:layout_height="@dimen/keyguard_avatar_size" - android:background="#00000000" - android:gravity="center_horizontal"> - <ImageView - android:id="@+id/keyguard_user_avatar" - android:scaleType="center" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center"/> - <TextView - android:id="@+id/keyguard_user_name" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:gravity="center" - android:textSize="@dimen/keyguard_avatar_name_size" - android:textColor="#ffffff" - android:singleLine="true" - android:ellipsize="end" - android:paddingLeft="2dp" - android:paddingRight="2dp" /> -</com.android.keyguard.KeyguardMultiUserAvatar> diff --git a/packages/Keyguard/res/layout/keyguard_multi_user_selector.xml b/packages/Keyguard/res/layout/keyguard_multi_user_selector.xml deleted file mode 100644 index 83036ab..0000000 --- a/packages/Keyguard/res/layout/keyguard_multi_user_selector.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -** -** Copyright 2009, 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. -*/ ---> -<com.android.keyguard.KeyguardMultiUserSelectorView - xmlns:androidprv="http://schemas.android.com/apk/res-auto" - xmlns:android="http://schemas.android.com/apk/res/android" - androidprv:layout_childType="userSwitcher" - android:id="@+id/keyguard_user_selector" - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:contentDescription="@string/keyguard_accessibility_user_selector" - android:visibility="gone"> - - <com.android.keyguard.KeyguardLinearLayout - android:id="@+id/keyguard_users_grid" - android:orientation="horizontal" - android:layout_width="wrap_content" - android:layout_marginBottom="@dimen/keyguard_muliuser_selector_margin" - android:layout_height="@dimen/keyguard_avatar_size" - android:layout_gravity="center|bottom" /> - -</com.android.keyguard.KeyguardMultiUserSelectorView> diff --git a/packages/Keyguard/res/layout/keyguard_selector_view.xml b/packages/Keyguard/res/layout/keyguard_selector_view.xml deleted file mode 100644 index 5330363..0000000 --- a/packages/Keyguard/res/layout/keyguard_selector_view.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?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.keyguard.KeyguardSelectorView - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:androidprv="http://schemas.android.com/apk/res-auto" - android:id="@+id/keyguard_selector_view" - android:layout_width="match_parent" - android:layout_height="match_parent" - androidprv:layout_maxWidth="420dp" - androidprv:layout_maxHeight="@dimen/keyguard_security_height" - android:clipChildren="false" - android:clipToPadding="false" - android:orientation="vertical" - android:contentDescription="@string/keyguard_accessibility_slide_unlock"> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center" - android:clipChildren="false" - android:clipToPadding="false" - android:gravity="center"> - - <include layout="@layout/keyguard_message_area" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - <View - android:id="@+id/keyguard_selector_view_frame" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp"/> - - <include layout="@layout/keyguard_glow_pad_container" /> - - <include layout="@layout/keyguard_eca" - android:id="@+id/keyguard_selector_fade_container" - android:layout_width="match_parent" - android:layout_height="48dp" - android:layout_gravity="bottom|center_horizontal" /> - </FrameLayout> - -</com.android.keyguard.KeyguardSelectorView> - diff --git a/packages/Keyguard/res/layout/keyguard_transport_control_view.xml b/packages/Keyguard/res/layout/keyguard_transport_control_view.xml deleted file mode 100644 index da82e40..0000000 --- a/packages/Keyguard/res/layout/keyguard_transport_control_view.xml +++ /dev/null @@ -1,151 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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 a view to control music playback in keyguard. --> -<com.android.keyguard.KeyguardTransportControlView - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center_horizontal" - android:id="@+id/keyguard_transport_control"> - - <LinearLayout - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="top" - android:gravity="center"> - <ImageView - android:id="@+id/badge" - android:layout_width="32dp" - android:layout_height="32dp" - android:scaleType="fitCenter" /> - <FrameLayout - android:id="@+id/info_container" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - <LinearLayout - android:id="@+id/metadata_container" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center"> - <TextView - android:id="@+id/title" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginStart="16dip" - android:layout_marginEnd="16dip" - android:gravity="center_horizontal" - android:singleLine="true" - android:ellipsize="marquee" - android:textAppearance="?android:attr/textAppearanceLarge" - android:fontFamily="sans-serif-light" /> - <TextView - android:id="@+id/artist_album" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginStart="16dip" - android:layout_marginEnd="16dip" - android:gravity="center_horizontal" - android:singleLine="true" - android:ellipsize="marquee" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="?android:attr/textColorSecondary" /> - </LinearLayout> - <RelativeLayout - android:id="@+id/transient_seek" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:visibility="invisible"> - <SeekBar - android:id="@+id/transient_seek_bar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - style="@style/Widget.TransportControl.SeekBar" /> - <TextView - android:id="@+id/transient_seek_time_elapsed" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentStart="true" - android:layout_below="@id/transient_seek_bar" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textSize="12dp" /> - <TextView - android:id="@+id/transient_seek_time_remaining" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:layout_below="@id/transient_seek_bar" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textSize="12dp" /> - </RelativeLayout> - </FrameLayout> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="4dp" - android:orientation="horizontal"> - <FrameLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1"> - <ImageButton - android:id="@+id/btn_prev" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:src="@drawable/ic_media_previous" - android:background="?android:attr/selectableItemBackground" - android:minWidth="48dp" - android:minHeight="48dp" - android:contentDescription="@string/keyguard_accessibility_transport_prev_description"/> - </FrameLayout> - <FrameLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1"> - <ImageButton - android:id="@+id/btn_play" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:src="@drawable/ic_media_play" - android:background="?android:attr/selectableItemBackground" - android:minWidth="48dp" - android:minHeight="48dp" - android:contentDescription="@string/keyguard_accessibility_transport_play_description"/> - </FrameLayout> - <FrameLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1"> - <ImageButton - android:id="@+id/btn_next" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:src="@drawable/ic_media_next" - android:background="?android:attr/selectableItemBackground" - android:minWidth="48dp" - android:minHeight="48dp" - android:contentDescription="@string/keyguard_accessibility_transport_next_description"/> - </FrameLayout> - </LinearLayout> - </LinearLayout> - -</com.android.keyguard.KeyguardTransportControlView> diff --git a/packages/Keyguard/res/layout/keyguard_widget_remove_drop_target.xml b/packages/Keyguard/res/layout/keyguard_widget_remove_drop_target.xml deleted file mode 100644 index 58b5b27..0000000 --- a/packages/Keyguard/res/layout/keyguard_widget_remove_drop_target.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?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. -*/ ---> -<TextView - xmlns:android="http://schemas.android.com/apk/res/android" - android:gravity="center" - android:padding="30dp" - android:paddingLeft="60dp" - android:paddingRight="60dp" - android:drawableLeft="@drawable/kg_widget_delete_drop_target" - android:drawablePadding="4dp" - android:text="@string/kg_reordering_delete_drop_target_text" - android:textColor="#FFF" - android:textSize="12dp" - android:shadowColor="#000" - android:shadowDy="1.0" - android:shadowRadius="1.0" - android:visibility="gone" /> diff --git a/packages/Keyguard/res/values-land/bools.xml b/packages/Keyguard/res/values-land/bools.xml index a1dd2e4..bedf504 100644 --- a/packages/Keyguard/res/values-land/bools.xml +++ b/packages/Keyguard/res/values-land/bools.xml @@ -15,8 +15,5 @@ --> <resources> - <bool name="kg_enable_camera_default_widget">false</bool> - <bool name="kg_top_align_page_shrink_on_bouncer_visible">true</bool> - <bool name="kg_share_status_area">false</bool> <bool name="kg_sim_puk_account_full_screen">false</bool> </resources> diff --git a/packages/Keyguard/res/values-land/dimens.xml b/packages/Keyguard/res/values-land/dimens.xml deleted file mode 100644 index bf30332..0000000 --- a/packages/Keyguard/res/values-land/dimens.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2010, 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> - <!-- Shift emergency button from the left edge by this amount. Used by landscape layout on - phones --> - <dimen name="kg_emergency_button_shift">30dp</dimen> - - <!-- Space reserved at the bottom of secure views (pin/pattern/password/SIM pin/SIM puk) --> - <dimen name="kg_secure_padding_height">0dp</dimen> - - <!-- Top padding for the widget pager --> - <dimen name="kg_widget_pager_top_padding">0dp</dimen> - - <!-- Bottom padding for the widget pager --> - <dimen name="kg_widget_pager_bottom_padding">0dp</dimen> - - <!-- If the height if keyguard drops below this threshold (most likely - due to the appearance of the IME), then drop the multiuser selector. - Landscape's layout allows this to be smaller than for portrait. --> - <dimen name="kg_squashed_layout_threshold">400dp</dimen> - -</resources> diff --git a/packages/Keyguard/res/values-land/integers.xml b/packages/Keyguard/res/values-land/integers.xml index 020fd23..0739c3a 100644 --- a/packages/Keyguard/res/values-land/integers.xml +++ b/packages/Keyguard/res/values-land/integers.xml @@ -20,7 +20,4 @@ <!-- Gravity to make KeyguardSelectorView work in multiple orientations 0x13 == "left|center_vertical" --> <integer name="kg_selector_gravity">0x13</integer> - <integer name="kg_widget_region_weight">45</integer> - <integer name="kg_security_flipper_weight">55</integer> - <integer name="kg_glowpad_rotation_offset">-90</integer> </resources> diff --git a/packages/Keyguard/res/values-large/dimens.xml b/packages/Keyguard/res/values-large/dimens.xml deleted file mode 100644 index 0b5d4ad..0000000 --- a/packages/Keyguard/res/values-large/dimens.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 2011, 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> - <!-- Minimum width of the search view text entry area. --> - <dimen name="search_view_text_min_width">192dip</dimen> - - <item type="dimen" name="dialog_min_width_major">55%</item> - <item type="dimen" name="dialog_min_width_minor">80%</item> - - <!-- Preference UI dimensions for larger screens. --> - <dimen name="preference_widget_width">56dp</dimen> -</resources> diff --git a/packages/Keyguard/res/values-port/bools.xml b/packages/Keyguard/res/values-port/bools.xml index 1e2a4f2..fdb8ebc 100644 --- a/packages/Keyguard/res/values-port/bools.xml +++ b/packages/Keyguard/res/values-port/bools.xml @@ -15,7 +15,5 @@ --> <resources> - <bool name="action_bar_embed_tabs">false</bool> - <bool name="kg_share_status_area">true</bool> <bool name="kg_sim_puk_account_full_screen">true</bool> </resources> diff --git a/packages/Keyguard/res/values-sw360dp/dimens.xml b/packages/Keyguard/res/values-sw360dp/dimens.xml index 6e39a42..38658ca 100644 --- a/packages/Keyguard/res/values-sw360dp/dimens.xml +++ b/packages/Keyguard/res/values-sw360dp/dimens.xml @@ -22,8 +22,4 @@ <!-- Height of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) --> <dimen name="keyguard_security_height">400dp</dimen> - - <!-- The bottom margin for the GlowPadView container --> - <dimen name="glowpadcontainer_bottom_margin">-48dp</dimen> - </resources> diff --git a/packages/Keyguard/res/values-sw380dp-land/dimens.xml b/packages/Keyguard/res/values-sw380dp-land/dimens.xml deleted file mode 100644 index 20eb1be..0000000 --- a/packages/Keyguard/res/values-sw380dp-land/dimens.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/common/assets/res/any/dimens.xml -** -** 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> - <!-- Top margin for the clock view --> - <dimen name="kg_clock_top_margin">48dp</dimen> -</resources> diff --git a/packages/Keyguard/res/values-sw600dp-land/dimens.xml b/packages/Keyguard/res/values-sw600dp-land/dimens.xml index 89252cf..a487644 100644 --- a/packages/Keyguard/res/values-sw600dp-land/dimens.xml +++ b/packages/Keyguard/res/values-sw600dp-land/dimens.xml @@ -18,11 +18,6 @@ */ --> <resources> - <!-- Top margin for the clock view --> - <dimen name="kg_clock_top_margin">85dp</dimen> - - <!-- Size of margin on the right of keyguard's status view --> - <dimen name="kg_status_line_font_right_margin">16dp</dimen> <!-- Overload default clock widget parameters --> <dimen name="widget_big_font_size">100dp</dimen> diff --git a/packages/Keyguard/res/values-sw600dp-land/integers.xml b/packages/Keyguard/res/values-sw600dp-land/integers.xml deleted file mode 100644 index b724c90..0000000 --- a/packages/Keyguard/res/values-sw600dp-land/integers.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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_widget_region_weight">50</integer> - <integer name="kg_security_flipper_weight">50</integer> - <integer name="kg_glowpad_rotation_offset">0</integer> -</resources> diff --git a/packages/Keyguard/res/values-sw600dp-port/integers.xml b/packages/Keyguard/res/values-sw600dp-port/integers.xml deleted file mode 100644 index 65b854a..0000000 --- a/packages/Keyguard/res/values-sw600dp-port/integers.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?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_widget_region_weight">46</integer> - <integer name="kg_security_flipper_weight">54</integer> -</resources>
\ No newline at end of file diff --git a/packages/Keyguard/res/values-sw600dp/bools.xml b/packages/Keyguard/res/values-sw600dp/bools.xml index 00f45c1..654821a 100644 --- a/packages/Keyguard/res/values-sw600dp/bools.xml +++ b/packages/Keyguard/res/values-sw600dp/bools.xml @@ -15,12 +15,5 @@ --> <resources> - <bool name="target_honeycomb_needs_options_menu">false</bool> - <bool name="show_ongoing_ime_switcher">true</bool> - <bool name="kg_share_status_area">false</bool> <bool name="kg_sim_puk_account_full_screen">false</bool> - <!-- No camera for you, tablet user --> - <bool name="kg_enable_camera_default_widget">false</bool> - <bool name="kg_center_small_widgets_vertically">true</bool> - <bool name="kg_top_align_page_shrink_on_bouncer_visible">false</bool> </resources> diff --git a/packages/Keyguard/res/values-sw600dp/dimens.xml b/packages/Keyguard/res/values-sw600dp/dimens.xml index 74be1ff..5de1d11 100644 --- a/packages/Keyguard/res/values-sw600dp/dimens.xml +++ b/packages/Keyguard/res/values-sw600dp/dimens.xml @@ -18,50 +18,13 @@ */ --> <resources> - <!-- Size of lockscreen outerring on unsecure unlock LockScreen --> - <dimen name="keyguard_lockscreen_outerring_diameter">364dp</dimen> - - <!-- Height of FaceUnlock view in keyguard --> - <dimen name="face_unlock_height">430dip</dimen> - - <!-- target placement radius for GlowPadView. Should be 1/2 of outerring diameter. --> - <dimen name="glowpadview_target_placement_radius">182dip</dimen> - - <!-- Size of status line font in LockScreen. --> - <dimen name="keyguard_pattern_unlock_status_line_font_size">14sp</dimen> - - <!-- Keyguard dimensions --> - <!-- Size of the clock font in keyguard's status view --> - <dimen name="kg_status_clock_font_size">120dp</dimen> <!-- Size of the generic status lines keyguard's status view --> <dimen name="kg_status_line_font_size">16sp</dimen> - <!-- Top margin for the clock view --> - <dimen name="kg_clock_top_margin">0dp</dimen> - - <!-- Size of margin on the right of keyguard's status view --> - <dimen name="kg_status_line_font_right_margin">50dp</dimen> - - <!-- Horizontal padding for the widget pager --> - <dimen name="kg_widget_pager_horizontal_padding">24dp</dimen> - - <!-- Top padding for the widget pager --> - <dimen name="kg_widget_pager_top_padding">0dp</dimen> - - <!-- Bottom padding for the widget pager --> - <dimen name="kg_widget_pager_bottom_padding">0dp</dimen> - - <!-- Top margin for the runway lights. We add a negative margin in large - devices to account for the widget pager padding --> - <dimen name="kg_runway_lights_top_margin">-10dp</dimen> - <!-- Margin around the various security views --> <dimen name="keyguard_security_view_margin">12dp</dimen> - <!-- Margin around the various security views --> - <dimen name="keyguard_muliuser_selector_margin">12dp</dimen> - <!-- Overload default clock widget parameters --> <dimen name="widget_big_font_size">140dp</dimen> <dimen name="widget_label_font_size">16sp</dimen> diff --git a/packages/Keyguard/res/values-sw600dp/integers.xml b/packages/Keyguard/res/values-sw600dp/integers.xml deleted file mode 100644 index de9829c..0000000 --- a/packages/Keyguard/res/values-sw600dp/integers.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?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/packages/Keyguard/res/values-sw720dp-land/dimens.xml b/packages/Keyguard/res/values-sw720dp-land/dimens.xml deleted file mode 100644 index 731bb64..0000000 --- a/packages/Keyguard/res/values-sw720dp-land/dimens.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/common/assets/res/any/dimens.xml -** -** 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> - <!-- Top margin for the clock view --> - <dimen name="kg_clock_top_margin">174dp</dimen> - - <!-- Size of margin on the right of keyguard's status view --> - <dimen name="kg_status_line_font_right_margin">16dp</dimen> - - <!-- Horizontal padding for the widget pager --> - <dimen name="kg_widget_pager_horizontal_padding">32dp</dimen> - - <dimen name="widget_big_font_size">150dp</dimen> -</resources> diff --git a/packages/Keyguard/res/values-sw720dp-port/integers.xml b/packages/Keyguard/res/values-sw720dp-port/integers.xml deleted file mode 100644 index 5f85f71..0000000 --- a/packages/Keyguard/res/values-sw720dp-port/integers.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?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_widget_region_weight">48</integer> - <integer name="kg_security_flipper_weight">52</integer> -</resources>
\ No newline at end of file diff --git a/packages/Keyguard/res/values-sw720dp/dimens.xml b/packages/Keyguard/res/values-sw720dp/dimens.xml index 86d155e..428c18e 100644 --- a/packages/Keyguard/res/values-sw720dp/dimens.xml +++ b/packages/Keyguard/res/values-sw720dp/dimens.xml @@ -17,40 +17,6 @@ */ --> <resources> - <!-- Keyguard dimensions --> - <!-- Size of the clock font in keyguard's status view --> - <dimen name="kg_status_clock_font_size">140dp</dimen> - - <!-- Top margin for the clock view --> - <dimen name="kg_clock_top_margin">0dp</dimen> - - <!-- Size of margin on the right of keyguard's status view --> - <dimen name="kg_status_line_font_right_margin">32dp</dimen> - - <!-- Horizontal padding for the widget pager --> - <dimen name="kg_widget_pager_horizontal_padding">80dp</dimen> - - <!-- Top padding for the widget pager --> - <dimen name="kg_widget_pager_top_padding">0dp</dimen> - - <!-- Bottom padding for the widget pager --> - <dimen name="kg_widget_pager_bottom_padding">0dp</dimen> - - <!-- Top margin for the runway lights. We add a negative margin in large - devices to account for the widget pager padding --> - <dimen name="kg_runway_lights_top_margin">-30dp</dimen> - - <!-- Margin around the various security views --> - <dimen name="keyguard_muliuser_selector_margin">24dp</dimen> - - <!-- Stroke width of the frame for the circular avatars. --> - <dimen name="keyguard_avatar_frame_stroke_width">3dp</dimen> - - <!-- Size of the avator on the multiuser lockscreen. --> - <dimen name="keyguard_avatar_size">88dp</dimen> - - <!-- Size of the text under the avator on the multiuser lockscreen. --> - <dimen name="keyguard_avatar_name_size">12sp</dimen> <!-- Width of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) --> <dimen name="keyguard_security_width">420dp</dimen> diff --git a/packages/Keyguard/res/values/alias.xml b/packages/Keyguard/res/values/alias.xml index 09e9591..f06b450 100644 --- a/packages/Keyguard/res/values/alias.xml +++ b/packages/Keyguard/res/values/alias.xml @@ -22,18 +22,6 @@ <!-- Alias used to reference framework color for transparency. --> <item type="color" name="transparent">@android:color/transparent</item> - <!-- Alias used to reference framework drawable in keyguard. --> - <item type="drawable" name="stat_sys_warning">@android:drawable/stat_sys_warning</item> - - <!-- Alias used to reference framework drawable in keyguard. --> - <item type="drawable" name="ic_media_pause">@android:drawable/ic_media_pause</item> - - <!-- Alias used to reference framework drawable in keyguard. --> - <item type="drawable" name="ic_media_stop">@*android:drawable/ic_media_stop</item> - - <!-- Alias used to reference framework drawable in keyguard. --> - <item type="drawable" name="ic_contact_picture">@*android:drawable/ic_contact_picture</item> - <!-- Alias used to reference framework "OK" string in keyguard. --> <item type="string" name="ok">@*android:string/ok</item> diff --git a/packages/Keyguard/res/values/attrs.xml b/packages/Keyguard/res/values/attrs.xml index 9100140..96a5bcc 100644 --- a/packages/Keyguard/res/values/attrs.xml +++ b/packages/Keyguard/res/values/attrs.xml @@ -20,113 +20,9 @@ --> <resources> - <!-- Standard gravity constant that a child supplies to its parent. - Defines how the child view should be positioned, on both the X and Y axes, within its enclosing layout. --> - <attr name="layout_gravity"> - <!-- Push object to the top of its container, not changing its size. --> - <flag name="top" value="0x30" /> - <!-- Push object to the bottom of its container, not changing its size. --> - <flag name="bottom" value="0x50" /> - <!-- Push object to the left of its container, not changing its size. --> - <flag name="left" value="0x03" /> - <!-- Push object to the right of its container, not changing its size. --> - <flag name="right" value="0x05" /> - <!-- Place object in the vertical center of its container, not changing its size. --> - <flag name="center_vertical" value="0x10" /> - <!-- Grow the vertical size of the object if needed so it completely fills its container. --> - <flag name="fill_vertical" value="0x70" /> - <!-- Place object in the horizontal center of its container, not changing its size. --> - <flag name="center_horizontal" value="0x01" /> - <!-- Grow the horizontal size of the object if needed so it completely fills its container. --> - <flag name="fill_horizontal" value="0x07" /> - <!-- Place the object in the center of its container in both the vertical and horizontal axis, not changing its size. --> - <flag name="center" value="0x11" /> - <!-- Grow the horizontal and vertical size of the object if needed so it completely fills its container. --> - <flag name="fill" value="0x77" /> - <!-- Additional option that can be set to have the top and/or bottom edges of - the child clipped to its container's bounds. - The clip will be based on the vertical gravity: a top gravity will clip the bottom - edge, a bottom gravity will clip the top edge, and neither will clip both edges. --> - <flag name="clip_vertical" value="0x80" /> - <!-- Additional option that can be set to have the left and/or right edges of - the child clipped to its container's bounds. - The clip will be based on the horizontal gravity: a left gravity will clip the right - edge, a right gravity will clip the left edge, and neither will clip both edges. --> - <flag name="clip_horizontal" value="0x08" /> - <!-- Push object to the beginning of its container, not changing its size. --> - <flag name="start" value="0x00800003" /> - <!-- Push object to the end of its container, not changing its size. --> - <flag name="end" value="0x00800005" /> - </attr> - - - <!-- PagedView specific attributes. These attributes are used to customize - a PagedView view in XML files. --> - <declare-styleable name="PagedView"> - <!-- The space between adjacent pages of the PagedView. --> - <attr name="pageSpacing" format="dimension" /> - <!-- The padding for the scroll indicator area --> - <attr name="scrollIndicatorPaddingLeft" format="dimension" /> - <attr name="scrollIndicatorPaddingRight" format="dimension" /> - </declare-styleable> - - <declare-styleable name="KeyguardGlowStripView"> - <attr name="dotSize" format="dimension" /> - <attr name="numDots" format="integer" /> - <attr name="glowDot" format="reference" /> - <attr name="leftToRight" format="boolean" /> - </declare-styleable> - - <!-- Some child types have special behavior. --> - <attr name="layout_childType"> - <!-- No special behavior. Layout will proceed as normal. --> - <enum name="none" value="0" /> - <!-- Widget container. - This will be resized in response to certain events. --> - <enum name="widget" value="1" /> - <!-- Security challenge container. - This will be dismissed/shown in response to certain events, - possibly obscuring widget elements. --> - <enum name="challenge" value="2" /> - <!-- User switcher. - This will consume space from the total layout area. --> - <enum name="userSwitcher" value="3" /> - <!-- Scrim. This will block access to child views that - come before it in the child list in bouncer mode. --> - <enum name="scrim" value="4" /> - <!-- The home for widgets. All widgets will be descendents of this. --> - <enum name="widgets" value="5" /> - <!-- This is a handle that is used for expanding the - security challenge container when it is collapsed. --> - <enum name="expandChallengeHandle" value="6" /> - <!-- Delete drop target. This will be the drop target to delete pages. --> - <enum name="pageDeleteDropTarget" value="7" /> - </attr> - - <declare-styleable name="SlidingChallengeLayout_Layout"> - <attr name="layout_childType" /> - <attr name="layout_maxHeight" format="dimension" /> - </declare-styleable> - - <declare-styleable name="MultiPaneChallengeLayout"> - <!-- Influences how layout_centerWithinArea behaves --> - <attr name="android:orientation" /> - </declare-styleable> - - <declare-styleable name="MultiPaneChallengeLayout_Layout"> - <!-- Percentage of the screen this child should consume or center within. - If 0/default, the view will be measured by standard rules - as if this were a FrameLayout. --> - <attr name="layout_centerWithinArea" format="float" /> - <attr name="layout_childType" /> - <attr name="layout_gravity" /> - <attr name="layout_maxWidth" format="dimension" /> - <attr name="layout_maxHeight" /> - </declare-styleable> - <declare-styleable name="KeyguardSecurityViewFlipper_Layout"> - <attr name="layout_maxWidth" /> - <attr name="layout_maxHeight" /> + <attr name="layout_maxWidth" format="dimension"/> + <attr name="layout_maxHeight" format="dimension" /> </declare-styleable> <declare-styleable name="NumPadKey"> diff --git a/packages/Keyguard/res/values/bools.xml b/packages/Keyguard/res/values/bools.xml index 5e842d7..2b83787 100644 --- a/packages/Keyguard/res/values/bools.xml +++ b/packages/Keyguard/res/values/bools.xml @@ -15,9 +15,6 @@ --> <resources> - <bool name="kg_enable_camera_default_widget">true</bool> - <bool name="kg_center_small_widgets_vertically">false</bool> - <bool name="kg_top_align_page_shrink_on_bouncer_visible">true</bool> <bool name="kg_show_ime_at_screen_on">true</bool> <bool name="kg_use_all_caps">true</bool> </resources> diff --git a/packages/Keyguard/res/values/colors.xml b/packages/Keyguard/res/values/colors.xml index 4e28eff..3b741ea 100644 --- a/packages/Keyguard/res/values/colors.xml +++ b/packages/Keyguard/res/values/colors.xml @@ -14,15 +14,6 @@ limitations under the License. --> <resources> - <!-- Keyguard colors --> - <color name="keyguard_avatar_frame_color">#ffffffff</color> - <color name="keyguard_avatar_frame_shadow_color">#80000000</color> - <color name="keyguard_avatar_nick_color">#ffffffff</color> - <color name="keyguard_avatar_frame_pressed_color">#ff35b5e5</color> - <color name="kg_widget_pager_gradient">#ffffffff</color> - - <!-- FaceLock --> - <color name="facelock_spotlight_mask">#CC000000</color> <!-- Clock --> <color name="clock_white">#ffffffff</color> diff --git a/packages/Keyguard/res/values/config.xml b/packages/Keyguard/res/values/config.xml index de17c4b..8d9d6ee 100644 --- a/packages/Keyguard/res/values/config.xml +++ b/packages/Keyguard/res/values/config.xml @@ -20,13 +20,6 @@ <!-- These resources are around just to allow their values to be customized --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- Package name for default keyguard appwidget [DO NOT TRANSLATE] --> - <string name="widget_default_package_name"></string> - - <!-- Class name for default keyguard appwidget [DO NOT TRANSLATE] --> - <string name="widget_default_class_name"></string> - <!-- Allow the menu hard key to be disabled in LockScreen on some devices [DO NOT TRANSLATE] --> <bool name="config_disableMenuKeyInLockScreen">false</bool> - </resources> diff --git a/packages/Keyguard/res/values/dimens.xml b/packages/Keyguard/res/values/dimens.xml index 8326d75..9290236 100644 --- a/packages/Keyguard/res/values/dimens.xml +++ b/packages/Keyguard/res/values/dimens.xml @@ -18,101 +18,10 @@ */ --> <resources> - <!-- Size of lockscreen outerring on unsecure unlock LockScreen --> - <dimen name="keyguard_lockscreen_outerring_diameter">270dp</dimen> - - <!-- The bottom margin for the GlowPadView container --> - <dimen name="glowpadcontainer_bottom_margin">-80dp</dimen> - - <!-- Default target placement radius for GlowPadView. Should be 1/2 of outerring diameter. --> - <dimen name="glowpadview_target_placement_radius">135dip</dimen> - - <!-- Default glow radius for GlowPadView --> - <dimen name="glowpadview_glow_radius">75dip</dimen> - - <!-- Default distance beyond which GlowPadView snaps to the matching target --> - <dimen name="glowpadview_snap_margin">40dip</dimen> - - <!-- Default distance from each snap target that GlowPadView considers a "hit" --> - <dimen name="glowpadview_inner_radius">15dip</dimen> - - <!-- Size of status line font on Unsecure unlock LockScreen. --> - <dimen name="keyguard_lockscreen_status_line_font_size">14dip</dimen> - - <!-- Size of right margin on Unsecure unlock LockScreen --> - <dimen name="keyguard_lockscreen_status_line_font_right_margin">42dip</dimen> - - <!-- Size of top margin on Clock font to edge on unlock LockScreen --> - <dimen name="keyguard_lockscreen_status_line_clockfont_top_margin">22dip</dimen> - - <!-- Size of top margin on Clock font to edge on unlock LockScreen --> - <dimen name="keyguard_lockscreen_status_line_clockfont_bottom_margin">12dip</dimen> - - <!-- Padding on left margin of PIN text entry field to center it when del button is showing --> - <dimen name="keyguard_lockscreen_pin_margin_left">40dip</dimen> - - <!-- Height of FaceUnlock view in keyguard --> - <dimen name="face_unlock_height">330dip</dimen> - - <!-- Keyguard dimensions --> - <!-- TEMP --> - <dimen name="kg_security_panel_height">600dp</dimen> - - <!-- Height of security view in keyguard. --> - <dimen name="kg_security_view_height">480dp</dimen> - - <!-- Width of widget view in keyguard. --> - <dimen name="kg_widget_view_width">0dp</dimen> - - <!-- Height of widget view in keyguard. --> - <dimen name="kg_widget_view_height">0dp</dimen> - - <!-- Size of the clock font in keyguard's status view --> - <dimen name="kg_status_clock_font_size">75dp</dimen> <!-- Size of the generic status lines keyguard's status view --> <dimen name="kg_status_line_font_size">14sp</dimen> - <!-- Size of margin on the right of keyguard's status view --> - <dimen name="kg_status_line_font_right_margin">16dp</dimen> - - <!-- Top margin for the clock view --> - <dimen name="kg_clock_top_margin">-16dp</dimen> - - <!-- Horizontal gap between keys in PIN and SIM PIN numeric keyboards in keyguard --> - <dimen name="kg_key_horizontal_gap">0dp</dimen> - - <!-- Horizontal gap between keys in PIN and SIM PIN numeric keyboards in keyguard --> - <dimen name="kg_key_vertical_gap">0dp</dimen> - - <!-- Horizontal gap between keys in PIN and SIM PIN numeric keyboards in keyguard --> - <dimen name="kg_pin_key_height">60dp</dimen> - - <!-- Space reserved at the bottom of secure views (pin/pattern/password/SIM pin/SIM puk) --> - <dimen name="kg_secure_padding_height">46dp</dimen> - - <!-- The height of the runway lights strip --> - <dimen name="kg_runway_lights_height">7dp</dimen> - - <!-- The height of the runway lights strip --> - <dimen name="kg_runway_lights_vertical_padding">2dp</dimen> - - <!-- Horizontal padding for the widget pager --> - <dimen name="kg_widget_pager_horizontal_padding">16dp</dimen> - - <!-- Top padding for the widget pager --> - <dimen name="kg_widget_pager_top_padding">0dp</dimen> - - <!-- Bottom padding for the widget pager --> - <dimen name="kg_widget_pager_bottom_padding">64dp</dimen> - - <!-- Top margin for the runway lights. We add a negative margin in large - devices to account for the widget pager padding --> - <dimen name="kg_runway_lights_top_margin">0dp</dimen> - - <!-- Touch slop for the global toggle accessibility gesture --> - <dimen name="accessibility_touch_slop">80dip</dimen> - <!-- Width of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) --> <dimen name="keyguard_security_width">320dp</dimen> @@ -125,44 +34,14 @@ <!-- Margin around the various security views --> <dimen name="keyguard_security_view_margin">8dp</dimen> - <!-- Margin around the various security views --> - <dimen name="keyguard_muliuser_selector_margin">8dp</dimen> - - <!-- Stroke width of the frame for the circular avatars. --> - <dimen name="keyguard_avatar_frame_stroke_width">2dp</dimen> - - <!-- Shadow radius under the frame for the circular avatars. --> - <dimen name="keyguard_avatar_frame_shadow_radius">1dp</dimen> - - <!-- Size of the avator on hte multiuser lockscreen. --> - <dimen name="keyguard_avatar_size">66dp</dimen> - - <!-- Size of the text under the avator on the multiuser lockscreen. --> - <dimen name="keyguard_avatar_name_size">10sp</dimen> - - <!-- Size of the region along the edge of the screen that will accept - swipes to scroll the widget area. --> - <dimen name="kg_edge_swipe_region_size">24dp</dimen> - - <!-- If the height if keyguard drops below this threshold (most likely - due to the appearance of the IME), then drop the multiuser selector. --> - <dimen name="kg_squashed_layout_threshold">600dp</dimen> - - <!-- The height of widgets which do not support vertical resizing. This is only - used on tablets; on phones, this size is determined by the space left by the - security mode. --> - <dimen name="kg_small_widget_height">160dp</dimen> - <!-- EmergencyCarrierArea overlap - amount to overlap the emergency button and carrier text. Should be 0 on devices with plenty of room (e.g. tablets) --> <dimen name="eca_overlap">-10dip</dimen> <!-- Default clock parameters --> <dimen name="bottom_text_spacing_digital">-10dp</dimen> - <dimen name="label_font_size">14dp</dimen> <dimen name="widget_label_font_size">16sp</dimen> <dimen name="widget_big_font_size">88dp</dimen> - <dimen name="big_font_size">120dp</dimen> <!-- The y translation to apply at the start in appear animations. --> <dimen name="appear_y_translation_start">32dp</dimen> diff --git a/packages/Keyguard/res/values/integers.xml b/packages/Keyguard/res/values/integers.xml deleted file mode 100644 index dc90bbf..0000000 --- a/packages/Keyguard/res/values/integers.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?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">75</integer> - <integer name="kg_glowpad_rotation_offset">0</integer> -</resources> diff --git a/packages/Keyguard/res/values/styles.xml b/packages/Keyguard/res/values/styles.xml index 7d161af..404a17e 100644 --- a/packages/Keyguard/res/values/styles.xml +++ b/packages/Keyguard/res/values/styles.xml @@ -35,36 +35,13 @@ <item name="android:paddingBottom">0dp</item> </style> - <!-- Standard animations for a non-full-screen window or activity. --> - <style name="Animation.LockScreen" parent="@android:style/Animation"> - <item name="android:windowEnterAnimation">@anim/lock_screen_enter</item> - <item name="android:windowExitAnimation">@anim/lock_screen_exit</item> - </style> - <!-- Built-in clock widget stuff --> <style name="widget_label"> <item name="android:textSize">@dimen/widget_label_font_size</item> </style> - <style name="big_thin"> - <item name="android:textSize">@dimen/big_font_size</item> - <item name="android:fontFamily">sans-serif-thin</item> - </style> - <style name="widget_big_thin" parent="big_thin"> + <style name="widget_big_thin"> <item name="android:textSize">@dimen/widget_big_font_size</item> - </style> - - <style name="Widget.TransportControl.SeekBar" parent="@android:style/Widget.DeviceDefault.Light.SeekBar"> - <item name="android:indeterminateOnly">false</item> - <item name="android:progressDrawable">@drawable/scrubber_progress_horizontal_holo_light</item> - <item name="android:indeterminateDrawable">@drawable/scrubber_progress_horizontal_holo_light</item> - <item name="android:minHeight">13dip</item> - <item name="android:maxHeight">13dip</item> - <item name="android:thumb">@drawable/scrubber_control_selector_holo</item> - <item name="android:thumbOffset">16dip</item> - <item name="android:focusable">true</item> - <item name="android:paddingStart">16dip</item> - <item name="android:paddingEnd">16dip</item> - <item name="android:mirrorForRtl">true</item> + <item name="android:fontFamily">sans-serif-thin</item> </style> <style name="BouncerSecurityContainer"> diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java index faecaed..50377c3 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java @@ -199,7 +199,6 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe break; // These don't have timeout dialogs. case Account: - case Biometric: case Invalid: case None: case SimPin: @@ -379,7 +378,6 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe case Password: case PIN: case Account: - case Biometric: finish = true; break; @@ -492,11 +490,7 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe monitor.clearFailedUnlockAttempts(); mLockPatternUtils.reportSuccessfulPasswordAttempt(); } else { - if (mCurrentSecuritySelection == SecurityMode.Biometric) { - monitor.reportFailedBiometricUnlockAttempt(); - } else { - KeyguardSecurityContainer.this.reportFailedUnlockAttempt(); - } + KeyguardSecurityContainer.this.reportFailedUnlockAttempt(); } } @@ -528,7 +522,6 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe case Pattern: return R.id.keyguard_pattern_view; case PIN: return R.id.keyguard_pin_view; case Password: return R.id.keyguard_password_view; - case Biometric: return R.id.keyguard_face_unlock_view; case Account: return R.id.keyguard_account_view; case SimPin: return R.id.keyguard_sim_pin_view; case SimPuk: return R.id.keyguard_sim_puk_view; @@ -541,7 +534,6 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe case Pattern: return R.layout.keyguard_pattern_view; case PIN: return R.layout.keyguard_pin_view; case Password: return R.layout.keyguard_password_view; - case Biometric: return R.layout.keyguard_face_unlock_view; case Account: return R.layout.keyguard_account_view; case SimPin: return R.layout.keyguard_sim_pin_view; case SimPuk: return R.layout.keyguard_sim_puk_view; diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityModel.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityModel.java index 1e2a233..adf8dd2 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityModel.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityModel.java @@ -38,7 +38,6 @@ public class KeyguardSecurityModel { Pattern, // Unlock by drawing a pattern. Password, // Unlock by entering an alphanumeric password PIN, // Strictly numeric password - Biometric, // Unlock with a biometric key (e.g. finger print or face unlock) Account, // Unlock by entering an account's login and password. SimPin, // Unlock by entering a sim pin. SimPuk // Unlock by entering a sim puk @@ -56,28 +55,6 @@ public class KeyguardSecurityModel { mLockPatternUtils = utils; } - /** - * Returns true if biometric unlock is installed and selected. If this returns false there is - * no need to even construct the biometric unlock. - */ - boolean isBiometricUnlockEnabled() { - return mLockPatternUtils.usingBiometricWeak() - && mLockPatternUtils.isBiometricWeakInstalled(); - } - - /** - * Returns true if a condition is currently suppressing the biometric unlock. If this returns - * true there is no need to even construct the biometric unlock. - */ - private boolean isBiometricUnlockSuppressed() { - KeyguardUpdateMonitor monitor = KeyguardUpdateMonitor.getInstance(mContext); - final boolean backupIsTimedOut = monitor.getFailedUnlockAttempts() >= - LockPatternUtils.FAILED_ATTEMPTS_BEFORE_TIMEOUT; - return monitor.getMaxBiometricUnlockAttemptsReached() || backupIsTimedOut - || !monitor.isAlternateUnlockEnabled() - || monitor.getPhoneState() != TelephonyManager.CALL_STATE_IDLE; - } - SecurityMode getSecurityMode() { KeyguardUpdateMonitor monitor = KeyguardUpdateMonitor.getInstance(mContext); SecurityMode mode = SecurityMode.None; @@ -127,12 +104,6 @@ public class KeyguardSecurityModel { * @return alternate or the given mode */ SecurityMode getAlternateFor(SecurityMode mode) { - if (isBiometricUnlockEnabled() && !isBiometricUnlockSuppressed() - && (mode == SecurityMode.Password - || mode == SecurityMode.PIN - || mode == SecurityMode.Pattern)) { - return SecurityMode.Biometric; - } return mode; // no alternate, return what was given } @@ -144,8 +115,6 @@ public class KeyguardSecurityModel { */ SecurityMode getBackupSecurityMode(SecurityMode mode) { switch(mode) { - case Biometric: - return getSecurityMode(); case Pattern: return SecurityMode.Account; } diff --git a/packages/SystemUI/res/layout/notification_public_default.xml b/packages/SystemUI/res/layout/notification_public_default.xml index acfc4bb..efabc06 100644 --- a/packages/SystemUI/res/layout/notification_public_default.xml +++ b/packages/SystemUI/res/layout/notification_public_default.xml @@ -37,7 +37,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="8dp" android:layout_alignParentEnd="true" - android:layout_alignBaseline="@id/title" + android:layout_alignBaseline="@+id/title" android:singleLine="true" android:gravity="center" android:paddingStart="8dp" diff --git a/packages/SystemUI/res/values/ids.xml b/packages/SystemUI/res/values/ids.xml index 4a9eb55..033a90e 100644 --- a/packages/SystemUI/res/values/ids.xml +++ b/packages/SystemUI/res/values/ids.xml @@ -36,5 +36,6 @@ <item type="id" name="height_animator_start_value_tag"/> <item type="id" name="doze_saved_filter_tag"/> <item type="id" name="qs_icon_tag"/> + <item type="id" name="scrim"/> </resources> diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index ecfb5cd..3f75503 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -63,7 +63,6 @@ import com.android.keyguard.KeyguardConstants; import com.android.keyguard.KeyguardDisplayManager; import com.android.keyguard.KeyguardUpdateMonitor; import com.android.keyguard.KeyguardUpdateMonitorCallback; -import com.android.keyguard.MultiUserAvatarCache; import com.android.keyguard.ViewMediatorCallback; import com.android.systemui.SystemUI; import com.android.systemui.statusbar.phone.PhoneStatusBar; |