157832 Commits

Author SHA1 Message Date
Jeff Sharkey
43aef1643b Move Documents action bar update even later.
At some point Activity started restoring the Toolbar/ActionBar title
during onPostCreate(), which would clobber some of the setup we just
finished doing.  To fix, move our update to be even later in the
restore lifecycle.

Also fix grid item widths for small screen devices.

Bug: 17428127
Change-Id: I258121b6a6eec5924f92b02290a67d3ae7dd9cf6
2014-11-24 12:17:12 -08:00
Jeff Sharkey
636baa0d24 Merge "Introduce revision codes for split APKs." into lmp-mr1-dev 2014-11-24 20:16:17 +00:00
Jeff Sharkey
88d2a3c0e1 Introduce revision codes for split APKs.
Apps delivered as multiple split APKs must have identical package
names, version code, and signatures.  However, developers may want
to iterate quickly on a subset of splits without having to increment
the version code, which would require delivery of the entire app.

This change introduces "revision codes" which can vary between
split APKs belonging to the same app.  An install is valid as long
as the normal version code is identical across all splits.  Splits
can be added/removed to an app over time, but if a split is present
across an upgrade the revision code must not decrease.

Since system apps could have been updated with splits, only revert
to the built-in APKs if the version code is strictly greater than the
data version.  Also fix bug to enable inheriting from system apps
when adding splits.

Bug: 18481866
Change-Id: I34d8e14c141a8eb95c33ffe24b4e52d6af5c8260
2014-11-24 12:13:11 -08:00
Sailesh Nepal
0afd49a172 Merge "Add system API to get registered connection managers" into lmp-mr1-dev 2014-11-24 19:36:58 +00:00
Jorim Jaggi
6b77074438 Merge "Fix quick settings on Keyguard" into lmp-mr1-dev 2014-11-24 19:31:30 +00:00
Jorim Jaggi
58bef33499 Fix quick settings on Keyguard
- Fix that quick settings couldn't be scrolled nor closed on Keyguard
if scrolling was needed.
- Fix jumping in unlock motion when closing both panel and QS
- Fix invalid panel height when closing both QS and panel

Bug: 18481668
Change-Id: Ifd12e29bbc64f72f0dc13b43e36b1a57df7524fa
2014-11-24 20:30:42 +01:00
Alan Viverette
7e0aaae3db Check for null drawable in theme-less getDrawable()
BUG: 18507509
Change-Id: I64e2950dc3a30f3979ec179789a6f6e055c9f86d
2014-11-24 11:27:09 -08:00
Bo Liu
de92f4c72b Fix crash in getNativeCanvas when canvasHandle is NULL
BUG: 18261928
Change-Id: I01a5af201fe829d5752433e1bb0db7edc01733d4
2014-11-24 11:25:45 -08:00
Geoff Mendal
de4b74a6ac Import translations. DO NOT MERGE
Change-Id: I753b271eb5b97b719fe6d4aa50d21431a961d553
Auto-generated-cl: translation import
2014-11-24 11:21:09 -08:00
Chris Wren
1b26cc5b7a Merge "LED should not be blocked by interruption filtering." into lmp-mr1-dev 2014-11-24 19:15:49 +00:00
Alan Viverette
d7dab349c2 Ensure calling mutate() on DrawableContainer creates a new state
Previously, a new state would only be created on newDrawable(), which
caused the first drawable loaded for a resource to share constant state
with the cached version. Even if mutate() was called, the constant
state was still shared and any changes were applied to the cached copy.

BUG: 18504919
Change-Id: I1ce76fbbc144e9c0c93261e3a12cc613d0c74b83
2014-11-24 11:11:05 -08:00
smain@google.com
79b496e867 am 75cd7c74: am 5f3ba993: am 1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs
* commit '75cd7c74ab38a55914f1658234a0031c907eb3ed':
  add intro videos (w/ shadowbox) to Auto and Wear landing pages.
