Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update screen record dialog to spec" into sc-dev

Browse Source
This commit is contained in:
Beth Thibodeau
2021-06-29 19:25:28 +00:00
committed by Android (Google) Code Review
parent 160fb766f1 64def4b394
commit f9a115817a
15 changed files with 278 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
packages/SystemUI/res/color/screenrecord_switch_thumb_color.xml Normal file
View File

@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2021 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Disabled status of thumb -->
<item android:state_enabled="false"
android:color="@android:color/system_neutral2_100" />
<!-- Toggle off status of thumb -->
<item android:state_checked="false"
android:color="@android:color/system_neutral2_100" />
<!-- Enabled or toggle on status of thumb -->
<item android:color="@android:color/system_accent1_100" />
</selector>

27
packages/SystemUI/res/color/screenrecord_switch_track_color.xml Normal file
View File

@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2021 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Disabled status of thumb -->
<item android:state_enabled="false"
android:color="@android:color/system_neutral2_600"
android:alpha="?android:attr/disabledAlpha" />
<!-- Toggle off status of thumb -->
<item android:state_checked="false"
android:color="@android:color/system_neutral2_600" />
<!-- Enabled or toggle on status of thumb -->
<item android:color="@android:color/system_accent1_600" />
</selector>

15
packages/SystemUI/res/drawable/ic_touch.xml
View File

@@ -13,14 +13,13 @@ Copyright (C) 2020 The Android Open Source Project
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- maybe need android:fillType="evenOdd" -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="#FF000000"
android:pathData="M9,7.5V11.24C7.79,10.43 7,9.06 7,7.5C7,5.01 9.01,3 11.5,3C13.99,3 16,5.01 16,7.5C16,9.06 15.21,10.43 14,11.24V7.5C14,6.12 12.88,5 11.5,5C10.12,5 9,6.12 9,7.5ZM14.3,13.61L18.84,15.87C19.37,16.09 19.75,16.63 19.75,17.25C19.75,17.31 19.74,17.38 19.73,17.45L18.98,22.72C18.87,23.45 18.29,24 17.54,24H10.75C10.34,24 9.96,23.83 9.69,23.56L4.75,18.62L5.54,17.82C5.74,17.62 6.02,17.49 6.33,17.49C6.39,17.49 6.4411,17.4989 6.4922,17.5078C6.5178,17.5122 6.5433,17.5167 6.57,17.52L10,18.24V7.5C10,6.67 10.67,6 11.5,6C12.33,6 13,6.67 13,7.5V13.5H13.76C13.95,13.5 14.13,13.54 14.3,13.61Z"
/>
android:fillColor="@android:color/white"
android:pathData="M18.19,12.44l-3.24,-1.62c1.29,-1 2.12,-2.56 2.12,-4.32c0,-3.03 -2.47,-5.5 -5.5,-5.5s-5.5,2.47 -5.5,5.5c0,2.13 1.22,3.98 3,4.89v3.26c-2.11,-0.45 -2.01,-0.44 -2.26,-0.44c-0.53,0 -1.03,0.21 -1.41,0.59L4,16.22l5.09,5.09C9.52,21.75 10.12,22 10.74,22h6.3c0.98,0 1.81,-0.7 1.97,-1.67l0.8,-4.71C20.03,14.32 19.38,13.04 18.19,12.44zM17.84,15.29L17.04,20h-6.3c-0.09,0 -0.17,-0.04 -0.24,-0.1l-3.68,-3.68l4.25,0.89V6.5c0,-0.28 0.22,-0.5 0.5,-0.5c0.28,0 0.5,0.22 0.5,0.5v6h1.76l3.46,1.73C17.69,14.43 17.91,14.86 17.84,15.29zM8.07,6.5c0,-1.93 1.57,-3.5 3.5,-3.5s3.5,1.57 3.5,3.5c0,0.95 -0.38,1.81 -1,2.44V6.5c0,-1.38 -1.12,-2.5 -2.5,-2.5c-1.38,0 -2.5,1.12 -2.5,2.5v2.44C8.45,8.31 8.07,7.45 8.07,6.5z"/>
</vector>

30
packages/SystemUI/res/drawable/screenrecord_button_background_outline.xml Normal file
View File

@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2021 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
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle">
<stroke
android:color="?androidprv:attr/colorAccentPrimary"
android:width="1dp"/>
<corners android:radius="24dp"/>
<padding
android:left="16dp"
android:right="16dp"
android:top="8dp"
android:bottom="8dp" />
<solid android:color="@android:color/transparent" />
</shape>

27
packages/SystemUI/res/drawable/screenrecord_button_background_solid.xml Normal file
View File

@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2021 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.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle">
<corners android:radius="24dp"/>
<padding
android:left="16dp"
android:right="16dp"
android:top="8dp"
android:bottom="8dp" />
<solid android:color="?androidprv:attr/colorAccentPrimary" />
</shape>

