PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,577 Commits 1 Branch 0 Tags
d6c1d47dffaa15673fdcedb64114dfa3228dbd3c
Commit Graph

65577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
8bb8384164 Merge "Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: dcba11ba82" into rvc-d1-dev-plus-aosp 2020-04-28 14:08:29 +00:00
TreeHugger Robot
d7478b0db4 Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: 4738734887 
Change-Id: Iee676688bd868b5bb045bd4da5296c7549ab8860
 2020-04-28 14:08:22 +00:00
TreeHugger Robot
5c427c828a Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: dcba11ba82 
Change-Id: If4766ce87e8786f179898d11f8873ff5bcda39d0
 2020-04-28 14:08:22 +00:00
TreeHugger Robot
4bc961c95d Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: 4738734887 
Change-Id: Ia923da6427ace26e9231bba0e464cf9d0a1f3a77
 2020-04-28 14:08:16 +00:00
TreeHugger Robot
6ca4817f2e Merge "Fix when search "storage", there are multiple results" into rvc-dev am: f7ee64da6c am: f635ce3685 am: ac9ba09d91 
Change-Id: Ie736ef335357ee039a9c44429ac61110079ffcde
 2020-04-28 14:07:30 +00:00
TreeHugger Robot
fbb7b19880 Merge "Fix when search "storage", there are multiple results" into rvc-dev am: f7ee64da6c am: 462f4cd695 am: 1676898f76 
Change-Id: I006fe0c7b21535cf12f38145d94b958429476fbd
 2020-04-28 14:07:17 +00:00
TreeHugger Robot
c2fc5892d0 Merge "Fix when search "storage", there are multiple results" into rvc-dev am: f7ee64da6c am: 462f4cd695 am: 4d26a4e326 
Change-Id: I31ee3857c15395399774e723f711afc1cf9dfea9
 2020-04-28 14:07:17 +00:00
TreeHugger Robot
dcba11ba82 Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 
Change-Id: I90d6f44c1b5af1037422aadae7fae71eabcaa452
 2020-04-28 14:02:40 +00:00
TreeHugger Robot
4738734887 Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 
Change-Id: I5d739de32339359c28bab9ab6957abf1c287b9e1
 2020-04-28 14:02:27 +00:00
TreeHugger Robot
6f482cef09 Merge "Updates for msg apps that don't use shortcuts" into rvc-dev 2020-04-28 13:57:15 +00:00
Bonian Chen
1613dbf95c Merge "[Settings] Avoid mobile data usage init in WiFi usage" into rvc-dev am: 38b0d3091d am: d0783f22c0 am: 06483a6af1 am: c2a0b2143d 
Change-Id: I1653f985edfc970bd5f70f59d8dc680b778d0992
 2020-04-28 13:54:21 +00:00
TreeHugger Robot
1676898f76 Merge "Fix when search "storage", there are multiple results" into rvc-dev am: f7ee64da6c am: 462f4cd695 
Change-Id: I74770262398fabbe4d7127b7faa42b81eb252c5b
 2020-04-28 13:53:58 +00:00
TreeHugger Robot
ac9ba09d91 Merge "Fix when search "storage", there are multiple results" into rvc-dev am: f7ee64da6c am: f635ce3685 
Change-Id: I6ac0e23924c4ccb76281d0c719a8aa9f5351d2da
 2020-04-28 13:53:56 +00:00
TreeHugger Robot
4d26a4e326 Merge "Fix when search "storage", there are multiple results" into rvc-dev am: f7ee64da6c am: 462f4cd695 
Change-Id: Ib15cfba1fe1da528b2bd8b755ffa11a92326a6e6
 2020-04-28 13:53:22 +00:00
Bonian Chen
44107f42d3 Merge "[Settings] Avoid mobile data usage init in WiFi usage" into rvc-dev am: 38b0d3091d am: 414949593c am: 2dbb480320 
Change-Id: Icd388919330c260c63a1399d818c64faa586f61e
 2020-04-28 13:40:58 +00:00
Bonian Chen
f5612b39da Merge "[Settings] Avoid mobile data usage init in WiFi usage" into rvc-dev am: 38b0d3091d am: d0783f22c0 am: 907949b2eb 
Change-Id: I1473e3405c82d8bb51ec29b6a3963c11dfceeeea
 2020-04-28 13:40:41 +00:00
Bonian Chen
c2a0b2143d Merge "[Settings] Avoid mobile data usage init in WiFi usage" into rvc-dev am: 38b0d3091d am: d0783f22c0 am: 06483a6af1 
Change-Id: I88d156f50d9391b2156f7e96a4e00a03122cc095
 2020-04-28 13:38:58 +00:00
