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

124934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Craig Mautner
e03ed51068 am 4e5b67e6: Queue startActivity params if not yet ready. 
* commit '4e5b67e69560ca443d5fb4b78abf56ae948f578c':
  Queue startActivity params if not yet ready.
 2014-02-07 23:37:56 +00:00
Craig Mautner
779d204abe am 9ef471f7: Don\'t remove Activities and Tasks until animation done 
* commit '9ef471f7f2f59de032d7cb9c3c7241486109979e':
  Don't remove Activities and Tasks until animation done
 2014-02-07 23:37:53 +00:00
Christopher Tate
88daefd407 am 379bb6ed: am ff27e6bc: Merge "Use canonical path for /vendor/app" 
* commit '379bb6ed4ea4de035569b04018f84d7ce95a8036':
  Use canonical path for /vendor/app
 2014-02-07 23:37:03 +00:00
Christopher Tate
379bb6ed4e am ff27e6bc: Merge "Use canonical path for /vendor/app" 
* commit 'ff27e6bc44097485abfde24f396399e5eec9ff6d':
  Use canonical path for /vendor/app
 2014-02-07 15:33:17 -08:00
Christopher Tate
ff27e6bc44 Merge "Use canonical path for /vendor/app" 2014-02-07 23:30:24 +00:00
Craig Mautner
4e5b67e695 Queue startActivity params if not yet ready. 
If the ActivityView is not ready when the startActivity method is
called we now save the Intent until the ActivityView is ready.

Fixes bug 12821638.

Change-Id: I30ebb2699963f174cc2d5a3fb77a99ed33a4252b
 2014-02-07 15:30:03 -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
Derek Sollenberger
76d3a1b8d0 Removing SkiaColorFilter and inspecting the native object directly. 
bug: 10650594
Change-Id: I4fcf66d008765afa0e35d011f58bc792183cb74f
 2014-02-07 17:06:14 -05: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
Craig Mautner
9ef471f7f2 Don't remove Activities and Tasks until animation done 
Just like stacks and displays, activities and tasks need to stick
around until animations have completed.

Change-Id: I54fe8f6855d60cbc3a25cbc6e762defd5ac50bf5
 2014-02-07 13:11:47 -08:00
John Spurlock
cd4cf932d9 am 6691bfd6: am cccae25f: Merge "Example controller app for system ui demo mode." 
* commit '6691bfd6462e27af7075a3a46eccce943f0de9dd':
  Example controller app for system ui demo mode.
 2014-02-07 21:03:39 +00:00
John Spurlock
6691bfd646 am cccae25f: Merge "Example controller app for system ui demo mode." 
* commit 'cccae25fc7cd3daf68dee3d3ca7665a5ea12f097':
  Example controller app for system ui demo mode.
 2014-02-07 13:01:42 -08:00
John Spurlock
cccae25fc7 Merge "Example controller app for system ui demo mode." 2014-02-07 20:58:37 +00: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
Dirk Dougherty
7fd4d29e84 am 392ddb22: Merge "Doc change: add carousel and spotlight for developer video." into klp-docs 
* commit '392ddb22973cab737e8e8487565f4c6147500703':
  Doc change: add carousel and spotlight for developer video.
 2014-02-07 20:52:33 +00:00
Derek Sollenberger
8852ab4357 Merge "Keep the SkPaint used when creating a layer." 2014-02-07 20:52:22 +00:00
Dirk Dougherty
392ddb2297 Merge "Doc change: add carousel and spotlight for developer video." into klp-docs 2014-02-07 20:50:25 +00:00
Ricardo Cervera
7e4b48668e docs: Fixed ViewPager animation tutorial. Bug: 12815243 
Went through the tutorial and fixed a few minor issues. There is
confusion with Fragment and FragmentManager from the support library
vs. the main Android APIs. Clarified this by showing some imports
explicitly. Tested the new code from the page on Eclipse and it works
as expected.

Change-Id: I8494a72f4c760a03a6b8f3322c5754e315f22e7c
Review: http://quixote.mtv.corp.google.com:8002/training/animation/screen-slide.html
 2014-02-07 20:44:44 +00:00
John Spurlock
c23929c3a3 Example controller app for system ui demo mode. 
Demo mode is protected behind a system setting.  To enable:
$ adb shell settings put global sysui_demo_allowed 1

Change-Id: I2248e27a253bf9eac176e8be9153a2b147cefa40
 2014-02-07 14:47:47 -05:00
Jean-Luc Brouillet
ecc8ee6495 am 8067c9ec: am 11e6cabc: Merge "Fix a typo." 
* commit '8067c9ec87906fb591bbc36d1c8aedb09160b2b4':
  Fix a typo.
 2014-02-07 19:43:31 +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
Jean-Luc Brouillet
8067c9ec87 am 11e6cabc: Merge "Fix a typo." 
* commit '11e6cabc66a5ecfc9dadbd68fc0a5ed7d2a4656d':
  Fix a typo.
 2014-02-07 11:11:28 -08:00
Ashok Bhat
e9bea2a182 Fix TinyHashMap to use generic hash_type instead of hash_t 
TinyHashMap used hash_t(key) to generate hashcode. This
would not work for 64-bit pointers as hash_t is declared as
an uint32_t.

Replaced the hash_t(key) call to more generic android::hash_type(key).
This function is a template function declared in TypeHelpers.h and
has a version available for all data types including pointers.

Change-Id: I612cf18b49ca7c30b63f9d6938df68fed7d80d08
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
 2014-02-07 19:10:04 +00:00
Jean-Luc Brouillet
11e6cabc66 Merge "Fix a typo." 2014-02-07 19:08:36 +00:00
Jean-Luc Brouillet
d60799ec84 Fix a typo. 
Change-Id: I770fe97ab0635de84d15393aca6bca57552f2f10
 2014-02-07 11:04:26 -08: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
Ashok Bhat
0d552f7d8b Use long to store pointers in ConsumerIrService 
Change-Id: I4e6562b7dc09f87ad80b1e862b614a370d37feb5
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
 2014-02-07 18:12:23 +00:00
Ashok Bhat
d2507a2f3c Fix in MediaMuxer's JNI code 
android_media_MediaMuxer_native_setup should return jlong. It was
incorrectly returning jint.

Change-Id: I31a475af0818f4d5dcbb39380b42612188cf3853
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
 2014-02-07 18:10:22 +00: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
Dan Sandler
9e07c1c4f3 am 6b1f3acd: am 6ea720ba: Merge "Make sure to turn off led after pulse()" 
* commit '6b1f3acdf0f0806c0b3826d1c4ea43bd6cc6f021':
  Make sure to turn off led after pulse()
 2014-02-07 16:05:31 +00:00
Dan Sandler
6b1f3acdf0 am 6ea720ba: Merge "Make sure to turn off led after pulse()" 
* commit '6ea720bacb805e88fc3b8634bbd9dc7fa918beaa':
  Make sure to turn off led after pulse()
 2014-02-07 08:02:15 -08:00
Dan Sandler
6ea720bacb Merge "Make sure to turn off led after pulse()" 2014-02-07 15:59:08 +00: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