PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,131 Commits 1 Branch 0 Tags
cf26f0465a7cadeb51c470b2e74347902954724c
Commit Graph

105131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Lin
c34fce8adc Merge "[Panlingual] Remove the warning message from AppLocaleDetails" into tm-dev am: 14c7ce7ccb am: 97cfcae36d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281654

Change-Id: I93174ca18ce0b7efed95890d673cfcc3cd8c5892
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:11:15 +00:00
James Lin
ad62f6a29e Merge "[Panlingual] Remove the warning message from AppLocaleDetails" into tm-dev am: 14c7ce7ccb am: c7eea3d1b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281654

Change-Id: I323acaf2c9c23d871bf378446b7f4b0f6ba90178
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:10:57 +00:00
James Lin
99d0a952f2 Merge "[Panlingual] Remove the warning message from AppLocaleDetails" into tm-dev am: 14c7ce7ccb am: c7eea3d1b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281654

Change-Id: I70cde08d7b556037a5a75162857b7d9a825b43bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:10:51 +00:00
James Lin
c7eea3d1b7 Merge "[Panlingual] Remove the warning message from AppLocaleDetails" into tm-dev am: 14c7ce7ccb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281654

Change-Id: I27181686e44f979d4989f38b8d91b32549be6d77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 02:31:53 +00:00
James Lin
97cfcae36d Merge "[Panlingual] Remove the warning message from AppLocaleDetails" into tm-dev am: 14c7ce7ccb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281654

Change-Id: Ic5e68e6647e6476d12b711e211a7d93fba92e083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 02:30:14 +00:00
James Lin
14c7ce7ccb Merge "[Panlingual] Remove the warning message from AppLocaleDetails" into tm-dev 2022-05-12 01:26:34 +00:00
Lifu Tang
f29a071fca Cache summary text to avoid flickering 
Bug: 231927706
Test: build, flash, run unit test, then test manually.
Change-Id: Ia0585302c5cf86cd6035315fa750c71b9df55237
 2022-05-11 15:52:23 -07:00
Ayush Sharma
56caabd8f7 Merge "Fix issue no action on clicking link in footer" into tm-dev am: 695a47e469 am: 71d5366bf6 am: f661c3a21b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281844

Change-Id: If35cdd63c8c25e80602ae7909c13e353c1fb5772
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:40:06 +00:00
Ayush Sharma
a2a30c6be9 Merge "Fix issue no action on clicking link in footer" into tm-dev am: 695a47e469 am: 71d5366bf6 am: 7ababc330d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281844

Change-Id: I4a68f0f385912b51b084fdd9714a8b35c2d650f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:37:17 +00:00
SongFerng Wang
b56d42609d Merge "stop show preferred SIM card dialog during sim switch" into tm-dev am: 55ded566e3 am: e48d3f8cc1 am: 7986818743 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234803

Change-Id: If3d492373e0c855c6cd79f4e5c6a2ecfff079674
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:32:22 +00:00
Tom Hsu
c9df841263 Merge "[Panlingual][Settings] Fix when tap search bar, will leave a big blank." into tm-dev am: d375456251 am: a3b5860398 am: b6556ad14d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234987

Change-Id: I4bde596a04011f60cbe3bd769a1091415f4562ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:30:34 +00:00
SongFerng Wang
4bfb67ded5 Merge "stop show preferred SIM card dialog during sim switch" into tm-dev am: 55ded566e3 am: e48d3f8cc1 am: 624f7ff6e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234803

Change-Id: I7b0d2eb4ee76a46c35499bf6d8e471c2e1931d5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:28:48 +00:00
Tom Hsu
6808be6640 Merge "[Panlingual][Settings] Fix when tap search bar, will leave a big blank." into tm-dev am: d375456251 am: a3b5860398 am: 011bf465fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234987

Change-Id: Ifb279a2384a40d5978df72f33b7f1e86e799f9ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:26:36 +00:00
Ayush Sharma
42d8511926 Merge "Fix issue no action on clicking link in footer" into tm-dev am: 695a47e469 am: 02d58f0109 am: cd10322d6d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281844

