Commit Graph

97817 Commits

Author SHA1 Message Date
Bill Yi
3781241a1a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb42730091 -s ours am: d0a337b13b -s ours am: f2cec9f3fd -s ours am: 946a8a905d -s ours am: 3dce4a08dd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I91a2be261afcc47aae2383f260cb49ab9ceef24f
2021-11-04 07:01:25 +00:00
Bill Yi
4622f4fa97 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4b62b6088 -s ours am: 16166fe2f6 -s ours am: bbbd9ac7e0 -s ours am: 8b1cf9dc11 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6b8ab2bdec6bc5d261209acd025a53e932ef8af1
2021-11-04 07:01:19 +00:00
Automerger Merge Worker
e7201234dc Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ffc0ed7b89 -s ours am: 6fa9eec8e2 -s ours" into sc-v2-dev-plus-aosp am: f9e287a846 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iad56add94a98283b08253c3c6bf5b5bc084d3b2a
2021-11-04 07:01:15 +00:00
Bill Yi
1903acc27a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb42730091 -s ours am: d0a337b13b -s ours am: f2cec9f3fd -s ours am: 3155e05d63 -s ours am: 267e6eef6f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9d4ce280cf09f9f87b131c8b1f0ed66ef1c582a2
2021-11-04 07:01:09 +00:00
Bill Yi
199a2da86d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4b62b6088 -s ours am: 16166fe2f6 -s ours am: feb7edbda7 -s ours am: 06cacac403 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2c79ef1b04764f3710fd32b1a634477b26ea8270
2021-11-04 07:00:47 +00:00
Bill Yi
962b664087 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ffc0ed7b89 -s ours am: 90f615bd7b -s ours am: da1328e485 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9b9c5f6aa3c34161ff6858a4a13a4d1597df4309
2021-11-04 07:00:41 +00:00
Bill Yi
1390a238f2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb42730091 -s ours am: d0a337b13b -s ours am: 2d81cee2e9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibd60f6d5b227dec832103c691ea8c03ca9ce7338
2021-11-04 06:44:39 +00:00
Bill Yi
ca9cd5e68b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4b62b6088 -s ours am: 9df8b566c7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8a7ea281b4cc39447511be2ceea0745bd418ea5b
2021-11-04 06:44:18 +00:00
Bill Yi
3dce4a08dd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb42730091 -s ours am: d0a337b13b -s ours am: f2cec9f3fd -s ours am: 946a8a905d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I02e276bd245ec7f5fc2a6e6aafd8a73d0f9bf107
2021-11-04 06:44:04 +00:00
Bill Yi
8b1cf9dc11 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4b62b6088 -s ours am: 16166fe2f6 -s ours am: bbbd9ac7e0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I43605920adf50bfce3c2147138f963f6e81cd9f7
2021-11-04 06:44:01 +00:00
Automerger Merge Worker
f9e287a846 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ffc0ed7b89 -s ours am: 6fa9eec8e2 -s ours" into sc-v2-dev-plus-aosp 2021-11-04 06:43:56 +00:00
Bill Yi
267e6eef6f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb42730091 -s ours am: d0a337b13b -s ours am: f2cec9f3fd -s ours am: 3155e05d63 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I02837274ae2aa23e4c6c759f4a7095fc456d99ae
2021-11-04 06:43:53 +00:00
Bill Yi
06cacac403 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4b62b6088 -s ours am: 16166fe2f6 -s ours am: feb7edbda7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieb5f843a1de9f66496b2f90a8bc15516c5677d68
2021-11-04 06:43:49 +00:00
Bill Yi
2260943140 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ffc0ed7b89 -s ours am: 6fa9eec8e2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9303667811763022460486008fa62d1eea414f8f
2021-11-04 06:43:48 +00:00
Bill Yi
da1328e485 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ffc0ed7b89 -s ours am: 90f615bd7b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7d0cdbb7b514829cc8762dacaea420f46d7ec25c
2021-11-04 06:43:46 +00:00
Bill Yi
3155e05d63 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb42730091 -s ours am: d0a337b13b -s ours am: f2cec9f3fd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5dcd6c8bf57ce0608b0bf27cab3212e5a46ec365
2021-11-04 06:38:09 +00:00
Bill Yi
946a8a905d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb42730091 -s ours am: d0a337b13b -s ours am: f2cec9f3fd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3d48528c3ac7d12df914f383e5130816ed3442ec
2021-11-04 06:38:08 +00:00
Bill Yi
f2cec9f3fd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb42730091 -s ours am: d0a337b13b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9a61c1cd7523ba091f1e8ebf2cf2441292f728d4
2021-11-04 06:32:13 +00:00
Bill Yi
feb7edbda7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4b62b6088 -s ours am: 16166fe2f6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I827968cc1e9231cfeb0cb12f3e265c985c8ba959
2021-11-04 06:32:07 +00:00
Bill Yi
bbbd9ac7e0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4b62b6088 -s ours am: 16166fe2f6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4cfc727f5c3124ba10f8e5d9b263f703e80f6085
2021-11-04 06:32:03 +00:00
Bill Yi
90f615bd7b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ffc0ed7b89 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifae05e666f2dc744005474d9ce90ecae402ab0f0
2021-11-04 06:31:57 +00:00
Bill Yi
16166fe2f6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4b62b6088 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2b1dadedfe56e81cc41dfa6e2259a7a96af2dae2
2021-11-04 06:31:57 +00:00
Bill Yi
6fa9eec8e2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ffc0ed7b89 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If4faf02c34e0077782fe6203c3eada7dad2d1b03
2021-11-04 06:31:56 +00:00
Bill Yi
2d81cee2e9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb42730091 -s ours am: d0a337b13b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0a4ba879f16c4fcb08c7f3db05e5522c06c9d06b
2021-11-04 06:31:19 +00:00
Bill Yi
9df8b566c7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4b62b6088 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ife5da9b66918a9fbdb6567f5281e98153376a54e
2021-11-04 06:31:05 +00:00
Bill Yi
d0a337b13b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb42730091 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3dc82c48ff9baf8a17d08ae5ace085eb137cc6cd
2021-11-04 06:30:58 +00:00
TreeHugger Robot
a6566fe3d7 Merge "Remove the text for untethered bt device" into sc-v2-dev am: 8118b9ff29 am: ac476ff63b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170316

