PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 7752790 from e9cea6a4aa to sc-v2-release

Browse Source 
Change-Id: I391ead7d212f71588d94f8b52b0a7adb00a7319b
This commit is contained in:
Android Build Coastguard Worker
2021-09-21 23:08:06 +00:00
parent 133f9b4be6 e9cea6a4aa
commit 2ff2b9e4e5
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/xml/adb_wireless_settings.xml
View File

@@ -42,7 +42,8 @@
<!-- Pairing methods category --> <!-- Pairing methods category -->
<PreferenceCategory <PreferenceCategory
android:key="adb_pairing_methods_category" android:key="adb_pairing_methods_category"
android:layout="@layout/preference_category_no_label"> android:layout="@layout/preference_category_no_label"
settings:allowDividerAbove="true">
<!-- qrcode scanner --> <!-- qrcode scanner -->
<Preference <Preference
android:key="adb_pair_method_qrcode_pref" android:key="adb_pair_method_qrcode_pref"
@@ -52,6 +53,7 @@
settings:controller="com.android.settings.development.AdbQrCodePreferenceController"/> settings:controller="com.android.settings.development.AdbQrCodePreferenceController"/>
<Preference <Preference
android:key="adb_pair_method_code_pref" android:key="adb_pair_method_code_pref"
android:icon="@drawable/ic_password"
android:title="@string/adb_pair_method_code_title" android:title="@string/adb_pair_method_code_title"
android:summary="@string/adb_pair_method_code_summary"/> android:summary="@string/adb_pair_method_code_summary"/>
</PreferenceCategory> </PreferenceCategory>
@@ -59,7 +61,8 @@
<!-- Paired devices list --> <!-- Paired devices list -->
<PreferenceCategory <PreferenceCategory
android:key="adb_paired_devices_category" android:key="adb_paired_devices_category"
android:title="@string/adb_paired_devices_title"/> android:title="@string/adb_paired_devices_title"
settings:allowDividerAbove="true"/>
<!-- Off message: Shown only in the off state --> <!-- Off message: Shown only in the off state -->
<PreferenceCategory <PreferenceCategory

2
src/com/android/settings/accessibility/AccessibilityControlTimeoutPreferenceFragment.java
View File

@@ -69,7 +69,7 @@ public final class AccessibilityControlTimeoutPreferenceFragment extends Dashboa
@Override @Override
public int getMetricsCategory() { public int getMetricsCategory() {
return SettingsEnums.ACCESSIBILITY; return SettingsEnums.ACCESSIBILITY_TIMEOUT;
} }
@Override @Override

2
src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizard.java
View File

@@ -33,7 +33,7 @@ public class ToggleSelectToSpeakPreferenceFragmentForSetupWizard
@Override @Override
public int getMetricsCategory() { public int getMetricsCategory() {
return SettingsEnums.SUW_ACCESSIBILITY_TOGGLE_SCREEN_READER; return SettingsEnums.SUW_ACCESSIBILITY_TOGGLE_SELECT_TO_SPEAK;
} }
@Override @Override