Commit Graph

67457 Commits

Author SHA1 Message Date
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
TreeHugger Robot
ff1ed9b7a1 Merge "Dynamic grouping failed the first time" into rvc-dev am: 2e16d78872 am: a7183d4323 am: 6ff1bb5be5 am: 9c25e873e3 am: 7c3ddec4d8
Change-Id: Ie62c8811f12bf4e622529c3aaa377de533ecf8b8
2020-04-27 09:25:18 +00:00
Bonian Chen
89a9bfbdc9 Merge "[Settings] Support re-init DataUsageSummaryPreferenceController" into rvc-dev am: 1b5f347893 am: 8e09bdaa6b am: b72c15c7e8 am: 5d17a5fa5a am: 318f1bc558
Change-Id: I627c418283f1f98668186d0dc1ad171c2cd8a8b3
2020-04-27 09:25:12 +00:00
TreeHugger Robot
5cfb405029 Merge "Dynamic grouping failed the first time" into rvc-dev am: 2e16d78872 am: 03f59415ce am: 0de5e57557 am: cc24b800a1 am: 6c99ccd68a
Change-Id: Id0c4dd6d08d0664ca1a25a00ea1ca8829d82d0a2
2020-04-27 09:25:06 +00:00
Bonian Chen
2ff8cefa25 Merge "[Settings] Support re-init DataUsageSummaryPreferenceController" into rvc-dev am: 1b5f347893 am: 5450d488b4 am: 9ca919591d am: 958469e462 am: 9d233cf69c
Change-Id: I51c2718f3c6c38aad1f91e78375bd76330e571c7
2020-04-27 09:25:00 +00: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
TreeHugger Robot
7c3ddec4d8 Merge "Dynamic grouping failed the first time" into rvc-dev am: 2e16d78872 am: a7183d4323 am: 6ff1bb5be5 am: 9c25e873e3
Change-Id: I2a41a58548c6f0c65b7e73d45b78079287ca782b
2020-04-27 09:12:27 +00:00
Bonian Chen
318f1bc558 Merge "[Settings] Support re-init DataUsageSummaryPreferenceController" into rvc-dev am: 1b5f347893 am: 8e09bdaa6b am: b72c15c7e8 am: 5d17a5fa5a
Change-Id: Ie0f13e7d02d0cf829e6cc5080a9d8dadec981690
2020-04-27 09:12:19 +00:00
TreeHugger Robot
6c99ccd68a Merge "Dynamic grouping failed the first time" into rvc-dev am: 2e16d78872 am: 03f59415ce am: 0de5e57557 am: cc24b800a1
Change-Id: Ib549b029529b673a93a92df8e33f9d78fcfff52e
2020-04-27 09:12:12 +00:00
Bonian Chen
9d233cf69c Merge "[Settings] Support re-init DataUsageSummaryPreferenceController" into rvc-dev am: 1b5f347893 am: 5450d488b4 am: 9ca919591d am: 958469e462
Change-Id: I9d8ce819fcbe280dec4a0eb0fbc91e4ff0ee32e7
2020-04-27 09:12:03 +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
TreeHugger Robot
9c25e873e3 Merge "Dynamic grouping failed the first time" into rvc-dev am: 2e16d78872 am: a7183d4323 am: 6ff1bb5be5
Change-Id: I88a44c691b7548e7523397202adeb65f2a554e7b
2020-04-27 09:02:45 +00:00
Bonian Chen
5d17a5fa5a Merge "[Settings] Support re-init DataUsageSummaryPreferenceController" into rvc-dev am: 1b5f347893 am: 8e09bdaa6b am: b72c15c7e8
Change-Id: I448cd62ac5258bce7d5552c7df6e8c04f156ad2e
2020-04-27 09:02:38 +00:00
TreeHugger Robot
cc24b800a1 Merge "Dynamic grouping failed the first time" into rvc-dev am: 2e16d78872 am: 03f59415ce am: 0de5e57557
Change-Id: I94aa2d9e81c49b1d11ce93e8d4a6e9feb3b70bc6
2020-04-27 09:02:32 +00:00
Bonian Chen
958469e462 Merge "[Settings] Support re-init DataUsageSummaryPreferenceController" into rvc-dev am: 1b5f347893 am: 5450d488b4 am: 9ca919591d
Change-Id: I254f2b7ddcdffc677b6773e3b9cc885fcfe2e07f
2020-04-27 09:02: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
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
PETER LIANG
1ae9e7583d 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 am: f253e8265d
Change-Id: I0c772437340b83df2828b2d19ff0bc04020b3bdb
2020-04-27 08:39:11 +00:00
PETER LIANG
d83ffdbdf6 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 am: 886a731dc3
Change-Id: Id24c01275a661c989202750b275851413789641e
2020-04-27 08:38:59 +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
PETER LIANG
bea7db6abb 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 am: 650d02d336
Change-Id: I3c9d7cf446341d9bc2054983caa373f8121c7abc
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
Bill Yi
85c55cb187 [automerger skipped] Import translations. DO NOT MERGE am: 114edb926b -s ours am: 623827cd5a -s ours am: 003d2ff544 -s ours am: f5f5e692f9 -s ours am: 6df040b74c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I760ffda1f886f45a8c2a158fe53e2ad3e341969b
2020-04-27 07:21:31 +00:00