Commit Graph

44203 Commits

Author SHA1 Message Date
Fan Zhang
ffb6e93128 Merge changes I0fde4f80,Iea1cff48 into pi-dev am: 0ae4204f54
am: 4663e6e52a

Change-Id: I4cff256a0707543d8fd782ba7b3889c5d181ddff
2018-03-30 02:26:45 +00:00
Fan Zhang
24ebab4565 Merge "Revert "Support AOD in the Universal Settings API"" into pi-dev am: 9af6688a92
am: 1b176e3332

Change-Id: I5d15b83e4dce008fea16961e80593180cff45057
2018-03-30 01:42:40 +00:00
Doris Ling
8c62a83811 Merge "Fix visibility issue with fingerprint icon." into pi-dev am: 108c5452b5
am: 7acf9a574b

Change-Id: I816c482c1ecdb057b2c8d1d9da86cc3891b486d3
2018-03-30 01:41:56 +00:00
Julia Reynolds
d81633ab96 Merge "Fix 'show badge' for pre O apps" into pi-dev am: d31c655a12
am: 11a9d03687

Change-Id: Ib81c3784e158459a06ddc58d373dd0687d9d64c6
2018-03-30 01:41:19 +00:00
Jerry Zhang
56dd224609 Merge "Explicity receive sticky usb intent" into pi-dev am: ee283563c8
am: 6ebe1935b5

Change-Id: I0010852ae4c714f4c2eda5055e303c761a9194f7
2018-03-30 01:31:16 +00:00
Fan Zhang
4663e6e52a Merge changes I0fde4f80,Iea1cff48 into pi-dev
am: 0ae4204f54

Change-Id: I9f27d240ff5f4d2dcf0dbde6733730da294e9f4e
2018-03-30 00:54:21 +00:00
Fan Zhang
1b176e3332 Merge "Revert "Support AOD in the Universal Settings API"" into pi-dev
am: 9af6688a92

Change-Id: Ide6383302dd399a3c6eb1e1011fd88315bda948d
2018-03-29 23:58:03 +00:00
Doris Ling
7acf9a574b Merge "Fix visibility issue with fingerprint icon." into pi-dev
am: 108c5452b5

Change-Id: I2ef0e88b9599b2749e43dc1808d1e4c718c98adc
2018-03-29 23:52:26 +00:00
TreeHugger Robot
0ae4204f54 Merge changes I0fde4f80,Iea1cff48 into pi-dev
* changes:
  Update TimezoneInfoPrefController to register in xml
  Make FontSizePreferenceController slice compatible.
2018-03-29 23:49:22 +00:00
Julia Reynolds
11a9d03687 Merge "Fix 'show badge' for pre O apps" into pi-dev
am: d31c655a12

Change-Id: Icb08d133cc25653f8429b79d59529f1cce8e93b3
2018-03-29 23:48:17 +00:00
Jerry Zhang
6ebe1935b5 Merge "Explicity receive sticky usb intent" into pi-dev
am: ee283563c8

Change-Id: Idcf6eff8617cd3b088e8d58eee9c68e3bb2333de
2018-03-29 23:24:56 +00:00
Pengquan Meng
83afd8a971 Merge "Add apn data structure" 2018-03-29 23:19:11 +00:00
TreeHugger Robot
9af6688a92 Merge "Revert "Support AOD in the Universal Settings API"" into pi-dev 2018-03-29 23:10:45 +00:00
TreeHugger Robot
108c5452b5 Merge "Fix visibility issue with fingerprint icon." into pi-dev 2018-03-29 23:07:24 +00:00
TreeHugger Robot
d31c655a12 Merge "Fix 'show badge' for pre O apps" into pi-dev 2018-03-29 23:06:26 +00:00
TreeHugger Robot
ee283563c8 Merge "Explicity receive sticky usb intent" into pi-dev 2018-03-29 21:51:55 +00:00
Fan Zhang
65983f71d5 Update TimezoneInfoPrefController to register in xml
Test: robotest
Bug: 77216595
Change-Id: I0fde4f8058a8be156dddb620a756254cd85f6a9f
2018-03-29 14:38:44 -07:00
Eran Messeri
bf652ca551 Merge "Require unlocked work profile to change notification settings" into pi-dev am: 5506097efd
am: 04da30d21a

