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

Commit b0c8102a authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am bf6e0ba9: Don\'t show rotation lock on phone-sized devices. 

* commit 'bf6e0ba9':
  Don't show rotation lock on phone-sized devices.
parents da0ff4de bf6e0ba9

packages/SystemUI/res/layout-sw600dp/status_bar_expanded_header.xml

0 → 100644
+75 −0
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.

-->



<LinearLayout

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

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingTop="@dimen/notification_panel_header_padding_top"

    android:background="@drawable/notification_header_bg"

    android:orientation="horizontal"

    android:gravity="center_vertical"

    android:baselineAligned="false"

    >

    <com.android.systemui.statusbar.policy.Clock

        android:id="@+id/clock"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginLeft="8dp"

        android:singleLine="true"

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

        />



    <com.android.systemui.statusbar.policy.DateView android:id="@+id/date"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginLeft="8dp"

        android:layout_marginRight="8dp"

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

        />



    <com.android.systemui.statusbar.RotationToggle android:id="@+id/rotation_lock_button"

        android:layout_width="32dp"

        android:layout_height="32dp"

        android:layout_margin="8dp"

        android:button="@drawable/ic_notify_rotation"

        android:contentDescription="@string/accessibility_rotation_lock_off"

        />



    <ImageView android:id="@+id/settings_button"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:scaleType="center"

        android:src="@drawable/ic_notify_quicksettings"

        android:contentDescription="@string/accessibility_settings_button"

        />



    <Space

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:layout_weight="1"

        />



    <ImageView android:id="@+id/clear_all_button"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:scaleType="center"

        android:src="@drawable/ic_notify_clear"

        android:contentDescription="@string/accessibility_clear_all"

        />            

</LinearLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/status_bar_expanded.xml

+3 −55
Original line number Diff line number Diff line
@@ -30,62 +30,10 @@ 
    android:layout_marginLeft="@dimen/notification_panel_margin_left"

    >



    <LinearLayout

    <include layout="@layout/status_bar_expanded_header"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingTop="@dimen/notification_panel_header_padding_top"

        android:background="@drawable/notification_header_bg"

        android:orientation="horizontal"

        android:gravity="center_vertical"

        android:baselineAligned="false"

        >

        <com.android.systemui.statusbar.policy.Clock

            android:id="@+id/clock"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginLeft="8dp"

            android:singleLine="true"

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

            />



        <com.android.systemui.statusbar.policy.DateView android:id="@+id/date"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginLeft="8dp"

            android:layout_marginRight="8dp"

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

            />



        <com.android.systemui.statusbar.RotationToggle android:id="@+id/rotation_lock_button"

            android:layout_width="32dp"

            android:layout_height="32dp"

            android:layout_margin="8dp"

            android:button="@drawable/ic_notify_rotation"

            android:contentDescription="@string/accessibility_rotation_lock_off"

            />



        <ImageView android:id="@+id/settings_button"

            android:layout_width="48dp"

            android:layout_height="48dp"

            android:scaleType="center"

            android:src="@drawable/ic_notify_quicksettings"

            android:contentDescription="@string/accessibility_settings_button"

            />



        <Space

            android:layout_width="0dp"

            android:layout_height="0dp"

            android:layout_weight="1"

            />



        <ImageView android:id="@+id/clear_all_button"

            android:layout_width="48dp"

            android:layout_height="48dp"

            android:scaleType="center"

            android:src="@drawable/ic_notify_clear"

            android:contentDescription="@string/accessibility_clear_all"

        />

    </LinearLayout>

 

    <ScrollView

        android:id="@+id/scroll"

packages/SystemUI/res/layout/status_bar_expanded_header.xml

0 → 100644
+67 −0
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.

-->



<LinearLayout

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

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingTop="@dimen/notification_panel_header_padding_top"

    android:background="@drawable/notification_header_bg"

    android:orientation="horizontal"

    android:gravity="center_vertical"

    android:baselineAligned="false"

    >

    <com.android.systemui.statusbar.policy.Clock

        android:id="@+id/clock"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginLeft="8dp"

        android:singleLine="true"

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

        />



    <com.android.systemui.statusbar.policy.DateView android:id="@+id/date"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginLeft="8dp"

        android:layout_marginRight="8dp"

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

        />



    <ImageView android:id="@+id/settings_button"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:scaleType="center"

        android:src="@drawable/ic_notify_quicksettings"

        android:contentDescription="@string/accessibility_settings_button"

        />



    <Space

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:layout_weight="1"

        />



    <ImageView android:id="@+id/clear_all_button"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:scaleType="center"

        android:src="@drawable/ic_notify_clear"

        android:contentDescription="@string/accessibility_clear_all"

        />            

</LinearLayout>
 
 No newline at end of file