TreeHugger Robot
1aaa69b8d3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 57e7d9c4b3
-s ours am: d3de9d4b6c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16000259
Change-Id: Ic78d95827b2ddcc7fd3ec0b011b0a1372dfa4067
2021-10-07 09:03:42 +00:00
TreeHugger Robot
07a0e2eaed
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 57e7d9c4b3
-s ours am: 69c9e424e8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16000259
Change-Id: I9f6a9e1755783edad3d256903e87e384331c5846
2021-10-07 08:52:14 +00:00
TreeHugger Robot
d3de9d4b6c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 57e7d9c4b3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16000259
Change-Id: Iad798b30be36844d9812501e49da3800115db0c9
2021-10-07 08:52:12 +00:00
TreeHugger Robot
69c9e424e8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 57e7d9c4b3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16000259
Change-Id: Ia8eba6d2c5e57bb52b4a5f35b954fb01e0714161
2021-10-07 08:51:58 +00:00
TreeHugger Robot
4f27cbc2ce
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: dd3651cc5e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16000260
Change-Id: I355bb467c90371c1259f6bafb1df089aa387769b
2021-10-07 08:51:18 +00:00
TreeHugger Robot
dd3651cc5e
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-10-07 08:40:55 +00:00
TreeHugger Robot
57e7d9c4b3
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-10-07 08:40:47 +00:00
Bill Yi
c18019db27
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idb42ad66d7b7212c8f9c131f939a08b674f3c640
2021-10-07 02:41:09 +00:00
Bill Yi
98f9ed5934
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia9a8641798558c7df5e1d65aadaf5ca9f15fc080
2021-10-07 02:37:16 +00:00
Chen Chen
25ab32bab1
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: 2b7a6c4407
am: 4f2a6225c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995345
Change-Id: I68c7e50dbc5adb8e67026ebedb94741b40e7779c
2021-10-07 00:57:44 +00:00
Chen Chen
25678e730b
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: 2b7a6c4407
am: 579e48b03d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995345
Change-Id: Ic8e88d314d355a5e324057a630a2806918f2541d
2021-10-07 00:57:02 +00:00
Chen Chen
579e48b03d
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: 2b7a6c4407
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995345
Change-Id: I25d658e8c82a1e45a69fdd3467309e897e10e8d5
2021-10-07 00:44:35 +00:00
Chen Chen
4f2a6225c9
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: 2b7a6c4407
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995345
Change-Id: Iad645cc93ddf67fa9cd96b2813f0a4a10f48b007
2021-10-07 00:44:33 +00:00
TreeHugger Robot
4664d0efac
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into sc-v2-dev am: 7d4dd26362
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995346
Change-Id: I3933dda90e3831133d217bcda65c65ea0dc2fd72
2021-10-06 22:58:42 +00:00
TreeHugger Robot
7d4dd26362
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into sc-v2-dev
2021-10-06 22:45:23 +00:00
Weng Su
f06e103985
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-qpr1-dev am: d408d7c408
am: 18895edd6a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959643
Change-Id: I76878029325ca87d044bd5544f069fb25eb9cd5a
2021-10-06 19:20:47 +00:00
Weng Su
ffce521166
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: f9e7a17247
am: be7746282d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959643
Change-Id: Ieec005e8887781dd072a5f34c8745f8cebde9700
2021-10-06 19:20:46 +00:00
Weng Su
e97eff1471
Merge changes from topic "sc-dev_WifiDialogActivity_permission-sc-qpr1-dev" into sc-qpr1-dev am: e736eff6db
am: 5ef4ac6048
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959642
Change-Id: Ifeb654760ec26796565750942b8cea2205c80010
2021-10-06 19:20:45 +00:00
Weng Su
20bf22cbba
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: f603e671e7
am: d6104f2e72
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959642
Change-Id: If6ff44de98909ba47ec1e29232cc9ee63201dc45
2021-10-06 19:20:44 +00:00
Weng Su
4d19eb8efc
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-qpr1-dev am: d408d7c408
-s ours am: 8c636a5cb5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959643
Change-Id: I6df64e1d195771a60ef0dfd38a36e437bbf1c9b6
2021-10-06 19:15:05 +00:00
Weng Su
1b293a76c1
Merge changes from topic "sc-dev_WifiDialogActivity_permission-sc-qpr1-dev" into sc-qpr1-dev am: e736eff6db
am: a444b37de0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959642
Change-Id: I841cfec11bfb2e90ddcb26dde095dd71da235b87
2021-10-06 19:15:04 +00:00
Weng Su
098a8d13da
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: f603e671e7
-s ours am: 11f05bfec4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959642
Change-Id: I809ef788ce02ba1f16cb6415760b553fd11fbb3d
2021-10-06 19:15:02 +00:00
Weng Su
18895edd6a
Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-qpr1-dev am: d408d7c408
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959643
Change-Id: Idedd5323921e0cd646f34624a485dcbbb92d7a3e
2021-10-06 19:09:49 +00:00
Weng Su
be7746282d
[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: f9e7a17247
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959643
Change-Id: If9b1ba5b239307f3f471d9a61e4a9279d3aa1d7c
2021-10-06 19:09:47 +00:00
Weng Su
5ef4ac6048
Merge changes from topic "sc-dev_WifiDialogActivity_permission-sc-qpr1-dev" into sc-qpr1-dev am: e736eff6db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959642
Change-Id: If64e864a38e2c68fb7da9e931b1dd14a82fff6e9
2021-10-06 19:09:46 +00:00
Weng Su
d6104f2e72
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: f603e671e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959642
Change-Id: I644814dfa7c696b1a7df4be6b061f1c6be21092d
2021-10-06 19:09:43 +00:00
Weng Su
8c636a5cb5
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-qpr1-dev am: d408d7c408
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959643
Change-Id: Ieaafa6731520c51d731d07474855c2a5d4cb9ade
2021-10-06 19:09:42 +00:00
Weng Su
a444b37de0
Merge changes from topic "sc-dev_WifiDialogActivity_permission-sc-qpr1-dev" into sc-qpr1-dev am: e736eff6db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959642
Change-Id: Ifea597474df5643dd61145c0e2e60c49280c4d9d
2021-10-06 19:09:41 +00:00
Weng Su
11f05bfec4
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: f603e671e7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959642
Change-Id: I8545fa6f77e9f20953c839313d8e418d1a07baf9
2021-10-06 19:09:41 +00:00
Weng Su
ed73503009
Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-v2-dev am: fb7d6f3918
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959657
Change-Id: I21ed5cf8b5b3326295af2947f8c620826505f441
2021-10-06 19:08:55 +00:00
Weng Su
d537fa10e9
[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 5cbaa375cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959657
Change-Id: I2c471e927ba5b5fa42099f9adaaf6a3f612a82f6
2021-10-06 19:08:53 +00:00
Weng Su
9e5308a998
Merge changes from topic "sc-dev_WifiDialogActivity_permission-sc-qpr1-dev-sc-v2-dev" into sc-v2-dev am: 1c15ca32c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959646
Change-Id: I8d36653e74adbb13144b2d65a58e124983b5e615
2021-10-06 19:08:51 +00:00
Weng Su
6662a94c23
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 34b571612f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959646
Change-Id: Ica11fe7e996e2e7ddf20572b4d84f1e5637a846c
2021-10-06 19:08:49 +00:00
Chen Chen
ee0f42ec6c
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog
...
Bug: 194300867
Test: Build
Change-Id: I5a496df50550ea7ee6986c960e28ae3e4a056b4b
2021-10-06 18:55:19 +00:00
Chen Chen
2b7a6c4407
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog
...
Bug: 194300867
Test: Build
Change-Id: I5a496df50550ea7ee6986c960e28ae3e4a056b4b
2021-10-06 18:54:38 +00:00
Weng Su
fb7d6f3918
Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-v2-dev
2021-10-06 18:48:54 +00:00
Weng Su
1c15ca32c2
Merge changes from topic "sc-dev_WifiDialogActivity_permission-sc-qpr1-dev-sc-v2-dev" into sc-v2-dev
...
* changes:
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity"
[RESTRICT AUTOMERGE] Revert "Add SafetyNet logging"
2021-10-06 18:48:54 +00:00
Weng Su
d408d7c408
Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-qpr1-dev
2021-10-06 18:48:39 +00:00
Weng Su
e736eff6db
Merge changes from topic "sc-dev_WifiDialogActivity_permission-sc-qpr1-dev" into sc-qpr1-dev
...
* changes:
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity"
[RESTRICT AUTOMERGE] Revert "Add SafetyNet logging"
2021-10-06 18:48:39 +00:00
Kunhung Li
4e77f2d62c
Merge "Not use NEW_TASKS for Wallpaper & style's 2-pane UX" into sc-v2-dev am: f83531e0b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15938355
Change-Id: I04034e2b77306d8494f496851af02f3d4e666e77
2021-10-06 14:19:12 +00:00
Kunhung Li
f83531e0b3
Merge "Not use NEW_TASKS for Wallpaper & style's 2-pane UX" into sc-v2-dev
2021-10-06 14:05:10 +00:00
Kunhung Li
c692af2a76
Not use NEW_TASKS for Wallpaper & style's 2-pane UX
...
Refine launch mode to support 2-pane UX for Settings.
Bug: 197609643
Test: make RunSettingsRoboTests
Change-Id: I5212bbcf8c512fac571284379a29cf487f387c5a
2021-10-06 14:04:08 +00:00
Menghan Li
ebdfd05c67
Merge "Apply GlifPreferenceLayout for accessibility service Setup Wizard two-panel styles" into sc-v2-dev am: 9441d2b289
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15773283
Change-Id: Icfd8f891f85dc2a179770592fc1168eab2a501b0
2021-10-06 11:00:39 +00:00
Menghan Li
9441d2b289
Merge "Apply GlifPreferenceLayout for accessibility service Setup Wizard two-panel styles" into sc-v2-dev
2021-10-06 10:46:37 +00:00
TreeHugger Robot
e6a10f3487
Merge "Update adaptive preference summary" into sc-v2-dev am: 6ff60d7771
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15981706
Change-Id: I33990898878a7f3a451667827936503f707f09f7
2021-10-06 10:14:33 +00:00
TreeHugger Robot
6ff60d7771
Merge "Update adaptive preference summary" into sc-v2-dev
2021-10-06 10:03:55 +00:00
YUKAI HUNG
e1d45963a6
Merge "Support mouse hover event for BatteryChartView to highlight slot" into sc-v2-dev am: 14139de0cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15988049
Change-Id: Ib86f5075fecd5d03a9832dba5a5cd454700ee5cd
2021-10-06 09:58:05 +00:00
YUKAI HUNG
14139de0cf
Merge "Support mouse hover event for BatteryChartView to highlight slot" into sc-v2-dev
2021-10-06 09:41:59 +00:00
ykhung
8eff5cc17e
Support mouse hover event for BatteryChartView to highlight slot
...
https://drive.google.com/file/d/19Ms4JOPVfQ6rfXr71vTeXJLSvJqJtRfw/
Bug: 201501553
Test: make SettingsRoboTests
Change-Id: I2c03585163ddb7809a09944aec326a41f6bd4758
2021-10-06 08:24:52 +00:00
Jason Chiu
328c184c3c
Merge "Create a provider for querying if embedding activity is enabled" into sc-v2-dev am: 93494cd39b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15981705
Change-Id: Id4d336ed87c3373a34d72a237cc8d36163ce4870
2021-10-06 06:49:25 +00:00