Robert Greenwalt
ed25cd454f
Merge "Fix register multiple PhoneStateListeners." am: 91f6b496a9 am: eb88257f07 am: aae2022cb5
...
am: dd433d73e7
* commit 'dd433d73e79970da5e5e034fe1b7315197c75960':
Fix register multiple PhoneStateListeners.
Change-Id: I03b5b9c8a02756613a39821368cff6de6fb1b3df
2016-05-18 18:28:34 +00:00
yifan.bai
dd433d73e7
Merge "Fix register multiple PhoneStateListeners." am: 91f6b496a9 am: eb88257f07
...
am: aae2022cb5
* commit 'aae2022cb593e1e96d7629b9c76a6eb5a58db4ff':
Fix register multiple PhoneStateListeners.
Change-Id: I5e2d8a59bda82246af553e16f98e7827ae6f99ef
2016-05-18 18:14:24 +00:00
Robert Greenwalt
aae2022cb5
Merge "Fix register multiple PhoneStateListeners." am: 91f6b496a9
...
am: eb88257f07
* commit 'eb88257f076323771fd1e9805708441efc2af03f':
Fix register multiple PhoneStateListeners.
Change-Id: Iece8c8bd197ed03835720f31174c710495a5998f
2016-05-18 18:06:49 +00:00
Daniel Nishi
c408e9c011
Don't show app in deletion helper if it was installed recently.
...
This solves several problems. The first is that if a user installs
a large app which triggers the deletion helper, the deletion helper
may clear out the recently installed large app to free up space.
The second is that it appears that the usage stats may not be
synced from device to device currently using Backup and Restore.
By considering the installation to be a use for deletion helper
filtering, this should avoid the problem for 60 days (and if the
user hasn't used the app at that point, it should be fair game
to clear).
Bug: 28800057
Change-Id: Idb8545aa45a42e45dc673dc5c179c0197204edfd
2016-05-18 09:56:43 -07:00
Daniel Nishi
0216e9dc2e
Add an upsell dialog to activate the storage manager.
...
After a manual clear, the user will be prompted to turn
on the storage manager, if it is turned off. The prompt
will only show up after certain defined delay times and
stop showing up entirely if denied enough times.
Currently, the dialog does not actually turn on the storage
manager because the storage manager is not yet landed.
Bug: 28801159
Change-Id: I3c221786d08a7102b3b5357416ab12692d1894cf
2016-05-18 09:25:38 -07:00
Julia Reynolds
29b7d0f73a
Merge "Null check." into nyc-dev am: fc1bb74186 am: d6575bcee2
...
am: e16aed4db5
* commit 'e16aed4db52ab55f88bd01436336732c49b19a65':
Null check.
Change-Id: I8231667d7c3c93d018a72b7f9f60e6f922880470
2016-05-18 14:15:11 +00:00
Julia Reynolds
e16aed4db5
Merge "Null check." into nyc-dev am: fc1bb74186
...
am: d6575bcee2
* commit 'd6575bcee288f1b6b9a825c793bbbfd3d00e27b7':
Null check.
Change-Id: Ifc8c584ec72f5fc19e45115d35cce7b3ef43a337
2016-05-18 14:12:42 +00:00
Julia Reynolds
d6575bcee2
Merge "Null check." into nyc-dev
...
am: fc1bb74186
* commit 'fc1bb74186c61712041dfa25e446391f7d8904a1':
Null check.
Change-Id: I1a170686d9df0c0094d154b2570f08f6145fe831
2016-05-18 14:10:13 +00:00
Julia Reynolds
1ca6867e35
Merge "Null check." into nyc-dev
...
am: fc1bb74186
* commit 'fc1bb74186c61712041dfa25e446391f7d8904a1':
Null check.
Change-Id: Idbcee7bd10b0f530c7d48760e93cd3f8be3448b5
2016-05-18 14:10:12 +00:00
Julia Reynolds
fc1bb74186
Merge "Null check." into nyc-dev
2016-05-18 14:02:05 +00:00
Yohei Yukawa
937d41faaf
Follow class package change: LocaleList am: 1ef9c4afd5 am: eb84d19de2
...
am: 340ab5f69b
* commit '340ab5f69b91221639228ea9581d9b41ccb533d5':
Follow class package change: LocaleList
Change-Id: I552e997e087cc1f8d7bb7e27f12169709754a027
2016-05-18 02:29:55 +00:00
Yohei Yukawa
340ab5f69b
Follow class package change: LocaleList am: 1ef9c4afd5
...
am: eb84d19de2
* commit 'eb84d19de23d9b35a417f77af542eac5275721e5':
Follow class package change: LocaleList
Change-Id: Ibf1754fe904b88bcdda6e0af891ba87b91ff84fe
2016-05-18 02:27:12 +00:00
Yohei Yukawa
eb84d19de2
Follow class package change: LocaleList
...
am: 1ef9c4afd5
* commit '1ef9c4afd56b534f836c38437624eabaa6691f0b':
Follow class package change: LocaleList
Change-Id: I725ad37be16a6175541a845cf537617f87dab7a1
2016-05-18 02:24:58 +00:00
Yohei Yukawa
161def60eb
Follow class package change: LocaleList
...
am: 1ef9c4afd5
* commit '1ef9c4afd56b534f836c38437624eabaa6691f0b':
Follow class package change: LocaleList
Change-Id: I5c36047c90d110aa241b86ea74b23648526833e8
2016-05-18 02:24:57 +00:00
Yohei Yukawa
1ef9c4afd5
Follow class package change: LocaleList
...
In order to avoid layering violation, LocaleList needs to be moved from
android.util package to android.os package [1]. This CL follows up that
package change.
No behavior change is intended.
[1]: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18
Bug: 28819696
Change-Id: Ibd7934b30062046830d63f33d1c6febef32da976
2016-05-17 16:25:39 -07:00
Julia Reynolds
47beeec10b
Null check.
...
Change-Id: I16dfe2cf265b4254aa69bc6165a8f72fc3954d7a
Fixes: 28531037
2016-05-17 16:14:10 -04:00
Felipe Leme
2d88dd7c42
Merge "Implemented onRestrictBackgroundBlacklistChanged()." into nyc-dev am: c769ddd330 am: 26e2c6bc26
...
am: fd122829ec
* commit 'fd122829ec0544d25f33c4842fc014fddcad9836':
Implemented onRestrictBackgroundBlacklistChanged().
Change-Id: Idabaf686ef95056feb22396943046e13de9d7651
2016-05-17 18:50:42 +00:00
Daniel Nishi
d0f1b67ed3
Merge "Add the automatic storage manager settings." into nyc-mr1-dev am: 699efba106
...
am: 2582b5f108
* commit '2582b5f108759362bd05e04b5f368c58f43194fc':
Add the automatic storage manager settings.
Change-Id: Ib24111573bd46be4fe8e327c4dd38170d04adc37
2016-05-17 18:50:41 +00:00
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
55cd13f44a
Merge "Remove settings overflow menu" into nyc-mr1-dev am: 97a8db3c8a
...
am: f5239e1e7c
* commit 'f5239e1e7c2e665b821400c5e0ce5daa9e82c592':
Remove settings overflow menu
Change-Id: Ib58b8d2942cf2db0540faaf33315c72d3c4a8c00
2016-05-17 16:59:03 +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
d8c0d970d6
Merge "Add an alert dialog before clearing data in deletion helper." into nyc-mr1-dev am: e86eae854c
...
am: 8ab8e4c6c4
* commit '8ab8e4c6c42a24fe60799a27edbbd4e04a9ce4e2':
Add an alert dialog before clearing data in deletion helper.
Change-Id: I2c47aeb1e604cb4628d2e7f711ba22bd1e2215d7
2016-05-17 16:28:45 +00: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
shwetachahar
66b46ff31f
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
...
am: b30db5ebd9
* commit 'b30db5ebd972bc467bc78faa647a038a64f6a583':
Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element.
Change-Id: Ic90bf5c75ff189b0f5c0a0b15d56ae6950846f53
2016-05-17 14:37:39 +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
495bd2c5a8
Merge "Fix crash on rotation." into nyc-dev am: 075690875b am: edd4824d44
...
am: 1f9ae181b0
* commit '1f9ae181b0165afea0e5f70d35d1b9ec1027b049':
Fix crash on rotation.
Change-Id: I88b20356aef9ebf32ffc6cfc9aa6048ce93d0494
2016-05-16 20:25:10 +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
Jiaquan He
8b9b00f964
Merge "Add an option allowing to skip wallpaper apps selection."
2016-05-16 19:21:46 +00:00
Julia Reynolds
314d265f3d
Merge "Catch rule creation exceptions." into nyc-dev am: f1c2e62f4e am: 84082aac24
...
am: c34538754a
* commit 'c34538754a9d18506f7c2d71e2db7c6a26fa2473':
Catch rule creation exceptions.
Change-Id: If2fecb8e96d4c468050fd560135b1d1034717102
2016-05-16 18:39:22 +00:00