Andrew Sapperstein
0590293c31
Merge "Remove "data usage" from search." into qt-dev am: 655e2e55e9
...
am: 706db87435
2019-04-30 00:27:02 -07:00
Andrew Sapperstein
9ba6224b2f
Merge "Move SIM_SUB_INFO_SETTINGS to NetworkDashboardActivity." into qt-dev am: 067332ca9e
...
am: e8bd1c48d0
2019-04-30 00:26:10 -07:00
Raff Tsai
c3de3381ad
Merge "Fix toggle button is enabled state but can't click" into qt-dev am: f9fd3b9e17
...
am: 5458399357
2019-04-30 00:25:17 -07:00
Fan Zhang
1f20c4cf68
Merge "Fix incorrect mapping to get subscriptioninfo" into qt-dev am: 4fe327858f
...
am: 7ba7f47ae3
2019-04-30 00:24:25 -07:00
Lei Yu
4f207934a4
Merge "Hide number label if info is opportunistic" into qt-dev am: 1a66d9b22f
...
am: f6ff7a02fb
2019-04-30 00:23:16 -07:00
Andy Chou
114fa266ef
Merge "Avoid IMEI overrided by getSummary() for dual SIM condition" into qt-dev am: 8c16ef2906
...
am: 5f82b6e72e
2019-04-30 00:22:23 -07:00
Chandan Nath
1a96c61193
Merge "Always show backup settings (even if backup is deactivated)." into qt-dev am: 2f2a3c4055
...
am: 2ab7fab9a8
2019-04-30 00:21:33 -07:00
hughchen
b7fb90ab6c
Merge "Fix media output slice is empty even BT device is paired" into qt-dev am: 668edcfb95
...
am: a35353d687
2019-04-30 00:17:55 -07:00
Lifu Tang
8968de16d4
Merge "Add timestamp to recent used apps" into qt-dev am: 80be930357
...
am: 68310109ef
2019-04-30 00:17:02 -07:00
Kevin Chyn
d32285a9ce
Merge changes I74d677dc,I17f4db85 into qt-dev am: 8888d346d1
...
am: 4fcd3c6056
2019-04-30 00:16:10 -07:00
Lei Yu
a7578022f0
Merge "Update color filter for battery saver mode" into qt-dev am: 30991963e4
...
am: c86d7fb326
2019-04-30 00:15:16 -07:00
Fan Zhang
724595db54
Merge "Include always ask button in SIM picker dialog" into qt-dev am: d414c64dc3
...
am: 85dde88aa5
2019-04-30 00:14:26 -07:00
Salvador Martinez
430814af13
Merge "Add keywords for battery saver schedule" into qt-dev am: 3825e09706
...
am: 958dea2303
2019-04-30 00:13:21 -07:00
Andrew Sapperstein
706db87435
Merge "Remove "data usage" from search." into qt-dev
...
am: 655e2e55e9
2019-04-30 00:13:08 -07:00
Salvador Martinez
cf61ab8596
Merge "Fix broken dark ui test" into qt-dev am: 1eb92917c9
...
am: 0677441d03
2019-04-30 00:12:28 -07:00
Andrew Sapperstein
e8bd1c48d0
Merge "Move SIM_SUB_INFO_SETTINGS to NetworkDashboardActivity." into qt-dev
...
am: 067332ca9e
2019-04-30 00:12:23 -07:00
Raff Tsai
5458399357
Merge "Fix toggle button is enabled state but can't click" into qt-dev
...
am: f9fd3b9e17
2019-04-30 00:11:37 -07:00
Yanting Yang
f1934ac7f7
Merge "Improve the latency of NotificationChannelSlice" into qt-dev am: c7564be562
...
am: 4bcd5b2cfd
2019-04-30 00:11:32 -07:00
Fan Zhang
7ba7f47ae3
Merge "Fix incorrect mapping to get subscriptioninfo" into qt-dev
...
am: 4fe327858f
2019-04-30 00:10:49 -07:00
Lei Yu
f6ff7a02fb
Merge "Hide number label if info is opportunistic" into qt-dev
...
am: 1a66d9b22f
2019-04-30 00:10:07 -07:00
Andy Chou
5f82b6e72e
Merge "Avoid IMEI overrided by getSummary() for dual SIM condition" into qt-dev
...
am: 8c16ef2906
2019-04-30 00:09:23 -07:00
Chandan Nath
2ab7fab9a8
Merge "Always show backup settings (even if backup is deactivated)." into qt-dev
...
am: 2f2a3c4055
2019-04-30 00:08:26 -07:00
hughchen
a35353d687
Merge "Fix media output slice is empty even BT device is paired" into qt-dev
...
am: 668edcfb95
2019-04-30 00:07:39 -07:00
Lifu Tang
68310109ef
Merge "Add timestamp to recent used apps" into qt-dev
...
am: 80be930357
2019-04-30 00:06:49 -07:00
Kevin Chyn
4fcd3c6056
Merge changes I74d677dc,I17f4db85 into qt-dev
...
am: 8888d346d1
2019-04-30 00:05:57 -07:00
Lei Yu
c86d7fb326
Merge "Update color filter for battery saver mode" into qt-dev
...
am: 30991963e4
2019-04-30 00:05:05 -07:00
Fan Zhang
85dde88aa5
Merge "Include always ask button in SIM picker dialog" into qt-dev
...
am: d414c64dc3
2019-04-30 00:04:22 -07:00
Salvador Martinez
958dea2303
Merge "Add keywords for battery saver schedule" into qt-dev
...
am: 3825e09706
2019-04-30 00:03:30 -07:00
Salvador Martinez
0677441d03
Merge "Fix broken dark ui test" into qt-dev
...
am: 1eb92917c9
2019-04-30 00:02:41 -07:00
Yanting Yang
4bcd5b2cfd
Merge "Improve the latency of NotificationChannelSlice" into qt-dev
...
am: c7564be562
2019-04-30 00:01:51 -07:00
Salvador Martinez
c59364eb96
Merge "Update BatteryUtils to update system battery estimate cache" into qt-dev am: b96e56b16e
...
am: dfc1da749f
2019-04-29 14:13:20 -07:00
Salvador Martinez
dfc1da749f
Merge "Update BatteryUtils to update system battery estimate cache" into qt-dev
...
am: b96e56b16e
2019-04-29 13:25:23 -07:00
TreeHugger Robot
545b43b0d0
Merge "Import translations. DO NOT MERGE"
2019-04-28 02:59:04 +00:00
Bill Yi
9bf005fdd6
Import translations. DO NOT MERGE
...
Change-Id: Id157de3373711c5fd83eaac91c83eefa3f417319
Auto-generated-cl: translation import
2019-04-26 21:08:36 -07:00
Kevin Chang
22133806a2
Merge "Change the string of Captions and reorder the feature in audio category"
2019-04-27 02:38:02 +00:00
Andrew Sapperstein
655e2e55e9
Merge "Remove "data usage" from search." into qt-dev
2019-04-26 20:28:06 +00:00
Andrew Sapperstein
067332ca9e
Merge "Move SIM_SUB_INFO_SETTINGS to NetworkDashboardActivity." into qt-dev
2019-04-26 20:27:01 +00:00
TreeHugger Robot
f9fd3b9e17
Merge "Fix toggle button is enabled state but can't click" into qt-dev
2019-04-26 20:00:48 +00:00
Fan Zhang
4fe327858f
Merge "Fix incorrect mapping to get subscriptioninfo" into qt-dev
2019-04-26 19:57:09 +00:00
Andrew Sapperstein
c65ccd23b4
Move SIM_SUB_INFO_SETTINGS to NetworkDashboardActivity.
...
Remove the entry point for SimSettings and redirect any intents to the new UI.
Filed b/131324863 to track deleting the code.
Fixes: 128859223
Bug: 131324863
Test: adb shell am start -a com.android.settings.sim.SIM_SUB_INFO_SETTINGS
shows main connectivity screens
Change-Id: I4a4ed5c34d231eaab929a923c7fcbbfc1e0ed6f3
2019-04-26 12:01:42 -07:00
Andrew Sapperstein
62a68d6edb
Remove "data usage" from search.
...
Fixes: 131324402
Test: verified manually
Change-Id: Ib72902c3eaa1f2427e9c1c835ba2939f28cf7a0d
2019-04-26 10:23:02 -07:00
Fan Zhang
f61db6e9d7
Fix incorrect mapping to get subscriptioninfo
...
getActiveSubscriptionInfoList() returns a list of active subscription.
It doesn't 1:1 mapping with slotId. So it is not correct to use slotId
as index to get subscriptioninfo from list.
Use framework interface getActiveSubscriptionInfoForSimSlotIndex() to
get subscriptioninfo per slotid instead.
Fixes: 129038597
Test: robotest
Change-Id: If4277c425e6145e0e3ba716551d0dce46cdb61ab
2019-04-26 10:07:07 -07:00
Lei Yu
1a66d9b22f
Merge "Hide number label if info is opportunistic" into qt-dev
2019-04-26 16:54:02 +00:00
Andy Chou
8c16ef2906
Merge "Avoid IMEI overrided by getSummary() for dual SIM condition" into qt-dev
2019-04-26 15:04:25 +00:00
Chandan Nath
2f2a3c4055
Merge "Always show backup settings (even if backup is deactivated)." into qt-dev
2019-04-26 08:14:53 +00:00
Kevin Chang
23c53ad504
Change the string of Captions and reorder the feature in audio category
...
Bug: 128887817
Test: Visual
Change-Id: I4bcde9c52b4ed3484727e79758ef37f4b05a209d
2019-04-26 09:42:46 +08:00
andychou
7c89a929c4
Avoid IMEI overrided by getSummary() for dual SIM condition
...
IMEI information will be overrided by getSummary() and cause second slot IMEI is
oerrided by first slot.
Avoid IMEI is override by first slot information.
Bug: 131124169
Test: Test with dual SIM device and atest
ImeiInfoPreferenceControllerTest, ImeiInfoDialogControllerTest pass
Change-Id: Ia0a028aa0103867f42fff610129cf7ce2d3910b7
2019-04-26 09:31:43 +08:00
TreeHugger Robot
668edcfb95
Merge "Fix media output slice is empty even BT device is paired" into qt-dev
2019-04-26 00:46:48 +00:00
Leon Liao
4824f3a7c5
Merge "Replace the placeholder animation."
2019-04-25 23:05:07 +00:00
TreeHugger Robot
80be930357
Merge "Add timestamp to recent used apps" into qt-dev
2019-04-25 22:54:20 +00:00
