Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
132,464 Commits 3 Branches 0 Tags
3ee5f40da29eb2bbd6f1c7e5b1d883b571fc0131
Commit Graph

38882 Commits

Author SHA1 Message Date
George Mount
3ee5f40da2 am 8721a548: Merge "Add mechanism for Transitions to target a class." 
* commit '8721a548c13281b4e603db88791d90141acac65c':
  Add mechanism for Transitions to target a class.
 2014-04-29 21:33:28 +00:00
George Mount
97ff65442a am f1526de2: Merge "Transfer image of shared element to launched Activity." 
* commit 'f1526de298e4bfbf1378ba70e04f88286b2f5594':
  Transfer image of shared element to launched Activity.
 2014-04-29 21:33:25 +00:00
George Mount
989a4e9b13 Merge "Add mechanism for Transitions to target a class." 2014-04-29 21:30:37 +00:00
George Mount
f31d367a5c Merge "Transfer image of shared element to launched Activity." 2014-04-29 21:30:27 +00:00
George Mount
96829515c4 am d7fe8929: Merge "Add Transform and ClipBounds Transitions." 
* commit 'd7fe8929426453ac0fa22cca6b92f2a77c8f340d':
  Add Transform and ClipBounds Transitions.
 2014-04-29 20:58:35 +00:00
George Mount
b061087212 Merge "Add Transform and ClipBounds Transitions." 2014-04-29 20:56:18 +00:00
George Mount
430f910f37 am cb9f337a: Merge "Add ability to exclude Views in transition XML." 
* commit 'cb9f337af3994a4424ca305258bcde8518b9cb40':
  Add ability to exclude Views in transition XML.
 2014-04-29 20:54:42 +00:00
George Mount
6eb2bc52a5 Merge "Add ability to exclude Views in transition XML." 2014-04-29 20:49:26 +00:00
Jae Seo
ed18089025 am c1201aa5: Merge "Add more URI patterns for accessing TV metadata" 
* commit 'c1201aa56381a548c4d7ce80e7ad47fd832699f0':
  Add more URI patterns for accessing TV metadata
 2014-04-29 20:25:57 +00:00
Jae Seo
994925d666 Merge "Add more URI patterns for accessing TV metadata" 2014-04-29 20:21:51 +00:00
Zhijun He
9c89303032 am 070fccb2: Merge "Camera2: Update availableFormats related key docs" 
* commit '070fccb29a11bd3bf35fa24ba912a3839fdc8d96':
  Camera2: Update availableFormats related key docs
 2014-04-29 20:19:13 +00:00
Zhijun He
896c330445 Merge "Camera2: Update availableFormats related key docs" 2014-04-29 20:16:02 +00:00
George Mount
a98fb7ab6a Add mechanism for Transitions to target a class. 
Bug 14289299

Added ability to target a specific class similarly to the
mechanism for excluding a specific class in Transitions.
Also changed XML tag from excludeTargetId to excludeId to
make it symmetric with excludeClass.

Change-Id: Ib371820ec75761243e75b659565b905b1b19c9a2
 2014-04-29 13:08:39 -07:00
George Mount
caa03107d4 Transfer image of shared element to launched Activity. 
First pass of the API will use a Bitmap. Future versions will use
more efficient mechanisms.

Change-Id: I111474dd031fef0b86de871017c85dc679166acf
 2014-04-29 13:08:37 -07:00
George Mount
608b87d9e5 Add Transform and ClipBounds Transitions. 
Made MoveImage use an overlay view. Drawables
cover all Views in the overlay and there may
be a desire to order the overlays.

Change-Id: Ic7b81f0d26d8cce3f475c2eebbce01538bc55d46
 2014-04-29 13:08:35 -07:00
George Mount
f976c3d42b Add ability to exclude Views in transition XML. 
Bug 14259955

Change-Id: I47bb10c530c9fec8910ddd96156fc38d6027e1f6
 2014-04-29 13:08:33 -07:00
Zhijun He
a4d0a8fb20 Camera2: Update availableFormats related key docs 
Change-Id: I1cd2a39ee6a4d3ec391fa827accaa8ad1b3dfc6e
 2014-04-29 12:35:27 -07:00
Chris Craik
fd82eeef32 am c011558a: Merge "Add Z property to View" 
* commit 'c011558a90329731e87d3eaf25af15b452001c4e':
  Add Z property to View
 2014-04-29 19:29:16 +00:00
