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
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
hoffc
4b575ec0d1
Settings: Fix force close when destory sim lock fragment view
...
Sim lock fragment does not override its parent onCreateView method and diretly
return null, which results in NPE when destory after removing Sim card.
Override its parent onCreateView when no sim card inserted.
Bug: 154743278
Test: build pass
Change-Id: I0b10a07c1767cda74096dc44ef7ffa7839a9aae4
2020-04-28 07:21:36 +00:00
Bonian Chen
549e12a372
Merge "[Settings] Align data usage calculation" into rvc-dev am: 0e385a58de am: a281c7bf49 am: 9309d54815 am: 0b9a678924 am: 5dbe1ba6fd
...
Change-Id: Iade4da4e4bf275532c4c6f5e46ca47657c449dd6
2020-04-28 07:21:24 +00:00
Jason Hsu
588dee5282
Merge "Change the name of accessibility service fragment type to more descriptive names" into rvc-dev am: e0adf5bfd6 am: cb4587f098 am: b38a99ce54 am: 08f4557747 am: 4965a8d389
...
Change-Id: I00b26a6628508bde26485b363bd575c22e3884c5
2020-04-28 07:21:05 +00: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
9668bf1df7
Merge "[Settings] Align data usage calculation" into rvc-dev am: 0e385a58de am: 3134966696 am: e64c572d2d am: b1c939c902
...
Change-Id: I9bd2689264e156059208dfe3a30d7e251f0e136d
2020-04-28 06:51:52 +00:00
Jason Hsu
b7f41404cd
Merge "Change the name of accessibility service fragment type to more descriptive names" into rvc-dev am: e0adf5bfd6 am: 38e6e6451f am: 5ccb69bcd0 am: d0f713029f
...
Change-Id: Ia3647fa79fecc7598eef5e80aa64c52f4446592e
2020-04-28 06:51:46 +00:00
Bonian Chen
6ff2dc5d24
Merge "[Settings] Align data usage calculation" into rvc-dev am: 0e385a58de am: a281c7bf49 am: 068f6e3a39 am: c6234f4efc
...
Change-Id: Ic52f15e1272e27560db167551cad4d1803a18cce
2020-04-28 06:51:32 +00:00
Jason Hsu
f6fc1154f3
Merge "Change the name of accessibility service fragment type to more descriptive names" into rvc-dev am: e0adf5bfd6 am: cb4587f098 am: 98c5ec6e58 am: 5c884a95a3
...
Change-Id: I81d5eccf9a3eb45df7958ab17b13ce7fe740e952
2020-04-28 06:51:20 +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
Jason Hsu
98c5ec6e58
Merge "Change the name of accessibility service fragment type to more descriptive names" into rvc-dev am: e0adf5bfd6 am: cb4587f098
...
Change-Id: I127aabddf277c184ac090920e89325755c98a46a
2020-04-28 06:24:37 +00:00
Bonian Chen
3134966696
Merge "[Settings] Align data usage calculation" into rvc-dev am: 0e385a58de
...
Change-Id: I471475149350474ea54d3a4e6f720d84349e60b1
2020-04-28 06:16:47 +00:00
Bonian Chen
a281c7bf49
Merge "[Settings] Align data usage calculation" into rvc-dev am: 0e385a58de
...
Change-Id: I9481a97defc128b964531fb85113798234125a82
2020-04-28 06:16:30 +00:00
Yanting Yang
96127fe621
Remove sub-text from slice builder
...
We would like to remove all sub-text from Settings Search. But slice
view does not support API to configure the sub-text visibility.
Therefore, the only way is to remove the sub-text from slices directly.
Since Settings slices are also invoked by other apps, we can not
directly remove the sub-text.
Finally, we decide to check the caller's uid. If it comes from Settings
Search, we will return the slice without the sub-text.
Bug: 143118037
Test: visual, robotests
Change-Id: Iac72f1683a2c930592634e0599058890d86f669d
2020-04-28 14:15:16 +08:00
Bonian Chen
0e385a58de
Merge "[Settings] Align data usage calculation" into rvc-dev
2020-04-28 06:13:58 +00:00
Jason Hsu
38e6e6451f
Merge "Change the name of accessibility service fragment type to more descriptive names" into rvc-dev am: e0adf5bfd6
...
Change-Id: I15d4d21de6d298505b49211aa3c814a4be4762ca
2020-04-28 06:10:11 +00:00
Jason Hsu
cb4587f098
Merge "Change the name of accessibility service fragment type to more descriptive names" into rvc-dev am: e0adf5bfd6
...
Change-Id: I6545c71dbd209d4a31d376dfe7a50cd076273426
2020-04-28 06:09:52 +00:00
Jason Hsu
e0adf5bfd6
Merge "Change the name of accessibility service fragment type to more descriptive names" into rvc-dev
2020-04-28 05:55:58 +00:00
TreeHugger Robot
ec5aa4f2c6
Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev am: 6fcac1d389 am: 7cf00c8a97 am: 6cd00f8a4d am: 52614d9226 am: 0619cf53e6
...
Change-Id: I762286c2ccd8ce21324cde64f7922cc89959698e
2020-04-28 03:58:09 +00:00
TreeHugger Robot
c35b1a0882
Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev am: 6fcac1d389 am: 4667f60fd6 am: c7081bedd5 am: 4f13a3f6b6
...
Change-Id: Icfa72fa629aacf03560c369f4e4e064d17efdae2
2020-04-28 03:58:02 +00:00
TreeHugger Robot
a9ba9c02a5
Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev am: 6fcac1d389 am: 7cf00c8a97 am: 6471bef55c am: 0009d317fa
...
Change-Id: I99e80f51c027bc0239a008fa6b81df7ffb3d6c9a
2020-04-28 03:57:40 +00:00
TreeHugger Robot
0619cf53e6
Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev am: 6fcac1d389 am: 7cf00c8a97 am: 6cd00f8a4d am: 52614d9226
...
Change-Id: I92499c55d1bef35242e3204ae45289edcf798195
2020-04-28 03:57:38 +00:00
