Commit Graph

37345 Commits

Author SHA1 Message Date
Michael Wright
ca8629fb3c am 9bec0f5c: Merge "Support unique calibration per orientation"
* commit '9bec0f5cc13c2f41cf09e409e134bab537a67e87':
  Support unique calibration per orientation
2014-03-10 16:44:13 -07:00
Michael Wright
9bec0f5cc1 Merge "Support unique calibration per orientation" 2014-03-10 23:40:51 +00:00
Michael Wright
d6ded48757 am 35514312: Merge changes I81c76e8c,I4daac2b1
* commit '35514312e5516acbc61f4b8b013173a9f82d8823':
  Initialize mAffineTransform and update on modification
  Allow persistence of input device calibration
2014-03-10 16:40:43 -07:00
Adam Powell
f224685d30 am 005c0324: am 8566f156: am c8b43bc0: am fd6b9975: Prevent overflow from MeasureSpec.adjust; measure cache fix
* commit '005c0324c52b7affd8a5fac1a4925c23fc22f3db':
  Prevent overflow from MeasureSpec.adjust; measure cache fix
2014-03-10 16:40:40 -07:00
Michael Wright
35514312e5 Merge changes I81c76e8c,I4daac2b1
* changes:
  Initialize mAffineTransform and update on modification
  Allow persistence of input device calibration
2014-03-10 23:39:52 +00:00
Adam Powell
005c0324c5 am 8566f156: am c8b43bc0: am fd6b9975: Prevent overflow from MeasureSpec.adjust; measure cache fix
* commit '8566f1561bb99eeff16b7845156c978b42ada227':
  Prevent overflow from MeasureSpec.adjust; measure cache fix
2014-03-10 23:38:19 +00:00
Jason Gerecke
d522074232 Support unique calibration per orientation
Updates the format of the calibration XML to store the Surface rotation
that a specific calibration applies to. Also updates the API to require
a rotation value for get/set, and has the native framework supply this
according to the current rotation whenever it changes.

Change-Id: I72b6703f646dd18db537365c5c9843f720a5f41e
2014-03-10 16:33:48 -07:00
Adam Powell
c8b43bc002 am fd6b9975: Prevent overflow from MeasureSpec.adjust; measure cache fix
* commit 'fd6b99750bfab7f930ee375a79009874a3196165':
  Prevent overflow from MeasureSpec.adjust; measure cache fix
2014-03-10 23:31:04 +00:00
Jason Gerecke
d6396d6720 Allow persistence of input device calibration
This patch extends the PersistentDataStore store to read and write
input device calibration data. A new SET_INPUT_CALIBRATION permission
grants apps the ability to update this information, and a new
TouchCalibration class is used to wrap the raw calibration data.

Change-Id: I4daac2b15ef03616ea5b068c1e77bebd0ce7b8c1
2014-03-10 15:54:21 -07:00
Amith Yamasani
93fbd017b0 am 724cc1f0: Merge "Allow related users to show activities on primary user"
* commit '724cc1f04f117ee27583d015b414a5ba4540d3b1':
  Allow related users to show activities on primary user
2014-03-10 14:39:25 -07:00
Amith Yamasani
724cc1f04f Merge "Allow related users to show activities on primary user" 2014-03-10 21:36:25 +00:00
Adam Powell
fd6b99750b Prevent overflow from MeasureSpec.adjust; measure cache fix
Extract the size from the MeasureSpec value before adding the
delta. The opposite order could result in a negative delta causing
overflow into size from the EXACTLY mode, creating a very large size
value in the resulting MeasureSpec.

Don't reapply optical bounds insets after pulling a value from the
measurement cache. (The insets will have already been applied before
insertion into the cache.)

Change-Id: Ib0154f4d6c3a7c31e7fee24fd7d5d10cc5dc71a1
2014-03-10 14:09:18 -07:00
Benoit Goby
6835033af4 am c6f0b54d: Merge "Add CAP_BLOCK_SUSPEND to system server" into klp-modular-dev
* commit 'c6f0b54d695b49966a13bb196800a985ac6ce212':
  Add CAP_BLOCK_SUSPEND to system server
2014-03-10 19:02:54 +00:00
John Reck
f9d70b81c5 am 17484411: Merge "DisplayList lifecycle changes"
* commit '174844118121021a17e37382eeb853774d0a36a6':
  DisplayList lifecycle changes
2014-03-10 10:19:54 -07:00
John Reck
1748441181 Merge "DisplayList lifecycle changes" 2014-03-10 17:17:29 +00:00
John Reck
be34f2f3b3 DisplayList lifecycle changes
Bug: 13360343
 Change DisplayList to be more forgiving with weaker lifecycle
 requirements. Is more self-managed with a strong reference
 to the renderer it needs

 Also fix naming mismatch