Chris Craik
f38475bc28 Merge "Add Z property to View" 2014-04-29 19:24:47 +00:00
Dianne Hackborn
4bbca4882f am febeb528: Merge "Implement better computing of battery drain time, actual charge time." 
* commit 'febeb528ba08fcc64b23e762f4001194ff44c31e':
  Implement better computing of battery drain time, actual charge time.
 2014-04-29 18:32:59 +00:00
Dianne Hackborn
1de6b101e5 Merge "Implement better computing of battery drain time, actual charge time." 2014-04-29 18:30:08 +00:00
Dianne Hackborn
260c5020ae Implement better computing of battery drain time, actual charge time. 
Also move time formatter in to framework for use elsewhere.

Change-Id: I42b6a44414b68754af65c522bef5591da5643909
 2014-04-29 11:23:16 -07:00
Kenny Root
c0db63d73b am ded03433: Only remember the signer certificates for Signatures 
* commit 'ded0343318e4be15c563228b714a8b89eb4535e6':
  Only remember the signer certificates for Signatures
 2014-04-29 18:14:29 +00:00
Kenny Root
a8e65fd82a Only remember the signer certificates for Signatures 
Previously we would use the JarEntry#getCertificates API which would
return a flattened array of all the signers and their certificate chain.
Since this isn't what was intended, switch to reading the certificate
chains and only paying attention to the signer certificate.

In order to migrate during upgrades of the platform, we'll scan on boot
with a compatibility mode which will check the stores signatures in the
old format by flattening the chains of the scanned packages then
comparing the two sets.

Bug: 13678484
Change-Id: I02a5c53121d8d6f70a51d7e3b98168a41e11482e
 2014-04-29 11:08:50 -07:00
John Reck
cdf66b72ec am 29277c8c: Merge "RenderThread animator support" 
* commit '29277c8c85092e3da9362cb62e96dae0ba4fec5e':
  RenderThread animator support
 2014-04-29 17:58:48 +00:00
John Reck
25ff2c1ec1 Merge "RenderThread animator support" 2014-04-29 17:56:04 +00:00
John Reck
e45b1fd03b RenderThread animator support 
Change-Id: Icf29098edfdaf7ed550bbe9d49e9eaefb4167084
 2014-04-29 10:42:11 -07:00
Selim Cinek
f9dbfbf36a am f7175d79: Merge "Fixed a bug where the outline was not correctly updated" 
* commit 'f7175d7952f0d3a8d9bc501e57b11a5c68b28e07':
  Fixed a bug where the outline was not correctly updated
 2014-04-29 16:02:21 +00:00
Selim Cinek
8efc566abf Merge "Fixed a bug where the outline was not correctly updated" 2014-04-29 15:57:02 +00:00
Selim Cinek
61571f1422 Fixed a bug where the outline was not correctly updated 
The outline was not correctly copied to the field when it already
existed.

Change-Id: I02a7006f7ceff9241b1c52c73ea159c59aa7464e
 2014-04-29 14:41:36 +02:00
Jae Seo
e115c5ec83 am 6b60d5ea: Merge "Dispatch input events to the TV input" 
* commit '6b60d5ea3df01024069f8f7374251e0e2eee1e47':
  Dispatch input events to the TV input
 2014-04-29 07:35:29 +00:00
Jae Seo
19db0f036a Merge "Dispatch input events to the TV input" 2014-04-29 06:22:00 +00:00
Jae Seo
6a6059a29e Dispatch input events to the TV input 
TvInputManagerService now creates an InputChannel pair and passes one
end to the app and the other end to the service. Then the TvInputManager
in the app creates an InputEventSender around one end of the channel to
send events and the service creates an InputEventReceiver around the
other end of the channel to receive events.
Most of the newly added code here was borrowed heavily from the IME.

Change-Id: I0bd83847cba0033ccb6f4b6dad267ebeaf5e9c7c
 2014-04-29 14:18:55 +09:00
Elliott Hughes
512c15964b am e7c24923: Fix a few more stray libcore.io references. 
* commit 'e7c249230b31d6e5d6971c724091d9eecd4e8c43':
  Fix a few more stray libcore.io references.
 2014-04-29 03:54:02 +00:00
Elliott Hughes
3484b68f3b am b07cbabb: Fix build. 
* commit 'b07cbabb6e6e9aaee2cda05c8910f9e9f5e8007b':
  Fix build.
 2014-04-29 03:49:57 +00:00
