PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
117,217 Commits 1 Branch 0 Tags
ad5b6855db9752327f182a3dddeef32e84cb9bcc
Commit Graph

117217 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
054978150d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c262175b3c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie718e47503a51a1be9a14b2cda6c9b0dbca49260
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-27 00:55:01 +00:00
Bill Yi
d14b388366 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-09-27 00:41:11 +00:00
Weng Su
673f06c2ec Show WiFi minimum level when the Wi-Fi level is UNREACHABLE 
- Use WIFI_LEVEL_MIN instead of WIFI_LEVEL_UNREACHABLE to get the Wi-Fi icon resource to avoid app crashing because no valid Wi-Fi icon could be found.

Bug: 213294802
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksFragmentTest

Change-Id: Ia805e902716c25db3276b96116a84d0dd2d96a1b
 2022-09-26 20:54:19 +08:00
Kuan Wang
56d1c2fa55 Extract the logic of loading battery usage data form BatteryUsageStats 
in DataProcessor to make it reusable by BatteryUsageLoaderService.

Bug: 246233366
Test: make RunSettingsRoboTests + manually
Change-Id: I5c721120cc4005044def63937506cc64339a3e6b
 2022-09-26 10:45:30 +00:00
Nikhil Kumar
4c5fb86e80 Merge "Enable Name and Avatar change without turning on multi-user" 2022-09-26 08:52:49 +00:00
Chaohui Wang
76171b9d79 Add All App List for SPA 
This is the App List under Apps page with storage usage size.

Bug: 236346018
Test: Manual with Settings App
Change-Id: I8753160fb1abb609dcf2e9539b04ec5d72548d40
 2022-09-26 16:27:09 +08:00
ot904699
aa76620073 Fix USB OTG hot plug out nndexOutOfBoundsException 
Open Settings, then open Storage , plug in USB OTG with Disk, select Disk, open Files, play a video, press the back key, hot plug out USB OTG, the IndexOutOfBoundsException will happen

The root cause is when received the onVolumeStateChanged in StorageEventListener in StorageDashboardFragment, the volumeInfo
status is VolumeInfo.STATE_UNMOUNTED or VolumeInfo.STATE_EJECTING, mSelectedStorageEntry set to changedStorageEntry, cause the fail.

This is a fix for CL 225095144 bug.

Bug: 247737688
Test: Manual

Change-Id: I9535c49d65c42a8dfa8ccf4e271ae973d944d4b9
 2022-09-26 08:15:48 +00:00
Chaohui Wang
7144d95e4d Merge "Add App Buttons to the App Settings page" 2022-09-26 07:58:57 +00:00
Chaohui Wang
9071feb4e6 Merge "Add debug flag for App Settings page" 2022-09-26 07:58:20 +00:00
Bill Yi
829b517f75 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 61485ad3cb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic490f8bc4fa644b0e55dcafb2ba2bb862358567d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 07:35:24 +00:00
Chaohui Wang
f6db01ccfb Merge "Add EntryProvider in SettingsGoogle" 2022-09-26 07:24:46 +00:00
TreeHugger Robot
b84d28f43a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7c21f2eaa6 -s ours am: 89fec1854b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie5e1c0adcf21aaf2c13df51f7e26c8db1e5947b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 06:51:25 +00:00
Bill Yi
055c6f769d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c3d8f340b -s ours am: 514c6d557c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I00339ee83f505465c5510ef607f7e38fe4bc4429
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 06:51:09 +00:00
Bill Yi
acd62d3809 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a44c6afa3 -s ours am: 9d95e8ecc0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia2781517977cba0276a7afc210c3cc2870bab7f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 06:50:57 +00:00
Automerger Merge Worker
69a1062579 Merge changes from topic "am-44884482f39c4e5bb8e97e19df49f3d8" into tm-qpr-dev-plus-aosp am: 8b698d46a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20035807

