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

65577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
86e170790a Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182 am: 001dcc9a5b am: 6acc3d6c95 
Change-Id: I2bef6148918693ff54d505551940df6e5945287b
 2020-04-27 18:21:40 +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
f150f8b606 Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462 am: 1e84f0252b 
Change-Id: I235dc0a55178e646502f987f62ad95deed6d00ea
 2020-04-27 18:03:45 +00:00
TreeHugger Robot
0c76c7cba0 Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182 am: e1617681df 
Change-Id: I538434bb22af23b06da7b927daa2b8408bd1b6f1
 2020-04-27 18:03:39 +00:00
TreeHugger Robot
f9ddba1a51 Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462 am: d120058c87 
Change-Id: Ic35bececf0122e56e6716a4e05094fc83e2c9cb4
 2020-04-27 18:03:15 +00:00
TreeHugger Robot
6acc3d6c95 Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182 am: 001dcc9a5b 
Change-Id: I1a04aef01625aae848e26dd94e5fe23f2fd17b98
 2020-04-27 18:02:57 +00:00
TreeHugger Robot
d120058c87 Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462 
Change-Id: Ia6dcc5c5f142838bceac1b170669be939f7065e2
 2020-04-27 17:39:13 +00:00
TreeHugger Robot
001dcc9a5b Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182 
Change-Id: I2479c711420447d02e7742a00e4b1002c18dcff5
 2020-04-27 17:39:07 +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
