TreeHugger Robot
22446ccf4a
Merge "Updates for msg apps that don't use shortcuts" into rvc-dev am: 6f482cef09 am: 4738734887 am: d7478b0db4
...
Change-Id: I5a79813584186bc54de9d5a8f64854a20e7ca6f5
2020-04-28 14:16:18 +00:00
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
Bonian Chen
f382311cfd
Merge "[Settings] Avoid mobile data usage init in WiFi usage" into rvc-dev am: 38b0d3091d am: d0783f22c0 am: 06483a6af1 am: c2a0b2143d am: 1613dbf95c
...
Change-Id: I01d5a51bf0867a9d57a0b8a43862eb9e1c9ef4f1
2020-04-28 13:57:40 +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
281280afa4
Merge "[Settings] Avoid mobile data usage init in WiFi usage" into rvc-dev am: 38b0d3091d am: 414949593c am: 2dbb480320 am: 44107f42d3
...
Change-Id: I029f521195aa2f09d2dd92652557cfc203e77327
2020-04-28 13:56:22 +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
7ec01ecd10
Merge "[Settings] Avoid mobile data usage init in WiFi usage" into rvc-dev am: 38b0d3091d am: d0783f22c0 am: 907949b2eb am: f5612b39da
...
Change-Id: I7a0ea19cbc5abc8f9c27b531f829cb7f5a148e51
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
TreeHugger Robot
960e27efec
Merge "Add icon to current screen saver preference" into rvc-dev am: beb92c325a am: 9921ee8713 am: ab6dd73faf am: 6aa00a1f54 am: 2cf8fe9ede
...
Change-Id: Id9bec72567cb96fb2d0f076eaa8de18d49a0b9c7
2020-04-28 13:23:21 +00:00
TreeHugger Robot
a63c46f736
Merge "Add icon to current screen saver preference" into rvc-dev am: beb92c325a am: 1e27d08127 am: 9c550e6fae am: a42b76d93a
...
Change-Id: I320cdbd0991c049e1bf00c6d4f191f1a92a8c640
2020-04-28 13:22:37 +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
faebaf1637
Merge "Add icon to current screen saver preference" into rvc-dev am: beb92c325a am: 9921ee8713 am: 41913ceb3d am: a1f8fe8937
...
Change-Id: I28a6dadeb52c2616a4f8f1721bba86e7bf8db0a6
2020-04-28 13:21:07 +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
3f3bd30fbc
Merge "Remove sub-text from slice builder" into rvc-dev am: 38bd23cb7f am: 70abedee86 am: bb6ca0fbc7 am: 3a8c8354d5 am: 0569b533c9
...
Change-Id: I55253cdada075152b93737ce2be3655d18c4ed25
2020-04-28 09:13:55 +00:00
Automerger Merge Worker
3b70959a5e
Merge "Merge "Remove sub-text from slice builder" into rvc-dev am: 38bd23cb7f am: f3354ea59c" into rvc-d1-dev-plus-aosp am: effc307614 am: fc7f9e8dd5
...
Change-Id: I3646a917c04fbbb2ed590e6264b9029fbe15f83b
2020-04-28 09:13:23 +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
Yanting Yang
69f5514c74
Merge "Remove sub-text from slice builder" into rvc-dev am: 38bd23cb7f am: 70abedee86 am: 38a90b2090 am: 0ff67f4a59
...
Change-Id: If8f5b7acdb2f4948cee7bc8e07845565c63684f2
2020-04-28 09:12:38 +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
