PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,260 Commits 1 Branch 0 Tags
f72035735ce66106adba4ea5ca2488a993dbb45c
Commit Graph

90260 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Chiu
ae5327d4bb Fine tune the homepage scrolling behavior 
Scroll to the highlight position before showing homepage.

Bug: 199017944
Bug: 204946469
Test: visual
Change-Id: I11708f42180a3af22855ac7b5f53460f737ed208
 2021-11-05 18:21:59 +08:00
Arc Wang
3a655fd1ec [Large screen] Set SplitPairRule for DeepLinkHomepageActivity am: 82eeacf275 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16183661

Change-Id: I7369fb99dea1ecd7b00a5fb399441a1cde8b0e68
 2021-11-05 09:34:51 +00:00
Hugh Chen
13375e5f44 Fix phone shows incorrect pairing code in pairing dialog 
Add PendingIntent.FLAG_UPDATE_CURRENT to let peding intent can
be updated the intent extra.

Bug: 204133175
Test: make -j64 RunSettingsRoboTests
Change-Id: I42966432dacc3727d31231d10aa07b782bb1d92e
 2021-11-05 09:22:13 +00:00
Arc Wang
82eeacf275 [Large screen] Set SplitPairRule for DeepLinkHomepageActivity 
Setting app should set SplitPairRule for all the alias of
SettingsHomepageActivity to handle all the different
launch cases.

Bug: 204156913
Bug: 204399375
Test: manual
      1. Launch settings in unfold screen
      2. Fold screen
      3. Launch wallpaper app
      4. Unfold screen
Change-Id: I3ad33a750ef19390bc8dc3fb4dc6f1c80630d57f
 2021-11-05 08:33:59 +00:00
TreeHugger Robot
54fec9c294 Merge "[Large screen] SplitListener may not provide correct information" into sc-v2-dev am: 672185ffe7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16183654

Change-Id: I0ec9b59130b9e5b5849cad1bd095823b45204ed3
 2021-11-05 04:56:14 +00:00
TreeHugger Robot
672185ffe7 Merge "[Large screen] SplitListener may not provide correct information" into sc-v2-dev 2021-11-05 04:39:50 +00:00
Arc Wang
488f79cab5 [Large screen] SplitListener may not provide correct information 
SettingsActivity may send Settings 2-pane deep link Intent to
SettingsHomepageActivity if split callback tells that there is no
SplitInfo.

Wallpaper app sends deep link Intent to SettingsHomepageActivity,
and then SettingsHomepageActivity starts Wallpaper app page.
The flow should be 2-pane organized but the split callback tells
that splitInfos is empty.

This change checks if the Intent is from SettingsHomepageActivity
to prevent the Intent loop by the bug.

Bug: 205206004
Test: manual
      Long click Launcher -> Wallpaper & style
Change-Id: I6b9d76c136238e556384e891ae1700ae7c1bb41f
 2021-11-05 11:07:33 +08:00
Joe Bolinger
ba9f4f66a8 Merge "Set a min height for pattern setup." into sc-v2-dev am: 774c2181ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16194774

Change-Id: I18756d98be500c0337278161909766ad157aec81
 2021-11-05 03:01:18 +00:00
Joe Bolinger
774c2181ea Merge "Set a min height for pattern setup." into sc-v2-dev 2021-11-05 02:45:07 +00:00
TreeHugger Robot
d34752cce6 Merge "Register rule for wallpaper entry" into sc-v2-dev am: 6c24e5bc33 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16180475

Change-Id: If731d818bef7f8bc3e20144ac9e45930f88ecd43
 2021-11-05 01:12:45 +00:00
TreeHugger Robot
6c24e5bc33 Merge "Register rule for wallpaper entry" into sc-v2-dev 2021-11-05 01:00:08 +00:00
Joe Bolinger
e55568a7ba Set a min height for pattern setup. 
Fix: 194022156
Test: manual (set pattern in SUW with largest font/display size)
Change-Id: I82a0bb5aec122e9d65e4b17ea45166091deea02a
 2021-11-05 00:24:36 +00:00
TreeHugger Robot
c1935f79d6 Merge "[Large screen] Check if it's in 2-pane before 2-pane deep link flow" into sc-v2-dev am: ea216fd2f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16151659

Change-Id: I00976f8dbb0ed7449f8bd7865bc84242c8de533f
 2021-11-04 11:31:07 +00:00
TreeHugger Robot
ea216fd2f3 Merge "[Large screen] Check if it's in 2-pane before 2-pane deep link flow" into sc-v2-dev 2021-11-04 11:06:19 +00:00
Tsung-Mao Fang
b3db40a02b Register rule for wallpaper entry 
We should keep consistent split rule for wallpaper and other home menu
item. So, we create this cl to register the split rule for wallpaper.

Also, I do some minor refactoring in this cl for reusing existing
method and better code quality.

Test: Go to wallpaper, and click back key. App can close.
Fix: 204406425
Fix: 204364572