Change-Id: I8ca897152fbe358624ddb5eb88093ce2f78a3120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 06:29:35 +00:00
TreeHugger Robot
c2f27e0790 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 83ffbfacbc -s ours am: 9ef4f7bf83 -s ours am: bdb77f2c7b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaa93d038c13ee408e963c07318f13b6beae06f0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 06:29:00 +00:00
TreeHugger Robot
4535046f2c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 83ffbfacbc -s ours am: 6b68056ab6 -s ours am: 211ffb5d1e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I72efabbd89b80b593ae02a2beead48e3b449aed9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 06:20:49 +00:00
Bill Yi
17bc006ec6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e0c4e5bdc5 -s ours am: c802b51978 -s ours am: e5efbb0e5e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6a086eeac5c7f29ee91194ea8c3e77a722ba6062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 06:20:38 +00:00
Bill Yi
e3b9062ae9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8be26784c -s ours am: 44c4eadbd3 -s ours am: 359712a426 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I52c08d32b6fb863574837a59d79eb3bff8ed6dae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 06:20:25 +00:00
Automerger Merge Worker
8b698d46a3 Merge changes from topic "am-44884482f39c4e5bb8e97e19df49f3d8" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 83ffbfacbc -s ours am: 9ef4f7bf83 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e0c4e5bdc5 -s ours am: 49e8ae680f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8be26784c -s ours am: db81d7d5ab -s ours
 2022-09-26 06:07:09 +00:00
Chaohui Wang
7fc0b3a70b Add App Buttons to the App Settings page 
Including the following,
- Launch
- Disable
- Uninstall
- Force stop

Bug: 236346018
Test: Manual with Settings App
Change-Id: Iecfc2b97cdda4ff0ba5080b4287cc4542ffc57ad
 2022-09-26 14:04:56 +08:00
