157869 Commits

Author SHA1 Message Date
Geoff Mendal
b82f42a139 Import translations. DO NOT MERGE
Change-Id: I885436b95251805a80c4a6edf308448d5ed43ca3
Auto-generated-cl: translation import
2014-11-26 06:56:43 -08:00
Paul Jensen
be3736d387 Merge "Don't let NetworkMonitor state stop user-initiated transitions." into lmp-mr1-dev 2014-11-26 12:05:01 +00:00
Jinsuk Kim
1c72ba8ac3 Merge "CEC: Do not compare active input when updating" into lmp-mr1-dev 2014-11-26 05:58:40 +00:00
Andy Hung
f32d06d855 Merge "Allow set loop and position before write for static AudioTracks" into lmp-mr1-dev 2014-11-26 02:04:45 +00:00
Dianne Hackborn
4298db73ce Merge "Re-tune low memory killer params." into lmp-mr1-dev 2014-11-26 01:44:22 +00:00
Dianne Hackborn
824aeab2db Re-tune low memory killer params.
Drop the minimums back down to their old values.

Revert what I think was a mistake in bumping up the last two
maximums to the same value as was being forced for 64 bit.

Smarten the 64 bit adjustment to be relative to the values picked,
rather than hard-coded.

Change-Id: Ibee9625073469ad4722a1b6684c9fb2b9f0a4681
2014-11-25 17:26:36 -08:00
smain@google.com
ee03226304 am 9da0881f: am 59f4624a: am be718f7c: Merge "add wear design guide for contextual apps" into lmp-docs
* commit '9da0881ffbcdc566cc1bf60b817ab4f617d0049a':
  add wear design guide for contextual apps
2014-11-26 00:59:45 +00:00
Alan Viverette
0a310c99ee Merge "Revert "Animates AbsSeekBar progress movement from key presses."" into lmp-mr1-dev 2014-11-26 00:52:36 +00:00
Alan Viverette
8a45126a29 Merge "Load SPEAK_PASSWORD from currently active user rather than self" into lmp-mr1-dev 2014-11-26 00:52:20 +00:00
Alan Viverette
5ce0ec0efd Revert "Animates AbsSeekBar progress movement from key presses."
Incorrect implementation that broke the Brightness dialog slider. Reverting
to the previous behavior.

This reverts commit c5c9d0af764f590ae0031b5470192a0a08ca42d1.

BUG: 18510040
Change-Id: I201b1da46be964fcf6f041bb92ef79c335c2d23d
2014-11-26 00:36:26 +00:00
smain@google.com
9da0881ffb am 59f4624a: am be718f7c: Merge "add wear design guide for contextual apps" into lmp-docs
* commit '59f4624a378ac29c9bb98ea6e800077919e4c8bf':
  add wear design guide for contextual apps
2014-11-26 00:31:54 +00:00
smain@google.com
59f4624a37 am be718f7c: Merge "add wear design guide for contextual apps" into lmp-docs
* commit 'be718f7cebd3e09eaa2a432d044a8305dc7b8428':
  add wear design guide for contextual apps
2014-11-26 00:26:15 +00:00
smain@google.com
be718f7ceb Merge "add wear design guide for contextual apps" into lmp-docs 2014-11-26 00:18:59 +00:00
smain@google.com
98ee16c52a add wear design guide for contextual apps
Change-Id: I2c5709f02352def34c5c6a0c7dcf7193ebd58e4f
2014-11-25 16:12:48 -08:00
Alan Viverette
b6e0cb97b7 Load SPEAK_PASSWORD from currently active user rather than self
Also fixes a typo in UserHandle's docs.

BUG: 18295054
Change-Id: I1f5384f84062b9ea7dcbebe1e5f64af331028d41
2014-11-25 16:08:03 -08:00
Alan Viverette
ee22218279 Merge "Ensure time picker HH:MM header is laid out left-to-right" into lmp-mr1-dev 2014-11-26 00:07:14 +00:00
padarshr
e3c48e9025 am ddd9c2b9: am 1586b9c3: Start MountService before performBootDexOpt
* commit 'ddd9c2b97d5a388074ed84c82b41f99ed15ad010':
  Start MountService before performBootDexOpt
2014-11-25 23:49:38 +00:00
padarshr
ddd9c2b97d am 1586b9c3: Start MountService before performBootDexOpt
* commit '1586b9c33ed8429b8dbbe15ce3316a2d1a73977a':
  Start MountService before performBootDexOpt
