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
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
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
2152d0ce4f
Merge "Hide the "play media to" option" into rvc-dev
2020-04-27 09:55:56 +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
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
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
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
6ff1bb5be5
Merge "Dynamic grouping failed the first time" into rvc-dev am: 2e16d78872
am: a7183d4323
...
Change-Id: Icbfb3b2c03bc5ff6c4060dc7468951ef63a4b9f5
2020-04-27 08:51:32 +00:00
Bonian Chen
b72c15c7e8
Merge "[Settings] Support re-init DataUsageSummaryPreferenceController" into rvc-dev am: 1b5f347893
am: 8e09bdaa6b
...
Change-Id: I36a82de3aaede3119dad1091fe34d281877bf211
2020-04-27 08:51:25 +00:00
TreeHugger Robot
0de5e57557
Merge "Dynamic grouping failed the first time" into rvc-dev am: 2e16d78872
am: 03f59415ce
...
Change-Id: I525165fad42c5a32e57d3a644c95ae691db2e0d8
2020-04-27 08:51:16 +00:00
Bonian Chen
9ca919591d
Merge "[Settings] Support re-init DataUsageSummaryPreferenceController" into rvc-dev am: 1b5f347893
am: 5450d488b4
...
Change-Id: I8a2df3dd2b72c2901640579a739b86477d609bae
2020-04-27 08:51:01 +00:00
TreeHugger Robot
a7183d4323
Merge "Dynamic grouping failed the first time" into rvc-dev am: 2e16d78872
...
Change-Id: I44d7a0b8dc13bf158129925d2f8e039a27702cdc
2020-04-27 08:38:46 +00:00
Bonian Chen
8e09bdaa6b
Merge "[Settings] Support re-init DataUsageSummaryPreferenceController" into rvc-dev am: 1b5f347893
...
Change-Id: I5558030dedf0992859afb4bacede6daf6a66df86
2020-04-27 08:38:39 +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
3b1edebcca
Merge "Add the enabled status into the condition for the service which is VolumeShortcutToggle type." into rvc-dev am: c0fc0e4542
am: 8cb13577f0
...
Change-Id: Ia2c31e610bc576567584f533b3a8c1871de74977
2020-04-27 07:56:44 +00:00
PETER LIANG
cf04f8f50c
Merge "Add the enabled status into the condition for the service which is VolumeShortcutToggle type." into rvc-dev am: c0fc0e4542
am: 6597cf6cb2
...
Change-Id: Id858ac61f4886029ef3217ef206b1448de5f53d5
2020-04-27 07:56:26 +00:00
PETER LIANG
8cb13577f0
Merge "Add the enabled status into the condition for the service which is VolumeShortcutToggle type." into rvc-dev am: c0fc0e4542
...
Change-Id: I9b825f6f223a4885a69df9ed6be375452e9432bb
2020-04-27 07:33:10 +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
0c3db58fba
[automerger skipped] Import translations. DO NOT MERGE am: 114edb926b
-s ours
...
am skip reason: subject contains skip directive
Change-Id: If502679a08e81824062995956094a7fe9e3e0142
2020-04-27 06:46:52 +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
Automerger Merge Worker
a6ce674367
Merge "Merge "Look up CBS package name through PackageManager." into rvc-dev am: 3becd37d47
am: a48e85d028" into rvc-d1-dev-plus-aosp
2020-04-27 00:10:41 +00:00
Amit Mahajan
442882451e
Merge "Look up CBS package name through PackageManager." into rvc-dev am: 3becd37d47
am: a48e85d028
...
Change-Id: I924a92ea0b9d30d619a586ae3fc8423bc8cbdfa5
2020-04-27 00:10:34 +00:00
Amit Mahajan
1ae72f1886
Merge "Look up CBS package name through PackageManager." into rvc-dev am: 3becd37d47
am: 4aa834efcd
...
Change-Id: I05a8cb4599ac14ae671690b91d97cbcfc461e2f1
2020-04-27 00:10:29 +00:00
Amit Mahajan
a48e85d028
Merge "Look up CBS package name through PackageManager." into rvc-dev am: 3becd37d47
...
Change-Id: I5cb2e64401aa132470b0b771fad4bc50848a809c
2020-04-26 23:52:53 +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