Change-Id: I4ade3710f5cf4f12a920a8a6d70223b24ca1d143
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:26:13 +00:00
SongFerng Wang
929de6f61c Merge "stop show preferred SIM card dialog during sim switch" into tm-dev am: 55ded566e3 am: bde99c02cc am: d100f24a62 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234803

Change-Id: I6b1d0f93dec2431c97b7044549042301465ee0e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:21:48 +00:00
Tom Hsu
6b8c2db301 Merge "[Panlingual][Settings] Fix when tap search bar, will leave a big blank." into tm-dev am: d375456251 am: b903b4a057 am: b90a6c8c81 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234987

Change-Id: Ic6454a0deeffb299a311a0087b87953b4312b5c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:19:07 +00:00
Ayush Sharma
f661c3a21b Merge "Fix issue no action on clicking link in footer" into tm-dev am: 695a47e469 am: 71d5366bf6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281844

Change-Id: I50979707076f5c23223759faa42b23dd23246412
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:56:18 +00:00
Ayush Sharma
7ababc330d Merge "Fix issue no action on clicking link in footer" into tm-dev am: 695a47e469 am: 71d5366bf6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281844

Change-Id: I6caa33c9f834634426492dc8924d4e80b709d73c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:51:34 +00:00
SongFerng Wang
624f7ff6e4 Merge "stop show preferred SIM card dialog during sim switch" into tm-dev am: 55ded566e3 am: e48d3f8cc1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234803

Change-Id: I7f9fd919138ccb9278fab1663742d909604178e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:48:21 +00:00
SongFerng Wang
7986818743 Merge "stop show preferred SIM card dialog during sim switch" into tm-dev am: 55ded566e3 am: e48d3f8cc1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234803

Change-Id: Iaccfa27744ed7d32c89897754ff670dfa0a37dac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:47:14 +00:00
Tom Hsu
011bf465fd Merge "[Panlingual][Settings] Fix when tap search bar, will leave a big blank." into tm-dev am: d375456251 am: a3b5860398 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234987

Change-Id: I29d101bc524384f3f5304c5deae825e898fcbd7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:46:55 +00:00
Tom Hsu
b6556ad14d Merge "[Panlingual][Settings] Fix when tap search bar, will leave a big blank." into tm-dev am: d375456251 am: a3b5860398 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234987

Change-Id: Ifec1a30bee7306968d16fdd9d367506304c60ffa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:46:08 +00:00
Ayush Sharma
cd10322d6d Merge "Fix issue no action on clicking link in footer" into tm-dev am: 695a47e469 am: 02d58f0109 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281844

Change-Id: I1dae906847c895beef40a731d6e45bf59d411670
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:43:02 +00:00
SongFerng Wang
d100f24a62 Merge "stop show preferred SIM card dialog during sim switch" into tm-dev am: 55ded566e3 am: bde99c02cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234803

Change-Id: I2b7d2833a72412e359fa1680ab2852edec58672a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:37:51 +00:00
Tom Hsu
b90a6c8c81 Merge "[Panlingual][Settings] Fix when tap search bar, will leave a big blank." into tm-dev am: d375456251 am: b903b4a057 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234987

Change-Id: I6bc2490339d6052629c722fe89f8547f3cb7c978
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:37:32 +00:00
Ayush Sharma
02d58f0109 Merge "Fix issue no action on clicking link in footer" into tm-dev am: 695a47e469 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281844

Change-Id: I0e71a2917ae7b26073d9de217e7909c729084613
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:28:24 +00:00
Ayush Sharma
71d5366bf6 Merge "Fix issue no action on clicking link in footer" into tm-dev am: 695a47e469 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281844

Change-Id: Ieaf89ca741ebb7a776300a1c9354f14d1339874a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:27:54 +00:00
SongFerng Wang
bde99c02cc Merge "stop show preferred SIM card dialog during sim switch" into tm-dev am: 55ded566e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234803

Change-Id: Id6017f330b9c7071e0df48d48ca2319b0b865365
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:27:36 +00:00
SongFerng Wang
e48d3f8cc1 Merge "stop show preferred SIM card dialog during sim switch" into tm-dev am: 55ded566e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234803

