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

122141 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zhijun He
399f05d1e7 Camera2: Update awbMode related javadoc spec 
Change-Id: I999d2bc94834c6f6d4483493707f05c92d7c5d67
 2014-01-15 11:31:30 -08:00
Leon Scroggins III
5aa3e4d58d Merge "Fix Javadoc build break." 2014-01-15 19:24:39 +00:00
Leon Scroggins III
2bc49ca96e Fix Javadoc build break. 
Remove links to non-specific function name.

Change-Id: I5643074149d0a511bd760d638751c44e3ec4c557
 2014-01-15 14:23:14 -05:00
John Reck
81155da284 Merge "Remove dead code" 2014-01-15 18:57:13 +00:00
Leon Scroggins III
f761fa7767 Merge "Remove calls to deprecated SkBitmap::setIsOpaque()" 2014-01-15 18:34:19 +00:00
Geoff Mendal
78604a2833 Merge "Import translations. DO NOT MERGE" 2014-01-15 18:24:04 +00:00
Geoff Mendal
282bcdd834 Import translations. DO NOT MERGE 
Change-Id: I0116e137efa21bd9e8e3ba65fa05c7d84afb9e2c
Auto-generated-cl: translation import
 2014-01-15 10:12:52 -08:00
quddusc
3a0ebd8957 am 4645edea: am 25e1900b: am e8ae214c: am f4011173: am 31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs 
* commit '4645edeae0eec727909bcfe1ff7562ca4a7d1c80':
  docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754
 2014-01-15 18:11:32 +00:00
quddusc
4645edeae0 am 25e1900b: am e8ae214c: am f4011173: am 31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs 
* commit '25e1900beee4959be28ede9e00b8c5e8f10c1e17':
  docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754
 2014-01-15 18:08:32 +00:00
quddusc
25e1900bee am e8ae214c: am f4011173: am 31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs 
* commit 'e8ae214c31b4c5c2e90538b9d0a5c258e32fafeb':
  docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754
 2014-01-15 18:04:31 +00:00
quddusc
e8ae214c31 am f4011173: am 31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs 
* commit 'f40111731581f03dc1b447b432331b3415fb87b9':
  docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754
 2014-01-15 10:00:53 -08:00
Glenn Kasten
0c5b62744b Merge "Unhide android.media.AudioTrack.setVolume(float)" 2014-01-15 17:58:53 +00:00
quddusc
f401117315 am 31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs 
* commit '31573d45933886237dd6414978486b79a4dd4f9f':
  docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754
 2014-01-15 17:57:27 +00:00
quddusc
31573d4593 Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug: 9436754" into klp-docs 2014-01-15 17:55:22 +00:00
John Reck
2114aef4ea Remove dead code 
Change-Id: I9c96d3d21bd3faed91a5146f5a2b8916c634fdff
 2014-01-15 09:37:38 -08:00
Marco Nelissen
7a993a3d54 am 4e53edf7: am e495a5a3: am cb15fb60: am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, check if it is closed." 
* commit '4e53edf7ea8f8158a123a451530146f23e3fed81':
  Before requerying a cursor, check if it is closed.
 2014-01-15 17:33:42 +00:00
Marco Nelissen
4e53edf7ea am e495a5a3: am cb15fb60: am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, check if it is closed." 
* commit 'e495a5a3f3feec6319262a6bdab3b7704d6ab843':
  Before requerying a cursor, check if it is closed.
 2014-01-15 17:29:43 +00:00
Marco Nelissen
e495a5a3f3 am cb15fb60: am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, check if it is closed." 
* commit 'cb15fb6041e604025d4b76645435f8cbafee754c':
  Before requerying a cursor, check if it is closed.
 2014-01-15 17:27:19 +00:00
Marco Nelissen
cb15fb6041 am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, check if it is closed." 
* commit '0d4916f19f81f80fc83eb7646c6d339630d5f618':
  Before requerying a cursor, check if it is closed.
 2014-01-15 09:22:55 -08:00
