Commit Graph

67476 Commits

Author SHA1 Message Date
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
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
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
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
f253e8265d Merge "Add the enabled status into the condition for the service which is VolumeShortcutToggle type." into rvc-dev am: c0fc0e4542 am: 6597cf6cb2 am: 3aa539884e am: d00d1ff06e am: 2922b7d8ae
Change-Id: Id31d9e9b6fc0a0fd7d21be301bbed4e6aa27790c
2020-04-27 08:22:26 +00:00
PETER LIANG
886a731dc3 Merge "Add the enabled status into the condition for the service which is VolumeShortcutToggle type." into rvc-dev am: c0fc0e4542 am: 8cb13577f0 am: 3b1edebcca am: 8bff859225
Change-Id: I59853b223d40bbb22d5d6cfdcb8a0bf8709d9657
2020-04-27 08:22:11 +00:00
PETER LIANG
2922b7d8ae Merge "Add the enabled status into the condition for the service which is VolumeShortcutToggle type." into rvc-dev am: c0fc0e4542 am: 6597cf6cb2 am: 3aa539884e am: d00d1ff06e
Change-Id: I64e28acbc8e28dba1a52efe8b16347d953acc5dc
2020-04-27 08:21:54 +00:00
PETER LIANG
650d02d336 Merge "Add the enabled status into the condition for the service which is VolumeShortcutToggle type." into rvc-dev am: c0fc0e4542 am: 6597cf6cb2 am: cf04f8f50c am: 099432633d
Change-Id: Iad38e159775edbbf1b989ae73f7430b837a773e5
2020-04-27 08:21:44 +00:00
PETER LIANG
8bff859225 Merge "Add the enabled status into the condition for the service which is VolumeShortcutToggle type." into rvc-dev am: c0fc0e4542 am: 8cb13577f0 am: 3b1edebcca
Change-Id: I3ffc39959d5836bd170e8c91ffa2b64926571bb1
2020-04-27 08:08:43 +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
099432633d Merge "Add the enabled status into the condition for the service which is VolumeShortcutToggle type." into rvc-dev am: c0fc0e4542 am: 6597cf6cb2 am: cf04f8f50c
Change-Id: I03917d1c655b560b34aba8ada40964f37515dc79
2020-04-27 08:08:34 +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
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
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
6df040b74c [automerger skipped] Import translations. DO NOT MERGE am: 114edb926b -s ours am: 623827cd5a -s ours am: 003d2ff544 -s ours am: f5f5e692f9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4088b5f4ffaebf5a19b4cb3e4a5734a37697e4bd
2020-04-27 07:07:21 +00:00
Bill Yi
829e95c930 [automerger skipped] Import translations. DO NOT MERGE am: 114edb926b -s ours am: 0c3db58fba -s ours am: d8cf999ed6 -s ours
am skip reason: subject contains skip directive

Change-Id: I0fd2c9c42fd0df5db8a57ec46889013e0eea9ca1
2020-04-27 07:07:06 +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
d8cf999ed6 [automerger skipped] Import translations. DO NOT MERGE am: 114edb926b -s ours am: 0c3db58fba -s ours
am skip reason: subject contains skip directive

Change-Id: I197f6c82f40b57592fa304ea398c2e5647e1a07c
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
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
Amit Mahajan
f082a85b0b Merge "Look up CBS package name through PackageManager." into rvc-dev am: 3becd37d47 am: 4aa834efcd am: 89ffb97196 am: 6c78c86bf2 am: 405910d601
Change-Id: I7f5675212761f437dc33aa3deb9bb321aaeb7f2b
2020-04-27 00:44:59 +00:00
Amit Mahajan
405910d601 Merge "Look up CBS package name through PackageManager." into rvc-dev am: 3becd37d47 am: 4aa834efcd am: 89ffb97196 am: 6c78c86bf2
Change-Id: If9b12dfb77a511e6cb0ee1b62b03ff0ee01bb50e
2020-04-27 00:38:13 +00:00
Automerger Merge Worker
cc52959c84 Merge "Merge "Look up CBS package name through PackageManager." into rvc-dev am: 3becd37d47 am: a48e85d028" into rvc-d1-dev-plus-aosp am: a6ce674367 am: e982b1a693
Change-Id: I51451454d3230585838a8f317e08fab268d5ed87
2020-04-27 00:38:08 +00:00
Amit Mahajan
9d8672648a Merge "Look up CBS package name through PackageManager." into rvc-dev am: 3becd37d47 am: 4aa834efcd am: 1ae72f1886 am: 73af5e5931
Change-Id: I099e686e7c97a3a93f5c9537555a0cf4781d1820
2020-04-27 00:38:00 +00:00
Automerger Merge Worker
e982b1a693 Merge "Merge "Look up CBS package name through PackageManager." into rvc-dev am: 3becd37d47 am: a48e85d028" into rvc-d1-dev-plus-aosp am: a6ce674367
Change-Id: Id31d1a201f8be575f49fd780c2e87e031c6c50d0
2020-04-27 00:28:24 +00:00
Amit Mahajan
73af5e5931 Merge "Look up CBS package name through PackageManager." into rvc-dev am: 3becd37d47 am: 4aa834efcd am: 1ae72f1886
Change-Id: I23f77cbdf75a5d6c08e8f99bd9d579ee524aefd2
2020-04-27 00:28:18 +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
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
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
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
baff61b517 Merge "[Settings] Fix DataUsageUtilsTest" into rvc-dev am: b9217e8e17 am: 7976cfc02d am: f026ac5c41 am: ad2c5922d7 am: 9952eeecbf
Change-Id: I3287ea31392f102a83f5914f05c69b7e2809b946
2020-04-25 05:50:46 +00:00