Commit Graph

96467 Commits

Author SHA1 Message Date
Daniel Solomon
cdf1cf85ee Merge "Update BrightnessInfo constructor usage" into sc-qpr1-dev am: 396939a577
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15918324

Change-Id: I155b6358e1ebafe3128bbc8c52f71fe391236ce3
2021-10-05 23:00:43 +00:00
Daniel Solomon
396939a577 Merge "Update BrightnessInfo constructor usage" into sc-qpr1-dev 2021-10-05 22:44:19 +00:00
TreeHugger Robot
c7dacf6bf4 Merge "Launch activities in another task if the metadata is set." into sc-v2-dev am: 14a90d0639 am: 3d86e97433
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959659

Change-Id: I7f4ce2f62faa7e2f9f27c6664b78239b29d31934
2021-10-05 12:07:28 +00:00
Weng Su
e92d1d1a6b [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"
This reverts commit 56a88885cc.

Reason for revert: rollback CLs to avoid compatibility risks

Bug: 185126813
Change-Id: Ie9d17faa536186e9787ff17b9bc7f7e30adabd1c
2021-10-05 12:03:07 +00:00
TreeHugger Robot
3d86e97433 Merge "Launch activities in another task if the metadata is set." into sc-v2-dev am: 14a90d0639
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959659

Change-Id: I1383024f1ce9c8b6c5f7e92d42c5d7bcd8756181
2021-10-05 11:58:59 +00:00
TreeHugger Robot
14a90d0639 Merge "Launch activities in another task if the metadata is set." into sc-v2-dev 2021-10-05 11:45:59 +00:00
Wesley.CW Wang
4137253658 Update adaptive preference summary
Bug: 195627250
Test: make RunSettingsRoboTests
Change-Id: I50ed736bbba7ac8d3d6fcf026e9e17e2116f86a7
2021-10-05 17:52:43 +08:00
Jason Chiu
73fa1f8e06 Create a provider for querying if embedding activity is enabled
Bug: 202103027
Test: manual
Change-Id: I97bd5fc9d1d6157ff11096678217f44175df0c8d
2021-10-05 17:25:52 +08:00
Bill Yi
c0af6253d6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a516da5761 -s ours am: e1ab06ff5f -s ours am: 6f20e41a38 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icbb5292e0685c55a9795a2499c68df1670b98194
2021-10-05 08:28:48 +00:00
Bill Yi
55cb5609d1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a516da5761 -s ours am: 1f44763e81 -s ours am: 9408e67823 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I08ce5407b96523b1e5d38def6f30e157e2498e55
2021-10-05 08:28:35 +00:00
Bill Yi
6f20e41a38 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a516da5761 -s ours am: e1ab06ff5f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I774485b2ffe98a7ab6e02020f1fb7c9bced583a6
2021-10-05 08:13:13 +00:00
Bill Yi
9408e67823 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a516da5761 -s ours am: 1f44763e81 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I78b960f9dae1117912b947616bb057f57ab59d52
2021-10-05 08:12:24 +00:00
Bill Yi
e1ab06ff5f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a516da5761 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia11fde412d70521c2955d4355c4c46956137c1ba
2021-10-05 07:49:05 +00:00
Bill Yi
1f44763e81 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a516da5761 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I00b1f3b12b11cabb628c10632fd6957ceedc410c
2021-10-05 07:49:00 +00:00
Yanting Yang
b093fb22e5 Merge "Start Safety & regulatory manual with new task" into sc-v2-dev am: 0a942ab338 am: 06b2992da4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895173

Change-Id: If51b269d398819a1424fc4ca53e2f33b94070f59
2021-10-05 04:05:20 +00:00
Yanting Yang
06b2992da4 Merge "Start Safety & regulatory manual with new task" into sc-v2-dev am: 0a942ab338
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895173

Change-Id: I8dbd4c80dd48d8592b43478f9c88f2dbe7d89389
2021-10-05 03:51:22 +00:00
Yanting Yang
0a942ab338 Merge "Start Safety & regulatory manual with new task" into sc-v2-dev 2021-10-05 03:31:47 +00:00
menghanli
7e8dd64ee4 Apply GlifPreferenceLayout for accessibility service Setup Wizard two-panel styles
Bug: 194447311
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilitySetupWizardUtilsTest
Change-Id: Icace09d12c0d2a82eb2591a55f6454f320172ec9
2021-10-05 10:09:04 +08:00
Bill Yi
a516da5761 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0590d5697883acc61ef586054d1ceb0820162159
2021-10-05 01:44:34 +00:00
TreeHugger Robot
1ba507f360 Merge "Audio balance slider is off-center" into sc-v2-dev am: 982e22c6e1 am: fd6589ab00
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958175

Change-Id: I2f0f226972eb60b0649e0a39a175629f70686d0e
2021-10-04 19:04:48 +00:00
TreeHugger Robot
3d003fa9c9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: da8e9c1108 -s ours am: ce03913deb -s ours am: b30022a1d4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7d855d225605124829be4dd27e8326c533e63d37
2021-10-04 19:04:09 +00:00
Bill Yi
6ae05c0cb5 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237 am: 853fdb2f22 -s ours am: c58566b623 -s ours am: 38879cdeb1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iab225911655fd5828a92d3218a7fce315bca6794
2021-10-04 19:03:25 +00:00
Bill Yi
d4796d54ad [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237 am: 7093e26067 -s ours am: c9920edd8e -s ours am: e3fbef2b5a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifb1d9136f4806289ddeb227315995925094e7644
2021-10-04 19:02:48 +00:00
TreeHugger Robot
691f2b68b0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: da8e9c1108 -s ours am: 02b3384ae1 -s ours am: 5cf79e13ec -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6b104f97586387d9855f584140c25613f72546fe
2021-10-04 18:59:30 +00:00
Bill Yi
679109014b [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237 am: 853fdb2f22 -s ours am: 35e8964074 -s ours am: 3560314b3f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0f5fe098d430f51364053651c98e0b44771101bf
2021-10-04 18:58:45 +00:00
TreeHugger Robot
1cc98bcd71 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 131a6a8b05 -s ours am: 76bf7b3992 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2c83bdd91ba95841fb7a15da1ba543b8e1fb76f6
2021-10-04 18:57:22 +00:00
TreeHugger Robot
1e27e76411 [automerger skipped] Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-qpr1-dev am: 468bad73d7 -s ours am: 10198632d3 -s ours am: e74c7b8faa -s ours
am skip reason: Merged-In Idf1f73bc1cdb8ef9ce632bfe4722b1469a6b8531 with SHA-1 1564ef5ca1 is already in history

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

Change-Id: I3210d34b4a5d495b8e953986e3a86a9efabb4fa0
2021-10-04 18:55:09 +00:00
TreeHugger Robot
f46b5143be [automerger skipped] Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-qpr1-dev am: 468bad73d7 am: 6d4c35933c -s ours am: 299117b77e -s ours
am skip reason: Merged-In Idf1f73bc1cdb8ef9ce632bfe4722b1469a6b8531 with SHA-1 1564ef5ca1 is already in history

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

Change-Id: I7daccc4eca28e1ffc56e74e676a7160c49e21a59
2021-10-04 18:51:40 +00:00
TreeHugger Robot
179ec93884 [automerger skipped] Merge "Fetch admin details if not present in Intent." into sc-qpr1-dev am: e750fb7528 am: 83c5600879 -s ours am: 2fe1fd69e6 -s ours
am skip reason: Merged-In Idda6078a64c03588f0b786ebc79079198ab722fe with SHA-1 49d20fa68e is already in history

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

Change-Id: Ic724ba74653bb92570a76c6ae1fe2f7dbd7149ac
2021-10-04 17:39:24 +00:00
TreeHugger Robot
3bed02dee9 [automerger skipped] Merge "Fetch admin details if not present in Intent." into sc-qpr1-dev am: e750fb7528 am: 39fae9778c am: a9b0b5f659 -s ours
am skip reason: Merged-In Idda6078a64c03588f0b786ebc79079198ab722fe with SHA-1 3e10ac87ee is already in history

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

Change-Id: Ie69822a7d3f1ffdade7d4c382ce43304949d0c8c
2021-10-04 17:38:25 +00:00
Yi-Ling Chuang
3855d6e587 Launch activities in another task if the metadata is set.
Add FLAG_ACTIVITY_NEW_TASK to the intent if META_DATA_LAUNCH_NEW_TASK is
set to true to make it launch a separate task.

Bug: 197702494
Bug: 197700978
Bug: 197702789
Test: Set this metadata to true and make sure this page is launched in another task.
Change-Id: I3b4e5745e940a3db5db6be51e17a9c505915e3c0
2021-10-04 16:36:19 +08:00
Weng Su
5cbaa375cd [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"
This reverts commit 56a88885cc.

Reason for revert: rollback CLs to avoid compatibility risks

Bug: 185126813
Change-Id: Ie9d17faa536186e9787ff17b9bc7f7e30adabd1c
2021-10-04 07:36:06 +00:00
Weng Su
34b571612f [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity"
This reverts commit 71e728e934.

Reason for revert: rollback CLs to avoid compatibility risks

Bug: 185126813
Change-Id: I9251eb35ecba9bcc07eb3763c47c3ad7f55897f1
2021-10-04 07:29:56 +00:00
TreeHugger Robot
fd6589ab00 Merge "Audio balance slider is off-center" into sc-v2-dev am: 982e22c6e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958175

Change-Id: I99febd12f072b1550c9c330fce2d011f5b9974e3
2021-10-04 05:48:57 +00:00
TreeHugger Robot
982e22c6e1 Merge "Audio balance slider is off-center" into sc-v2-dev 2021-10-04 05:37:24 +00:00
TreeHugger Robot
0f933bcc00 Merge "[Settings] Refactor MobileNetworkUtils" 2021-10-04 03:18:12 +00:00
TreeHugger Robot
b30022a1d4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: da8e9c1108 -s ours am: ce03913deb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5c82c36722bd3538305a5225dd5e8f30ae840cb7
2021-10-02 06:54:18 +00:00
Bill Yi
38879cdeb1 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237 am: 853fdb2f22 -s ours am: c58566b623 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1d00dbcc2a7bcf7f6cc28d3538a895d5b801a5aa
2021-10-02 06:54:14 +00:00
Bill Yi
e3fbef2b5a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237 am: 7093e26067 -s ours am: c9920edd8e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie0f0ba4af2a1b8399b1a374ba65b45835b6e8874
2021-10-02 06:54:07 +00:00
TreeHugger Robot
5cf79e13ec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: da8e9c1108 -s ours am: 02b3384ae1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaaa7224ca5240ac96ebd6e29d5df0d9a875031de
2021-10-02 06:49:58 +00:00
Bill Yi
3560314b3f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237 am: 853fdb2f22 -s ours am: 35e8964074 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I88214d6d1ef786a7e479e72306fcab0f0b7f55e1
2021-10-02 06:49:42 +00:00
TreeHugger Robot
76bf7b3992 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 131a6a8b05 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie96199f129f6cc8fcc43153552019b785d7a5673
2021-10-02 06:49:04 +00:00
TreeHugger Robot
ce03913deb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: da8e9c1108 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2dea37dac41c682b9ed26e4f91e40e55a49fba7f
2021-10-02 06:43:06 +00:00
TreeHugger Robot
02b3384ae1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: da8e9c1108 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2e108813b56f1a2a0bdfbf26b1299704f818a372
2021-10-02 06:43:05 +00:00
Bill Yi
35e8964074 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237 am: 853fdb2f22 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I41cdf263c606a7e4307abc7a82afa6cb7012707c
2021-10-02 06:43:02 +00:00
Bill Yi
c58566b623 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237 am: 853fdb2f22 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9681141c17e40d26b8125911133e413cf5c501f9
2021-10-02 06:42:59 +00:00
Bill Yi
c9920edd8e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237 am: 7093e26067 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3ad7194b9b6159e101b87dc3f8ddd4ad7f1ddf95
2021-10-02 06:42:40 +00:00
TreeHugger Robot
f3e917b850 Merge changes from topic "presubmit-am-334d138faa3d4553b7d7a0e63caceee2" into sc-mainline-prod am: d84c315d38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15962722

Change-Id: I6436c6f65c384f16cb29d902e230d9e3ea6798fb
2021-10-02 06:35:46 +00:00
TreeHugger Robot
131a6a8b05 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-10-02 06:34:39 +00:00
TreeHugger Robot
da8e9c1108 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-10-02 06:34:33 +00:00