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

138514 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yin-Chia Yeh
ffff217134 Merge "Camera2: Do not hide TonemapCurve construtor" into lmp-preview-dev 2014-06-05 23:33:38 +00:00
Zhijun He
169a149d55 am b67beb8e: Merge "Camera2: Hide input stream related key and enum" into lmp-preview-dev 
* commit 'b67beb8e8b9115c1ba796a57f1bb59822e6a1ce1':
  Camera2: Hide input stream related key and enum
 2014-06-05 23:21:03 +00:00
Alan Viverette
efa65cc8e7 am 6f2ed69f: (-s ours) Merge "DO NOT MERGE Change preference category text color for quantum" into lmp-preview-dev 
* commit '6f2ed69f25dad726baabe67b98c9107fd9bcaa46':
  DO NOT MERGE Change preference category text color for quantum
 2014-06-05 23:16:17 +00:00
Evan Charlton
7d3ff83b8b am 266a63ad: Merge "Expose post-dial APIs" into lmp-preview-dev 
* commit '266a63ad7731d7ebaf4c426b3d226e70c6afd2af':
  Expose post-dial APIs
 2014-06-05 23:15:58 +00:00
Zhijun He
f98a3c020d Merge "Camera2: Hide input stream related key and enum" into lmp-preview-dev 2014-06-05 23:15:17 +00:00
Alan Viverette
4294202648 Merge "DO NOT MERGE Change preference category text color for quantum" into lmp-preview-dev 2014-06-05 23:09:57 +00:00
Vinod Krishnan
90e96db0b5 Merge "Adding a way to stub Vpn ConfirmDialog" into klp-modular-dev 2014-06-05 23:03:49 +00:00
Prashant Malani
42db3761c9 Merge "DO NOT MERGE Change display state modification during dozing" into klp-modular-dev 2014-06-05 23:03:19 +00:00
Prashant Malani
31363809b8 Merge "Change display state modification during dozing" 2014-06-05 23:02:42 +00:00
Yorke Lee
8c2d8c0c27 Revert "API changes to Telephony per API review" 
The original change was submitted into lmp-preview-dev and should
not have been auto-merged to master.

This reverts commit 80327f7a31b19213ec48e1ab66e6bdc8e76cb0fe.

Change-Id: I9ff8a868ffa3135583c52ef97b15311107716899
 2014-06-05 22:55:49 +00:00
Evan Charlton
e62a885ea6 Merge "Expose post-dial APIs" into lmp-preview-dev 2014-06-05 22:52:07 +00:00
Deepanshu Gupta
eaa55cdc87 am ee001119: Merge "LayoutLib: Add assertions for typeface." into lmp-preview-dev 
* commit 'ee0011198ff150f972c8afbc5dff695bce2af1f1':
  LayoutLib: Add assertions for typeface.
 2014-06-05 22:43:22 +00:00
Deepanshu Gupta
6d14163a1e am 242dded6: Merge "LayoutLib: Font variants" into lmp-preview-dev 
* commit '242dded6e8b7e5851ad7b80a0c05e4883d2a9f42':
  LayoutLib: Font variants
 2014-06-05 22:43:16 +00:00
Deepanshu Gupta
6c1f78f5d6 am 9a9d96bf: Merge "LayoutLib: Add capability to simulate old versions" into lmp-preview-dev 
* commit '9a9d96bf044bd75e0d75e16a6002dc20e5399866':
  LayoutLib: Add capability to simulate old versions
 2014-06-05 22:43:11 +00:00
ztenghui
537d7ea039 am 42decb1b: Merge "API Review: move the CreateRevealAnimator to ViewAnimationUtils" into lmp-preview-dev 
* commit '42decb1bfe354923205a7cdf856f395f9070b64f':
  API Review: move the CreateRevealAnimator to ViewAnimationUtils
 2014-06-05 22:39:11 +00:00
Deepanshu Gupta
e872209986 Merge "LayoutLib: Add assertions for typeface." into lmp-preview-dev 2014-06-05 22:38:00 +00:00
Deepanshu Gupta
edfaa50864 Merge "LayoutLib: Font variants" into lmp-preview-dev 2014-06-05 22:37:09 +00:00
Deepanshu Gupta
37f7c68cd7 Merge "LayoutLib: Add capability to simulate old versions" into lmp-preview-dev 2014-06-05 22:36:57 +00:00
ztenghui
2050d39e08 Merge "API Review: move the CreateRevealAnimator to ViewAnimationUtils" into lmp-preview-dev 2014-06-05 22:32:41 +00:00
Raph Levien
e1c4a0d299 Make elegantTextHeight xml attribute public 
The elegantTextHeight attribute of TextView was made public through
Java code, but the corresponding attribute wasn't public. This patch
makes it so.

