Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c58de01f authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Ensure 36dps around keyguard bouncer" into oc-mr1-dev 

am: f00b496b

Change-Id: Iee45882aa11644046c374a7715b2ad836fb85d43
parents 3983ef63 f00b496b

core/res/res/values-sw380dp-land/dimens.xml

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
<?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>

core/res/res/values-sw380dp/dimens.xml

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
<?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>
 
 No newline at end of file

core/res/res/values-sw600dp/dimens.xml

+0 −3
Original line number Diff line number Diff line
@@ -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>

core/res/res/values-sw720dp/dimens.xml

+0 −6
Original line number Diff line number Diff line
@@ -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>

core/res/res/values/dimens.xml

+0 −9
Original line number Diff line number Diff line
@@ -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>