PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
113,334 Commits 1 Branch 0 Tags
ae7411b999d7bd3d744f7b0a34e90a5ebfc09814
Commit Graph

113334 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
menghanli
ae7411b999 Remove Theme.AlertDialog declaration in accessibility dialog layout 
Root cause: Settings application level style includes the alertDialogTheme, No need to set Theme.AlertDialog for dialog layout.
Solution: Remove unnecessary attrs.

Bug: 225764984
Test: Manual testing
Change-Id: Ic3607ec70e97a3d1023d002c006cffc9715d7fb6
 2022-07-22 12:56:26 +08:00
Menghan Li
7fa6e7df05 Merge "Refactor AccessibilityControlTimeoutPreferenceFragment to improve maintainability" 2022-07-18 13:52:29 +00:00
Simon Wingrove
3db36eb530 Merge "Distinguish multiple PendingIntents via requestCode" 2022-07-18 11:13:42 +00:00
Zaiyue Xue
a3a90a744f Merge "Refactor BatteryChartView X-axis labels. Instead of only timestamps, also support any string[] labels." 2022-07-18 08:50:38 +00:00
menghanli
236a376211 Refactor AccessibilityControlTimeoutPreferenceFragment to improve maintainability 
Root cause: There is a bunch of different logic of preferences in AccessibilityControlTimeoutPreferenceFragment. It’s hard to implement new features and hard to maintain and hard to be testable.
Solution: Move out logic of AccessibilityControlTimeoutPreferenceFragment into controllers to reduce the complexity of the relationship between preference and fragment.

Bug: 197695932
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.accessibility
Change-Id: I22e6e3b9e2f199ac1721fc069690321ad5f7a0d4
 2022-07-18 15:50:52 +08:00
Zaiyue Xue
24bc269ec1 Refactor BatteryChartView X-axis labels. Instead of 
only timestamps, also support any string[] labels.

Bug: 236101166
Test: manual
Change-Id: I84763ccce0ee63da0b5b26e1416bf5bd5b58963d
 2022-07-18 14:25:24 +08:00
Bill Yi
dfdcb3b7dd Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-07-18 04:31:31 +00:00
Bill Yi
fb7e554b91 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-07-18 04:31:31 +00:00
TreeHugger Robot
d20233e81c Merge changes from topic "tc_change_22071422_30" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc75b57a54
  Import translations. DO NOT MERGE ANYWHERE
 2022-07-17 18:06:56 +00:00
