Julia Reynolds
d81633ab96
Merge "Fix 'show badge' for pre O apps" into pi-dev am: d31c655a12
...
am: 11a9d03687
2018-03-30 01:41:19 +00:00
Jerry Zhang
56dd224609
Merge "Explicity receive sticky usb intent" into pi-dev am: ee283563c8
...
am: 6ebe1935b5
2018-03-30 01:31:16 +00:00
Julia Reynolds
11a9d03687
Merge "Fix 'show badge' for pre O apps" into pi-dev
...
am: d31c655a12
2018-03-29 23:48:17 +00:00
Jerry Zhang
6ebe1935b5
Merge "Explicity receive sticky usb intent" into pi-dev
...
am: ee283563c8
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
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
Eran Messeri
bf652ca551
Merge "Require unlocked work profile to change notification settings" into pi-dev am: 5506097efd
...
am: 04da30d21a
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
2018-03-29 21:22:10 +00:00
Doris Ling
c925c8d534
Merge "Report unavailable data usage." into pi-dev am: a673f714c4
...
am: 4395decf14
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
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
2018-03-29 20:15:08 +00:00
Doris Ling
4395decf14
Merge "Report unavailable data usage." into pi-dev
...
am: a673f714c4
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
085ef3f60d
Merge "Add some debug logging" into pi-dev am: f3789adffd
...
am: 0169765b4f
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
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
2018-03-29 18:16:40 +00:00
Fan Zhang
0169765b4f
Merge "Add some debug logging" into pi-dev
...
am: f3789adffd
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
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
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
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
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
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
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
2018-03-29 16:32:07 +00:00
Beverly
020117e9ba
Merge "Settings should use Oxford comma" into pi-dev
...
am: 51646b5f07
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
TreeHugger Robot
db29040d2a
Merge "Import translations. DO NOT MERGE"
2018-03-29 15:11:32 +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
Bill Yi
86c1bb347a
Import translations. DO NOT MERGE
...
Change-Id: I424706ab77ce3c761a4114e569903958fdcedc99
Auto-generated-cl: translation import
2018-03-29 04:57:25 -07:00
Rubin Xu
53f59f9214
Merge "Confirm parent user's credential when setting lock for profile" into pi-dev am: b0a35de10b
...
am: 95970db0fa
2018-03-29 09:05:48 +00:00
Rubin Xu
95970db0fa
Merge "Confirm parent user's credential when setting lock for profile" into pi-dev
...
am: b0a35de10b
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
bd838bde93
Merge "Reduce size of 'GB' and '%' in storage settings." into pi-dev am: 01933aa02c
...
am: b2f7a325b4
2018-03-29 07:04:37 +00:00
Fan Zhang
2c7a10b34d
Merge changes I236b1124,Iad16b06e into pi-dev am: 6a89e511d1
...
am: 8c7824bc29
2018-03-29 05:13:37 +00:00
Andrew Chiang
bf824732b8
Merge "Update toggle text for Data Saver" into pi-dev am: f3ea58a7df
...
am: e469636038
2018-03-29 05:06:20 +00:00
