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
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
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
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
Fan Zhang
6546fcb087
Merge "Fix a NPE when getting ZenMode in RingerMutedCondition." into pi-dev am: 6b36c2e402
...
am: 6deb639427
2018-03-29 04:54:28 +00:00
Scott Nien
e6e017f4c8
Merge "Apply entity header effect to storage summary screen" into pi-dev am: 27ba675ddd
...
am: 1fd894fd66
2018-03-29 04:28:09 +00:00
TreeHugger Robot
77448157f7
Merge "Fix the first link is not visible in the supported links"
2018-03-29 04:05:17 +00:00
Jane Chiang
b2f7a325b4
Merge "Reduce size of 'GB' and '%' in storage settings." into pi-dev
...
am: 01933aa02c
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
2018-03-29 03:04:11 +00:00
Andrew Chiang
e469636038
Merge "Update toggle text for Data Saver" into pi-dev
...
am: f3ea58a7df
2018-03-29 03:02:49 +00:00
Vincent Peng
f3f9ddc684
Merge "Change DataUsageSummaryPreference.setLimitInfo(String text) to take CharSequence"
2018-03-29 02:51:02 +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
Dieter Hsu
02aa04bc2b
Merge "Support AOD in the Universal Settings API" into pi-dev am: 3025bc7c18
...
am: 9180cade44
2018-03-29 02:38:34 +00:00
Fan Zhang
6deb639427
Merge "Fix a NPE when getting ZenMode in RingerMutedCondition." into pi-dev
...
am: 6b36c2e402
2018-03-29 02:05:34 +00:00
Philip P. Moltmann
6943d0d547
Merge "A18y: Don't double announce 'searching for printers.'" into pi-dev am: f9cfc7c75a
...
am: 4280a00341
2018-03-29 01:58:45 +00:00
Scott Nien
1fd894fd66
Merge "Apply entity header effect to storage summary screen" into pi-dev
...
am: 27ba675ddd
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
c9b47afad3
Merge "Remove duplicate classes from test/robotests" into pi-dev am: 8b63a03278
...
am: e2f9e63a2a
2018-03-29 01:16:24 +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
Doris Ling
5e63efee2e
Merge "Move IMS registration state to SIM status screen" into pi-dev am: 6fa3b89033
...
am: ab8d5cc02b
2018-03-29 01:01:55 +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
2018-03-29 00:42:11 +00:00
Victor Chang
283fcbc43c
Merge "Fix incorrect GMT offset in display" into pi-dev am: caf72cf3ff
...
am: b074d0640c
2018-03-29 00:29:59 +00:00
Dieter Hsu
3025bc7c18
Merge "Support AOD in the Universal Settings API" into pi-dev
2018-03-29 00:13:56 +00:00