Change-Id: I5c89453a72a52954f6f959f0846199705dbb6476
2014-03-10 10:12:32 -07:00
Paul Lawrence
c3e05be93f am 2bc68575: Merge "Clean up a few minor issues"
* commit '2bc68575325ab7bf082de24f5f095f20ea63f877':
  Clean up a few minor issues
2014-03-10 09:43:35 -07:00
Paul Lawrence
2bc6857532 Merge "Clean up a few minor issues" 2014-03-10 16:41:22 +00:00
John Spurlock
f7fcaa89be am fc558d56: Fix compiler warning in Activity.java.
* commit 'fc558d56c2040220853d9912d765cfc535463689':
  Fix compiler warning in Activity.java.
2014-03-10 07:59:16 -07:00
John Spurlock
fc558d56c2 Fix compiler warning in Activity.java.
Otherwise appears in frameworks/base build output.

Change-Id: Id4ee4f01ba8026b2629f4c3b30c7152d9bdcfc64
2014-03-10 09:56:00 -04:00
Jessica Hummel
4cb211fbd6 am df897d08: Merge "Extend DeviceAdminReceiver to receive provisioning complete broadcast."
* commit 'df897d08cebb013795ae679eef842a38b5153252':
  Extend DeviceAdminReceiver to receive provisioning complete broadcast.
2014-03-10 02:33:44 -07:00
Jessica Hummel
df897d08ce Merge "Extend DeviceAdminReceiver to receive provisioning complete broadcast." 2014-03-10 09:29:25 +00:00
Jean Chalard
8a0b9bcd84 am 30c86ad4: Merge "Improve doc for EditorInfo#initialSel{Start,End}"
* commit '30c86ad4754e228ecc0ff07ecb3d76ea37a619e0':
  Improve doc for EditorInfo#initialSel{Start,End}
2014-03-09 21:07:19 -07:00
Jean Chalard
30c86ad475 Merge "Improve doc for EditorInfo#initialSel{Start,End}" 2014-03-10 04:03:32 +00:00
Dave Allison
b6c4cb6b29 am 2d3ddc2b: am 199670c4: am 324aa693: am b94904ab: am 3fc3b9fd: Merge "ART profiler usage."
* commit '2d3ddc2ba9f86d795e437ea90dccb59cf1ebfd11':
  ART profiler usage.
2014-03-08 13:02:54 -08:00
Jeff Brown
3de5a874e5 am 2901e044: am 9e3de5f7: am 6f9f8e7a: am 01b5e765: Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev
* commit '2901e0442ab63d3148b708e88f445acaf8d4dc15':
  Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
2014-03-08 13:02:44 -08:00
Chris Craik
73dac751ba am 400b6232: Merge "Update Z documentation to avoid hidden API"
* commit '400b6232090c9e620bf4eedd34c8ceadb00b2237':
  Update Z documentation to avoid hidden API
2014-03-08 13:02:32 -08:00
Alan Viverette
46ea4894ed am 4fc51997: Merge "Update fast scroller item count after layoutChildren()"
* commit '4fc51997602262bad6c931b5513add5e9a13750c':
  Update fast scroller item count after layoutChildren()
2014-03-08 13:02:29 -08:00
Dianne Hackborn
a29c2b1c9d am 13305da3: Merge "Start recording wakeup reasons in battery history."
* commit '13305da38b1ac0e796a2a651fe283cfd627cab35':
  Start recording wakeup reasons in battery history.
2014-03-08 13:02:22 -08:00
Dave Allison
2d3ddc2ba9 am 199670c4: am 324aa693: am b94904ab: am 3fc3b9fd: Merge "ART profiler usage."
* commit '199670c46a9950bd2e06af43ea082427b542060a':
  ART profiler usage.
2014-03-08 07:26:41 +00:00
Jeff Brown
2901e0442a am 9e3de5f7: am 6f9f8e7a: am 01b5e765: Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev
* commit '9e3de5f70d77f7152b25fec6c27b73d037c1376d':
  Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
2014-03-08 05:43:12 +00:00
Dave Allison
324aa693b8 am b94904ab: am 3fc3b9fd: Merge "ART profiler usage."
* commit 'b94904ab6dfbb9db7e8042f10886042a295857d4':
  ART profiler usage.
2014-03-08 01:56:29 +00:00
Amith Yamasani
734983fff3 Allow related users to show activities on primary user
Make ActivityManager and WindowManager understand related users.

Task stack will now contain interleaved tasks for related users,
but still group regular users separately from groups of related users.

InputMethodManagerService permits related users to invoke IME and receive
key events.

