Commit Graph

47525 Commits

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

Change-Id: I44eaa8ffc6cf0fb3ec6cabfacb1b672033fa6b2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-11 02:46:39 +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
Diya Bera
9777ea2fdf Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev 2023-03-10 21:11:09 +00:00
Vania Januar
61d5568e62 Merge "Show single icon layout for unknown device type in advanced header." into udc-dev am: 76452f3a1f am: 5b24c992e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21700162

Change-Id: I55e5d977c94731ee859bdab9323db620edbba7c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 18:59:42 +00:00
Treehugger Robot
e04405ab59 Merge "Adb is disconnecting during Monkey Test Run." am: 821e70ea59 am: c8a58a249d am: 3c62dd3543 am: a38c972ef0 am: f719ca7ec0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2348443

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

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

Change-Id: Ie2a9702e857b93b87aba055ea97172092e44d579
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 12:17:37 +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
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
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
Dmitry Dementyev
77a4bbe35c Merge "Use updated lockscreen validation API in Settings." 2023-03-09 20:23:36 +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
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
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
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
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
037eda8910 Merge "Support stylus handwriting in settings search bar" into udc-dev 2023-03-09 07:02:58 +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
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
31122aedf5 Merge "Remove CACHED_PROC_STATES which is unused." into tm-qpr-dev am: f7a098295f am: 11ab38f690 am: 0f90688ede am: 31a4ff212f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21779083

Change-Id: Ia321436ae069d5cae61a05902026b66b53bcc095
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 23:55:37 +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
Dmitry Dementyev
e3d665c9e4 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 13:38:54 -08: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
Vania Januar
4837c05b3f Remove battery event time detection from StylusUpdater.
StylusManager battery listener now triggers whenever the
stylus battery becomes stale, so we no longer need to track
event time from the updater.

Bug: 270422546
Test: StylusDeviceUpdaterTest
Change-Id: I36f5dc132a95f7d4649cec2bda1d457edc1f64bd
2023-03-08 18:33:56 +00:00
Justin Ghan
1cc772d30d Support stylus handwriting in settings search bar
Bug: 270708561
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.search
Change-Id: Iec6d6deb68b834654b2bbc11d96227db5319b0f0
2023-03-08 10:20:44 -08:00
Tiger Huang
0570923eac Merge "Add an developer option to enable config_navBarDefaultTransparent" into udc-dev am: 2238b4e807 am: a4b8956dcb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21519268

Change-Id: I58ef07ccf0627bf4aa8c08e00d37403860fdca04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 13:17:06 +00:00
Tiger Huang
2238b4e807 Merge "Add an developer option to enable config_navBarDefaultTransparent" into udc-dev 2023-03-08 12:47:29 +00:00
Ankita Vyas
0da1131343 Display toast for clone app creation and completion in App Info page.
Bug: 271990959
Test: manual
Change-Id: I93641c1bf675ac531fbf8201203d5141aafd39cc
2023-03-08 10:55:37 +00:00
TreeHugger Robot
899491b4bd Merge "Add subtitle to settings (settings)" 2023-03-08 07:12:45 +00:00
Maciej Żenczykowski
ce902ff182 Merge "settings: allow enabling ethernet tethering independent of link state" am: 905d584b15 am: f73112b56e am: 7e21dec65e am: 850993d166 am: 4b91b0318b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2475089

Change-Id: I5dbf849d66ba53715fe4d84c9510ff356d553962
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 06:39:45 +00:00
Maciej Żenczykowski
850993d166 Merge "settings: allow enabling ethernet tethering independent of link state" am: 905d584b15 am: f73112b56e am: 7e21dec65e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2475089

Change-Id: I5e5711aeb90bb8bd860fd8515975f2b7d90ce689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 05:28:51 +00:00