Sanket Agarwal
261543c89b
Handle return value when Bluetooth is enabled am: 77ad3c2531
am: 63ddec0756
...
am: 3c2bd1a442
* commit '3c2bd1a44238c5844b4ec06018857f9dcb0cc7f2':
Handle return value when Bluetooth is enabled
Change-Id: Ibbba45ce3ea8401e2eeec75369e18047091b7044
2016-05-19 21:05:58 +00:00
Sanket Agarwal
3c2bd1a442
Handle return value when Bluetooth is enabled am: 77ad3c2531
...
am: 63ddec0756
* commit '63ddec075623cbe9d6a09dec75c3be205fa56d81':
Handle return value when Bluetooth is enabled
Change-Id: I712a01b1931400e92bc692d2730e22160bdb296d
2016-05-19 18:37:02 +00:00
Sanket Agarwal
63ddec0756
Handle return value when Bluetooth is enabled
...
am: 77ad3c2531
* commit '77ad3c2531c00c7b654162be826e93abb5e4dc75':
Handle return value when Bluetooth is enabled
Change-Id: I5db74292d85d6a8795b2b25afd3c89c3731bd533
2016-05-19 18:32:25 +00:00
Sanket Agarwal
77ad3c2531
Handle return value when Bluetooth is enabled
...
If the Bluetooth enable(true) returns false currently we are waiting for
a broadcast (which may not happen if enable returns false). We mark the
toggle to have failed (i.e. it is clickable and in OFF state) and the
switch bar text is appropriately shown.
Bug: b/28318203
Change-Id: I09ba46d2e102e7f2c4ef9a72bf38dedc1346364f
2016-05-19 18:27:03 +00:00
Daniel Nishi
4019400fb5
Merge "Don\'t show app in deletion helper if it was installed recently." into nyc-mr1-dev am: 0772471119
...
am: b09ecc6b8f
* commit 'b09ecc6b8fba4800cf4f1e819b063986245a121a':
Don't show app in deletion helper if it was installed recently.
Change-Id: I73924851d445159a521d35d50a398f30754d518b
2016-05-19 17:17:53 +00:00
Daniel Nishi
b09ecc6b8f
Merge "Don\'t show app in deletion helper if it was installed recently." into nyc-mr1-dev
...
am: 0772471119
* commit '07724711199a78720f4b1d9bdf365633e085b333':
Don't show app in deletion helper if it was installed recently.
Change-Id: I442adc220e730aca333eb49041cd2955a8f2e106
2016-05-19 17:13:34 +00:00
Daniel Nishi
0772471119
Merge "Don't show app in deletion helper if it was installed recently." into nyc-mr1-dev
2016-05-19 17:09:17 +00:00
Daniel Nishi
7ad6c44b15
Merge "Add an upsell dialog to activate the storage manager." into nyc-mr1-dev am: 83ff4b06ec
...
am: d85a19a970
* commit 'd85a19a97043eb7c22fee797655cc5cf55022af0':
Add an upsell dialog to activate the storage manager.
Change-Id: I25138268bf7f256f2c4d52b8f083e6e66d721d28
2016-05-19 17:05:15 +00:00
Daniel Nishi
d85a19a970
Merge "Add an upsell dialog to activate the storage manager." into nyc-mr1-dev
...
am: 83ff4b06ec
* commit '83ff4b06ecae86cbfed75938df793628723c076c':
Add an upsell dialog to activate the storage manager.
Change-Id: I0ac4d60411b135db3d3f876f4bec98c2663adf4c
2016-05-19 17:01:27 +00:00
Daniel Nishi
83ff4b06ec
Merge "Add an upsell dialog to activate the storage manager." into nyc-mr1-dev
2016-05-19 16:47:51 +00:00
Kenny Guy
86dbfc792a
Merge "Merge "Update work challenge background image." into nyc-dev am: 726085c5c7
am: cdc59c8709" into nyc-mr1-dev-plus-aosp
...
am: 5e01c6c2f6
* commit '5e01c6c2f6508b7a167ccc0f900b0938830488a5':
Change-Id: I99429f53fdae516733de5460ec8d192717c242fc
2016-05-19 11:14:38 +00:00
Kenny Guy
6468225b40
Merge "Update work challenge background image." into nyc-dev am: 726085c5c7
am: 01891c5bf0
...
am: 8da57a60f8
* commit '8da57a60f8e1a61a2e835fb95fd2049a12021a6d':
Update work challenge background image.
Change-Id: Ie1f18ff1c0eaee38362b1432fc26698ecca79ce3
2016-05-19 11:14:37 +00:00
Android Build Merger (Role)
5e01c6c2f6
Merge "Merge "Update work challenge background image." into nyc-dev am: 726085c5c7
am: cdc59c8709" into nyc-mr1-dev-plus-aosp
2016-05-19 11:11:22 +00:00
Kenny Guy
a848b1048f
Merge "Update work challenge background image." into nyc-dev am: 726085c5c7
...
am: cdc59c8709
* commit 'cdc59c87090f16afbc4336062ce371317b2def0b':
Update work challenge background image.
Change-Id: I266f8e0be6ddf4135bf0a11694210a1639df2762
2016-05-19 11:11:10 +00:00
Kenny Guy
8da57a60f8
Merge "Update work challenge background image." into nyc-dev am: 726085c5c7
...
am: 01891c5bf0
* commit '01891c5bf07db8df50bac4b3f21744187815557e':
Update work challenge background image.
Change-Id: I7f41624bd0918f9127c934cfaf15e8762be35c0a
2016-05-19 11:11:08 +00:00
Kenny Guy
01891c5bf0
Merge "Update work challenge background image." into nyc-dev
...
am: 726085c5c7
* commit '726085c5c7016a828850580a21e09d2330a20ce4':
Update work challenge background image.
Change-Id: Iadf215b82f1753c88471acad41ff70fe3242e65a
2016-05-19 11:07:59 +00:00
Kenny Guy
cdc59c8709
Merge "Update work challenge background image." into nyc-dev
...
am: 726085c5c7
* commit '726085c5c7016a828850580a21e09d2330a20ce4':
Update work challenge background image.
Change-Id: Ie16ea20b5c848814d9bd48b1c704f6a3cc73d35c
2016-05-19 11:07:59 +00:00
Kenny Guy
726085c5c7
Merge "Update work challenge background image." into nyc-dev
2016-05-19 11:01:37 +00:00
TreeHugger Robot
35a058ce8c
Merge "Display total storage for Internal shared storage."
2016-05-18 22:35:27 +00:00
Baligh Uddin
b761e10ef1
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7ffeda3633
-s ours am: 43a6de268d
-s ours
...
am: fe73d01eba
-s ours
* commit 'fe73d01ebab81ef85b4eda15d8ba0d6b2144be4f':
Change-Id: I0703aa0325715f5879a48bd05531d0849a9f078e
2016-05-18 19:30:43 +00:00
Baligh Uddin
9ceab5183a
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7ffeda3633
-s ours am: 5736532e19
-s ours
...
am: 9a0da1eb79
-s ours
* commit '9a0da1eb79e132bd0ae7450da11e5e606a64e5fc':
Import translations. DO NOT MERGE
Change-Id: I5ed8201864c9d27c9e9d7fc865680498373457ae
2016-05-18 19:30:42 +00:00
Baligh Uddin
fe73d01eba
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7ffeda3633
-s ours
...
am: 43a6de268d
-s ours
* commit '43a6de268d5996f94eaa3c7f154a7cdf5d2c46a4':
Change-Id: I86c55dd3e0a2d2dc926e0599b63d2f53e04b0dc3
2016-05-18 19:25:03 +00:00
Baligh Uddin
9a0da1eb79
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7ffeda3633
-s ours
...
am: 5736532e19
-s ours
* commit '5736532e1944c56a2a6ab0f71fbb4d1dc09cfc5d':
Import translations. DO NOT MERGE
Change-Id: I1aa08062675ddd931a23f74103a90a1875af4b19
2016-05-18 19:22:30 +00:00
Baligh Uddin
9d64c9c344
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: be840c80cb
-s ours
...
am: 59d13e52d9
-s ours
* commit '59d13e52d904ee2f07e2d2eb9452616681a4199a':
Import translations. DO NOT MERGE
Change-Id: I764e55ad97c2114148d96bda0110d956670b970f
2016-05-18 19:19:58 +00:00
Baligh Uddin
5736532e19
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 7ffeda3633
-s ours
* commit '7ffeda3633ee5296e8403da1042ac4e7321a3023':
Import translations. DO NOT MERGE
Change-Id: I49ec349b40cbc6715479d3b0968337f05d4f9b12
2016-05-18 19:17:05 +00:00
Baligh Uddin
59d13e52d9
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: be840c80cb
-s ours
* commit 'be840c80cbf79a06a82acea65035f35c51a4cdac':
Import translations. DO NOT MERGE
Change-Id: I62c4f546f41886284b4c4b1c5c4c3b96b0ba23a8
2016-05-18 19:14:15 +00:00
Baligh Uddin
43a6de268d
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 7ffeda3633
-s ours
* commit '7ffeda3633ee5296e8403da1042ac4e7321a3023':
Import translations. DO NOT MERGE
Change-Id: I613a4c8aba7a51e232985f6025660c71f8dab169
2016-05-18 19:13:59 +00:00
Baligh Uddin
7ffeda3633
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-05-18 19:06:53 +00:00
Baligh Uddin
be840c80cb
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-05-18 19:06:48 +00:00
Baligh Uddin
946a0ead3c
Merge "Import translations. DO NOT MERGE"
2016-05-18 18:56:47 +00:00
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
yifan.bai
eb88257f07
Merge "Fix register multiple PhoneStateListeners."
...
am: 91f6b496a9
* commit '91f6b496a99e085d853d684485c8486125f83f45':
Fix register multiple PhoneStateListeners.
Change-Id: I00a37f58a9f2eccb138bbbdee2bc05323e05237a
2016-05-18 18:02:56 +00:00
Robert Greenwalt
91f6b496a9
Merge "Fix register multiple PhoneStateListeners."
2016-05-18 17:54:47 +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
Kenny Guy
846e182385
Update work challenge background image.
...
Updated so the orange briefcase in the image
isn't central so avoiding clashing with text.
Bug: 28557192
Change-Id: Ic8e4ea71f47449e81619b28b979f59c3d9aaf6a0
2016-05-18 16:14:19 +01:00
Julia Reynolds
c6e50d7b66
Merge "Merge "Null check." into nyc-dev am: fc1bb74186
am: 1ca6867e35" into nyc-mr1-dev-plus-aosp
...
am: a638e869f1
* commit 'a638e869f1ec02f4f49e263cefdae99d30e53a86':
Change-Id: I196f70728ccfb0921e8175d1a55362bf261ee8bc
2016-05-18 14:15:12 +00: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
Android Build Merger (Role)
a638e869f1
Merge "Merge "Null check." into nyc-dev am: fc1bb74186
am: 1ca6867e35" into nyc-mr1-dev-plus-aosp
2016-05-18 14:12:58 +00:00
Julia Reynolds
5e8831c6b1
Merge "Null check." into nyc-dev am: fc1bb74186
...
am: 1ca6867e35
* commit '1ca6867e3541d30fc1dd8a51a856e49dda675bdb':
Null check.
Change-Id: Ib62b96a074606166dafd1c1cf3d6905df491a67c
2016-05-18 14:12:44 +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
8dbd68cbb7
Follow class package change: LocaleList am: 1ef9c4afd5
am: 161def60eb
...
am: 4211355575
* commit '4211355575bb1d5f3eef3db81a4093258b0bf1f5':
Change-Id: I1f4b6818c2e644224ea7f28d9b8c07eccc830466
2016-05-18 02:51:23 +00:00
Yohei Yukawa
4211355575
Follow class package change: LocaleList am: 1ef9c4afd5
...
am: 161def60eb
* commit '161def60eb1e4a0b9b556ec828f55b0a9fc537b0':
Change-Id: I4d91a07c2190d6508f4c7fe8f1c82b4d51e57cfc
2016-05-18 02:48:10 +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