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

105348 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SongFerng Wang
892bafec43 Merge "[MEP] show the DSDS mode selection dialog for user when user insert esim" into tm-dev am: 1bc142776c am: 9c6211e043 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17904395

Change-Id: Ifb3e8d06c36a22089261315a7b08dfba152ceb09
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 08:16:57 +00:00
Chaohui Wang
4cb33a8dae Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0 am: 6dc65f1eb4 am: 295d56267e am: 411671e6c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523

Change-Id: I53bcd11212a724d11bbd8810c7ee4a2581ceb8fe
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 08:11:21 +00:00
Chaohui Wang
430a0e798b Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0 am: 61a35e7b85 am: d1573cd417 am: 3e5220662d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523

Change-Id: Id96acb419cdd6dabb9fa2619e7f6794953f3f823
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 08:11:14 +00:00
Chaohui Wang
b1ea37e90d Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0 am: 61a35e7b85 am: 5094979554 am: a6fc221062 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523

Change-Id: I54233c54b6678f4978a677a8d2897409e6005306
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 08:11:06 +00:00
Jason Hsu
12c10cfa5c Merge "Correct Magnification shortcut title" into tm-dev 2022-04-26 08:07:37 +00:00
SongFerng Wang
45d498e411 Merge "[MEP] show the DSDS mode selection dialog for user when user insert esim" into tm-dev am: 1bc142776c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17904395

Change-Id: Ib83808167690f7b67cef48ef53764a1f7e500897
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 08:02:48 +00:00
SongFerng Wang
33887c1233 Merge "[MEP] show the DSDS mode selection dialog for user when user insert esim" into tm-dev am: 1bc142776c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17904395

Change-Id: I4ad320fc4ed02e50841b66b5e575787dccafac22
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 08:01:53 +00:00
SongFerng Wang
9c6211e043 Merge "[MEP] show the DSDS mode selection dialog for user when user insert esim" into tm-dev am: 1bc142776c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17904395

Change-Id: Id978d5b9524984ab553bc301fa6b6173afcb56ec
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 08:01:34 +00:00
Chaohui Wang
411671e6c5 Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0 am: 6dc65f1eb4 am: 295d56267e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523

Change-Id: I4ccccdca61ad243dabb944319510c82482d2e115
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 07:49:37 +00:00
Chaohui Wang
3e5220662d Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0 am: 61a35e7b85 am: d1573cd417 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523

Change-Id: I8db1a6e7e0af9e4c01225f5b3e4cb37d2969a66c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 07:48:07 +00:00
Chaohui Wang
a6fc221062 Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0 am: 61a35e7b85 am: 5094979554 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523

Change-Id: I0b234e8b3c5e5c29aafdb668be5c1585a6a76eab
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 07:48:01 +00:00
SongFerng Wang
1bc142776c Merge "[MEP] show the DSDS mode selection dialog for user when user insert esim" into tm-dev 2022-04-26 07:36:28 +00:00
Automerger Merge Worker
44b4537e40 Merge "Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed am: 5fe986be58" into tm-d1-dev-plus-aosp am: 3f5b45397a am: 0ecead8a61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935

Change-Id: I3a0181852158b776118271818c3ed08070f96b5c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 07:28:40 +00:00
Jason Chiu
b4b707dabd Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed am: b174c6853e am: ca7d463f4d am: faf332ab5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935

Change-Id: I9341324a58560f402eadabac02ae3bfb043aff81
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 07:28:32 +00:00
Automerger Merge Worker
fb836529f0 Merge "Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 734ada269b" into tm-d1-dev-plus-aosp am: d53e79d292 am: b4e433845b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: I451cfb1c20a4771d9501a8adb097aa48746c524d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 07:28:25 +00:00
Automerger Merge Worker
e4c5d67028 Merge "Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 5f3059ff3e am: 7ba258ee83" into tm-qpr-dev-plus-aosp am: c9bdc0bee5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: Id30bd30c4f339fecf54dea40a1bc0be17b98a80c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 07:28:17 +00:00
Jason Chiu
09c42d7240 Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed am: b174c6853e am: 163ee46ef0 am: 9e636663b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935

Change-Id: I462be5de3e84a0e70e644909d608f1f8fd1f3f94
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 07:28:05 +00:00
Chaohui Wang
295d56267e Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0 am: 6dc65f1eb4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523

Change-Id: I35b7b67d86557eb9a03d07a62adda253ae22ccc4
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 07:27:36 +00:00
Chaohui Wang
5094979554 Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0 am: 61a35e7b85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523

Change-Id: I868e35ed12d7143c6d8fdea63e52feb628163c90
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 07:27:31 +00:00
Chaohui Wang
d1573cd417 Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0 am: 61a35e7b85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523

Change-Id: I88d0995852b1864a6ce85d2b304bcc7084d444f4
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 07:27:28 +00:00
Chaohui Wang
815ee3779b Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0 am: 334335bc6a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523

Change-Id: I87294478784f6518f58e57aaeba0eef5af5b0297
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 07:26:55 +00:00
TreeHugger Robot
bf37dfd08a Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 5f3059ff3e am: 4837d34fab am: 39f80a0d8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: Ib31a916a7c1a01eafbdaaed2762951de124a4810
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 07:26:43 +00:00
Weng Su
71b9cc0e32 Check Wi-Fi permissions for QrCode scanner 
- Launched package require ACCESS_WIFI_STATE and ACCESS_FINE_LOCATION permissions to get results