This is a fix for bug 15428791 "elegantTextHeight is hidden (not in
android.R.attr)"

Change-Id: I7011f10ae58fd2e212da9cbaca4a484f011d8fed
 2014-06-05 22:30:37 +00:00
Vinod Krishnan
b0e5bbb657 Adding a way to stub Vpn ConfirmDialog 
- This is needed to pass CTS tests on the wear devices
- Related CL: http://ar/479486

Bug: 15087985

Change-Id: I56673ff6085618a03ec61031e3af0f6631cb3425
 2014-06-05 15:28:50 -07:00
Prashant Malani
448a4e59ad DO NOT MERGE Change display state modification during dozing 
Check that the BrightnessRamp animation has completed before updating
the display state to STATE_DOZING.

Bug: 13472578
Change-Id: Ib9751f7a987463e4df98571e846d829ec8e73b5e
Signed-off-by: Prashant Malani <pmalani@google.com>
 2014-06-05 22:25:23 +00:00
Aravind Akella
62479c591f Remove getRequiredPermission from NDK. 
Bug: 15089664
Change-Id: Ieb1e97e44ef335e6087ba9164058fe3535e9998a
(cherry picked from commit 8bcdd9b7a5c99e9a5bf1e45f7924b67037898e75)
 2014-06-05 22:24:57 +00:00
Aravind Akella
5271e0b890 Hide Sensor.getRequiredPermission API. 
Bug: 15089664
Change-Id: Ia0f4e64a563ca409849cf53721b4836abbb0be68
(cherry picked from commit e7213150abbe33c71dbdc3295a1fa1feaafb069d)
 2014-06-05 22:24:25 +00:00
Ji-Hwan Lee
4a2e599b5a am b3412adf: Merge "TvContract: Add channel logo and program thumbnail" into lmp-preview-dev 
* commit 'b3412adf92b9d932b600acf44c4463cf06387a8e':
  TvContract: Add channel logo and program thumbnail
 2014-06-05 22:23:11 +00:00
Yorke Lee
f537259ec4 am 87d1dbc5: Merge "API changes to Telephony per API review" into lmp-preview-dev 
* commit '87d1dbc52e473227b2b4bc0d95ca48cfb3363adc':
  API changes to Telephony per API review
 2014-06-05 22:23:03 +00:00
Alan Viverette
0622a4c8b8 am 7553d48d: Merge "Fix default stroke width and NPE for line with no stroke width" into lmp-preview-dev 
* commit '7553d48d28683b5b21e964d837a3f3c0f66af9ad':
  Fix default stroke width and NPE for line with no stroke width
 2014-06-05 22:22:57 +00:00
Chris Craik
c229c2a6a8 am 8632b85b: Merge "Fix issues around GL on incorrect thread" into lmp-preview-dev 
* commit '8632b85b3ceca1b64ca37843ffd87bc10f4ae72f':
  Fix issues around GL on incorrect thread
 2014-06-05 22:22:51 +00:00
Matthew Williams
3ae7a0c030 am 426209c6: Merge "Include forgotten file to fix build." into lmp-preview-dev 
* commit '426209c658d97338396b0dd042d64ed084d94396':
  Include forgotten file to fix build.
 2014-06-05 22:22:50 +00:00
Ji-Hwan Lee
cc15afbe12 Merge "TvContract: Add channel logo and program thumbnail" into lmp-preview-dev 2014-06-05 22:12:08 +00:00
Yorke Lee
66c11e1f84 Merge "API changes to Telephony per API review" into lmp-preview-dev 2014-06-05 22:02:22 +00:00
Alan Viverette
19c0ebca59 Merge "Fix default stroke width and NPE for line with no stroke width" into lmp-preview-dev 2014-06-05 21:57:31 +00:00
Chris Craik
56f46abdcd Merge "Fix issues around GL on incorrect thread" into lmp-preview-dev 2014-06-05 21:53:48 +00:00
Kristian Monsen
3dba0546c4 Merge "Remove unused function from the WebView statics" 2014-06-05 21:51:00 +00:00
Deepanshu Gupta
a19b8c111b LayoutLib: Add assertions for typeface. 
Framework passes typeface along with the paint object at many places.
Paint_Delegate is supposed to have the typeface object with it. Add
assertions to ensure that the two typefaces are indeed the same.

