Commit Graph

98552 Commits

Author SHA1 Message Date
Bonian Chen
7f94d2ba0e Merge "[Crash] finish activity without super#onResume()" into sc-v2-dev am: 5d1400f8b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16005289

Change-Id: I2b2c907e8341e1b80cc6145998dccc7a5dfab8cf
2021-11-01 14:06:24 +00:00
Bonian Chen
5d1400f8b2 Merge "[Crash] finish activity without super#onResume()" into sc-v2-dev 2021-11-01 13:56:03 +00:00
TreeHugger Robot
9abf3e5e76 Merge "Optimize battery optimize page control flow" into sc-v2-dev am: c6a5bcc933 am: 137f9acac1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16138630

Change-Id: I53031d3f0c7abe2ac1a089534f0908c939ffb49c
2021-11-01 08:20:08 +00:00
TreeHugger Robot
137f9acac1 Merge "Optimize battery optimize page control flow" into sc-v2-dev am: c6a5bcc933
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16138630

Change-Id: Ic9d497517b6778c413909917d485575a054dc331
2021-11-01 08:07:13 +00:00
TreeHugger Robot
c6a5bcc933 Merge "Optimize battery optimize page control flow" into sc-v2-dev 2021-11-01 07:53:21 +00:00
Hugh Chen
f8cd68c6e2 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission
- Only enable device can be discoverable when the user launch
  "Connected Devices settings" through settings and systemui

Bug: 194695497
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.

Change-Id: Ia04ab759b737acf30b782f5c5831dd59f25fb257
(cherry picked from commit d3abbb9821)
2021-11-01 07:44:18 +00:00
Hugh Chen
d4e0ed2284 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission
- Only enable device can be discoverable when the user launch
  "Connected Devices settings" through settings and systemui

Bug: 194695497
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.

Change-Id: Ia04ab759b737acf30b782f5c5831dd59f25fb257
(cherry picked from commit d3abbb9821)
2021-11-01 07:37:33 +00:00
Jason Chiu
1e00dc9c9a Declare a highlight menu key for ButtonNavigationSettingsAssistController
Bug: 204695404
Test: manual
Change-Id: I787824d0a4ef79d697bb7cd254fca6fb9b64d16f
2021-11-01 15:32:39 +08:00
tim peng
8e9b052de4 Merge "Phone fails to switch channel mode from stereo to mono" am: 41cfaa9f29 am: a4197a7aa1 am: e6ebfee220 am: 63ec94e217 am: ad58b6cd59
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1873736

Change-Id: Ida42e9357e1bfab46436632e1e08d23da737d8ca
2021-11-01 07:25:44 +00:00
tim peng
ad58b6cd59 Merge "Phone fails to switch channel mode from stereo to mono" am: 41cfaa9f29 am: a4197a7aa1 am: e6ebfee220 am: 63ec94e217
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1873736

Change-Id: I93a51e0129d7791e619f2af80d84010daa998d3a
2021-11-01 07:11:43 +00:00
Hugh Chen
528d40e4d1 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission
- Only enable device can be discoverable when the user launch
  "Connected Devices settings" through settings and systemui

Bug: 194695497
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.

Change-Id: Ia04ab759b737acf30b782f5c5831dd59f25fb257
(cherry picked from commit d3abbb9821)
2021-11-01 07:01:34 +00:00
tim peng
63ec94e217 Merge "Phone fails to switch channel mode from stereo to mono" am: 41cfaa9f29 am: a4197a7aa1 am: e6ebfee220
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1873736

Change-Id: Ie0838ac36286b679f0ed5158ce97e0669f1fe2db
2021-11-01 07:01:31 +00:00
Hugh Chen
249f9e2696 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission
- Only enable device can be discoverable when the user launch
  "Connected Devices settings" through settings and systemui

Bug: 194695497
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.

Change-Id: Ia04ab759b737acf30b782f5c5831dd59f25fb257
(cherry picked from commit d3abbb9821)
2021-11-01 07:00:33 +00:00
Jason Chiu
2989c50a23 Add highlight menu keys for all toggle pref controllers and custom slices
Bug: 204695404
Test: manual, robotest build pass, unit
Change-Id: Iad2e28ada8ddb766ffa7eff2c8dc581250cbd6f8
2021-11-01 15:00:18 +08:00
Hugh Chen
d7c50f7952 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission
- Only enable device can be discoverable when the user launch
  "Connected Devices settings" through settings and systemui

Bug: 194695497
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.

Change-Id: Ia04ab759b737acf30b782f5c5831dd59f25fb257
(cherry picked from commit d3abbb9821)
2021-11-01 06:58:55 +00:00
Hugh Chen
b1adf980a5 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission
- Only enable device can be discoverable when the user launch
  "Connected Devices settings" through settings and systemui

Bug: 194695497
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.

Change-Id: Ia04ab759b737acf30b782f5c5831dd59f25fb257
(cherry picked from commit d3abbb9821)
2021-11-01 06:57:09 +00:00
Hugh Chen
58d81fbbb4 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission
- Only enable device can be discoverable when the user launch
  "Connected Devices settings" through settings and systemui

