PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,203 Commits 1 Branch 0 Tags
bed126e923138426ebea42c5898e143c2aeef95c
Commit Graph

102203 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
3190e40a71 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2b07fb08f9 
Blank merge reason: commit message contains skip directive

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

Change-Id: If7526393e07468b112d4713b04e016378d287b81
 2022-04-07 00:00:51 +00:00
Bill Yi
2b07fb08f9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic1eee796328d6e3f4c9ee7c153353f470214846c
 2022-04-07 00:00:42 +00:00
Bill Yi
08321b4e75 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9ac6df90d3871bc3df75ab805569114a49c71ecb
 2022-04-06 23:58:59 +00:00
Bill Yi
c3bc0251d4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I289f0bae8f742355f3ef04aac484bb763cd0da4d
 2022-04-06 23:57:22 +00:00
Bill Yi
2c5a30e12e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia8b418f650d3f7293387d1b37aa9cd858d5109f0
 2022-04-06 23:55:44 +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
Bill Yi
47e0304cea [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 62dd76e7d4 
Blank merge reason: commit message contains skip directive

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

Change-Id: Iff713f75feef96eb93b863847cb996f0e709bf94
 2022-04-06 23:40:28 +00:00
Bill Yi
62dd76e7d4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib47f53297c83360071064bfed2de9c5b2c0ec7a3
 2022-04-06 23:40:15 +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
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
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
Edgar Wang
90e095dbe3 Fix LaunchAnyWhere in AppRestrictionsFragment 
If the intent's package equals to the app's package, this intent
will be allowed to startActivityForResult.
But this check is unsafe, because if the component of this intent
is set, the package field will just be ignored. So if we set the
component to any activity we like and set package to the app's
package, it will pass the assertSafeToStartCustomActivity check
and now we can launch anywhere.

Bug: 223578534
Test: robotest and manual verify
Change-Id: I40496105bae313fe5cff2a36dfe329c1e2b5bbe4
 2022-04-06 17:51:07 +08: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
Cn Chen
e4724e5aa9 Merge "Properly apply the SUW dynamic color theme" into tm-dev am: 8b6bbda28a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17536304

Change-Id: Ib15f8d433901516e7293677762e69f3a35de73a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 09:18:23 +00:00
TreeHugger Robot
c260b55ad2 Merge "Add work profile badge for icon of free up space" into tm-dev am: 6d0b9c7bd4 am: acdd95c572 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17462163

Change-Id: Ife7245ecd37a3e454e529e6327c434248fb77d63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 08:57:35 +00: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
acdd95c572 Merge "Add work profile badge for icon of free up space" into tm-dev am: 6d0b9c7bd4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17462163

Change-Id: Id3925d5b24a5bd8bd7ee3dc533af979d76e7e8fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 08:35:45 +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
TreeHugger Robot
b9128f28f6 Merge "Added test for FP Enroll vibration" into tm-d1-dev am: f733c0d7c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17606348

Change-Id: I2df84f7b7a8a235086a28b57e938731a0842f4f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 01:20:52 +00:00
TreeHugger Robot
f733c0d7c9 Merge "Added test for FP Enroll vibration" into tm-d1-dev 2022-04-06 01:04:47 +00:00
Joshua McCloskey
2a05de0df1 Added test for FP Enroll vibration 
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Fixes: 222593183
Change-Id: I18ba2471c506c9a34151dc34c5f5f423db478c06
 2022-04-05 23:28:14 +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
252607e648 Merge "Fix bug where not all views are getting disabled alpha applied." into tm-dev am: ab8467e872 am: 674bca5b78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17574303

Change-Id: Ia96355414fb0bdd500118920346f609fbac2871c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 15:33:47 +00:00
Lucas Silva
674bca5b78 Merge "Fix bug where not all views are getting disabled alpha applied." into tm-dev am: ab8467e872 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17574303

Change-Id: I1bc1db7cd6f6ffbc8f0cff135f6e109ac06febdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 15:13:31 +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
edf16b89a8 Merge "Fix cannot add language" into tm-dev am: 65c610c2ab am: d5d380f9c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539527

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