Marco Nelissen
0d4916f19f am c3036a12: Merge "Before requerying a cursor, check if it is closed." 
* commit 'c3036a12467395465b86e6935af8aa500c1b128d':
  Before requerying a cursor, check if it is closed.
 2014-01-15 09:19:52 -08:00
Marco Nelissen
c3036a1246 Merge "Before requerying a cursor, check if it is closed." 2014-01-15 17:17:05 +00:00
Leon Scroggins III
8790be6de3 Remove calls to deprecated SkBitmap::setIsOpaque() 
setIsOpaque() has been removed from ToT Skia.

Update setters for mIsPremultiplied and hasAlpha to take the
other into consideration.

Change-Id: I1b36b0b0ce7126031eb7b769b563c17dcd4b306a
 2014-01-15 11:37:04 -05:00
Michael Jurka
cae6b43b03 Merge "Centering the crop by default in system wallpaper cropper" 2014-01-15 12:52:08 +00:00
Alan Viverette
c6c243bf01 Merge "Propagate first call to DrawableContainer.setAlpha() to children" 2014-01-15 02:24:44 +00:00
Alan Viverette
34bd56b546 Propagate first call to DrawableContainer.setAlpha() to children 
BUG: 12530662
Change-Id: Idd972698d1a6805cb9f66ba4c2ddde97e1f8d2ca
 2014-01-14 18:19:09 -08:00
Zhijun He
78146ecb24 Camera2: Update AF mode related javadoc specs 
Change-Id: If7a0de76f660ade25d9fdb92458fbe7e9752d0dd
 2014-01-14 18:12:13 -08:00
Zhijun He
fb46c644ce Camera2: metadata tag javadoc update 
Change-Id: I66700340780f3185796f25c054487f439f24a6fb
 2014-01-14 17:57:23 -08:00
Alan Viverette
0ae6a7a2cc Merge "Cache display lists for Drawables" 2014-01-15 01:31:00 +00:00
Glenn Kasten
4896cb59a4 Merge "Use AUDIO_SESSION_ALLOCATE instead of hard-coded 0" 2014-01-15 01:27:59 +00:00
Jason Sams
bdc223a7f2 Merge "Check that bound allocations are 1D" 2014-01-15 01:23:51 +00:00
Alan Viverette
c062c7003f Cache display lists for Drawables 
Change-Id: I86e2dd4cd4ac8871f4131450cb9082c2b8de2eed
 2014-01-14 17:16:29 -08:00
Craig Mautner
3a43aa9cef am 9cfb2e5f: Merge "Retain stacks even if they are empty." into klp-modular-dev 
* commit '9cfb2e5f4c95c16d8ca531808f60486f214f9039':
  Retain stacks even if they are empty.
 2014-01-15 01:10:51 +00:00
Adrian Roos
a3fa8bf159 Merge "Make brightness panel behave like volume panel." 2014-01-15 01:10:32 +00:00
Craig Mautner
9cfb2e5f4c Merge "Retain stacks even if they are empty." into klp-modular-dev 2014-01-15 01:07:15 +00:00
Alan Viverette
4b95cc7ef7 Quick fix for updating the FastScroller long list property 
BUG: 12553181
Change-Id: I5305b0ec4ae8e069fc98d45dc3d5daaa0628ca79
 2014-01-14 16:54:02 -08:00
Jason Sams
9eb8b3ae09 Check that bound allocations are 1D 
We do not support higher order bound allocations. The
stride is not available to the script so they cannot
walk the allocation correctly.

Change-Id: I9447a5d43c3ae1b88fc9522628a17bd5a317ffc6
 2014-01-14 16:18:14 -08:00
Adrian Roos
d8ea484e2c Make brightness panel behave like volume panel. 
Moves the brightness panel to the same spot as the volume panel. To avoid a conflict with the volume panel, brightness is dismissed when the volume keys are pressed.

