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

61702 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
TreeHugger Robot
2a2d8f2b89 Merge "Dynamic grouping failed the first time" into rvc-dev am: 2e16d78872 am: 03f59415ce am: c1e566a22e 
Change-Id: Ie1e89387f03cd73e662cf348da145f7a96819fb4
 2020-04-27 09:07:05 +00:00
Bonian Chen
8da5435581 Merge "[Settings] Support re-init DataUsageSummaryPreferenceController" into rvc-dev am: 1b5f347893 am: 5450d488b4 am: e407de2ad6 
Change-Id: I10814347701d111680339c1630b9e38142b7e9b4
 2020-04-27 09:06:50 +00:00
Bonian Chen
e17e302c9e [Settings] Sync summary of call preference with dialer 
Replacing the display of summary part within Settings' calls preference
by VoIP account when configured calling account settings within Dialer.

The click behavior for calls preference remain unchanged, due to this is
the configuration for subscription (instead of for all kinds of
accounts).

Bug: 136277187
Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DefaultSubscriptionControllerTest
Change-Id: Iaa5fa1f3efe7ba2463caa0b450077f885d42b1c8
 2020-04-27 08:53:18 +00:00
TreeHugger Robot
c1e566a22e Merge "Dynamic grouping failed the first time" into rvc-dev am: 2e16d78872 am: 03f59415ce 
Change-Id: I3147846138f6c79aefc4981ef98996b5a7caa212
 2020-04-27 08:51:30 +00:00
Bonian Chen
e407de2ad6 Merge "[Settings] Support re-init DataUsageSummaryPreferenceController" into rvc-dev am: 1b5f347893 am: 5450d488b4 
Change-Id: Ia6d84b34f25b3b74a379d262468b3db43f86974a
 2020-04-27 08:51:24 +00:00
TreeHugger Robot
03f59415ce Merge "Dynamic grouping failed the first time" into rvc-dev am: 2e16d78872 
Change-Id: I193214a4dd54c751ea6bee005a4b6b847cf171d7
 2020-04-27 08:38:38 +00:00
Bonian Chen
5450d488b4 Merge "[Settings] Support re-init DataUsageSummaryPreferenceController" into rvc-dev am: 1b5f347893 
Change-Id: Iece45eb3a95b4c45bf42d346f814c693071d60f4
 2020-04-27 08:38:30 +00:00
TreeHugger Robot
2e16d78872 Merge "Dynamic grouping failed the first time" into rvc-dev 2020-04-27 08:35:48 +00:00
Bonian Chen
1b5f347893 Merge "[Settings] Support re-init DataUsageSummaryPreferenceController" into rvc-dev 2020-04-27 08:26:46 +00:00
PETER LIANG
d00d1ff06e Merge "Add the enabled status into the condition for the service which is VolumeShortcutToggle type." into rvc-dev am: c0fc0e4542 am: 6597cf6cb2 am: 3aa539884e 
Change-Id: I843bf2eea21153b2ff62b4e42cda982141c8a2ce
 2020-04-27 08:08:36 +00:00
PETER LIANG
3aa539884e Merge "Add the enabled status into the condition for the service which is VolumeShortcutToggle type." into rvc-dev am: c0fc0e4542 am: 6597cf6cb2 
Change-Id: I734588ccdd71aca775d98fefec63a6782bcc4e3f
 2020-04-27 07:56:42 +00:00
PETER LIANG
6597cf6cb2 Merge "Add the enabled status into the condition for the service which is VolumeShortcutToggle type." into rvc-dev am: c0fc0e4542 
Change-Id: Ie6d62f2b2731c756eae1d90368c3cf19d410edd7
 2020-04-27 07:33:00 +00:00
PETER LIANG
c0fc0e4542 Merge "Add the enabled status into the condition for the service which is VolumeShortcutToggle type." into rvc-dev 2020-04-27 07:20:16 +00:00
Bill Yi
003d2ff544 [automerger skipped] Import translations. DO NOT MERGE am: 114edb926b -s ours am: 623827cd5a -s ours 
am skip reason: subject contains skip directive

Change-Id: Ie25f6166bb94fa60c5ee05be1158a913bc825735
 2020-04-27 07:00:01 +00:00
Bill Yi
623827cd5a [automerger skipped] Import translations. DO NOT MERGE am: 114edb926b -s ours 
am skip reason: subject contains skip directive