23
packages/SystemUI/res/drawable/screenrecord_spinner_background.xml Normal file
View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2021 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.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle"
android:padding="12dp">
<corners android:radius="24dp"/>
<solid android:color="?androidprv:attr/colorAccentSecondary" />
</shape>

29
packages/SystemUI/res/drawable/screenrecord_switch_thumb.xml Normal file
View File

@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2021 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.
-->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:top="4dp"
android:left="4dp"
android:right="4dp"
android:bottom="4dp">
<shape android:shape="oval" >
<size android:height="20dp" android:width="20dp" />
<solid android:color="@color/screenrecord_switch_thumb_color" />
</shape>
</item>
</layer-list>

24
packages/SystemUI/res/drawable/screenrecord_switch_track.xml Normal file
View File

@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2021 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.
-->
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"
android:width="52dp"
android:height="28dp">
<solid android:color="@color/screenrecord_switch_track_color" />
<corners android:radius="35dp" />
</shape>

95
packages/SystemUI/res/layout/screen_record_dialog.xml
View File

@@ -28,6 +28,10 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="24dp"
android:paddingEnd="24dp"
android:paddingTop="26dp"
android:paddingBottom="30dp"
android:orientation="vertical">
<!-- Header -->
@@ -35,27 +39,28 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:gravity="center"
android:padding="@dimen/screenrecord_dialog_padding">
android:gravity="center">
<ImageView
android:layout_width="@dimen/screenrecord_logo_size"
android:layout_height="@dimen/screenrecord_logo_size"
android:src="@drawable/ic_screenrecord"
android:tint="@color/GM2_red_500"
android:layout_marginBottom="@dimen/screenrecord_dialog_padding"/>
android:tint="@color/screenrecord_icon_color"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:fontFamily="@*android:string/config_headlineFontFamily"
android:text="@string/screenrecord_start_label"/>
android:text="@string/screenrecord_start_label"
android:layout_marginTop="22dp"
android:layout_marginBottom="15dp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/screenrecord_description"
android:textAppearance="?android:attr/textAppearanceSmall"
android:paddingTop="@dimen/screenrecord_dialog_padding"
android:paddingBottom="@dimen/screenrecord_dialog_padding"/>
android:textColor="?android:textColorSecondary"
android:gravity="center"
android:layout_marginBottom="20dp"/>
<!-- Options -->
<LinearLayout
@@ -63,18 +68,21 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:layout_width="@dimen/screenrecord_logo_size"
android:layout_height="@dimen/screenrecord_logo_size"
android:layout_width="@dimen/screenrecord_option_icon_size"
android:layout_height="@dimen/screenrecord_option_icon_size"
android:src="@drawable/ic_mic_26dp"
android:tint="@color/GM2_grey_700"
android:tint="?android:attr/textColorSecondary"
android:layout_gravity="center"
android:layout_weight="0"
android:layout_marginRight="@dimen/screenrecord_dialog_padding"/>
android:layout_marginRight="@dimen/screenrecord_option_padding"/>
<Spinner
android:id="@+id/screen_recording_options"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_height="wrap_content"
android:minHeight="48dp"
android:layout_weight="1"
android:popupBackground="@drawable/screenrecord_spinner_background"
android:dropDownWidth="274dp"
android:prompt="@string/screenrecord_audio_label"/>
<Switch
android:layout_width="wrap_content"
@@ -83,63 +91,76 @@
android:layout_weight="0"
android:layout_gravity="end"
android:contentDescription="@string/screenrecord_audio_label"
android:id="@+id/screenrecord_audio_switch"/>
android:id="@+id/screenrecord_audio_switch"
style="@style/ScreenRecord.Switch"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:orientation="horizontal"
android:layout_marginTop="@dimen/screenrecord_option_padding">
<ImageView
android:layout_width="@dimen/screenrecord_logo_size"
android:layout_height="@dimen/screenrecord_logo_size"
android:layout_width="@dimen/screenrecord_option_icon_size"
android:layout_height="@dimen/screenrecord_option_icon_size"
android:layout_weight="0"
android:src="@drawable/ic_touch"
android:tint="@color/GM2_grey_700"
android:tint="?android:attr/textColorSecondary"
android:layout_gravity="center"
android:layout_marginRight="@dimen/screenrecord_dialog_padding"/>
<Switch
android:layout_width="match_parent"
android:layout_height="48dp"
android:id="@+id/screenrecord_taps_switch"
android:layout_marginRight="@dimen/screenrecord_option_padding"/>
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:minHeight="48dp"
android:layout_weight="1"
android:text="@string/screenrecord_taps_label"
android:textAppearance="?android:attr/textAppearanceMedium"
android:fontFamily="@*android:string/config_headlineFontFamily"
android:textColor="?android:attr/textColorPrimary"
android:textAppearance="?android:attr/textAppearanceSmall"/>
android:importantForAccessibility="no"/>
<Switch
android:layout_width="wrap_content"
android:minWidth="48dp"
android:layout_height="48dp"
android:layout_weight="0"
android:id="@+id/screenrecord_taps_switch"
android:contentDescription="@string/screenrecord_taps_label"
style="@style/ScreenRecord.Switch"/>
</LinearLayout>
</LinearLayout>
<!-- hr -->
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/GM2_grey_300"/>
<!-- Buttons -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="@dimen/screenrecord_dialog_padding">
<Button
android:layout_marginTop="36dp">
<TextView
android:id="@+id/button_cancel"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0"
android:layout_gravity="start"
android:text="@string/cancel"
style="@android:style/Widget.DeviceDefault.Button.Borderless.Colored"/>
android:textColor="?android:textColorPrimary"
android:background="@drawable/screenrecord_button_background_outline"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="14sp"/>
<Space
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"/>
<Button
<TextView
android:id="@+id/button_start"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0"
android:layout_gravity="end"
android:text="@string/screenrecord_start"
style="@android:style/Widget.DeviceDefault.Button.Colored"/>
android:textColor="@android:color/system_neutral1_900"
android:background="@drawable/screenrecord_button_background_solid"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="14sp"/>
</LinearLayout>
</LinearLayout>
</ScrollView>