Change-Id: Ia7de9483b351d1121cc26c4af1cb8a89ad0a16bc
 2021-11-04 18:48:59 +08:00
TreeHugger Robot
8e9b44ea7d Merge "Update "Mobile network standby" attribute label into "Mobile network"" into sc-v2-dev am: c425a4ae93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16182698

Change-Id: I729cd092754422afd7c44cef0d5873336b070f80
 2021-11-04 10:09:24 +00:00
Bill Yi
4f343aa6d1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: 4933470166 -s ours am: 8f132e48f6 -s ours am: 7493a1c8f1 -s ours am: 9d554450b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I76c78ef0e60e9e0d7a751619faad20446e38f698
 2021-11-04 10:09:19 +00:00
Bill Yi
299447cadd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 579555c158 -s ours am: 7a05400c26 -s ours am: d51e96b212 -s ours am: 84b11eefca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia6880875ca99d515a7caabb6bfd3c37cbf9d719c
 2021-11-04 10:09:07 +00:00
Bill Yi
270ce09842 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: d18efb1358 -s ours am: c95b61f5f3 -s ours am: 7f0820ba09 -s ours am: 90d2c5ded2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5bed915b927474bb065dd2fe6bc09cc1b2e13906
 2021-11-04 10:08:55 +00:00
Bill Yi
b5e306ce19 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: 4933470166 -s ours am: 8f132e48f6 -s ours am: 7493a1c8f1 -s ours am: 3bf6443c3b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a3fb538e393ace6b707234c69d15cb079027933
 2021-11-04 10:08:49 +00:00
Bill Yi
881e62e394 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 579555c158 -s ours am: 7a05400c26 -s ours am: d51e96b212 -s ours am: 73606b9c56 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I294595254738f98a3fa14dfad15eac1f1320e96c
 2021-11-04 10:08:42 +00:00
Bill Yi
5d72e96a66 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: d18efb1358 -s ours am: c95b61f5f3 -s ours am: 7f0820ba09 -s ours am: 0db68469ef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id4632a2959dc03a8ca5c49377f048e4b17241882
 2021-11-04 10:08:35 +00:00
Automerger Merge Worker
927b097a41 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 6510b1715b -s ours am: 4a273e4c6b -s ours am: 38c9bb9362 -s ours am: f7939d35f5 -s ours" into sc-v2-dev-plus-aosp 2021-11-04 10:08:31 +00:00
Bill Yi
236065badf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 6510b1715b -s ours am: 4a273e4c6b -s ours am: 38c9bb9362 -s ours am: 899f7414bf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8bbfedad9d1311e409d57c00cbaa6572e90e3b1e
 2021-11-04 10:08:28 +00:00
Bill Yi
d0723669a1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 6510b1715b -s ours am: 4a273e4c6b -s ours am: 38c9bb9362 -s ours am: f7939d35f5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I99766bfbe4e6591ab5ce0dbff5e2ea3638b4b8ed
 2021-11-04 10:08:26 +00:00
Bill Yi
740477dc52 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: 4933470166 -s ours am: 8f132e48f6 -s ours am: ba11c08f71 -s ours am: b91416b6fd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2fd187e36a1b672b9dc234c94b24d0a6f90ed60c
 2021-11-04 10:08:22 +00:00
Bill Yi
28029299e1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 579555c158 -s ours am: 7a05400c26 -s ours am: b2daff0ad3 -s ours am: bbc8fcad51 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I41a08651f1fe19ea556270e9385fecf577d34131
 2021-11-04 10:08:14 +00:00
Bill Yi
cd5b3be99c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: d18efb1358 -s ours am: c95b61f5f3 -s ours am: a7e7987804 -s ours am: d858a497fb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I46719d2f90003ee63828bfb8d4f87ea4dc22ccac
 2021-11-04 10:08:07 +00:00
Bill Yi
fcad28e786 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 6510b1715b -s ours am: 4a273e4c6b -s ours am: 25be092f3b -s ours am: 59793f8785 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I456b72876ac3c01310c45cad9ec667605c233f33
 2021-11-04 10:07:52 +00:00
Arc Wang
e80b74de3a [Large screen] Check if it's in 2-pane before 2-pane deep link flow 
The callback of SplitStateObserver.SplitStateListener can have one
or more active splits when there is already 2-pane in Activity stack.

This change prevent unnecessary 2-pane deep link flow if the Activity
is already in 2-pane activity stack.

This solution does not work if the Activity was started in a new task.
(e.g., Intent.FLAG_ACTIVITY_NEW_TASK, launchMode singleTask).

Bug: 201379454
Bug: 201620626
Bug: 204398432
Bug: 204397936
Bug: 197609195
Bug: 197609197
Bug: 204501179
Bug: 204959335
Bug: 204845334
Test: manual
      1. Settings -> Apps > Default apps > Opening links.
      2. Click back button should back to Default apps page.
