Ilya Matyukhin
77faf64a86
Merge changes from topic "fingerprint-settings-after-enrollment" into qt-dev am: 64693e31d9
...
am: e1a84e5c23
Change-Id: Ib2cc2e7ccf0f01fe6f5156e593515ff21556e232
2019-04-30 20:00:48 -07:00
Julia Reynolds
4ad850af69
Merge "Fix visibility and editability of importance fields" into qt-dev am: 7c802e553f
...
am: 4c77fd575c
Change-Id: I9f0e7f1e13082d86bd9dd3bf50fb3dc70775f606
2019-04-30 19:59:59 -07:00
Ilya Matyukhin
e1a84e5c23
Merge changes from topic "fingerprint-settings-after-enrollment" into qt-dev
...
am: 64693e31d9
Change-Id: I93a19028b425eadb10317b93cc5de7a60f9ccaa3
2019-04-30 17:26:12 -07:00
Julia Reynolds
4c77fd575c
Merge "Fix visibility and editability of importance fields" into qt-dev
...
am: 7c802e553f
Change-Id: I84ed085ac5dba8423f6d49beb2045c8a9460c6ed
2019-04-30 17:25:17 -07:00
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
Andrew Sapperstein
9ba6224b2f
Merge "Move SIM_SUB_INFO_SETTINGS to NetworkDashboardActivity." into qt-dev am: 067332ca9e
...
am: e8bd1c48d0
Change-Id: Id7de9e739ff61a6cc13c54cbad96e6e9b0ce78a2
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
Change-Id: I048e88c4abf774b33b861b19cb523592ef805875
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
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
Kevin Chyn
d32285a9ce
Merge changes I74d677dc,I17f4db85 into qt-dev am: 8888d346d1
...
am: 4fcd3c6056
Change-Id: I37f70f7a3ad57ea9c1dcd1cd73bbcc490abaa937
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
Change-Id: Ie20322fc7039f8fcc8c6dec6e7bbb24557498bec
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
Change-Id: Ic1805319330e8d9f819d15c158d3c12e65c6d11b
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
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
Andrew Sapperstein
e8bd1c48d0
Merge "Move SIM_SUB_INFO_SETTINGS to NetworkDashboardActivity." into qt-dev
...
am: 067332ca9e
Change-Id: I7659232cad1d477864b310cc83d41ae6a9bd4f0f
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
Change-Id: I08bd28a91fa7d6e4d13d9844a72e3b26036f60a2
2019-04-30 00:11:37 -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
Kevin Chyn
4fcd3c6056
Merge changes I74d677dc,I17f4db85 into qt-dev
...
am: 8888d346d1
Change-Id: I0d6523d1a67b4dd1c99d30ebcdd3637535944983
2019-04-30 00:05:57 -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
Fan Zhang
85dde88aa5
Merge "Include always ask button in SIM picker dialog" into qt-dev
...
am: d414c64dc3
Change-Id: I121e662ca5dad110ac53caa55cb8b72501e2bf4a
2019-04-30 00:04:22 -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
Salvador Martinez
c59364eb96
Merge "Update BatteryUtils to update system battery estimate cache" into qt-dev am: b96e56b16e
...
am: dfc1da749f
Change-Id: I765e1804e9deafbf6fa3e0f873f99a85333910a3
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
Change-Id: Iee088214fe89cc79a33bff4b7de98a7648ace5cf
2019-04-29 13:25:23 -07:00
TreeHugger Robot
64693e31d9
Merge changes from topic "fingerprint-settings-after-enrollment" into qt-dev
...
* changes:
Show fingerprint preferences after enrolling from settings
Run postEnroll() after enrolling from SUW
2019-04-29 18:03:45 +00:00
TreeHugger Robot
7c802e553f
Merge "Fix visibility and editability of importance fields" into qt-dev
2019-04-29 17:04:02 +00:00
Julia Reynolds
a540fa56d4
Fix visibility and editability of importance fields
...
- Block field should always be visible
- Locked by OEM: cannot block or change importance
- Locked by default app: cannot block, can change importance
- Locked by system app: cannot block, can change importance
- system app but blockable: can block, can change importance
Test: robotests
Fixes: 131248127
Change-Id: Ifa718c84573dd5125aefa4f672a79dc4f267d515
2019-04-28 22:01:36 -04: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
Ilya Matyukhin
8979f84865
Show fingerprint preferences after enrolling from settings
...
Bug: 131231334
Test: tested on blueline
Change-Id: Ifd43f28001fcb42ec61a62ad6656d2da2a0629eb
2019-04-28 16:31:54 -07:00
Ilya Matyukhin
cee87535e2
Run postEnroll() after enrolling from SUW
...
Bug: 131231334
Test: tested on blueline
Change-Id: I225725edb1c3379f2f3f5bc8b5cbe9adddb49f59
2019-04-28 16:24:29 -07: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
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
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