Pasty Chang
8b6857951c
Merge "Set QR scan activity to light theme in setup flow" into qt-dev am: 54cddc70e5
...
am: 9f8406d876
Change-Id: I4ca7732c16bfaf11b5ede3763a3b20e1bd9c74ae
2019-04-30 13:34:49 -07:00
Pasty Chang
9f8406d876
Merge "Set QR scan activity to light theme in setup flow" into qt-dev
...
am: 54cddc70e5
Change-Id: I93fb36b2a44b37484f938a3a2066c0b5767de021
2019-04-30 11:41:18 -07:00
Clown SHEN
9d38cce756
Merge "Show "Disconnected" instead of "Saved" in detail page summary" into qt-dev am: fbcf3708a6
...
am: dba84b1781
Change-Id: I31cf1082ff2b1fb370aa6b398760edf338fcd94a
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
Change-Id: I9d3f7e0d3c5afe2c339401aceebaef82e6761d0e
2019-04-30 07:20:47 -07:00
Antony Sargent
58dee76e8e
Merge "Remove empty MNC filtering when retrieving available subscriptions" into qt-dev am: 06da2980a0
...
am: ec2dcef796
Change-Id: I3c3410ce3e332e547ff5bf51918da31eab6abf78
2019-04-30 00:27:53 -07:00
Andrew Sapperstein
0590293c31
Merge "Remove "data usage" from search." into qt-dev am: 655e2e55e9
...
am: 706db87435
Change-Id: I8f47f7834fdb634c19804b819f4c677db04b4d1c
2019-04-30 00:27:02 -07:00
Fan Zhang
1f20c4cf68
Merge "Fix incorrect mapping to get subscriptioninfo" into qt-dev am: 4fe327858f
...
am: 7ba7f47ae3
Change-Id: I263b518ea5982ffb6012dc6fabdf5518435963f1
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
Change-Id: I5a1ccdc55dd564fe579c1db89704fd7f6c06e83e
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
Change-Id: Idc33c26d5dae95ac9a1f5dd9c769c2b9a1351d0b
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
Change-Id: I7811cbe094eaf4d3127c15c231969d8f38c19a4e
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
Change-Id: I8c008f2b441287e43ff879b709009df996e9f5d7
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
Change-Id: I4e37834459b5019c18d41715f287b504ab242eec
2019-04-30 00:17:02 -07:00
Lei Yu
a7578022f0
Merge "Update color filter for battery saver mode" into qt-dev am: 30991963e4
...
am: c86d7fb326
Change-Id: Ie20322fc7039f8fcc8c6dec6e7bbb24557498bec
2019-04-30 00:15:16 -07:00
Antony Sargent
ec2dcef796
Merge "Remove empty MNC filtering when retrieving available subscriptions" into qt-dev
...
am: 06da2980a0
Change-Id: I924eb0f0fdf4f95294b45f171f752784f8db4604
2019-04-30 00:14:16 -07:00
Andrew Sapperstein
706db87435
Merge "Remove "data usage" from search." into qt-dev
...
am: 655e2e55e9
Change-Id: I4dd878cc6377d15c2cfbebef9555c9b6c384e1c8
2019-04-30 00:13:08 -07:00
Salvador Martinez
cf61ab8596
Merge "Fix broken dark ui test" into qt-dev am: 1eb92917c9
...
am: 0677441d03
Change-Id: Ie2e6be0afaf37d30f806af478aa00d00418c5677
2019-04-30 00:12:28 -07:00
Yanting Yang
f1934ac7f7
Merge "Improve the latency of NotificationChannelSlice" into qt-dev am: c7564be562
...
am: 4bcd5b2cfd
Change-Id: I46d84a85ea875ece0ef68246521d55d1d993d837
2019-04-30 00:11:32 -07:00
Fan Zhang
7ba7f47ae3
Merge "Fix incorrect mapping to get subscriptioninfo" into qt-dev
...
am: 4fe327858f
Change-Id: Ieaaf0c62fb2e4d5d6aa25ccd2cc62ad2dea04a41
2019-04-30 00:10:49 -07:00
Lei Yu
f6ff7a02fb
Merge "Hide number label if info is opportunistic" into qt-dev
...
am: 1a66d9b22f
Change-Id: I5163816c04b825a98067e63db18d4020dfbcdcd1
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
Change-Id: I2b024b585edf065d94d9f25dc97d333bf3a289c3
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
Change-Id: Ic6af3ffd48b508d93bbda564187547c90249337f
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
Change-Id: If6fa5506edd2e89a1a725414ed791284825ad8a5
2019-04-30 00:07:39 -07:00
Lifu Tang
68310109ef
Merge "Add timestamp to recent used apps" into qt-dev
...
am: 80be930357
Change-Id: I9efc997ecef8785f9da838a5cbadb36e81006614
2019-04-30 00:06:49 -07:00
Lei Yu
c86d7fb326
Merge "Update color filter for battery saver mode" into qt-dev
...
am: 30991963e4
Change-Id: Ida0eced5ae330de91a0f647f3f2c7eda60f1d8db
2019-04-30 00:05:05 -07:00
Salvador Martinez
0677441d03
Merge "Fix broken dark ui test" into qt-dev
...
am: 1eb92917c9
Change-Id: I96fb30ab6a4fd1a0b82727c4e3969b2e59c5d721
2019-04-30 00:02:41 -07:00
Yanting Yang
4bcd5b2cfd
Merge "Improve the latency of NotificationChannelSlice" into qt-dev
...
am: c7564be562
Change-Id: I86c35f4c8d4dde32592ddec09926e226dbcc0751
2019-04-30 00:01:51 -07:00
Pasty Chang
54cddc70e5
Merge "Set QR scan activity to light theme in setup flow" into qt-dev
2019-04-29 01:52:11 +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
06da2980a0
Merge "Remove empty MNC filtering when retrieving available subscriptions" into qt-dev
2019-04-26 22:34:27 +00: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
Andrew Sapperstein
655e2e55e9
Merge "Remove "data usage" from search." into qt-dev
2019-04-26 20:28:06 +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
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
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
TreeHugger Robot
80be930357
Merge "Add timestamp to recent used apps" into qt-dev
2019-04-25 22:54:20 +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
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
TreeHugger Robot
c7564be562
Merge "Improve the latency of NotificationChannelSlice" into qt-dev
2019-04-25 17:31:16 +00:00
Salvador Martinez
b0737ee174
Fix broken dark ui test
...
It was checking something in shared preferences which seems
to have stopped working (a bunch of the stuff used in the
test is deprecated). This CL just has it verify that
updateDarkTheme() is called when appropriate since that
is all we really care about.
Test: is a test
Bug: 130897882
Change-Id: If3286dd91b5a95cb0f41cac619a11a9089e0aecf
2019-04-25 10:25:15 -07:00
Pasty Chang
7dfb0f3df9
Merge "Update the fingerprint skip dialog" into qt-dev am: d6f9ec122d
...
am: 6c43c5a924
Change-Id: Id63a4942c83ac2d82c0b07256d1ffa9dfac6f68a
2019-04-25 02:27:21 -07:00
Pasty Chang
6c43c5a924
Merge "Update the fingerprint skip dialog" into qt-dev
...
am: d6f9ec122d
Change-Id: I0484722780e03a3e84a00bdc8a988cfb4e61467f
2019-04-25 02:17:09 -07:00
clownshen
0d5928f6f1
Show "Disconnected" instead of "Saved" in detail page summary
...
To improve UX, show summary as "Disconnected" is more make sense to end
user instead of "Saved" in detail page, it's decision-maker to click
connect button.
Bug: 131119614
Test: manual test
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Change-Id: I26ea0c566daab6214a596509f972005fd37fab4d
2019-04-25 08:15:13 +00:00