PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,933 Commits 1 Branch 0 Tags
01793cf5fd1ece841793cfe87dd80a3cdf58241c
Commit Graph

103933 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weng Su
9dfbd9dab8 Remove Wi-Fi toggle in settings search 
- Remove Wi-Fi toggle preferences in settings search if Wi-Fi state is disallowed to change

- See the result screenshot in b/203168097#comment29

Bug: 203168097
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: Ibe352f3ec3413fb0774de0b2bd213bb705e919e0
 2022-05-04 04:01:47 +08:00
Vadim Caen
a4ea00024c Merge "Add Settings for back animation developer option DO NOT MERGE" into tm-dev am: 0be85b0811 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17622557

Change-Id: I25c0da85710fa4b793c511c1bb5d3169576d7b35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 14:16:41 +00:00
Vadim Caen
dc7b4cf7fd Add Settings for back animation developer option DO NOT MERGE am: d268b11e85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17622557

Change-Id: Ided61f54664b6cf41fc45ea0f24c2455f5624b21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 14:16:38 +00:00
Vadim Caen
0be85b0811 Merge "Add Settings for back animation developer option DO NOT MERGE" into tm-dev 2022-05-03 14:13:56 +00:00
Bonian Chen
63686f0534 Merge "[Settings] Fix missing part for refactor" into tm-dev am: e83d2a5e0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18123662

Change-Id: Ie255f9849c8f422ac33aef061363eeafe1823412
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 13:26:10 +00:00
Bonian Chen
f34bb7a6e9 Merge "[Settings] Preferred network mode appears during in-call" into tm-dev am: 55d722c2b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18121902

Change-Id: I9592f50ec10fdd0451ec8e7ca897a7376f6db8bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 13:24:25 +00:00
Bonian Chen
e83d2a5e0e Merge "[Settings] Fix missing part for refactor" into tm-dev 2022-05-03 12:33:36 +00:00
Chaohui Wang
f311566b85 Add the jank detection to Settings sliders 
- Currently most the sliders are implemented by
   com.android.settings.widget.SeekBarPreference.
 - Volume ones are implemented by VolumeSeekBarPreference, which resets
   the OnSeekBarChangeListener, so need special handling.
 - PointerSpeedPreference is standalone, added separately.

Bug: 230285829
Test: Verify trace via jank developer guideline.
Change-Id: Ia2978df196676ad6675d2834f6af6cb2aa9094cf
 2022-05-03 11:06:34 +00:00
Chaohui Wang
cf81f94e3b Improve Talkback for user select dialog 
Before this fix,
Both the list item and button are focusable by Talkback, and the list
item one is ok ("Personal, one of two."), the button one is read as
"Unlabeled".

After this fix,
Only the button is focusable by Talkback, read as "Personal, in list, 2
items."

Also test to make sure Switch Access not break.

Bug: 174626616
Test: manual test when Talkback / Switch Access enabled
Change-Id: I72765c1bcbb75e544d5829b21c3e2baf4355be1f
 2022-05-03 19:02:21 +08:00
Stanley Wang
61b960f787 Update the title of Model page 
The title of the page should be the same as the clicked preference.

Fix: 216250776
Test: manually test and see the UI
Change-Id: I6599375fe7b3043f5b48fdc2497ee351136d0629
 2022-05-03 18:28:52 +08:00
Bonian Chen
55d722c2b0 Merge "[Settings] Preferred network mode appears during in-call" into tm-dev 2022-05-03 09:46:47 +00:00
TreeHugger Robot
f0cf82f057 Merge "Show restricted message in Wi-Fi hotspot settings" into tm-dev am: cf52a8ea7d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18126022

Change-Id: Ie63bb97aa8fbf040392c5755fd49a3060fe18566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 09:09:04 +00:00
TreeHugger Robot
cf52a8ea7d Merge "Show restricted message in Wi-Fi hotspot settings" into tm-dev 2022-05-03 08:58:13 +00:00
TreeHugger Robot
5e5b3916e8 Merge "Fix the flashing list on Opening link page" into tm-dev am: e99683f013 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087633

Change-Id: I84b98e5c16e0fdde34cfebf11725ec83c4b69328
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 08:45:03 +00:00
Bonian Chen
85a7283c06 Merge "[Settings] Stop listening data connected intent for presenting reset APN dialog" into tm-dev am: 337cfe6fc0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090786

