Commit Graph

86148 Commits

Author SHA1 Message Date
Yanting Yang
41e6a117a0 Rephrase dialog message of clear storage dialog for security concern am: 7d22136fb0 am: 337e182e0f am: d67d983bd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101568

Change-Id: I30ee8b6c4bd8535ef387cdcebb1d2224ca19a519
2021-11-03 20:15:31 +00:00
Yanting Yang
70b7658b74 Rephrase dialog message of clear storage dialog for security concern am: 7fd0ece6f4 am: 204f82d6c4 am: ac38fc7f32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101569

Change-Id: I866f203650beccf90f77ced375bf3b41adc358f1
2021-11-03 20:01:07 +00:00
Yanting Yang
f7f0d4f12d Rephrase dialog message of clear storage dialog for security concern am: 6024ea553a am: b0ce558a3e am: 551083020b am: c70af376d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101567

Change-Id: I4cf416fd79887104f3aeac8dbfbf5cc53c8048de
2021-11-03 20:01:06 +00:00
Yanting Yang
d67d983bd4 Rephrase dialog message of clear storage dialog for security concern am: 7d22136fb0 am: 337e182e0f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101568

Change-Id: I61c1b3cfb9a33fb80d93740f2e18ca46d3cbe811
2021-11-03 20:01:02 +00:00
Yanting Yang
6d13309c39 Rephrase dialog message of clear storage dialog for security concern am: 881d7ec5ab am: 0549b8c4e3 am: 5c0dc5688f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101566

Change-Id: If5e235b14920a609dfc2ba40c0fabe2ef81de83b
2021-11-03 20:01:01 +00:00
TreeHugger Robot
a6c7b5e0f1 Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-dev am: 3e23903ff8 am: 0fd394db07
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101565

Change-Id: I40b5bb4b7be8960cea11ab5521aa36aacf81e7ce
2021-11-03 20:00:55 +00:00
Yanting Yang
ac38fc7f32 Rephrase dialog message of clear storage dialog for security concern am: 7fd0ece6f4 am: 204f82d6c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101569

Change-Id: Ifdb5eb3c216bab863cdf3e641bf1a050c0e5ee74
2021-11-03 19:55:05 +00:00
Yanting Yang
c70af376d4 Rephrase dialog message of clear storage dialog for security concern am: 6024ea553a am: b0ce558a3e am: 551083020b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101567

Change-Id: I8ff1d7b11d4a0bb33644b8e45e1b4a455dc2c641
2021-11-03 19:52:30 +00:00
Yanting Yang
5c0dc5688f Rephrase dialog message of clear storage dialog for security concern am: 881d7ec5ab am: 0549b8c4e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101566

Change-Id: I1677fb03ae5ca4c4bd59473f967c567274457b84
2021-11-03 19:52:25 +00:00
Yanting Yang
1ed1e2b0db Rephrase dialog message of clear storage dialog for security concern am: 6024ea553a am: b0ce558a3e am: 551083020b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101567

Change-Id: I29a1c85dfdc3a7b7d1cab6aa79ad147a4328c6c9
2021-11-03 19:49:41 +00:00
Yanting Yang
82872a85d2 Rephrase dialog message of clear storage dialog for security concern am: 881d7ec5ab am: 0549b8c4e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101566

Change-Id: I0a46c89f3a211f7b937c44b77c08f85d04ef8155
2021-11-03 19:49:34 +00:00
TreeHugger Robot
6cbf225a24 Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-dev am: 3e23903ff8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101565

Change-Id: I84c50d2857869b9b2303467ef465dc29bc1e9119
2021-11-03 19:49:31 +00:00
Yanting Yang
204f82d6c4 Rephrase dialog message of clear storage dialog for security concern am: 7fd0ece6f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101569

Change-Id: I78d007987cc32a6673e1e843aa2b54d96c9e145c
2021-11-03 19:49:30 +00:00
Yanting Yang
2d08d34762 Rephrase dialog message of clear storage dialog for security concern am: 6024ea553a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101567

Change-Id: I48bd3929de67fcf78059e21b34950c9732a905a3
2021-11-03 19:49:15 +00:00
Yanting Yang
551083020b Rephrase dialog message of clear storage dialog for security concern am: 6024ea553a am: b0ce558a3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101567

Change-Id: Ia9cfe663f267c7d8f852ca94358384df227f08b5
2021-11-03 19:48:35 +00:00
Yanting Yang
0549b8c4e3 Rephrase dialog message of clear storage dialog for security concern am: 881d7ec5ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101566

Change-Id: I51c5b0ee5aa92de5e86c721fcaea665272c549bf
2021-11-03 19:48:30 +00:00
Yanting Yang
337e182e0f Rephrase dialog message of clear storage dialog for security concern am: 7d22136fb0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101568

Change-Id: I73a42c76e9bc6c5b3c6aff1da4bc364925f98ff0
2021-11-03 19:48:27 +00:00
Yanting Yang
b0ce558a3e Rephrase dialog message of clear storage dialog for security concern am: 6024ea553a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101567

Change-Id: Ia563798d9e45ec18a445b3515a6cd5f41957cf1d
2021-11-03 19:48:20 +00:00
TreeHugger Robot
0fd394db07 Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-dev am: 3e23903ff8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101565