Change-Id: If66c750d52a403831eae88340c5bc7d9a04da353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:27:06 +00:00
Tom Hsu
a3b5860398 Merge "[Panlingual][Settings] Fix when tap search bar, will leave a big blank." into tm-dev am: d375456251 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234987

Change-Id: Ib9e7b7aa2d36c132c1befefde363c3dc7e7bdcdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:20:26 +00:00
Tom Hsu
b903b4a057 Merge "[Panlingual][Settings] Fix when tap search bar, will leave a big blank." into tm-dev am: d375456251 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234987

Change-Id: Ib2e09e95c6dbef9b54a8e1182e5f3b57ed0d0a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:19:02 +00:00
tom hsu
89f48dce82 [Panlingual] Fix shall not show app with empty LocaleConfig. 
Bug: b/231990625
Test: local
Change-Id: Ia4747b777ee5228b57c0293d366c77e91ae5bee0
 2022-05-12 01:50:13 +08:00
Julia Reynolds
2011588b16 Use NMS calculation of fixed importance 
Rather than recalculating it again. Also align logic on
listing and details pages.

Test: NotificationBackendTest, NotificationPreferenceControllerTest
Bug: 231662091
Fixes: 231815850
Change-Id: If9572766666620008afb839ecb0828ace8d6073d
 2022-05-11 16:38:04 +00:00
Weng Su
25b0db21ac Get app label by launched package 
- Activity#getCallingPackage will return null in some special cases, use the launched package instead.

Bug: 194709435
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiScanModeActivityTest

Change-Id: I4f22bab7592dedf75dd36daf5e18dbc934bc8655
 2022-05-11 22:51:45 +08:00
Ayush Sharma
695a47e469 Merge "Fix issue no action on clicking link in footer" into tm-dev 2022-05-11 12:56:44 +00:00
SongFerng Wang
55ded566e3 Merge "stop show preferred SIM card dialog during sim switch" into tm-dev 2022-05-11 11:17:28 +00:00
Jason Chiu
7d41a8e01b Add summary strings of "Tips & support" for tablets 
Fix: 232197701
Test: visual
Change-Id: Iaa5dbf4b8d2bf989aa57f78d285dfb6a85d84ef4
 2022-05-11 17:27:20 +08:00
Yi-Ling Chuang
2754a20c72 Make the force stop dialog work properly in split screen 
When it's in a multi-window mode, force stopping an app will lead to an
activity recreate, and the dialog fragment will also be recreated.
That's why the dialog still shows after the button is clicked.

Hence, dismiss the dialog before stopping the app to fix it.

Fixes: 231529730
Test: robotest
Change-Id: I75d27624f0c60bb617e7d1a92ffe01d3c0fbf7be
 2022-05-11 17:07:38 +08:00
Chaohui Wang
5a2f5ecff5 [DO NOT MERGE] Fix flicker for Data Usage page 
Both "Mobile data usage" & "Non-carrier data usage".

By,
1. Use summary placeholder for usage amount to avoid shift
2. Before fix CycleListener's onItemSelected() is called multiple times,
   cause the app list to flash, let DataUsageList to handle the dedup
   logic to better handling.
3. Before fix if return from App Usage page, no loading view is
   displayed (only first enter has it), move this to onResume() to fix.
4. Before fix the cycles passed to App Usage page is cached (even when
   the cycles are changed), clear the cache when onResume() to fix.
5. Listener in SpinnerPreference could be null, add safety guard to it.

Fix: 187019210
Test: manual visual test
Change-Id: I95e544c46333496f4f30ed77dafa4779b4d66019
 2022-05-11 17:02:54 +08:00
Milton Wu
23b95b4147 Recreate fingerprint setup if degree 0 to 180 
Recreate animation on fingerprint setup page when screen orientation is
changed from 0 to 180, or 180 to 0.

Bug: 232187001
Test: Manually rotate screen for 4 orientation, and make sure animation
      orientation is correct
Change-Id: I75687bc8500cf5a48be6da6ef4245b12b63e774e
 2022-05-11 08:30:31 +00:00
James.cf Lin
85db3167e2 [Panlingual] Remove the warning message from AppLocaleDetails 
Since opt-in is enabled and it will only display locales that are available or downloadable, there is no longer a need to display the warning message to users.