Change-Id: I19062e21d610f38201c8c13815a3cb3cc9550acb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 08:44:55 +00:00
Hugh Chen
ec0c171735 Fix can't select the [USB Tethering] item in [Developer Options] 
- This CL is using 'USB_CONFIGURED' to check whether the USB enumeration
  is completed from the intent. If 'USB_CONFIGURED' is true then update
  the UI.

Bug: 229200265
Test: make -j65 RunSettingsRoboTests
Change-Id: Icab05e37ae3fcc9f1bf404a610fc97c368c453f5
 2022-05-03 08:00:58 +00:00
TreeHugger Robot
e99683f013 Merge "Fix the flashing list on Opening link page" into tm-dev 2022-05-03 07:59:17 +00:00
Bonian Chen
337cfe6fc0 Merge "[Settings] Stop listening data connected intent for presenting reset APN dialog" into tm-dev 2022-05-03 07:54:30 +00:00
Bonian Chen
eff476375c [Settings] Fix missing part for refactor 
There're 2 missing parts in previous code refactor:
1. The API change for exiting ECM mode dialog
2. The support of onActivityResult() for PreferenceController

Bug: 226494641
Test: local
Change-Id: I0c2c313a53fbc1b7435f295f190b70653e2f6758
 2022-05-03 07:33:48 +00:00
Betty Chang
79949be124 Merge "[LE] Launch the dialog for the user to broadcast or find broadcast" into tm-dev am: 5dea2176a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030886

Change-Id: I487df2695fe2c7ead09d86286b32f75b3a343d98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 07:33:21 +00:00
Edgar Wang
278b99f743 Merge "Revert "Update data_usage_bytes_editor spinner background"" into tm-dev am: 37ad451324 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029962

Change-Id: I3a8d34d848f6cde3d906c4343f6052f7e56a681c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 07:33:13 +00:00
Betty Chang
5dea2176a2 Merge "[LE] Launch the dialog for the user to broadcast or find broadcast" into tm-dev 2022-05-03 07:21:11 +00:00
Edgar Wang
37ad451324 Merge "Revert "Update data_usage_bytes_editor spinner background"" into tm-dev 2022-05-03 07:14:24 +00:00
Weng Su
e37a553e94 Show restricted message in Wi-Fi hotspot settings 
- Remove Wi-Fi hotspot preferences in settings search if Wi-Fi hotspot is disallowed

- See the result screenshot in b/203168953#comment12

Bug: 203168953
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSettingsTest

Change-Id: Id4416fd0659b596e4e6f31890a139198219f4552
 2022-05-03 13:58:54 +08:00
changbetty
f31b5769d7 [LE] Launch the dialog for the user to broadcast or find broadcast 
- Launch the broadcast dialog from entry point in Media Volume Slice

    - Fix the broadcast dialog to follow the dialog style

    - Start broadcast and launch the MediaOutputBroadcastDialog from
      broadcast dialog

Bug: 229577518
Test: manual test
Change-Id: I1329b3f35b03afc441142494df883ae17f373656
 2022-05-03 03:16:08 +00:00