Change-Id: I4d1dacfe41db1f76576a49e829113837212871b1
2018-03-29 21:28:31 +00:00
Pengquan Meng
ee25956f57 Add apn data structure
This add a data structure to store the apn data locally.

Test: no test
Bug: 73745458
Bug: 67327863
Change-Id: Iae56583ab1c99f57154461c71a10b74db87ab1bd
2018-03-29 14:23:09 -07:00
Victor Chang
a7d9133461 Merge "Fix ZonePickerSettingsTest due to string change" into pi-dev am: 75f438cc37
am: 8995e8d9f6

Change-Id: I84aefcb56804a50693cbd44d776fecad28c550f6
2018-03-29 21:22:10 +00:00
Doris Ling
c925c8d534 Merge "Report unavailable data usage." into pi-dev am: a673f714c4
am: 4395decf14

Change-Id: I713f1fc8a1025087b8dfc775e45c63c0ff037c9c
2018-03-29 20:45:42 +00:00
Julia Reynolds
6f2450636a Fix 'show badge' for pre O apps
Test: make -j RunSettingsRoboTests
Change-Id: I20f6b38986afde0ca781329ffc24326601650a1f
Fixes: 69437269
2018-03-29 16:26:40 -04:00
Eran Messeri
04da30d21a Merge "Require unlocked work profile to change notification settings" into pi-dev
am: 5506097efd

Change-Id: I94b47ece9dccba04fcda28f7f02e86d19c0de1e1
2018-03-29 20:21:20 +00:00
Fan Zhang
f75edca09f Revert "Support AOD in the Universal Settings API"
This reverts commit 537c2cfc2c.

Fixes: 77278897

Change-Id: I7a5ff34bf79b87f6a7be50c2e8f421bfc4a22195
2018-03-29 20:20:31 +00:00
Eran Messeri
5506097efd Merge "Require unlocked work profile to change notification settings" into pi-dev 2018-03-29 20:17:18 +00:00
Victor Chang
8995e8d9f6 Merge "Fix ZonePickerSettingsTest due to string change" into pi-dev
am: 75f438cc37

Change-Id: Idaa83888a00597d581506bf7bc2aec7fdce2ff05
2018-03-29 20:15:08 +00:00
Doris Ling
4395decf14 Merge "Report unavailable data usage." into pi-dev
am: a673f714c4

Change-Id: I473eac43583caaa94093fabdfb6b588de290e36c
2018-03-29 20:14:04 +00:00
Doris Ling
92268fd640 Fix visibility issue with fingerprint icon.
- set icon tint color to control normal. The icon fill color is white,
and without the tint color set, it is invisible on a white background.

Change-Id: I9cda0e9105701230256620bd4ea904c96d7bc166
Fixes: 77151365
Test: visual
2018-03-29 13:08:09 -07:00
TreeHugger Robot
75f438cc37 Merge "Fix ZonePickerSettingsTest due to string change" into pi-dev 2018-03-29 20:01:26 +00:00
TreeHugger Robot
a673f714c4 Merge "Report unavailable data usage." into pi-dev 2018-03-29 19:57:44 +00:00
Jerry Zhang
0fa350eeaf Explicity receive sticky usb intent
Sticky intents are both returned by onReceive
and broadcast to the receiver. In some cases
though, the receiver could be unregistered
so quickly that it has no time to receive
it. When this happens the screen is not
refreshed, so explicity handle the intent
to ensure a refresh.

Fixes: 74255559
Test: screen refreshed property in multi-window
Change-Id: I2480dc35e28f98561ffed4b557f4bdaf83a73e9c
2018-03-29 12:55:23 -07:00
Fan Zhang
fc1590e901 Make FontSizePreferenceController slice compatible.
Bug: 67997826
Test: robotests
Change-Id: Iea1cff48f39e1433abea285309376876e8356c07
2018-03-29 12:33:13 -07:00
Fan Zhang
085ef3f60d Merge "Add some debug logging" into pi-dev am: f3789adffd
am: 0169765b4f

Change-Id: I59006ceb531f3096d04bc3e8ea9242707d0c9920
2018-03-29 19:12:45 +00:00
Daniel Nishi
b83e7a14a3 Merge "Don't allow a zero-length device name to work." into pi-dev am: 6ff8bbeb4a
am: 49058e92c7

