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

124263 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek Sollenberger
eece0dda56 Fix includes so that they no longer rely on the global Skia includes directories. 
bug:13225538
Change-Id: Ia5d816dc665f81c7985f21036af4fd0a63c560cf
 2014-02-27 14:31:29 -05:00
George Mount
94b5ca811e Merge "Change Activity Scene Transitions to be more automatic redo." 2014-02-27 15:15:06 +00:00
Nicolas Prevot
a5e27eb4a4 Merge "Correcting a deadlock in CreateRelatedUser" 2014-02-27 14:47:56 +00:00
Nicolas Prevot
c6d033ed11 Correcting a deadlock in CreateRelatedUser 
A deadlock sometimes happened in CreateRelatedUser of UserManagerService.
A lock was kept when it should have been released.

Change-Id: I15444c0b5d0d5d1e14e7bf29c2115aa954b7dfc0
 2014-02-27 13:47:21 +00:00
Narayan Kamath
e5f98941ba am 7aec4109: am 7aeb4307: am 2525acf5: am e4dae5f2: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY" 
* commit '7aec4109c53371e69bec111c69767810f45c301c':
  AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
 2014-02-27 13:33:23 +00:00
Narayan Kamath
7aec4109c5 am 7aeb4307: am 2525acf5: am e4dae5f2: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY" 
* commit '7aeb43072a9fb9b0a7078a390cb4a729321bf117':
  AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
 2014-02-27 13:30:08 +00:00
Narayan Kamath
7aeb43072a am 2525acf5: am e4dae5f2: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY" 
* commit '2525acf5a9855d748c008268bb26d6f6d5045d84':
  AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
 2014-02-27 13:26:39 +00:00
Narayan Kamath
a393735a5d am 2589067d: am 9fc8e6fe: am f61add84: am 2000fe58: Merge "Make getAssetInt throw unconditionally." 
* commit '2589067d10b5f6a67eb1f789b4cf5943914dd9d2':
  Make getAssetInt throw unconditionally.
 2014-02-27 13:25:43 +00:00
Narayan Kamath
2589067d10 am 9fc8e6fe: am f61add84: am 2000fe58: Merge "Make getAssetInt throw unconditionally." 
* commit '9fc8e6fe8f6c89f5ebcda4b569cab10988e1fa3f':
  Make getAssetInt throw unconditionally.
 2014-02-27 13:22:36 +00:00
Narayan Kamath
2525acf5a9 am e4dae5f2: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY" 
* commit 'e4dae5f2c26f5992a31f8ce15811fc082647ddb8':
  AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
 2014-02-27 05:20:52 -08:00
Narayan Kamath
9fc8e6fe8f am f61add84: am 2000fe58: Merge "Make getAssetInt throw unconditionally." 
* commit 'f61add84c28be06c190d5594a41a7ef84b7666fe':
  Make getAssetInt throw unconditionally.
 2014-02-27 13:19:15 +00:00
Narayan Kamath
e4dae5f2c2 Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY" 2014-02-27 13:18:07 +00:00
Narayan Kamath
f61add84c2 am 2000fe58: Merge "Make getAssetInt throw unconditionally." 
* commit '2000fe58332dffaad34c618fe35840992cb0f571':
  Make getAssetInt throw unconditionally.
 2014-02-27 05:15:56 -08:00
Narayan Kamath
2000fe5833 Merge "Make getAssetInt throw unconditionally." 2014-02-27 13:13:08 +00:00
Yohei Yukawa
589800485d Add unit test for InputMethodInfo 
This CL adds a unit test to make sure that InputMethodInfo
implements Parcelable correctly.

BUG: 12954290
Change-Id: I0abe8c266b4b035bf8ef4688d11069b355fabe9f
 2014-02-27 17:32:48 +09:00
Baligh Uddin
ac5eaa3dc2 Merge "Import translations. DO NOT MERGE" 2014-02-27 04:34:36 +00:00
Baligh Uddin
b96b224554 Merge "Import translations. DO NOT MERGE" 2014-02-27 04:34:30 +00:00
Alan Viverette
3b6502f541 Merge "Always set item type on obtained ListView item views" 2014-02-27 03:49:45 +00:00
Yuhao Zheng
72e1400e2f Merge "Add new API to scan a given channel set" 2014-02-27 03:12:06 +00:00
Jeff Brown
d964a746e0 am ba61962b: (-s ours) am 71e21fec: am 6ca90042: Add touch.wake IDC property to control wakeup. 
* commit 'ba61962b3308881e6200870c8d6420b81c6f9225':
  Add touch.wake IDC property to control wakeup.
 2014-02-27 02:42:30 +00:00
