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
7d750aaef5
Merge "Update title string for Nfc Tag App Preference" into udc-dev am: 541a7153a5
am: 8995b86814
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21918803
Change-Id: I9a933c196acaf98bf5c8d0cf23f92c32d2ddf396
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 06:12:23 +00:00
George Chang
8995b86814
Merge "Update title string for Nfc Tag App Preference" into udc-dev am: 541a7153a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21918803
Change-Id: I4765b87b59613ce12bf280229df9d6cd65fd82c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 05:48:23 +00:00
George Chang
541a7153a5
Merge "Update title string for Nfc Tag App Preference" into udc-dev
2023-03-10 05:11:20 +00:00
Cathy Chen
8208de8cf4
Merge "Revert "Use updated lockscreen validation API in Settings.""
2023-03-10 04:25:46 +00:00
Cathy Chen
093658dbb6
Revert "Use updated lockscreen validation API in Settings."
...
Revert submission 21914417-lskf-api-review1
Reason for revert: build break
Reverted changes: /q/submissionid:21914417-lskf-api-review1
Bug: 272574624
Change-Id: I3cc824924efd239b25415e500a48bf6deb0c3c9b
2023-03-10 04:04:54 +00:00
Ting-Kang Chang
c746960886
Merge "Add debug logs for updateBatteryStatus and TopLevelBatteryPreferenceController updating." into udc-dev am: d31de7593e
am: b2c2836b19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21858528
Change-Id: I3abe3392cfcb349890eeacf75a437ea9a0f1d5fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 03:25:41 +00:00
Ting-Kang Chang
b2c2836b19
Merge "Add debug logs for updateBatteryStatus and TopLevelBatteryPreferenceController updating." into udc-dev am: d31de7593e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21858528
Change-Id: Ic182026d44537fa2548eb629affe5c1f2afdd40c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 03:01:53 +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
Automerger Merge Worker
5153de354b
Merge "Merge "Use updated lockscreen validation API in Settings." into udc-dev am: 18df885c94
am: 56deb1bde4"
2023-03-09 23:10:45 +00:00
Dmitry Dementyev
36537e895b
Merge "Use updated lockscreen validation API in Settings." into udc-dev am: 18df885c94
am: 56deb1bde4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21910534
Change-Id: I6e1395bd9d4d675b9919cc16f3630747095b8416
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-09 23:10:17 +00:00
Dmitry Dementyev
ac7e7903ec
Merge "Use updated lockscreen validation API in Settings." into udc-dev am: 18df885c94
am: 938be1cfa0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21910534
Change-Id: I08f402b2c9512bbc6051f21b7ececac31b93a550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-09 23:09:57 +00:00
Dmitry Dementyev
938be1cfa0
Merge "Use updated lockscreen validation API in Settings." into udc-dev am: 18df885c94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21910534
Change-Id: I3fb05dd24e4f5ca655115fbc3ec669f79e41c788
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-09 22:45:41 +00:00
Dmitry Dementyev
56deb1bde4
Merge "Use updated lockscreen validation API in Settings." into udc-dev am: 18df885c94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21910534
Change-Id: I0335cc899f0fc5b88497e5d0be3821365518e60f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-09 22:45:31 +00:00
Dmitry Dementyev
18df885c94
Merge "Use updated lockscreen validation API in Settings." into udc-dev
2023-03-09 22:15:43 +00:00
Dmitry Dementyev
77a4bbe35c
Merge "Use updated lockscreen validation API in Settings."
2023-03-09 20:23:36 +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
90bf81095f
Add "Speed & compatibility" preference to Wi-Fi hotspot Settings am: bcca5ebf1a
am: d9026c1914
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21858522
Change-Id: Ibd62c667830c16ca9be546b329600da773da3ca1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-09 16:34:03 +00:00
Weng Su
881d84e088
Add "Speed & compatibility" preference to Wi-Fi hotspot Settings am: bcca5ebf1a
am: 581269c33a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21858522
Change-Id: I1d77989126213d9a01db50d9c714830cfd0c7503
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-09 16:31:43 +00:00
Weng Su
d9026c1914
Add "Speed & compatibility" preference to Wi-Fi hotspot Settings am: bcca5ebf1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21858522
Change-Id: I8731bece358e754a93ad6751ccfc81df82fd8578
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-09 15:59:11 +00:00
Weng Su
581269c33a
Add "Speed & compatibility" preference to Wi-Fi hotspot Settings am: bcca5ebf1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21858522
Change-Id: I1449370d6ea68fdf215572ee495429006f44c8f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-09 15:58:42 +00: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
2d825c6d05
Merge "Remove battery event time detection from StylusUpdater." into udc-dev am: ebf06975e3
am: 9f07af6d03
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21787129
Change-Id: I89e676836b17e2cb23cc9482aee263ad7c05811f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-09 11:50:30 +00:00
YK Hung
251dc1fa57
Merge "Add configChanges for PowerUsageSummaryActivity for rotation" into udc-dev am: 16b4fb33e8
am: d4128903dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21918805
Change-Id: I2be7d2d3d93aabda29ef93e4f9f778b03c3714d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-09 11:49:41 +00:00
Vania Januar
40b748e139
Merge "Remove battery event time detection from StylusUpdater." into udc-dev am: ebf06975e3
am: 026cd4273a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21787129
Change-Id: I9ee831feb00c2249cbd2bdca634602c68833dd2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-09 11:32:20 +00:00
YK Hung
a2758a5f35
Merge "Add configChanges for PowerUsageSummaryActivity for rotation" into udc-dev am: 16b4fb33e8
am: c05e7dabf0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21918805
Change-Id: I4812dc6a224078ac50205e676b7a888d12a9d0fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-09 11:29:50 +00:00
Vania Januar
9f07af6d03
Merge "Remove battery event time detection from StylusUpdater." into udc-dev am: ebf06975e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21787129
Change-Id: I251939d46600738e4b22fc6209b54ec721b23961
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-09 11:13:31 +00:00
YK Hung
d4128903dc
Merge "Add configChanges for PowerUsageSummaryActivity for rotation" into udc-dev am: 16b4fb33e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21918805
Change-Id: I8f80ef73fb77fb71688fdce2a78e43d601824cdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-09 11:12:51 +00:00
Vania Januar
026cd4273a
Merge "Remove battery event time detection from StylusUpdater." into udc-dev am: ebf06975e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21787129
Change-Id: I51edf97f50865769e1431484203e94d65e2c1cd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-09 11:09:15 +00:00
YK Hung
c05e7dabf0
Merge "Add configChanges for PowerUsageSummaryActivity for rotation" into udc-dev am: 16b4fb33e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21918805
Change-Id: Ibc77b30118851625895da35d41946683f02794a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-09 11:08:33 +00:00
Bill Yi
3c3f35c7dd
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9426f51c0dc4c7ef8fbd6294d10d87277f1f55d3
2023-03-09 02:58:16 -08:00
Bill Yi
44d7c4e2ae
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibbca2af983f0af8ded727f60e4aecf71df2220ae
2023-03-09 02:48:56 -08:00
Bill Yi
9d5a9fbb23
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifc1fb1ffb46cb18743b69d6e673e4c05bec8eb3c
2023-03-09 02:46:48 -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
Justin Ghan
50b613bea9
Merge "Support stylus handwriting in settings search bar" into udc-dev am: 037eda8910
am: ad618f755a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21477804
Change-Id: I7216d4e65df4b52c2a0570eb04e795ada03ded29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-09 08:03:08 +00:00
Justin Ghan
386dac40c1
Merge "Support stylus handwriting in settings search bar" into udc-dev am: 037eda8910
am: 6d1acfa875
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21477804
Change-Id: Ic83b60e33ff9165a12aedb92a1d44b4af510b112
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-09 08:01:44 +00:00
Justin Ghan
ad618f755a
Merge "Support stylus handwriting in settings search bar" into udc-dev am: 037eda8910
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21477804
Change-Id: I6839d9b7f0f248caa25825558728c9bd402cf01c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-09 07:31:59 +00:00
Justin Ghan
6d1acfa875
Merge "Support stylus handwriting in settings search bar" into udc-dev am: 037eda8910
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21477804
Change-Id: I71736317c7d900bcebd6227c66b7103ad557000d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-09 07:31:18 +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
Ankita Vyas
0d20909f0a
Merge "Display toast for clone app creation and completion in App Info page." into udc-dev am: f9c62f2275
am: c0ebdcfd49
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809544
Change-Id: Ic966eb8acd1507597fdea7e707437e62f86e8e5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-09 06:18:02 +00:00
Ankita Vyas
18fc54b53e
Merge "Display toast for clone app creation and completion in App Info page." into udc-dev am: f9c62f2275
am: 9dc72b2f94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809544
Change-Id: I34a93564916fac6f74e2097cbe5dea508ac3a235
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-09 06:16:52 +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