Commit Graph

85921 Commits

Author SHA1 Message Date
Bill Yi
7245d9f02a [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b
Blank merge reason: commit message contains skip directive

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

Change-Id: I8aef99f96568cb302d895a18e5a1806da044701f
2021-09-26 04:35:06 +00:00
Bill Yi
fe3544e435 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b
Blank merge reason: commit message contains skip directive

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

Change-Id: Ib81043858abd402fcc9e4b0cdfa856ca2a26b3ba
2021-09-26 04:35:06 +00:00
Bill Yi
92e5e1d54b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I116288a1e6ca78f8cd87f40b7a83de262b7b4449
2021-09-26 04:34:53 +00:00
Android Build Coastguard Worker
58d2c7d1b1 Snap for 7766788 from 1aff9c726a to sc-qpr1-release
Change-Id: I4964a24d24de0a96c2cb2b8432104d6dd7d1e81c
2021-09-25 03:08:00 +00:00
Julia Reynolds
e21284e8d9 Always return the same result code in access screens am: 1aff9c726a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15908133

Change-Id: Ib1df91f97e9dd60cf13871db1eef62e4180d7e95
2021-09-24 19:35:14 +00:00
Julia Reynolds
1aff9c726a Always return the same result code in access screens
Regardless if the target package exists or not.

Test: Launch dnd and NLS screen with valid and invalid
packages; ensure the result code is the same for both
Bug: 195412179

Change-Id: I1bacd54c2971afb3733ca2f1462bcaabaada300b
2021-09-24 18:05:27 +00:00
Bill Yi
1b275d9c03 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d43653e80d -s ours am: b01a8ddd0f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0648a5c7d6537c0900f73ffc0596edee64f44cf8
2021-09-24 17:36:02 +00:00
Bill Yi
c6fad452b9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ffa2c65c22 -s ours am: 17eccfd048 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia461e950dae6bc932070531c0eb1f462de3b8afd
2021-09-24 17:35:35 +00:00
Bill Yi
b61ad9bd03 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d43653e80d -s ours am: 7e253fafe9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic936e269458a6c450bf3efe2710d376196ed24a0
2021-09-24 17:28:34 +00:00
Bill Yi
ffc08e5492 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ffa2c65c22 -s ours am: ee7f088a94 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If817910e5df391007d014318015636c1fa405730
2021-09-24 17:28:28 +00:00
Bill Yi
0522bb8e22 Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-qpr1-dev am: 1b857d20ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513

Change-Id: I4017c631e26ecd89579e86313d1bff14e7d5ff00
2021-09-24 17:28:25 +00:00
Bill Yi
fb5a956797 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f am: c038db5354 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2927ae3d99e3e899899a4b591731dd54f0b90596
2021-09-24 17:28:24 +00:00
Bill Yi
fd934ec1ee Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-qpr1-dev am: 6553465417
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516

Change-Id: Ieae6cde28894b935da0e437f8279478ebc6f3c06
2021-09-24 17:28:07 +00:00
Bill Yi
ba80bd4ddd [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163 am: 3732defccb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icf1ced8676e9b8d08a812dd7e67bb4d14a1565f0
2021-09-24 17:28:04 +00:00
TreeHugger Robot
f343c0e49a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b -s ours am: 85214e918e -s ours am: 16ab663f53 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic7d79aacc898a4b86c34df1f0e8e58edb1446e84
2021-09-24 17:27:37 +00:00
Bill Yi
7e253fafe9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d43653e80d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2820410fc0de20dd6ec3b8fe2bb92dc593b6b3e7
2021-09-24 17:27:21 +00:00
Bill Yi
ee7f088a94 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ffa2c65c22 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id9ce6f1b5106c79de410fa563465ee026c1a17f2
2021-09-24 17:26:39 +00:00
Bill Yi
cd039bb2de [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783 -s ours am: 78abb83343 -s ours am: f78bbdeedc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3a9d81bd7af985a14c1ac756775b6ffaf0a03a0b
2021-09-24 17:26:16 +00:00
Bill Yi
b01a8ddd0f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d43653e80d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1b040c3b7f9c49990ca50381233325f96db54357
2021-09-24 17:25:53 +00:00
Bill Yi
17eccfd048 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ffa2c65c22 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9ac01c58e94e4bc8e8a03400112049bc06cf0c01
2021-09-24 17:25:28 +00:00
Bill Yi
798e2adb59 Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-dev-plus-aosp am: 93e7956a7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513

Change-Id: Ib1965639952ad39d8c94229b0c02b94f996ea688
2021-09-24 17:15:20 +00:00
Bill Yi
27649a27e9 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f am: 2175bf57c6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id1d9ce2eaa7b8a59362e88c53c4ccf3b84e74eb8
2021-09-24 17:15:20 +00:00
Bill Yi
b8dff25882 Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-dev-plus-aosp am: 3d46803aee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516

Change-Id: I35df749b6c90df88c39b385a6fe6b973d30ce5ad
2021-09-24 17:15:11 +00:00
Bill Yi
767ce7ca1b [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163 am: fab8681446 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I84c2a01d26139d8b82755e98b052b60751dc3153
2021-09-24 17:15:11 +00:00
TreeHugger Robot
df6573b91e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b -s ours am: 85214e918e -s ours am: 58a441f611 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I264dbd4f666e93d707ddc9b4486f55552a9a7a46
2021-09-24 17:14:45 +00:00
Bill Yi
e2bf04f17b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783 -s ours am: 78abb83343 -s ours am: 7f395f18b2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I119c980481b99e5ef5db212fdf324fcd29fffce0
2021-09-24 17:14:32 +00:00
Bill Yi
d43653e80d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-24 17:13:34 +00:00
Bill Yi
1b857d20ac Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f
  Import translations. DO NOT MERGE ANYWHERE
2021-09-24 17:13:34 +00:00
Bill Yi
93e7956a7e Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f
  Import translations. DO NOT MERGE ANYWHERE
2021-09-24 17:13:34 +00:00
Bill Yi
6553465417 Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163
  Import translations. DO NOT MERGE ANYWHERE
2021-09-24 17:10:56 +00:00
Bill Yi
ffa2c65c22 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-24 17:10:56 +00:00
Bill Yi
3d46803aee Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163
  Import translations. DO NOT MERGE ANYWHERE
2021-09-24 17:10:56 +00:00
TreeHugger Robot
16ab663f53 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b -s ours am: 85214e918e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic29e3bfc8ee0d8837ea923f3a80f333a7578f9af
2021-09-24 17:01:46 +00:00
Bill Yi
f78bbdeedc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783 -s ours am: 78abb83343 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7965d6f1a57b2e26c13d88d00c81d051f197ac1b
2021-09-24 17:01:35 +00:00
TreeHugger Robot
58a441f611 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b -s ours am: 85214e918e -s ours
am skip reason: subject contains skip directive

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

Change-Id: If2f43424484cec92cc2fb2fa481162bc3a3b6db8
2021-09-24 17:00:54 +00:00
Bill Yi
7f395f18b2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783 -s ours am: 78abb83343 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0ff01146a726074ee24afd7c141df16750ec611f
2021-09-24 17:00:07 +00:00
TreeHugger Robot
f78cb86b4b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: de59a250f8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib0cd151dcd0d64b6c18213408573989f8ea3d085
2021-09-24 16:49:50 +00:00
TreeHugger Robot
bf23269e34 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: f337947e27 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9208b4608cf8c105f69edf032709ee6072766047
2021-09-24 16:49:45 +00:00
TreeHugger Robot
85214e918e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I86e538594b008a280a542665306978afaba1e771
2021-09-24 16:45:20 +00:00
Bill Yi
78abb83343 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I37b3fc803bb1b033f24467dc54f43a8d7e1f4cb1
2021-09-24 16:44:26 +00:00
TreeHugger Robot
de59a250f8 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-09-24 16:32:45 +00:00
TreeHugger Robot
f337947e27 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-09-24 16:32:43 +00:00
TreeHugger Robot
416206347b Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-09-24 16:32:30 +00:00
Treehugger Robot
577abc36f7 Merge "[Settings] backport missing CL" am: a8ee80e95a am: 15c0678ca8 am: da36a07df1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1836333

Change-Id: I684ceac5e6c70a2766b0dc3e14f2c8b40e4ad806
2021-09-24 10:53:17 +00:00
Treehugger Robot
da36a07df1 Merge "[Settings] backport missing CL" am: a8ee80e95a am: 15c0678ca8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1836333

Change-Id: I687c80bc2f50b242151edffdb8ab97307d08b9d9
2021-09-24 10:40:36 +00:00
Treehugger Robot
15c0678ca8 Merge "[Settings] backport missing CL" am: a8ee80e95a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1836333

Change-Id: I09f384d8d7073270d4bf460e91a52021a69e3e19
2021-09-24 10:24:31 +00:00
Treehugger Robot
a8ee80e95a Merge "[Settings] backport missing CL" 2021-09-24 10:10:37 +00:00
Bonian Chen
dc3c1e8a4b [Settings] backport missing CL
aosp/1258356 got missing when merging several CLs of refactor code in
aosp/1281915.

Bug: 186543910
Test: local
Change-Id: I34287b22fec4da660c7b44b5953eb16591cfb2d7
2021-09-24 15:45:30 +08:00
TreeHugger Robot
59461a5836 Merge "Revert "Move Automatic System Updates from Developer Options to ..."" into sc-qpr1-dev am: cc1cc9a5f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895168

Change-Id: I869ee6339bce5342b023ca65bba44afc9e594a68
2021-09-24 05:54:39 +00:00
TreeHugger Robot
cc1cc9a5f7 Merge "Revert "Move Automatic System Updates from Developer Options to ..."" into sc-qpr1-dev 2021-09-24 05:44:36 +00:00