Commit Graph

65411 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Bonian Chen
5dbe1ba6fd Merge "[Settings] Align data usage calculation" into rvc-dev am: 0e385a58de am: a281c7bf49 am: 9309d54815 am: 0b9a678924
Change-Id: Ib61657bebf5c740ba2ff0b704775599b36930985
2020-04-28 07:04:14 +00:00
Jason Hsu
4965a8d389 Merge "Change the name of accessibility service fragment type to more descriptive names" into rvc-dev am: e0adf5bfd6 am: cb4587f098 am: b38a99ce54 am: 08f4557747
Change-Id: Iaad7ac80f2501cf9ce646dc1e68045be61c80629
2020-04-28 07:04:07 +00:00
Bonian Chen
0b9a678924 Merge "[Settings] Align data usage calculation" into rvc-dev am: 0e385a58de am: a281c7bf49 am: 9309d54815
Change-Id: I1982c9fbd336bea3d1cb1c87b8817f27282ab5fa
2020-04-28 06:37:59 +00:00
Jason Hsu
08f4557747 Merge "Change the name of accessibility service fragment type to more descriptive names" into rvc-dev am: e0adf5bfd6 am: cb4587f098 am: b38a99ce54
Change-Id: Ic21e2bcbbefb148a025332593701548843dd3761
2020-04-28 06:37:52 +00:00
Bonian Chen
b1c939c902 Merge "[Settings] Align data usage calculation" into rvc-dev am: 0e385a58de am: 3134966696 am: e64c572d2d
Change-Id: If211021dd4de49a8f8c48375b9462f21883213dd
2020-04-28 06:37:15 +00:00
Jason Hsu
d0f713029f Merge "Change the name of accessibility service fragment type to more descriptive names" into rvc-dev am: e0adf5bfd6 am: 38e6e6451f am: 5ccb69bcd0
Change-Id: I821531e8f2e21cf6d6de16125c159f85cd714f21
2020-04-28 06:37:10 +00:00
Bonian Chen
c6234f4efc Merge "[Settings] Align data usage calculation" into rvc-dev am: 0e385a58de am: a281c7bf49 am: 068f6e3a39
Change-Id: Iba6d6d26a8b8ce4893f08f1f4909c5987c077c7e
2020-04-28 06:37:04 +00:00
Jason Hsu
5c884a95a3 Merge "Change the name of accessibility service fragment type to more descriptive names" into rvc-dev am: e0adf5bfd6 am: cb4587f098 am: 98c5ec6e58
Change-Id: I14a5a1d2b90bbb8bd4a2efc3f01055fb82b4f817
2020-04-28 06:36:59 +00:00
Bonian Chen
e64c572d2d Merge "[Settings] Align data usage calculation" into rvc-dev am: 0e385a58de am: 3134966696
Change-Id: Ib29d9ff5ba47e2b8233209366f4b41edff288ba0
2020-04-28 06:25:19 +00:00
Bonian Chen
9309d54815 Merge "[Settings] Align data usage calculation" into rvc-dev am: 0e385a58de am: a281c7bf49
Change-Id: I935c29961cf30f03c630dda52e4c7ceb89bd714d
2020-04-28 06:25:16 +00:00
Jason Hsu
5ccb69bcd0 Merge "Change the name of accessibility service fragment type to more descriptive names" into rvc-dev am: e0adf5bfd6 am: 38e6e6451f
Change-Id: Iea0d44ccb8778c2a98085926b42a12945035301b
2020-04-28 06:25:12 +00:00
Jason Hsu
b38a99ce54 Merge "Change the name of accessibility service fragment type to more descriptive names" into rvc-dev am: e0adf5bfd6 am: cb4587f098
Change-Id: I18575f1d65d0886a6d87d64454d27d85ab6832f8
2020-04-28 06:25:11 +00:00
Bonian Chen
068f6e3a39 Merge "[Settings] Align data usage calculation" into rvc-dev am: 0e385a58de am: a281c7bf49
Change-Id: Iad1f8005bed021f00a18cd7240b0662f946d922a
2020-04-28 06:24:47 +00:00