124671 Commits

Author SHA1 Message Date
Alan Viverette
94088e0c6f Merge "Adds hotspot support to LayerDrawable and InsetDrawable" 2014-02-05 22:16:25 +00:00
Alan Viverette
dc9125880c Merge "Temporary fix for background invalidation" 2014-02-05 22:16:10 +00:00
Christopher Tate
eaa27e8cbf am f0af5757: Merge "Improve idle-service bind permission description"
* commit 'f0af57578eeb38da86610789271cd970ff44b11f':
  Improve idle-service bind permission description
2014-02-05 14:05:59 -08:00
Alan Viverette
87980f9a73 Adds hotspot support to LayerDrawable and InsetDrawable
Change-Id: Id17f460c8e4e0a6bf9fd39a4a7b8c79fa2df8d29
2014-02-05 14:05:51 -08:00
Alan Viverette
e6875f1575 Temporary fix for background invalidation
Not a complete solution, since we could be more efficient, but enough
to have both background display lists and proper invalidation.

Change-Id: I0216a104948c0930760275bb2b98318b0a4487e7
2014-02-05 14:05:17 -08:00
Christopher Tate
f0af57578e Merge "Improve idle-service bind permission description" 2014-02-05 22:03:33 +00:00
Chris Craik
d89f010bad am ba9a2156: am 2c764b20: am 0ec3ca6e: am 449273e2: Merge "Fix for positioning of glyphs within a bitmap"
* commit 'ba9a21561e09bddf4ba25fd41474fda6cb941bfb':
  Fix for positioning of glyphs within a bitmap
2014-02-05 13:55:48 -08:00
Zhijun He
cb49cb32ae am b77690ce: Merge "Camera2: update aeLock and transform matrix tag specs"
* commit 'b77690cea0f146c6823c922a4f8d8ca7336dde21':
  Camera2: update aeLock and transform matrix tag specs
2014-02-05 13:52:25 -08:00
Chris Craik
ba9a21561e am 2c764b20: am 0ec3ca6e: am 449273e2: Merge "Fix for positioning of glyphs within a bitmap"
* commit '2c764b20e4a35c509f49e3d9430e135b4f3a0984':
  Fix for positioning of glyphs within a bitmap
2014-02-05 21:52:23 +00:00
Zhijun He
b77690cea0 Merge "Camera2: update aeLock and transform matrix tag specs" 2014-02-05 21:49:56 +00:00
Zhijun He
49a3ca9330 Camera2: update aeLock and transform matrix tag specs
Change-Id: I436f41ff2bf811a654de15b51739c07def354648
2014-02-05 13:48:09 -08:00
John Spurlock
c6d1c60fb1 Global system setting to override certain window policy.
Specifically, the ability to force immersive-mode-like behavior
on the status bar, the navigation bar (or both) on a
package-by-package basis - and to disable immersive mode
confirmations for specific packages.

Change-Id: I2df7092a91eceeb815367ef917dd7289f4f2b27e
2014-02-05 16:45:23 -05:00
Chris Craik
2c764b20e4 am 0ec3ca6e: am 449273e2: Merge "Fix for positioning of glyphs within a bitmap"
* commit '0ec3ca6e08e5933016beda147ca9a82e96434b15':
  Fix for positioning of glyphs within a bitmap
2014-02-05 21:43:48 +00:00
Chris Craik
0ec3ca6e08 am 449273e2: Merge "Fix for positioning of glyphs within a bitmap"
* commit '449273e2d575041ffe1a5d435666d36923de888b':
  Fix for positioning of glyphs within a bitmap
2014-02-05 13:40:22 -08:00
Hui Shu
a09c820552 am e6415f50: Merge "Fix postUrl to call loadUrl when url is not a network url."
* commit 'e6415f50b10fe455df2cbe568a90bc762cce3cf7':
  Fix postUrl to call loadUrl when url is not a network url.