TreeHugger Robot
f635ce3685 Merge "Fix when search "storage", there are multiple results" into rvc-dev am: f7ee64da6c 
Change-Id: I47d066f5a8be772d4f4367facee5ae13373b2438
 2020-04-28 13:38:12 +00:00
TreeHugger Robot
462f4cd695 Merge "Fix when search "storage", there are multiple results" into rvc-dev am: f7ee64da6c 
Change-Id: I5bc7cb1b0ac17d75e7ff336b63bd6bcd4d18a0d2
 2020-04-28 13:37:55 +00:00
Bonian Chen
06483a6af1 Merge "[Settings] Avoid mobile data usage init in WiFi usage" into rvc-dev am: 38b0d3091d am: d0783f22c0 
Change-Id: Ifd5c59ab77f0f577f4a9d476b24bb31fda01c41c
 2020-04-28 13:22:15 +00:00
Bonian Chen
2dbb480320 Merge "[Settings] Avoid mobile data usage init in WiFi usage" into rvc-dev am: 38b0d3091d am: 414949593c 
Change-Id: I4853658b7dc0fa101fb2d60de744f9b25664ea3b
 2020-04-28 13:21:58 +00:00
TreeHugger Robot
2cf8fe9ede Merge "Add icon to current screen saver preference" into rvc-dev am: beb92c325a am: 9921ee8713 am: ab6dd73faf am: 6aa00a1f54 
Change-Id: I6cd1a4c1178717cfda656e1915119318a15f32e0
 2020-04-28 13:21:39 +00:00
Bonian Chen
907949b2eb Merge "[Settings] Avoid mobile data usage init in WiFi usage" into rvc-dev am: 38b0d3091d am: d0783f22c0 
Change-Id: I25419396bfc8a04be851f165fde5ead3dc61aa04
 2020-04-28 13:21:38 +00:00
TreeHugger Robot
f7ee64da6c Merge "Fix when search "storage", there are multiple results" into rvc-dev 2020-04-28 13:21:34 +00:00
TreeHugger Robot
a42b76d93a Merge "Add icon to current screen saver preference" into rvc-dev am: beb92c325a am: 1e27d08127 am: 9c550e6fae 
Change-Id: I17fe9eecf7a7eb4a9150ed7503709198d1d9c7c0
 2020-04-28 13:03:40 +00:00
Bonian Chen
414949593c Merge "[Settings] Avoid mobile data usage init in WiFi usage" into rvc-dev am: 38b0d3091d 
Change-Id: I2da3995606dee5652a146fb7f67649432d951945
 2020-04-28 13:03:30 +00:00
Bonian Chen
d0783f22c0 Merge "[Settings] Avoid mobile data usage init in WiFi usage" into rvc-dev am: 38b0d3091d 
Change-Id: Ic9aca8582c7567e689d7b381cd735280f7282600
 2020-04-28 13:03:30 +00:00
TreeHugger Robot
a1f8fe8937 Merge "Add icon to current screen saver preference" into rvc-dev am: beb92c325a am: 9921ee8713 am: 41913ceb3d 
Change-Id: I8929587911ecfc2766e22a9d08bddb41dfd62cb2
 2020-04-28 13:03:03 +00:00
TreeHugger Robot
6aa00a1f54 Merge "Add icon to current screen saver preference" into rvc-dev am: beb92c325a am: 9921ee8713 am: ab6dd73faf 
Change-Id: I88e8ee8b6c5931d3d7243f2708cf0f7338e73c83
 2020-04-28 13:02:48 +00:00
Bonian Chen
38b0d3091d Merge "[Settings] Avoid mobile data usage init in WiFi usage" into rvc-dev 2020-04-28 12:50:18 +00:00
Alex Johnston
05c0ab0324 Check if FRP policy is supported in Settings 
* Check if FRP policy is supported before
  erasing a device via settings.
* Call DPM TestAPI isFactoryResetProtectionPolicySupported
* If FRP policy is not supported, then do not
  erase the device.

Bug: 155057616
Test: atest com.android.settings.MasterClearConfirmTest
Change-Id: I56e4a6566457f31932658188646abe21701637fc
 2020-04-28 13:48:01 +01:00
TreeHugger Robot
9c550e6fae Merge "Add icon to current screen saver preference" into rvc-dev am: beb92c325a am: 1e27d08127 
Change-Id: I0601504d78fd3b9ad5a15e61eacea815bece99cb
 2020-04-28 12:40:25 +00:00
TreeHugger Robot
ab6dd73faf Merge "Add icon to current screen saver preference" into rvc-dev am: beb92c325a am: 9921ee8713 
Change-Id: Ie3b3089e0890a188e0d8c3a9d699735021289ee5
 2020-04-28 12:40:11 +00:00
TreeHugger Robot
41913ceb3d Merge "Add icon to current screen saver preference" into rvc-dev am: beb92c325a am: 9921ee8713 
Change-Id: Ic66fc07f9ac9656e450781031f7749bbd90c02ff
 2020-04-28 12:39:55 +00:00
