Jesse Evans
d7da58ade5
Merge "Removes instant apps from certain screens" into oc-dev am: 1c956b304a
...
am: 1a8318c7ed
2017-04-04 18:13:20 +00:00
Jesse Evans
1a8318c7ed
Merge "Removes instant apps from certain screens" into oc-dev
...
am: 1c956b304a
2017-04-04 17:59:37 +00:00
TreeHugger Robot
1c956b304a
Merge "Removes instant apps from certain screens" into oc-dev
2017-04-04 17:49:55 +00:00
Christine Franks
6d539dc7a4
Merge "Changed description for system alert window setting" into oc-dev am: 48c2d516de
...
am: c259cee35f
2017-04-04 17:38:29 +00:00
Sean Stout
87350960d7
Merge "Added Night Light Suggestion and tests" into oc-dev am: 1512b07a9b
...
am: c2ed9f8b7e
2017-04-04 17:38:14 +00:00
Christine Franks
c259cee35f
Merge "Changed description for system alert window setting" into oc-dev
...
am: 48c2d516de
2017-04-04 17:30:39 +00:00
Sean Stout
c2ed9f8b7e
Merge "Added Night Light Suggestion and tests" into oc-dev
...
am: 1512b07a9b
2017-04-04 17:30:22 +00:00
Christine Franks
48c2d516de
Merge "Changed description for system alert window setting" into oc-dev
2017-04-04 17:24:40 +00:00
Sean Stout
1512b07a9b
Merge "Added Night Light Suggestion and tests" into oc-dev
2017-04-04 17:19:44 +00:00
Jesse Evans
804854cdfe
Removes instant apps from certain screens
...
Removes instant apps from the Special Access screens, as well as
notifications.
Test: make RunSettingsRoboTests
Bug: 36515324
Change-Id: I5b2f0ee3219acd89e2cbdcefed4d9608450395c0
(cherry picked from commit 1c9b6092ee
2017-04-04 08:34:57 -07:00
Christine Franks
3bec2c3c25
Changed description for system alert window setting
...
Bug: 36070413
Test: make -j100, updated string appears in Settings
Change-Id: I962b17344ea5fc948c35e4d779ed5686df0d09a3
2017-04-04 15:05:16 +00:00
Jack He
fa183f7a49
Fix a crash when an app requests Bluetooth to be discoverable am: ebbfce0bf1
...
am: 4b27231fd4
2017-04-04 04:17:31 +00:00
Jack He
4b27231fd4
Fix a crash when an app requests Bluetooth to be discoverable
...
am: ebbfce0bf1
2017-04-04 04:12:08 +00:00
Jack He
ebbfce0bf1
Fix a crash when an app requests Bluetooth to be discoverable
...
* When an app requests Bluetooth to be discoverable with a timeout and a
non null EXTRA_PACKAGE_NAME, Settings app should put in the correct
timeout values in the dialog string
Bug: 36870303
Test: make, try making Bluetooth discoverable via
ACTION_REQUEST_DISCOVERABLE intent
Change-Id: I0cebc2f20371c9de5f28feb26425422c0777aa45
2017-04-04 01:53:20 +00:00
Jeff Sharkey
5a13d2fc4d
Merge "Don't try using a detached fragment." into oc-dev am: b59337c0eb
...
am: 019946868e
2017-04-04 01:31:09 +00:00
Jeff Sharkey
019946868e
Merge "Don't try using a detached fragment." into oc-dev
...
am: b59337c0eb
2017-04-04 01:26:59 +00:00
TreeHugger Robot
b59337c0eb
Merge "Don't try using a detached fragment." into oc-dev
2017-04-04 01:18:11 +00:00
Jeff Sharkey
5e2fc68668
Don't try using a detached fragment.
...
Test: builds, boots
Bug: 36486843
Change-Id: I3e2d2bcd56edcc86370f4b64dabdf155d63f40d3
2017-04-03 17:19:19 -06:00
TreeHugger Robot
b4e7b17223
Merge "Add AvailableVirtualKeyboardFragment to TV"
2017-04-03 22:04:18 +00:00
Sean Stout
062512641e
Added Night Light Suggestion and tests
...
Bug: 34900174
Test: make ROBOTEST_FILTER=SettingsSuggestionsTest RunSettingsRoboTests
Change-Id: I5b2d4e5debc1403cfcbf9c6ecf9397d1074e3a29
2017-04-03 14:46:25 -07:00
Maurice Lam
ca022e2b9b
Merge "Fix suggested action custom view binding"
2017-04-03 21:38:20 +00:00
Maurice Lam
68d6bcd18a
Merge "Rebuild suggestions when suggestions are dismissed"
2017-04-03 21:37:59 +00:00
Stephen Chen
fb3bdd7ed4
Merge "Add friction icon for metered networks." into oc-dev am: 9b271041a9
...
am: c1288e2630
2017-04-03 18:51:58 +00:00
Stephen Chen
c1288e2630
Merge "Add friction icon for metered networks." into oc-dev
...
am: 9b271041a9
2017-04-03 18:40:34 +00:00
Hemant Gupta
06dc823fb7
Merge "Bluetooth: Fix Resource Leak in OPP (1/2)" am: e270a6aa85 am: 2ffab51c0e am: b5e14d5f30
...
am: ec6815ea7c
2017-04-03 18:40:19 +00:00
TreeHugger Robot
9b271041a9
Merge "Add friction icon for metered networks." into oc-dev
2017-04-03 18:24:02 +00:00
Hemant Gupta
ec6815ea7c
Merge "Bluetooth: Fix Resource Leak in OPP (1/2)" am: e270a6aa85 am: 2ffab51c0e
...
am: b5e14d5f30
2017-04-03 17:57:42 +00:00
Hemant Gupta
b5e14d5f30
Merge "Bluetooth: Fix Resource Leak in OPP (1/2)" am: e270a6aa85
...
am: 2ffab51c0e
2017-04-03 17:54:06 +00:00
Hemant Gupta
2ffab51c0e
Merge "Bluetooth: Fix Resource Leak in OPP (1/2)"
...
am: e270a6aa85
2017-04-03 17:50:36 +00:00
Treehugger Robot
e270a6aa85
Merge "Bluetooth: Fix Resource Leak in OPP (1/2)"
2017-04-03 17:43:42 +00:00
Amin Shaikh
fa04ad4e8f
Fix NPE when forgetting networks. am: 3c0d5ff3d1
...
am: f73b263583
2017-04-02 21:36:50 +00:00
Amin Shaikh
f73b263583
Fix NPE when forgetting networks.
...
am: 3c0d5ff3d1
2017-04-02 21:33:55 +00:00
Amin Shaikh
3c0d5ff3d1
Fix NPE when forgetting networks.
...
- Fixed disablement of ephemeral networks
- Exit out of the fragment when Forget is pressed
Bug: 36723238
Test: m RunSettingsRoboTests and manual testing
Change-Id: I83c09a44dbef0f02a452dc8c3163523a27bd4b63
2017-04-02 12:19:42 -07:00
TreeHugger Robot
5ed1fc855e
Merge "Adds the Clear App dialog for Instant Apps"
2017-04-02 18:25:26 +00:00
Jesse Evans
ee37bd1a61
Merge "Removes summary text from Instant Apps details" into oc-dev am: 8fc0d1f948
...
am: 6ecbdadd6a
2017-04-02 16:20:33 +00:00
Jesse Evans
6ecbdadd6a
Merge "Removes summary text from Instant Apps details" into oc-dev
...
am: 8fc0d1f948
2017-04-02 16:17:35 +00:00
Jesse Evans
8fc0d1f948
Merge "Removes summary text from Instant Apps details" into oc-dev
2017-04-02 16:13:54 +00:00
Jesse Evans
91c51146a4
Merge "Removes instant apps from certain screens"
2017-04-02 16:09:32 +00:00
Lei Yu
b643a0d30b
Merge "Fix crash when opening battery page"
2017-04-02 07:03:48 +00:00
Lei Yu
851e73b8a2
Merge "Ui changes in battery main page"
2017-04-02 07:03:10 +00:00
Bill Yi
760eca3d64
Import translations. DO NOT MERGE am: 66ff06da2f -s ours am: c7ca1bcf70 -s ours
...
am: ff8eb394ad
2017-04-02 04:03:21 +00:00
Bill Yi
ff8eb394ad
Import translations. DO NOT MERGE am: 66ff06da2f -s ours
...
am: c7ca1bcf70
2017-04-02 04:00:21 +00:00
Bill Yi
c7ca1bcf70
Import translations. DO NOT MERGE
...
am: 66ff06da2f
2017-04-02 03:58:11 +00:00
Bill Yi
66ff06da2f
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 36832302
Change-Id: I940468be84cb7790fb9c205c3648e526a4b32422
2017-04-01 16:45:18 -07:00
Charles He
2a3513673f
VPN settings: add missing string resource am: 1b5015cae6
...
am: eea0037272
2017-04-01 20:50:57 +00:00
Charles He
eea0037272
VPN settings: add missing string resource
...
am: 1b5015cae6
2017-04-01 20:47:57 +00:00
Charles He
1b5015cae6
VPN settings: add missing string resource
...
Previously, a string resource was deleted by mistake in commit
cce4e61260
2017-04-01 18:37:10 +00:00
Bartosz Fabianowski
b01ec531ee
Merge "Keep EnterprisePrivacySettingsActivity always enabled" into oc-dev am: 5569816021
...
am: 9f7308baad
2017-04-01 05:21:02 +00:00
Bartosz Fabianowski
4c68f06bc8
Merge "Device management info: Refer to current user, not primary user" into oc-dev am: 57a0771bf5
...
am: 1e67d8902c
2017-04-01 05:20:48 +00:00
Bartosz Fabianowski
9f7308baad
Merge "Keep EnterprisePrivacySettingsActivity always enabled" into oc-dev
...
am: 5569816021
2017-04-01 05:20:07 +00:00