2014-11-25 23:43:19 +00:00
Alan Viverette
10e2700d50 Merge "Ensure calling mutate() on DrawableContainer creates a new state" into lmp-mr1-dev 2014-11-25 23:42:19 +00:00
padarshr
1586b9c33e Start MountService before performBootDexOpt
This change is to start Mountservice before starting
performBootDexOpt, as in one case, in performBootDexOpt
when system upgrade happens, StorageManager will be started to
get the low threshold of DataDir. But, at this point, as
Mountservice is still not up, StorageManager will end up
having a null object of Mountservice.

Change-Id: If2b5e1b58e7d2a72c6313f196e98a68738295ec6
2014-11-25 15:30:02 -08:00
Eric Laurent
e511ddce43 Merge "AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION." into lmp-mr1-dev 2014-11-25 22:28:17 +00:00
Roozbeh Pournader
c08b47a7ac Merge "Add Lohit Odia (Oriya) font to the fallback chain." into lmp-mr1-dev 2014-11-25 22:27:40 +00:00
Lajos Molnar
3ed95fe258 Merge "media: add support for 160-byte image info in MediaCodec" into lmp-mr1-dev 2014-11-25 22:09:36 +00:00
Paul Crowley
77e25331ca Merge "Add flag for wiping factory reset protection data." into lmp-mr1-dev 2014-11-25 21:13:30 +00:00
Paul Crowley
a7e87acb24 Add flag for wiping factory reset protection data.
Bug: 18366448
Change-Id: If8904888a6bf8611d34647e6d65d2347d824dbb3
2014-11-25 20:48:41 +00:00
Amit Mahajan
3749541a20 Merge "Adding helper functions to retrieve settings that are stored per subId." into lmp-mr1-dev 2014-11-25 20:39:09 +00:00
John Reck
dec3f138c2 Merge "Force-use the pbuffer surface for destroy" into lmp-mr1-dev 2014-11-25 19:52:53 +00:00
Jorim Jaggi
c1de25d8eb Merge "Animate notifs depending on touch when exiting doze mode" into lmp-mr1-dev 2014-11-25 19:28:39 +00:00
Jorim Jaggi
2a5e452f4f Animate notifs depending on touch when exiting doze mode
When exiting doze mode during pulsing and the reason for the wakeup
is a touch event, we calculate the delay of the animations to animate
the notification from black/white to color depending on the point
where the touch happened to wake up the screen.

Bug: 18146441
Change-Id: Ica76b235d629acfc2b09b5f56027c688502f89d8
2014-11-25 20:26:40 +01:00
Robin Lee
692e4933f0 Merge "DevicePolicy: Don't warn about managed profile CAs" into lmp-mr1-dev 2014-11-25 19:11:00 +00:00
Chris Craik
ee6606519d Merge "Improve DisplayList state output" into lmp-mr1-dev 2014-11-25 18:45:11 +00:00
Dianne Hackborn
d0f6b4f629 Merge "Start MountService before performBootDexOpt" into lmp-mr1-dev 2014-11-25 18:42:59 +00:00
padarshr
4a84116d11 Start MountService before performBootDexOpt
This change is to start Mountservice before starting
performBootDexOpt, as in one case, in performBootDexOpt
when system upgrade happens, StorageManager will be started to
get the low threshold of DataDir. But, at this point, as
Mountservice is still not up, StorageManager will end up
having a null object of Mountservice.

Change-Id: I6dec474266faa5de67449c1bbe6ef30791e5ecaa
2014-11-25 10:42:15 -08:00
John Spurlock
bc6f59a1ef Merge "VolumeZen: Introduce internal vs external ringer mode." into lmp-mr1-dev 2014-11-25 18:40:55 +00:00
Alan Viverette
8dcd533786 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: I40d257867eb0a092ce580b9c4338ddc7406a031d
2014-11-25 10:40:24 -08:00
John Spurlock
661f2cf458 VolumeZen: Introduce internal vs external ringer mode.
Stabilize mapping between ringer-mode=silent and zen=priority
by keeping track of two ringer modes:
 - Internal ringer mode: Used for underlying stream muting
 - External ringer mode: Reported to clients

The mapping between external ringer mode + zen is:
 - normal = all
 - vibrate = all
 - silent = priority (read-write) or none (read)

Changes include:
 - Remove "zen check" from audio service, back to audio
   service having no knowledge of zen.
 - Maintain a new external ringer mode in audio service,
   this is the ringer mode reported through AudioManager
   to callers, also mapped to the change intent.
 - Introduce a "ringer mode delegate" to the local
   audio manager interface, responsible for observing
   external / internal mode changes, and making changes
   if necessary.
 - Internal ringer mode changes are still interesting
   to the volume dialog, wire up a callback through
   the existing IVolumeController interface.
 - On devices without vibration, the mapping is the same
   but since no ringer mode change is possible, disable
   the icon toggle and remove the mute icon when volume=0.
 - On devices with vibration, volume down presses should
   pulse the vibrate icon (and vibrate) as a hint that this
   is as low as the device can go using the keys.  Since
   the mechanics are similar to the existing zen=none hint,
   pull into shared helper.
 - Log ringer mode changes to the zen log, include calling
   package information for issue diagnosis.
 - Include whether vibration is supported in the audio service
   dump.
 - Update the status bar icon policy to use the internal ringer
   mode, not the external mode (for vibrate icon).
 - Update the "Muted by <x>" logic, include current suppressor
   in dumpsys, ensure suppression icon is enabled & !clickable,
   regardless of zen mode.

