Commit Graph

8762 Commits

Author SHA1 Message Date
Salvador Martinez
ac690d98c0 Merge "Fix null pointer in SubscriptionUtil" into qt-dev
am: 30d0e6c7d7

Change-Id: I0cba2206822450f14610d557f7844e8e1ea08abc
2019-05-01 10:59:11 -07:00
Tim Peng
a5d1d35bcf Merge "Update "Play media to" display rule in SoundSetting" into qt-dev
am: 1bf8fb8535

Change-Id: Iadb043eb838aee8d3680bb7a295647ab3444a033
2019-05-01 09:44:47 -07:00
Fan Zhang
0360305461 Merge "Delete a broken test" into qt-dev am: c824a0cb82
am: cad5eb221c

Change-Id: Ia3baf3ef35e2520efb58c6dd85e70a2d3bca58a1
2019-05-01 07:33:55 -07:00
Antony Sargent
d4f37bb46e Merge "Add 'Erase SIM' to mobile network details page" into qt-dev am: 2740c4a052
am: 4e1273c53f

Change-Id: Ia925f6646eeb49564750dad9a055898ddbdd650f
2019-05-01 07:19:34 -07:00
Sunny Shao
fbe30c5bf7 Merge "Show mobile data slice in Search even no SIM card" into qt-dev am: 8b285f2355
am: 6fba302a0d

Change-Id: I917e58a68eecac6c28500eefab8ad4cc31f2087e
2019-05-01 07:18:45 -07:00
Julia Reynolds
090e67d938 Importance preference updates
- Use show on lockscreen setting
- Match design to notification shade guts

Test: robotests
Bug: 131290247
Bug: 128445911
Change-Id: I645b35191c8f22e751c264fd8ca13560f50b7582
2019-05-01 10:14:05 -04:00
Xiangyu/Malcolm Chen
4a0f2aedd5 Merge "Create enable MMS notification." into qt-dev
am: 25de66c030

Change-Id: I5744cd16cfa4e60f70ad7a069c7efd06d419f605
2019-05-01 07:13:26 -07:00
Fan Zhang
cad5eb221c Merge "Delete a broken test" into qt-dev
am: c824a0cb82

Change-Id: I03296dda94edb42b9c9911a8594aca35bcb6465b
2019-05-01 07:10:51 -07:00
Antony Sargent
4e1273c53f Merge "Add 'Erase SIM' to mobile network details page" into qt-dev
am: 2740c4a052

Change-Id: I7fe388644b137549807d74b0a7888fdd9d7eab74
2019-05-01 07:08:19 -07:00
Sunny Shao
6fba302a0d Merge "Show mobile data slice in Search even no SIM card" into qt-dev
am: 8b285f2355

Change-Id: Ibb7ab1b8b0425938092b27dad980ef0c11ee2b66
2019-05-01 07:07:32 -07:00
Lifu Tang
1c0c74220d Merge "Update location app stats" into qt-dev am: 5bfa4b24e2
am: 3ee7292958

Change-Id: Icb598b8930394d65012bf4e7a82b7be2e80db19a
2019-04-30 23:11:07 -07:00
Yi-Ling Chuang
ab5cfcdf33 Merge "Only shows two suggestion cards at once." into qt-dev am: 15524dbaee
am: 191e38abec

Change-Id: I086330ea5c300ba13fdcdfa2d5e4e4ed0137ee9e
2019-04-30 22:57:18 -07:00
Lei Yu
2f862295fd Merge "Fix a crash in battery settings page" into qt-dev am: 116d4f14dc
am: cdce15c670

Change-Id: I3b3f4ccaa1efb7461d381906ca92d507d8c00a05
2019-04-30 22:33:43 -07:00
Daniel Solomon
608ad6f632 Hide display white balance setting depending on accessibility
To avoid conflicting with display accessibility features, hide the
display white balance setting when these features are active.

Bug: 130263943
Test: make ROBOTEST_FILTER=DisplayWhiteBalancePreferenceControllerTest
RunSettingsRoboTests -j32

Change-Id: I9936a657521287a7a0482f2a934430bd79013cf3
2019-04-30 22:00:17 -07:00
Lifu Tang
3ee7292958 Merge "Update location app stats" into qt-dev
am: 5bfa4b24e2

Change-Id: Ida6d56aa38861ae76654f7a01e2a0921bd1b5e6f
2019-04-30 21:57:34 -07:00
Yi-Ling Chuang
191e38abec Merge "Only shows two suggestion cards at once." into qt-dev
am: 15524dbaee

Change-Id: I628873293315d2850f95e8f42fbb011417dc50a5
2019-04-30 21:56:01 -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
Lei Yu
cdce15c670 Merge "Fix a crash in battery settings page" into qt-dev
am: 116d4f14dc

Change-Id: Icf99350b41c88a6f3f6aaafd34477e5af57a49d3
2019-04-30 19:21:41 -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
TreeHugger Robot
30d0e6c7d7 Merge "Fix null pointer in SubscriptionUtil" into qt-dev 2019-04-30 23:43:42 +00:00
TreeHugger Robot
1bf8fb8535 Merge "Update "Play media to" display rule in SoundSetting" into qt-dev 2019-04-30 23:07:28 +00:00
Xiangyu/Malcolm Chen
25de66c030 Merge "Create enable MMS notification." into qt-dev 2019-04-30 23:05:25 +00:00
Fan Zhang
c824a0cb82 Merge "Delete a broken test" into qt-dev 2019-04-30 20:55:35 +00: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
Fan Zhang
e2e104f563 Delete a broken test
The test has been broken for a while.

Fixes: 120505691
Test: robotest
Change-Id: I92537d1676ba1dc94595e87893ca7324d4740a70
2019-04-30 11:37:21 -07:00
Salvador Martinez
b5d471c19b Fix null pointer in SubscriptionUtil
Sometimes we get null sub info which causes a crash. This just
makes it so that if we see that we treat it as inactive since
there isn't really a world where an active null sub info makes
sense.

Test: atest SubscriptionUtilTest
Bug: 131603073
Change-Id: Id5ecbecf011e19ff02d9465e0571b1d17c83de9a
2019-04-30 09:59:27 -07:00
TreeHugger Robot
2740c4a052 Merge "Add 'Erase SIM' to mobile network details page" into qt-dev 2019-04-30 16:47:54 +00: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
cnchen
1c67af1762 "Change font size" tile should go to settings' font size page directly
Test: atest & manual test
Bug: 131374325
Change-Id: I878da8c22e315100ae50d3d34ff218c5d14e81d8
2019-04-30 19:54:18 +08:00
TreeHugger Robot
8b285f2355 Merge "Show mobile data slice in Search even no SIM card" into qt-dev 2019-04-30 11:05:37 +00: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