Change-Id: Icf3de5a331dc58c0a815e8a0602b8fc69ccd3615
2021-11-04 04:48:27 +00:00
TreeHugger Robot
ac476ff63b Merge "Remove the text for untethered bt device" into sc-v2-dev am: 8118b9ff29
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170316

Change-Id: I89ae3ac6b59ff776e745c5885f03ff529f9c7677
2021-11-04 04:25:46 +00:00
TreeHugger Robot
8118b9ff29 Merge "Remove the text for untethered bt device" into sc-v2-dev 2021-11-04 04:08:45 +00:00
TreeHugger Robot
a5bae59374 Merge "Add package name check for the calling app" into sc-v2-dev am: 12b7fd54ec am: 631c67dc8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16062219

Change-Id: I7322c5f293cb90e50c5f402004113777119361cc
2021-11-04 03:24:33 +00:00
TreeHugger Robot
f34c14d147 Merge "To use the getLaunchedFromPackage to get the actual package name" into sc-v2-dev am: 3b84fd462f am: d7bd386313
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16062214

Change-Id: I42bb1bc4fcfe2d964935f5fe1ccaa5d1409aac77
2021-11-04 03:24:26 +00:00
TreeHugger Robot
631c67dc8e Merge "Add package name check for the calling app" into sc-v2-dev am: 12b7fd54ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16062219

Change-Id: I248616eaed0c9c3d19612d702b97e851f1847e2a
2021-11-04 03:07:48 +00:00
TreeHugger Robot
d7bd386313 Merge "To use the getLaunchedFromPackage to get the actual package name" into sc-v2-dev am: 3b84fd462f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16062214

Change-Id: Iec793d2d8f629bcb5d92cccf889e919db6450f54
2021-11-04 03:07:40 +00:00
TreeHugger Robot
12b7fd54ec Merge "Add package name check for the calling app" into sc-v2-dev 2021-11-04 03:01:33 +00:00
Hugh Chen
ab3a70cf1e Remove the text for untethered bt device
Bug: 204066796
Test: make -j64 RunSettingsRoboTests
Change-Id: I35fec4ff998332e6937fc9c360ea488b35b477f8
2021-11-04 02:52:37 +00:00
TreeHugger Robot
3b84fd462f Merge "To use the getLaunchedFromPackage to get the actual package name" into sc-v2-dev 2021-11-04 02:51:01 +00:00
Bill Yi
cb42730091 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6966abfdfdbf672b27528c1761eb23b95aefe521
2021-11-03 22:25:19 +00:00
Bill Yi
ffc0ed7b89 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6966abfdfdbf672b27528c1761eb23b95aefe521
2021-11-03 21:32:13 +00:00
Bill Yi
e4b62b6088 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6966abfdfdbf672b27528c1761eb23b95aefe521
2021-11-03 14:28:55 -07:00
TreeHugger Robot
0d65cc166c Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-qpr1-dev am: 64539c0a57 am: 02ccb048bf am: 28871af9ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16100469