Bug: 228923650
Test: manual test
Change-Id: Ibd98f3a292eb09c921f4bf00dbf448c976927e5d
 2022-05-11 15:20:52 +08:00
Arc Wang
87212cf504 Storage Settings crash 
Storage settings will crash because there is no emulated primary volume found after private internal volume is Ejected.

Below change in Settings impacted Storage dashboard screen behavior as
it Query storage size instead of calculate size of installed APP. Due to
this design change now MediaProvider is queried for file sizes, but due
to unmounting of primary emulated volume it crashes.

We should not show Eject option for private Internal volume.

Author: ramneek.kalra@mediatek.com
Bug: 230689829
Test: atest com.android.settings.deviceinfo.VolumeOptionMenuControllerTest
      manual
      1. Insert sdcard or generate virtual disk using command : adb shell "sm set-virtual-disk true"
      2. Go to Settings -> Storage -> Sdcard/virtual disk -> Format as Internal -> do migrate data
      3. After above process completed, go to Settings-> Storage -> sd card/virtual disk and chose Eject menu option.
      4. Eject page gets open, Click on Eject button.

Change-Id: I98d09f75ee7c2cd5aae10808bd0e0cdf10da7582
 2022-05-11 13:57:33 +08:00
Tom Hsu
d375456251 Merge "[Panlingual][Settings] Fix when tap search bar, will leave a big blank." into tm-dev 2022-05-11 05:51:00 +00:00
Arc Wang
941b13f26a [automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 640eab60f2 am: 3d9bdda678 -s ours am: ec921eea1a -s ours am: f0065e3adf -s ours am: 09c382d878 -s ours am: 4daf31225d -s ours am: a1bc77f4a4 -s ours am: 335cf2ccb8 -s ours am: 6e9fcaa1e3 -s ours am: 6d20bb4396 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id994be5fb022c697b9c192751896d502441ea060
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 04:43:10 +00:00
TreeHugger Robot
8636aa6a93 Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev am: f39872bc18 am: 0fa209b89c am: f53aeb97fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234991

Change-Id: I4ece0278d16658065b1e3ba27553284ea010876c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 04:41:48 +00:00
Arc Wang
5dd819ab90 [automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 640eab60f2 am: 3d9bdda678 -s ours am: ec921eea1a -s ours am: f0065e3adf -s ours am: 09c382d878 -s ours am: 4daf31225d -s ours am: a1bc77f4a4 -s ours am: 335cf2ccb8 -s ours am: fe4df8e6a8 -s ours am: 6ea2ae7fe8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2e757d6a702c4a4aa46dfc39d49a7cc0daa748ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 04:22:22 +00:00
TreeHugger Robot
afe6e93cb9 Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev am: f39872bc18 am: ebd46572c4 am: 10ee27e781 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234991

Change-Id: I9d41e3324a554725884e3dc3afd5c232a8e4ea0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 04:22:11 +00:00
Arc Wang
c07ad0d2cf [automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 640eab60f2 am: 3d9bdda678 -s ours am: ec921eea1a -s ours am: f0065e3adf -s ours am: 09c382d878 -s ours am: 4daf31225d -s ours am: a1bc77f4a4 -s ours am: 335cf2ccb8 -s ours am: 6e9fcaa1e3 -s ours am: 5bdf17dd57 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id6f0e3efba332beef418a4a8705905f647d375fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 04:22:06 +00:00
TreeHugger Robot
935fbe577e Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev am: f39872bc18 am: 0fa209b89c am: b53549a4c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234991

Change-Id: Ifed5031af5d1b50160d337daccb1ee1ddc1acf38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 04:21:54 +00:00
Arc Wang
6ea2ae7fe8 [automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 640eab60f2 am: 3d9bdda678 -s ours am: ec921eea1a -s ours am: f0065e3adf -s ours am: 09c382d878 -s ours am: 4daf31225d -s ours am: a1bc77f4a4 -s ours am: 335cf2ccb8 -s ours am: fe4df8e6a8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8c92fd1e645d3b83ab608fc84a7ab9fed7a620b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 04:08:03 +00:00