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
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
TreeHugger Robot
f6e08c8c56
Merge changes from topic "presubmit-am-334d138faa3d4553b7d7a0e63caceee2"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237
2p: 58d731dd8e
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237
Import translations. DO NOT MERGE ANYWHERE
2021-10-02 06:32:12 +00:00
TreeHugger Robot
d84c315d38
Merge changes from topic "presubmit-am-334d138faa3d4553b7d7a0e63caceee2" into sc-mainline-prod
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237
Import translations. DO NOT MERGE ANYWHERE
2021-10-02 06:32:12 +00:00
TreeHugger Robot
1241c787ca
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-10-02 06:27:27 +00:00
Bill Yi
9e6aca3b26
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iced2e8ac5c2387729982b92d55c1776460c4d369
2021-10-02 04:50:03 +00:00
Bill Yi
41533a64d6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9a5eb92a2e472ba7faca95791c4b748f71c20a58
2021-10-02 04:46:24 +00:00
Bill Yi
9848b647f7
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237
2p: 58d731dd8e
...
Blank merge reason: parent was merged -s ours
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15962722
Change-Id: I63447d82f5c59bb689e4977929af79901c4ca8eb
2021-10-02 04:43:09 +00:00
Bill Yi
853fdb2f22
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15962722
Change-Id: If00f802350f9a2769fb8cc2d992c0f7b42f09f43
2021-10-02 04:43:05 +00:00
Bill Yi
7093e26067
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15962722
Change-Id: I26116054259653dcc9f68186b1a4a6bf0a13c393
2021-10-02 04:43:05 +00:00
Bill Yi
58d731dd8e
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ae858a0237
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15962722
Change-Id: Ie6c0c856bec1c105543c0009f3e95663a821326d
2021-10-02 04:43:05 +00:00
Bill Yi
ae858a0237
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6ce3387fb38bbb8530d28c7265ccd7563e19be4d
2021-10-02 04:42:52 +00:00
Bill Yi
87872bced9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I38b8b8fa6200b99afc73e92a3ba3734fe69204b2
2021-10-02 04:38:51 +00:00
Bill Yi
be0325e228
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 85acba44c7
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15962719
Change-Id: I1780ce0fb21d99454460101949a284ddc78c1182
2021-10-02 04:28:14 +00:00