PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,097 Commits 1 Branch 0 Tags
e01b67b83a0ab6fff2ee87bf0fa64ec0eeffd631
Commit Graph

103097 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Presubmit Automerger Backend
58bd2faec6 [automerge] [Pnalingual] Resolve code conflict. 2p: 6436a5aa6f 2p: 9d162016b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615234

Bug: 228292561
Change-Id: I120235e895b8542275a84a314d9cf89ebad088f7
 2022-04-06 11:08:01 +00:00
Presubmit Automerger Backend
9d162016b9 [automerge] [Pnalingual] Resolve code conflict. 2p: 6436a5aa6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615234

Bug: 228292561
Change-Id: I889b195579da6dda07bb5f186a59f5a7f0fa8c08
 2022-04-06 11:07:55 +00: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
ea1878eed1 Merge "Update framework strings for the security page." into tm-dev am: a926f6ddbc am: 0a6067a69e am: 8180a6e3f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17567139

Change-Id: Ica343c26a4d3c460f19e6cbbd5252d79758e2371
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 10:43:38 +00:00
Tom Hsu
444c4868ee Merge "[Pnalingual] Resolve code conflict." 2022-04-06 10:38:08 +00:00
tom hsu
aac21a59aa [Pnalingual] Resolve code conflict. 
Bug: 228292561
Test: local
Change-Id: Idc79694fdecf3ad64e93e2f353837fd7bbdde1ed
 2022-04-06 10:31:34 +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
4a12af2cf8 Merge "Update framework strings for the security page." into tm-dev am: a926f6ddbc am: ba369cbb31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17567139

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

Change-Id: I02dfc09b26e4adfaed831ebb8eecb1f0bd31e4ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 10:06:33 +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
Jan Tomljanovic
ba369cbb31 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: I162b571a63526a1118608ac47ecc0455add8d785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 09:59: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
Cn Chen
55aef08432 Merge "Properly apply the SUW dynamic color theme" into tm-dev am: 8b6bbda28a am: 87b8c8d107 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17536304

Change-Id: I66c0b7194513efdf36123dfde17712e50c6de043
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 09:45:20 +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
2646ea3180 [automerge] Fix the flow for ZenCustomRuleSettingsBase 2p: 3b3e66c780 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615233

Bug: 226523115
Change-Id: If37ebc4a3eaec779ddad315789ebd858aec684f0
 2022-04-06 09:22:39 +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
5884943ea0 Merge "Add work profile badge for icon of free up space" into tm-dev am: 6d0b9c7bd4 am: acdd95c572 am: c260b55ad2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17462163

Change-Id: Ie07be51538be769eab39f849ea3efdd25ed18ce4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 09:17:45 +00:00
Cn Chen
87b8c8d107 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: Iee7a70d91d7ef77cd1a0d39a30c7eed5f0a9f8aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 09:17:28 +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
7e3ac66bc6 Merge "Add work profile badge for icon of free up space" into tm-dev am: 6d0b9c7bd4 am: 1f75850e11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17462163

Change-Id: I49413190190e30abb9d360f24405de710fb2ebe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 08:50:26 +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
1f75850e11 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: Ie55415540cda4898f0b37f0ff3c9d69f278b91aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 08:34:49 +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
4652097173 [automerge] Fixes 'learn more' link in ScreenTimeoutSettings 2p: 284cb1c2b2 2p: e6f28fbd49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17578008

Bug: 227292811
Change-Id: I47f32600feffd755dccad876f2cf5bb7b68c8c6d
 2022-04-06 06:49:40 +00:00
Yi Jiang
e6f28fbd49 [automerge] Fixes 'learn more' link in ScreenTimeoutSettings 2p: 284cb1c2b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17578008

Bug: 227292811
Change-Id: Ibab34cc241b50c473e6951d46f6be1697bfadb03
 2022-04-06 06:49:32 +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
Kedar Chitnis
1149c12949 Merge "Guest mode UX flow updates to user settings" 2022-04-06 04:18:05 +00:00
TreeHugger Robot
4eedbed2f4 Merge "Added test for FP Enroll vibration" into tm-d1-dev am: f733c0d7c9 am: b9128f28f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17606348

Change-Id: I127f181f8d00443fac9efa49446eb28f13954df1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 01:51:53 +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
c858e7e18e [automerge] Remove GameSettings and ExtraAppInfo. 2p: e14c23fcf9 2p: f621f13d83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17599733

Change-Id: I26779ff68346f089155d4d0f15e2afd5b351a234
 2022-04-05 21:52:06 +00:00
Peiyong Lin
f621f13d83 [automerge] Remove GameSettings and ExtraAppInfo. 2p: e14c23fcf9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17599733

Change-Id: I12ee20fe9ccf469eaa2a0d67b605ec1d952cd585
 2022-04-05 21:51:57 +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
c193606f26 Merge "Fix bug where not all views are getting disabled alpha applied." into tm-dev am: ab8467e872 am: 674bca5b78 am: 252607e648 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17574303

Change-Id: Ic575456cd4138aef1fc0c10bb012bcb839b872d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 15:55:21 +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
44a4e905e7 Merge "Fix bug where not all views are getting disabled alpha applied." into tm-dev am: ab8467e872 am: 2ec4bc0b5d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17574303

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

Change-Id: Ic05f5cad545f01b117c33ae978612b01806c8707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 12:13:24 +00: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
Chaohui Wang
4786d1f869 Merge "Fix cannot add language" into tm-dev am: 65c610c2ab am: 20032a4b13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539527

Change-Id: Ifc0e1bcc96a628b05a3b0b3e5414d0cc05e7ba72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 11:51:09 +00:00
Chaohui Wang
d5d380f9c0 Merge "Fix cannot add language" into tm-dev am: 65c610c2ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539527

Change-Id: Id5fdb67e9eccb3b7a55f56025452b67db5bad854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 11:30:32 +00:00
Chaohui Wang
20032a4b13 Merge "Fix cannot add language" into tm-dev am: 65c610c2ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539527

Change-Id: I1f427300d8ee35d800c102efa1c58bf2cf6a58f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 11:29:19 +00:00
Chaohui Wang
65c610c2ab Merge "Fix cannot add language" into tm-dev 2022-04-05 11:04:10 +00:00