drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
134,381 Commits 1 Branch 0 Tags
Commit Graph

134381 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Selim Gurun
d7625b2b59 am 11b98d6d: Merge "Fix build" 
* commit '11b98d6d25fb87dd43228160e10e9a4206bc21c9':
  Fix build
 2014-05-07 23:43:43 +00:00
Brian Carlstrom
ea4facab1c am a599245c: Merge "resolved conflicts for merge of 3bbef521 to master" 
* commit 'a599245ca0d4886842bff4257e254adaf6743e5f':
  Use package usage information to decide what dex files to optimize in PackageManagerService
 2014-05-07 23:43:38 +00:00
Winson Chung
e962c85e96 am 1c0090b6: Merge "Disabling shadowing (until bugs are addressed) and refactoring some constants." 
* commit '1c0090b6b3348cd7fe9e78e00c41f69cac2cdb7b':
  Disabling shadowing (until bugs are addressed) and refactoring some constants.
 2014-05-07 23:43:34 +00:00
John Reck
14d5767c37 am 9cdc11c6: Merge "Cleanup attachFunctor" 
* commit '9cdc11c684756336734399dac16476a24b8348ef':
  Cleanup attachFunctor
 2014-05-07 23:43:30 +00:00
Jorim Jaggi
2daec8f4ad am d19697b5: Merge "New layout structure for the expanded status bar." 
* commit 'd19697b58c260e566f7724c7de81cbfd50a931e1':
  New layout structure for the expanded status bar.
 2014-05-07 23:43:26 +00:00
Jim Miller
56d9f20039 am e22854a7: am 424edf06: am cc6b9eb2: am 92ddac04: Merge "Fix can\'t change airplane mode from GlobalActions." 
* commit 'e22854a78f3149b5614bfcbe12dd767a24db03d9':
  Fix can't change airplane mode from GlobalActions.
 2014-05-07 23:43:21 +00:00
Zhijun He
02157bb93f am eb440873: Camera: remove some DNG tags 
* commit 'eb44087344cb545f97f78b802dc91bfec252f0f7':
  Camera: remove some DNG tags
 2014-05-07 23:42:39 +00:00
John Reck
b53f2b7882 am 47003dcd: Merge "Implement TODO(romainguy)" 
* commit '47003dcd3993f06416c63b2a781ef43c6f5feed3':
  Implement TODO(romainguy)
 2014-05-07 23:42:32 +00:00
John Reck
fd0ca638b8 am be376021: Merge "Don\'t try to draw if there\'s no canvas or surface" 
* commit 'be376021bc20431bf829de868d199992635d84c1':
  Don't try to draw if there's no canvas or surface
 2014-05-07 23:42:29 +00:00
Mindy Pereira
101e379318 am 07763e30: Merge "Make distance count when dismissing swipedismisslayout" into klp-modular-dev 
* commit '07763e305404bce16df500e1a65493d2f2b7d0c9':
  Make distance count when dismissing swipedismisslayout
 2014-05-07 23:42:00 +00:00
Jorim Jaggi
4d2f8a553d am 08d852aa: Merge "Add intermediate lock icon so users know how to unlock." 
* commit '08d852aa220d3272b80b23ab3c221dbf5670fd8f':
  Add intermediate lock icon so users know how to unlock.
 2014-05-07 23:41:58 +00:00
Jason Monk
0c744579c5 am b80ab1b9: Fix Build 
* commit 'b80ab1b91ab06679137678243b05f1f5a8fe19ee':
  Fix Build
 2014-05-07 23:41:53 +00:00
repo sync
90cfa00112 resolved conflicts for merge of 5ae1c4f7 to klp-modular-dev-plus-aosp 
Change-Id: I4e1448af91c158e4b5a25577b9b392773d7d3bfc
 2014-05-07 16:34:51 -07:00
Jason Monk
41a2e33744 Fix Docs breakage 
This depends on another API which evidently has not been merged
yet, this change should be reverted once the API is available
to be linked.