2014-02-05 13:38:01 -08:00
Chris Craik
449273e2d5 Merge "Fix for positioning of glyphs within a bitmap" 2014-02-05 21:36:42 +00:00
Craig Mautner
dc548483ae Move activities from DisplayContent to TaskStack
Now that activities and tasks can be detached from a display do not
keep their state within the DisplayContent class. All such state is
now moved to the TaskStack class with this change.

Change-Id: Ie6b1811e9ec3f545782bad8c3461bd4f2d336b93
2014-02-05 13:35:24 -08:00
Hui Shu
e6415f50b1 Merge "Fix postUrl to call loadUrl when url is not a network url." 2014-02-05 21:35:12 +00:00
Hui Shu
c60ad9c3fb Fix postUrl to call loadUrl when url is not a network url.
Change-Id: I4be00611c220572b4e8ecea1a00409a6f5d2bb18
2014-02-05 13:32:37 -08:00
Chris Craik
629f67709b Simplify DisplayList matrices
Somewhat unifies the ortho/perspecive paths - the property matrix
(translate/scale/rotate) is now always a Matrix4.

Change-Id: I36e4fe83d1150ee6e4be5f64f34d0fc8d6525cc6
2014-02-05 13:12:04 -08:00
Robert Shih
34c8a0ea8b am 7da27478: Merge "android_media_MediaMuxer_setLocation: amended signature."
* commit '7da27478ea09d7e6c8e6bb8c563ea6439c53e28f':
  android_media_MediaMuxer_setLocation: amended signature.
2014-02-05 12:29:26 -08:00
Maxim Siniavine
b69e703a23 am 12ae9b14: Merge "Using large file for download manager test."
* commit '12ae9b1459980060c8780b910d23e835590ab0fb':
  Using large file for download manager test.
2014-02-05 12:29:23 -08:00
John Spurlock
8f10bce1f0 am 6c1b8c14: Merge "Remove need for software layer drawing percentage text."
* commit '6c1b8c14128e360e855ed4a5baeaee675f26c034':
  Remove need for software layer drawing percentage text.
2014-02-05 12:29:20 -08:00
Robert Shih
7da27478ea Merge "android_media_MediaMuxer_setLocation: amended signature." 2014-02-05 20:05:17 +00:00
Maxim Siniavine
12ae9b1459 Merge "Using large file for download manager test." 2014-02-05 20:04:07 +00:00
John Spurlock
6c1b8c1412 Merge "Remove need for software layer drawing percentage text." 2014-02-05 20:03:18 +00:00
Andreas Huber
f8a0c47e90 Remove no longer needed http proxy handling code, it's obsolete now
since we started to use java's HTTPConnection instead of the native
implementation.

Change-Id: I32b08480593a859e0368dbbcf8da8f25c9e08ca9
2014-02-05 11:53:40 -08:00
Zhijun He
6f4e1e51b4 am c44b51bd: Merge "Camera2: Update stream num tag specs"
* commit 'c44b51bdebd901def3015591814a57964f0adeef':
  Camera2: Update stream num tag specs
2014-02-05 11:30:59 -08:00
Zhijun He
c44b51bdeb Merge "Camera2: Update stream num tag specs" 2014-02-05 19:28:43 +00:00
Adam Lesinski
898c13df7b Check feature bits before loading optional services
At startup, we check with PackageManager whether a system service is
available before attempting to load it. A system service is available
if its associated feature (similar to hardware features) is present.
This does not remove unavailable services from the compiled jar.

Change-Id: I13571805083aa4e65519a74acb52efd17b9fb3d7
2014-02-05 19:26:40 +00:00
Geoff Mendal
4da7c52d58 am 5325019a: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '5325019a1afa3d43efcc0c827611a863ebf5d515':
  Import translations. DO NOT MERGE
2014-02-05 11:09:02 -08:00
Geoff Mendal
5325019a1a Merge "Import translations. DO NOT MERGE" 2014-02-05 19:06:06 +00:00
Geoff Mendal
d6b9183519 am 0e69ab07: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '0e69ab076c0f9bfea33381de4ddf2202e3540f46':
  Import translations. DO NOT MERGE
