Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure 36dps around keyguard bouncer

Browse Source 
Simplified bouncer size calculation by setting a default
lateral margin and removing unused dimens.

We can expect the bouncer to grow up to the requested size,
or shrink to incorporate the margins.

Change-Id: I085bc4148aa956b2107ab2a4853e8dd9fcbdce06
Fixes: 64560804
Test: runtest -x packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerTest.java
Test: look at keyguard on multiple screen sizes
This commit is contained in:
Lucas Dupin
2017-08-21 14:34:23 -07:00
parent 9c85d966cd
commit 7fc1fc6c07
13 changed files with 18 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/res/res/values-sw380dp-land/dimens.xml
View File

@@ -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>

23
core/res/res/values-sw380dp/dimens.xml
View File

@@ -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>
<!-- Width of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->
<dimen name="keyguard_security_width">340dp</dimen>
</resources>

3
core/res/res/values-sw600dp/dimens.xml
View File

@@ -103,9 +103,6 @@
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>

6
core/res/res/values-sw720dp/dimens.xml
View File

@@ -111,10 +111,4 @@
<!-- 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>
<!-- Height of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->
<dimen name="keyguard_security_height">420dp</dimen>
</resources>

9
core/res/res/values/dimens.xml
View File

@@ -438,15 +438,6 @@
<!-- Width of the outline stroke used by the accessibility screen magnification indicator -->
<dimen name="accessibility_magnification_indicator_width">4dip</dimen>
<!-- Width of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->
<dimen name="keyguard_security_width">320dp</dimen>
<!-- Height of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->
<dimen name="keyguard_security_height">400dp</dimen>
<!-- 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>

4
packages/SystemUI/res-keyguard/layout/keyguard_host_view.xml
View File

@@ -45,7 +45,9 @@
android:layout_height="match_parent"
android:clipChildren="false"
android:clipToPadding="false"
android:paddingTop="@dimen/keyguard_security_view_margin"
android:paddingTop="@dimen/keyguard_security_view_top_margin"
android:paddingStart="@dimen/keyguard_security_view_lateral_margin"
android:paddingEnd="@dimen/keyguard_security_view_lateral_margin"
android:gravity="center">
</com.android.keyguard.KeyguardSecurityViewFlipper>
</com.android.keyguard.KeyguardSecurityContainer>

3
packages/SystemUI/res-keyguard/values-sw320dp/dimens.xml
View File

@@ -19,7 +19,8 @@
-->
<resources>
<!-- Height of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->
<!-- Height of the sliding KeyguardSecurityContainer
(includes 2x keyguard_security_view_top_margin) -->
<dimen name="keyguard_security_height">345dp</dimen>
</resources>

2
packages/SystemUI/res-keyguard/values-sw360dp/dimens.xml
View File

@@ -20,6 +20,6 @@
<resources>
<!-- Height of the sliding KeyguardSecurityContainer (includes 2x
keyguard_security_view_margin) -->
keyguard_security_view_top_margin) -->
<dimen name="keyguard_security_height">400dp</dimen>
</resources>

23
packages/SystemUI/res-keyguard/values-sw380dp/dimens.xml
View File

@@ -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>
<!-- Width of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->
<dimen name="keyguard_security_width">340dp</dimen>
</resources>

2
packages/SystemUI/res-keyguard/values-sw540dp-port/dimens.xml
View File

@@ -19,6 +19,6 @@
-->
<resources>
<!-- Height of the sliding KeyguardSecurityContainer
(includes 2x keyguard_security_view_margin) -->
(includes 2x keyguard_security_view_top_margin) -->
<dimen name="keyguard_security_height">500dp</dimen>
</resources>

2
packages/SystemUI/res-keyguard/values-sw600dp/dimens.xml
View File

@@ -23,7 +23,7 @@
<dimen name="kg_status_line_font_size">16sp</dimen>
<!-- Margin around the various security views -->
<dimen name="keyguard_security_view_margin">12dp</dimen>
<dimen name="keyguard_security_view_top_margin">12dp</dimen>
<!-- Overload default clock widget parameters -->
<dimen name="widget_big_font_size">100dp</dimen>

6
packages/SystemUI/res-keyguard/values-sw720dp/dimens.xml
View File

@@ -18,10 +18,8 @@
-->
<resources>
<!-- Width of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->
<dimen name="keyguard_security_width">420dp</dimen>
<!-- Height of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->
<!-- Height of the sliding KeyguardSecurityContainer
(includes 2x keyguard_security_view_top_margin) -->
<dimen name="keyguard_security_height">420dp</dimen>
<dimen name="widget_big_font_size">100dp</dimen>

13
packages/SystemUI/res-keyguard/values/dimens.xml
View File

@@ -22,17 +22,20 @@
<!-- Size of the generic status lines keyguard's status view -->
<dimen name="kg_status_line_font_size">14sp</dimen>
<!-- Width of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->
<dimen name="keyguard_security_width">320dp</dimen>
<!-- Maximum width of the sliding KeyguardSecurityContainer -->
<dimen name="keyguard_security_width">420dp</dimen>
<!-- Height of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->
<!-- Height of the sliding KeyguardSecurityContainer
(includes 2x keyguard_security_view_top_margin) -->
<dimen name="keyguard_security_height">400dp</dimen>
<!-- Max Height of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->
<!-- Max Height of the sliding KeyguardSecurityContainer
(includes 2x keyguard_security_view_top_margin) -->
<dimen name="keyguard_security_max_height">450dp</dimen>
<!-- Margin around the various security views -->
<dimen name="keyguard_security_view_margin">8dp</dimen>
<dimen name="keyguard_security_view_top_margin">8dp</dimen>
<dimen name="keyguard_security_view_lateral_margin">36dp</dimen>
<!-- EmergencyCarrierArea overlap - amount to overlap the emergency button and carrier text.
Should be 0 on devices with plenty of room (e.g. tablets) -->