PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,692 Commits 1 Branch 0 Tags
6aa00a1f548dff0cf87cedb81567039be0215fd8
Commit Graph

61692 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
38bd23cb7f Merge "Remove sub-text from slice builder" into rvc-dev 2020-04-28 07:48:45 +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
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
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
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
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
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
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
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
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
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
TreeHugger Robot
7aa3131201 Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e 
Change-Id: I91b09f88338864003ce982eb37f8cd42e1ee6971
 2020-04-27 20:37:53 +00:00
TreeHugger Robot
5c3f71859e Merge "Allow > 1 line title for DND duration preference" into rvc-dev 2020-04-27 20:21:50 +00:00
Beverly
f939976367 Allow > 1 line title for DND duration preference 
Test: manual
Fixes: 154694705
Change-Id: I9eaffb21e5d5902782beb5e9f845394015ba23be
 2020-04-27 14:23:54 -04:00
TreeHugger Robot
36b7fd7322 Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462 am: 1e84f0252b am: a84e0cb241 
Change-Id: I4cc6c791999c42fa46dcb30e722883b06c2da9b8
 2020-04-27 18:22:34 +00:00
TreeHugger Robot
a0823cbb6c Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182 am: e1617681df am: e0b855898a 
Change-Id: I1d271b9fb31b38f874d6459daa5b9c7b67a8d22b
 2020-04-27 18:22:24 +00:00
TreeHugger Robot
a84e0cb241 Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462 am: 1e84f0252b 
Change-Id: I8eab9035ceacc23c3f8deabadcb0ad88ecb28387
 2020-04-27 18:04:09 +00:00
TreeHugger Robot
e0b855898a Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182 am: e1617681df 
Change-Id: I4cf2d49a51639240483eb162f386a5ca1b7b4710
 2020-04-27 18:03:57 +00:00
TreeHugger Robot
1e84f0252b Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462 
Change-Id: I515b17b9408bdb84b5dc0d0f951f0bf167b27132
 2020-04-27 17:39:06 +00:00
TreeHugger Robot
e1617681df Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182 
Change-Id: I98945495e8b451863faeb5bd18ee01b7f8ca0de2
 2020-04-27 17:38:57 +00:00
TreeHugger Robot
50a5a0c462 Merge "Separate dnd categories in a list" into rvc-dev 2020-04-27 17:38:06 +00:00
TreeHugger Robot
d28fca9182 Merge "Separate call/messages dnd summary string" into rvc-dev 2020-04-27 17:26:16 +00:00
jasonwshsu
43daeb90da Change the name of accessibility service fragment type to more descriptive names 
Bug: 155052371
Test: manual test
Change-Id: I097138c84083528acd4d16a145921227ffe3f736
 2020-04-28 00:55:04 +08:00
Beverly
ae2d681faf Separate dnd categories in a list 
For translations purposes, separate strings that are the first element
in a list of sound categories from the stand alone category titles.

Test: manual
Bug: 154694384
Change-Id: I1ba5a487f179103ccfa881fdc57b10b6ec2560ad
 2020-04-27 12:08:11 -04:00
TreeHugger Robot
2ac1f2cfa7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7f15836d47 -s ours am: 5d8f6ee782 -s ours am: 0b338dd383 -s ours 
am skip reason: subject contains skip directive

Change-Id: I9d7eb901575813b7609eb1282944034df4c09bbe
 2020-04-27 15:38:48 +00:00
TreeHugger Robot
0b338dd383 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7f15836d47 -s ours am: 5d8f6ee782 -s ours 
am skip reason: subject contains skip directive

Change-Id: I0996cc0acf0d7014d72e72601145a45ce2cdaeaa
 2020-04-27 15:31:07 +00:00
Menghan Li
7ad40cc9e4 Merge "Fix formats and internationalization of the string "0.6 seconds" in sk language" into rvc-dev am: 24f71c6e91 am: 8afeaa1fa7 am: dc0196627d 
Change-Id: I17af5b51d03b6d5841bfe83140c393175f59e3d7
 2020-04-27 15:20:44 +00:00
TreeHugger Robot
5d8f6ee782 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7f15836d47 -s ours 
am skip reason: subject contains skip directive

Change-Id: I7e0d481d302186bad525a009193949684221fb69
 2020-04-27 15:13:38 +00:00
Menghan Li
dc0196627d Merge "Fix formats and internationalization of the string "0.6 seconds" in sk language" into rvc-dev am: 24f71c6e91 am: 8afeaa1fa7 
Change-Id: I4e1cf7113623b30c671495f8fd5412185368df05
 2020-04-27 15:08:11 +00:00
TreeHugger Robot
7f15836d47 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-27 14:57:02 +00:00
Menghan Li
8afeaa1fa7 Merge "Fix formats and internationalization of the string "0.6 seconds" in sk language" into rvc-dev am: 24f71c6e91 
Change-Id: I1f61856a89598b4d72bdf9873e0e7ac63e50f53f
 2020-04-27 14:40:56 +00:00
kholoud mohamed
c5b78e072f Fix broken tests in RedactionInterstitialTest 
correctly set the user as managed profile after the
implementation for ShadowUserManager#isManagedProfile changed.

Fixes: 154567856
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.notification.RedactionInterstitialTest
Change-Id: I14472913391c3986c5f27391023e396b7b64aad3
 2020-04-27 15:25:42 +01:00
Menghan Li
24f71c6e91 Merge "Fix formats and internationalization of the string "0.6 seconds" in sk language" into rvc-dev 2020-04-27 14:22:22 +00:00
Beverly
a8ea534674 Separate call/messages dnd summary string 
The translation for call/messages may be feminine or masculine depending
on the language which changes the way this string should be translated.
Therefore, separate the string to prevent bad translations.

Test: manual
Fixes: 154687360
Change-Id: I3cbef72d41626a244ce82a0d0574427fb9c4462e
 2020-04-27 10:02:28 -04:00
Bonian Chen
260ad5c523 [Settings] Align data usage calculation 
Align the calculation of data usage between
DataUsageSummaryPreferenceController and DataUsagePrefereneController.

Bug: 143996139
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest
Change-Id: I73de79b5cc298bf949827eda0a8bb0274089c016
 2020-04-27 19:39:01 +08:00
Bill Yi
c162aa3acb Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I5fd1212a2ca1683651184562d1d51811883c56cd
 2020-04-27 04:37:20 -07:00
TreeHugger Robot
2d9cc070fc Merge "Hide the "play media to" option" into rvc-dev am: 2152d0ce4f am: 1580c35296 am: 0a1de20630 
Change-Id: Ie60f349d5baab515dc55d8453553db55abb13baf
 2020-04-27 10:32:52 +00:00