Change-Id: I68193513c2d99f269c0458d6493f23025bbda385
 2014-06-05 14:42:14 -07:00
Matthew Williams
5ca8f2f005 Include forgotten file to fix build. 
Change-Id: I4a5ddb6063e5feb18d95ee5c7fe7a126ca59d3b9
 2014-06-05 14:34:53 -07:00
Alan Viverette
1a81cca8ea DO NOT MERGE Change preference category text color for quantum 
Use the colorAccent theme attribute.

Bug: 15384941
Change-Id: I9f98868313caf30a9658eadede23687f2eca5c9c
 2014-06-05 14:34:29 -07:00
Eric Laurent
5edb85c17d Merge "add sound trigger JNI" 2014-06-05 21:04:50 +00:00
Eric Laurent
7de8c849d7 Merge "Add SoundTrigger native service interface" 2014-06-05 21:04:09 +00:00
Michael Wright
9f882defac Merge "Use META_LEFT to launch the ASSIST behavior." 2014-06-05 21:01:04 +00:00
Michael Wright
6a62e55d05 Use META_LEFT to launch the ASSIST behavior. 
Also, claim any key combo'd with META_LEFT for the system.

Change-Id: I29892e31ed40f04d1dd3cf173551237ffb3702ca
 2014-06-05 21:00:53 +00:00
Alan Viverette
c954e61cd7 am 3966c960: Merge "Add defaults for caption colors and edge type" into lmp-preview-dev 
* commit '3966c9604e55c9183a6d1ba8b3540add3be4434f':
  Add defaults for caption colors and edge type
 2014-06-05 21:00:32 +00:00
Justin Koh
70dbeacadc am 910aff5f: (-s ours) am 89b6bf5a: DO NOT MERGE Readd removal of notification listener limit on posting 
* commit '910aff5f6b5ba9611db17b493f0a5fdb9c6d746e':
  DO NOT MERGE Readd removal of notification listener limit on posting
 2014-06-05 20:59:37 +00:00
Matthew Williams
d6cee1a47d Merge "Include forgotten file to fix build." into lmp-preview-dev 2014-06-05 20:57:51 +00:00
Justin Koh
910aff5f6b am 89b6bf5a: DO NOT MERGE Readd removal of notification listener limit on posting 
* commit '89b6bf5a118322d923cb9349515f06e32003c6ef':
  DO NOT MERGE Readd removal of notification listener limit on posting
 2014-06-05 20:56:19 +00:00
Matthew Williams
eb3bf68b57 Include forgotten file to fix build. 
Change-Id: I4a5ddb6063e5feb18d95ee5c7fe7a126ca59d3b9
 2014-06-05 13:54:25 -07:00
Florin Malita
1dc14ba388 Implement SkCanvasGlue::clipRegion() using clipPath(). 
(Canvas clipRegion() public API is scheduled for deprecation)

The SkCanvas clip stack does not support clipRegion() ops. Implementing
these in terms of clipPath() makes persisting clips for SaveFlags
emulation purposes a whole lot simpler.

Change-Id: I41d1eb9e292ce370fba224338f9071d5e4068621
 2014-06-05 16:51:35 -04:00
Justin Koh
89b6bf5a11 DO NOT MERGE Readd removal of notification listener limit on posting 
Listener packages are allowed to post > 50 notifications

This reverts commit 500a6b0ca68aaad6140b5af2dae94349be9f7aeb.
 2014-06-05 13:50:58 -07:00
Yorke Lee
d8819baf85 API changes to Telephony per API review 
* Make context the first argument for isLocalEmergencyNumber and
isPotentialLocalEmergencyNumber

* Hide DisconnectCause
Bug: 15432083

Change-Id: I88b5ace925e3704bd032dc9694b0c2dd871b9cf9
 2014-06-05 13:48:12 -07:00
ztenghui
62f30e0bb1 API Review: move the CreateRevealAnimator to ViewAnimationUtils 
b/15451650

Change-Id: If270bbf757047ce7847cab457d3836d756830124
 2014-06-05 13:45:15 -07:00