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

113511 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
38863695fd Merge "Move zen rule deletion" into tm-qpr-dev am: 7ab7c1d6f8 am: cf3fc8d0b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19377234

Change-Id: I69bc3bcd386422febab4aef1bac86ea09637b520
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-25 17:52:01 +00:00
Peter Zhang
9b502ca1d2 Merge "Improve the UI of Press & hold power button settings" into tm-qpr-dev am: 1cc741a745 am: 179c4dd48a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19291450

Change-Id: I970ace8e8cee5aa3e23693d2a3985999f8f10b8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-25 17:50:30 +00:00
Julia Reynolds
cf3fc8d0b5 Merge "Move zen rule deletion" into tm-qpr-dev am: 7ab7c1d6f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19377234

Change-Id: I25fdf9997ff4fe2dc97577e709f20df32317e10d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-25 17:33:36 +00:00
Peter Zhang
179c4dd48a Merge "Improve the UI of Press & hold power button settings" into tm-qpr-dev am: 1cc741a745 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19291450

Change-Id: I7f3ea617800c37f49d8534131728875c0cd1d243
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-25 17:33:08 +00:00
Julia Reynolds
7ab7c1d6f8 Merge "Move zen rule deletion" into tm-qpr-dev 2022-07-25 17:24:42 +00:00
Peter Zhang
1cc741a745 Merge "Improve the UI of Press & hold power button settings" into tm-qpr-dev 2022-07-25 17:18:25 +00:00
PETER LIANG
e000f54431 Merge "Fix the inconsistent alignment of the main switch preference." into tm-qpr-dev am: aea8f1aeb2 am: 26c3c3a95c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19358210

Change-Id: Iaa9faf78d8fd4813e9725f246745744e98d0c325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-25 12:44:12 +00:00
PETER LIANG
26c3c3a95c Merge "Fix the inconsistent alignment of the main switch preference." into tm-qpr-dev am: aea8f1aeb2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19358210

Change-Id: I38ed641d9b1df23306f2d1e78b705d02592f34b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-25 12:25:25 +00:00
PETER LIANG
aea8f1aeb2 Merge "Fix the inconsistent alignment of the main switch preference." into tm-qpr-dev 2022-07-25 12:05:17 +00:00
TreeHugger Robot
873a47576d Merge "Add DataProcessor to process raw history map for UI." 2022-07-25 11:03:35 +00:00
Tim Peng
d30f5d1ac5 Merge "AID_SYSTEM_USER - Main thread blocked at getConnectionSummary()" 2022-07-25 09:59:46 +00:00
Menghan Li
0f6f22225c Merge changes I5409c1e8,I8ed80b44 
* changes:
  Refactor CaptionAppearanceFragment to improve maintainability (4/n)
  Refactor CaptionAppearanceFragment to improve maintainability (3/n)
 2022-07-25 08:42:40 +00:00
Kuan Wang
287a40a9e9 Add DataProcessor to process raw history map for UI. 
- Move interpolation from DatabaseUtil
- Add the logic to wrap processed history map to BatteryLevelData
- Change ImmutableList to List in BatteryLevelData because
  ImmutableList.of doesn't support null element.

Bug: 236101687
Test: make RunSettingsRoboTests
Change-Id: I0a842f24e5481faf65f667c08a4fdc11fe2f235c
 2022-07-25 08:39:45 +00:00
menghanli
5356e0c0a9 Refactor CaptionAppearanceFragment to improve maintainability (4/n) 
Root cause: There is a bunch of different logic of preferences in CaptionAppearanceFragment. It’s hard to implement new features and hard to maintain and hard to be testable.
Solution: Move out preset preference logic of CaptionAppearanceFragment into controllers to reduce the complexity of the relationship between preference and fragment.

Bug: 197695932
Test: make RunSettingsRoboTests ROBOTEST_FILTER=CaptionPresetControllerTest CaptionAppearanceFragmentTest
Change-Id: I5409c1e8a6bdfc633abc304d8cf800ea0943de78
 2022-07-25 12:26:27 +08:00
timhypeng
830cb48593 AID_SYSTEM_USER - Main thread blocked at getConnectionSummary() 
-move getConnectionSummary() to background thread.

Bug: 239394377
Test: atest BluetoothDevicePreferenceTest
Change-Id: I6911f53860ff48ef6a9fa5fe3007c004e6e4a331
 2022-07-25 01:28:46 +00:00
