Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,315 Commits 1 Branch 0 Tags
da5676d4ea3d9c2480197cd84f48963d7dd5fa02
Commit Graph

101315 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
da5676d4ea [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-dev am: d0d67e68a5 -s ours am: e8097d4464 -s ours am: 35c5b0b0a2 -s ours am: 2b767881d6 -s ours am: a6e2ce6e95 -s ours am: 6d6e40b5a5 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d is already in history

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

Change-Id: I8dad18856662585afa3f5ba1487a050321aa365c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:41:55 +00:00
Bonian Chen
5de1e4e244 [automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491 -s ours am: eefa7371ed -s ours am: fcdc4a4de3 -s ours am: 065876ee1b -s ours am: 275f38c554 -s ours am: bcfc0913fa -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d is already in history

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

Change-Id: Ie1768f6881c9bbbcd5ac6ef1a4e77b1cf26d12c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:41:55 +00:00
Bonian Chen
4cb8514e55 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev am: 6279d80f93 -s ours am: d15869f014 -s ours am: dad1ee3deb -s ours am: 0382c98491 -s ours am: 8254eaf6e5 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae639 is already in history

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

Change-Id: Idfc5967ada272fd13e147f3b59848cad2b4e39d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:41:47 +00:00
Bonian Chen
bff0b04656 [automerger skipped] [Settings] Move display of VPN version into summary text am: 5fc0e6614d -s ours am: 96fe347312 -s ours am: b3be027c39 -s ours am: 663715de66 -s ours am: 62e59a727a -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae639 is already in history

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

Change-Id: If6eed5dd6ed360ae1f8c0dec12d2a8c03b76f235
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:41:46 +00:00
Bonian Chen
20a2d95a3c [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into sc-dev am: 0f10561082 am: 1893045740 -s ours am: fdc7764eff -s ours am: c95c6de8b5 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 14e76c3233 is already in history

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

Change-Id: I288019aa868663fcfe3b469630d6b949d616ce1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:41:39 +00:00
Bonian Chen
6d6e40b5a5 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-dev am: d0d67e68a5 -s ours am: e8097d4464 -s ours am: 35c5b0b0a2 -s ours am: 2b767881d6 -s ours am: a6e2ce6e95 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d is already in history

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

Change-Id: I274ea0090c629476173bfc95a1609755d7d6ac58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:17:59 +00:00
Bonian Chen
bcfc0913fa [automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491 -s ours am: eefa7371ed -s ours am: fcdc4a4de3 -s ours am: 065876ee1b -s ours am: 275f38c554 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d is already in history

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

Change-Id: Ie7af1a675d9d9065620e1f9af3e122ed1b84a0ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:17:59 +00:00
Bonian Chen
8254eaf6e5 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev am: 6279d80f93 -s ours am: d15869f014 -s ours am: dad1ee3deb -s ours am: 0382c98491 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae639 is already in history

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

Change-Id: I7ea32f8e2012cf0028a6ce2bf872ced1cdf13a03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:17:51 +00:00
Bonian Chen
62e59a727a [automerger skipped] [Settings] Move display of VPN version into summary text am: 5fc0e6614d -s ours am: 96fe347312 -s ours am: b3be027c39 -s ours am: 663715de66 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae639 is already in history

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

Change-Id: I007a7694511b2f33fb4c9afb73e84ec3fd596ae9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:17:50 +00:00
Bonian Chen
c95c6de8b5 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into sc-dev am: 0f10561082 am: 1893045740 -s ours am: fdc7764eff -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 14e76c3233 is already in history

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

Change-Id: Icd9ed0d2fc4c6fb566c19c0a10495260da99833b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:17:11 +00:00
Bonian Chen
a6e2ce6e95 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-dev am: d0d67e68a5 -s ours am: e8097d4464 -s ours am: 35c5b0b0a2 -s ours am: 2b767881d6 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d is already in history

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

Change-Id: Ifc049e3484de57a8dbbfcb0e88b1a5027af9d5a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:47:35 +00:00
Bonian Chen
275f38c554 [automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491 -s ours am: eefa7371ed -s ours am: fcdc4a4de3 -s ours am: 065876ee1b -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d is already in history

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

Change-Id: Icfba714554133449358195728e3b96601d0ec7ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:47:33 +00:00
Bonian Chen
0382c98491 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev am: 6279d80f93 -s ours am: d15869f014 -s ours am: dad1ee3deb -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae639 is already in history

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

Change-Id: Ifbc2755d6d798adb0d5107a1ab4a6462965423b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:47:18 +00:00
Bonian Chen
663715de66 [automerger skipped] [Settings] Move display of VPN version into summary text am: 5fc0e6614d -s ours am: 96fe347312 -s ours am: b3be027c39 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae639 is already in history

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

Change-Id: Ib295e46b23a6bee59682ec37cd40015a45d776e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:47:17 +00:00
Bonian Chen
fdc7764eff [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into sc-dev am: 0f10561082 am: 1893045740 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 14e76c3233 is already in history

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

Change-Id: Ie670746adf6306a4fcd5e671d9fec5543d2780e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:47:10 +00:00
Bonian Chen
2b767881d6 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-dev am: d0d67e68a5 -s ours am: e8097d4464 -s ours am: 35c5b0b0a2 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d is already in history

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

Change-Id: I6ea85d8201f1582bef4a96ca295ca8041be5c460
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:23:43 +00:00
Bonian Chen
065876ee1b [automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491 -s ours am: eefa7371ed -s ours am: fcdc4a4de3 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d is already in history

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

Change-Id: I42bb51e2686a65d73da0ef0c6db94a253016c777
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:23:41 +00:00
Bonian Chen
dad1ee3deb [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev am: 6279d80f93 -s ours am: d15869f014 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae639 is already in history

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

Change-Id: Iad2e8ed7a78c79b972ff5d3042e8c5b806b80a46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:23:33 +00:00
Bonian Chen
b3be027c39 [automerger skipped] [Settings] Move display of VPN version into summary text am: 5fc0e6614d -s ours am: 96fe347312 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae639 is already in history

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

Change-Id: Ifef705f785658826b4f8e34768428cc74338ffad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:23:32 +00:00
Bonian Chen
1893045740 Merge "[Settings] Move display of VPN version into summary text" into sc-dev am: 0f10561082 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341972

Change-Id: Ied57a6cc4b3948ea50e72859b6c207fd260907fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:23:26 +00:00
Bonian Chen
35c5b0b0a2 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-dev am: d0d67e68a5 -s ours am: e8097d4464 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d is already in history

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

Change-Id: I74e55c981975f965e6cf42950b9642b17f891413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:23:09 +00:00
Bonian Chen
fcdc4a4de3 [automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491 -s ours am: eefa7371ed -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d is already in history

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

Change-Id: Id825050bb1431aa5679b4b755a81333b75de140e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:23:07 +00:00
Bonian Chen
d15869f014 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev am: 6279d80f93 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae639 is already in history

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

Change-Id: Ife42fa9c137e142f976d68cb63e2b954a176920f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:22:59 +00:00
Bonian Chen
96fe347312 [automerger skipped] [Settings] Move display of VPN version into summary text am: 5fc0e6614d -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae639 is already in history

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

Change-Id: I218a79f1c264eea6b72e604392fb0c69c54c7ece
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:22:57 +00:00
Bonian Chen
e8097d4464 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-dev am: d0d67e68a5 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d is already in history

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

Change-Id: Id3bd26debfc50e0b332695ffaf9f1fe1aca51feb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:22:44 +00:00
Bonian Chen
eefa7371ed [automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d is already in history

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

Change-Id: Ide4d80dc46e692c7664010e6ab2746be482dff5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:22:43 +00:00
Bonian Chen
0f10561082 Merge "[Settings] Move display of VPN version into summary text" into sc-dev 2022-04-07 00:08:28 +00:00
Bonian Chen
6279d80f93 Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev 2022-04-07 00:08:23 +00:00
Bonian Chen
d0d67e68a5 Merge "[Settings] Move display of VPN version into summary text" into rvc-dev 2022-04-07 00:08:16 +00:00
TreeHugger Robot
5cb554d02a Merge "[Panlingual] Fix settings crash from rotation." into tm-dev am: e0f6939c4c am: cd10b0552e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615231

Change-Id: Ia1c8562a066bf568be5c3702f9ff4d413f522096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:56:33 +00:00
Xiaowen Lei
8621b2d7f7 Merge "Update the function used to log the dream picking events." into tm-dev am: 8708bbd8b3 am: da1f3d6d37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17543375

Change-Id: Ia6c1ab4e9663033226651ee700877edaacdee55a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:56:22 +00:00
TreeHugger Robot
46d9aeee40 Merge "Fixes 'learn more' link in ScreenTimeoutSettings" into tm-dev am: d23aa91e8b am: 3a23af64cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17578008

Change-Id: I61828c73a8b3afc1523b439c50624093610a9f27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:56:00 +00:00
Chaohui Wang
ec331ee2d0 Merge "Fix the flow for ZenCustomRuleSettingsBase" into tm-dev am: 9c6249a04f am: 631c56fc20 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615233

Change-Id: Iddd3130e8f4cf5c5562b968aa9e8d9bbbb0903f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:55:31 +00:00
TreeHugger Robot
cd10b0552e Merge "[Panlingual] Fix settings crash from rotation." into tm-dev am: e0f6939c4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615231

Change-Id: I0ec167e7c12e1f3f22811c239644985f863c06ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:54:57 +00:00
TreeHugger Robot
e0f6939c4c Merge "[Panlingual] Fix settings crash from rotation." into tm-dev 2022-04-06 15:15:37 +00:00
Xiaowen Lei
da1f3d6d37 Merge "Update the function used to log the dream picking events." into tm-dev am: 8708bbd8b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17543375

Change-Id: I15b857b5bd7688aef3926d2049f2d7d2b0876aeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:09:04 +00:00
Xiaowen Lei
8708bbd8b3 Merge "Update the function used to log the dream picking events." into tm-dev 2022-04-06 15:04:57 +00:00
TreeHugger Robot
3a23af64cd Merge "Fixes 'learn more' link in ScreenTimeoutSettings" into tm-dev am: d23aa91e8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17578008

Change-Id: I83e7923119669ea604bdd72f121d3182bf2dd550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:00:32 +00:00
Chaohui Wang
631c56fc20 Merge "Fix the flow for ZenCustomRuleSettingsBase" into tm-dev am: 9c6249a04f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615233

Change-Id: Ic18c24b08b00ea8a20877fe2d9e9fc2b8e51ad07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:00:17 +00:00
TreeHugger Robot
d23aa91e8b Merge "Fixes 'learn more' link in ScreenTimeoutSettings" into tm-dev 2022-04-06 15:00:11 +00:00
Chaohui Wang
9c6249a04f Merge "Fix the flow for ZenCustomRuleSettingsBase" into tm-dev 2022-04-06 14:35:51 +00:00
tom hsu
8d2c67bd03 [Pnalingual] Resolve code conflict. am: 6436a5aa6f am: 715ebf4705 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615234

Change-Id: I2e252e7b93bc3587fbfeb0e8152fbc16ad6c0f42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 12:03:41 +00:00
tom hsu
715ebf4705 [Pnalingual] Resolve code conflict. am: 6436a5aa6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615234

Change-Id: I9e1316234f825ab3cd92fc8e395dbffe82448dd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 11:48:43 +00:00
tom hsu
19bd21d96c [Panlingual] Fix settings crash from rotation. 
- View may not create in time when add view of fragment.

Bug: 228126890
Test: local test.
Change-Id: Idce63dc9d39de09ff1ee684881ea6cb90637ee22
 2022-04-06 19:32:36 +08:00
tom hsu
6436a5aa6f [Pnalingual] Resolve code conflict. 
Bug: 228292561
Test: local
Change-Id: Idc79694fdecf3ad64e93e2f353837fd7bbdde1ed
(cherry picked from commit aac21a59aa)
 2022-04-06 11:07:22 +00:00
Jan Tomljanovic
8180a6e3f8 Merge "Update framework strings for the security page." into tm-dev am: a926f6ddbc am: 0a6067a69e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17567139

Change-Id: I067a4d284f6669a2c4535ffa83f390dd98525ec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 10:21:58 +00:00
Jan Tomljanovic
0a6067a69e Merge "Update framework strings for the security page." into tm-dev am: a926f6ddbc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17567139

Change-Id: Iccc614da39722d9774186a6df59be5cd07e4539b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 10:00:17 +00:00
Cn Chen
936007f4db Merge "Properly apply the SUW dynamic color theme" into tm-dev am: 8b6bbda28a am: e4724e5aa9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17536304

Change-Id: I5563f80d775bc0527c5ff9db7a29f77772db6a90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 09:45:48 +00:00
Jan Tomljanovic
a926f6ddbc Merge "Update framework strings for the security page." into tm-dev 2022-04-06 09:25:15 +00:00
Chaohui Wang
3b3e66c780 Fix the flow for ZenCustomRuleSettingsBase 
updateRule() should be called before super.onResume() because rule will
be used in updatePreferenceStates() in super.onResume().

This is follow up of Change: Ief9963091847d58654f26851616563ae910716a5

Bug: 226523115
Test: manual
Change-Id: I2fe0cfb2b4a76273283bb2d3aca629b5d647db91
 2022-04-06 17:22:12 +08:00