2014-11-24 19:11:04 +00:00
smain@google.com
75cd7c74ab am 5f3ba993: am 1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs
* commit '5f3ba99376a7d01a4d142f2e34576202870b0a46':
  add intro videos (w/ shadowbox) to Auto and Wear landing pages.
2014-11-24 19:02:34 +00:00
smain@google.com
5f3ba99376 am 1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs
* commit '1b23ee962a1ce0963537810724b2be61c0ab8c57':
  add intro videos (w/ shadowbox) to Auto and Wear landing pages.
2014-11-24 18:55:57 +00:00
smain@google.com
1b23ee962a Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs 2014-11-24 18:51:03 +00:00
Jean-Michel Trivi
958876fe55 Add support for audio focus locking
New API for a registered AudioPolicy to lock/unlock the audio
  focus stack and prevent any new grant of focus, similar to
  the way phone calls behave.

Bug 16010554

Change-Id: If34a58ca9bd43d5479e94a2a7b540750b4c6efe9
2014-11-24 10:46:12 -08:00
Natalie Masse
e24908e342 Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation
Change-Id: Ie433d4bfd7ac7fd2e524a201497c250a7aede47d
2014-11-24 18:38:00 +00:00
John Spurlock
4dfce43e97 Merge "QS: Update data usage over limit title." into lmp-mr1-dev 2014-11-24 18:34:58 +00:00
Paul Jensen
e57064a289 Merge "Don't bother validating networks that don't satisfy the default request." into lmp-mr1-dev 2014-11-24 18:30:36 +00:00
Geoff Mendal
44b769d010 am 3a013dab: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '3a013dab155acafab6a80e6b13a82252b69abd9f':
  Import translations. DO NOT MERGE
2014-11-24 18:24:23 +00:00
Svet Ganov
c9f499d2f1 Merge "Print spooler crash when printing after a rotation." into lmp-mr1-dev 2014-11-24 18:23:37 +00:00
Amit Mahajan
7734836508 Merge "Set network selection to automatic when in Global mode" into lmp-mr1-dev 2014-11-24 18:22:02 +00:00
John Reck
b059ff8157 am 2b36a86b: Wire up surface width/height to lockHardwareCanvas DO NOT MERGE
* commit '2b36a86b8ee4e8c0952494dd17b5e96ded22f2ee':
  Wire up surface width/height to lockHardwareCanvas DO NOT MERGE
2014-11-24 18:19:45 +00:00
Geoff Mendal
3a013dab15 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-24 18:18:15 +00:00
John Reck
2b36a86b8e Wire up surface width/height to lockHardwareCanvas DO NOT MERGE
Bug: 18338026
Change-Id: I6c37774ef1312278ae81280561060662fef923fb
(cherry picked from commit b35c9602cf5c628c621e4fe102a461505f302bfe)
2014-11-24 17:59:38 +00:00
Dianne Hackborn
2bbea56d12 Merge "Final resource IDs." into lmp-mr1-dev 2014-11-24 17:54:06 +00:00
Dianne Hackborn
5bbb1af74a Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1-dev 2014-11-24 17:53:50 +00:00
Tom Taylor
86201db27e Issues with messaging apps on non-primary user account
Bug 18399514

Adjust the contentUri to contain the caller's userId so that when
the phone process tries to open the Uri, it will open the provider
on the correct user.
Also make sure the Uri grants are properly qualified. We only need to grant
permission for sending. Receiving an MMS is always done by the primary
user and doesn't need special permissions. Move various permission grants
from the SmsManager to here.

Change-Id: Ib192f651ab05db9f07e9e6245bb343ed7a55b18e
2014-11-24 09:36:43 -08:00
Jeff Brown
b5686d5596 am 3d110b23: Make WallpaperService watch the actual display state.
* commit '3d110b239153a6c7423a99f02ef859201205eee2':
  Make WallpaperService watch the actual display state.
