PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
114,912 Commits 1 Branch 0 Tags
92c5ef7a89d6c5c3b05f09bd0bce1b51db2c7bb8
Commit Graph

114912 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
adf79eae3e Merge "Port battery usage bug fixing cls from master to tm-qpr-dev" into tm-qpr-dev 2022-08-24 05:04:05 +00:00
Bill Yi
49b3291215 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1be27e97c5 -s ours am: 7c8eb553f3 -s ours am: a6e3a37237 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5152ae609cab4663d2942f0182625edbe4facbf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 05:00:22 +00:00
Bill Yi
c76fc1fd5d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9c441ad4fe -s ours am: 44b8eef34f -s ours am: 77f4742278 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4deeb8ea66ef2a5ba3fcff0f8e5711b9a707f180
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 05:00:03 +00:00
Bill Yi
b441eba8c8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1a3d6c47c2 -s ours am: a508e939b1 -s ours am: ffb58bd57f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idc6b908eccb2e8e665127eecc714028cbd9542ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 04:59:40 +00:00
Bill Yi
ae3792c3ee [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 789b774cb2 -s ours am: 0bc186ced0 -s ours am: b55ee3e40c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I05e49d78aaf8bf1fcaed8d3d99fdbcf5070f771f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 04:59:18 +00:00
Betty Chang
3852ceab9b Merge "[LE Audio] Display the correct title on broadcast assistant device" into tm-qpr-dev am: f14071682f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19705826

Change-Id: I7a4f1366a1481e303afe73f21320cd3c421015e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 03:51:23 +00:00
tom hsu
3aa4440b36 [Panlingual] Improve conditions of supporting app locale. 
There are 3 conditions we need to check.
  1. Has locale config file
  2. Has locale config file w/o content
  3. Has locale config file w/ content

 Currently, we do not have condition 2 into the condition group, and we
 need to add it into.

Bug: b/243099750
Test: Manual
Change-Id: I58d0275af53031ba4f4c705022017d5143f45795
 2022-08-24 03:39:35 +00:00
tom hsu
e6b46dc853 [Panlingual] Remove featureflag of app language. 
Panlingual successfully landed. Hence, we can remove the feature flag
 right now.

Bug: b/209775925
Test: atest pass
Test: Manual test pass
Change-Id: I464a206027fd63ee1763acaf17d1b6251e839bc0
 2022-08-24 11:29:31 +08:00
tom hsu
3cbb6f8680 [Languages] Add new information to system language page. 
- Add top Intro preference
 - Add footer preference
 - Add sub string to language picker
 - Modify title of app locale pages

Bug: 242182598 Add information to system language page.
Bug: 241600418 [Panlingual] Change strings on App languages
Test: Maunal test
Change-Id: I9bca8911e8e70c97c273294b3c9d1d73d4ea0cb2
 2022-08-24 11:04:24 +08:00
Kedar Chitnis
b619ba5580 Merge "Remove feature flag SETTINGS_GUEST_MODE_UX_CHANGES" 2022-08-24 03:02:14 +00:00
Betty Chang
f14071682f Merge "[LE Audio] Display the correct title on broadcast assistant device" into tm-qpr-dev 2022-08-24 02:55:13 +00:00
Bill Yi
292e3d1c4f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 1a788ea34e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I303bcfa1e93aebc6b19d2aaf88f3bdd135527aff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 23:24:20 +00:00
Bill Yi
1002104b19 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6fc7e574e2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If3e46cc0636c267fbd4b1e12b5d2ce9b1c1b3e16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 23:24:15 +00:00
Bill Yi
1a788ea34e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-08-23 22:52:50 +00:00
TreeHugger Robot
05e98c62b4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675 -s ours am: 4f819e1516 -s ours am: bf23a06eac -s ours am: f4a4722c33 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id9f4fb087bd7e730d1e7df14ff1a1de5e2955334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 21:08:54 +00:00
Bill Yi
52d7d56da8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21 -s ours am: f8f3b752ea -s ours am: 637265f9ea -s ours am: 2c63bb5b09 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia870ca2693b88730f7273e9a2a9f6a2d312ea4c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 21:08:30 +00:00
TreeHugger Robot
cadcee22d1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c6e9ba1100 -s ours am: d1c096bc56 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I50ed0c316dba7e71dd1973a2cbafaaa863795e8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 21:04:35 +00:00
Bill Yi
89daab6918 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23c81a0a7f -s ours am: 906b408520 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I99b5a6bc45e9a4b85e7e8218cd58119578f9ac14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 21:04:23 +00:00
TreeHugger Robot
365b1b7657 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: fa53f6fafe -s ours am: 7448a4df9f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iece7afa7246dda2939763a6ee511fd8271e79a29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 21:04:07 +00:00
Bill Yi
ad3af12d5a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31ea59660b -s ours am: c7e2c34520 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I244aa55fc087febd2cb37ef26f7aef32a4786285
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 21:03:45 +00:00
Sayak Dutta
9f1113274e [automerger skipped] Merge "Update back FooterButton visibility for navigation instead of back button" into tm-qpr-dev am: af11c676a9 am: 3985485b3a -s ours 
am skip reason: Merged-In I6c99b1173bd8ef90b89dedc49745fdb2bcf11318 with SHA-1 40e436ff3b is already in history

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

Change-Id: I7997e8372e4b76fb65fe7555b1e43d6e322a9752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 21:02:08 +00:00
Bonian Chen
534dbdfd29 Merge "[Settings] Additional route for dismiss activity dialog" into tm-qpr-dev am: 105cda2fbe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19705214

Change-Id: Ib5200b5c3a0cbf87fc8a8de5991742847b924049
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 20:50:09 +00:00
Bill Yi
a6e3a37237 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1be27e97c5 -s ours am: 7c8eb553f3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I297f2dc5429b7a5d3bd0384766e2c1b7037efa43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 20:42:09 +00:00
Bill Yi
77f4742278 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9c441ad4fe -s ours am: 44b8eef34f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I920696223f019b3eff5ad37094cd4253bbb8a2bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 20:41:52 +00:00
Bill Yi
ffb58bd57f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1a3d6c47c2 -s ours am: a508e939b1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id3d30220f0640686211033bcddad7731ee7ecb48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 20:41:27 +00:00
Bill Yi
b55ee3e40c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 789b774cb2 -s ours am: 0bc186ced0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0fa6be28773a7a887007d81402bb8e456a3ac919
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 20:41:05 +00:00
TreeHugger Robot
f4a4722c33 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675 -s ours am: 4f819e1516 -s ours am: bf23a06eac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I66be52d039371640b6bcbf4df1fe8c3ab8b5dffa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 20:27:13 +00:00
Bill Yi
2c63bb5b09 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21 -s ours am: f8f3b752ea -s ours am: 637265f9ea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I152fc992e09d34a12b52f4b09d86b7c28ad3854c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 20:26:55 +00:00
TreeHugger Robot
d1c096bc56 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: c6e9ba1100 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib19ca47d04b3f250201329826b64f9e6e8b51c91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 20:25:15 +00:00
Bill Yi
906b408520 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23c81a0a7f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5aaf8ae1adbc7f578b9ea6dc76d75b1a6c68f3e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 20:24:50 +00:00
TreeHugger Robot
7448a4df9f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: fa53f6fafe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8f398660f3f7eb4b0a8ad0823302ed6b3215a100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 20:24:32 +00:00
Bill Yi
c7e2c34520 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31ea59660b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib0bf5cd74a3c2a05f9e62346c7377cbdac3e3aa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 20:24:19 +00:00
Sayak Dutta
3985485b3a Merge "Update back FooterButton visibility for navigation instead of back button" into tm-qpr-dev am: af11c676a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19682757

Change-Id: Iae792a3cb815612047ffb2c14fee3c40a19653d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 20:22:51 +00:00
Bonian Chen
9bdca3ba92 [Settings] Data warning & limit UI should be configuable when running out of limit 
Should access API which is irrelated to status of data limit.
Changing from API isDataEnabledForApn(ApnSetting.TYPE_DEFAULT)
into isDataEnabledForReason(TelephonyManager.DATA_ENABLED_REASON_USER).

Bug: 223361190
Change-Id: Iada89de38e9db3706a944c7a5b5f8a3e87d415e5
Test: Manual
(cherry picked from commit 7e530dda39)
 2022-08-23 18:37:08 +00:00
Chloris Kuo
fe172874ed Merge "Support ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS in Enhanced Notifications" 2022-08-23 18:35:22 +00:00
Bonian Chen
105cda2fbe Merge "[Settings] Additional route for dismiss activity dialog" into tm-qpr-dev 2022-08-23 18:14:32 +00:00
Tiffany Nguyen
83ade9dd2a Merge "Fix loading bug when switching filters." 2022-08-23 17:51:20 +00:00
Bill Yi
5fabe23482 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: f0632c26b5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5ea8b507df6c7409726330950eea1185eae83282
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 17:20:39 +00:00
Bill Yi
74a222312f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f6a1e9ded -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8501c021895608b09d108d789780953b17d427d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 17:20:26 +00:00
Bill Yi
af0f1a099e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1be27e97c5 -s ours am: 5c691c0670 -s ours am: c29ab9bf8b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6f08bb590cce0cab8ae307bdd402d777c76035c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 15:41:52 +00:00
Bill Yi
05773ecea0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9c441ad4fe -s ours am: 60f828e428 -s ours am: 78aece0998 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I384a00aeb000326b6ef38f50c35b159d47d3bff3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 15:41:27 +00:00
Bill Yi
7ac893639d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1a3d6c47c2 -s ours am: 9281ec1752 -s ours am: 56af244b80 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If9c598992da440a52a905c9ddb61780137f28f91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 15:41:08 +00:00
Bill Yi
15d7c75f32 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 789b774cb2 -s ours am: 381f37b918 -s ours am: 1c41a160c2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0703bdd5d63e31e140c9eec69d043418177f974b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 15:40:54 +00:00
Treehugger Robot
b09a775ba7 Merge "Fix always return first package for mock location app in developer options." am: d221269892 am: 280ad76afb am: 4c06c2426d am: 1467de15bc am: cb302284e6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2133170

Change-Id: I0105eee03725bc5ec7f07218483fa668e41d96bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 15:39:32 +00:00
Bill Yi
c29ab9bf8b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1be27e97c5 -s ours am: 5c691c0670 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iea672469f43e5b1deda5fb6c7b75ba79c5c9adb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 14:37:08 +00:00
Bill Yi
78aece0998 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9c441ad4fe -s ours am: 60f828e428 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idff7c99bf3926e4138799fa53bc0317306a9158f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 14:36:42 +00:00
Bill Yi
56af244b80 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1a3d6c47c2 -s ours am: 9281ec1752 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I13c2baa859f086fcb43624b88be0f5de477caf84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 14:36:23 +00:00
Bill Yi
1c41a160c2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 789b774cb2 -s ours am: 381f37b918 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4fc668bfd5013261e8a3205af9aa15f20edc14ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 14:36:09 +00:00
Treehugger Robot
cb302284e6 Merge "Fix always return first package for mock location app in developer options." am: d221269892 am: 280ad76afb am: 4c06c2426d am: 1467de15bc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2133170

Change-Id: Ie73421bb80637e58b04772e20289a38d22a2a708
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-23 14:35:06 +00:00
Bill Yi
f0632c26b5 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-08-23 14:30:18 +00:00