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

35933 Commits

Author SHA1 Message Date
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
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
Chris Craik
9103e4f748 Add Z property to View 
Change-Id: Iff0b2fc616c650c46e5567a1cc81301afffcbfce
 2014-04-28 17:00:44 -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
Yuling Liang
26a5c2dd74 Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev 2014-04-28 23:16:13 +00:00
Chris Craik
ceeccd434c am 40310481: Merge "Add elevation, Z properties to View" 
* commit '403104813cb424ae28df6b4245bafaab21969917':
  Add elevation, Z properties to View
 2014-04-28 23:07:59 +00:00
Chris Craik
139349b7de Merge "Add elevation, Z properties to View" 2014-04-28 23:03:42 +00:00
Eino-Ville Talvala
81356bb398 am b79b4307: Merge "CameraDevice: Make sure log tags are within length bounds." 
* commit 'b79b4307983c43614a5cd35a08c8444493abae79':
  CameraDevice: Make sure log tags are within length bounds.
 2014-04-28 22:33:57 +00:00
Eino-Ville Talvala
967c4354be Merge "CameraDevice: Make sure log tags are within length bounds." 2014-04-28 22:28:55 +00:00
Eino-Ville Talvala
b72d1efdef CameraDevice: Make sure log tags are within length bounds. 
Change-Id: I93c4670c1ee0b0be5956b0ed8cd0f53873257f7c
 2014-04-28 15:23:43 -07:00
Chris Craik
cc39e16cb9 Add elevation, Z properties to View 
Change-Id: I3dd3b683a66e248a0fdf2ca69d1e962615b0daf9
 2014-04-28 14:33:33 -07:00
Yorke Lee
fedd55a424 am a6521d78: Merge "Add setOverlay method to QuickContactsBadge" 
* commit 'a6521d78a4ce3c273b241eed214c85ec12a30d32':
  Add setOverlay method to QuickContactsBadge
 2014-04-28 21:31:31 +00:00
Griff Hazen
48f04a845b am 58ba9f2d: am e638b844: am 3c5a6cf9: am 2c6131bb: am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE. 
* commit '58ba9f2db123e216a262fae5e276ec9f394e42f8':
  Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
 2014-04-28 21:31:24 +00:00
Adam Lesinski
448b130c12 am d15388df: Merge "Merge commit \'734a78fb\' into manualmerge" 
* commit 'd15388dfe12938c95f52aba1cb41ec58ad1e5e84':
  Various CTS fixes
 2014-04-28 21:31:21 +00:00
Yorke Lee
2e9c300b91 Merge "Add setOverlay method to QuickContactsBadge" 2014-04-28 21:24:21 +00:00
Bo Liu
3a915af6a2 am caffba94: Merge "Add invokeFunctor call to ViewRootImpl" 
* commit 'caffba94e9e7cf8a798675b05815e578cbe72ffd':
  Add invokeFunctor call to ViewRootImpl
 2014-04-28 21:22:17 +00:00
Elliott Hughes
d9e6101862 am 05678e17: resolved conflicts for merge of 3ce4f3d0 to master 
* commit '05678e17e8c079a1c1c144e23e40a7a644a0b040':
  Track libcore.os' move to android.system.
 2014-04-28 21:22:01 +00:00
Griff Hazen
7c12112d62 am e638b844: am 3c5a6cf9: am 2c6131bb: am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE. 
* commit 'e638b84436caeea8d54b560c0b883ef599ba328d':
  Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
 2014-04-28 21:21:10 +00:00
Adam Lesinski
1ebf4ef188 Merge "Merge commit '734a78fb' into manualmerge" 2014-04-28 21:20:01 +00:00
Bo Liu
802667b20b Merge "Add invokeFunctor call to ViewRootImpl" 2014-04-28 21:16:14 +00:00
Adam Lesinski
e929bee9bb Merge commit '734a78fb' into manualmerge 
Conflicts:
	core/java/android/app/WallpaperManager.java

Change-Id: Id103f540329ea484ff2e0829a0fc8158621f3dd3
 2014-04-28 14:15:06 -07:00
Yorke Lee
a702ccdf9f Add setOverlay method to QuickContactsBadge 
Allow apps to disable/configure their own overlay to be used
on the QuickContactsBadge

Bug: 13747208

Change-Id: Id84c6ee1ebde6ce17477c12d22522ca19c27ea9b
 2014-04-28 13:57:04 -07:00