Bill Yi
67d1684f28 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0 -s ours am: 5e07d7fd84 -s ours am: d75e8abee9 -s ours am: 1836db16f7 -s ours am: a8f28ed7c5 -s ours am: 551016f43b -s ours am: 41b6a6c820 -s ours am: a82a1ff84e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9f32b652574da07d2f3a141c996d17a9ec92e65a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 00:33:31 +00:00
Bill Yi
9e755959ac [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0 -s ours am: 5e07d7fd84 -s ours am: d75e8abee9 -s ours am: 1836db16f7 -s ours am: a8f28ed7c5 -s ours am: b8d61f99e0 -s ours am: 10abd90819 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I56da951d2c301dfa95ec3da70a3bce4e2ae7e79e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 00:32:52 +00:00
Bill Yi
a82a1ff84e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0 -s ours am: 5e07d7fd84 -s ours am: d75e8abee9 -s ours am: 1836db16f7 -s ours am: a8f28ed7c5 -s ours am: 551016f43b -s ours am: 41b6a6c820 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I76e5a942e34ed88eb8bccc0651f3faf2d7536922
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 00:31:51 +00:00
Bill Yi
41b6a6c820 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0 -s ours am: 5e07d7fd84 -s ours am: d75e8abee9 -s ours am: 1836db16f7 -s ours am: a8f28ed7c5 -s ours am: 551016f43b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id66275160d51b92ccd9285f85143bc699b375a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 00:00:48 +00:00
Bill Yi
10abd90819 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0 -s ours am: 5e07d7fd84 -s ours am: d75e8abee9 -s ours am: 1836db16f7 -s ours am: a8f28ed7c5 -s ours am: b8d61f99e0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia097d604caed1a90740d24c5dbe05807242127ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 00:00:46 +00:00
Bill Yi
551016f43b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0 -s ours am: 5e07d7fd84 -s ours am: d75e8abee9 -s ours am: 1836db16f7 -s ours am: a8f28ed7c5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5cea3e375757e71dc4f940d0e02aaa6425cc8136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 23:29:26 +00:00
Bill Yi
c5cbc6044c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours am: 0b07e79cc1 -s ours am: 365338b6d0 -s ours am: ec31d2697d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie622f99dae37f0c276aad327f14964f8f03b3d76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 23:28:39 +00:00
Bill Yi
97f8879cff [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours am: 7a2a5bd916 -s ours am: 1df006f84c -s ours am: 9f888216b4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1e5fe4b221792ee36b4512b421cd0a4d9c34f3d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 23:28:32 +00:00
Bill Yi
b8d61f99e0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0 -s ours am: 5e07d7fd84 -s ours am: d75e8abee9 -s ours am: 1836db16f7 -s ours am: a8f28ed7c5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8e84a4ec5b0aa8c75372ac26088a3b4da51dfef6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 23:28:29 +00:00
Bill Yi
a8f28ed7c5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0 -s ours am: 5e07d7fd84 -s ours am: d75e8abee9 -s ours am: 1836db16f7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib411051ca0e3f2d2b849688bce481a663a44fadb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:53:37 +00:00
Bill Yi
ec31d2697d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours am: 0b07e79cc1 -s ours am: 365338b6d0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibab132c360957a95e11a84dd1f7b88cc178a1381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:53:28 +00:00
Bill Yi
9f888216b4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours am: 7a2a5bd916 -s ours am: 1df006f84c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0b27088d1c07bfaf369d2da9689e2c10eb3c4eec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:53:21 +00:00
Bill Yi
a5ebf55708 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours am: 52bb0b7039 -s ours am: e7ce899b93 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I417725150925f81370959c4acea726122359c194
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:31:26 +00:00
Bill Yi
1f00d35c4f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours am: 4c08f33493 -s ours am: c77e41302b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib32fc8b21ac7ff855eb41b010bca35b0077bcf38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:31:20 +00:00
Bill Yi
365338b6d0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours am: 0b07e79cc1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I38710b182545fc2b88f8c8a195ae07548dabd06f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:31:04 +00:00
Bill Yi
e7ce899b93 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours am: 52bb0b7039 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2255dc24bfe7120b071b2d0eb276c7ed1eeef2c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:31:01 +00:00
TreeHugger Robot
c1b2acfb3b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0a2b1de3a5 -s ours am: 6c9433b31e -s ours am: 2a21fa1024 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8e9f299fa94e9d69c778daaadc18ddacfbd51022
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:31:00 +00:00
Bill Yi
c453a65ed2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b81da264a8 -s ours am: e0da5747da -s ours am: 1a4297414e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0f90f520b15abdb1fe0d6fb61158e6fdfec433a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:30:59 +00:00
Bill Yi
1df006f84c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours am: 7a2a5bd916 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib72b241a27bc95e319ab02bec34c4dd4857c79fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:30:58 +00:00
Bill Yi
c77e41302b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours am: 4c08f33493 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8a3d96a7c13aadb307de14e0702ebe0b1896e3ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:30:55 +00:00
Bill Yi
94a1ab304a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 am: bf87406634 -s ours am: 53993399da -s ours am: 44f1eb9246 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3a217f11889d90a9a51c519432d00899ef45a33e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:30:18 +00:00
Bill Yi
1836db16f7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0 -s ours am: 5e07d7fd84 -s ours am: d75e8abee9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I99d69b8e647e305a479b153fc02214669d1a2afa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:29:38 +00:00
Bill Yi
0b07e79cc1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6 -s ours am: 223d9c81f2 -s ours am: a509cd4695 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id91cf446e28fb0ced0561e2be10ced8c69ab6427
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:06:03 +00:00
Bill Yi
7a2a5bd916 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c -s ours am: f46213941c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3933eb376b11ac6d0944db6ada4c75b52ff87674
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:05:58 +00:00
TreeHugger Robot
2a21fa1024 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0a2b1de3a5 -s ours am: 6c9433b31e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia5113f388898f79c43b714ec80cd73b19e75814a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:05:01 +00:00