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

124703 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ruben Brunk
9408be9dbb am aa1567f9: Merge "camera3: Make blackLevelPattern optional." 
* commit 'aa1567f9ba3611647968ab7786fd3a51abeffb32':
  camera3: Make blackLevelPattern optional.
 2014-02-07 16:15:18 -08:00
Ruben Brunk
aa1567f9ba Merge "camera3: Make blackLevelPattern optional." 2014-02-08 00:12:46 +00:00
Ruben Brunk
1ef676f23c camera3: Make blackLevelPattern optional. 
Change-Id: Ic7b115e9f6361e158e7af13442bb781bbf351cbf
 2014-02-07 16:08:38 -08:00
Zhijun He
621f0e74c9 am 12b805bb: Merge "Camera2: Update focus distance related tags" 
* commit '12b805bb5a0bb186e1756b28cece9eb64ff6d598':
  Camera2: Update focus distance related tags
 2014-02-07 16:02:58 -08:00
Zhijun He
12b805bb5a Merge "Camera2: Update focus distance related tags" 2014-02-07 23:59:42 +00:00
Zhijun He
ff41393d06 Camera2: Update focus distance related tags 
Change-Id: Ib94311c3168802aea2193a282185e0cd70a547cb
 2014-02-07 15:57:10 -08:00
Ruben Brunk
957274354b am 3759ec9b: Merge "camera3: Add camera neutral tag." 
* commit '3759ec9b2e8aea4301dd0398e5da203bdbc6f833':
  camera3: Add camera neutral tag.
 2014-02-07 15:54:50 -08:00
Ruben Brunk
3759ec9b2e Merge "camera3: Add camera neutral tag." 2014-02-07 23:52:45 +00:00
Ruben Brunk
20c76f6758 camera3: Add camera neutral tag. 
Change-Id: Ia7e8c444256ce2a587ce708c2e6e951dec9bbdc8
 2014-02-07 15:47:10 -08:00
Ruben Brunk
9c17a4c862 am 97f0ed03: Merge "camera3: Update blackLevelPattern tag." 
* commit '97f0ed03ec0d9a7d06064c0018feb8d7a45e0c52':
  camera3: Update blackLevelPattern tag.
 2014-02-07 15:42:23 -08:00
Ruben Brunk
97f0ed03ec Merge "camera3: Update blackLevelPattern tag." 2014-02-07 23:39:44 +00:00
Ruben Brunk
67b4702428 camera3: Update blackLevelPattern tag. 
Change-Id: Iee29d475c92bec1688de96e7cae54dfaf1eec69d
 2014-02-07 15:38:28 -08:00
ztenghui
3e793b5ef5 am 82946aae: Merge "Add the clipToOutline by just using the clipPathOp" 
* commit '82946aae3cae9bdfe01f96cfc5e8d1efcefeba7c':
  Add the clipToOutline by just using the clipPathOp
 2014-02-07 14:10:52 -08:00
ztenghui
82946aae3c Merge "Add the clipToOutline by just using the clipPathOp" 2014-02-07 22:09:39 +00:00
Dianne Hackborn
ec2299d01a am 68ac5cef: Merge "Battery stats: more events, fixes." 
* commit '68ac5cef63a9fef595a0cd6b7d8f9170994672ad':
  Battery stats: more events, fixes.
 2014-02-07 13:58:39 -08:00
Dianne Hackborn
68ac5cef63 Merge "Battery stats: more events, fixes." 2014-02-07 21:56:45 +00:00
Dianne Hackborn
eaf2ac464b Battery stats: more events, fixes. 
Add new history events for top application package and
foreground application packages.

Doing this involved a fair amount of improvement to history
events.  The event code is now separated out to have "start"
and "finish" identifies, and we use that to now keep track
of which events are active.  With that, when resetting the
stats, we can spit out all of the currently active events at
the front of the new history.

Also fixed some problems when I re-arranged the history delta
int bits that were conflicting with the packing of the battery
status bits.  These packing structures are changed to work
together correctly.

Change-Id: Ic8b815060dd8a50ff4a0a209efc2e1044215cd88
 2014-02-07 13:45:01 -08:00
ztenghui
fad4593a3c Add the clipToOutline by just using the clipPathOp 
Change-Id: I6ba23b589e579599d018600d0744be0efe2028c1
 2014-02-07 13:36:57 -08:00
Derek Sollenberger
c8641801a9 am 8852ab43: Merge "Keep the SkPaint used when creating a layer." 
* commit '8852ab4357ffb653bafb36f3b9272866834f7a72':
  Keep the SkPaint used when creating a layer.
 2014-02-07 12:54:03 -08:00