Bug: 7217009
Bug: 7217154
Change-Id: Ib8331a1e390cbedca40fa237243ea2cfd088e521
 2014-01-14 16:12:33 -08:00
Glenn Kasten
3e21cc8140 Unhide android.media.AudioTrack.setVolume(float) 
Bug: 12534920
Change-Id: I7d7437f87f7002c42452011e347e89ddaa0bf6a5
 2014-01-14 13:55:36 -08:00
John Spurlock
4a5eb8fe18 Merge "Add demo-mode command to hide notification icons." 2014-01-14 21:29:57 +00:00
John Spurlock
7f42fc5007 Add demo-mode command to hide notification icons. 
Bug:11285517
Change-Id: I341feadbf164afd34fef192a541f14a2ff67e8e2
 2014-01-14 16:20:39 -05:00
Chris Craik
255fd80737 Merge "Simplify Z reordering logic" 2014-01-14 21:07:50 +00:00
Chris Craik
9f68c09626 Simplify Z reordering logic 
Change-Id: I9e36f68d7be5cfd4d69a84a51824cb9a642fe18d
 2014-01-14 12:52:41 -08:00
Matthew Xie
49da8370f6 am 91da5b68: Merge changes I86b3fa60,I7fa4e847 into klp-modular-dev 
* commit '91da5b6830c4c26827c1dfac79e26785c16ecf32':
  BLE peripheral mode (3/4): Add peripheral mode API.
  NPE in BluetoothSocket.write()
 2014-01-14 20:46:36 +00:00
quddusc
9c09d67536 am 84d5df5f: am f1809bae: am 65e3350c: am 916277e4: am e7eb5996: Merge "docs: Removed stray link. Bug: 11773486" into klp-docs 
* commit '84d5df5fa6832aa89fae3f3f02cf6ee4e7a60b8b':
  docs: Removed stray link. Bug: 11773486
 2014-01-14 20:46:31 +00:00
quddusc
5913630869 am 0a17ad7a: am d689a06e: am 9bc3bde7: am 5e5c9833: am cec51d66: Merge "docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug: 10797762" into klp-docs 
* commit '0a17ad7a4b3e017b69b8639970368e8ce5f40003':
  docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug: 10797762
 2014-01-14 20:46:25 +00:00
quddusc
fdba15bdcc am 2bcc0782: am ee1b0bfd: am 9714cbdf: am 21627274: am cc29a170: Merge "docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515" into klp-docs 
* commit '2bcc0782fda432035ed2e4e44ab723926a79e4b2':
  docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515
 2014-01-14 20:46:12 +00:00
quddusc
5cf5247261 am 876bd853: am 1746de33: am bcc83d01: am 7c865524: am 64231d01: Merge "docs: Fixed typo in IAB training doc. Bug: 10807741" into klp-docs 
* commit '876bd853dc80d8e03afa11923edd11b05068c44c':
  docs: Fixed typo in IAB training doc. Bug: 10807741
 2014-01-14 20:46:07 +00:00
quddusc
18b7daf89f am 2808073f: am 76a6dfaf: am e53c32a0: am c61e6bc6: am 72159ab0: Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251" into klp-docs 
* commit '2808073f079e381d5c465bce454708972a7e8cd6':
  docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug: 9316251
 2014-01-14 20:46:02 +00:00
Matthew Xie
91da5b6830 Merge changes I86b3fa60,I7fa4e847 into klp-modular-dev 
* changes:
  BLE peripheral mode (3/4): Add peripheral mode API.
  NPE in BluetoothSocket.write()
 2014-01-14 20:44:16 +00:00
quddusc
84d5df5fa6 am f1809bae: am 65e3350c: am 916277e4: am e7eb5996: Merge "docs: Removed stray link. Bug: 11773486" into klp-docs 
* commit 'f1809bae546c8a6a435968b22527b0dcd325b4a1':
  docs: Removed stray link. Bug: 11773486
 2014-01-14 20:42:10 +00:00