Change-Id: I81bfa960ca27819b2facbb78a1d19fc8ff6e4169
 2020-04-27 06:47:07 +00:00
Arc Wang
b33a59b860 [Wi-Fi] Add object comments for WifiTrackerLib migration 
Migrating from Wi-Fi SettingsLib to to WifiTrackerLib, there are
both some Settings files of both version. Developers should
develop on new version files.

Bug: 152571756
Test: compile
Change-Id: I4446e2e333663bf69daa1ceff102775889021851
 2020-04-27 14:28:13 +08:00
Bill Yi
114edb926b Import translations. DO NOT MERGE 
Change-Id: If34c66548982270e15e0b607dd3fa7c810ad5f15
Auto-generated-cl: translation import
 2020-04-26 22:07:52 -07:00
hughchen
d02c31e693 Hide the "play media to" option 
This CL will hide the "play media to" option is there are no active
media session and media state is not playing.

Bug: 154457882
Test: manually test
Change-Id: If272a336f06b51e7a2e1605c8dc092b2ca134c25
 2020-04-27 11:42:06 +08:00
Peter_Liang
9e50eb1598 Add the enabled status into the condition for the service which is VolumeShortcutToggle type. 
Root cause: Shouldn't show the tutorial related to accessibility button when the service which has the accessibility button flag and is VolumeShortcutToggle type is not turned on.

Next: Add the status of the corresponding service.

Bug: 148989018
Test: manual test
Change-Id: Icc1dc071387e34401ecf67ed9fbc7bd4f9f9d612
 2020-04-27 02:42:19 +00:00
Amit Mahajan
6c78c86bf2 Merge "Look up CBS package name through PackageManager." into rvc-dev am: 3becd37d47 am: 4aa834efcd am: 89ffb97196 
Change-Id: I6857ddde1f6ab8b6936133dda0737ed16fcc6ebd
 2020-04-27 00:28:16 +00:00
Amit Mahajan
89ffb97196 Merge "Look up CBS package name through PackageManager." into rvc-dev am: 3becd37d47 am: 4aa834efcd 
Change-Id: Iacbc4bd3e4b6a5353eb98a0b87a0da0769561003
 2020-04-27 00:10:34 +00:00
Amit Mahajan
4aa834efcd Merge "Look up CBS package name through PackageManager." into rvc-dev am: 3becd37d47 
Change-Id: Ib7987a370ba181a36b139fbb66b57a9668dfffe6
 2020-04-26 23:52:42 +00:00
Amit Mahajan
3becd37d47 Merge "Look up CBS package name through PackageManager." into rvc-dev 2020-04-26 23:41:30 +00:00
Bonian Chen
ad2c5922d7 Merge "[Settings] Fix DataUsageUtilsTest" into rvc-dev am: b9217e8e17 am: 7976cfc02d am: f026ac5c41 
Change-Id: I2235663d84425573cf3d50be2555fc21cf0c31db
 2020-04-25 05:34:13 +00:00
Bonian Chen
f026ac5c41 Merge "[Settings] Fix DataUsageUtilsTest" into rvc-dev am: b9217e8e17 am: 7976cfc02d 
Change-Id: I8efd4f26c856894af826ccbc42258d3bcd848b89
 2020-04-25 05:21:08 +00:00
Bonian Chen
7976cfc02d Merge "[Settings] Fix DataUsageUtilsTest" into rvc-dev am: b9217e8e17 
Change-Id: Ifc346d43a3a7209304048da212f35326f543308f
 2020-04-25 05:06:36 +00:00
Bonian Chen
b9217e8e17 Merge "[Settings] Fix DataUsageUtilsTest" into rvc-dev 2020-04-25 04:54:04 +00:00
Winson Chung
d6c7d72f57 Merge "Ensure CryptKeeper runs with its own task affinity" into rvc-dev am: fbfefe5b60 am: 8d4eb8f7b1 am: 7b2a48fc58 
Change-Id: Ifb3a2d14183ce06d45056d93d6bd40dace6e0dfc
 2020-04-24 23:49:27 +00:00
Winson Chung
7b2a48fc58 Merge "Ensure CryptKeeper runs with its own task affinity" into rvc-dev am: fbfefe5b60 am: 8d4eb8f7b1 
Change-Id: I8c50da5decc4ccdca3eb260cba9b16d48a83c452
 2020-04-24 23:33:57 +00:00