Change-Id: I3bd87b32aec69c3f8d470c8b29b144f4e849c808
2014-03-07 17:41:24 -08:00
Chris Craik
400b623209 Merge "Update Z documentation to avoid hidden API" 2014-03-08 01:12:44 +00:00
Chris Craik
29cc47a5f1 Update Z documentation to avoid hidden API
Change-Id: I723930b951327a06dfbf2aeb8417409e6ce02c2e
2014-03-07 17:11:26 -08:00
Alan Viverette
4fc5199760 Merge "Update fast scroller item count after layoutChildren()" 2014-03-08 01:00:31 +00:00
Alan Viverette
732ca4642f Update fast scroller item count after layoutChildren()
BUG: 12553181
Change-Id: I4ea1b45d08c153b0146868bf57884d6b8dde6245
2014-03-07 16:49:32 -08:00
Benoit Goby
a26d08e612 Add CAP_BLOCK_SUSPEND to system server
With linux 3.5 and above, CAP_BLOCK_SUSPEND is needed to take a
suspend blocker.

CAP_BLOCK_SUSPEND has aleady been added in master.

Change-Id: Ibd4b1f8498c3c4a7b69ea9fc68311546a8f0ecda
2014-03-08 00:17:43 +00:00
Dianne Hackborn
13305da38b Merge "Start recording wakeup reasons in battery history." 2014-03-08 00:10:15 +00:00
Jeff Brown
6f9f8e7aad am 01b5e765: Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev
* commit '01b5e765e59c14cdfb62f1a8684e9116a46874d2':
  Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
2014-03-07 23:39:12 +00:00
Chris Craik
9dea9e69b6 am 2d70802f: Merge "Hide isolatedZVolume API"
* commit '2d70802fec68ccd4b83c6634abcfe2bc4ba428c1':
  Hide isolatedZVolume API
2014-03-07 15:39:04 -08:00
Dianne Hackborn
c51cf03cf2 Start recording wakeup reasons in battery history.
Depends on a modification to libsuspend so that we can get
a callback each time the device wakes up, to read the current
wakeup reasons from the kernel.  These are then stuffed in
to a new field in the battery history.

Also add new dump options --history-start and --charged
to better control what is dumped.

Finally the alarm manager uses a "*walarm*" tag for history
item wake locks that are coming from a wakeup alarm.

Change-Id: I457571973d5b2b5fdc4e4b63ab16275db20d7edd
2014-03-07 15:18:45 -08:00
Jeff Brown
6212a49a94 Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
These new keys behave in similarly to KEYCODE_POWER but do not
simply toggle between awake and asleep states.

Sleep puts the device to sleep if it is awake.
Wakeup wakes up the device if it is asleep.

Bug: 12938999
Change-Id: I260fb918cc858882fe06fa880910df5763a76c5d
2014-03-07 14:02:55 -08:00
Chris Craik
2d70802fec Merge "Hide isolatedZVolume API" 2014-03-07 21:51:56 +00:00
Mike J. Chen
55e0d4996f am 8169bc78: am 5adbea2e: am 784224d2: am b8a7dd63: Merge "Add handshake broadcast support" into klp-modular-dev
* commit '8169bc78a1222ff0797ca53fe5fa19c8cf6fc70a':
  Add handshake broadcast support
2014-03-07 13:12:37 -08:00
Chris Craik
b3a8b2c823 Hide isolatedZVolume API
Change-Id: Ia3a70aaac3d7027285a7510d6fed9ca3548a0bf1
2014-03-07 13:10:30 -08:00
Mike J. Chen
8169bc78a1 am 5adbea2e: am 784224d2: am b8a7dd63: Merge "Add handshake broadcast support" into klp-modular-dev
* commit '5adbea2e2da3a0af1357de05a04534c65a7c9f76':
  Add handshake broadcast support
2014-03-07 20:33:46 +00:00
Dave Allison
0efbd9a463 ART profiler usage.
This is a change to add args to some of the profiler related
functions, including installd commands.

Also read properties and set command line options for the runtime
profiling parameters.

Changed calls to isDexOptNeeded() to isDexOptNeededInternal().  This
needs additional arguments passed for profiles.

Bug: 12877748
Change-Id: I1a426c9309d760bac0cf92daa298defee62287c1

Conflicts:
	core/jni/AndroidRuntime.cpp
2014-03-07 12:32:44 -08:00
Jeff Brown
8563d42248 am 71c8fb92: am 2b27ef97: am c969450a: am 840c8474: Merge "Add config_supportAutoRotation." into klp-modular-dev
* commit '71c8fb92a151f2f64ffbaf551c072179bc46c0da':
  Add config_supportAutoRotation.
2014-03-07 11:36:15 -08:00
Jeff Brown
71c8fb92a1 am 2b27ef97: am c969450a: am 840c8474: Merge "Add config_supportAutoRotation." into klp-modular-dev
* commit '2b27ef979dba3808cdae6dce32fe27b59197e34c':
  Add config_supportAutoRotation.
2014-03-07 19:29:48 +00:00