Derek Sollenberger
8852ab4357 Merge "Keep the SkPaint used when creating a layer." 2014-02-07 20:52:22 +00:00
John Spurlock
b8bf5b7b3a am 876e359b: Merge "Make QS battery composite color match others." 
* commit '876e359b4863ea41f08fe0e49551ad4ac3fa98af':
  Make QS battery composite color match others.
 2014-02-07 11:26:57 -08:00
John Spurlock
876e359b48 Merge "Make QS battery composite color match others." 2014-02-07 19:25:20 +00:00
Chris Craik
841af3a5f7 am 27bfb245: Merge "Rework and clean up DisplayList projection" 
* commit '27bfb24518934f0344c79a1d655ea8d1208d2446':
  Rework and clean up DisplayList projection
 2014-02-07 10:51:10 -08:00
Chris Craik
27bfb24518 Merge "Rework and clean up DisplayList projection" 2014-02-07 18:47:57 +00:00
Derek Sollenberger
d44fbe55a9 Keep the SkPaint used when creating a layer. 
This will allow us to inspect the paint for thing other than
color and xfermode, such as SkColorFilters and SkShaders.

bug: 10650594
Change-Id: I2c3ddd07a3966e1e77af34136307e2b59b2898c1
 2014-02-07 13:33:29 -05:00
Kenny Root
9f6caa1ff9 am 1a88d834: KeyChain: add explicit package for getPrivateKey 
* commit '1a88d834e8f7d21e714121c011fec82369a2e9f1':
  KeyChain: add explicit package for getPrivateKey
 2014-02-07 09:54:46 -08:00
Kenny Root
1a88d834e8 KeyChain: add explicit package for getPrivateKey 
Bug: 9964538
Change-Id: If67c1938e9506d4fa81b241bcbce2193d1b194ef
 2014-02-07 09:14:32 -08:00
Narayan Kamath
7c1f81e844 am 8f52fee0: Merge "Fix several bad function definitions." 
* commit '8f52fee0609a4f273f87f4178865b0713c8114aa':
  Fix several bad function definitions.
 2014-02-07 03:37:01 -08:00
Narayan Kamath
8f52fee060 Merge "Fix several bad function definitions." 2014-02-07 11:34:19 +00:00
Jim Miller
d0fd4cf4bc am ba7d94b8: Fix problem where input wasn\'t being requested 
* commit 'ba7d94b8f3c41fd5b933b185e7463a56589e04d2':
  Fix problem where input wasn't being requested
 2014-02-06 17:11:02 -08:00
Jim Miller
c6055c851d am 5e612cf0: Add KeyguardSimpleHostView and make it the default 
* commit '5e612cf07872dc0989a4b9f09e2a38a2ee12186d':
  Add KeyguardSimpleHostView and make it the default
 2014-02-06 17:10:59 -08:00
Jim Miller
4de05a378c am 3eb4971b: Move launch, verification and menu logic to base class - Add simplified KeyguardHostView - Move common functions to KeyguardViewBase.java - Create new KeyguardSimpleHostView class for simplified view implementation. 
* commit '3eb4971b679464e206cb666de1cf0e5a538c8d7d':
  Move launch, verification and menu logic to base class - Add simplified KeyguardHostView - Move common functions to KeyguardViewBase.java - Create new KeyguardSimpleHostView class for simplified view implementation.
 2014-02-06 17:10:56 -08:00
Jim Miller
ba7d94b8f3 Fix problem where input wasn't being requested 
This fixes a bug where input wasn't being enabled when the security
method changed.  The solution is to propagate changes back to the parent

Add missing copyright header to simplified keyguard view.

Bugs 12135931, 12879769

Change-Id: I0fc6cf8ef3b628c96a045797a5b9cdecd3a1007a
 2014-02-06 16:13:42 -08:00
Jim Miller
5e612cf078 Add KeyguardSimpleHostView and make it the default 
This adds a simplified KeyguardHostView that's intended to
be used as an overlay or dialog for asking the user's
credentials.

Bug 12135931

Change-Id: Iecede0715d671e88024e7bb77e7432cd1c7ec356
 2014-02-06 16:13:42 -08:00
Jim Miller
3eb4971b67 Move launch, verification and menu logic to base class 
- Add simplified KeyguardHostView
- Move common functions to KeyguardViewBase.java
- Create new KeyguardSimpleHostView class for simplified view
implementation.

Bug 12135931

Change-Id: I8d6b0a61c36a0c7ceb87da4da54b1dfbed0054ff
 2014-02-06 16:13:41 -08:00
Chris Craik
1df26446b7 Rework and clean up DisplayList projection 
Move the projection surface to be a property of a DisplayList,
set to true for every background drawable.