Bug: 194695497
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.

Change-Id: Ia04ab759b737acf30b782f5c5831dd59f25fb257
2021-11-01 06:56:12 +00:00
TreeHugger Robot
9caca05e59 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 33b0ddcb9f -s ours am: 803a4a84a8 -s ours am: 17d3f20ebf -s ours am: 5ca439352e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720

Change-Id: Id78320268c5969e57caabb54e9e1e07f8568fd71
2021-11-01 06:55:54 +00:00
TreeHugger Robot
8f97c068a7 [automerger skipped] Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d" into sc-qpr1-dev am: 15e9a44b45 -s ours am: c95398214f -s ours am: 35cc26c1d1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720

Change-Id: Ifa50ffb8bc4324c60a9e5d2d1eda51fd7b57fde8
2021-11-01 06:54:03 +00:00
TreeHugger Robot
18e7e66eb7 Merge changes from topic "presubmit-am-11a27b06803045468001e263b4b441f0" into sc-qpr1-dev am: 49400133f1 am: 348a01d9fe am: 14949b4a73
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720

Change-Id: I9a0610b7c02c38be982f73d4c0a9c966ed8ad2c1
2021-11-01 06:54:01 +00:00
Bill Yi
d1fef05ffc [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d am: 88711716d8 -s ours am: c6a1634ddd -s ours am: e97ccea80d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720

Change-Id: I397d75926218109552996c7f19eddf0b3be85112
2021-11-01 06:54:00 +00:00
TreeHugger Robot
b226386bed [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 07709bfd9e -s ours am: ba70207c32 -s ours am: eb76baa8f4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155721

Change-Id: Icd98d15748b509b1d6e8626bbb07198cc4f401cb
2021-11-01 06:52:46 +00:00
Wesley.CW Wang
151b88f76f Optimize battery optimize page control flow
- Post the setup logic into background and setup once only when leaving
 this page, this can improve the performance since we won't setup
 every time when switching preference

Bug: 195306545
Bug: 199892006
Test: make SettingsRoboTests
Change-Id: I1c3ee4673cf5cdba0abe39f208dfb1412082c579
2021-11-01 14:52:42 +08:00
TreeHugger Robot
7267fa688e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b41f6a01a3 -s ours am: 89064bf1a0 -s ours am: 320aa7acf2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155722

Change-Id: I6abe268e1c8d07ff75ee5267a8722823008f2418
2021-11-01 06:52:17 +00:00
TreeHugger Robot
e0d1ec377b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 33b0ddcb9f -s ours am: 3ef8ed0bac -s ours am: 0bf0236ef5 -s ours am: 759efbe3d9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720

Change-Id: Ia8b503e78fe3114de726e86334d7038fb04f81c0
2021-11-01 06:51:38 +00:00
Automerger Merge Worker
0b98263e67 Merge "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eb45210f6a am: c0eaec8037 -s ours" into sc-qpr1-dev-plus-aosp am: ebb11f1e6e -s ours am: 0121404997 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16156271

Change-Id: I55f90925673555e2cc6ebec1eeb5befcc74d519f
2021-11-01 06:49:10 +00:00
Bill Yi
38d1d63dfb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eb45210f6a -s ours am: d497dee907 -s ours am: 4080a4ffd4 -s ours am: 2b9e68f26b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16156271

Change-Id: I8d359572f4fe04347c50f20e89c1ac68f048c671
2021-11-01 06:48:35 +00:00
TreeHugger Robot
d1d7fbb770 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 33b0ddcb9f -s ours am: 803a4a84a8 -s ours am: cb81759d15 -s ours am: fd3b39ea3e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720

Change-Id: Ie6df36abac1d14a88856fed8c9379441010bee41
2021-11-01 06:47:37 +00:00
TreeHugger Robot
3ebf3d1694 [automerger skipped] Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d" into sc-dev-plus-aosp am: dfb6af177f -s ours am: 671b1b64a7 -s ours am: d62c988995 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720

Change-Id: Id1de98e7928e47fc7410ab4f945bfe7f429d8a96
2021-11-01 06:45:52 +00:00
Bill Yi
d4b40c3dce [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d am: 4f200606a9 -s ours am: 94b058a0c1 -s ours am: 01d1cd7df5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720

Change-Id: I0bb83a867229f0e3cf2df413776f84723a4f81fa
2021-11-01 06:45:49 +00:00
TreeHugger Robot
95a731669d [automerger skipped] Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d" into sc-qpr1-dev am: 15e9a44b45 -s ours am: fe2a7627dc -s ours am: 8adc1c1d96 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720

Change-Id: I0cb50cf9e94e1ee8a3f4c56d34fcf3d1682df79c
2021-11-01 06:43:53 +00:00
TreeHugger Robot
8d8c462e57 Merge changes from topic "presubmit-am-11a27b06803045468001e263b4b441f0" into sc-qpr1-dev am: 49400133f1 am: 5a64962814 am: 53c3e1d04e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720

Change-Id: Ic5481d52fd1d97cba5f7b7e8ebbfe681289ddfaf
2021-11-01 06:43:52 +00:00
Bill Yi
e84fedf3cd [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d am: 88711716d8 -s ours am: de92464a0c -s ours am: 350c637e83 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720

Change-Id: I283b89e5b8e5ca7d114262dc9a29ab0b43dd2048
2021-11-01 06:43:49 +00:00
TreeHugger Robot
00fc28d01d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 07709bfd9e -s ours am: 0f8deae0af -s ours am: 6c62f6369e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155721

Change-Id: I40b5ad291ae3ad35f6cfcc6576d79a21b4c45171
2021-11-01 06:40:55 +00:00
TreeHugger Robot
0e90451e08 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b41f6a01a3 -s ours am: c2041123e6 -s ours am: 3ee9239392 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155722

Change-Id: Id158e2c8eb8aefccaa4fbc0007b76c8573f609f9
2021-11-01 06:37:53 +00:00
tim peng
e6ebfee220 Merge "Phone fails to switch channel mode from stereo to mono" am: 41cfaa9f29 am: a4197a7aa1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1873736

Change-Id: I1d17526b87d442bc3513a1e7f526fcf5ff11e881
2021-11-01 06:36:53 +00:00
TreeHugger Robot
5ca439352e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 33b0ddcb9f -s ours am: 803a4a84a8 -s ours am: 17d3f20ebf -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720

Change-Id: Ic9b134881349b5a3386b602f030247cb72230fea
2021-11-01 06:32:44 +00:00
TreeHugger Robot
35cc26c1d1 [automerger skipped] Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d" into sc-qpr1-dev am: 15e9a44b45 -s ours am: c95398214f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720

Change-Id: I6fdb5ce965d62aa9412452867633452776867533
2021-11-01 06:32:28 +00:00
TreeHugger Robot
14949b4a73 Merge changes from topic "presubmit-am-11a27b06803045468001e263b4b441f0" into sc-qpr1-dev am: 49400133f1 am: 348a01d9fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720

Change-Id: Id8807d589752d09a0dc1d81ac95b233136f0e898
2021-11-01 06:32:26 +00:00
Bill Yi
e97ccea80d [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d am: 88711716d8 -s ours am: c6a1634ddd -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720

Change-Id: Ibbb933a4ac6d5a50362e92f8f8b4d7b0a3d223c3
2021-11-01 06:32:25 +00:00
TreeHugger Robot
eb76baa8f4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 07709bfd9e -s ours am: ba70207c32 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155721

Change-Id: If9655984778d70ae1c72a6a20b148a2ce5e18d0d
2021-11-01 06:32:13 +00:00
Bill Yi
ae27fcd1a7 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eb45210f6a am: c0eaec8037 -s ours am: c7d8d778f6 -s ours am: 6e0c66918c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16156271

Change-Id: I69610c513f283120cb012d6ad12bdd84c092d7ea
2021-11-01 06:32:09 +00:00
TreeHugger Robot
320aa7acf2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b41f6a01a3 -s ours am: 89064bf1a0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155722

Change-Id: I9a08fe0d12604d164def4873b04e756ddb349815
2021-11-01 06:31:45 +00:00
TreeHugger Robot
759efbe3d9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 33b0ddcb9f -s ours am: 3ef8ed0bac -s ours am: 0bf0236ef5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720

Change-Id: I030b1631f02cc7cd45ddf5a7b5c351208e917deb
2021-11-01 06:31:40 +00:00
Automerger Merge Worker
0121404997 Merge "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eb45210f6a am: c0eaec8037 -s ours" into sc-qpr1-dev-plus-aosp am: ebb11f1e6e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16156271

Change-Id: I241e0febd74f41521b9f39812b6fcb91192ef97e
2021-11-01 06:30:41 +00:00
Jason Chiu
594eb43159 Support slice deep links highlighting menu entries
- Add an interface to get highlight menu key resource in Sliceable
- Force implementing the new interface in TogglePreferenceController and
  CustomSliceable at syntax level
- Update the slice index db schema

Bug: 204695404
Test: manual, robotest build pass, unit
Change-Id: I0b5068bccd04f1590023de7f3385bc0a4c6fa47b
2021-11-01 14:27:34 +08:00
TreeHugger Robot
ca3f658192 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b450a4518e -s ours am: 0563e86e06 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155723

Change-Id: Iede77b5a484271e7d07b8904bee7384387429589
2021-11-01 06:25:44 +00:00
Bill Yi
2b9e68f26b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eb45210f6a -s ours am: d497dee907 -s ours am: 4080a4ffd4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16156271

Change-Id: I089e7c196e86c99d336d2fd2f63410f7b62c571c
2021-11-01 06:24:12 +00:00
TreeHugger Robot
3df9f11dbb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 1cc1696a72 -s ours am: 3b8fc0d70d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155789

Change-Id: Ib9af0cc1fa0f79f4db880a5ca5747886c502e042
2021-11-01 06:23:37 +00:00
TreeHugger Robot
fd3b39ea3e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 33b0ddcb9f -s ours am: 803a4a84a8 -s ours am: cb81759d15 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720

Change-Id: I90b422741fda58bf1e545b5c4ae10f222ed583e4
2021-11-01 06:22:33 +00:00