Change-Id: Id7b8ba483f8b323c0e658d66a62c4c58f6dc17a0
2021-11-03 19:47:39 +00:00
TreeHugger Robot
3e23903ff8 Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-dev 2021-11-03 19:29:35 +00:00
Bill Yi
1b281028c2 [automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 9d0eba50aa -s ours am: eda6485a4b -s ours am: 56abf6d05d -s ours
am skip reason: Merged-In I62be3678022753eaba32209c33f95edf220294f1 with SHA-1 a4197a7aa1 is already in history

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

Change-Id: Ifeae8b849e50c7a6874032bd5255e56c2f566e0b
2021-11-03 18:46:14 +00:00
Bill Yi
56abf6d05d [automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 9d0eba50aa -s ours am: eda6485a4b -s ours
am skip reason: Merged-In I62be3678022753eaba32209c33f95edf220294f1 with SHA-1 a4197a7aa1 is already in history

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

Change-Id: Icc33406e496cfc45f87c8fc7fbc739d08b0f4ca0
2021-11-03 18:25:45 +00:00
Bill Yi
eda6485a4b [automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 9d0eba50aa -s ours
am skip reason: Merged-In I62be3678022753eaba32209c33f95edf220294f1 with SHA-1 a4197a7aa1 is already in history

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

Change-Id: I095493a9f49902c2bfe20a0f5464f86ae50ed536
2021-11-03 18:08:25 +00:00
Bill Yi
9d0eba50aa Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" 2021-11-03 17:50:39 +00:00
Bill Yi
5e67298476 Merge SP1A.211105.004 to aosp-master - DO NOT MERGE
Merged-In: I62be3678022753eaba32209c33f95edf220294f1
Merged-In: I1d17526b87d442bc3513a1e7f526fcf5ff11e881
Change-Id: I63bda2d4f97e2c35d317675624c69d45e6dfbcaa
2021-11-02 21:07:55 -07:00
The Android Open Source Project
27067e7dd8 [automerger skipped] Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE am: e5d3401aa1 -s ours am: 51c0a2cb6e -s ours
am skip reason: Merged-In I1d17526b87d442bc3513a1e7f526fcf5ff11e881 with SHA-1 e6ebfee220 is already in history

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

Change-Id: If522424ffa85db50121cc40410ed12394a5b8af0
2021-11-03 00:12:29 +00:00
The Android Open Source Project
51c0a2cb6e [automerger skipped] Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE am: e5d3401aa1 -s ours
am skip reason: Merged-In I1d17526b87d442bc3513a1e7f526fcf5ff11e881 with SHA-1 e6ebfee220 is already in history

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

Change-Id: Iced88b946a227a369a465b018226d38b9fb69c43
2021-11-02 23:55:40 +00:00
The Android Open Source Project
e5d3401aa1 Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE
Merged-In: I1d17526b87d442bc3513a1e7f526fcf5ff11e881
Change-Id: Ib2e431d8d28a3b0da86ec65cad345d8adda041ec
2021-11-02 14:11:57 -07: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
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
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
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
tim peng
a4197a7aa1 Merge "Phone fails to switch channel mode from stereo to mono" am: 41cfaa9f29
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1873736

Change-Id: I62be3678022753eaba32209c33f95edf220294f1
2021-11-01 06:22:15 +00:00
TreeHugger Robot
17d3f20ebf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 33b0ddcb9f -s ours am: 803a4a84a8 -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: I4f9cc37ab3adf455c08c3b017fc1fc23e3d8c669
2021-11-01 06:17:05 +00:00
TreeHugger Robot
c95398214f [automerger skipped] Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d" into sc-qpr1-dev am: 15e9a44b45 -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: Ib281d8c897b86bb6874dd775b046d10276f97983
2021-11-01 06:16:36 +00:00
TreeHugger Robot
348a01d9fe Merge changes from topic "presubmit-am-11a27b06803045468001e263b4b441f0" into sc-qpr1-dev am: 49400133f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720

Change-Id: Ieba625798ef14be588e5dff5ca3c30ea8af50974
2021-11-01 06:16:34 +00:00
Bill Yi
c6a1634ddd [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d am: 88711716d8 -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: I9ca17f255ee6931ff4fc58037f7d1e9938c29b35
2021-11-01 06:16:33 +00:00
TreeHugger Robot
ba70207c32 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 07709bfd9e -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: I69192d5e771481b661a57df56af96ee381266152
2021-11-01 06:15:52 +00:00
TreeHugger Robot
89064bf1a0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b41f6a01a3 -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: Id5baf58d797f4636670fed2e29f23240cc4ad6e6
2021-11-01 06:10:16 +00:00
TreeHugger Robot
0bf0236ef5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 33b0ddcb9f -s ours am: 3ef8ed0bac -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: Ibe25649cc892e6767cdbd40fba4a9ab16c26cb90
2021-11-01 06:08:54 +00:00
Automerger Merge Worker
ebb11f1e6e Merge "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eb45210f6a am: c0eaec8037 -s ours" into sc-qpr1-dev-plus-aosp 2021-11-01 06:08:44 +00:00
TreeHugger Robot
803a4a84a8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 33b0ddcb9f -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: Ic300b54ea954c625fcd08a35b286ecf9d043aa50
2021-11-01 06:08:42 +00:00
Bill Yi
433960b45e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eb45210f6a am: c0eaec8037 -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: I736645f705abdc03f0605ff32d79c83f9a600366
2021-11-01 06:08:42 +00:00
Bill Yi
4080a4ffd4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eb45210f6a -s ours am: d497dee907 -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: I9b5a544ae99432f715513b7f027b224390706e47
2021-11-01 06:08:41 +00:00
TreeHugger Robot
671b1b64a7 [automerger skipped] Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d" into sc-dev-plus-aosp am: dfb6af177f -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: If4b3001c37cd7cf10fe0e93e3d470c93f818fca0
2021-11-01 06:07:51 +00:00
Bill Yi
94b058a0c1 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d am: 4f200606a9 -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: Ibeeacf435f58eb6f036b97f7534c544bdf76bf1d
2021-11-01 06:07:51 +00:00