Daniel Solomon
71d5798d3e
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: Iea142d5bec500413df5dd68ee0fc73273130ecdc
2021-10-05 23:01:16 +00:00
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
Michael Wachenschwanz
dc150492e1
Update to new method of getting display power profile constants
...
Bug: 200226329
Test: builds and flashes
Change-Id: I4abcb609a383224bba1550cfd3e50bb68f58ba72
2021-10-05 11:32:13 -07:00
Weng Su
ca67955d7d
[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-05 12:04:33 +00:00
Weng Su
f733da4859
[RESTRICT AUTOMERGE] Revert "Add SafetyNet logging"
...
This reverts commit 199528d460
.
Reason for revert: rollback CLs to avoid compatibility risks
Bug: 185126813
Change-Id: I5ed1782f1a35681ab6be4f74ea3156420b7dad5f
2021-10-05 12:04:14 +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
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
Weng Su
18043562c1
[RESTRICT AUTOMERGE] Revert "[DO NOT MERGE] Add permission checking to WifiDialogActivity"
...
Revert submission 15207347-add_permission_wifidialog
Reason for revert: rollback CLs to avoid compatibility risks
Reverted Changes:
If7ca069c8:[DO NOT MERGE] Add permission checking to WifiDial...
I1535f6f2d:[DO NOT MERGE] Add SafetyNet logging
Bug: 185126813
Change-Id: Ifc3b53dc91fc8d5aa31c1a10d4eb033bbe54c47d
2021-10-05 06:47:46 +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
Weng Su
6a2624e500
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity"
...
Revert submission 15220072-add_permission_wifidialog-qt-dev
Reason for revert: rollback CLs to avoid compatibility risks
Reverted Changes:
I1535f6f2d:Add SafetyNet logging
If7ca069c8:Add permission checking to WifiDialogActivity
Bug: 185126813
Change-Id: I3f75adf5bf0eea037dc0c5dfbeeb22b35b2856b6
2021-10-05 03:37:51 +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
Weng Su
1c93d29b73
[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"
...
This reverts commit fa1e3870d8
.
Reason for revert: rollback CLs to avoid compatibility risks
Bug: 185126813
Change-Id: I77a027075465b5685a857b4c8c68203ef812a172
2021-10-05 03:25:13 +00:00
Weng Su
12dcd5034a
[RESTRICT AUTOMERGE] Revert "[DO NOT MERGE] Add SafetyNet logging"
...
Revert submission 15207347-add_permission_wifidialog
Reason for revert: rollback CLs to avoid compatibility risks
Reverted Changes:
If7ca069c8:[DO NOT MERGE] Add permission checking to WifiDial...
I1535f6f2d:[DO NOT MERGE] Add SafetyNet logging
Bug: 185126813
Change-Id: I41721dbb34612144d00dba7885944d834bf93c7d
2021-10-05 03:24:34 +00:00
Weng Su
153b0f03f5
[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"
...
This reverts commit 4fb84a3737
.
Reason for revert: rollback CLs to avoid compatibility risks
Bug: 185126813
Change-Id: I495cd723917db6405ef3b540a6f01eaeaf8a45fe
2021-10-05 03:24:14 +00:00
Weng Su
d05686b431
[RESTRICT AUTOMERGE] Revert "Add SafetyNet logging"
...
Revert submission 15220072-add_permission_wifidialog-qt-dev
Reason for revert: rollback CLs to avoid compatibility risks
Reverted Changes:
I1535f6f2d:Add SafetyNet logging
If7ca069c8:Add permission checking to WifiDialogActivity
Bug: 185126813
Change-Id: I42b77ac420d9438c741b28ce33bcadf1c74b19eb
2021-10-05 03:23:45 +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
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
Weng Su
f603e671e7
[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-03 18:26:32 +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
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
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
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
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
ae858a0237
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6ce3387fb38bbb8530d28c7265ccd7563e19be4d
2021-10-02 04:42:52 +00:00
TreeHugger Robot
e74c7b8faa
[automerger skipped] Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-qpr1-dev am: 468bad73d7
-s ours am: 10198632d3
-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: Ief8876e4da3a000966ec00a30db04c79da8e2d44
2021-10-01 23:54:10 +00:00