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

93889 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
4d1a339b98 Merge changes from topic "presubmit-am-febb5148f3864699b2afc6cf79966010" into sc-dev-plus-aosp 
* 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
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
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
Bill Yi
9f379245bb [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: I3d53c0eed511682b23520262314690929a492ae8
 2021-08-17 21:03:37 +00:00
TreeHugger Robot
cddbe5f798 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours am: fbc5473058 -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: Iee7e8652d848ff8f323c0a17034496312dd14446
 2021-08-17 21:03:19 +00:00
Bill Yi
78c1fb5468 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours am: d63b6c0428 -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: I52a7e2d2eb70b650b37405613fc7f2db43fe1d36
 2021-08-17 21:03:07 +00:00
Bill Yi
c8aa2fc52f [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 skip reason: subject contains skip directive

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

Change-Id: Ib9296ac54c3bf5fa98c33bf8a4e0071621d707c0
 2021-08-17 21:02:30 +00:00
Bill Yi
7c14455c8b [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 skip reason: subject contains skip directive

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

Change-Id: I7cbf40fcdb457efb7b39af434187fecbef133e97
 2021-08-17 20:50:02 +00:00
TreeHugger Robot
fe24c2c1ce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1bdc58284d -s ours am: ed4f4693c2 -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: I196bd571dfac2a55fd323b9819a970a93e8027c3
 2021-08-17 20:49:08 +00:00
TreeHugger Robot
bf8b916a3e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1bdc58284d -s ours am: 8013ac32c6 -s ours am: 1b205fbb03 -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: I928b7438f8e1f50f2b03a276d8da8ef36861bc5c
 2021-08-17 20:48:53 +00:00
TreeHugger Robot
150a09b784 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 6a41d25bcc -s ours am: d9754e6900 -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: I65b313f804bfb11004e0af089fe097e2c2832572
 2021-08-17 20:48:39 +00:00
TreeHugger Robot
085d3c9360 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -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: I8a40984c311e385afd08a66cd0f397391a8097fd
 2021-08-17 20:47:16 +00:00
Bill Yi
d02406dbe7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -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: I7211a697224d6da927389795fee3ba9d109a32ca
 2021-08-17 20:47:02 +00:00
TreeHugger Robot
fbc5473058 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -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: I9791ccc8a20c6497f2a4901dfde213e4394d0c6c
 2021-08-17 20:46:05 +00:00
Bill Yi
d63b6c0428 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -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: Ib09c9a3cc1329de1014329bd2402134951076d3e
 2021-08-17 20:45:55 +00:00
TreeHugger Robot
345eec506d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -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: I01f4d67deebe14482f976ff3086484ed79ed75ce
 2021-08-17 20:43:37 +00:00
Bill Yi
f8f7afe889 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -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: I430230645a0bd690921bb35d762c792ec73bbfbc
 2021-08-17 20:43:27 +00:00
Bill Yi
48bd94aad3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours am: 02b5415b3a -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: I648805cff2ca54f29e9c5b1c95ae8aab35990052
 2021-08-17 20:40:47 +00:00
Bill Yi
baf3a8b3bd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours am: 02b5415b3a -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: Iad888f0320d8301f19628debbd9ad2cc37cf301b
 2021-08-17 20:40:45 +00:00
TreeHugger Robot
82629e7bb1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 6a41d25bcc -s ours am: 3c63e65b2c -s ours am: bedcd7dcf9 -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: I89b7ed9ce15d775d88ff37a256febe5f620c2c48
 2021-08-17 20:40:20 +00:00
Bill Yi
18e9683196 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours am: 27b0252afa -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: I0464c880c88013e7a6ead0984a8981f281c2df95
 2021-08-17 20:39:43 +00:00
Xin Li
7238a80218 [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 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: I167be22eeb7eaf97356aa60928b5f63bca23d291
 2021-08-17 20:32:38 +00:00
TreeHugger Robot
9aeb396178 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -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: I7b04dbbc9369c89ca837fe2dccb86a3c9445dbdb
 2021-08-17 20:28:48 +00:00
Bill Yi
3e49192ffc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -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: I983cb558895e64cd0455dbe51eb169e0fe7bd634
 2021-08-17 20:28:41 +00:00
Bill Yi
02b5415b3a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -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: I21a0af17579c11c689e78382f4fe1e16bc91b416
 2021-08-17 20:21:42 +00:00
Bill Yi
27b0252afa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -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: I60a5373e66911dbf1652d49b385dd78c46ec79ac
 2021-08-17 20:20:53 +00:00
Bill Yi
1ca3b46718 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -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: I0fd26a73fa93e5e592efc6d2259bd9e83dac2b04
 2021-08-17 20:18:16 +00:00
TreeHugger Robot
186c4d6e63 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-08-17 20:18:07 +00:00
TreeHugger Robot
1b205fbb03 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1bdc58284d -s ours am: 8013ac32c6 -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: Ie6c607caee526934a3881076ef940b82e65d27fc
 2021-08-17 20:15:11 +00:00
TreeHugger Robot
bedcd7dcf9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 6a41d25bcc -s ours am: 3c63e65b2c -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: I9ff0cd7576de8189386738962d9178696784125f
 2021-08-17 20:15:06 +00:00
TreeHugger Robot
dd0e1a338c Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-08-17 20:14:28 +00:00
TreeHugger Robot
413f1db6c6 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-08-17 20:10:00 +00:00
TreeHugger Robot
3ceb76595f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 478207eda5 -s ours am: 2ace4acb04 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id0cadc4ad8f9effaea9853c026d9a13f4bfb979b
 2021-08-17 20:07:02 +00:00
TreeHugger Robot
7ed74f52bf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a1c58e43cb -s ours am: 70a5bd4c62 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I42d5610e565014cd40e02fdef3fd1742508cbb04
 2021-08-17 20:06:56 +00:00
Bill Yi
fa3505fdd8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -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: Ib5eb493e9092ee4f57bea4cc9238a995284b1cf8
 2021-08-17 20:06:51 +00:00