TreeHugger Robot
31ab010723 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: dee7be8277 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I54c4908e120beaa653ebbabadedbe3f8fb3a565e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-16 19:17:58 +00:00
Bill Yi
0ff0b62161 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c0e84757d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9005ccdd21fe5b5ff0f861a22cb322a2cfda19d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-16 19:17:50 +00:00
TreeHugger Robot
dee7be8277 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-07-16 18:36:03 +00:00
TreeHugger Robot
2e89652733 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 7afae4bac1 -s ours am: e0f3ec193b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2555b9cfb6563c123cfda1189838cf70dd02d319
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-16 07:11:52 +00:00
Bill Yi
6b62556ab9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0f98a4d1ca -s ours am: 4c171b21e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6a846d8cc40d71f73e87dc2147e53da9980d3be9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-16 07:11:20 +00:00
TreeHugger Robot
d6fc39e36d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9e97c811a8 -s ours am: cd107313cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iff5ad3d3776265cbc9c0af1a63eb58f4b1278c23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-16 07:10:59 +00:00
Bill Yi
58fb52791c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e148a29a1c -s ours am: aa37dd1860 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If19d51d9ff5c10642e008fb8aefaaee10adb4145
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-16 07:10:42 +00:00
TreeHugger Robot
e0f3ec193b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 7afae4bac1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iea692e5126ada63d0ca4aa91bd83570f3ddf325a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-16 06:46:32 +00:00
Bill Yi
4c171b21e8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0f98a4d1ca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5c0e23ba0c57b9e5d69c6107d2c1421bd747e76a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-16 06:46:06 +00:00
TreeHugger Robot
cd107313cf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9e97c811a8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieebc2eba1f675bba4cb40037f5639b3cb6bc179a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-16 06:45:41 +00:00
Bill Yi
aa37dd1860 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e148a29a1c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2c38c15ab224ca98b6911c70f54ac8a07e59f1e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-16 06:45:20 +00:00
TreeHugger Robot
7afae4bac1 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-07-16 06:32:58 +00:00
TreeHugger Robot
9e97c811a8 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-07-16 06:32:58 +00:00
TreeHugger Robot
661c035a1e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233 -s ours am: f20ec29820 -s ours am: de8d037d68 -s ours am: 68d4addfdc -s ours am: cafb63129c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ife88e6efc3fe594b73ba204fe0e50933087992f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 19:29:04 +00:00
Bill Yi
1ed80994fe [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706 -s ours am: 6aa3b0a3a9 -s ours am: 7cb9020b74 -s ours am: 42ae81fed7 -s ours am: 1bcf2cea28 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I10a6f397f7dc2b78fdca7c2c8588b479f52c1aa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 19:28:52 +00:00
Bill Yi
9797a60371 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4 -s ours am: cb2cb2e72a -s ours am: aae3370ac8 -s ours am: c5aff8f391 -s ours am: 7a4991ecf0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic7557deb4a3949451130d2872467a83f425e9c3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 19:28:34 +00:00
TreeHugger Robot
ccdb91b881 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233 -s ours am: f20ec29820 -s ours am: 8a300a43df -s ours am: 086f4d675b -s ours am: 9192425035 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I147f8caaec459e9dcbbc095a67cd4c808a1129b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 19:21:08 +00:00
Bill Yi
c5d7394b00 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706 -s ours am: 6aa3b0a3a9 -s ours am: 617be8295c -s ours am: b70a1941ed -s ours am: fb3fd8e9de -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ife5c07c7172a721f77fb9fd9b2ac1f20ba08b549
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 19:20:55 +00:00
Bill Yi
bbd18a609f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4 -s ours am: cb2cb2e72a -s ours am: d1f25e5217 -s ours am: 64ff179b42 -s ours am: 8ca886ff9b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie2c1e707fec93223a72753709603d7505b3fcde8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 19:20:37 +00:00
TreeHugger Robot
5de01382a8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7d8655936b -s ours am: 188a2c66c1 -s ours am: 037a382168 -s ours am: a687b7be39 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I82a1ca83266d2235eea4fd9cc95e6ec0130d302d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 19:13:40 +00:00
Bill Yi
ed9ba993e3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fef55df6ec -s ours am: cdd61bac15 -s ours am: 3df6f3fe63 -s ours am: 36ff4395d4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0bd64bf0e25564af2624e2a03faa17f68613077a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 19:13:23 +00:00
Bill Yi
c986a444f6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7 -s ours am: 3050a6cb87 -s ours am: c25ff8ff49 -s ours am: 5fd6295eb7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5bab5b06ea443c37178eb0b62657b73a6c4fc5e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 19:13:07 +00:00
TreeHugger Robot
02b809d119 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 377685d4a6 -s ours am: 0adac53973 -s ours am: e57d5e757a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4f43da4e0e053a4c8b4b67bf0e127ce10e23f07f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 19:11:27 +00:00
Bill Yi
efb749cffa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 30c5704504 -s ours am: 392e976d77 -s ours am: 2313c8a358 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I65150a9764ee89ef2bcf4cd60545fd93ba8f589c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 19:11:14 +00:00
Bill Yi
608b32d1aa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ff486543a -s ours am: 4011a37faa -s ours am: 2ebef8d20b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic61c1e08e6e63827d6d2ffc970610c4cbce42bdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 19:10:59 +00:00
Automerger Merge Worker
9a89fb183b Merge changes from topic "am-04754628637348948b04fab6958e617d" into tm-qpr-dev-plus-aosp am: 73c7e602f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433

Change-Id: I0a6d5f4bf9c5d907f5ccca12e08da1751dc95459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 19:04:16 +00:00
TreeHugger Robot
87f19e06f6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233 -s ours am: f20ec29820 -s ours am: 8a300a43df -s ours am: d0695e781f -s ours am: 5ef8d799fc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idc9c737343cad69e6244a32ec7d76e260b7c1436
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 19:04:02 +00:00
TreeHugger Robot
af96f9945c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7d8655936b -s ours am: 3ff66be05a -s ours am: ec4f2a953b -s ours am: fc3718b3d8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I432e0f7154dd167d36b204e58c3089030858e877
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 18:54:44 +00:00
Bill Yi
0513d99003 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fef55df6ec -s ours am: 84ce084f90 -s ours am: 6f2aa0d0f7 -s ours am: 1a29a382e0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08038288fe810313a1ab854f82d6eb45d04e9e99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 18:54:28 +00:00
Bill Yi
a5e4a0a8c3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7 -s ours am: bc5abed2bd -s ours am: ea80c38015 -s ours am: 505057189b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icd5c7b5040aed4734e07953878152ca110507528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 18:54:10 +00:00
TreeHugger Robot
cafb63129c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233 -s ours am: f20ec29820 -s ours am: de8d037d68 -s ours am: 68d4addfdc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0ca19eb0e480a18b028c97c095156d8516cbc2b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 18:53:32 +00:00
Bill Yi
1bcf2cea28 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706 -s ours am: 6aa3b0a3a9 -s ours am: 7cb9020b74 -s ours am: 42ae81fed7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I03b32df00588839b622c85e2416f8a6acf8f6fae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 18:53:17 +00:00
Bill Yi
7a4991ecf0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4 -s ours am: cb2cb2e72a -s ours am: aae3370ac8 -s ours am: c5aff8f391 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If7b3fee97f7473db545b6d67e86fc29e7df7e69c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 18:53:04 +00:00
TreeHugger Robot
9192425035 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233 -s ours am: f20ec29820 -s ours am: 8a300a43df -s ours am: 086f4d675b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I128a267e658d79aa6a58fa4d3e9f5342759a91d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 18:50:08 +00:00
Bill Yi
fb3fd8e9de [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706 -s ours am: 6aa3b0a3a9 -s ours am: 617be8295c -s ours am: b70a1941ed -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5128d8c91bc9d9e9e5056494361181cec9d77ca1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 18:49:53 +00:00
TreeHugger Robot
bf50143c7a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7d8655936b -s ours am: 188a2c66c1 -s ours am: 4479132675 -s ours am: c54a6df09e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie3120efda45321a93b41c173f75a88b72ec359b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 18:49:46 +00:00
Bill Yi
8ca886ff9b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4 -s ours am: cb2cb2e72a -s ours am: d1f25e5217 -s ours am: 64ff179b42 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I61a77120a73e892d661c405bc6b391a1a6d96a75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 18:49:39 +00:00
Bill Yi
8e5d982ac8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fef55df6ec -s ours am: cdd61bac15 -s ours am: da2052f884 -s ours am: 850e3b1531 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic5d3f97d9d2533ddea7768316256c83b3e7baaf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 18:49:28 +00:00
Bill Yi
fb381deaa7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7 -s ours am: 3050a6cb87 -s ours am: 8ca2243678 -s ours am: e64f69f6cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I983f5976f6d1b0157b31d9f05cc1ceb20d0b763a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 18:49:11 +00:00
TreeHugger Robot
ce8470c925 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 377685d4a6 -s ours am: fe9539f0a4 -s ours am: d39de8723d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6856bb235f1cfdf4afb6cdab00f9492c333c07e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 18:47:56 +00:00
Bill Yi
ee52e953cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 30c5704504 -s ours am: 9d6d73301d -s ours am: f5b244dab9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I961869dd0ff1d33262811d27eea1f5b8d1f77368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 18:47:42 +00:00