Alan Viverette
e6be9c78b5 Always set item type on obtained ListView item views 
If a view is scrapped without layout params being set, it will
incorrectly be recycled as item type 0.

BUG: 13212603
Change-Id: I2a42c04ec5065067ab260a0a8afb07207db729f6
 2014-02-26 18:16:36 -08:00
Jeff Brown
ba61962b33 am 71e21fec: am 6ca90042: Add touch.wake IDC property to control wakeup. 
* commit '71e21fec61d17b41a3f0ed817bfa2ae5fb357212':
  Add touch.wake IDC property to control wakeup.
 2014-02-27 02:02:22 +00:00
Jeff Brown
71e21fec61 am 6ca90042: Add touch.wake IDC property to control wakeup. 
* commit '6ca90042b398153e063cf69dea784e201e76a9ee':
  Add touch.wake IDC property to control wakeup.
 2014-02-27 01:59:02 +00:00
Alan Viverette
af7c240b99 Restore getTintMode() method on BitmapDrawable 
Change-Id: I8fffc90ce3f0811d75b517d2dfc71de731188da6
 2014-02-26 17:20:10 -08:00
Alan Viverette
09ceac298c Clean up tint API 
Change-Id: I56056e7596840c563f5332922d63e8893a0cac17
 2014-02-26 16:49:10 -08:00
Alan Viverette
257398378a Merge "Fix shape drawable constructor" 2014-02-27 00:27:05 +00:00
Alan Viverette
2cc13d0ef1 Fix shape drawable constructor 
Change-Id: Ibb2c1993faf9d2baae3130f334475aa07fbe9015
 2014-02-26 16:26:33 -08:00
Dianne Hackborn
c2248715e3 Merge "Collect per-uid mobile radio usage." 2014-02-27 00:18:00 +00:00
Wonsik Kim
a9499d704c Merge "VideoPlaneView initial implementation" 2014-02-27 00:07:40 +00:00
Dianne Hackborn
d45665bf0b Collect per-uid mobile radio usage. 
We now compute radio active time per application, by distributing
the active time across all applications each time the radio goes
down, weighting it by the number of packets transferred.

Per-app radio power use is now computed using this radio active
time.

This also gives us a new metric "ms per packet", which give an
idea of how effectively an application is using the radio.  This
is collected and reported as a new set of stats in the human-
readable checkin.  (It can be computed from the raw checkin data).

Also improve sync reporting to include the sync source as used
in wake locks, not just the component name.

Change-Id: I0b0185fadd1e47ae749090ed36728ab78ac24c5e
 2014-02-26 15:53:44 -08:00
Alan Viverette
813d85b82c Fix progress bar tinting, add tint support to ShapeDrawable 
Cleans up APIs a little, since I think we may want to add tinting
modes beyond what Porter-Duff can provide. Plus we don't actually
support some of the Porter-Duff modes in hardware.

Change-Id: I2cea1b737cc93607a24842c54eb9f0d8346b29d4
 2014-02-26 15:38:51 -08:00
George Mount
e180337ee9 Change Activity Scene Transitions to be more automatic redo. 
This reverts commit 206e30cd93afe3eb72ec94178324417db5424ed2
along with removing the additional startActivity* methods
and replaces them with ActivityOptions makeSceneTransitionAnimation
methods.

Change-Id: I52bec31ae3c4cea6d549810ae5a7acd8aea176d8
 2014-02-26 15:30:22 -08:00
Jeff Brown
6ca90042b3 Add touch.wake IDC property to control wakeup. 
Normally we do not wake the device when the internal touch screen is
touched.  This behavior can now be configured by setting a property
in the input device configuration file.  Add the following line to
the IDC file to enable an initial touch to wake the device from sleep.

  touch.wake = 1

Change-Id: Ifd6d4f51afacd30d85f475725a66e6fcccde9cbb
 2014-02-26 15:15:53 -08:00
Chris Craik
ba7d4f564c am f85da425: (-s ours) Fix build - DO NOT MERGE 
* commit 'f85da42512d5dd76a899097907974b48b887be60':
  Fix build - DO NOT MERGE
 2014-02-26 21:28:34 +00:00
