PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
93,765 Commits 1 Branch 0 Tags
abcdb9b66fb43cbfc571951060e2b2eea82f86b9
Commit Graph

93765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
abcdb9b66f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours am: 345eec506d -s ours am: dc69206b6e -s ours am: cb38d31a13 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If144a01bbda00baaddd6ed6862a2e8166eeb8b2f
 2021-08-18 01:29:48 +00:00
Bill Yi
a9ced00b13 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours am: f8f7afe889 -s ours am: 79e8d066ef -s ours am: 06955416e4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0d5aad2f3573189c39dbf8b0c02c75690553a423
 2021-08-18 01:28:32 +00:00
Bill Yi
c1bab4a77b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours am: 1ca3b46718 -s ours am: 11895d923a -s ours am: b0173be441 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I92d0a7133750d53d80ec47a739aad5358ed05176
 2021-08-18 01:26:44 +00:00
Jordan Jozwiak
84fff1384d Merge "Use refactored RecentAppOpsAccess" into sc-v2-dev am: 5da0ca8a14 am: 8df6b505af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15547175

Change-Id: I9453a12a4bfe6e79e3a19a7371bba7ab03215a39
 2021-08-18 01:12:01 +00:00
TreeHugger Robot
5e51e123dc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours am: 085d3c9360 -s ours am: 6ac0521fc9 -s ours am: 3365e403a4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I98eb37cde2cded2a2a9feaed2017b5e9290ff8a2
 2021-08-18 00:36:41 +00:00