Change-Id: I59cb76e158fc0fac68ebd1c0de48b55e52274805
 2014-05-07 19:18:38 -04:00
John Reck
ae493d967f Merge "Allow all loopers to be RT-accelerated" 2014-05-07 23:16:52 +00:00
Jason Monk
fab0126136 Merge "Fix Docs breakage" 2014-05-07 23:16:02 +00:00
Vinod Krishnan
7d3387bc13 am 03498d34: am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev 
* commit '03498d349ae3aa5e429e999b97036d194981373f':
  Adding a HeartRate Feature
 2014-05-07 22:57:45 +00:00
John Reck
030d619aaa Allow all loopers to be RT-accelerated 
Bug: 14445956

Change-Id: I03e92642aa118db5c7fefa1f09c3a5bde6ea671d
 2014-05-07 15:46:36 -07:00
Mindy Pereira
07763e3054 Merge "Make distance count when dismissing swipedismisslayout" into klp-modular-dev 2014-05-07 22:46:02 +00:00
Florin Malita
531fecca1c Merge "Encapsulate Canvas.mNativeCanvas" 2014-05-07 22:44:47 +00:00
Jason Monk
faf3fd59d5 Fix Docs breakage 
Change-Id: Idaa57d16165203ad38143e493552ddf8a1ff56e5
 2014-05-07 18:41:13 -04:00
Brian Carlstrom
dfad99ad9f resolved conflicts for merge of 0b5598c9 to master 
Change-Id: Ie911d6b0b5e2b87e2b4669fa2465a82bb5807893
 2014-05-07 15:24:01 -07:00
Ying Wang
b38e3fdf5a Remove unused LOCAL_LDLIBS. 
Change-Id: I01346e76f4ac6402af0ef33e3b2eef4a69e704a2
 2014-05-07 15:23:37 -07:00
George Mount
6de56bb07e Fix mismatch in Transition ID/instances 
Bug 14597573

In a Transition, when a View is removed from a Scene
and that View has an ID in common with another View
in the end Scene, it will be matched, even if the
View in the start Scene already had a matching View
by instance. This CL prevents a match by ID when an
instance match is available.

Future: disable matching when two views have the
same ID.

Change-Id: I0e51d1f2d0a2d05d09e8e135f090d0e1b2a67efc
 2014-05-07 15:09:08 -07:00
Selim Gurun
b5a449e488 Merge "Fix build" 2014-05-07 22:08:31 +00:00
Brian Carlstrom
095652d3cb Merge "resolved conflicts for merge of 3bbef521 to master" 2014-05-07 22:06:24 +00:00
Selim Gurun
5ba69bef8c Fix build 
Fix the java reflection to have the devices boot again.

Change-Id: Ibd24b1e43e5c8385aa9372f8e22133b6eb85cd2b
 2014-05-07 15:04:40 -07:00
Winson Chung
945c27836b Merge "Disabling shadowing (until bugs are addressed) and refactoring some constants." 2014-05-07 22:04:16 +00:00
Winson Chung
814086db67 Disabling shadowing (until bugs are addressed) and refactoring some constants. 
Change-Id: Iaf4c98bcb13441be3e66048687ea5b0673d2bce6
 2014-05-07 15:01:14 -07:00
Baligh Uddin
88eeb81043 Import translations. DO NOT MERGE 
Change-Id: I14399e867491e32386a481c24d98418be3f128b3
Auto-generated-cl: translation import
 2014-05-07 14:56:32 -07:00
John Reck
ef27453cf7 Merge "Cleanup attachFunctor" 2014-05-07 21:48:20 +00:00
Vinod Krishnan
03498d349a am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev 
* commit 'b9d71fa1081dc318a811b60660009d0769c02971':
  Adding a HeartRate Feature
 2014-05-07 21:46:45 +00:00
Brian Carlstrom
6422abef78 resolved conflicts for merge of 3bbef521 to master 
Change-Id: I0bbb7c80f6c4f003779da784475d7acbfb898c94
 2014-05-07 14:46:40 -07:00
