Commit Graph

120726 Commits

Author SHA1 Message Date
Diya Bera
bee78a3d59 Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev am: 9777ea2fdf am: 9a93c8a00f am: 3a4c6feb0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911480

Change-Id: Ieaf430842a766ff697b5de93bf4ed24db05186ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-11 02:00:12 +00: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
Bill Yi
869cd2a572 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-10 21:18:23 +00:00
Bill Yi
fa0cc20b94 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-10 21:18:23 +00:00
Bill Yi
8fe591389b Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-10 21:18:23 +00:00
Diya Bera
9777ea2fdf Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev 2023-03-10 21:11:09 +00:00
Vania Januar
adb043c201 Merge "Show single icon layout for unknown device type in advanced header." into udc-dev am: 76452f3a1f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21700162

Change-Id: I172f16edeaabf7374f9a77cd67daf0ac5808a64b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 18:55:54 +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
2f6bb387f0 Merge "Adb is disconnecting during Monkey Test Run." am: 821e70ea59 am: c8a58a249d am: 3c62dd3543 am: a38c972ef0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2348443

Change-Id: I5b3920550c231799afcc28c7aeb3150712bd57a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 17:57:53 +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
Marcelo Arteiro
e161c61575 Merge "Revert "Automated Token Alignment Android/Material"" into udc-dev am: 7e2d77a717
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21944880

Change-Id: Id3cc5c2fd50d8b5c34b7695796ae6047d76016d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 14:09:10 +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
775719b968 Merge "Do not crash when duplication found in merged imsi list" am: ae267bae74 am: 0da4abe1db am: 4beef2e82e am: 3eb30fb31c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2479336

Change-Id: I2c70953e9d9c7ab8db48bafd8e194ac196374acc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 11:26:22 +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
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
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
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
18df885c94 Merge "Use updated lockscreen validation API in Settings." into udc-dev 2023-03-09 22:15:43 +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
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
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
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
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
Ankita Vyas
9dc72b2f94 Merge "Display toast for clone app creation and completion in App Info page." into udc-dev am: f9c62f2275
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809544

Change-Id: Iea9c165e0d63ea77e022da5d81b50b0b791343a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 05:44:42 +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
Yu-Ting Tseng
31a4ff212f Merge "Remove CACHED_PROC_STATES which is unused." into tm-qpr-dev am: f7a098295f am: 11ab38f690 am: 0f90688ede
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21779083

Change-Id: I6bb33610c8fe6aae7ec6eded96831092aba7c2d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 23:27:00 +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