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

Commit 35453dd7 authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

Merge "QuickSettings: fix text alignment."

parents c670c3b1 4bf31983

packages/SystemUI/res/layout/qs_zen_mode_detail.xml

+4 −4
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
        android:layout_width="64dp"

        android:layout_height="64dp"

        android:layout_alignParentStart="true"

        android:padding="@dimen/quick_settings_panel_padding" />

        android:padding="@dimen/qs_panel_padding" />



    <Switch

        android:id="@android:id/checkbox"
@@ -33,7 +33,7 @@ 
        android:layout_height="64dp"

        android:layout_alignParentEnd="true"

        android:gravity="center"

        android:padding="@dimen/quick_settings_panel_padding" />

        android:padding="@dimen/qs_panel_padding" />



    <TextView

        android:id="@android:id/title"
@@ -43,7 +43,7 @@ 
        android:layout_toStartOf="@android:id/checkbox"

        android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Clock"

        android:gravity="center_vertical"

        android:paddingStart="@dimen/quick_settings_panel_padding"

        android:paddingStart="@dimen/qs_panel_padding"

        android:text="@string/zen_mode_title" />



    <View
@@ -70,7 +70,7 @@ 
        android:layout_alignParentBottom="true"

        android:layout_alignParentEnd="true"

        android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Clock"

        android:padding="@dimen/quick_settings_panel_padding"

        android:padding="@dimen/qs_panel_padding"

        android:text="@string/quick_settings_more_settings"

        android:textAllCaps="true" />

packages/SystemUI/res/layout/qs_zen_mode_detail_condition.xml

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
        android:layout_width="32dp"

        android:layout_height="64dp"

        android:layout_alignParentStart="true"

        android:layout_marginStart="@dimen/quick_settings_panel_padding"

        android:layout_marginStart="@dimen/qs_panel_padding"

        android:gravity="center" />



    <TextView
@@ -45,7 +45,7 @@ 
        android:layout_height="64dp"

        android:layout_alignParentEnd="true"

        android:layout_marginEnd="48dp"

        android:padding="@dimen/quick_settings_panel_padding"

        android:padding="@dimen/qs_panel_padding"

        android:paddingRight="0px" />



    <ImageView
@@ -54,6 +54,6 @@ 
        android:layout_width="64dp"

        android:layout_height="64dp"

        android:layout_alignParentEnd="true"

        android:padding="@dimen/quick_settings_panel_padding" />

        android:padding="@dimen/qs_panel_padding" />



</RelativeLayout>
 
 No newline at end of file

packages/SystemUI/res/values-land/dimens.xml

+0 −3
Original line number Diff line number Diff line
@@ -38,9 +38,6 @@ 
    <dimen name="status_bar_recents_app_icon_left_margin">8dp</dimen>

    <dimen name="status_bar_recents_app_icon_top_margin">8dp</dimen>



    <!-- The fixed height of each tile -->

    <dimen name="quick_settings_cell_height">100dp</dimen>



    <!-- Width of the zen mode interstitial dialog. -->

    <dimen name="zen_mode_dialog_width">384dp</dimen>

</resources>

packages/SystemUI/res/values-sw380dp/dimens.xml

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

 * Copyright (c) 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>

    <!-- The fixed height of each tile -->

    <dimen name="quick_settings_cell_height">124dp</dimen>

</resources>

packages/SystemUI/res/values/colors.xml

+2 −8
Original line number Diff line number Diff line
@@ -41,18 +41,12 @@ 
    <color name="system_secondary_color">#ff384248</color>

    <color name="system_accent_color">#ff7fcac3</color>

    <color name="system_error_color">#fff0592b</color>

    <color name="quick_settings_tile_divider">#ff888888</color>

    <color name="quick_settings_tile_text">#FFFFFFFF</color>

    <color name="qs_tile_divider">#29ffffff</color><!--  16% white -->

    <color name="qs_tile_text">#FFFFFFFF</color>

    <color name="status_bar_clock_color">#FFFFFFFF</color>

    <drawable name="notification_item_background_color">#ff111111</drawable>

    <drawable name="notification_item_background_color_pressed">#ff454545</drawable>



    <!-- Tint color for inactive Quick Settings icons. -->

    <color name="ic_qs_off">#ff404040</color>



    <!-- Tint color for active Quick Settings icons. -->

    <color name="ic_qs_on">#ffffffff</color>



    <!-- Tint color for the content on the notification overflow card. -->

    <color name="keyguard_overflow_content_color">#ff666666</color>