Skip to content

Commit 7fcc9b1

Browse files
dsandlerAndroid Git Automerger
authored andcommitted
am e111ad3: No, that\'s German for "The Quick Settings, The".
* commit 'e111ad300d614a0f94e30f96ae664a1de578c48a': No, that's German for "The Quick Settings, The".
2 parents 13b82d6 + e111ad3 commit 7fcc9b1

File tree

15 files changed

+103
-42
lines changed

15 files changed

+103
-42
lines changed
916 Bytes
Loading
1.73 KB
Loading
739 Bytes
Loading
1.09 KB
Loading
1.06 KB
Loading
2.3 KB
Loading
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- Copyright (C) 2012 The Android Open Source Project
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
-->
16+
17+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
18+
<item android:state_pressed="true"
19+
android:drawable="@drawable/ic_notify_settings_pressed" />
20+
<item
21+
android:drawable="@drawable/ic_notify_settings_normal" />
22+
</selector>
23+

packages/SystemUI/res/layout/status_bar_expanded_header.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,14 @@
7575
android:layout_width="50dp"
7676
android:layout_height="50dp"
7777
android:scaleType="center"
78-
android:src="@drawable/ic_notify_quicksettings"
78+
android:src="@drawable/ic_notify_settings"
7979
android:contentDescription="@string/accessibility_settings_button"
8080
/>
8181

8282
<ImageView android:id="@+id/clear_all_button"
8383
android:layout_width="50dp"
8484
android:layout_height="50dp"
85-
android:layout_marginLeft="18dp"
85+
android:layout_marginLeft="12dp"
8686
android:scaleType="center"
8787
android:src="@drawable/ic_notify_clear"
8888
android:contentDescription="@string/accessibility_clear_all"

packages/SystemUI/res/layout/super_status_bar.xml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,11 @@
4242
android:layout_width="match_parent"
4343
android:layout_height="match_parent"
4444
/>
45-
<include layout="@layout/quick_settings"
45+
<ViewStub android:id="@+id/quick_settings_stub"
46+
android:layout="@layout/quick_settings"
4647
android:layout_width="match_parent"
4748
android:layout_height="match_parent"
4849
/>
4950
</com.android.systemui.statusbar.phone.PanelHolder>
5051

51-
<ViewStub
52-
android:layout="@layout/status_bar_help"
53-
android:id="@+id/status_bar_cling_stub"
54-
android:inflatedId="@+id/status_bar_cling"
55-
android:layout_width="match_parent"
56-
android:layout_height="match_parent"
57-
android:layout_marginTop="@*android:dimen/status_bar_height"
58-
android:visibility="gone"
59-
/>
60-
6152
</com.android.systemui.statusbar.phone.StatusBarWindowView>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
<!-- These resources are around just to allow their values to be customized
2121
for different hardware and product builds. -->
2222
<resources>
23+
<!-- Enable quick settings on tablets -->
24+
<bool name="config_hasSettingsPanel">true</bool>
25+
2326
<!-- The number of columns in the QuickSettings -->
2427
<integer name="quick_settings_num_columns">3</integer>
2528

0 commit comments

Comments
 (0)