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

51438 Commits

Author SHA1 Message Date
Alan Viverette
0d18871688 Merge "TouchFeedbackDrawable is now RippleDrawable" 2014-05-19 23:51:31 +00:00
Alan Viverette
c80ad99a33 TouchFeedbackDrawable is now RippleDrawable 
Change-Id: I59f5f04b73089215c6320560556ac21beb03db06
 2014-05-19 16:27:31 -07:00
Victoria Lease
eabcc91252 Merge "fix argument order in call to SkBlurDrawLooper constructor" 2014-05-19 23:16:49 +00:00
Victoria Lease
49f0db3481 fix argument order in call to SkBlurDrawLooper constructor 
This fixes all sorts of badness.

Bug: 15074512
Change-Id: I5e96983c58d19e0dc2d8fa61d1efa9dcff076ca1
 2014-05-19 16:12:22 -07:00
ztenghui
77bc0a17e8 Merge "Remove the versionCode" 2014-05-19 22:13:36 +00:00
Winson Chung
4661a2574a Merge "Fixing regression in dismissing Recents." 2014-05-19 21:13:13 +00:00
Winson Chung
6cb485fd2e Fixing regression in dismissing Recents. 
- Restoring app info functionality when developer options are enabled and you long-press on the app icon.

Change-Id: I8a20ff5f595eefa20db5528c0d5b1a1f0b110834
 2014-05-19 14:06:13 -07:00
Mark Renouf
16e782374b am 5a932046: am 6a7843c9: Merge "Override windowContentOverlay and windowBackground for Theme.Micro.*" into klp-modular-dev 
* commit '5a93204678f5032e3464cc36e38a805aabdeec95':
  Override windowContentOverlay and windowBackground for Theme.Micro.*
 2014-05-19 20:44:31 +00:00
Mark Renouf
5a93204678 am 6a7843c9: Merge "Override windowContentOverlay and windowBackground for Theme.Micro.*" into klp-modular-dev 
* commit '6a7843c972122bd90819fe991cb463088f19be0a':
  Override windowContentOverlay and windowBackground for Theme.Micro.*
 2014-05-19 20:40:51 +00:00
ztenghui
e3c45e7a6b Remove the versionCode 
Change-Id: I2a77fefd7b14fd3bef0b0c7a142fe88e69883c75
 2014-05-19 13:22:10 -07:00
John Reck
8461b70b6c Merge "Workaround double-translate bug" 2014-05-19 20:21:00 +00:00
John Reck
86faf9ec3e Workaround double-translate bug 
Bug: 15065005

Change-Id: Ie0f77c6ea13eebf3508df7513b79efaa65d31de0
 2014-05-19 13:19:07 -07:00
RoboErik
b19c192654 Merge "Rename session classes to have media prefix, hide routes" 2014-05-19 19:29:06 +00:00
Mark Renouf
facdea7f69 Override windowContentOverlay and windowBackground for Theme.Micro.* 
Change-Id: Iab40fb70398ad2ce87b613aa9278cb87f7a35d84
 2014-05-19 15:10:05 -04:00
Robert Greenwalt
d19c41c0bb Add javadoc and unhide new API 
Change-Id: I12e475bbf4000c7acec4ca27b1d3bf8f870cc2cf
 2014-05-19 10:34:36 -07:00
Robert Greenwalt
34c83190bf Merge "Add docs for Linkproperties and unhide it." 2014-05-19 16:45:12 +00:00
Robert Greenwalt
4f05d55296 Add docs for Linkproperties and unhide it. 
Preperation for ConnectivityManager API reveal.

Change-Id: Id2addf424213e796c6077def0b7f30cac9a0f75f
 2014-05-19 09:43:36 -07:00
Winson Chung
958e559b98 Merge "Initial changes to enable keyboard support with alternate Recents. (Bug 14067913)" 2014-05-19 16:25:40 +00:00
Winson Chung
9aeb607399 Merge "Enabling alternate recents on all form factors." 2014-05-19 16:18:38 +00:00
Robert Greenwalt
f16f5788fa Merge "Apply Doc fixes to RouteInfo" 2014-05-19 15:53:15 +00:00
Robert Greenwalt
b26e44416a Merge "Add docs to Network" 2014-05-19 15:52:05 +00:00
Robert Greenwalt
34524f06fb Add javadoc for NetworkRequest. 
Also moved the requestId serial number out of this public class into CS.

Had to leave NetworkRequest hidden for now because the docs refer to things still hidden
in ConnectivityManager.

Change-Id: I14d1fe52d992adf5e4dc197b8f5433e40b0adfe6
 2014-05-19 08:17:05 -07:00
Robert Greenwalt
85956263c1 Add docs to Network 
Still must be hidden until we unhide the new API in ConnectivityManager.

Change-Id: I4749e56777199093cdba9223eb3d721c3174047d
 2014-05-19 07:59:16 -07:00
Robert Greenwalt
386aba8bd1 Apply Doc fixes to RouteInfo 
Change-Id: Ib76df135d5514f7b8baafbbe91fa3d1cdd632f00
 2014-05-19 07:27:46 -07:00
Robert Greenwalt
2631da82ae Merge "Update the docs for NetworkCapabilities" 2014-05-19 14:06:07 +00:00
Przemyslaw Szczepaniak
f8771ebc88 Merge "TTS Connection callbacks are called on main thread." 2014-05-19 12:02:51 +00:00
Ben Murdoch
73f328953a am 4088970d: am 3011fc1a: Merge "Fallback to NullWebView when Chromium WebView not present." into klp-modular-dev 
* commit '4088970dce354f53911f78084a32cb78af45baaf':
  Fallback to NullWebView when Chromium WebView not present.
 2014-05-19 11:35:04 +00:00