Chris Craik
f85da42512 Fix build - DO NOT MERGE 
Change-Id: I1ab7c369082d1d2aa4f4ed11354c13ff86582410
 2014-02-26 13:21:41 -08:00
Ying Wang
82f4988d0e Merge "Fix SDK build." 2014-02-26 20:34:40 +00:00
Ying Wang
fd5f381edb Fix SDK build. 
Change-Id: Ic93a6d3e7b510aef2d66dc0dc2dad5af8e7648c5
 2014-02-26 12:33:46 -08:00
Chris Craik
adcd253a14 am 4fecd0ae: (-s ours) am 74a8b916: am 59ff85af: (-s ours) am 2729857d: (-s ours) Merge "Fix AOSP build - DO NOT MERGE" 
* commit '4fecd0aeeb9a76b55c234a24cfd5e1394c801348':
  Fix AOSP build - DO NOT MERGE
 2014-02-26 19:31:22 +00:00
Chris Craik
300bdfa13d am 328b7ee6: am aecb8c43: am 7b4cce68: am c3bac8a0: Merge "Fix graphics corruption caused by HWUI caches" 
* commit '328b7ee6a2ba2dc8f162fa57dbafd4bfc89bb72e':
  Fix graphics corruption caused by HWUI caches
 2014-02-26 19:31:16 +00:00
Felipe Leme
9d1ae3b87c Merge "Added support for WiFi frequency on WifiInfo (getter, settter, and frequency constant). Bug: 12767819" 2014-02-26 19:22:52 +00:00
Chris Craik
4fecd0aeeb am 74a8b916: am 59ff85af: (-s ours) am 2729857d: (-s ours) Merge "Fix AOSP build - DO NOT MERGE" 
* commit '74a8b916aceb0b55a7fdfa63bd8267c50d952a28':
  Fix AOSP build - DO NOT MERGE
 2014-02-26 19:14:35 +00:00
Chris Craik
328b7ee6a2 am aecb8c43: am 7b4cce68: am c3bac8a0: Merge "Fix graphics corruption caused by HWUI caches" 
* commit 'aecb8c43d0c6c3d2b55f88abeaa0e3197be59301':
  Fix graphics corruption caused by HWUI caches
 2014-02-26 19:14:32 +00:00
Chris Craik
74a8b916ac am 59ff85af: (-s ours) am 2729857d: (-s ours) Merge "Fix AOSP build - DO NOT MERGE" 
* commit '59ff85af314e2984068943f5572ac40ef381edea':
  Fix AOSP build - DO NOT MERGE
 2014-02-26 19:10:44 +00:00
Chris Craik
aecb8c43d0 am 7b4cce68: am c3bac8a0: Merge "Fix graphics corruption caused by HWUI caches" 
* commit '7b4cce68853d8bcfce2b6bd7f999915063eb56d2':
  Fix graphics corruption caused by HWUI caches
 2014-02-26 19:10:39 +00:00
Jeff Davidson
0f58bb3b4d Merge "Fix SDK build broken by ag/423985" 2014-02-26 19:10:06 +00:00
Ashok Bhat
64d38d9f48 AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY 
Note that files changed in this patch have been automatically
generated by running frameworks/native/opengl/tools/glgen/gen
script

This will allow eglGetDisplay(int) to work on both 32-bit and
64-bit systems when EGL_DEFAULT_DISPLAY is passed as a parameter.

Change-Id: Idf27d6e00d623d331bb2d4d7f85fa450e0db26c9
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
 2014-02-26 19:07:54 +00:00
Chris Craik
59ff85af31 am 2729857d: (-s ours) Merge "Fix AOSP build - DO NOT MERGE" 
* commit '2729857df6c559b37248c96b78303b662212d14b':
  Fix AOSP build - DO NOT MERGE
 2014-02-26 11:06:30 -08:00
Chris Craik
7b4cce6885 am c3bac8a0: Merge "Fix graphics corruption caused by HWUI caches" 
* commit 'c3bac8a096cc5661cf91c8c0aa9b7dd0fc099c5d':
  Fix graphics corruption caused by HWUI caches
 2014-02-26 11:06:27 -08:00
Chris Craik
2729857df6 Merge "Fix AOSP build - DO NOT MERGE" 2014-02-26 18:48:27 +00:00
Chris Craik
c3bac8a096 Merge "Fix graphics corruption caused by HWUI caches" 2014-02-26 18:48:00 +00:00