Jorim Jaggi
4f0128fb8f Merge "New layout structure for the expanded status bar." 2014-05-07 21:43:14 +00:00
Jim Miller
46426009a5 am 424edf06: am cc6b9eb2: am 92ddac04: Merge "Fix can\'t change airplane mode from GlobalActions." 
* commit '424edf064fb705b07f5f7d41e875dd2b24ccf271':
  Fix can't change airplane mode from GlobalActions.
 2014-05-07 21:40:15 +00:00
Dmitry Grinberg
5ae1c4f708 Merge "DO NOT MERGE: change preloaded classes" into klp-modular-dev 2014-05-07 21:39:44 +00:00
John Reck
832b151465 Cleanup attachFunctor 
Bug: 13961296

Change-Id: Id48d11bfcc234afd1fd7e4fdd409a50e7208c81d
 2014-05-07 14:39:44 -07:00
Zhijun He
bc01db42d5 Camera: remove some DNG tags 
Change-Id: I878e26414dcf5cedbcfd8c505b0c507f4548c035
 2014-05-07 21:33:23 +00:00
Baligh Uddin
bf37476825 Import translations. DO NOT MERGE 
Change-Id: I120dc14038baa40159d1773e70cb31468ed54843
Auto-generated-cl: translation import
 2014-05-07 14:31:26 -07:00
John Reck
b6d9211d31 Merge "Implement TODO(romainguy)" 2014-05-07 21:24:25 +00:00
John Reck
841057ffc0 Merge "Don't try to draw if there's no canvas or surface" 2014-05-07 21:24:23 +00:00
Jason Sams
26e9051957 Add flags to context creation for RS 
We have a number of context options exposed though native
that were not available though the Java API.  This brings them
to parity.  Will finish plumbing in a follow on CL.

Change-Id: I8c65ee743d0e750e418304127b84088f25176c38
 2014-05-07 14:23:46 -07:00
Amith Yamasani
1a7eaaa50e Send boot_completed for users started in the background 
Bug: 14587584

Change-Id: I7abfad0a7102376e1665b528f3fd110a4b6ed164
 2014-05-07 14:16:46 -07:00
Emily Bernier
394a6cdd98 New user restrictions for EDU 
New user restrictions will allow schools to prevent students from 1) using
device microphones, 2) adjusting device volume, and 3) mounting physical
external media.

Change-Id: Ib2fcb7ce8fbc489a25d2c97a122b2124012a9e3c
 2014-05-07 17:04:58 -04:00
John Reck
63a0667325 Implement TODO(romainguy) 
Bug: 14277445

Change-Id: Id52d6f7fcc023000adcc440bd4da67d9a673536b
 2014-05-07 13:45:54 -07:00
Baligh Uddin
8152ee5e83 Import translations. DO NOT MERGE 
Change-Id: I17154078eaa160864a641882dee6d7d49c56ff31
Auto-generated-cl: translation import
 2014-05-07 13:38:21 -07:00
Vinod Krishnan
b9d71fa108 Merge "Adding a HeartRate Feature" into klp-modular-dev 2014-05-07 20:33:12 +00:00
Brian Carlstrom
0b5598c924 am 691079dd: am a21ba5be: Merge "Add BackgroundDexOptService" 
* commit '691079ddc0055fac9b82dccaf35b4591978b2a55':
  Add BackgroundDexOptService
 2014-05-07 20:28:25 +00:00
Brian Carlstrom
3bbef521d4 resolved conflicts for merge of f2db00fd to klp-modular-dev-plus-aosp 
Change-Id: I745164033962f6222832f8f19fa316a2e2634fd0
 2014-05-07 13:20:23 -07:00
John Reck
368cdd8526 Don't try to draw if there's no canvas or surface 
Bug: 14616376

 doFrame() can happen after the canvas or surface is destroyed,
 handle it gracefully

Change-Id: Ibbbbdbfa77fa2134bd2abc215ca1a0886d706969
 2014-05-07 13:19:28 -07:00