PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,311 Commits 1 Branch 0 Tags
2adbb69d81bc4f49d54c76c268bc148585d07960
Commit Graph

101311 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
ee79190be9 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into sc-qpr1-dev am: a84027d685 -s ours am: db51e0c04b -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/+/16341971

Change-Id: I2103c67411ccb792d833271a9e82cadecac653e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:45:30 +00:00
Bonian Chen
5305cceda7 [automerger skipped] [Settings] Move display of VPN version into summary text am: 96f581310f -s ours am: 3c651042ba -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/+/16341971

Change-Id: I90c6705b083b667931f8a52f44cc51c98ff83900
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:45:28 +00:00
Bonian Chen
06b9bf362e [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: c058392a70 -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: Ic3d9c339402bc01aedadc6232270501203e45e90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:24:40 +00:00
Bonian Chen
f52fc37869 [automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491 -s ours am: eefa7371ed -s ours am: fcdc4a4de3 -s ours am: b17f587257 -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: Ia31ea8fa8ca0cdd539e1842efc0cf0af2f61b845
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:24:39 +00:00
Bonian Chen
b82af15ea9 [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: eedfefab4b -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: I583f3af9e630046b485f58d15fdfbffa76088d4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:24:31 +00:00
Bonian Chen
8f9ade3eaf [automerger skipped] [Settings] Move display of VPN version into summary text am: 5fc0e6614d -s ours am: 96fe347312 -s ours am: 83e4693075 -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: Ifba29937fc81a1591e4605437dec0df5ff943f1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:24:30 +00:00
Bonian Chen
7c93a31c72 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into sc-dev am: 0f10561082 -s ours am: 771b606116 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 96f581310f is already in history

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

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

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

Change-Id: If41c61bfe97231550c64c6da05471f72d2535a09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:24:21 +00:00
Bonian Chen
db51e0c04b [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into sc-qpr1-dev am: a84027d685 -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/+/16341971

Change-Id: Iaedf9edd1c38b7265c16927b3e5dba07ba0edaad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:24:13 +00:00
Bonian Chen
3c651042ba [automerger skipped] [Settings] Move display of VPN version into summary text am: 96f581310f -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/+/16341971

Change-Id: Iebd5667f16d475d06834b2caf875e297c2d14716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:24:13 +00:00
Bonian Chen
c058392a70 [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: I5ef85a51130641bb7690d7de5e15ff6e350508ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:24:12 +00:00
Bonian Chen
b17f587257 [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: I93d97253b7686f176d2b5a2bb192a5d4ff1cf7ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:24:11 +00:00
Bonian Chen
eedfefab4b [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: Ia97c0a7c8667c952ec2e6e286a02d736bc526335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:24:04 +00:00
Bonian Chen
83e4693075 [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: I2d597ac19b472b75fa776e207238c05d52f912af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:24:03 +00:00
Bonian Chen
771b606116 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into sc-dev am: 0f10561082 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 96f581310f is already in history

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

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

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

Change-Id: I77fbb84a4fc98dcc2aca741a1ec1c479b6051e9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:23:55 +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
d35d3e2446 Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16341975

Change-Id: Iabf1f3d5b113e12ddfd1cfe1037a94fb4509e180
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 00:23:16 +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
a84027d685 Merge "[Settings] Move display of VPN version into summary text" into sc-qpr1-dev 2022-04-07 00:08:34 +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
Bonian Chen
d0888970a4 Merge "[Settings] Move display of VPN version into summary text" into qt-dev 2022-04-07 00:08:08 +00:00
Bill Yi
cc1f1b5e6e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8b31bb16c8e1a7dead3d302b15db20d7a4031bfe
 2022-04-06 23:45:35 +00:00
tom hsu
c0214ff9f3 [Panlingual] Fix the back button press 
Bug: 226894999
Test: local
Change-Id: I81e6408ebf2587bd023a13dbbdfa97e38efd8c31
 2022-04-06 23:28:17 +08:00
TreeHugger Robot
e0f6939c4c Merge "[Panlingual] Fix settings crash from rotation." into tm-dev 2022-04-06 15:15:37 +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
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
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
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
Cn Chen
8b6bbda28a Merge "Properly apply the SUW dynamic color theme" into tm-dev 2022-04-06 08:55:48 +00:00
TreeHugger Robot
6d0b9c7bd4 Merge "Add work profile badge for icon of free up space" into tm-dev 2022-04-06 08:05:10 +00:00
Yi Jiang
284cb1c2b2 Fixes 'learn more' link in ScreenTimeoutSettings 
Bug: 227292811
Test: make RunSettingsRoboTests

Change-Id: I0e5678e6760ebd590dfd526f362207776ece3a70
 2022-04-06 06:49:19 +00:00
Peiyong Lin
e14c23fcf9 Remove GameSettings and ExtraAppInfo. 
Bug: b/224595815
Test: manual
Change-Id: Ifc9a9e8c0b4b2170144639abb2f81f8916d5f164
 2022-04-05 21:45:05 +00:00
Lucas Silva
ab8467e872 Merge "Fix bug where not all views are getting disabled alpha applied." into tm-dev 2022-04-05 14:42:41 +00:00
Jan Tomljanovic
b8187256eb Update framework strings for the security page. 
Test: manual
Bug: 226098547
Change-Id: Idf31853fc65aaef241de1bbcabc33fceabe2fd3a
 2022-04-05 15:20:46 +01:00
Chaohui Wang
65c610c2ab Merge "Fix cannot add language" into tm-dev 2022-04-05 11:04:10 +00:00