Ben Murdoch
4088970dce am 3011fc1a: Merge "Fallback to NullWebView when Chromium WebView not present." into klp-modular-dev 
* commit '3011fc1aa7dbffd3faab7d41203f63d2c0b50c2c':
  Fallback to NullWebView when Chromium WebView not present.
 2014-05-19 11:30:41 +00:00
Ben Murdoch
3011fc1aa7 Merge "Fallback to NullWebView when Chromium WebView not present." into klp-modular-dev 2014-05-19 11:26:33 +00:00
Robert Greenwalt
01d004ef42 Update the docs for NetworkCapabilities 
Preparing for ConnectivityService API update

Change-Id: I397e375b9254d4271183cf34c4a689deea1e198e
 2014-05-18 16:40:16 -07:00
Robert Greenwalt
3a9f0175ba Merge "Update RouteInfo docs and make public." 2014-05-18 23:24:59 +00:00
Jinsuk Kim
fc9c89f9aa Merge "HdmiControlManager with HdmiPlaybackClient API definition" 2014-05-18 22:50:16 +00:00
Jinsuk Kim
91120c541a HdmiControlManager with HdmiPlaybackClient API definition 
This is a rewrite of HdmiCecManager that exposes API for CEC Playback
device control. HdmiCecManager will be removed together with
HdmiCecService once the migration is completed.

Replaced direct access to CEC commands with the following 2 API:
- oneTouchPlay
- queryDisplayStatus

Each method requires communication with other device on CEC bus,
hence might take some time to finish. The result at the end of
protocol exchange is reported through a callback provided as a
parameter to the method.

The callback is based on interface not abstract class since
it has only one method 'onComplete'.

Change-Id: I41e9d4571f890303282a79a803c86530d0b46974
 2014-05-19 07:46:26 +09:00
John Spurlock
a25a160340 Merge "VolumeZen: frameworks changes to support Settings." 2014-05-18 21:32:41 +00:00
Adam Powell
236bcc3ad1 Merge "Action bar refactoring, round 1" 2014-05-18 21:08:05 +00:00
Robert Greenwalt
4095bd5a88 Update RouteInfo docs and make public. 
Change-Id: I1a8fe04022ea8291076af166f09112d19114ee16
 2014-05-18 12:43:14 -07:00
Robert Greenwalt
5575def80c Merge "Update comments for LinkAddress" 2014-05-18 18:26:10 +00:00
Yuhao Zheng
a486447231 Hotspot 2.0 framework APIs -- initial implementation 
Cherry-picked from klp-wireless-dev-mirror
SHA1: e73969fac45aaca72528226dc8c0c5e54fb2cdd4

Bug: 5485670
Change-Id: If3250a2fae181a3774d3158e341220006ad6ebe5
 2014-05-18 09:41:35 -07:00
Robert Greenwalt
fd202e6f84 Update comments for LinkAddress 
In preparation for CS api review.

Change-Id: Ib933e905846ebd039d96a523946dd8fdb10f3ff1
 2014-05-18 09:39:18 -07:00
John Spurlock
74a2e06d83 VolumeZen: frameworks changes to support Settings. 
- Pull SeekBarVolumizer out into a separately reusable class.
- Make register/unregisterOnActivityStopListener avail to system code.
- Add new setting for displaying suppressed notifications in zen mode.

Change-Id: Ic30aa575ae07650cee62c8c1d83b6bc69395cf0d
 2014-05-18 12:26:21 -04:00
Alan Viverette
677a9f2496 Merge "Fix onHardwarePreDraw call in ThreadedRenderer" 2014-05-17 23:37:42 +00:00
Alan Viverette
d5b2ec4ff1 Fix onHardwarePreDraw call in ThreadedRenderer 
Change-Id: Ia3852cbd7afc21e9f57824e9f207ba02acae12a7
 2014-05-17 16:34:09 -07:00
Adam Powell
4369e7d0b0 Action bar refactoring, round 1 
Decouple PhoneWindow and ActionBarView to allow for using Toolbar in
some circumstances later.

Change-Id: I907743e06c3a1203e21cfd84860a1884c66f3527
 2014-05-17 14:16:08 -07:00
Ruben Brunk
f967a5486a camera2: Plumb DngCreator to native library. 
Change-Id: Ic58bf6cf5086808b503460ef8e451fc0d6f1f850
 2014-05-16 23:25:51 -07:00
Joe LaPenna
a0fc1b3730 am 3e1bbaf7: am 45734b4a: Merge "Log accept and close debug statements in BluetoothSocket." into klp-modular-dev 
* commit '3e1bbaf786c12e66624c42c13a58095bc8133117':
  Log accept and close debug statements in BluetoothSocket.
 2014-05-17 02:01:42 +00:00
Joe LaPenna
3e1bbaf786 am 45734b4a: Merge "Log accept and close debug statements in BluetoothSocket." into klp-modular-dev 
* commit '45734b4ae180ea3c34f92575b3ed362bbf4f20e5':
  Log accept and close debug statements in BluetoothSocket.
 2014-05-17 01:57:44 +00:00
Joe LaPenna
45734b4ae1 Merge "Log accept and close debug statements in BluetoothSocket." into klp-modular-dev 2014-05-17 01:55:06 +00:00
Adrian Roos
7643422fb6 Merge "Enforce that trust agents declare the BIND_TRUST_AGENT permission" 2014-05-17 01:31:34 +00:00
Adrian Roos
cb9fbc3a30 Enforce that trust agents declare the BIND_TRUST_AGENT permission 
Change-Id: Iba10b6fb140362c368fb12b7d3c6be550897de40
 2014-05-17 03:19:56 +02:00
Michael Wright
d27a69c40d Merge "Add InputStage debugging logs" 2014-05-17 00:44:35 +00:00