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
Salvador Martinez
cf61ab8596
Merge "Fix broken dark ui test" into qt-dev am: 1eb92917c9
...
am: 0677441d03
2019-04-30 00:12:28 -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
Fan Zhang
4fe327858f
Merge "Fix incorrect mapping to get subscriptioninfo" into qt-dev
2019-04-26 19:57:09 +00: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
Kevin Chyn
8888d346d1
Merge changes I74d677dc,I17f4db85 into qt-dev
...
* changes:
Only gray out remove button after positive button is pressed
Check PackageManager before getting system service
2019-04-25 22:48:02 +00:00
Lei Yu
7e9ef34112
Hide number label if info is opportunistic
...
Fixes: 125855323
Test: RunSettingsRoboTests
Change-Id: I6f77d65691319097c9bf56232710ba12fa7360f3
2019-04-25 14:56:59 -07:00
Lei Yu
30991963e4
Merge "Update color filter for battery saver mode" into qt-dev
2019-04-25 21:42:56 +00:00
TreeHugger Robot
d414c64dc3
Merge "Include always ask button in SIM picker dialog" into qt-dev
2019-04-25 21:02:13 +00:00
TreeHugger Robot
3825e09706
Merge "Add keywords for battery saver schedule" into qt-dev
2019-04-25 21:00:28 +00:00
TreeHugger Robot
7e4cd25d9d
Merge "ANR observed under settings when trying to reset network settings"
2019-04-25 20:03:34 +00:00
Lifu Tang
c359536d0b
Add timestamp to recent used apps
...
Bug: 129354132
Test: build, flash, and test manually
Change-Id: If8e657460da45db019633e95e77dffb1493997c0
2019-04-25 12:47:42 -07:00
TreeHugger Robot
1eb92917c9
Merge "Fix broken dark ui test" into qt-dev
2019-04-25 19:25:30 +00:00
Kevin Chyn
f19fb6fa46
Only gray out remove button after positive button is pressed
...
Fixes: 131252811
Test: manual
Change-Id: I74d677dc5608b21045b148020a13d5ea5c1bde20
2019-04-25 12:21:29 -07:00
Kevin Chyn
acc340d615
Check PackageManager before getting system service
...
Fixes: 131285189
Test: manual
Change-Id: I17f4db85afc5969c58a0a08667ef05786302712b
2019-04-25 12:17:26 -07:00
Salvador Martinez
5829b56657
Add keywords for battery saver schedule
...
We forgot to add keywords to battery saver schedule so that it
would show up in search. This simply adds the string and the
appropriate keywords for it.
Test: manual (keywords result in search results)
Bug: 129984960
Change-Id: I94983fed6a6236f4d8cee3fb19c841822fd507e2
2019-04-25 11:13:46 -07:00