TreeHugger Robot
211ffb5d1e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 83ffbfacbc -s ours am: 6b68056ab6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I969e49c03907bfa3ee03dc2e0717a01dc0440f1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 06:03:39 +00:00
TreeHugger Robot
bdb77f2c7b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 83ffbfacbc -s ours am: 9ef4f7bf83 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icf02d341caf3a6c50cbfd12a73ef11dc512f2089
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 06:03:33 +00:00
Bill Yi
e5efbb0e5e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e0c4e5bdc5 -s ours am: c802b51978 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7c876af69d65c5e9be7e72684a5fa2c71c6975cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 06:03:26 +00:00
Bill Yi
637f8bdd5d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e0c4e5bdc5 -s ours am: 49e8ae680f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I09117dde481df49ff57a2da477d2e9fa6a3d33a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 06:03:22 +00:00
Bill Yi
359712a426 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8be26784c -s ours am: 44c4eadbd3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iba0ff644ef6e947c69e0270ecdd78511e970bff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 06:03:15 +00:00
Bill Yi
4220e27e3d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8be26784c -s ours am: db81d7d5ab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4f6a1b7a1fea9fab71a46f0d8163dcbc909724ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 06:03:06 +00:00
TreeHugger Robot
6b68056ab6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 83ffbfacbc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia8d350fd3268d547a91f443b245742a77b3aa594
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 05:43:09 +00:00
Bill Yi
c802b51978 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e0c4e5bdc5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id3fae5f4eb9984d9fe3aadee1ce847067d59753d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 05:43:03 +00:00
Bill Yi
44c4eadbd3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8be26784c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a66f517313d9543447a17e62d063c0c9b233238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 05:42:39 +00:00
TreeHugger Robot
9ef4f7bf83 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 83ffbfacbc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5682881041e0d914cf81c26b1244924458b7637c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 05:41:56 +00:00
Bill Yi
49e8ae680f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e0c4e5bdc5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I717c9a7a099ce59ac3487d09b50e0bf620b76dd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 05:41:46 +00:00
Bill Yi
db81d7d5ab [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8be26784c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I49d728662f4953943c069d486d3345d02a7fd1da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 05:41:29 +00:00
TreeHugger Robot
83ffbfacbc Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-09-26 05:13:10 +00:00
Bill Yi
180a8c3925 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5419d3f04e -s ours am: 1b68f107cf -s ours am: 9c58f1e6d5 -s ours am: 9e24f47b92 -s ours am: d4accc6881 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifd24d16bba3c959397e22a940567576ae2c0d2f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 04:28:47 +00:00
Bill Yi
bbf761d57b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a068e61a94 -s ours am: fa5c30b611 -s ours am: fc1eb27c1c -s ours am: cf6bdfbf1c -s ours am: 9f6069250c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I63346549fb2a25193c8cd28985bbfe96a259e438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 04:28:33 +00:00
Bill Yi
9530502d6a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2a57051294 -s ours am: 44f10293dd -s ours am: 687ba7a903 -s ours am: 3f81e0c4f4 -s ours am: a15d043618 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I131d3677c827e716d579fd67da42759a9444f24f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 04:28:14 +00:00
Bill Yi
33045b4e93 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53322b1886 -s ours am: b9925d6346 -s ours am: 7687eee85f -s ours am: 99dffa3013 -s ours am: 093f59ea7b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I54198d4bf93d70f3deaf28da93e6beff1cdb46ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 04:27:50 +00:00
Bill Yi
d4accc6881 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5419d3f04e -s ours am: 1b68f107cf -s ours am: 9c58f1e6d5 -s ours am: 9e24f47b92 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icd7e614320e4a387d8192731b10375c304d42002
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 04:08:38 +00:00
Bill Yi
9f6069250c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a068e61a94 -s ours am: fa5c30b611 -s ours am: fc1eb27c1c -s ours am: cf6bdfbf1c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id9d9691802dd0465946c6b6c8b2f74b9c22f474b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 04:08:22 +00:00
Bill Yi
a15d043618 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2a57051294 -s ours am: 44f10293dd -s ours am: 687ba7a903 -s ours am: 3f81e0c4f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2edddad61a1db601cf779c1f2930783aa1988698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 04:08:01 +00:00
Bill Yi
093f59ea7b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53322b1886 -s ours am: b9925d6346 -s ours am: 7687eee85f -s ours am: 99dffa3013 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2a5a0d35bca900dfaec8e19f2b123e374ccb2dc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 04:07:38 +00:00
Bill Yi
9e24f47b92 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5419d3f04e -s ours am: 1b68f107cf -s ours am: 9c58f1e6d5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id3d18979de5a6edcafa9c9873842f192e5bc2fc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 04:02:43 +00:00
Bill Yi
cf6bdfbf1c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a068e61a94 -s ours am: fa5c30b611 -s ours am: fc1eb27c1c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I64e785ee741a47e1852645b5013c9cf5f9fc9977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 04:02:28 +00:00
Bill Yi
3f81e0c4f4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2a57051294 -s ours am: 44f10293dd -s ours am: 687ba7a903 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic3b007c53d6692c289c3cc4205b709d8fe64a6fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 04:02:08 +00:00
Bill Yi
99dffa3013 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53322b1886 -s ours am: b9925d6346 -s ours am: 7687eee85f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3133d34aed69f46827676b1ebd82930caa98b8d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 04:01:46 +00:00
Bill Yi
9c58f1e6d5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5419d3f04e -s ours am: 1b68f107cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I220d0e40fe818db047ad044eaebf353b4c3a9453
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 03:41:25 +00:00
Bill Yi
fc1eb27c1c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a068e61a94 -s ours am: fa5c30b611 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia71f310fee9bcaacc1a85cbdfa67d4a7410753b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 03:41:10 +00:00
Bill Yi
687ba7a903 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2a57051294 -s ours am: 44f10293dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic109f908fef58e17b1d2bcd2538f33140bcd5330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 03:40:50 +00:00
Bill Yi
7687eee85f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53322b1886 -s ours am: b9925d6346 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie1172379e741d3e5062ea530ad2ef3af7cd44ef6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-26 03:40:25 +00:00