13023 Commits

Author SHA1 Message Date
Svet Ganov
846aac1a22 am 48956f26: am f51d7015: Merge "Lockup in the print spooler." into lmp-mr1-dev
* commit '48956f266df46bc852c8c2886f16dbb7ac61b3fe':
  Lockup in the print spooler.
2014-11-25 18:45:32 +00:00
Jeff Sharkey
44952282e8 am ce7a0e6c: am 7038c390: Merge "Move Documents action bar update even later." into lmp-mr1-dev
* commit 'ce7a0e6cc7cd90cc5019f9b150a0295347f38406':
  Move Documents action bar update even later.
2014-11-25 17:50:06 +00:00
Jeff Sharkey
c02f304c3a am 58b699c3: am 636baa0d: Merge "Introduce revision codes for split APKs." into lmp-mr1-dev
* commit '58b699c366dea7abc26f34c1e5f1cc6031c04e23':
  Introduce revision codes for split APKs.
2014-11-25 17:39:16 +00:00
Jorim Jaggi
a6eaf8b38a am 82bb648b: am 6b770744: Merge "Fix quick settings on Keyguard" into lmp-mr1-dev
* commit '82bb648b5a1a5a4a0946a252a9cf9b6f8944a15d':
  Fix quick settings on Keyguard
2014-11-25 17:38:26 +00:00
John Spurlock
98c2090de4 am 98a20f68: am 4dfce43e: Merge "QS: Update data usage over limit title." into lmp-mr1-dev
* commit '98a20f68e0f31c43d090b16e3802c67226dbd055':
  QS: Update data usage over limit title.
2014-11-25 17:38:02 +00:00
Svet Ganov
f0de3a5ca3 am f34896bb: am c9f499d2: Merge "Print spooler crash when printing after a rotation." into lmp-mr1-dev
* commit 'f34896bbeb49aef3509e55ccf9afc7b62ae4dafd':
  Print spooler crash when printing after a rotation.
2014-11-25 17:37:42 +00:00
Jorim Jaggi
649c0ca2a4 am fc4d8043: am f510a8a6: Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-dev
* commit 'fc4d8043ded6f8ef5dcf6ffdcb9f2f40c1c369f5':
  Tint SIM images in PIN/PUK screen
2014-11-25 15:09:46 +00:00
Adrian Roos
e33017b404 am 20eb594a: am 8a924242: Merge "Revert "Only keep user switcher bitmaps if needed"" into lmp-mr1-dev
* commit '20eb594ab27a9e4dee83574b3fe36a5a6d0d7807':
  Revert "Only keep user switcher bitmaps if needed"
2014-11-25 15:09:39 +00:00
Chris Wren
ff47355d2b am 865c73b5: am 1aa63f0b: Merge "Push back notification means snooze the package." into lmp-mr1-dev
* commit '865c73b5f66bfd1e5a9eded75b5a5fb24e701042':
  Push back notification means snooze the package.
2014-11-25 15:09:12 +00:00
Jorim Jaggi
0da89b7640 resolved conflicts for merge of f0fc23a1 to lmp-mr1-dev-plus-aosp
Change-Id: I8f1dbae2ecd14ae4e51a9e86eb6d36dd56a48be1
2014-11-25 15:34:56 +01:00
Svet Ganov
48956f266d am f51d7015: Merge "Lockup in the print spooler." into lmp-mr1-dev
* commit 'f51d7015df585b61d6a4f72f2327df7dcdec8899':
  Lockup in the print spooler.
2014-11-25 10:42:30 +00:00
Svet Ganov
f51d7015df Merge "Lockup in the print spooler." into lmp-mr1-dev 2014-11-25 10:38:58 +00:00
Jeff Sharkey
ce7a0e6cc7 am 7038c390: Merge "Move Documents action bar update even later." into lmp-mr1-dev
* commit '7038c39012c039aafcf4ac7931a087bfff42e125':
  Move Documents action bar update even later.
2014-11-24 22:26:04 +00:00
Jeff Sharkey
7038c39012 Merge "Move Documents action bar update even later." into lmp-mr1-dev 2014-11-24 22:18:51 +00:00
Svet Ganov
c80814e70a Lockup in the print spooler.
A recent change modified the way we destroy the remote renderer from
asynchronous to synchronous. This caused problems since it was possible
that the remote rendering service is unbound while we are reading the
contents of a rendered page. As a result the reader was blocking on I/O
and the print spooler was getting into a locked state that required a
restart of its process.  Now the remote renderer is destroyed
asynchronously.

bug:18498626

Change-Id: I1312bf808f30430728b4038dd4be43c55d2be825
2014-11-24 22:12:34 +00:00
Geoff Mendal
6a0ec6e606 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-24 21:15:29 +00:00
Geoff Mendal
597226d6f2 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-24 20:44:58 +00:00
Jeff Sharkey
58b699c366 am 636baa0d: Merge "Introduce revision codes for split APKs." into lmp-mr1-dev
* commit '636baa0d2451a531f8e83f5cdfc0d709989c4862':
  Introduce revision codes for split APKs.
2014-11-24 20:20:10 +00:00
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
Jorim Jaggi
82bb648b5a am 6b770744: Merge "Fix quick settings on Keyguard" into lmp-mr1-dev
* commit '6b77074438f191de4fcfa1f1560fb5f038cb8173':
  Fix quick settings on Keyguard