Change-Id: I788a002a2d9432b7fb55146bbb9be3bba5ef82ed
2018-03-29 18:27:49 +00:00
Jeff Sharkey
70e4117cd1 Merge "Better public volumes handling on secondary users." into pi-dev am: bfc661ea3e
am: 978d2dd575

Change-Id: I17ef1a2163c3df258dd12a0f2c03e37c089c06e2
2018-03-29 18:16:40 +00:00
Fan Zhang
0169765b4f Merge "Add some debug logging" into pi-dev
am: f3789adffd

Change-Id: Iee699c9c5861e40fafb04a6b6edf6f68daedcd0c
2018-03-29 18:12:46 +00:00
Victor Chang
6366a3cc5d Fix ZonePickerSettingsTest due to string change
The change with id I1fb3e2abf80da3cb53cfbc3363bbe46e40a6ac22 broke the
test

Bug: 76209571
Test: atest SettingsUITests:ZonePickerSettingsTest
Change-Id: I6676e8669e1f396c9588e3096b62cc6aedcc38a9
2018-03-29 19:01:26 +01:00
TreeHugger Robot
f3789adffd Merge "Add some debug logging" into pi-dev 2018-03-29 17:59:40 +00:00
Fan Zhang
db139a6a44 Merge "Check time-spent-in-app intent must come from system app." into pi-dev am: 8e88874e47
am: 06a2555802

Change-Id: Ia28178fe8aa5b034bc988506dabb163352dfe3ff
2018-03-29 17:59:01 +00:00
Daniel Nishi
49058e92c7 Merge "Don't allow a zero-length device name to work." into pi-dev
am: 6ff8bbeb4a

Change-Id: Ic9e67a1a03b5ae2ac79326770c779e969849146e
2018-03-29 17:55:11 +00:00
Doris Ling
02b4cf2aca Report unavailable data usage.
- when showing the data usage graph, if the first data point is equal to
the first available data, insert a 0 usage point on the first day of
available data, so that it will show a flat line for the days that do
not have available data instead of showing a non-zero slope.

Change-Id: Ibf305e292a65ab3310ea12efbb575e3a7e1b6012
Fixes: 76155147
Test: make RunSettingsRoboTests
2018-03-29 10:54:54 -07:00
Jeff Sharkey
978d2dd575 Merge "Better public volumes handling on secondary users." into pi-dev
am: bfc661ea3e

Change-Id: I6bca0f8eb74f30251a4d06bd462b4590ee030d92
2018-03-29 17:45:08 +00:00
Daniel Nishi
6ff8bbeb4a Merge "Don't allow a zero-length device name to work." into pi-dev 2018-03-29 17:33:27 +00:00
Fan Zhang
06a2555802 Merge "Check time-spent-in-app intent must come from system app." into pi-dev
am: 8e88874e47

Change-Id: I4d4eb4d06d032e31d3e6dd1a0b2d3f0a866afb09
2018-03-29 17:22:29 +00:00
Jeff Sharkey
bfc661ea3e Merge "Better public volumes handling on secondary users." into pi-dev 2018-03-29 17:13:42 +00:00
yuemingw
3005660476 Merge "Disallow_airplane_mode should not disable mobile network." into pi-dev am: cc65760354
am: 59b7244dcc

Change-Id: Iff817627897dee78d0f54a0f571703a495e944e9
2018-03-29 17:05:11 +00:00
TreeHugger Robot
8e88874e47 Merge "Check time-spent-in-app intent must come from system app." into pi-dev 2018-03-29 16:55:30 +00:00
yuemingw
59b7244dcc Merge "Disallow_airplane_mode should not disable mobile network." into pi-dev
am: cc65760354

Change-Id: I13c39e2857bc58f6062a5d74ad3c4e672200a029
2018-03-29 16:53:38 +00:00
TreeHugger Robot
cc65760354 Merge "Disallow_airplane_mode should not disable mobile network." into pi-dev 2018-03-29 16:45:43 +00:00
Beverly
e711ea4afc Merge "Settings should use Oxford comma" into pi-dev am: 51646b5f07
am: 020117e9ba

Change-Id: I387368b20e038b9f2b920793b4b5e72064f27fd1
2018-03-29 16:32:07 +00:00