Change-Id: I6210d18cb4f584a024483fb456541953b6940805
2021-11-03 21:25:08 +00:00
Yanting Yang
9373c25683 Rephrase dialog message of clear storage dialog for security concern am: 7fd0ece6f4 am: 204f82d6c4 am: ac38fc7f32 am: 70b7658b74 am: 0e77ce80cb am: d190dd5011 am: 408410b4fc am: c91856a0ef am: e02a78acd9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101569

Change-Id: Ife2d580d13cf65b3241915c3b37eb0215ac37d8c
2021-11-03 21:25:02 +00:00
Yanting Yang
85c63f86be Rephrase dialog message of clear storage dialog for security concern am: 7d22136fb0 am: 337e182e0f am: d67d983bd4 am: 41e6a117a0 am: 43d833aef3 am: f0cc223e1d am: 0d3acd78b7 am: e4024b50dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101568

Change-Id: I0e9d655f0649ba680759c595e9dd1fba2fab91ef
2021-11-03 21:24:51 +00:00
Yanting Yang
20a2b1e59c Rephrase dialog message of clear storage dialog for security concern am: 7fd0ece6f4 am: 204f82d6c4 am: ac38fc7f32 am: 70b7658b74 am: e49a0f6bdd am: 5a142ad048 am: 92abf7d7f4 am: e476740e70 am: 61c86cd103
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101569

Change-Id: Ifd6c1ff367464c268128f92ab9d1bb563fe9c2a6
2021-11-03 21:24:42 +00:00
Yanting Yang
3250db8e62 Rephrase dialog message of clear storage dialog for security concern am: 7d22136fb0 am: 337e182e0f am: d67d983bd4 am: 7f972fc601 am: 60fcac572b am: 103032e208 am: 9ad88aaf4d am: efcdc88062
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101568

Change-Id: I277897f6209216f3a7ca3840abe7569d548f2af5
2021-11-03 21:24:31 +00:00
TreeHugger Robot
20c906ec35 Merge "Rephrase dialog message of clear storage dialog for security concern" into sc-qpr1-dev am: 64539c0a57 am: 5992daa350 am: 827e9a8748
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16100469

Change-Id: Id9aabdf96ac98208d03c57738d6fb725de929500
2021-11-03 21:24:20 +00:00
Yanting Yang
37e2263650 Rephrase dialog message of clear storage dialog for security concern am: 7fd0ece6f4 am: 204f82d6c4 am: ac38fc7f32 am: 70b7658b74 am: 0e77ce80cb am: d190dd5011 am: 408410b4fc am: e0fcd661a1 am: 8a1df21d0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101569

Change-Id: I67443582db19bb5b92c182f072c19e2cb55390d2
2021-11-03 21:24:14 +00:00
Yanting Yang
55c47853d9 Rephrase dialog message of clear storage dialog for security concern am: 7d22136fb0 am: 337e182e0f am: d67d983bd4 am: 41e6a117a0 am: 43d833aef3 am: f0cc223e1d am: 11ac83dc2b am: 75a636cb10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101568

Change-Id: I5c25c3ba74a1738735fb723dac6556e7ad6a9da7
2021-11-03 21:24:03 +00:00
Automerger Merge Worker
7c41666e4e Merge "Rephrase dialog message of clear storage dialog for security concern am: 6024ea553a am: 2d08d34762 am: ebcc8d976f am: 01b0ba594d am: ee991758dd" into sc-v2-dev-plus-aosp am: 8b8ebe7658
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101567

Change-Id: I6a9e915f943fa92f54129630d00eb3bc9c8d8968
2021-11-03 21:23:53 +00:00
Yanting Yang
40f8464685 Rephrase dialog message of clear storage dialog for security concern am: 7fd0ece6f4 am: 204f82d6c4 am: ac38fc7f32 am: 70b7658b74 am: e49a0f6bdd am: 5a142ad048 am: 92abf7d7f4 am: 3efc0db80e am: c3e1858361
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101569

Change-Id: Ieff57b0763a83d195f1ec80c0b6b14d24dac46a7
2021-11-03 21:23:41 +00:00
Yanting Yang
098fab3df9 Rephrase dialog message of clear storage dialog for security concern am: 7d22136fb0 am: 337e182e0f am: d67d983bd4 am: 7f972fc601 am: 60fcac572b am: 103032e208 am: bb65a1a32e am: 34ce98a585
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101568

Change-Id: I1e4de6a000db994ed843e7b361d326c1f5a75f5c
2021-11-03 21:23:31 +00:00