Commit Graph

63128 Commits

Author SHA1 Message Date
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
Bonian Chen
aad8762d24 Merge "[Settings] Fix DataUsageUtilsTest" into rvc-dev am: b9217e8e17 am: a261865632
Change-Id: Ic1d3d8d855dd68abedf03a79f9063847ea1e300e
2020-04-25 05:21:07 +00:00
Bonian Chen
1e465439ad Merge "[Settings] Fix DataUsageUtilsTest" into rvc-dev am: b9217e8e17 am: 7976cfc02d
Change-Id: Ia12ae46141f42366faed193e1bb344251a672290
2020-04-25 05:20:51 +00:00
Bonian Chen
a261865632 Merge "[Settings] Fix DataUsageUtilsTest" into rvc-dev am: b9217e8e17
Change-Id: If8d10cc456874cb1772ce51aacf624b1467f47f2
2020-04-25 05:06:50 +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
278e875aaa Merge "Ensure CryptKeeper runs with its own task affinity" into rvc-dev am: fbfefe5b60 am: 3bc117b769
Change-Id: Ib8914abf04029a20a37c9b82c0a459d781427149
2020-04-24 23:34:20 +00:00
Winson Chung
df8ce9f774 Merge "Ensure CryptKeeper runs with its own task affinity" into rvc-dev am: fbfefe5b60 am: 8d4eb8f7b1
Change-Id: I91fb7ba0ea4c14299e7b2cd0f4763815131895bf
2020-04-24 23:33:50 +00:00
Winson Chung
8d4eb8f7b1 Merge "Ensure CryptKeeper runs with its own task affinity" into rvc-dev am: fbfefe5b60
Change-Id: I490a0b353d7cdd45485b9a4262362522d64c8dea
2020-04-24 23:22:44 +00:00
Winson Chung
3bc117b769 Merge "Ensure CryptKeeper runs with its own task affinity" into rvc-dev am: fbfefe5b60
Change-Id: I122d158b872a5d7b2614265e98c95615492ab20d
2020-04-24 23:22:36 +00:00
Winson Chung
fbfefe5b60 Merge "Ensure CryptKeeper runs with its own task affinity" into rvc-dev 2020-04-24 23:01:36 +00:00
Winson Chung
ec8f79925a Ensure CryptKeeper runs with its own task affinity
- Otherwise, when it finishes and home is started in the same task,
  subsequent launches of Settings activities will be routed to the
  home task incorrectly.

Bug: 154890505
Bug: 150983816
Test: Flash & wipe device, finish SUW, launch a quick settings
      settings activity, ensure it starts in a new non-home task
Change-Id: I48db005a5c292f76ab23b34a194b209c6d1b2335
2020-04-24 22:58:38 +00:00
Amit Mahajan
b6139c0caf Look up CBS package name through PackageManager.
Instead of hardcoding it.

Test: manual
Bug: 154436403
Change-Id: I0feb356e6cd4868f71198bdee49a7658b4b98b5d
2020-04-24 13:46:11 -07:00
Automerger Merge Worker
400b08a495 Merge "Merge "Add SearchIndexable to Power Menu" into rvc-dev am: 482968c84b am: d506c17694" into rvc-d1-dev-plus-aosp 2020-04-24 19:46:34 +00:00
TreeHugger Robot
8666d1d120 Merge "Add SearchIndexable to Power Menu" into rvc-dev am: 482968c84b am: d506c17694
Change-Id: Ib874ad52f18bfabc768ccd579bc392162f3a366a
2020-04-24 19:46:30 +00:00
TreeHugger Robot
2a0847f29f Merge "Add SearchIndexable to Power Menu" into rvc-dev am: 482968c84b am: 5bd1d6693f
Change-Id: I070341c00753fe9783fedee218c8a835d15a96df
2020-04-24 19:46:26 +00:00
TreeHugger Robot
d506c17694 Merge "Add SearchIndexable to Power Menu" into rvc-dev am: 482968c84b
Change-Id: I8d745265c999e52987827a7a5e3ba2c409ecf481
2020-04-24 19:35:46 +00:00
TreeHugger Robot
5bd1d6693f Merge "Add SearchIndexable to Power Menu" into rvc-dev am: 482968c84b
Change-Id: I360e3fc7967c71fd07d3a65f69eb7605fe954b2f
2020-04-24 19:35:40 +00:00
TreeHugger Robot
482968c84b Merge "Add SearchIndexable to Power Menu" into rvc-dev 2020-04-24 19:20:51 +00:00
TreeHugger Robot
f16672ea40 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 0dc7e9b328 -s ours
am skip reason: subject contains skip directive

Change-Id: I1484ee6608cea9f359415a81a84bd30c25b06331
2020-04-24 18:07:25 +00:00
TreeHugger Robot
4e16f5c8c3 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c93aaf860e -s ours am: 1f98044eee -s ours
am skip reason: subject contains skip directive

Change-Id: Iea44cc04492ce77d1de47fd77aa58535e93057e9
2020-04-24 18:07:06 +00:00
TreeHugger Robot
88ea5e29c7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c93aaf860e -s ours am: 39e56f4bee -s ours
am skip reason: subject contains skip directive

Change-Id: I22f8ae4d19f380293fb2204927790a613a83511f
2020-04-24 18:06:53 +00:00
TreeHugger Robot
0dc7e9b328 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-04-24 18:02:01 +00:00
TreeHugger Robot
39e56f4bee [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c93aaf860e -s ours
am skip reason: subject contains skip directive

Change-Id: I6453b490eb044cb1663e995fd88c34c46fd66e11
2020-04-24 17:52:20 +00:00
TreeHugger Robot
1f98044eee [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c93aaf860e -s ours
am skip reason: subject contains skip directive

Change-Id: Idf9772084f575d243e668645beb712ce9a980cbf
2020-04-24 17:51:49 +00:00