13
packages/SystemUI/res/layout/screen_record_dialog_audio_source.xml
View File

@@ -19,18 +19,19 @@
android:layout_width="250dp"
android:layout_height="48dp"
android:orientation="vertical"
android:padding="13dp">
android:padding="12dp">
<TextView
android:id="@+id/screen_recording_dialog_source_text"
android:layout_width="250dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"/>
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="14sp"
android:textColor="@android:color/system_neutral1_900"/>
<TextView
android:id="@+id/screen_recording_dialog_source_description"
android:layout_width="250dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary"/>
android:textColor="@android:color/system_neutral2_700"/>
</LinearLayout>

3
packages/SystemUI/res/layout/screen_record_dialog_audio_source_selected.xml
View File

@@ -24,7 +24,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/screenrecord_audio_label"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textAppearance="?android:attr/textAppearanceMedium"
android:fontFamily="@*android:string/config_headlineFontFamily"
android:textColor="?android:attr/textColorPrimary"/>
<TextView
android:id="@+id/screen_recording_dialog_source_text"

1
packages/SystemUI/res/values/colors.xml
View File

@@ -272,6 +272,7 @@
<color name="misalignment_text_color">#F28B82</color>
<color name="screenrecord_status_color">#E94235</color>
<color name="screenrecord_icon_color">#D93025</color><!-- red 600 -->
<color name="privacy_chip_background">#3ddc84</color>

8
packages/SystemUI/res/values/dimens.xml
View File

@@ -1398,9 +1398,11 @@
<dimen name="controls_dialog_padding">32dp</dimen>
<dimen name="controls_dialog_control_width">200dp</dimen>
<!-- Screen Record -->
<dimen name="screenrecord_dialog_padding">18dp</dimen>
<dimen name="screenrecord_logo_size">24dp</dimen>
<!-- Screen record dialog -->
<dimen name="screenrecord_option_padding">18dp</dimen>
<dimen name="screenrecord_logo_size">26dp</dimen>
<dimen name="screenrecord_option_icon_size">24dp</dimen>
<!-- Screen record status bar icon -->
<dimen name="screenrecord_status_text_size">14sp</dimen>
<dimen name="screenrecord_status_icon_radius">7dp</dimen>
<dimen name="screenrecord_status_icon_width">21dp</dimen>

9
packages/SystemUI/res/values/styles.xml
View File

@@ -697,6 +697,15 @@
<item name="android:windowCloseOnTouchOutside">true</item>
</style>
<style name="ScreenRecord.Switch">
<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
<item name="android:switchMinWidth">52dp</item>
<item name="android:minHeight">48dp</item>
<item name="android:track">@drawable/settingslib_switch_track</item>
<item name="android:thumb">@drawable/settingslib_switch_thumb</item>
</style>
<!-- Screenshots -->
<style name="LongScreenshotActivity" parent="@android:style/Theme.DeviceDefault.DayNight">
<item name="android:windowNoTitle">true</item>

6
packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordDialog.java
View File

@@ -30,9 +30,9 @@ import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.Spinner;
import android.widget.Switch;
import android.widget.TextView;
import com.android.systemui.R;
import com.android.systemui.settings.UserContextProvider;
@@ -78,12 +78,12 @@ public class ScreenRecordDialog extends Activity {
setContentView(R.layout.screen_record_dialog);
Button cancelBtn = findViewById(R.id.button_cancel);
TextView cancelBtn = findViewById(R.id.button_cancel);
cancelBtn.setOnClickListener(v -> {
finish();
});
Button startBtn = findViewById(R.id.button_start);
TextView startBtn = findViewById(R.id.button_start);
startBtn.setOnClickListener(v -> {
requestScreenCapture();
finish();