2014-11-24 20:01:19 +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
Geoff Mendal
24bc59be4c Import translations. DO NOT MERGE
Change-Id: Ia5a03d8dd7c8d82c4f65421b1b2985bdffceee19
Auto-generated-cl: translation import
2014-11-24 11:28:36 -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
John Spurlock
98a20f68e0 am 4dfce43e: Merge "QS: Update data usage over limit title." into lmp-mr1-dev
* commit '4dfce43e976a294b3b575564c855214a8e5cef58':
  QS: Update data usage over limit title.
2014-11-24 18:48:59 +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
Svet Ganov
f34896bbeb am c9f499d2: Merge "Print spooler crash when printing after a rotation." into lmp-mr1-dev
* commit 'c9f499d2f1cd598b90bfb8c13e505354555caea8':
  Print spooler crash when printing after a rotation.
2014-11-24 18:27:52 +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
Wink Saville
b4c5410987 am 4f1cce63: am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
* commit '4f1cce63061976490e2e2cfc4085e1634d3a02de':
  Additional changes to SubscriptionManager API as per API council.
2014-11-24 18:06:09 +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
Jorim Jaggi
fc4d8043de am f510a8a6: Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-dev
* commit 'f510a8a688acf08378419aae20d2be25b88a4397':
  Tint SIM images in PIN/PUK screen
2014-11-24 16:30:13 +00: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
20eb594ab2 am 8a924242: Merge "Revert "Only keep user switcher bitmaps if needed"" into lmp-mr1-dev
* commit '8a9242428b9d631ba841c166d062f158fd64f0f6':
  Revert "Only keep user switcher bitmaps if needed"
2014-11-24 16:08:41 +00:00
Chris Wren
865c73b5f6 am 1aa63f0b: Merge "Push back notification means snooze the package." into lmp-mr1-dev
* commit '1aa63f0baf0df58ae22ecb2558a5de7cebd38654':
  Push back notification means snooze the package.
2014-11-24 16:04:00 +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
Chris Wren
1aa63f0baf Merge "Push back notification means snooze the package." into lmp-mr1-dev 2014-11-24 15:58:17 +00:00
Geoff Mendal
d2fd0410d9 Import translations. DO NOT MERGE
Change-Id: Ib6f35d7fd27aa2503ee0e1038e1048c989bf31af
Auto-generated-cl: translation import
2014-11-24 06:25:15 -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
Selim Cinek
f0fc23a141 am 962b06f9: Merge "Fixed several time related states for secondary users" into lmp-mr1-dev
* commit '962b06f9a02f08392b6f87225a314ebf39dd7a07':
  Fixed several time related states for secondary users
2014-11-24 11:57:59 +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
Wink Saville
4f1cce6306 am 12c2136e: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
* commit '12c2136e556b54a717624d8479ec4650f363ce45':
  Additional changes to SubscriptionManager API as per API council.
2014-11-22 20:28:10 +00:00
Wink Saville
d09c4cad65 Additional changes to SubscriptionManager API as per API council.
bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
2014-11-22 10:08:16 -08:00
Svet Ganov
f6cd14dbc9 Print spooler crash when printing after a rotation.
1. Available printers are provided by a loader driven by the activity
   lifecycle. After a rotation of an app that does not handle rotation
   the print activity is destroyed in a delayed fashion. When another
   print task is started the loader of the destroed activity gets two
   cancellations, one when the activity is stopped and one when it is
   destroyed but when the second cancellation happens the loader has a
   bad state that it is loading while it is not and a NPE occurs.

2. If a rotation happens early before the print activity is fully initialized
   (there are asyncrconous operations that take place) we get a NPE as
   the print preview controller is not created yet.

3. A lockup of the print preview process occurs if the print print
   activity is destroyed after we initiated binding to the rendering
   service but before we receive the remote interface. In this case no
   remote service is received as exepcted since we already unbound from
   it resulting in a missed signal.

bug:18238590

Change-Id: I81817d81702f649ded97dfbab7d7bba28f22fa91
2014-11-22 09:28:38 -08:00
Winson Chung
161b51ba06 am 207356ef: am 71113e43: Merge "Reset the task stack instead of the view when Recents is hidden. (Bug. 18436876, Bug. 18394126, Bug. 18432310)" into lmp-mr1-dev
* commit '207356efae596b3860a384ced5f369462ce342d7':
  Reset the task stack instead of the view when Recents is hidden. (Bug. 18436876, Bug. 18394126, Bug. 18432310)
2014-11-21 23:24:14 +00:00
Winson Chung
207356efae am 71113e43: Merge "Reset the task stack instead of the view when Recents is hidden. (Bug. 18436876, Bug. 18394126, Bug. 18432310)" into lmp-mr1-dev
* commit '71113e43e768d973b3721f8fac9f9654ed159911':
  Reset the task stack instead of the view when Recents is hidden. (Bug. 18436876, Bug. 18394126, Bug. 18432310)
2014-11-21 23:19:38 +00:00
Winson Chung
71113e43e7 Merge "Reset the task stack instead of the view when Recents is hidden. (Bug. 18436876, Bug. 18394126, Bug. 18432310)" into lmp-mr1-dev 2014-11-21 23:15:04 +00:00
Amith Yamasani
1f26bf6bfd am 108bdbc9: am efb2df69: Merge "Different messages when wiping user and not device" into lmp-mr1-dev
* commit '108bdbc934d1e5fb77406d0267ab67f8736dfc57':
  Different messages when wiping user and not device
2014-11-21 23:07:03 +00:00
Amith Yamasani
108bdbc934 am efb2df69: Merge "Different messages when wiping user and not device" into lmp-mr1-dev
* commit 'efb2df698a4c2ed3d3371656cab199e5e3737fa9':
  Different messages when wiping user and not device
2014-11-21 23:00:52 +00:00