Commit Graph

43835 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
020117e9ba Merge "Settings should use Oxford comma" into pi-dev
am: 51646b5f07

Change-Id: I94ac135a10015933a2dc7e2d5d0b7d8f72b6b865
2018-03-29 16:09:50 +00:00
TreeHugger Robot
51646b5f07 Merge "Settings should use Oxford comma" into pi-dev 2018-03-29 15:41:21 +00:00
Eran Messeri
e0856e6d99 Require unlocked work profile to change notification settings
Require that the work profile be started and unlocked before the user
can change the notification settings for the work profile.

That prevents leaking of notifications from the work profile, which
could happen when the user set the work profile notifications to show
even if the profile was unlocked (an example scenario is a family member
of the user using the device while the work profile is locked).

Test: Manually with TestDPC
Bug: 75252682
Change-Id: I300d001b7439c0a1d0130d7dbc9ec4c2430be227
2018-03-29 14:54:53 +01:00
yuemingw
6e78482016 Disallow_airplane_mode should not disable mobile network.
Found mobile_network_settings preference is dependent on toggle_airplane
preference so once Disallow_airplane_mode is turned on,  toggle_airplane
preference will be set disabled, and mobile_network_settings preference
is also set disabled because of the dependence. Can fix this bug moving
the dependance and let MobileNetworkPreferenceController listen to
Settings.Global.AIRPLANE_MODE_ON.

Bug: 76468718
Test: manually but TestDpc
Change-Id: I137938766557d7bc5ae0795bc3359a6bfbae17e3
2018-03-29 14:34:33 +01:00
Beverly
bf4f4bf4ad Settings should use Oxford comma
Test: manual
Change-Id: Ie4edd64d423ce96ce097e91f9f5a31bb4339774c
Fixes: 77230158
2018-03-29 09:30:54 -04:00
Rubin Xu
95970db0fa Merge "Confirm parent user's credential when setting lock for profile" into pi-dev
am: b0a35de10b

Change-Id: I8df143549c8e4bb0e79350c8ee3d993a039f112f
2018-03-29 08:49:24 +00:00
Rubin Xu
b0a35de10b Merge "Confirm parent user's credential when setting lock for profile" into pi-dev 2018-03-29 08:35:46 +00:00
Jane Chiang
b2f7a325b4 Merge "Reduce size of 'GB' and '%' in storage settings." into pi-dev
am: 01933aa02c

Change-Id: Icee729e83d50e6447b1872fd4340b7f113fb7ec4
2018-03-29 03:24:18 +00:00
Jane Chiang
01933aa02c Merge "Reduce size of 'GB' and '%' in storage settings." into pi-dev 2018-03-29 03:20:35 +00:00
Jane Chiang
a2860a488d Reduce size of 'GB' and '%' in storage settings.
Test: Manual
Fixes: 62548317
Change-Id: I5ff8ff8c463c2718e48bf04731924922bc0ecc9c
2018-03-29 11:07:08 +08:00
Fan Zhang
8c7824bc29 Merge changes I236b1124,Iad16b06e into pi-dev
am: 6a89e511d1

Change-Id: I82ae2d375b99bd9c1ae58b2919ed87f02ed18adf
2018-03-29 03:04:11 +00:00
Andrew Chiang
e469636038 Merge "Update toggle text for Data Saver" into pi-dev
am: f3ea58a7df

Change-Id: I5119ec416a7c531eaf73fdf5e9c160f17e42b202
2018-03-29 03:02:49 +00:00
TreeHugger Robot
6a89e511d1 Merge changes I236b1124,Iad16b06e into pi-dev
* changes:
  Add conformance test for preference controller constructor
  Remove duplicate framework classes/robotest compile stub
2018-03-29 02:48:21 +00:00
Andrew Chiang
f3ea58a7df Merge "Update toggle text for Data Saver" into pi-dev 2018-03-29 02:44:04 +00:00
Fan Zhang
6deb639427 Merge "Fix a NPE when getting ZenMode in RingerMutedCondition." into pi-dev
am: 6b36c2e402

Change-Id: Ifad1dbe1fad852fa72ea005c2478cf77c651f79d
2018-03-29 02:05:34 +00:00
Scott Nien
1fd894fd66 Merge "Apply entity header effect to storage summary screen" into pi-dev
am: 27ba675ddd

Change-Id: Ic1b2b4cff34ecb5468420dac9d100e0226914609
2018-03-29 01:50:53 +00:00
TreeHugger Robot
6b36c2e402 Merge "Fix a NPE when getting ZenMode in RingerMutedCondition." into pi-dev 2018-03-29 01:23:41 +00:00
Fan Zhang
b803a23031 Check time-spent-in-app intent must come from system app.
Change-Id: Ie73aacdaf919b336d99a296328c2fbb4f75036b0
Fixes: 74580195
Test: robotests
2018-03-28 18:15:58 -07:00
Scott Nien
27ba675ddd Merge "Apply entity header effect to storage summary screen" into pi-dev 2018-03-29 01:07:46 +00:00
Fan Zhang
92ca05e15e Add conformance test for preference controller constructor
BasePreferenceController's constructor must be in a certain format in
order to work with search and slice. This test enforces that.

Change-Id: I236b11248b09ce71f052c449d39e994c84981a06
Fixes: 77216595
Test: robotests
2018-03-28 17:51:05 -07:00
Fan Zhang
e1398d1350 Remove duplicate framework classes/robotest compile stub
Bug: 76167422
Test: robotests
Change-Id: Iad16b06e54bd7290fd363c3abebdb8c66434c0e2
2018-03-28 17:51:05 -07:00
Dieter Hsu
9180cade44 Merge "Support AOD in the Universal Settings API" into pi-dev
am: 3025bc7c18

Change-Id: I90309ffd96e9668a286a3019691748e319ed6d4f
2018-03-29 00:42:11 +00:00
Dieter Hsu
3025bc7c18 Merge "Support AOD in the Universal Settings API" into pi-dev 2018-03-29 00:13:56 +00:00
Philip P. Moltmann
4280a00341 Merge "A18y: Don't double announce 'searching for printers.'" into pi-dev
am: f9cfc7c75a

Change-Id: I8198b511255e9e78e7c378adc62886aa4f31fac8
2018-03-28 23:59:30 +00:00
Fan Zhang
e2f9e63a2a Merge "Remove duplicate classes from test/robotests" into pi-dev
am: 8b63a03278

Change-Id: I2e82659b4341d3bec2ae0020216f73284c30f7f7
2018-03-28 23:26:59 +00:00
Fan Zhang
025d9d2a47 Fix a NPE when getting ZenMode in RingerMutedCondition.
Change-Id: If9a8b6f4a2d5e9b45402240d8e1401cef7dd001c
Fixes: 77217038
Test: robotest
2018-03-28 16:26:21 -07:00