Change-Id: I04aaceed47a8f2754a4e17c53b49252f61e0a1d1
 2021-11-04 17:20:17 +08:00
TreeHugger Robot
c425a4ae93 Merge "Update "Mobile network standby" attribute label into "Mobile network"" into sc-v2-dev 2021-11-04 09:11:04 +00:00
Bill Yi
3bf6443c3b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: 4933470166 -s ours am: 8f132e48f6 -s ours am: 7493a1c8f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibc0d39e1a70c151ca911be921742b7e6498c397d
 2021-11-04 07:56:09 +00:00
Bill Yi
73606b9c56 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 579555c158 -s ours am: 7a05400c26 -s ours am: d51e96b212 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9428f1fdc0e62a1201fcb12eaa0a87f1756661d5
 2021-11-04 07:56:02 +00:00
Bill Yi
9d554450b0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: 4933470166 -s ours am: 8f132e48f6 -s ours am: 7493a1c8f1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I071ad78e8a2f6bb415ec5af61f10bfe6fc5508b9
 2021-11-04 07:55:58 +00:00
Bill Yi
0db68469ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: d18efb1358 -s ours am: c95b61f5f3 -s ours am: 7f0820ba09 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8d8288aba079744d82408a91eb0ea7ee07be250b
 2021-11-04 07:55:56 +00:00
Bill Yi
84b11eefca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 579555c158 -s ours am: 7a05400c26 -s ours am: d51e96b212 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0acefa0287b4ef07bf8ab307c9f1c970e8b5e123
 2021-11-04 07:55:54 +00:00
Bill Yi
90d2c5ded2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: d18efb1358 -s ours am: c95b61f5f3 -s ours am: 7f0820ba09 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c5b92d64fa2b247d7b32fe9ef04bd088728ee8a
 2021-11-04 07:55:51 +00:00
Bill Yi
899f7414bf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 6510b1715b -s ours am: 4a273e4c6b -s ours am: 38c9bb9362 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icbc57a543a9a5ec2f5c79f2ab37d725da0967463
 2021-11-04 07:55:49 +00:00
Bill Yi
f7939d35f5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 6510b1715b -s ours am: 4a273e4c6b -s ours am: 38c9bb9362 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2a25941728663b0393cb8c8f95305c45cc3c2f5c
 2021-11-04 07:55:47 +00:00
Bill Yi
b91416b6fd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: 4933470166 -s ours am: 8f132e48f6 -s ours am: ba11c08f71 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I507b80419dbc3fd42ff159560a3dd82deddc43c9
 2021-11-04 07:55:29 +00:00
Bill Yi
bbc8fcad51 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 579555c158 -s ours am: 7a05400c26 -s ours am: b2daff0ad3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I28a4a9323ab9e9d96bdfc43d4d7d64e946b60a2b
 2021-11-04 07:55:23 +00:00
ykhung
22dc875ba7 Update "Mobile network standby" attribute label into "Mobile network" 
Bug: 205051643
Test: make SettingsRoboTests
Change-Id: Ia8f5c3e76d72ffa6fd0601c58b1b3d157b711b30
 2021-11-04 15:55:23 +08:00
Bill Yi
d858a497fb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: d18efb1358 -s ours am: c95b61f5f3 -s ours am: a7e7987804 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If873f78b687d2ecc28b6de5ce117c4c7a54a50e4
 2021-11-04 07:55:18 +00:00
Bill Yi
59793f8785 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 6510b1715b -s ours am: 4a273e4c6b -s ours am: 25be092f3b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6f9ed58dcc110d6017203f1fb5b539001d8ac8f4
 2021-11-04 07:55:05 +00:00
Bill Yi
7493a1c8f1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: 4933470166 -s ours am: 8f132e48f6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idc52815ca55d4e7409f926b8e94bd411e58a8a87
 2021-11-04 07:38:52 +00:00
Bill Yi
d51e96b212 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 579555c158 -s ours am: 7a05400c26 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If762afbc0779ce9677359df76f27d6497dff0046
 2021-11-04 07:38:47 +00:00
Bill Yi
7f0820ba09 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: d18efb1358 -s ours am: c95b61f5f3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5d1aad6e0003033cf74c3f4d9b351159d523ce82
 2021-11-04 07:38:43 +00:00
Bill Yi
38c9bb9362 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 6510b1715b -s ours am: 4a273e4c6b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia0e61626cb5e20f4f5f8bd2120bd603c62fd8d17
 2021-11-04 07:38:39 +00:00
Bill Yi
ba11c08f71 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: 4933470166 -s ours am: 8f132e48f6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I254e6c5f36f5da439af64a1bd67e818e51064fdd
 2021-11-04 07:36:00 +00:00
Bill Yi
b2daff0ad3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a69cc3921 -s ours am: 5f68234c40 -s ours am: e99626cbca -s ours am: 579555c158 -s ours am: 7a05400c26 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibaef6558f196029d8c4c80f766def947aa0c1f80
 2021-11-04 07:35:55 +00:00