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

65603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
TreeHugger Robot
4dc3280bd8 Merge "Hide the "play media to" option" into rvc-dev am: 2152d0ce4f 
Change-Id: I653f6f990d6bde8b6cc1187486cecb73560d34ec
 2020-04-27 10:07:55 +00:00
TreeHugger Robot
1580c35296 Merge "Hide the "play media to" option" into rvc-dev am: 2152d0ce4f 
Change-Id: I50adccf9f3fa816cefbec2490c50657be577cf29
 2020-04-27 10:07:45 +00:00
TreeHugger Robot
ad92213c6f Merge "[Wi-Fi] Add object comments for WifiTrackerLib migration" into rvc-dev am: 71b353352c am: 854130ec24 am: 5354a3ec51 
Change-Id: Id4d00c9f53fccd4260d0a8ca42b44af70f60d9c0
 2020-04-27 10:02:01 +00:00
Bonian Chen
bfeefb3309 Merge "[Settings] Sync summary of call preference with dialer" into rvc-dev am: 51433a5ea8 am: 408e49b369 am: b03a392406 
Change-Id: Ibccc037b78ee270355ba198d1866180bfae80862
 2020-04-27 10:01:53 +00:00
TreeHugger Robot
88e3e828e2 Merge "[Wi-Fi] Add object comments for WifiTrackerLib migration" into rvc-dev am: 71b353352c am: c343242cd6 am: 2561796c9d 
Change-Id: I285abf5230987dcf5e366a11a30dadcd5d3727dd
 2020-04-27 09:57:17 +00:00
TreeHugger Robot
2a9eedda51 Merge "[Wi-Fi] Add object comments for WifiTrackerLib migration" into rvc-dev am: 71b353352c am: 854130ec24 am: a7084cb125 
Change-Id: I038a2a078b97ddee615299932fde006bcdfd487c
 2020-04-27 09:57:08 +00:00
Bonian Chen
19a2ab6b1a Merge "[Settings] Sync summary of call preference with dialer" into rvc-dev am: 51433a5ea8 am: 08ea07fb44 am: d2c13b4f36 
Change-Id: If62d5e7b16e8033ffe21d28692bef671bf183799
 2020-04-27 09:56:59 +00:00
Bonian Chen
6ca45c623f Merge "[Settings] Sync summary of call preference with dialer" into rvc-dev am: 51433a5ea8 am: 408e49b369 am: 8034f50076 
Change-Id: I33262f4b91420ea280a35c6aad90a6ac1b280bd9
 2020-04-27 09:56:47 +00:00
TreeHugger Robot
2152d0ce4f Merge "Hide the "play media to" option" into rvc-dev 2020-04-27 09:55:56 +00:00
TreeHugger Robot
5354a3ec51 Merge "[Wi-Fi] Add object comments for WifiTrackerLib migration" into rvc-dev am: 71b353352c am: 854130ec24 
Change-Id: I6d1ed797a90703a4da083b78e734005a12d0c6f5
 2020-04-27 09:47:10 +00:00
TreeHugger Robot
2561796c9d Merge "[Wi-Fi] Add object comments for WifiTrackerLib migration" into rvc-dev am: 71b353352c am: c343242cd6 
Change-Id: Iadadce2dbe2f4614e25a8cccfb32a61728dd9838
 2020-04-27 09:47:01 +00:00
TreeHugger Robot
a7084cb125 Merge "[Wi-Fi] Add object comments for WifiTrackerLib migration" into rvc-dev am: 71b353352c am: 854130ec24 
Change-Id: If9b4c00324c133a40dda7fa224e3907e69385f0d
 2020-04-27 09:46:55 +00:00
Bonian Chen
b03a392406 Merge "[Settings] Sync summary of call preference with dialer" into rvc-dev am: 51433a5ea8 am: 408e49b369 
Change-Id: I4a2039bdeb9e2ecf10b0be33a3d21dc5c22a8ec0
 2020-04-27 09:46:49 +00:00
Bonian Chen
d2c13b4f36 Merge "[Settings] Sync summary of call preference with dialer" into rvc-dev am: 51433a5ea8 am: 08ea07fb44 
Change-Id: I45eec6f92ba4744ac88010958844e8739d0530ec
 2020-04-27 09:46:44 +00:00
Bonian Chen
8034f50076 Merge "[Settings] Sync summary of call preference with dialer" into rvc-dev am: 51433a5ea8 am: 408e49b369 
Change-Id: I6090250799a1985c2d2f8d53c304c03ed3b6f14a
 2020-04-27 09:46:39 +00:00
TreeHugger Robot
c343242cd6 Merge "[Wi-Fi] Add object comments for WifiTrackerLib migration" into rvc-dev am: 71b353352c 
Change-Id: I1ed7e9356ed5fd2a92116ace80770723aa200f96
 2020-04-27 09:31:54 +00:00
TreeHugger Robot
854130ec24 Merge "[Wi-Fi] Add object comments for WifiTrackerLib migration" into rvc-dev am: 71b353352c 
Change-Id: Ie798a4182e284c9b2ac9ec5cfe42669b32a46e11
 2020-04-27 09:31:40 +00:00
Bonian Chen
08ea07fb44 Merge "[Settings] Sync summary of call preference with dialer" into rvc-dev am: 51433a5ea8 
Change-Id: I1542af86709326dc6db1bef691523df0e435d01a
 2020-04-27 09:31:31 +00:00
Bonian Chen
408e49b369 Merge "[Settings] Sync summary of call preference with dialer" into rvc-dev am: 51433a5ea8 
Change-Id: Ic99a56c4a37733ee40334f33d71c1a30f3713772
 2020-04-27 09:31:17 +00:00
Edgar Wang
9f196efcad Fix when search "storage", there are multiple results 
root cause: if device doesn't have external storage,
StorageSettings will launch PrivateVolumeSettings and finish itself.
But we still index the preferences in StorageSettings.

Solution: Check if device doesn't support external storage,
add all of StorageSettings preference into nonIndexableKey list.

Bug: 152366015
Test: robotest & manual

Change-Id: Ib559db3455d46a343ad7eb73e54eb72d0e833308
 2020-04-27 17:23:46 +08:00
TreeHugger Robot
0abea4fed4 Merge "Dynamic grouping failed the first time" into rvc-dev am: 2e16d78872 am: 03f59415ce am: c1e566a22e am: 2a2d8f2b89 
Change-Id: Ia9f2c3b3cf604e7bd45913fea6ac6d4c88198662
 2020-04-27 09:23:31 +00:00
Bonian Chen
21d9086e22 Merge "[Settings] Support re-init DataUsageSummaryPreferenceController" into rvc-dev am: 1b5f347893 am: 5450d488b4 am: e407de2ad6 am: 8da5435581 
Change-Id: I24a48b01ace2787759da5f8bb1c3c9dbbe74da05
 2020-04-27 09:23:23 +00:00
TreeHugger Robot
71b353352c Merge "[Wi-Fi] Add object comments for WifiTrackerLib migration" into rvc-dev 2020-04-27 09:15:00 +00:00
Bonian Chen
51433a5ea8 Merge "[Settings] Sync summary of call preference with dialer" into rvc-dev 2020-04-27 09:14:22 +00:00