Vania Januar
5b24c992e1
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: I5cf3fa692a8bd992e78b2a42fe3817487683f5e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 18:55:27 +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
f719ca7ec0
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: I8b60d17de7e930436142107da0dfd1fee29c0c88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 17:58:19 +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
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
52cd57fc7f
Merge "Revert "Automated Token Alignment Android/Material"" into udc-dev am: 7e2d77a717 am: e7250864cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21944880
Change-Id: I6f9b7b60ed8abb98abf53a9d3b7b69ebbecb5e4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 14:43:17 +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
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
e7250864cd
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: Ia16e68a02b5f88082f4b6f7468580d261a6cb422
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 14:09:07 +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
50ef1baad4
Merge "Do not crash when duplication found in merged imsi list" am: ae267bae74 am: 0da4abe1db am: 4beef2e82e am: 3eb30fb31c am: 101d035e5f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2479336
Change-Id: Ief45cbb7ab7a0d2b51e4a521bdf8ae1bd7bacff9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 13:14:50 +00:00
George Chang
f308aa1117
Merge "Update title string for Nfc Tag App Preference" into udc-dev am: 541a7153a5 am: 3785967f8e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21918803
Change-Id: I57c46bd49a6c4d6a707dc1e5c4d2f17c99a88100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 13:14:30 +00:00
Ting-Kang Chang
68523a3f0c
Merge "Add debug logs for updateBatteryStatus and TopLevelBatteryPreferenceController updating." into udc-dev am: d31de7593e am: 3d500900b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21858528
Change-Id: Ic02188652ed4fc324258c87369891563d4028044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 13:13:38 +00:00
Junyu Lai
101d035e5f
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: Ib5ac7af875fc0e29301739ebe147b93eb8e207c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 12:41:54 +00:00
George Chang
3785967f8e
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: I6bae3dfae9a53f92761770b2a7aa08b923b2d115
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 12:41:45 +00:00
Ting-Kang Chang
3d500900b7
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: Ia1311e3f57008829afa03d6dcca6b985b86d7302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 12:41:13 +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
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
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
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
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