TreeHugger Robot
1e27d08127 Merge "Add icon to current screen saver preference" into rvc-dev am: beb92c325a 
Change-Id: I096ba58579b7f49aeba7bc60ec9d758b007b8e1e
 2020-04-28 12:21:18 +00:00
TreeHugger Robot
9921ee8713 Merge "Add icon to current screen saver preference" into rvc-dev am: beb92c325a 
Change-Id: I30cee5190eb1a2879f5cb8383cd3be96a989eff0
 2020-04-28 12:21:11 +00:00
TreeHugger Robot
beb92c325a Merge "Add icon to current screen saver preference" into rvc-dev 2020-04-28 12:05:16 +00:00
Yanting Yang
0569b533c9 Merge "Remove sub-text from slice builder" into rvc-dev am: 38bd23cb7f am: 70abedee86 am: bb6ca0fbc7 am: 3a8c8354d5 
Change-Id: I70bb1b49f78d0697d753c90dd5092df68a9e0b54
 2020-04-28 09:12:57 +00:00
Mill Chen
c91a8bce5b Add icon to current screen saver preference 
The screen saver setting is coming from different apps to modify
their options. This will confuse people that they were modifying
something in Settings rather than in other apps. To improve that,
we added an icon of active dream and put it on the left side of
current screen saver setting, which is to let people clearer to
know that they were modifying the options in other apps.

Bug: 129994275
Test: robotests
Change-Id: I014c9de745044c2bd39d22782b6c36f8605d8f56
 2020-04-28 17:09:01 +08:00
Automerger Merge Worker
fc7f9e8dd5 Merge "Merge "Remove sub-text from slice builder" into rvc-dev am: 38bd23cb7f am: f3354ea59c" into rvc-d1-dev-plus-aosp am: effc307614 
Change-Id: I94e74f4c4788f1df8b4d4cba012315ae15697626
 2020-04-28 09:01:55 +00:00
Yanting Yang
3a8c8354d5 Merge "Remove sub-text from slice builder" into rvc-dev am: 38bd23cb7f am: 70abedee86 am: bb6ca0fbc7 
Change-Id: If341d501bcd1147ab92819d6f471120758c1b947
 2020-04-28 09:01:31 +00:00
Yanting Yang
0ff67f4a59 Merge "Remove sub-text from slice builder" into rvc-dev am: 38bd23cb7f am: 70abedee86 am: 38a90b2090 
Change-Id: I405558fdd3c1827a278b07a1d6dddb61a8eb6019
 2020-04-28 09:00:55 +00:00
Automerger Merge Worker
effc307614 Merge "Merge "Remove sub-text from slice builder" into rvc-dev am: 38bd23cb7f am: f3354ea59c" into rvc-d1-dev-plus-aosp 2020-04-28 08:45:05 +00:00
Yanting Yang
bb6ca0fbc7 Merge "Remove sub-text from slice builder" into rvc-dev am: 38bd23cb7f am: 70abedee86 
Change-Id: I52348b944a861b144538d3455479a177494270f4
 2020-04-28 08:45:00 +00:00
Yanting Yang
38a90b2090 Merge "Remove sub-text from slice builder" into rvc-dev am: 38bd23cb7f am: 70abedee86 
Change-Id: I4004c82c62a78f8c329cdc8c74a8a17a4733c0bd
 2020-04-28 08:45:00 +00:00
Yanting Yang
e40201f4a2 Merge "Remove sub-text from slice builder" into rvc-dev am: 38bd23cb7f am: f3354ea59c 
Change-Id: Iec234ec0192fe87894c30d3471f7d17ff62cee1c
 2020-04-28 08:45:00 +00:00
Yanting Yang
70abedee86 Merge "Remove sub-text from slice builder" into rvc-dev am: 38bd23cb7f 
Change-Id: I1f6023e3652dfc45694abf3cb537c8591f4205a0
 2020-04-28 08:26:06 +00:00
Yanting Yang
f3354ea59c Merge "Remove sub-text from slice builder" into rvc-dev am: 38bd23cb7f 
Change-Id: I9703a63418d231dedef72a332286fac6af86b648
 2020-04-28 08:25:33 +00:00
Yanting Yang
38bd23cb7f Merge "Remove sub-text from slice builder" into rvc-dev 2020-04-28 07:48:45 +00:00
Bonian Chen
225db346b6 [Settings] Avoid mobile data usage init in WiFi usage 
Avoid from initial in WiFi usage and update into mobile data usage after
refresh.

Bug: 151751844
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest
Change-Id: Ic6176952953ded9d47f1fc52c3f311e6568a5b90
 2020-04-28 15:47:30 +08:00