Bill Yi
abd43900df [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours am: d02406dbe7 -s ours am: 0ffadc1caf -s ours am: 7b49f388eb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If391f264b0fe71c21ef43c394f36023b6c2def98
 2021-08-18 00:36:35 +00:00
TreeHugger Robot
24911ae517 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours am: 085d3c9360 -s ours am: 99036fe183 -s ours am: c16965f2a4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I25c490d34f61dcbbbaf3f076cee47f809a8f286b
 2021-08-18 00:36:30 +00:00
Bill Yi
7fa35a5808 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours am: d02406dbe7 -s ours am: 9f379245bb -s ours am: 528d97bbee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iefd1ea9870a83cad04af97d6ba7a6e3462bd816b
 2021-08-18 00:36:23 +00:00
Bill Yi
b9d4c914cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours am: 02b5415b3a -s ours am: 48bd94aad3 -s ours am: c8aa2fc52f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibaa1d36ade6414aae7fdf02666e60847dc1f8d85
 2021-08-18 00:36:17 +00:00
Bill Yi
5dd1ed611f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours am: 02b5415b3a -s ours am: baf3a8b3bd -s ours am: 7c14455c8b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib4897841fe30027c86d7c599ca2a5220356e16fb
 2021-08-18 00:36:11 +00:00
TreeHugger Robot
8266bf76fc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1bdc58284d -s ours am: ed4f4693c2 -s ours am: fe24c2c1ce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib218221dee4e3097e951223ef19e19171dcf5bbc
 2021-08-18 00:36:05 +00:00
TreeHugger Robot
ac33be89e5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 6a41d25bcc -s ours am: d9754e6900 -s ours am: 150a09b784 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaaff37379b6130b117ec0013fe5a0bf13d1e1ddf
 2021-08-18 00:35:59 +00:00
Xin Li
c5369df06b [automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: 7d646a5182 -s ours am: c1853be4d0 -s ours am: 0313c67921 -s ours am: 7238a80218 -s ours 
am skip reason: Merged-In Id2a8c43f9bca79200f837759ce9de0a6eba2a37a with SHA-1 26d1877a7b is already in history

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

Change-Id: I63cf2a94bfa62f5a648bf3d77ce50694ebeb530d
 2021-08-18 00:23:57 +00:00
TreeHugger Robot
f6f69585c1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours am: cee3e9bfce -s ours am: 171722b764 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I01be210d351794a18cef95286bb4e124541eae36
 2021-08-18 00:00:09 +00:00
TreeHugger Robot
171722b764 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours am: cee3e9bfce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I669169439a94eb1a0d287ca24e48a23e66dec2f4
 2021-08-17 23:42:15 +00:00
TreeHugger Robot
cee3e9bfce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0c0963f016e83b020dcffc91517604cfd0197468
 2021-08-17 23:27:43 +00:00
TreeHugger Robot
a26ca75570 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-08-17 23:08:15 +00:00
TreeHugger Robot
cb38d31a13 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours am: 345eec506d -s ours am: dc69206b6e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I522d2068fcb1c7b452cbe03227ae87807e24ee37
 2021-08-17 22:38:40 +00:00
Bill Yi
06955416e4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours am: f8f7afe889 -s ours am: 79e8d066ef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3607bc7ec83978f68e6f535980bdcb80e445254a
 2021-08-17 22:37:50 +00:00
Bill Yi
b0173be441 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours am: 1ca3b46718 -s ours am: 11895d923a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie859c51b68e2879ec082887c791a81d05f9ab623
 2021-08-17 22:35:01 +00:00
Bill Yi
e045f6bd55 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 28dea4a78c -s ours am: a4ccf79b5d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0789078db6878ff6909387cabedc3a1c0d1273fd
 2021-08-17 22:25:00 +00:00
Bill Yi
734f034098 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fe195f2b0 -s ours am: c9d25efe7a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I484fb4cbf5f47f4cf173622802aca5790251461d
 2021-08-17 22:24:33 +00:00
Bill Yi
8153b3ffaa Merge changes from topic "presubmit-am-cdddcf78595b4111a60c29aad3e575f9" into sc-mainline-prod am: ac8b1cd444 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591587

Change-Id: I745d393c7226a633ab494c5b59d27b81d9b60dad
 2021-08-17 22:22:41 +00:00
Bill Yi
16fe32396b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 195d9a765e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a768bcf69068a8ada4215a0f3660296881ad090
 2021-08-17 22:22:25 +00:00
TreeHugger Robot
dc69206b6e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours am: 345eec506d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaad69de065ade77be8285dcc6e5ef59f40d4fe48
 2021-08-17 22:21:45 +00:00
Bill Yi
688a80bbbd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: f6aa488c32 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifdda033e9d7f53b45a7c93729dcfc2317d0f8012
 2021-08-17 22:21:22 +00:00
Bill Yi
a4ccf79b5d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 28dea4a78c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7c1df04c8feb457b41ad223bdd95f4550ef1b124
 2021-08-17 22:20:42 +00:00
Bill Yi
c5e5144283 Merge changes from topic "presubmit-am-febb5148f3864699b2afc6cf79966010" into sc-mainline-prod am: 1e988be985 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591583

Change-Id: I2708d8959b967b6b4ef027be4daaf4ee3a06ccb7
 2021-08-17 22:20:23 +00:00
Bill Yi
c9d25efe7a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fe195f2b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I88a611868c9f39b230067de33d0617f746ebe77b
 2021-08-17 22:20:10 +00:00
Bill Yi
79e8d066ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours am: f8f7afe889 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ief7c74ce297f8552def699acb67520adc278a13a
 2021-08-17 22:19:58 +00:00
Bill Yi
11895d923a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours am: 1ca3b46718 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8457b3f3f9dd10594546a70baecceede1c4085ce
 2021-08-17 22:18:22 +00:00
Bill Yi
28dea4a78c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-17 22:06:14 +00:00
Bill Yi
ac8b1cd444 Merge changes from topic "presubmit-am-cdddcf78595b4111a60c29aad3e575f9" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-17 22:06:14 +00:00
Bill Yi
f16a243a19 Merge changes from topic "presubmit-am-cdddcf78595b4111a60c29aad3e575f9" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb 2p: 8d94de2962
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-17 22:06:14 +00:00
Bill Yi
195d9a765e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-08-17 22:06:00 +00:00
Bill Yi
bde95ae5bb Merge changes from topic "presubmit-am-c386f954c4484bf18ee18e18534b4765" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 9b333b2dcb
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-17 22:06:00 +00:00
Bill Yi
f6aa488c32 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-08-17 22:05:54 +00:00
Bill Yi
81575b3eb4 Merge changes from topic "presubmit-am-92157eaf9a0f4bcdbb408b05b9d0c9aa" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 04d698d1f6
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-17 22:05:54 +00:00
Bill Yi
1e988be985 Merge changes from topic "presubmit-am-febb5148f3864699b2afc6cf79966010" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 21392f9ffb
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-17 22:04:16 +00:00
Bill Yi
0fe195f2b0 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-17 22:04:16 +00:00
Bill Yi
7fa5eb1b73 Merge changes from topic "presubmit-am-febb5148f3864699b2afc6cf79966010" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 21392f9ffb 2p: 1e656787ee
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 21392f9ffb
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-17 22:04:16 +00:00
Jordan Jozwiak
8df6b505af Merge "Use refactored RecentAppOpsAccess" into sc-v2-dev am: 5da0ca8a14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15547175

Change-Id: Ie4805efe824392507eff9ef70c1ee8281491f422
 2021-08-17 21:51:12 +00:00
Jordan Jozwiak
5da0ca8a14 Merge "Use refactored RecentAppOpsAccess" into sc-v2-dev 2021-08-17 21:40:30 +00:00
TreeHugger Robot
3365e403a4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours am: 085d3c9360 -s ours am: 6ac0521fc9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I01d4d0635bb06b11982879ef19365a00c24a7e97
 2021-08-17 21:20:09 +00:00
Bill Yi
7b49f388eb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours am: d02406dbe7 -s ours am: 0ffadc1caf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id431d505435c106e41e59442b71d01205eff180e
 2021-08-17 21:19:39 +00:00
TreeHugger Robot
c16965f2a4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours am: 085d3c9360 -s ours am: 99036fe183 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iae01fce4ad2e7a33c0833caa1e97ecf7dfe406d6
 2021-08-17 21:09:10 +00:00
Bill Yi
528d97bbee [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours am: d02406dbe7 -s ours am: 9f379245bb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I81369ee763ebc5b21a33409c45af64836308f559
 2021-08-17 21:08:56 +00:00
TreeHugger Robot
6ac0521fc9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours am: 085d3c9360 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I88aba12bc51f3ee79ba47c76e85271afd8733453
 2021-08-17 21:03:57 +00:00
TreeHugger Robot
99036fe183 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours am: 085d3c9360 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0a49e72f34de52b0a39ae50d4e0d564bdbd02ee6
 2021-08-17 21:03:52 +00:00
Bill Yi
0ffadc1caf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours am: d02406dbe7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib3c5fb241235d33f07b0cd6adae4a3a850b69c9b
 2021-08-17 21:03:39 +00:00