Felipe Leme
df9714e9de
Merge "Implemented onRestrictBackgroundBlacklistChanged()." into nyc-dev
...
am: c769ddd330
* commit 'c769ddd330c7b5734c5c319ef7fc3cabd0c226f8':
Implemented onRestrictBackgroundBlacklistChanged().
Change-Id: Ia3bd9fa234c8ccff136e9999b87abf642ecc9d17
2016-05-17 18:43:58 +00:00
Felipe Leme
fd122829ec
Merge "Implemented onRestrictBackgroundBlacklistChanged()." into nyc-dev am: c769ddd330
...
am: 26e2c6bc26
* commit '26e2c6bc260e33b14ab25a82a9622d97c4d46447':
Implemented onRestrictBackgroundBlacklistChanged().
Change-Id: Iac0d0baa11ba15176884fad16321242ebd822382
2016-05-17 18:41:52 +00:00
Daniel Nishi
2582b5f108
Merge "Add the automatic storage manager settings." into nyc-mr1-dev
...
am: 699efba106
* commit '699efba10667eb18bd28de02aebb549257baf53e':
Add the automatic storage manager settings.
Change-Id: I7518c8784a43ee522ebc3ff06097c474b24d2725
2016-05-17 18:41:51 +00:00
Felipe Leme
26e2c6bc26
Merge "Implemented onRestrictBackgroundBlacklistChanged()." into nyc-dev
...
am: c769ddd330
* commit 'c769ddd330c7b5734c5c319ef7fc3cabd0c226f8':
Implemented onRestrictBackgroundBlacklistChanged().
Change-Id: Ifb0c4bdfa825948cb18d382c0c8eb29ce3d187b7
2016-05-17 18:39:08 +00:00
TreeHugger Robot
c769ddd330
Merge "Implemented onRestrictBackgroundBlacklistChanged()." into nyc-dev
2016-05-17 18:28:21 +00:00
Daniel Nishi
699efba106
Merge "Add the automatic storage manager settings." into nyc-mr1-dev
2016-05-17 18:10:53 +00:00
Rachel Zhang
f5239e1e7c
Merge "Remove settings overflow menu" into nyc-mr1-dev
...
am: 97a8db3c8a
* commit '97a8db3c8af60ffa381347963a0ccaf700a71ee7':
Remove settings overflow menu
Change-Id: I081b2dab824053294749995deb41147c8620a57a
2016-05-17 16:56:20 +00:00
Rachel Zhang
97a8db3c8a
Merge "Remove settings overflow menu" into nyc-mr1-dev
2016-05-17 16:51:25 +00:00
Daniel Nishi
116a55cdab
Add the automatic storage manager settings.
...
This provides a toggle for changing if the storage manager
is turned on or off and how many days of data to retain.
It is currently not hooked up to anything currently and only acts as
the view, pending b/28600825.
Bug: 28560570
Change-Id: Iaa2d819f26addab4dc02ced80e9ba79e0fcf0980
2016-05-17 09:32:12 -07:00
Daniel Nishi
8ab8e4c6c4
Merge "Add an alert dialog before clearing data in deletion helper." into nyc-mr1-dev
...
am: e86eae854c
* commit 'e86eae854cb8c31d67497578dc5ba78ae50e8d8e':
Add an alert dialog before clearing data in deletion helper.
Change-Id: Ide9c26bcfa719b812eecec43ef63ca6f7a8f0a54
2016-05-17 16:26:12 +00:00
Daniel Nishi
e86eae854c
Merge "Add an alert dialog before clearing data in deletion helper." into nyc-mr1-dev
2016-05-17 16:21:27 +00:00
Shweta Chahar
b30db5ebd9
Merge "Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element." into nyc-dev am: 1cb87b2af5
...
am: b34112820a
* commit 'b34112820a7dcee3a85a8e7163b194f614a9e840':
Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element.
Change-Id: Ie097c2500e58c7cf6472b3f8962c59f376f8b6bf
2016-05-17 14:34:55 +00:00
shwetachahar
d16f4fd531
Merge "Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element." into nyc-dev
...
am: 1cb87b2af5
* commit '1cb87b2af57df71d56951c43aa28b8d01b4fb2a7':
Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element.
Change-Id: Id9f34074524813aedcf2994fd1a424b5e2b0185c
2016-05-17 14:32:45 +00:00
shwetachahar
b34112820a
Merge "Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element." into nyc-dev
...
am: 1cb87b2af5
* commit '1cb87b2af57df71d56951c43aa28b8d01b4fb2a7':
Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element.
Change-Id: I72f2a0a95aadb87031ab53c9d2479f45f3e452ef
2016-05-17 14:32:16 +00:00
Shweta Chahar
1cb87b2af5
Merge "Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element." into nyc-dev
2016-05-17 14:27:09 +00:00
Robin Lee
dfd2fc6d06
Don't crash trying to disable lockdown VPN
...
Bug: 28624328
Change-Id: I2b726453da43feaf5f46d45679a702a52e6f4df0
2016-05-17 14:58:32 +01:00
shwetachahar
43d93289ba
Modify the TTS engine preference UI so that the radio button and the TTS
...
engine name are a single focusable element.
Bug: 27136946
Change-Id: I502634e0942b9fe30e290ce9de6ba293f33bf863
2016-05-17 13:56:57 +01:00
yifan.bai
4bf1704650
Fix register multiple PhoneStateListeners.
...
To avoid multiple PhoneStateListeners are registered, when user changes
the tab between SIMs, unregister the previous listener.
Change-Id: I99cf36a2c25bfbb74322b55efc6d751ea96810e5
2016-05-17 09:47:43 +00:00
Daniel Nishi
46c32b9e32
Add an alert dialog before clearing data in deletion helper.
...
The dialog states how much space will be freed by the deletion
and prompts the user to either cancel or continue with the
deletion.
BUG: 28762412
Change-Id: I8db2a8f928c82ebaa2cf5fea030b6b6f4730eb3e
2016-05-16 15:36:28 -07:00
Rachel Zhang
471815e4bd
Remove settings overflow menu
...
Bug: 28139684
Change-Id: I099af85878fde5f2317be312f979994fbbc87287
2016-05-16 13:43:51 -07:00
Felipe Leme
b2c4949de7
Implemented onRestrictBackgroundBlacklistChanged().
...
BUG: 28743623
Change-Id: I2d8620360858660fed0e745b16dc61ce262b90b9
2016-05-16 20:43:12 +00:00
Julia Reynolds
1f9ae181b0
Merge "Fix crash on rotation." into nyc-dev am: 075690875b
...
am: edd4824d44
* commit 'edd4824d44ada4095d8715e26fba08479a6d7219':
Fix crash on rotation.
Change-Id: I108cd3d51018987f37b6249e53684eb81b4de832
2016-05-16 20:22:30 +00:00
Julia Reynolds
edd4824d44
Merge "Fix crash on rotation." into nyc-dev
...
am: 075690875b
* commit '075690875b437822d23dc38df5e1c02564a7b83e':
Fix crash on rotation.
Change-Id: I6bb07ec33e7fa029047d416d758cfa8e6985d3af
2016-05-16 20:19:50 +00:00
Julia Reynolds
3d18e1991a
Merge "Fix crash on rotation." into nyc-dev
...
am: 075690875b
* commit '075690875b437822d23dc38df5e1c02564a7b83e':
Fix crash on rotation.
Change-Id: I08a281fa426b81ebcf0021b89adbe04379d305ec
2016-05-16 20:19:46 +00:00
Julia Reynolds
075690875b
Merge "Fix crash on rotation." into nyc-dev
2016-05-16 20:12:06 +00:00
Julia Reynolds
176b28663b
Fix crash on rotation.
...
Change-Id: Ife0a040bfc1a6ecc579d544f78cc45e37f5bca3c
Fixes: 28767083
2016-05-16 15:56:15 -04:00
Julia Reynolds
c34538754a
Merge "Catch rule creation exceptions." into nyc-dev am: f1c2e62f4e
...
am: 84082aac24
* commit '84082aac240febc46d6db1b94530b047e522b200':
Catch rule creation exceptions.
Change-Id: I99aeb96b8e8b9494a4e388f53e52bdb90288970d
2016-05-16 18:34:17 +00:00
Julia Reynolds
84082aac24
Merge "Catch rule creation exceptions." into nyc-dev
...
am: f1c2e62f4e
* commit 'f1c2e62f4ec00205dc1e78ff66e77d8380d9a6f2':
Catch rule creation exceptions.
Change-Id: I2d5d9e15f0c86b700b8c3a058e3cf92e36591173
2016-05-16 18:29:21 +00:00
Julia Reynolds
35dc1899a6
Merge "Catch rule creation exceptions." into nyc-dev
...
am: f1c2e62f4e
* commit 'f1c2e62f4ec00205dc1e78ff66e77d8380d9a6f2':
Catch rule creation exceptions.
Change-Id: Ia0aa67e7aa968b18dc54a4a171780fb283b3bee8
2016-05-16 18:29:16 +00:00
Julia Reynolds
f1c2e62f4e
Merge "Catch rule creation exceptions." into nyc-dev
2016-05-16 18:22:15 +00:00
Clara Bayarri
709ba02218
Rename requestKeyboardShortcutsHelper am: fcc411c807
...
am: 41db2612ff
* commit '41db2612ff1dc8a2cd3e54142a269e211f2529cc':
Rename requestKeyboardShortcutsHelper
Change-Id: I90b0e5f7be3825d462b964d14eb0183273d119ef
2016-05-16 15:14:44 +00:00
Clara Bayarri
41db2612ff
Rename requestKeyboardShortcutsHelper
...
am: fcc411c807
* commit 'fcc411c8078e4be5f1f77d7a28b8ce0be20206d5':
Rename requestKeyboardShortcutsHelper
Change-Id: I807f9d504e2a93b2090f22261c9ff911eb3349cc
2016-05-16 15:09:33 +00:00
Clara Bayarri
0220d40488
Rename requestKeyboardShortcutsHelper
...
am: fcc411c807
* commit 'fcc411c8078e4be5f1f77d7a28b8ce0be20206d5':
Rename requestKeyboardShortcutsHelper
Change-Id: I5333409492e2a64d4015c601714e1d0ec041e54f
2016-05-16 15:09:31 +00:00
Julia Reynolds
992422fd5e
Catch rule creation exceptions.
...
Bug: 28775583
Change-Id: I54c4af0352c88b27717660741709ec54e4749656
2016-05-16 09:53:23 -04:00
Clara Bayarri
fcc411c807
Rename requestKeyboardShortcutsHelper
...
Per API Council feedback
Bug: 28775576
Change-Id: Ia19668dceb7da2222e9716fcb1caff8d0ee86c41
2016-05-16 14:16:46 +01:00
Steven Ng
958d1253c5
Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev
...
am: 030060a321
* commit '030060a32166990585cf0ef2c007e7f787e5dd7d':
Add a Global setting for disabling OEM unlocking setting
Change-Id: I8fa26a26e174e0e44875eb925aad9f3978373e04
2016-05-16 09:25:39 +00:00
Steven Ng
030060a321
Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev
2016-05-16 09:20:43 +00:00
Daniel Nishi
e592a41727
Merge "Add an Activity to handle Intents to invoke the Deletion Helper." into nyc-mr1-dev
...
am: 03f26d3997
* commit '03f26d39972d4d063096ccbc00ebec53365ce455':
Add an Activity to handle Intents to invoke the Deletion Helper.
Change-Id: I7322ce796fe4910d9904e37d0bf142bbc90b5f47
2016-05-14 01:23:28 +00:00
Daniel Nishi
03f26d3997
Merge "Add an Activity to handle Intents to invoke the Deletion Helper." into nyc-mr1-dev
2016-05-14 01:14:15 +00:00
Daniel Nishi
de98b25c01
Merge "Add downloads to the deletion helper." into nyc-mr1-dev
...
am: 95c3c5045f
* commit '95c3c5045fde4667e8085d69a0aba4b82126d682':
Add downloads to the deletion helper.
Change-Id: I192143eb333d584b4ec792913eda79d9614c6150
2016-05-14 00:12:32 +00:00
Daniel Nishi
95c3c5045f
Merge "Add downloads to the deletion helper." into nyc-mr1-dev
2016-05-14 00:05:01 +00:00
Daniel Nishi
287d91181f
Add an Activity to handle Intents to invoke the Deletion Helper.
...
This will allow apps to launch the deletion helper when they need to
have space freed up.
To launch the activity using an intent, you can set it as follows:
Intent intent = new Intent(Settings.ACTION_DELETION_HELPER_SETTINGS);
startActivity(intent);
This intent should bring up the Deletion Helper.
Bug: 28675265
Change-Id: I781615ccad4ca1fcae97817ecb823e5dcad67b5b
2016-05-13 17:03:30 -07:00
Sudheer Shanka
50f9e16450
Merge "Guard against exception when getting package installer info." into nyc-dev am: 15c1bb48c3
...
am: 3ad3bd66ad
* commit '3ad3bd66adb2be016654c8655f8bad4ddc0bcd79':
Guard against exception when getting package installer info.
Change-Id: I2de57942f4e844375e6dfe6f4f0a9489f9d6382b
2016-05-13 21:34:24 +00:00
Sudheer Shanka
b071fdca57
Merge "Guard against exception when getting package installer info." into nyc-dev
...
am: 15c1bb48c3
* commit '15c1bb48c3da3404a775c7101e3559772aa37d6e':
Guard against exception when getting package installer info.
Change-Id: I3cf5a62c44b12356b48f841a03874f93b1c23981
2016-05-13 21:29:02 +00:00
Sudheer Shanka
3ad3bd66ad
Merge "Guard against exception when getting package installer info." into nyc-dev
...
am: 15c1bb48c3
* commit '15c1bb48c3da3404a775c7101e3559772aa37d6e':
Guard against exception when getting package installer info.
Change-Id: Ibe6459ec92ffe90872c3380d865baea6cb257508
2016-05-13 21:29:01 +00:00
TreeHugger Robot
15c1bb48c3
Merge "Guard against exception when getting package installer info." into nyc-dev
2016-05-13 21:18:06 +00:00
Daniel Nishi
2ef20fb36d
Add downloads to the deletion helper.
...
This adds a deletion service to delete files in the Downloads
folder. All of the files there are collected and offered to the
user to delete.
Bug: 28621781
Change-Id: I94431f9abc3a0afa2d07dbab763312c09e830aef
2016-05-13 13:35:37 -07:00
Sudheer Shanka
aed0537aaf
Guard against exception when getting package installer info.
...
Bug: 28742227
Change-Id: I8742c882ae6b18cb8f51a9da04170358a20a7d48
2016-05-13 12:58:42 -07:00
Julia Reynolds
d7a6287f9e
Merge "Don\'t crash on invalid numbers." into nyc-dev am: 5c401966a3
...
am: 54408a74fa
* commit '54408a74fa7988a66dc5f68704a2751c23485c0e':
Don't crash on invalid numbers.
Change-Id: Idbcf00b60beaf13d5d023832ea9a6c9c0a9debbe
2016-05-13 18:24:22 +00:00
Daniel Nishi
e197dfa1fc
Merge "Entries in the Deletion Helper should be default unchecked." into nyc-mr1-dev
...
am: 4924839515
* commit '4924839515811deaff1b0a758101f4db47a77683':
Entries in the Deletion Helper should be default unchecked.
Change-Id: Iaa1bb02433378e3ad9ec0b1029566fc113d8fb14
2016-05-13 18:24:21 +00:00