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

103125 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
22ad285b7c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 2p: 737ee1e1a7 am: fa29c0c3bc -s ours am: 20df862686 -s ours am: b2e1f16d8d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If76d138090f8f7631a8f2bd85c2cabaab53f9c72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:18:34 +00:00
Amy Hsu
fdbf57cf09 Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: 19b9978591 am: 8d3a4324e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983872

Change-Id: I3c72807e586bf8ce9194ac17f5eda5ccb756f3bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:53:38 +00:00
Prabal Singh
c562155857 Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f44227e am: 89e0eda197 am: 294134ce05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601

Change-Id: I1e4967dc532bb48e48ba4c1ee7d39c9c326c1478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:27:59 +00:00
Bill Yi
b2e1f16d8d [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 2p: 737ee1e1a7 am: fa29c0c3bc -s ours am: 20df862686 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iee180f4e6058a7cddbc27c848f7210ee7b51c365
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:27:26 +00:00
Prabal Singh
4cdce44fac Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f44227e am: 7642301f28 am: f52e82eb8c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601

Change-Id: I40a8b70116ad90a54c39f8b7405795141c894edd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:25:26 +00:00
Amy Hsu
8d3a4324e5 Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: 19b9978591 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983872

Change-Id: Ib2e443b2385b482b78cb47ea4241ee28f0e7a3e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:22:47 +00:00
Prabal Singh
294134ce05 Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f44227e am: 89e0eda197 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601

Change-Id: Ic1978699a9611fbc0b6892d1279aaed20cd5e364
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:03:06 +00:00
Prabal Singh
f52e82eb8c Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f44227e am: 7642301f28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601

Change-Id: I7e08a7863af94ea3db2138797f18747e046b40ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 18:01:38 +00:00
Bill Yi
20df862686 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 2p: 737ee1e1a7 am: fa29c0c3bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8b0e95cf44bb643eeae2578a8c8e799c35940888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 16:37:09 +00:00
Amy Hsu
19b9978591 Merge "[ScreenResolutionController] UI string update" into tm-d1-dev 2022-04-29 03:25:34 +00:00
Prabal Singh
7642301f28 Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f44227e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601

Change-Id: I0e90fc35f7916ae920ce08a2da996d69e01cf80f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 20:51:44 +00:00
Prabal Singh
89e0eda197 Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f44227e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601

Change-Id: Ibfa6243c7bb5757515ed2388f2acec1547c023d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 20:41:46 +00:00
Bill Yi
fa29c0c3bc [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 2p: 737ee1e1a7 
Blank merge reason: parent was merged -s ours

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

Bug: 205460459
Change-Id: Ic315f239b7f44fccb3ffdf859a920c7bbdda7602
 2022-04-28 18:52:14 +00:00
Bill Yi
737ee1e1a7 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8 
Blank merge reason: commit message contains skip directive

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

Bug: 205460459
Change-Id: I51afb40dfedcc3495b937de9d81e15c82a3bf90b
 2022-04-28 18:51:58 +00:00
Bill Yi
aedbfeb8b8 Import translations. DO NOT MERGE ANYWHERE 
BUG:205460459

Auto-generated-cl: translation import
Change-Id: I5bb2a5d970bbdff0ea715cef8f0fca7bd052a670
 2022-04-28 18:46:21 +00:00
Prabal Singh
9a8f44227e Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev 2022-04-28 17:12:28 +00:00
Prabal Singh
3e2d7f4581 Remove extra argument WorkPolicyUtil constructor 
Only constructor is required for WorkPolicyInfo constructor. The other
dependencies can be derives

Test: make ROBOTEST_FILTER=EnterprisePrivacyFeatureProviderImplTest RunSettingsRoboTests -j40
Change-Id: I7f35e5ed344d452190b333aad7fa823a010d17b3
 2022-04-28 15:21:18 +01:00
Automerger Merge Worker
40be7a2d38 Merge "Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f am: f9be4c5a5c" into tm-d1-dev-plus-aosp am: 7e2bf6724a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991

Change-Id: I48a68315d6964d38390fd2d64d7ac4be29356781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 13:02:49 +00:00
Bonian Chen
2c0598c3f5 Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f am: 69aa69a45d am: ae297c8f19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991

Change-Id: I3c7646d6f98761ac9fae4676d5b2baa1eaed7198
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 13:02:32 +00:00
Bonian Chen
3a8315d562 Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f am: 69aa69a45d am: cb72c82a18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991

Change-Id: Ic685c3292694e5922de80aaefc6d0d080220a94c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 13:02:19 +00:00
Automerger Merge Worker
7e2bf6724a Merge "Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f am: f9be4c5a5c" into tm-d1-dev-plus-aosp 2022-04-28 12:10:27 +00:00
Bonian Chen
aba0d1654d Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f am: f9be4c5a5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991

Change-Id: Ib66781f14b6ce6652bac2471399b621255f3524c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 12:10:24 +00:00
Bonian Chen
ae297c8f19 Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f am: 69aa69a45d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991

Change-Id: Ia1fdd76b65c635d05f3bd74ab4d1ce687794cbf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 12:10:23 +00:00
Bonian Chen
cb72c82a18 Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f am: 69aa69a45d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991

Change-Id: Ibf8b08764cba09c5d72130fd4ecad37960ea2062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 12:10:11 +00:00
Bonian Chen
69aa69a45d Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991

Change-Id: If187192b7619e4b0dea0b565fbc124651b235466
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 11:42:57 +00:00
Bonian Chen
f9be4c5a5c Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991

Change-Id: I5f9c37b458f185ac261f182ae290950c2d2fe856
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 11:41:24 +00:00
Bonian Chen
783314ae4f Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev 2022-04-28 11:05:42 +00:00
PETER LIANG
e21e69fb62 Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94 am: 17ddbadb74 am: 4496dd6520 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953

Change-Id: I1473ee54ad3acf428380647bd036a450d13527d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 09:16:14 +00:00
PETER LIANG
0b2b945830 Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94 am: acdb3b8a60 am: ec94752f9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953

Change-Id: I6d4bb8196e547c8dc1b42313a6fbc72d2c90f421
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 09:15:55 +00:00
PETER LIANG
75e30769c1 Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94 am: 17ddbadb74 am: 0109d6100e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953

Change-Id: Ib3397522957ead248821ca1d362b0a59de73053c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 09:15:15 +00:00
PETER LIANG
4496dd6520 Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94 am: 17ddbadb74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953

Change-Id: Ie5968648a599aaf4bfd45d2d3e8d34e66a9c30af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 08:42:30 +00:00
PETER LIANG
ec94752f9d Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94 am: acdb3b8a60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953

Change-Id: Ibd5b4a67660b826c0928b37bc9e6c3cd54ca9e2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 08:42:08 +00:00
PETER LIANG
0109d6100e Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94 am: 17ddbadb74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953

Change-Id: If9b7ad6fcce1288eb5c39d1d6150df0e52a3696e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 08:40:23 +00:00
PETER LIANG
17ddbadb74 Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953

Change-Id: I900480866ed1fb85fb7629223f37538c46ff11b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 07:53:30 +00:00
PETER LIANG
acdb3b8a60 Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev am: 27aa5f9d94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886953

Change-Id: Ic8db083e3d479c6f85615c36113fa747ce10c62d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 07:51:22 +00:00
Amy Hsu
f1dfa76dba [ScreenResolutionController] UI string update 
Bug: b/230626771
Test: Check the string manually
Change-Id: Ibe8cde0ef743ef398edbc438ead130215f7294d0
 2022-04-28 07:40:44 +00:00
PETER LIANG
27aa5f9d94 Merge "Logging for the feature "Text and reading options" in Android T." into tm-dev 2022-04-28 06:45:11 +00:00
Kweku Adams
1250d57309 Merge "Make final factors configurable." into tm-dev am: 3663986909 am: 664e3805a7 am: 8ebc71d701 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486

Change-Id: Ib4333f6e9897ce7236f8f0a7b82c4ca24afeb8b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 05:26:23 +00:00
Stanley Wang
3127b05280 Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993 am: f781d8a02a am: 979ee5f856 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076

Change-Id: I15d8402098df434e6288a5c524a283bbc9bef721
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 05:25:55 +00:00
Kweku Adams
88c367dbf2 Merge "Make final factors configurable." into tm-dev am: 3663986909 am: 4c5cbeb882 am: 59e93d5225 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486

Change-Id: I985ca208ff9bc0bd8a79d18c657ba89bd491447c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 05:25:30 +00:00
Kweku Adams
ac66727cde Merge "Make final factors configurable." into tm-dev am: 3663986909 am: 4c5cbeb882 am: 5262325601 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486

Change-Id: I7db9edd6bd997cbc09a2c48379b9c35772a6ffe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 05:21:12 +00:00
Stanley Wang
908868a215 Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993 am: 5e5ea25a2b am: 6ef0f6fed7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076

Change-Id: I0c41b28889092f11052bf225e08db7694ca5a5b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 05:20:50 +00:00
Xinyi Zhou
844be62f38 Delete Fast Pair Settings am: 3438e20da1 am: 14c317a689 am: 425316caae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888

Change-Id: I11a6ec0bf450d63d5552d6d81022febb425b602c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 05:19:50 +00:00
Kweku Adams
8ebc71d701 Merge "Make final factors configurable." into tm-dev am: 3663986909 am: 664e3805a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486

Change-Id: I513d7a13d671c8dc49e94ef38e4b4feb14a6c9d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 05:19:40 +00:00
Stanley Wang
979ee5f856 Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993 am: f781d8a02a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076

Change-Id: I5518011aaec7763b7d71461d722993d026a91713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 05:19:24 +00:00
Stanley Wang
bd50a87911 Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993 am: 5e5ea25a2b am: 602b1f3d9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076

Change-Id: I2b9c479450475ce46386ed21edfa415eff272430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 05:19:20 +00:00
Xinyi Zhou
64e9591e7f Delete Fast Pair Settings am: 3438e20da1 am: e2db47e9ab am: d318a79c25 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888

Change-Id: Ied49b0072aff4f138e8c5c88350349c1c9824afa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 05:18:20 +00:00
Xinyi Zhou
815bbd8c1b Delete Fast Pair Settings am: 3438e20da1 am: e2db47e9ab am: 4be70892e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17968888

Change-Id: Ie978c707ae47ff97af937bcc114c5a362044aa8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 05:17:58 +00:00
Kweku Adams
664e3805a7 Merge "Make final factors configurable." into tm-dev am: 3663986909 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17947486

Change-Id: I9705e9019fb5a2ef096e1c7a8a8bb6a29bbba0e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 03:36:35 +00:00
Stanley Wang
f781d8a02a Merge "Fixe the problem of invalid switch preference." into tm-dev am: 0e861f0993 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950076

Change-Id: I72be188119ae313ba3908dd9c10c1e5e99ce7ef9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-28 03:36:04 +00:00