Skip to content
Snippets Groups Projects
Commit c65544bf authored by Chris Göllner's avatar Chris Göllner Committed by Chris Göllner
Browse files

PSS permission dialog - Add missing hover and focus states 

- The toggles hover state is fixed by removing their artificial container

- The spinner hover state is achieved by using a color selector

Fixes: 342593242
Test: Manually
Flag: NONE Bug fix
Change-Id: I069cf4225bb483d3562737968608d867e07d0c1c
parent 88178f7c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
packages/SystemUI/res/color/screenshare_options_spinner_background.xml 0 → 100644
+ 22
− 0
View file @ c65544bf
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2024 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"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<item android:state_hovered="false" android:state_focused="false" android:color="@android:color/transparent" />
<item android:state_focused="true" android:color="?androidprv:attr/materialColorOnSurface" android:alpha=".1" />
<item android:state_hovered="true" android:color="?androidprv:attr/materialColorOnSurface" android:alpha=".08" />
</selector>
packages/SystemUI/res/drawable/screenshare_options_spinner_background.xml
+ 1
− 1
View file @ c65544bf
......@@ -22,7 +22,7 @@
<stroke
android:width="1dp"
android:color="?androidprv:attr/textColorTertiary" />
<solid android:color="@android:color/transparent"/>
<solid android:color="@color/screenshare_options_spinner_background"/>
</shape>
</item>
<item
......
packages/SystemUI/res/layout/screen_record_options.xml
+ 17
− 29
View file @ c65544bf
......@@ -40,22 +40,16 @@
android:popupBackground="@drawable/screenrecord_spinner_background"
android:dropDownWidth="274dp"
android:importantForAccessibility="yes"/>
<FrameLayout
android:id="@+id/screenrecord_audio_switch_container"
<Switch
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<Switch
android:layout_width="wrap_content"
android:minWidth="48dp"
android:layout_height="48dp"
android:layout_gravity="end"
android:focusable="false"
android:clickable="false"
android:id="@+id/screenrecord_audio_switch"
android:contentDescription="@string/screenrecord_audio_label"
style="@style/ScreenRecord.Switch"
android:importantForAccessibility="yes"/>
</FrameLayout>
android:minWidth="48dp"
android:layout_height="48dp"
android:layout_gravity="end"
android:id="@+id/screenrecord_audio_switch"
android:contentDescription="@string/screenrecord_audio_label"
style="@style/ScreenRecord.Switch"
android:importantForAccessibility="yes" />
</LinearLayout>
<LinearLayout
android:id="@+id/show_taps"
......@@ -81,20 +75,14 @@
android:fontFamily="@*android:string/config_bodyFontFamily"
android:textColor="?android:attr/textColorPrimary"
android:contentDescription="@string/screenrecord_taps_label"/>
<FrameLayout
android:id="@+id/screenrecord_taps_switch_container"
<Switch
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<Switch
android:layout_width="wrap_content"
android:minWidth="48dp"
android:layout_height="48dp"
android:focusable="false"
android:clickable="false"
android:id="@+id/screenrecord_taps_switch"
android:contentDescription="@string/screenrecord_taps_label"
style="@style/ScreenRecord.Switch"
android:importantForAccessibility="yes"/>
</FrameLayout>
android:minWidth="48dp"
android:layout_height="48dp"
android:id="@+id/screenrecord_taps_switch"
android:contentDescription="@string/screenrecord_taps_label"
style="@style/ScreenRecord.Switch"
android:importantForAccessibility="yes" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialogDelegate.kt
+ 0
− 8
View file @ c65544bf
......@@ -29,7 +29,6 @@ import android.view.MotionEvent.ACTION_MOVE
import android.view.View
import android.view.View.GONE
import android.view.View.VISIBLE
import android.view.ViewGroup
import android.view.accessibility.AccessibilityNodeInfo
import android.widget.AdapterView
import android.widget.ArrayAdapter
......@@ -114,10 +113,8 @@ class ScreenRecordPermissionDialogDelegate(
}
private lateinit var tapsSwitch: Switch
private lateinit var tapsSwitchContainer: ViewGroup
private lateinit var tapsView: View
private lateinit var audioSwitch: Switch
private lateinit var audioSwitchContainer: ViewGroup
private lateinit var options: Spinner
override fun createDialog(): SystemUIDialog {
......@@ -164,17 +161,12 @@ class ScreenRecordPermissionDialogDelegate(
private fun initRecordOptionsView() {
audioSwitch = dialog.requireViewById(R.id.screenrecord_audio_switch)
tapsSwitch = dialog.requireViewById(R.id.screenrecord_taps_switch)
audioSwitchContainer = dialog.requireViewById(R.id.screenrecord_audio_switch_container)
tapsSwitchContainer = dialog.requireViewById(R.id.screenrecord_taps_switch_container)
// Add these listeners so that the switch only responds to movement
// within its target region, to meet accessibility requirements
audioSwitch.setOnTouchListener { _, event -> event.action == ACTION_MOVE }
tapsSwitch.setOnTouchListener { _, event -> event.action == ACTION_MOVE }
audioSwitchContainer.setOnClickListener { audioSwitch.toggle() }
tapsSwitchContainer.setOnClickListener { tapsSwitch.toggle() }
tapsView = dialog.requireViewById(R.id.show_taps)
updateTapsViewVisibility()
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment