Commit Graph

27607 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Pankaj Kanwar
f23a64afb8 Merge "Choose Bluetooth Device window cant\'t fill screen" into nyc-dev am: 4dd2fdf90b
am: 23e8435899

* commit '23e8435899fb06e6eb8c853e734d189ca2969b16':

Change-Id: Iebd464a3d91a1d8f79de2df0d437aee687922e20
2016-05-17 22:36:38 +00:00
Pankaj Kanwar
2a0f73ab89 Merge "Choose Bluetooth Device window cant\'t fill screen" into nyc-dev am: 4dd2fdf90b
am: edb9f49afe

* commit 'edb9f49afeabec1c1df7e1509c4f2f5567cc075a':
  Choose Bluetooth Device window cant't fill screen

Change-Id: I78d24c405566eaa5da282bbb2042d0c6f0d3cf40
2016-05-17 22:36:03 +00:00
pkanwar
edb9f49afe Merge "Choose Bluetooth Device window cant\'t fill screen" into nyc-dev
am: 4dd2fdf90b

* commit '4dd2fdf90b97b64931cbb1c7ca69b38cef58662e':
  Choose Bluetooth Device window cant't fill screen

Change-Id: I92577a0d913f0b8436df28708dc6d84c5c82c01a
2016-05-17 22:31:17 +00:00
pkanwar
23e8435899 Merge "Choose Bluetooth Device window cant\'t fill screen" into nyc-dev
am: 4dd2fdf90b

* commit '4dd2fdf90b97b64931cbb1c7ca69b38cef58662e':
  Choose Bluetooth Device window cant't fill screen

Change-Id: I3134f37ab8e0ac3e7367d26141c4a882051e8652
2016-05-17 22:31:15 +00:00
Pankaj Kanwar
4dd2fdf90b Merge "Choose Bluetooth Device window cant't fill screen" into nyc-dev 2016-05-17 22:16:49 +00:00
Julia Reynolds
47beeec10b Null check.
Change-Id: I16dfe2cf265b4254aa69bc6165a8f72fc3954d7a
Fixes: 28531037
2016-05-17 16:14:10 -04:00
pkanwar
956597eaf8 Choose Bluetooth Device window cant't fill screen
b/28684861: fixed the layout file to ensure that the separators cover
the entire screen.

Change-Id: I4471a1da901c9a4c0830ff0dfc943cd087ee1702
2016-05-17 12:03:42 -07:00
Felipe Leme
4331b410be Merge "Implemented onRestrictBackgroundBlacklistChanged()." into nyc-dev am: c769ddd330
am: df9714e9de

* commit 'df9714e9de5506100669480ae19e723a9957a3ef':

Change-Id: I9aecb8efe4b187614fac26cec9341eaed1637489
2016-05-17 18:50:28 +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
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
Android Build Merger (Role)
cee0578ea3 Merge "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: d16f4fd531" into nyc-mr1-dev-plus-aosp 2016-05-17 14:35:09 +00:00