menghanli
16fbfe4e14 Refactor CaptionAppearanceFragment to improve maintainability (3/n) 
Root cause: There is a bunch of different logic of preferences in CaptionAppearanceFragment. It’s hard to implement new features and hard to maintain and hard to be testable.
Solution: Move out color and edge preference logic of CaptionAppearanceFragment 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: I8ed80b445a0d376a7e9dda87feda82420a78a9da
 2022-07-25 09:18:11 +08:00
menghanli
755d691183 Refine AccessibilityGestureNavigationTutorial button type 
Root cause: It is weird to display positive text for the negative button.
Solution: Change to the positive button.

Bug: 216189516
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityGestureNavigationTutorialTest
Change-Id: I8ffc6b7b5b510fab159a23af83bca4426f2dc81d
 2022-07-25 08:40:24 +08:00
Menghan Li
2675dbf54a Merge "Remove Theme.AlertDialog declaration in accessibility dialog layout" 2022-07-24 23:05:17 +00:00
TreeHugger Robot
0090d3990a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 037cf476e7 -s ours am: a851cb82af -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I510ac10b55b71c6c505fafa2619a0cb268065cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 06:18:41 +00:00
Bill Yi
132bbfec07 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b99222d2b8 -s ours am: 4b7bac7464 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3e963a457cea29fad0718205601b5142febd4653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 06:18:22 +00:00
TreeHugger Robot
a851cb82af [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 037cf476e7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1515f96c6ed25f7b4df24e971225a2f136c3e6e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 05:53:21 +00:00
Bill Yi
4b7bac7464 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b99222d2b8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I331b56a6a9a36555bb6688c04413729bb77a33e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 05:52:51 +00:00
TreeHugger Robot
037cf476e7 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-07-23 05:32:42 +00:00
TreeHugger Robot
b269196053 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 96bc6ca196 -s ours am: c79be68440 -s ours am: 0ce31c8b67 -s ours am: 8ea9ed66dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4d61c1b05c1d4eebaea630737ddcf8380c605f4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 04:01:57 +00:00
Bill Yi
b0cf469f76 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: babd7f1cc6 -s ours am: 9dd5145c74 -s ours am: ff79fd3b9f -s ours am: f0ec69b322 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c81aa2630730f4813f6a8172a1e445284bec71b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 04:01:37 +00:00
Automerger Merge Worker
110adf8a30 Merge changes from topic "am-fccad1fd78d74820ac27310bf754500a" into tm-d1-dev-plus-aosp am: 474e99c32a am: f42353579d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392235

Change-Id: Ie7d892b4ddc342d3d00b768140b8d104ca0d4a00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:58:53 +00:00
TreeHugger Robot
0127e27559 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1ea00326ca -s ours am: 54b94fa642 -s ours am: 745bc58b23 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ice2b1f101b4891a5f9d041b3f559bca244e1f7b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:58:31 +00:00
TreeHugger Robot
44bd2e97cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 96bc6ca196 -s ours am: 7da6e7a960 -s ours am: 4915a9b3aa -s ours am: e1b6c95a72 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6b2be1c26faf3d3496869de1ac8f1210a0460ced
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:54:46 +00:00
Bill Yi
a76bb724d2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: babd7f1cc6 -s ours am: e6613a454e -s ours am: ed43940526 -s ours am: f3ee83c034 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6f642c95db925be7e1490087098086ae87c5c844
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:54:24 +00:00
TreeHugger Robot
9addedf155 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 96bc6ca196 -s ours am: c79be68440 -s ours am: 0e6b0ba8cb -s ours am: c819cc5401 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I235bd6920b28e0336145099cf30b3b21eab51e44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:46:03 +00:00
Bill Yi
5831f07be2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: babd7f1cc6 -s ours am: 9dd5145c74 -s ours am: 6654c69877 -s ours am: 4948557b54 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibbb8270fe977a21253efaf513a27035fe685f8e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:45:45 +00:00
TreeHugger Robot
89f4bbf2ac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1ea00326ca -s ours am: 4fe83b61ff -s ours am: 1a59c69653 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie16044d7a4fddbebded19c89c8647d0a1437cf8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:42:50 +00:00
Bill Yi
ee269bbed1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1e9765bba2 -s ours am: 9d76bd7a1f -s ours am: a0ad43068a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I37f6d0b0b5d5c10ea058abf852ffc70414f95df5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:42:27 +00:00
Automerger Merge Worker
53a2d35a85 Merge "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours am: 7a0b1e186d -s ours" into tm-d1-dev-plus-aosp am: b13d27ffe5 -s ours am: 003f3914c4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6d8ee1f609f0880c72d78ae469e66bb3aeb014b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:20:27 +00:00
Bill Yi
ca167baafd [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours am: 7a0b1e186d -s ours am: 7c0e477837 -s ours am: 4b38cfde8c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic47b6032a423ba12bb742f2be89cf0beb33de4ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:20:22 +00:00
TreeHugger Robot
8ea9ed66dd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 96bc6ca196 -s ours am: c79be68440 -s ours am: 0ce31c8b67 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I99d30767e72c2f43e723fd300c5af5c864bce308
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:20:02 +00:00
Bill Yi
f0ec69b322 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: babd7f1cc6 -s ours am: 9dd5145c74 -s ours am: ff79fd3b9f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifed35abcd5daad6c8db622908f1bb5fdfdba80c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:19:42 +00:00
Automerger Merge Worker
f42353579d Merge changes from topic "am-fccad1fd78d74820ac27310bf754500a" into tm-d1-dev-plus-aosp am: 474e99c32a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392235

Change-Id: I2b35fe496782f272f71207b5bbe64cec3e4ba69a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:17:35 +00:00
Automerger Merge Worker
d760b3272c Merge "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours am: 002496b1e1 -s ours am: 71eaa44916 -s ours" into tm-qpr-dev-plus-aosp am: 91b0cd2e93 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4a1574674e613a8ece0bfd2beabf7b96dd447d51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:17:19 +00:00
TreeHugger Robot
745bc58b23 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1ea00326ca -s ours am: 54b94fa642 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I488047868f3ceba59f9e8cdf098856eb0702d02d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:17:13 +00:00
Bill Yi
80f9b363c2 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours am: 002496b1e1 -s ours am: 71eaa44916 -s ours am: d10cea9f3e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3c9ee75a6fbcea0bdfb5984662079f42d3e05e26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:17:10 +00:00
Bill Yi
a904677d80 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours am: 002496b1e1 -s ours am: f97e8519cf -s ours am: 1b4979f090 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ide154c85ed9e25d99d60a99f178c7a24a1dc45c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:15:24 +00:00
TreeHugger Robot
e1b6c95a72 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 96bc6ca196 -s ours am: 7da6e7a960 -s ours am: 4915a9b3aa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I54115b6db99539cbdeef2bfb7bb6e8def0048538
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:13:34 +00:00
Bill Yi
f3ee83c034 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: babd7f1cc6 -s ours am: e6613a454e -s ours am: ed43940526 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic13dab8232d14b73841b181bc752be6766f3f70a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:13:09 +00:00
TreeHugger Robot
c819cc5401 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 96bc6ca196 -s ours am: c79be68440 -s ours am: 0e6b0ba8cb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib457298cf25a7886c125118fb87d9425c1f5f9c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:06:22 +00:00
Bill Yi
4948557b54 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: babd7f1cc6 -s ours am: 9dd5145c74 -s ours am: 6654c69877 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I02eb36503083b73c3bc46e0b4957310efeff5607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:06:00 +00:00
TreeHugger Robot
1a59c69653 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1ea00326ca -s ours am: 4fe83b61ff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id9dc808dbcfdf9d75acf75ed7fd1257174bb437f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:03:11 +00:00
Bill Yi
a0ad43068a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1e9765bba2 -s ours am: 9d76bd7a1f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1ffc3ac599dc156766f0a0844c8cda078acdb9b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 03:02:48 +00:00
Automerger Merge Worker
003f3914c4 Merge "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours am: 7a0b1e186d -s ours" into tm-d1-dev-plus-aosp am: b13d27ffe5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9334c75634f8d0968ec4a43e80586352904ab4c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 02:56:41 +00:00
Bill Yi
4b38cfde8c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours am: 7a0b1e186d -s ours am: 7c0e477837 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1414d188012d50886c5df43afe3c04712748f7a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-23 02:56:34 +00:00