Bug: 17884168
Bug: 15471679
Bug: 16824970
Change-Id: Ia7d3bb23ce6d1e37b24fb6521d1c1ab9bb8f60c0
2014-11-25 13:20:46 -05:00
John Reck
b945f2313a Force-use the pbuffer surface for destroy
Bug: 18518580

If CanvasContext is being destroyed() the Surface
is probably no longer valid as well, so make sure to
makeCurrent() to the pbuffer surface so that the
subsequent GL operations are not using an invalid
EGLSurface

Change-Id: Ica5d6a065841772c47e00ad65aa7894c7e27e043
2014-11-25 09:54:13 -08:00
Andres Morales
59093d925d Merge "Define permission for system apps to query size of block" into lmp-mr1-dev 2014-11-25 17:35:21 +00:00
Bo Liu
84be180e97 Merge "Fix crash in getNativeCanvas when canvasHandle is NULL" into lmp-mr1-dev 2014-11-25 16:56:07 +00:00
Andres Morales
6b0c7acd7f Define permission for system apps to query size of block
Allows ManagedProvisioning to determine whether there's a
challenge and thus whether to disable NFC provisioning.

Other implementation option: new hidden boolean API method.
Can't think of benefit of new API method "isBlockInUse", other
than doesn't leak PDB size and is more explicitly tied to the
use case. Open to either impl if anyone has opinions on the matter.

Bug: 18508767
Change-Id: I28d2eb5a0837ff85cb91f140b17ce1dd843fe9d6
2014-11-25 15:55:28 +00:00
John Reck
fb6121e069 Merge "Revert "Ensure calling mutate() on DrawableContainer creates a new state"" into lmp-mr1-dev 2014-11-25 15:54:25 +00:00
John Reck
cf84ab5e7f Revert "Ensure calling mutate() on DrawableContainer creates a new state"
This reverts commit d7dab349c2af0e4bde188b1969f0c697b217dd57.

Change-Id: Icc1c4bfa296a59a551088fe7cc2449a97bb2b7b7
Reason: Broke the build
2014-11-25 15:50:59 +00:00
Robin Lee
80559f4aad DevicePolicy: Don't warn about managed profile CAs
Setting up a managed profile should have included a step to warn about
this sort of thing already. As the user should trust the profile owner
anyway it's hard to argue this warning is needed.

Bug: 18224038
Change-Id: Ie86ba26851af726c0dec30eb9c32894ed6bb4a00
2014-11-25 15:48:48 +00:00
John Reck
0c31d97a38 Merge "Switch TextureCache to SkPixelRef::fStableId" into lmp-mr1-dev 2014-11-25 15:32:27 +00:00
Natalie Masse
8d9e64343d am 65e51fcd: am d7c7d275: am 77283ec9: Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs
* commit '65e51fcda25c33cdfa73e8ca3a4f71cf987bd0d2':
  Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation
2014-11-25 11:22:05 +00:00
Natalie Masse
65e51fcda2 am d7c7d275: am 77283ec9: Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs
* commit 'd7c7d275e77ffcae7498df7f75142e68e1b5123c':
  Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation
2014-11-25 11:15:24 +00:00
Natalie Masse
d7c7d275e7 am 77283ec9: Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs
* commit '77283ec981fc022cd26ced1e44ad21cdc0b2e4ae':
  Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation
2014-11-25 11:10:09 +00:00
Natalie Masse
77283ec981 Merge "Fixed NullPointerException due to null Bundle, changed time interval from ms to seconds as per method documentation" into lmp-docs 2014-11-25 11:05:52 +00:00
Svet Ganov
f51d7015df Merge "Lockup in the print spooler." into lmp-mr1-dev 2014-11-25 10:38:58 +00:00
Jinsuk Kim
449c019f22 CEC: Do not compare active input when updating
A recent change sets the active path ahead of calling
updateActiveInput. Removes the check between new and active
path as it is always successful thus stops the flow.

Bug: 18506537
Change-Id: I29471ffc6194baa1fad62063f1d192caa9000afd
2014-11-25 15:01:56 +09:00