2707263f0f [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7f15836d47 -s ours am: 5d8f6ee782 -s ours am: 0b338dd383 -s ours am: 2ac1f2cfa7 -s ours 
am skip reason: subject contains skip directive

Change-Id: I32d4f0e5ef4d840455face5d4c0340aa3b43baaa
 2020-04-27 15:39:20 +00:00
TreeHugger Robot
f81f7193ce [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7f15836d47 -s ours am: 5d8f6ee782 -s ours am: 093ce3ce46 -s ours 
am skip reason: subject contains skip directive

Change-Id: I053695fcb03daf6d9ec3e7093baf68affd85cd5e
 2020-04-27 15:38:58 +00: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
Menghan Li
e59157413e Merge "Fix formats and internationalization of the string "0.6 seconds" in sk language" into rvc-dev am: 24f71c6e91 am: 8afeaa1fa7 am: dc0196627d am: 7ad40cc9e4 
Change-Id: I21c8efdebd1e98851bd8f1756ba5f159484eeba0
 2020-04-27 15:38:47 +00:00
TreeHugger Robot
961510b374 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7f15836d47 -s ours am: 9ecf1649fb -s ours am: c96e38337e -s ours 
am skip reason: subject contains skip directive

Change-Id: I20e874f9c1bf6188d47b6d5eacda755db8c72c6b
 2020-04-27 15:38:24 +00:00
TreeHugger Robot
093ce3ce46 [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: I50541c7179208c537847cdb9cd887538d6ad1fdb
 2020-04-27 15:31:53 +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
TreeHugger Robot
c96e38337e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7f15836d47 -s ours am: 9ecf1649fb -s ours 
am skip reason: subject contains skip directive

Change-Id: I8f0a6037ffcc40b3817abf52cf5f3802219dfb9a
 2020-04-27 15:30:27 +00:00
Menghan Li
2166b2f721 Merge "Fix formats and internationalization of the string "0.6 seconds" in sk language" into rvc-dev am: 24f71c6e91 am: b49fb33540 am: e8c5238fd4 
Change-Id: I91c53e060e8ab89f42991ed60c3b91f5d6778753
 2020-04-27 15:22:55 +00:00
Menghan Li
61d7b654a2 Merge "Fix formats and internationalization of the string "0.6 seconds" in sk language" into rvc-dev am: 24f71c6e91 am: 8afeaa1fa7 am: abc21bdb41 
Change-Id: I2115550bc1a3b03dd5d3b8f0f3dafa964e727e3b
 2020-04-27 15:21:33 +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
9ecf1649fb [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7f15836d47 -s ours 
am skip reason: subject contains skip directive

Change-Id: I8b03a47456963e4553c8e248900b229c57290269
 2020-04-27 15:13:41 +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
e8c5238fd4 Merge "Fix formats and internationalization of the string "0.6 seconds" in sk language" into rvc-dev am: 24f71c6e91 am: b49fb33540 
Change-Id: I6f67943fa45a1b8c57e83b0b457e25f8af64104b
 2020-04-27 15:08:44 +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
Julia Reynolds
8fe4b28312 Updates for msg apps that don't use shortcuts 
- Notice on app specific page
- No individual conversation bubble controls

Test: manual
Bug: 154814754
Change-Id: I74c291890ba6203e6a3a162fc0c0335ed5eba3d4
 2020-04-27 11:07:40 -04:00
Menghan Li
abc21bdb41 Merge "Fix formats and internationalization of the string "0.6 seconds" in sk language" into rvc-dev am: 24f71c6e91 am: 8afeaa1fa7 
Change-Id: I840a42b41004b3557ba9d25e20958ad1672081c1
 2020-04-27 15:07:40 +00:00
TreeHugger Robot
7f15836d47 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-27 14:57:02 +00:00
Menghan Li
b49fb33540 Merge "Fix formats and internationalization of the string "0.6 seconds" in sk language" into rvc-dev am: 24f71c6e91 
Change-Id: Ib348a11d558771871da94e32e7c3fa5040590669
 2020-04-27 14:41:14 +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
Arc Wang
69653f0585 [Wi-Fi] Show Wi-Fi editor for authentication failures 
When the Wi-Fi network is disabled because of authentication failures,
Wi-Fi picker should show editor before connecting or the network will
always fail to connect.

Bug: 112137755
Test: atest com.android.wifitrackerlib.StandardWifiEntryTest
Change-Id: I0ae42e7974e6bd2548e7f2595c6ae71a73398030
 2020-04-27 19:37:30 +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
4cc9f38aaa Merge "Hide the "play media to" option" into rvc-dev am: 2152d0ce4f am: 1580c35296 am: 0a1de20630 am: 2d9cc070fc 
Change-Id: I1519420186fd0c273c249e0b2edfd648b620754f
 2020-04-27 10:47:24 +00:00
TreeHugger Robot
77d557a522 Merge "Hide the "play media to" option" into rvc-dev am: 2152d0ce4f am: 4dc3280bd8 am: 5c46f94ec1 
Change-Id: Iffa714f3a35cdfa138e809e5f7415d58ac578c08
 2020-04-27 10:33:42 +00:00
TreeHugger Robot
ce613552f9 Merge "Hide the "play media to" option" into rvc-dev am: 2152d0ce4f am: 1580c35296 am: 8dc3937594 
Change-Id: I77424c774cfdcdc210279f3f66fa6d8a09fc7daf
 2020-04-27 10:33:35 +00: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
TreeHugger Robot
0a1de20630 Merge "Hide the "play media to" option" into rvc-dev am: 2152d0ce4f am: 1580c35296 
Change-Id: I6ce388d461a93aad999a8b7b4cb72ba3cc0b2e6b
 2020-04-27 10:20:34 +00:00
TreeHugger Robot
5c46f94ec1 Merge "Hide the "play media to" option" into rvc-dev am: 2152d0ce4f am: 4dc3280bd8 
Change-Id: I7ecbd623db551e7e6be20d7198f23ba9d6c30c1c
 2020-04-27 10:20:33 +00:00
TreeHugger Robot
8dc3937594 Merge "Hide the "play media to" option" into rvc-dev am: 2152d0ce4f am: 1580c35296 
Change-Id: Iac86942ec17d36aa05ae73eeb920173629ae5e5c
 2020-04-27 10:20:04 +00:00
TreeHugger Robot
11f1bc92cf Merge "[Wi-Fi] Add object comments for WifiTrackerLib migration" into rvc-dev am: 71b353352c am: 854130ec24 am: 5354a3ec51 am: ad92213c6f 
Change-Id: Iea97fa61ee12459d9226f437c0162ecc687bd6e5
 2020-04-27 10:15:09 +00:00
Bonian Chen
be4d8bb27d Merge "[Settings] Sync summary of call preference with dialer" into rvc-dev am: 51433a5ea8 am: 408e49b369 am: b03a392406 am: bfeefb3309 
Change-Id: I163f2f07c2ccd267174bf4f8e630341b605fa69d
 2020-04-27 10:15:03 +00:00