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
cbc16fc5af
Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev am: 9777ea2fdf
am: 9a93c8a00f
am: 3a4c6feb0a
am: 0fcf95b375
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911480
Change-Id: I189d43953b4cb8c0844f918d531298422d1699a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-11 03:02:14 +00:00
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
0fcf95b375
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: I50bc1a5529ebb04798f8b41c7cfa675bcaff54bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-11 02:29:44 +00:00
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
8b02de1799
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 869cd2a572
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21925629
Change-Id: Icded7105ee4854ad9943c554f2bdeb49e4fc814d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 21:50:54 +00:00
Bill Yi
f5fe27e59e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 44d7c4e2ae
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21925629
Change-Id: I943f12820f36dc7bcfbc1264ac2bdaa4fa64c623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 21:50:47 +00:00
Bill Yi
c2f0c7b380
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fa0cc20b94
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21924253
Change-Id: I809f5c79ff573848275a196be5b08a2b74b41ece
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 21:50:44 +00:00
Bill Yi
03c863614d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c3f35c7dd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21924253
Change-Id: I62904eafe1d1b0cbd4b08cf84a761137e8e889c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 21:50:40 +00:00
Bill Yi
b052aa6400
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 8fe591389b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21924251
Change-Id: I94b235b1e698bb00fd2f3f9394c2629ca5f96557
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 21:50:36 +00:00
Bill Yi
c0c88802c4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d5a9fbb23
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21924251
Change-Id: I1176718cb5f1cb2af438642fa2a30462082e9098
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 21:48:30 +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
1883fc0bf6
Merge "Show single icon layout for unknown device type in advanced header." into udc-dev am: 76452f3a1f
am: adb043c201
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21700162
Change-Id: Iafe427fa7342385bfd71b03328310e5082e4e463
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 19:24:46 +00:00
Treehugger Robot
758f403273
Merge "Adb is disconnecting during Monkey Test Run." am: 821e70ea59
am: c8a58a249d
am: 3c62dd3543
am: a38c972ef0
am: 2f6bb387f0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2348443
Change-Id: I04df492aaa2cfc42d7de65c41788f3dceb582dd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 19:22:10 +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
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
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
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
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