2014-02-05 10:57:23 -08:00
Geoff Mendal
d397deeef0 Import translations. DO NOT MERGE
Change-Id: I388073346d1d4990f09c557f2d1a2bea49cee99d
Auto-generated-cl: translation import
2014-02-05 10:57:18 -08:00
Geoff Mendal
0e69ab076c Merge "Import translations. DO NOT MERGE" 2014-02-05 18:56:01 +00:00
Robert Shih
3cb78498d3 android_media_MediaMuxer_setLocation: amended signature.
Change parameter `nativeObject` from type `jint` to `jlong` to match its JNI
signature.

Bug: 12890910
Change-Id: I7feb7fa5c3eccc07f2d1bc733b7d4b3a3b52e292
2014-02-05 10:53:55 -08:00
Geoff Mendal
b204e82e6e Import translations. DO NOT MERGE
Change-Id: Id2cedaf11af37d24aa50dbcf27da1b470de6f43a
Auto-generated-cl: translation import
2014-02-05 10:48:38 -08:00
Andreas Huber
f76c701450 am cb1b23b5: Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to media code"
* commit 'cb1b23b5e600abe542e3374b66c2be7976fccd72':
  FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to media code
2014-02-05 10:44:02 -08:00
Marco Nelissen
516c13c3be am 829a57c9: Merge "Cache media/nomedia paths"
* commit '829a57c9a52d6cd11916b926491f8addcef526ec':
  Cache media/nomedia paths
2014-02-05 10:43:59 -08:00
Narayan Kamath
25b66062ad am 33e77b61: Merge "Revert "Camera2: Update stream num tag specs""
* commit '33e77b61b8c170166206fbdacb157e56955bebc8':
  Revert "Camera2: Update stream num tag specs"
2014-02-05 10:43:56 -08:00
Jake Hamby
c130ffacdb am dbe576eb: Merge "Add new RIL commands to read/write NV items and reset NV config."
* commit 'dbe576ebd1c6bc05d17657aedb3f2feec162f2b1':
  Add new RIL commands to read/write NV items and reset NV config.
2014-02-05 10:43:53 -08:00
Andreas Huber
cb1b23b5e6 Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to media code" 2014-02-05 17:13:07 +00:00
John Spurlock
1fd0b933b8 Remove need for software layer drawing percentage text.
When the text is transparent, use the same approach as the bolt
to punch it through the rest of the shape - by first rendering the
text into a path.

When the text is opaque, draw the text on top as before.

Change-Id: I50f201b1bf0f92164728e3237ec45e22eb788d52
2014-02-05 11:56:17 -05:00
Zhijun He
a5a0cace7d Camera2: Update stream num tag specs
Change-Id: Iba6f1f8c779e5c3a622a7f07029f4373a887bffe
2014-02-05 07:55:44 -08:00
Marco Nelissen
829a57c9a5 Merge "Cache media/nomedia paths" 2014-02-05 15:41:55 +00:00
Narayan Kamath
33e77b61b8 Merge "Revert "Camera2: Update stream num tag specs"" 2014-02-05 12:19:15 +00:00
Narayan Kamath
8b1c5704cb Revert "Camera2: Update stream num tag specs"
This reverts commit 67c23833f81cb27671ee9f62a87ba810d0d49989.

Change-Id: I3aa2d0b245c998c57f3312e2d6f68aa72d80c338
2014-02-05 12:16:46 +00:00
Jake Hamby
dbe576ebd1 Merge "Add new RIL commands to read/write NV items and reset NV config." 2014-02-05 03:56:03 +00:00
Adam Powell
e57ba3d142 am 11579e55: Merge "Import updated SearchView assets from UX"
* commit '11579e559593b8c271247fe548f6446af7f6e1ca':
  Import updated SearchView assets from UX
2014-02-04 18:30:18 -08:00
Adam Powell
11579e5595 Merge "Import updated SearchView assets from UX" 2014-02-05 02:28:14 +00:00