Clown SHEN
9d38cce756
Merge "Show "Disconnected" instead of "Saved" in detail page summary" into qt-dev am: fbcf3708a6
...
am: dba84b1781
2019-04-30 08:13:53 -07:00
Clown SHEN
dba84b1781
Merge "Show "Disconnected" instead of "Saved" in detail page summary" into qt-dev
...
am: fbcf3708a6
2019-04-30 07:20:47 -07:00
Bill Yi
5ed1e2db38
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 47b32d0939 -s ours
...
am: 91eefed117
2019-04-30 00:29:17 -07:00
Andrew Sapperstein
d1bdd3809b
Merge "Add a gap in the ordering for phone numbers." into qt-dev am: d464f67e31
...
am: d45dbafd4c
2019-04-30 00:28:54 -07:00
Antony Sargent
58dee76e8e
Merge "Remove empty MNC filtering when retrieving available subscriptions" into qt-dev am: 06da2980a0
...
am: ec2dcef796
2019-04-30 00:27:53 -07:00
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
Bill Yi
91eefed117
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 47b32d0939
2019-04-30 00:15:16 -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
Andrew Sapperstein
d45dbafd4c
Merge "Add a gap in the ordering for phone numbers." into qt-dev
...
am: d464f67e31
2019-04-30 00:15:00 -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
Antony Sargent
ec2dcef796
Merge "Remove empty MNC filtering when retrieving available subscriptions" into qt-dev
...
am: 06da2980a0
2019-04-30 00:14:16 -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
Clown SHEN
fbcf3708a6
Merge "Show "Disconnected" instead of "Saved" in detail page summary" into qt-dev
2019-04-27 06:42:45 +00:00
TreeHugger Robot
47b32d0939
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-04-27 06:01:25 +00:00
Bill Yi
3f0e2a1eed
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I84b1d9a020529c12781b308c4bc7a489cd924de1
2019-04-26 21:51:43 -07: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
TreeHugger Robot
d464f67e31
Merge "Add a gap in the ordering for phone numbers." into qt-dev
2019-04-26 23:00:39 +00:00
TreeHugger Robot
06da2980a0
Merge "Remove empty MNC filtering when retrieving available subscriptions" into qt-dev
2019-04-26 22:34:27 +00:00
Andrew Sapperstein
10cfaa0b7e
Add a gap in the ordering for phone numbers.
...
Previously there was no gap which caused the second phone number to show below
Emergency info.
Fixes: 131378898
Test: visual inspection
Change-Id: If98d3442562d44f65a6e5ce896b71ee093d8616c
2019-04-26 14:00:53 -07:00
Antony Sargent
972bf437f6
Remove empty MNC filtering when retrieving available subscriptions
...
During the early phase of work on DSDS, we found that a hacky solution
to seeing duplicate subscriptions that are part of a logical group (eg
Google Fi) was to filter out the entries with empty MNC strings. It
turns out this breaks things for some legitimate eSIM subsctiptions, and
isn't needed anymore because of the fixes that landed for b/127833821.
Fixes: 130706446
Test: make RunSettingsRoboTests
Change-Id: Ic4472c1de3c3e2449139b3e2ffb20d11a0058e8a
2019-04-26 13:45:53 -07:00
