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

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

resolve merge conflicts of 781e8c2b to nyc-mr1-dev-plus-aosp 

am: ea92d5d1

Change-Id: I1aabe531b0a2a26828f0ec68de70158b8c11e3fb
parents 2ba211b5 ea92d5d1

packages/SystemUI/res/layout-sw410dp/status_bar_alarm_group.xml

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

<!--

     Copyright (C) 2016 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.

-->

<LinearLayout

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

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

    android:id="@+id/date_time_alarm_group"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_marginTop="8dp"

    android:layout_marginStart="16dp"

    android:gravity="start"

    android:orientation="vertical">

    <LinearLayout

        android:id="@+id/date_time_group"

        android:layout_width="wrap_content"

        android:layout_height="19dp"

        android:orientation="horizontal"

        android:focusable="true" >



        <include layout="@layout/split_clock_view"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:id="@+id/clock" />



        <com.android.systemui.statusbar.policy.DateView

            android:id="@+id/date"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="6dp"

            android:drawableStart="@drawable/header_dot"

            android:drawablePadding="6dp"

            android:singleLine="true"

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

            android:textSize="@dimen/qs_time_collapsed_size"

            android:gravity="top"

            systemui:datePattern="@string/abbrev_wday_month_day_no_year_alarm" />



        <com.android.systemui.statusbar.AlphaOptimizedImageView

            android:id="@+id/alarm_status_collapsed"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:src="@drawable/ic_access_alarms_small"

            android:paddingStart="6dp"

            android:gravity="center"

            android:visibility="gone" />

    </LinearLayout>



    <com.android.systemui.statusbar.AlphaOptimizedButton

        android:id="@+id/alarm_status"

        android:layout_width="wrap_content"

        android:layout_height="20dp"

        android:paddingTop="3dp"

        android:drawablePadding="8dp"

        android:drawableStart="@drawable/ic_access_alarms_small"

        android:textColor="#64ffffff"

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

        android:gravity="top"

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

        android:visibility="gone" />



</LinearLayout>

packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml

+5 −57
Original line number Diff line number Diff line
@@ -118,64 +118,12 @@ 
        android:gravity="center_vertical"

        android:focusable="true" />



    <LinearLayout

    <include

        android:id="@+id/date_time_alarm_group"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentStart="true"

        android:layout_alignParentTop="true"

        layout="@layout/status_bar_alarm_group"

        android:layout_marginTop="16dp"

        android:layout_marginStart="16dp"

        android:gravity="start"

        android:orientation="vertical">

        <LinearLayout

            android:id="@+id/date_time_group"

            android:layout_width="wrap_content"

            android:layout_height="19dp"

            android:orientation="horizontal"

            android:focusable="true" >



            <include layout="@layout/split_clock_view"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:id="@+id/clock" />



            <com.android.systemui.statusbar.policy.DateView

                android:id="@+id/date"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginStart="6dp"

                android:drawableStart="@drawable/header_dot"

                android:drawablePadding="6dp"

                android:singleLine="true"

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

                android:textSize="@dimen/qs_time_collapsed_size"

                android:gravity="top"

                systemui:datePattern="@string/abbrev_wday_month_day_no_year_alarm" />



            <com.android.systemui.statusbar.AlphaOptimizedImageView

                android:id="@+id/alarm_status_collapsed"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:src="@drawable/ic_access_alarms_small"

                android:paddingStart="6dp"

                android:gravity="center"

                android:visibility="gone" />

        </LinearLayout>



        <com.android.systemui.statusbar.AlphaOptimizedButton

            android:id="@+id/alarm_status"

            android:layout_width="wrap_content"

            android:layout_height="20dp"

            android:paddingTop="3dp"

            android:drawablePadding="8dp"

            android:drawableStart="@drawable/ic_access_alarms_small"

            android:textColor="#64ffffff"

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

            android:gravity="top"

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

            android:visibility="gone" />

    </LinearLayout>

        android:layout_alignParentStart="true"

        android:layout_alignParentTop="true" />



    <com.android.systemui.qs.QuickQSPanel

        android:id="@+id/quick_qs_panel"
@@ -189,7 +137,7 @@ 
        android:clipToPadding="false"

        android:importantForAccessibility="yes"

        android:focusable="true"

        android:accessibilityTraversalAfter="@id/date_time_group"

        android:accessibilityTraversalAfter="@+id/date_time_group"

        android:accessibilityTraversalBefore="@id/expand_indicator" />



    <com.android.systemui.statusbar.AlphaOptimizedImageView

packages/SystemUI/res/layout/status_bar_alarm_group.xml

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

<!--

     Copyright (C) 2016 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.

-->

<LinearLayout

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

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

    android:id="@+id/date_time_alarm_group"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_marginTop="8dp"

    android:layout_marginStart="16dp"

    android:gravity="start"

    android:orientation="vertical">

    <LinearLayout

        android:id="@+id/date_time_group"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:focusable="true" >



        <include layout="@layout/split_clock_view"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:id="@+id/clock" />



        <com.android.systemui.statusbar.AlphaOptimizedImageView

            android:id="@+id/alarm_status_collapsed"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:src="@drawable/ic_access_alarms_small"

            android:paddingStart="6dp"

            android:gravity="center"

            android:visibility="gone" />

    </LinearLayout>



    <com.android.systemui.statusbar.policy.DateView

        android:id="@+id/date"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:singleLine="true"

        android:layout_marginTop="-4dp"

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

        android:textSize="@dimen/qs_time_collapsed_size"

        android:gravity="top"

        systemui:datePattern="@string/abbrev_wday_month_day_no_year_alarm" />



    <com.android.systemui.statusbar.AlphaOptimizedButton

        android:id="@+id/alarm_status"

        android:layout_width="wrap_content"

        android:layout_height="20dp"

        android:paddingTop="3dp"

        android:drawablePadding="8dp"

        android:drawableStart="@drawable/ic_access_alarms_small"

        android:textColor="#64ffffff"

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

        android:gravity="top"

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

        android:visibility="gone" />



</LinearLayout>

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

+1 −1
Original line number Diff line number Diff line
@@ -22,5 +22,5 @@ 
<resources>

    <integer name="quick_settings_num_rows">2</integer>



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

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

</resources>

packages/SystemUI/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -272,6 +272,6 @@ 
    <!-- Nav bar button default ordering/layout -->

    <string name="config_navBarLayout" translatable="false">space,back;home;recent,menu_ime</string>



    <bool name="quick_settings_show_date">false</bool>

    <bool name="quick_settings_show_full_alarm">false</bool>



</resources>