Elliott Hughes
c1858228df Fix a few more stray libcore.io references. 
Change-Id: Id328544bd3a382fec16507d0ae5b699fef44ebd7
 2014-04-28 20:49:24 -07:00
Elliott Hughes
33ee1e779d Fix build. 
Change-Id: I9e1a5280d3356e8814e505915bbc74200bc58b40
 2014-04-28 20:45:31 -07:00
Elliott Hughes
7c4d03e694 am f5a29f59: am 3e792ef7: am fff28619: am f4a7ac00: Merge "Move the Zygote off libcore.os and onto android.system." 
* commit 'f5a29f592abc0d09ab94ab5e69ffbd4f4a87db16':
  Move the Zygote off libcore.os and onto android.system.
 2014-04-29 02:40:30 +00:00
Elliott Hughes
20cfa1b36c am 3e792ef7: am fff28619: am f4a7ac00: Merge "Move the Zygote off libcore.os and onto android.system." 
* commit '3e792ef78fbad1df75e97da9a32a5826371b2da9':
  Move the Zygote off libcore.os and onto android.system.
 2014-04-29 02:38:02 +00:00
Elliott Hughes
3e792ef78f am fff28619: am f4a7ac00: Merge "Move the Zygote off libcore.os and onto android.system." 
* commit 'fff28619d8f3b2fa7577c3e101d3fcd45f26f3a4':
  Move the Zygote off libcore.os and onto android.system.
 2014-04-29 02:34:37 +00:00
Elliott Hughes
860c5911a2 Move the Zygote off libcore.os and onto android.system. 
Change-Id: Iaa20e50b05fad355bdf15bcfdc58efc9941c400c
 2014-04-28 19:19:13 -07:00
Alan Viverette
a21491bba0 am d7f5ba85: Merge "Fix alert dialog icon" 
* commit 'd7f5ba85e19bcd0416014864e560fd0cc3982949':
  Fix alert dialog icon
 2014-04-29 00:20:12 +00:00
Alan Viverette
b6093740db Merge "Fix alert dialog icon" 2014-04-29 00:13:36 +00:00
Chris Craik
9103e4f748 Add Z property to View 
Change-Id: Iff0b2fc616c650c46e5567a1cc81301afffcbfce
 2014-04-28 17:00:44 -07:00
Elliott Hughes
2b4edabd6a am 7221fa28: Merge "Move internal libcore.os users over to android.system." 
* commit '7221fa288089572b0f1ae16739deebe0d057f26d':
  Move internal libcore.os users over to android.system.
 2014-04-28 23:43:59 +00:00
Elliott Hughes
f97c63350a Move internal libcore.os users over to android.system. 
Change-Id: I84e1ace19ba3b4e58d7bb24f3ecda1bdf5dc75a5
 2014-04-28 16:38:43 -07:00
Jae Seo
cdf6bd22e0 Add more URI patterns for accessing TV metadata 
The following URI patterns are added:
  content://com.android.tv/input/*/*/channel
  content://com.android.tv/input/*/*/channel?browsable_only=
  content://com.android.tv/channel/#/program
  content://com.android.tv/channel/#/program?start_time=&end_time=

This allows us to disable user-provided selection on query/delete/update to help
avoid SQL injection.

Bug: 14133838
Change-Id: I6c86ac33cb5bc8aaa5248a80ed0f0fe0899a15b8
 2014-04-29 08:28:44 +09:00
Yuling Liang
f2231eb0a1 am de4054bb: am 3914a33c: am 26a5c2dd: Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev 
* commit 'de4054bba780e67d2f24ba52c5bc8e5a16d5bddc':
  Followon fix for 14276128 Clipping at bottom of TextView
 2014-04-28 23:28:36 +00:00
Yuling Liang
54dacbe7ca am 3914a33c: am 26a5c2dd: Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev 
* commit '3914a33c01102f5de51e33d006c0aeedf2693af0':
  Followon fix for 14276128 Clipping at bottom of TextView
 2014-04-28 23:22:54 +00:00
Yuling Liang
3914a33c01 am 26a5c2dd: Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev 
* commit '26a5c2dd740f309f3168790fc55a164738963835':
  Followon fix for 14276128 Clipping at bottom of TextView
 2014-04-28 23:18:58 +00:00