Paul Wang
d4fbc38279
Merge "Avoid disabling LE Audio when BT is off" am: dd3d813ff3
am: d60b851b93
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2472124
Change-Id: I2ba651e080ca1f054ff03d3d125848031ced4e51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-13 10:58:14 +00:00
Paul Wang
d60b851b93
Merge "Avoid disabling LE Audio when BT is off" am: dd3d813ff3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2472124
Change-Id: I231847656a260eff43204306faf8c3908c9fc8e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-13 10:22:11 +00:00
TreeHugger Robot
85ca6e6a5e
Merge "Fix b/273175976: Screen time counts the time before full charge." into udc-dev
2023-03-13 10:15:36 +00:00
Paul Wang
dd3d813ff3
Merge "Avoid disabling LE Audio when BT is off"
2023-03-13 09:55:49 +00:00
jasonwshsu
6a2db7ee4d
Return getMetricsCategory() for each new page hearing aid and flash notifications in android U
...
Bug: 262839191
Test: manual test
Change-Id: I066f49a2537b798132b484f6eff0d0314a164138
2023-03-13 17:45:30 +08:00
Jason Hsu
de202d5307
Merge "The string of "Hearing device shortcut" is displayed wrong when shortcut set to gesture." into udc-dev
2023-03-13 09:34:58 +00:00
Zoey Chen
63978e7e52
[Settings] 1. Show default subId SIM page if get an intent with invalid
...
subId 2. Fix the hotswap UI issue
Bug: 271635200
Bug: 271347499
Test: local test
Change-Id: Iac61a211fce7bcd85da48cb291f46584cf43f5c5
2023-03-13 08:12:20 +00:00
Zaiyue Xue
a528f1e382
Fix b/273175976: Screen time counts the time before full charge.
...
Use the raw start timestamp instead of the first timestamp in the level
map to query app usage time.
Bug: 273175976
Fix: 273175976
Test: manual
Change-Id: Idb43b2bd5378e2f34ec722354408754f4a439c6d
2023-03-13 15:59:05 +08:00
Candice Lo
b64632bcf7
[automerger skipped] Merge "Set the settings key when the font size is changed" into tm-qpr-dev am: 91eab671d1
am: 934beb4127
-s ours
...
am skip reason: Merged-In I382e4ecd3c335d7b046f157cedc093fc40c3a77a with SHA-1 dbaea0f1c2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21791725
Change-Id: Ib94406415a0913a62c1a93a4a3ab56b25543950e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-13 07:57:53 +00:00
Candice Lo
934beb4127
Merge "Set the settings key when the font size is changed" into tm-qpr-dev am: 91eab671d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21791725
Change-Id: I0b61473ac3ef0a91e2ed901d7b2deb1e35268866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-13 07:22:21 +00:00
Candice Lo
91eab671d1
Merge "Set the settings key when the font size is changed" into tm-qpr-dev
2023-03-13 06:51:27 +00:00
jasonwshsu
2bf80d8bf2
The string of "Hearing device shortcut" is displayed wrong when shortcut set to gesture.
...
Root Cause: Did not update dialog when user back to previous page.
Solution: Merge the solution in ToggleFeaturePreferenceFragment.java
Bug: 263451053
Test: manual test
Change-Id: I99513fa70cf44b32a0fb78a5f953e41373e086f4
2023-03-12 20:47:25 +08:00
jasonwshsu
052c07b4d4
Click the search result "System Sounds" will crash the Settings app
...
Root Cause: Preferences in this page need to pass CachedBluetoothDevice or will finish the page imediately
Solution: theses preferences are in device detail page which will only show when device get connected. Show them in search result is not reasonable. Remove them.
Bug: 270508779
Test: verfiy it did not show in search result
Change-Id: I866d7be158ff87343d76fa0b3173382880c4aa6e
2023-03-12 02:48:13 +08:00
Diya Bera
3a4c6feb0a
Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev am: 9777ea2fdf
am: 9a93c8a00f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911480
Change-Id: I27b79bf6dcc69e42ea3af7f5b1274173676996fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-11 01:14:57 +00:00
Diya Bera
9a93c8a00f
Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev am: 9777ea2fdf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911480
Change-Id: Iddfaa9baa18e16d3b1f5e06de88d74faf208c811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 23:26:58 +00:00
Diya Bera
9777ea2fdf
Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev
2023-03-10 21:11:09 +00:00
Taran Singh
1ec8dff6d6
[Settings] Make scribe setting default_on and secure
...
1. Migrate scribe pref to Settings.Secure
2. Consider enabled when not set.
Bug: 272376168
Test: atest StylusDevicesControllerTest StylusHandwritingPreferenceControllerTest.java
Change-Id: I4973a93c2cfe8c44f461b68fbda1a853e49340a2
2023-03-10 18:31:03 +00:00
Behnam Heydarshahi
806297f85c
Extend settings panel under navigation bar
...
The panel used to sit above the navigation bar. Now it extends down all
the way to the edge of the screen.
Bug: b/250484565
Test: make ROBOTEST_FILTER=SettingsPanelActivityTest RunSettingsRoboTests -j40
Test: Manual. When volume panel is opened, verify that it extends all
the way to the bottom of the window, instead of sitting on navigation
bar. Panel can be opened with:
adb shell am start -a android.settings.panel.action.VOLUME
Substitute VOLUME with NFC and WIFI for the other settings panels.
Change-Id: Ibae5d3602231e2309b5ff847c630a1f8c82ea355
2023-03-10 18:30:08 +00:00
Vania Januar
76452f3a1f
Merge "Show single icon layout for unknown device type in advanced header." into udc-dev
2023-03-10 18:15:37 +00:00
Treehugger Robot
a38c972ef0
Merge "Adb is disconnecting during Monkey Test Run." am: 821e70ea59
am: c8a58a249d
am: 3c62dd3543
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2348443
Change-Id: If51239c47ffc2ebf9c80ce5b8f2e27d8b187a871
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 17:04:09 +00:00
Treehugger Robot
3c62dd3543
Merge "Adb is disconnecting during Monkey Test Run." am: 821e70ea59
am: c8a58a249d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2348443
Change-Id: I8ec06e45f02f48bfec30051159ed8a931a11e2e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 16:27:37 +00:00
Treehugger Robot
c8a58a249d
Merge "Adb is disconnecting during Monkey Test Run." am: 821e70ea59
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2348443
Change-Id: I76493ccb15ff2d58045061ef4c62b20f772aab30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 15:53:41 +00:00
Treehugger Robot
821e70ea59
Merge "Adb is disconnecting during Monkey Test Run."
2023-03-10 15:19:15 +00:00
Neil Fuller
7ddbef73f0
Fix a crash due to absence of no-arg fragment init
...
Fix a crash due to absence of no-arg fragment constructor.
e.g. if the dialog were shown and the device were rotated, the dialog
could not be restored.
Bug: 272439218
Test: Manual with repro steps before and after
Change-Id: Idca052acff709af132fa72f7919aa71fe8060595
2023-03-10 15:16:05 +00:00
Marcelo Arteiro
7e2d77a717
Merge "Revert "Automated Token Alignment Android/Material"" into udc-dev
2023-03-10 13:43:23 +00:00
Junyu Lai
3eb30fb31c
Merge "Do not crash when duplication found in merged imsi list" am: ae267bae74
am: 0da4abe1db
am: 4beef2e82e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2479336
Change-Id: I7323a6fbd1e8f7595fdb7c29e7520cff5ac12a00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 10:48:49 +00:00
Junyu Lai
4beef2e82e
Merge "Do not crash when duplication found in merged imsi list" am: ae267bae74
am: 0da4abe1db
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2479336
Change-Id: Ia79b5f286b4269c38fc3a2fa990615251694a020
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 10:12:13 +00:00
Junyu Lai
0da4abe1db
Merge "Do not crash when duplication found in merged imsi list" am: ae267bae74
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2479336
Change-Id: I3e55fc5496918d8e2d0c230df74b62e1e6847fb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 09:37:20 +00:00
Junyu Lai
ae267bae74
Merge "Do not crash when duplication found in merged imsi list"
2023-03-10 09:01:44 +00:00
Mill Chen
ba6d2c3417
Update the font family for panel slice
...
Bug: 267370921
Test: visual verified
Change-Id: I2e01d672d396b4a436599839d7b35f129e4b97d6
2023-03-10 16:57:52 +08:00
danielwbhuang
a6b78f6d01
The PK settings UI should show subtype labels instead of the subtype's language names.
...
1. Use InputMethodSubtype#getDisplayName()
2. Sorting by label
Video: https://screencast.googleplex.com/cast/NjEzMjM3OTI0OTgwMzI2NHxiODBhNjQzZi1kZA
Bug: 271504879
Test: manual
Change-Id: Ia2be6f3a007c678e62bdda21fe20d95a2b304d70
2023-03-10 16:43:39 +08:00
George Chang
541a7153a5
Merge "Update title string for Nfc Tag App Preference" into udc-dev
2023-03-10 05:11:20 +00:00
Ting-Kang Chang
d31de7593e
Merge "Add debug logs for updateBatteryStatus and TopLevelBatteryPreferenceController updating." into udc-dev
2023-03-10 02:32:59 +00:00
Marcelo Arteiro
1b599e0232
Revert "Automated Token Alignment Android/Material"
...
This reverts commit c9ca4a9014
.
Reason for revert: Black Search Box in Settings App (Light Theme)
Change-Id: I936e977ce044b8da41d818d6b3392adc6fd1e4e6
2023-03-09 23:40:40 +00:00
Dmitry Dementyev
18df885c94
Merge "Use updated lockscreen validation API in Settings." into udc-dev
2023-03-09 22:15:43 +00:00
Lucas Silva
4ace76e6c2
Add home controls button to screensaver settings
...
Toggle will allow users to disable showing home controls over their
screensaver.
Bug: 271330583
Test: make -j64 RunSettingsRoboTests
Change-Id: I9600cdb85d85253c859c88f12c1d074e1082bf97
2023-03-09 14:58:26 -05:00
Weng Su
bcca5ebf1a
Add "Speed & compatibility" preference to Wi-Fi hotspot Settings
...
- Show 4 speed types in summary
- 2.4 Ghz
- 5 Ghz
- 2.4 and 5 GHz
- 6 GHz
Bug: 245258763
Test: manual test
atest -c WifiTetherViewModelTest
atest -c WifiHotspotRepositoryTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSettingsTest
Change-Id: I6deb41cb355b0ceb1f1fd2d84408a83b90433e7d
2023-03-09 20:06:37 +08:00
Vania Januar
ebf06975e3
Merge "Remove battery event time detection from StylusUpdater." into udc-dev
2023-03-09 10:32:51 +00:00
Junyu Lai
8005bc8f5b
Do not crash when duplication found in merged imsi list
...
For some unknown reason, the merged imsi list might contain
duplicated items. Deduplication for better error handling.
Test: make RunSettingsRoboTests
Fix: 271298466
Change-Id: I3cbe8f9441769963a16720fc5128db173fa0868b
2023-03-09 16:55:35 +08:00
YK Hung
16b4fb33e8
Merge "Add configChanges for PowerUsageSummaryActivity for rotation" into udc-dev
2023-03-09 08:50:19 +00:00
ykhung
0c3957db8b
Add configChanges for PowerUsageSummaryActivity for rotation
...
Add configChanges to avoid the battery settings main page is recreated while rotating the device to improve rotation performance, but we still need to investigate the PowerUsageAdvanced re-create case
Bug: 271380711
Test: presubmit & manual
Change-Id: I7629de89d9d23b08fc82369e1f9f79081e99625a
2023-03-09 15:22:12 +08:00
Justin Ghan
037eda8910
Merge "Support stylus handwriting in settings search bar" into udc-dev
2023-03-09 07:02:58 +00:00
George Chang
a6addced52
Update title string for Nfc Tag App Preference
...
Bug: 244272155
Test: manual
Change-Id: I41ac15099f2d6fd0a7d7858f191d5ec0336b97b9
2023-03-09 06:02:48 +00:00
Ting-Kang Chang
ec90572f75
Add debug logs for updateBatteryStatus and TopLevelBatteryPreferenceController updating.
...
Bug: 271665638
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I1c9cc3cfcb54051223df2ad46947d7f0c1ebbdb0
2023-03-09 13:22:53 +08:00
Ankita Vyas
f9c62f2275
Merge "Display toast for clone app creation and completion in App Info page." into udc-dev
2023-03-09 05:10:55 +00:00
Diya Bera
8ceded494f
Remove subtext when enrollment stage changes
...
Bug: 272145668
Test: Manual (Try enrolling fingerprint in UDFPS, the subtext should
disappear when lottie asset is introduced)
Change-Id: I912ff2b32644d05cc189105ae1679fa14b04a1ef
2023-03-08 23:00:47 +00:00
Yu-Ting Tseng
0f90688ede
Merge "Remove CACHED_PROC_STATES which is unused." into tm-qpr-dev am: f7a098295f
am: 11ab38f690
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21779083
Change-Id: Ic12845f37d61bd197c3c7eaeecf742aac572947b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-08 22:49:49 +00:00
Yu-Ting Tseng
11ab38f690
Merge "Remove CACHED_PROC_STATES which is unused." into tm-qpr-dev am: f7a098295f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21779083
Change-Id: I995d75f9a0cf98b329f0de672a7677307a434695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-08 22:17:51 +00:00
Dmitry Dementyev
1ab3fe5a9e
Use updated lockscreen validation API in Settings.
...
Test: manual
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Bug: 269256333
Change-Id: I660dea98eace96ed241b0a90f12ddeb742381dc0
2023-03-08 22:09:25 +00:00
Yu-Ting Tseng
f7a098295f
Merge "Remove CACHED_PROC_STATES which is unused." into tm-qpr-dev
2023-03-08 21:24:57 +00:00