Additionally, handle a projecting view background such that it doesn't
try to project onto itself (which is undesirable).

Change-Id: Ic70b17474bd87340e80767f8518f73b233419c7a
 2014-02-06 16:07:37 -08:00
Chris Craik
1291e70dba am fdace4e2: Merge "Simplify DisplayList matrices" 
* commit 'fdace4e238afa9f2409c6397a78498b00f765ab0':
  Simplify DisplayList matrices
 2014-02-06 15:24:05 -08:00
Chris Craik
fdace4e238 Merge "Simplify DisplayList matrices" 2014-02-06 23:22:28 +00:00
Adam Powell
47e352cf04 am 6250c59e: Merge "Refactoring of fitSystemWindows to applyWindowInsets for views" 
* commit '6250c59e0d917fb3641ac499ca69b011aa50a4bd':
  Refactoring of fitSystemWindows to applyWindowInsets for views
 2014-02-06 14:43:27 -08:00
Adam Powell
6250c59e0d Merge "Refactoring of fitSystemWindows to applyWindowInsets for views" 2014-02-06 22:41:14 +00:00
Ricardo Cervera
86b99ae94c am 1d2b0c00: am adb94013: am 8ff1f285: am b7d456d4: am 8d65fc2c: am 8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug: 10303533" into klp-docs 
* commit '1d2b0c008bfedfa4d6ef231c393f848cda662e03':
  docs: Updated the retaining an object during conf change. Bug: 10303533
 2014-02-06 14:17:33 -08:00
Ricardo Cervera
921407e137 am 6232c3ca: am a5e35cb0: am 6ed26862: am 74d290fd: am d057fa6d: am 531939d1: Merge "docs: Fixed links to Proguard manual. Bug: 12713887" into klp-docs 
* commit '6232c3caf580d805ef26648c645181ac37ab00ff':
  docs: Fixed links to Proguard manual. Bug: 12713887
 2014-02-06 14:17:30 -08:00
Craig Mautner
ec8ac30614 am c667f054: am 43ef013c: (-s ours) am 38f7dcd7: DO NOT MERGE. Test for Configuration differences before changing. 
* commit 'c667f054d5b5a87247cd84d78d483dc1c97af41a':
  DO NOT MERGE. Test for Configuration differences before changing.
 2014-02-06 14:17:28 -08:00
John Reck
ef129d8442 am 393fdbec: Merge "Remove overdraw counter" 
* commit '393fdbec9f3f11d277e1631c2e36362e408cbbdc':
  Remove overdraw counter
 2014-02-06 14:17:25 -08:00
Adam Lesinski
95e17980c5 am 9f97de13: am a5a93f55: am 7f416631: Merge "Check feature bits before loading optional services" into klp-modular-dev 
* commit '9f97de13359662c2709eed227b3fab2ce7d5dabc':
  Check feature bits before loading optional services
 2014-02-06 14:17:22 -08:00
Jeff Sharkey
be781e26aa am 2b1252dd: Merge "Update DrmOutputStream to use raw FileDescriptor." 
* commit '2b1252ddd2650cb38918cb85d2a3711b2cfa8db5':
  Update DrmOutputStream to use raw FileDescriptor.
 2014-02-06 14:17:18 -08:00
Craig Mautner
a9080e9b01 am d1c2c542: Test for Configuration differences before changing. 
* commit 'd1c2c5421181b988f09fd12d9633e2a7c2a8ab60':
  Test for Configuration differences before changing.
 2014-02-06 14:17:15 -08:00
Ricardo Cervera
1d2b0c008b am adb94013: am 8ff1f285: am b7d456d4: am 8d65fc2c: am 8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug: 10303533" into klp-docs 
* commit 'adb940131adf137023006fcd86663fd048fa6a54':
  docs: Updated the retaining an object during conf change. Bug: 10303533
 2014-02-06 21:29:59 +00:00
Ricardo Cervera
6232c3caf5 am a5e35cb0: am 6ed26862: am 74d290fd: am d057fa6d: am 531939d1: Merge "docs: Fixed links to Proguard manual. Bug: 12713887" into klp-docs 
* commit 'a5e35cb002936291b79ff422c94eb2caabedfb3a':
  docs: Fixed links to Proguard manual. Bug: 12713887
 2014-02-06 21:26:03 +00:00
Ricardo Cervera
adb940131a am 8ff1f285: am b7d456d4: am 8d65fc2c: am 8756b0c3: Merge "docs: Updated the retaining an object during conf change. Bug: 10303533" into klp-docs 
* commit '8ff1f285c93a1a44a7419ab216bee2f92518387a':
  docs: Updated the retaining an object during conf change. Bug: 10303533
 2014-02-06 21:23:40 +00:00