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

65939 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Malcolm Chen
97a8568e49 Fix Robo test failure in NrDisabledInDsdsFooterPreferenceControllerTest. 
Bug: 154566065
Test: robotest
Change-Id: I77dfa6eb61ee7b2cf2eb4fd8d8a392a43f7035b3
Merged-In: I77dfa6eb61ee7b2cf2eb4fd8d8a392a43f7035b3
 2020-04-27 18:19:44 -07:00
Malcolm Chen
99e64da899 Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter 
Bug: 152786064
Test: build and manual
Change-Id: I6194592d9a7bf4d4b7993fc344d7392bf5c296aa
Merged-In: I6194592d9a7bf4d4b7993fc344d7392bf5c296aa
 2020-04-27 18:19:13 -07:00
Malcolm Chen
5e68080b1f Define a helper link for 5G limitation in DSDS footer. 
Bug: 152786064
Test: manual
Change-Id: I5a02f847531988217cc6ab47e3b35ed319c1027c
Merged-In: I5a02f847531988217cc6ab47e3b35ed319c1027c
 2020-04-27 18:14:46 -07:00
TreeHugger Robot
01f33c6c37 Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e am: 7aa3131201 am: eab97e5548 am: e194ca5528 
Change-Id: I50ddd520b1b1aa786bf1f5b6751a48b222818f6a
 2020-04-27 21:33:12 +00:00
TreeHugger Robot
e97ebdac4f Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e am: f6ab80044d am: 91585bd8a5 
Change-Id: I24a088e9c69dba5cadce7eea9fdd6e2e100b34f1
 2020-04-27 21:11:48 +00:00
TreeHugger Robot
479366ccd5 Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e am: 7aa3131201 am: de07ac05d8 
Change-Id: Iacaf61c2105d20a6c09707833234920c525e0c22
 2020-04-27 21:11:30 +00:00
TreeHugger Robot
e194ca5528 Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e am: 7aa3131201 am: eab97e5548 
Change-Id: I39b9eee2e6edb9b24b5216ff0c77258ed289de8c
 2020-04-27 21:10:27 +00:00
TreeHugger Robot
91585bd8a5 Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e am: f6ab80044d 
Change-Id: I6132ee88c9944f706a77a74305eb35e8a2e99a98
 2020-04-27 20:52:17 +00:00
TreeHugger Robot
eab97e5548 Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e am: 7aa3131201 
Change-Id: Icff3bab54b6b26f68ee83c451abd3b9e24105a23
 2020-04-27 20:52:03 +00:00