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
6dcb64a6b6
Merge "[Settings] Align data usage calculation" into rvc-dev am: 0e385a58de am: 3134966696 am: e64c572d2d am: b1c939c902 am: 9668bf1df7
...
Change-Id: I7c7573fa58c75a59aaf7ba04b349f4240f7aa608
2020-04-28 07:12:55 +00:00
Jason Hsu
a943000a3f
Merge "Change the name of accessibility service fragment type to more descriptive names" into rvc-dev am: e0adf5bfd6 am: 38e6e6451f am: 5ccb69bcd0 am: d0f713029f am: b7f41404cd
...
Change-Id: I56465968ea6933047f5453c5869054fdb6343916
2020-04-28 07:12:49 +00:00
Bonian Chen
a1e17cacac
Merge "[Settings] Align data usage calculation" into rvc-dev am: 0e385a58de am: a281c7bf49 am: 068f6e3a39 am: c6234f4efc am: 6ff2dc5d24
...
Change-Id: I92ff8c269b3687b31b77ccfde7427a7d42a6ff92
2020-04-28 07:12:43 +00:00
Jason Hsu
d7d6e50cc8
Merge "Change the name of accessibility service fragment type to more descriptive names" into rvc-dev am: e0adf5bfd6 am: cb4587f098 am: 98c5ec6e58 am: 5c884a95a3 am: f6fc1154f3
...
Change-Id: I8370de34215fc2209d1126278f7b7f9e24615e94
2020-04-28 07:12:37 +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
b1ff541cb4
Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev am: 6fcac1d389 am: 7cf00c8a97 am: 6cd00f8a4d am: 52614d9226 am: 0619cf53e6 am: ec5aa4f2c6
...
Change-Id: I75e984e3419cc5a82b20e12d3dae7c5353487904
2020-04-28 04:26:10 +00:00
TreeHugger Robot
8bf3ab3ff2
Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev am: 6fcac1d389 am: 4667f60fd6 am: c7081bedd5 am: 4f13a3f6b6 am: c35b1a0882
...
Change-Id: If9cfc73b0072e08969cb099102f13d50b776ac18
2020-04-28 04:25:50 +00:00
TreeHugger Robot
ee0094ee2e
Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev am: 6fcac1d389 am: 7cf00c8a97 am: 6471bef55c am: 0009d317fa am: a9ba9c02a5
...
Change-Id: Ica53c51a8fa0c6d7de70c4cefb80170d7cf5e8b7
2020-04-28 04:25:45 +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
TreeHugger Robot
4f13a3f6b6
Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev am: 6fcac1d389 am: 4667f60fd6 am: c7081bedd5
...
Change-Id: I7e8ea3d01c7eeddc8fcb549044bab2f98990e83e
2020-04-28 03:35:51 +00:00
TreeHugger Robot
0009d317fa
Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev am: 6fcac1d389 am: 7cf00c8a97 am: 6471bef55c
...
Change-Id: Icb842b19dba816ca4566e8af900adbbc5527061c
2020-04-28 03:35:31 +00:00
TreeHugger Robot
52614d9226
Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev am: 6fcac1d389 am: 7cf00c8a97 am: 6cd00f8a4d
...
Change-Id: I42fcfc0e87a402afc33a726b0fbc9b161b2895b6
2020-04-28 03:35:29 +00:00
TreeHugger Robot
c7081bedd5
Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev am: 6fcac1d389 am: 4667f60fd6
...
Change-Id: I34952c86be90c4d2dd162cb6cb27b081ac0d3376
2020-04-28 03:20:13 +00:00
TreeHugger Robot
6cd00f8a4d
Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev am: 6fcac1d389 am: 7cf00c8a97
...
Change-Id: I75d03086165bd3ba6a72f02ed2bee4a577903628
2020-04-28 03:19:39 +00:00
TreeHugger Robot
6471bef55c
Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev am: 6fcac1d389 am: 7cf00c8a97
...
Change-Id: I727061ec65629bf410aafdf953893ab0092e7db0
2020-04-28 03:19:03 +00:00
TreeHugger Robot
4667f60fd6
Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev am: 6fcac1d389
...
Change-Id: I62a3fc49e67fadc1ffa8aafee445ecfdf7e7e373
2020-04-28 03:03:31 +00:00
TreeHugger Robot
7cf00c8a97
Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev am: 6fcac1d389
...
Change-Id: Id1c919ccbe9570d1e724e55f9d738782542fc12b
2020-04-28 03:03:08 +00:00
TreeHugger Robot
6fcac1d389
Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev
2020-04-28 02:43:55 +00:00
TreeHugger Robot
82c424f0e2
Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e am: 7aa3131201 am: eab97e5548 am: e194ca5528 am: 01f33c6c37 am: 1536c9bb92
...
Change-Id: I061269e3193760b7c13cc74feb1d34fb9e57d0c5
2020-04-27 21:49:02 +00:00
TreeHugger Robot
77d5524dc0
Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e am: f6ab80044d am: 91585bd8a5 am: e97ebdac4f am: 6d78aa97cc
...
Change-Id: I5bc63055c9caa0af88c8f9ea05aae40b2e0d3c93
2020-04-27 21:48:53 +00:00