Bug: 187176859
Test: manual test
make RunSettingsRoboTests \
    ROBOTEST_FILTER=WifiDppQrCodeScannerFragmentTest

Change-Id: Ie80c4e5b3a5863749de518e4736873390478816e
 2022-04-26 07:10:57 +00:00
Chaohui Wang
61a35e7b85 Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523

Change-Id: I71d0c09c5c1419f48bd3dd754eeaafa1acbf17f7
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:52:31 +00:00
Automerger Merge Worker
0ecead8a61 Merge "Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed am: 5fe986be58" into tm-d1-dev-plus-aosp am: 3f5b45397a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935

Change-Id: If75a0c60a58c3d3137928e190a43277758b6f16c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:51:37 +00:00
Chaohui Wang
334335bc6a Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523

Change-Id: Iebd9f7099abee0275a61cdc0083b9ee339c931d5
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:51:33 +00:00
Jason Chiu
faf332ab5f Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed am: b174c6853e am: ca7d463f4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935

Change-Id: I35d91a8d1ee0705d9aa9bf3d8c3468a5fa243b98
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:51:27 +00:00
Automerger Merge Worker
b4e433845b Merge "Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 734ada269b" into tm-d1-dev-plus-aosp am: d53e79d292 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: I0209574f5a9ac7cf37a6c5ea7d9a14ffdbdc8a58
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:51:22 +00:00
Chaohui Wang
6dc65f1eb4 Merge "Update Personal / work selection UI." into tm-dev am: 1a39660de0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17716523

Change-Id: Iea7bef3ceebeb17a54314389a1314a378d383d5c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:51:16 +00:00
Automerger Merge Worker
c9bdc0bee5 Merge "Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 5f3059ff3e am: 7ba258ee83" into tm-qpr-dev-plus-aosp 2022-04-26 06:51:02 +00:00
TreeHugger Robot
237c468661 Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 5f3059ff3e am: 7ba258ee83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: Ic52cf9c89c93fa8374775864d1bcc705cacddedd
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:51:00 +00:00
Jason Chiu
9e636663b8 Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed am: b174c6853e am: 163ee46ef0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935

Change-Id: Id9d5634786ea3ff7fcee2bd75dd365fb7136f84d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:50:59 +00:00
TreeHugger Robot
39f80a0d8f Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 5f3059ff3e am: 4837d34fab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: I8961eecc3296bb6cd50cc79077320f60b35309e6
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:50:50 +00:00
Chaohui Wang
1a39660de0 Merge "Update Personal / work selection UI." into tm-dev 2022-04-26 06:34:37 +00:00
Automerger Merge Worker
3f5b45397a Merge "Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed am: 5fe986be58" into tm-d1-dev-plus-aosp 2022-04-26 06:28:08 +00:00
Jason Chiu
370c61e339 Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed am: 5fe986be58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935

Change-Id: I3b5e38835df123445bf89e270a36b7dd4a759b1b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:28:06 +00:00
Jason Chiu
ca7d463f4d Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed am: b174c6853e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935

Change-Id: I524ebc3da76ccac4bbbdaa6c0601c11d8f324379
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:28:05 +00:00
Jason Chiu
163ee46ef0 Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed am: b174c6853e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935

Change-Id: I8a1ca0ab86930c57f64fbb9d712ec4b449b530bf
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:28:03 +00:00
Automerger Merge Worker
d53e79d292 Merge "Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 734ada269b" into tm-d1-dev-plus-aosp 2022-04-26 06:28:02 +00:00
TreeHugger Robot
7ba258ee83 Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 5f3059ff3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: Ie95b750091bf22ac690c73ebb49d63c906e047c2
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:27:59 +00:00
TreeHugger Robot
81f281b6dc Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 734ada269b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: I955609258cbd7ab4faeaa0748a13e55fff2e5a03
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:27:59 +00:00
TreeHugger Robot
4837d34fab Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 5f3059ff3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: I7f2a5fc92011f20591e51ce2e64ff4255d9d9c23
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:27:57 +00:00
Jason Chiu
704689ab04 Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed am: 50893331e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935

Change-Id: I0ded6982be5c1d1334eaf8157de629505a1ebcf8
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:27:38 +00:00
TreeHugger Robot
68bb261092 Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe am: 4e3f5c9253 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: I13ec576dbf17d1907006d0214d0a80738b4a6489
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:27:30 +00:00
Jason Chiu
b174c6853e Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935

Change-Id: Ia100a0ee19b88d603887cad11b1849d1a5b9d2cd
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:12:57 +00:00
TreeHugger Robot
5f3059ff3e Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: Ice45d444bedfecaad34cce27fedd38528cd5ab91
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:12:49 +00:00
Jason Chiu
50893331e5 Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935

Change-Id: I2d6f4e17cda08de25b4963e729048bc70ee48deb
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:11:58 +00:00
TreeHugger Robot
4e3f5c9253 Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: I9d3a483b648c9a8f55943c18e5388541a3749abb
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:11:51 +00:00
Jason Chiu
5fe986be58 Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935

Change-Id: I227ce218c0b7096412012ec04c356fa60e908882
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:11:40 +00:00
TreeHugger Robot
734ada269b Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: I5e3948fb746aa2eb485cc0a2113f9f06a4ed234f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 06:11:31 +00:00