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

Commit b4d16644 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Work on QS landscape fitting" into nyc-dev am: 917c06a0 

am: ab25de04

* commit 'ab25de04':
  Work on QS landscape fitting

Change-Id: I529defeef666a34f9979952ed6041a8c364885df
parents 93673ce9 ab25de04

packages/SystemUI/res/layout/battery_detail.xml

+8 −2
Original line number Diff line number Diff line
@@ -26,10 +26,13 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingStart="72dp"

        android:paddingBottom="@dimen/battery_detail_graph_space_top"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:textColor="?android:attr/colorAccent" />



    <com.android.systemui.ResizingSpace

        android:layout_width="match_parent"

        android:layout_height="@dimen/battery_detail_graph_space_top" />



    <com.android.settingslib.graph.UsageView

        android:id="@+id/battery_usage"

        android:layout_width="match_parent"
@@ -40,11 +43,14 @@ 
        android:colorAccent="?android:attr/colorAccent"

        systemui:textColor="#66FFFFFF" />



    <com.android.systemui.ResizingSpace

        android:layout_width="match_parent"

        android:layout_height="@dimen/battery_detail_graph_space_bottom" />



    <View

        android:layout_width="match_parent"

        android:layout_height="1dp"

        android:background="?android:attr/listDivider"

        android:layout_marginTop="@dimen/battery_detail_graph_space_bottom"

        android:layout_marginBottom="8dp" />



    <RelativeLayout

packages/SystemUI/res/layout/qs_detail.xml

+5 −3
Original line number Diff line number Diff line
@@ -25,13 +25,15 @@ 
    android:visibility="invisible"

    android:orientation="vertical">



    <com.android.systemui.ResizingSpace

        android:layout_width="match_parent"

        android:layout_height="@dimen/qs_detail_margin_top" />



    <include

        android:id="@+id/qs_detail_header"

        layout="@layout/qs_detail_header"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="28dp"

        />

        android:layout_height="wrap_content" />



    <com.android.systemui.statusbar.AlphaOptimizedImageView

        android:id="@+id/qs_detail_header_progress"

packages/SystemUI/res/layout/qs_detail_items.xml

+7 −10
Original line number Diff line number Diff line
@@ -16,17 +16,19 @@ 
-->

<!-- extends FrameLayout -->

<com.android.systemui.qs.QSDetailItems xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:sysui="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:paddingTop="16dp"

    android:paddingTop="@dimen/qs_detail_items_padding_top"

    android:paddingStart="16dp"

    android:paddingEnd="16dp">



    <LinearLayout

    <com.android.systemui.qs.AutoSizingList

        android:id="@android:id/list"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical" />

        android:layout_height="match_parent"

        android:orientation="vertical"

        sysui:itemHeight="@dimen/qs_detail_item_height" />



    <LinearLayout

        android:id="@android:id/empty"
@@ -48,9 +50,4 @@ 
            android:layout_marginTop="20dp"

            android:textAppearance="@style/TextAppearance.QS.DetailEmpty" />

    </LinearLayout>



    <View

        android:id="@+id/min_height_spacer"

        android:layout_width="match_parent"

        android:layout_height="0dp"/>

</com.android.systemui.qs.QSDetailItems>

packages/SystemUI/res/values-h560dp/config.xml

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



<!--

  ~ Copyright (C) 2014 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 maximum number of items to be displayed in quick settings -->

    <integer name="quick_settings_detail_max_item_count">6</integer>

</resources>

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

+10 −0
Original line number Diff line number Diff line
@@ -24,4 +24,14 @@ 


    <dimen name="docked_divider_handle_width">2dp</dimen>

    <dimen name="docked_divider_handle_height">16dp</dimen>



    <dimen name="qs_tile_margin_top">2dp</dimen>

    <dimen name="qs_brightness_padding_top">0dp</dimen>



    <dimen name="battery_detail_graph_space_top">9dp</dimen>

    <dimen name="battery_detail_graph_space_bottom">9dp</dimen>



    <integer name="quick_settings_num_columns">4</integer>

    <bool name="quick_settings_wide">true</bool>

    <dimen name="qs_detail_margin_top">0dp</dimen>

</resources>