2014-11-24 17:34:32 +00:00
John Spurlock
beaf117889 QS: Update data usage over limit title.
Bug: 18499916
Change-Id: I468eb40cbbbef52853c52e196e458d72f103765a
2014-11-24 12:25:32 -05:00
smain@google.com
43eabc8f13 add intro videos (w/ shadowbox) to Auto and Wear landing pages.
Change-Id: Ieb730416b7a469c7cbd0e80d1e9f74f14a7adb70
2014-11-24 09:25:00 -08:00
Sreeram Ramachandran
6d0e8711d0 Merge "Delete unused/non-working code." into lmp-mr1-dev 2014-11-24 17:24:26 +00:00
Sreeram Ramachandran
45e2732717 Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev 2014-11-24 17:24:04 +00:00
Sreeram Ramachandran
aaea7e8114 Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev 2014-11-24 17:21:18 +00:00
Geoff Mendal
234e25fbda Import translations. DO NOT MERGE
Change-Id: Ia6e19184b9f8f2ef31f1ea94263fe1090333837e
Auto-generated-cl: translation import
2014-11-24 08:51:30 -08:00
Jorim Jaggi
f510a8a688 Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-dev 2014-11-24 16:26:03 +00:00
Adrian Roos
8a9242428b Merge "Revert "Only keep user switcher bitmaps if needed"" into lmp-mr1-dev 2014-11-24 16:03:56 +00:00
Adrian Roos
07361c8488 Merge "Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045" into lmp-mr1-dev 2014-11-24 16:03:43 +00:00
Adrian Roos
702d9e31b1 Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev 2014-11-24 16:02:11 +00:00
Christoph Studer
671424951d Merge "Fix MediaStyle API comments" into lmp-mr1-dev 2014-11-24 16:00:38 +00:00
Chris Wren
1aa63f0baf Merge "Push back notification means snooze the package." into lmp-mr1-dev 2014-11-24 15:58:17 +00:00
Chris Wren
ce00a234ed LED should not be blocked by interruption filtering.
Bug: 17204854
Change-Id: Ife30c2ebbcf3fce87ac262dbd339b694d4a57728
2014-11-24 10:53:46 -05:00
Geoff Mendal
ae71b0027f Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-24 15:30:49 +00:00
Geoff Mendal
9be80ee53f Import translations. DO NOT MERGE
Change-Id: I0cddd5a38892d51d9ceb338f039e360dddc877bf
Auto-generated-cl: translation import
2014-11-24 07:13:23 -08:00
Geoff Mendal
905e20855b Import translations. DO NOT MERGE
Change-Id: Ib51df7dd1177be11dbe75dc983866a9cfdf74511
Auto-generated-cl: translation import
2014-11-24 06:21:48 -08:00
Christoph Studer
e935fe918e Fix MediaStyle API comments
Bug: 17805819
Change-Id: Ie45a43d7ae99304d635ce75aeb32a6d4d4e3e57d
2014-11-24 14:18:06 +01:00
Zoltan Szatmary-Ban
604aec9574 Merge "Add new subcommand 'set-active-admin' to the dpm command." into lmp-mr1-dev 2014-11-24 12:08:20 +00:00
Selim Cinek
962b06f9a0 Merge "Fixed several time related states for secondary users" into lmp-mr1-dev 2014-11-24 11:52:40 +00:00
Jinsuk Kim
546d867cb8 CEC: Do not issue non-effective <Routing Change>
CEC command <Routing Change> should not be issued if old and new path
are identical since it not only have no effect but also can lead certain
devices to taking unexpected action.

Bug: 18283251
Change-Id: I7a210b7aa20ce4b96ef0d260c4abfc10d4393e63
2014-11-24 11:51:35 +09:00
a20023
bcb78eec88 Set network selection to automatic when in Global mode
Verzion requests that network selection should be set to automatic when 
network mode is global.

Bug: 18372726
Change-Id: I58aae223e15351efc3f58a938630f0aa9600537e
2014-11-24 02:34:08 +00:00