Skip to content

Commit 82ca685

Browse files
vansh123456hpnightowlmarkakashmaxwen
authored and
raiyanbinmohsin
committed
Add Android S style player + screenshot sound toggle (#9)
* SystemUI: Redesign Media Player View Design inspired from Android S Co-authored-by: Akash Srivastava <akashniki@gmail.com> * base: Allow disabling screenshot shutter sound [1/2] Includes also: commit b794cab075a38caccbb3c411b8b697426df27653 Co-Authored-By: xyyx <xyyx@mail.ru> Date: Thu Jan 12 21:59:42 2017 +0800 ScreenshotSound: Fix playing screenshot's sound when camera's sounds off. This bug actually because Screenshot uses Camera Shutter Sound @idoybh: Adapt to A11 Change-Id: If6f766e4b581e7c35d36e2e777ce2c37a3843ad4 Co-authored-by: hpnightowl <iamhp2k@gmail.com> Co-authored-by: Akash Srivastava <akashniki@gmail.com> Co-authored-by: maxwen <max.weninger@gmail.com>
1 parent 46c8f3e commit 82ca685

12 files changed

Lines changed: 136 additions & 131 deletions

File tree

‎core/java/android/provider/Settings.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5034,6 +5034,12 @@ public static void setShowGTalkServiceStatusForUser(ContentResolver cr, boolean
50345034
public static final String[] LEGACY_RESTORE_SETTINGS = {
50355035
};
50365036

5037+
/**
5038+
* Whether to enable screenshot sound
5039+
* @hide
5040+
*/
5041+
public static final String SCREENSHOT_SOUND = "screenshot_sound";
5042+
50375043
/**
50385044
* These are all public system settings
50395045
*

‎packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,5 +89,6 @@ public class SystemSettings {
8989
Settings.System.VOLUME_ROCKER_WAKE,
9090
Settings.System.VOLUME_BUTTON_MUSIC_CONTROL,
9191
Settings.System.LOCKSCREEN_MEDIA_ART,
92+
Settings.System.SCREENSHOT_SOUND,
9293
};
9394
}

‎packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,5 +221,6 @@ public boolean validate(@Nullable String value) {
221221
VALIDATORS.put(System.KEY_APP_SWITCH_ACTION, new InclusiveIntegerRangeValidator(0, 9));
222222
VALIDATORS.put(System.KEY_APP_SWITCH_LONG_PRESS_ACTION, new InclusiveIntegerRangeValidator(0, 9));
223223
VALIDATORS.put(System.LOCKSCREEN_MEDIA_ART, BOOLEAN_VALIDATOR);
224+
VALIDATORS.put(System.SCREENSHOT_SOUND, BOOLEAN_VALIDATOR);
224225
}
225226
}

‎packages/SystemUI/res/layout/media_view.xml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -165,16 +165,6 @@
165165
android:paddingBottom="30dp"
166166
android:splitTrack="false" />
167167

168-
<!-- App name -->
169-
<TextView
170-
android:id="@+id/app_name"
171-
android:layout_width="0dp"
172-
android:layout_height="wrap_content"
173-
android:singleLine="true"
174-
android:fontFamily="@*android:string/config_headlineFontFamily"
175-
android:textDirection="locale"
176-
android:textSize="14sp" />
177-
178168
<!-- Song name -->
179169
<TextView
180170
android:id="@+id/header_title"

‎packages/SystemUI/res/values/dimens.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1251,7 +1251,7 @@
12511251
<dimen name="qs_media_width">350dp</dimen>
12521252
<dimen name="qs_media_padding">16dp</dimen>
12531253
<dimen name="qs_media_panel_outer_padding">16dp</dimen>
1254-
<dimen name="qs_media_album_size">52dp</dimen>
1254+
<dimen name="qs_media_album_size">120dp</dimen>
12551255
<dimen name="qs_media_icon_size">16dp</dimen>
12561256
<dimen name="qs_center_guideline_padding">10dp</dimen>
12571257
<dimen name="qs_seamless_icon_size">@dimen/qs_media_icon_size</dimen>

‎packages/SystemUI/res/values/revengeos_dimens.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
Copyright (C) 2020 RevengeOS
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+
http://www.apache.org/licenses/LICENSE-2.0
8+
Unless required by applicable law or agreed to in writing, software
9+
distributed under the License is distributed on an "AS IS" BASIS,
10+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
See the License for the specific language governing permissions and
12+
limitations under the License.
13+
-->
14+
<resources>
15+
<dimen name="quick_settings_top_margin_media">4dp</dimen>
16+
17+
<dimen name="quick_settings_top_margin_media_extra">10dp</dimen>
18+
19+
<dimen name="qs_media_action_button_size">48dp</dimen>
20+
21+
</resources>

‎packages/SystemUI/res/xml/media_collapsed.xml‎

Lines changed: 58 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!--
3-
~ Copyright (C) 2020 The Android Open Source Project
3+
~ Copyright (C) 2021 Project 404
44
~
55
~ Licensed under the Apache License, Version 2.0 (the "License");
66
~ you may not use this file except in compliance with the License.
@@ -17,42 +17,46 @@
1717
<ConstraintSet
1818
xmlns:android="http://schemas.android.com/apk/res/android"
1919
xmlns:app="http://schemas.android.com/apk/res-auto">
20+
2021
<Constraint
21-
android:id="@+id/icon"
22-
android:layout_width="@dimen/qs_media_icon_size"
23-
android:layout_height="@dimen/qs_media_icon_size"
24-
android:layout_marginStart="18dp"
25-
app:layout_constraintTop_toTopOf="@id/app_name"
26-
app:layout_constraintBottom_toBottomOf="@id/app_name"
22+
android:id="@+id/album_art"
23+
android:layout_width="120dp"
24+
android:layout_height="120dp"
25+
android:layout_marginTop="@dimen/qs_media_panel_outer_padding"
26+
android:layout_marginBottom="@dimen/qs_media_panel_outer_padding"
27+
android:layout_marginStart="@dimen/qs_media_panel_outer_padding"
28+
app:layout_constraintEnd_toStartOf="@id/media_action_barrier"
29+
app:layout_constraintHorizontal_bias="0.0"
2730
app:layout_constraintStart_toStartOf="parent"
31+
app:layout_constraintTop_toTopOf="parent"
2832
/>
2933

3034
<Constraint
31-
android:id="@+id/app_name"
32-
android:layout_width="0dp"
33-
android:layout_height="wrap_content"
34-
android:layout_marginEnd="@dimen/qs_center_guideline_padding"
35-
android:layout_marginStart="10dp"
36-
android:layout_marginTop="20dp"
35+
android:id="@+id/icon"
36+
android:layout_width="@dimen/qs_media_icon_size"
37+
android:layout_height="@dimen/qs_media_icon_size"
38+
android:layout_marginTop="@dimen/qs_media_panel_outer_padding"
39+
android:layout_marginStart="18dp"
40+
app:layout_constraintStart_toEndOf="@id/album_art"
3741
app:layout_constraintTop_toTopOf="parent"
38-
app:layout_constraintStart_toEndOf="@id/icon"
39-
app:layout_constraintEnd_toStartOf="@id/center_vertical_guideline"
40-
app:layout_constraintHorizontal_bias="0"
4142
/>
4243

4344
<Constraint
4445
android:id="@+id/media_seamless"
4546
android:layout_width="wrap_content"
4647
android:layout_height="wrap_content"
47-
app:layout_constraintEnd_toEndOf="parent"
48-
app:layout_constraintTop_toTopOf="parent"
48+
android:layout_gravity="center_vertical"
49+
android:layout_marginTop="6dp"
50+
android:layout_marginStart="@dimen/qs_center_guideline_padding"
51+
android:layout_marginEnd="@dimen/qs_center_guideline_padding"
4952
app:layout_constrainedWidth="true"
50-
app:layout_constraintWidth_min="60dp"
51-
app:layout_constraintStart_toEndOf="@id/center_vertical_guideline"
53+
app:layout_constraintEnd_toEndOf="parent"
54+
app:layout_constraintHeight_min="16dp"
5255
app:layout_constraintHorizontal_bias="1"
53-
android:layout_marginTop="@dimen/qs_media_panel_outer_padding"
54-
android:layout_marginEnd="@dimen/qs_media_panel_outer_padding"
55-
android:layout_marginStart="@dimen/qs_center_guideline_padding"
56+
app:layout_constraintHorizontal_chainStyle="spread_inside"
57+
app:layout_constraintStart_toEndOf="@id/icon"
58+
app:layout_constraintTop_toTopOf="parent"
59+
app:layout_constraintWidth_min="16dp"
5660
/>
5761

5862
<Constraint
@@ -61,39 +65,27 @@
6165
android:layout_height="@dimen/qs_seamless_fallback_icon_size"
6266
android:layout_marginEnd="@dimen/qs_seamless_fallback_end_margin"
6367
android:layout_marginStart="@dimen/qs_center_guideline_padding"
68+
app:layout_constraintBottom_toBottomOf="@id/icon"
69+
app:layout_constraintEnd_toEndOf="parent"
70+
app:layout_constraintHorizontal_bias="1"
6471
android:alpha="0.5"
6572
android:visibility="gone"
66-
app:layout_constraintHorizontal_bias="1"
67-
app:layout_constraintEnd_toEndOf="parent"
68-
app:layout_constraintTop_toTopOf="@id/app_name"
69-
app:layout_constraintBottom_toBottomOf="@id/app_name"
73+
app:layout_constraintTop_toTopOf="@id/icon"
7074
app:layout_constraintStart_toEndOf="@id/center_vertical_guideline"
7175
/>
7276

73-
<Constraint
74-
android:id="@+id/album_art"
75-
android:layout_width="@dimen/qs_media_album_size"
76-
android:layout_height="@dimen/qs_media_album_size"
77-
android:layout_marginTop="16dp"
78-
android:layout_marginStart="@dimen/qs_media_panel_outer_padding"
79-
android:layout_marginBottom="24dp"
80-
app:layout_constraintTop_toBottomOf="@id/icon"
81-
app:layout_constraintStart_toStartOf="parent"
82-
app:layout_constraintBottom_toBottomOf="parent"
83-
/>
84-
8577
<!-- Song name -->
8678
<Constraint
8779
android:id="@+id/header_title"
8880
android:layout_width="wrap_content"
8981
android:layout_height="wrap_content"
90-
android:layout_marginTop="17dp"
91-
android:layout_marginStart="16dp"
82+
android:layout_marginTop="@dimen/qqs_media_spacing"
83+
android:layout_marginStart="@dimen/qqs_media_spacing"
9284
app:layout_constrainedWidth="true"
93-
app:layout_constraintTop_toBottomOf="@id/app_name"
85+
app:layout_constraintTop_toBottomOf="@id/icon"
9486
app:layout_constraintBottom_toTopOf="@id/header_artist"
9587
app:layout_constraintStart_toEndOf="@id/album_art"
96-
app:layout_constraintEnd_toStartOf="@id/media_action_barrier"
88+
app:layout_constraintEnd_toEndOf="parent"
9789
app:layout_constraintHorizontal_bias="0"/>
9890

9991
<!-- Artist name -->
@@ -102,13 +94,14 @@
10294
android:layout_width="wrap_content"
10395
android:layout_height="wrap_content"
10496
android:layout_marginTop="3dp"
105-
android:layout_marginBottom="24dp"
97+
android:layout_marginBottom="@dimen/qqs_media_spacing"
98+
android:layout_marginEnd="@dimen/qs_media_panel_outer_padding"
10699
app:layout_constrainedWidth="true"
100+
app:layout_constraintHorizontal_bias="0"
101+
app:layout_constraintEnd_toEndOf="parent"
107102
app:layout_constraintTop_toBottomOf="@id/header_title"
108103
app:layout_constraintStart_toStartOf="@id/header_title"
109-
app:layout_constraintEnd_toStartOf="@id/media_action_barrier"
110-
app:layout_constraintBottom_toBottomOf="parent"
111-
app:layout_constraintHorizontal_bias="0"/>
104+
/>
112105

113106
<!-- Seek Bar -->
114107
<Constraint
@@ -140,15 +133,15 @@
140133
android:id="@+id/action0"
141134
android:layout_width="48dp"
142135
android:layout_height="48dp"
143-
android:layout_marginStart="4dp"
136+
android:layout_marginStart="@dimen/qqs_media_spacing"
137+
android:layout_marginBottom="@dimen/qs_media_panel_outer_padding"
144138
android:layout_marginEnd="4dp"
145-
android:layout_marginTop="18dp"
146139
android:visibility="gone"
147140
app:layout_constraintHorizontal_chainStyle="packed"
148-
app:layout_constraintTop_toBottomOf="@id/app_name"
149141
app:layout_constraintLeft_toLeftOf="parent"
150142
app:layout_constraintRight_toLeftOf="@id/action1"
151-
app:layout_constraintHorizontal_bias="1"
143+
app:layout_constraintHorizontal_bias="0"
144+
app:layout_constraintTop_toBottomOf="@id/header_artist"
152145
>
153146
</Constraint>
154147

@@ -158,10 +151,11 @@
158151
android:layout_height="48dp"
159152
android:layout_marginStart="4dp"
160153
android:layout_marginEnd="4dp"
161-
android:layout_marginTop="18dp"
162-
app:layout_constraintTop_toBottomOf="@id/app_name"
154+
android:layout_marginBottom="@dimen/qs_media_panel_outer_padding"
155+
app:layout_constraintBottom_toBottomOf="parent"
163156
app:layout_constraintLeft_toRightOf="@id/action0"
164157
app:layout_constraintRight_toLeftOf="@id/action2"
158+
app:layout_constraintTop_toBottomOf="@id/header_artist"
165159
>
166160
</Constraint>
167161

@@ -171,21 +165,23 @@
171165
android:layout_height="48dp"
172166
android:layout_marginStart="4dp"
173167
android:layout_marginEnd="4dp"
174-
android:layout_marginTop="18dp"
175-
app:layout_constraintTop_toBottomOf="@id/app_name"
168+
android:layout_marginBottom="@dimen/qs_media_panel_outer_padding"
169+
app:layout_constraintBottom_toBottomOf="parent"
176170
app:layout_constraintLeft_toRightOf="@id/action1"
177171
app:layout_constraintRight_toLeftOf="@id/action3"
172+
app:layout_constraintTop_toBottomOf="@id/header_artist"
178173
>
179174
</Constraint>
180175

181176
<Constraint
182177
android:id="@+id/action3"
183178
android:layout_width="48dp"
184179
android:layout_height="48dp"
180+
android:layout_marginBottom="@dimen/qs_media_panel_outer_padding"
185181
android:layout_marginStart="4dp"
186182
android:layout_marginEnd="4dp"
187-
android:layout_marginTop="18dp"
188-
app:layout_constraintTop_toBottomOf="@id/app_name"
183+
app:layout_constraintBottom_toBottomOf="parent"
184+
app:layout_constraintTop_toBottomOf="@id/header_artist"
189185
app:layout_constraintLeft_toRightOf="@id/action2"
190186
app:layout_constraintRight_toLeftOf="@id/action4"
191187
>
@@ -195,13 +191,14 @@
195191
android:id="@+id/action4"
196192
android:layout_width="48dp"
197193
android:layout_height="48dp"
198-
android:layout_marginStart="4dp"
199-
android:layout_marginEnd="4dp"
200194
android:visibility="gone"
201-
android:layout_marginTop="18dp"
195+
android:layout_marginBottom="@dimen/qs_media_panel_outer_padding"
196+
android:layout_marginEnd="@dimen/qs_media_panel_outer_padding"
197+
android:layout_marginStart="4dp"
202198
app:layout_constraintHorizontal_chainStyle="packed"
203-
app:layout_constraintTop_toBottomOf="@id/app_name"
199+
app:layout_constraintTop_toBottomOf="@id/header_artist"
204200
app:layout_constraintLeft_toRightOf="@id/action3"
201+
app:layout_constraintBottom_toBottomOf="parent"
205202
app:layout_constraintRight_toRightOf="parent"
206203
app:layout_constraintHorizontal_bias="0"
207204
>

0 commit comments

Comments
 (0)