Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
127,161 Commits 3 Branches 0 Tags
f46e83f5682bb4be52288ac0fb25c67ca4a4e281
Commit Graph

37371 Commits

Author SHA1 Message Date
RoboErik
f46e83f568 am 3484dff6: Merge "Fix SDK build" 
* commit '3484dff61d0bc91a26f7663dc94917394dda505d':
  Fix SDK build
 2014-03-11 16:17:22 -07:00
Winson Chung
9c2392f9e7 am 303e1ff1: Initial changes for recents. 
* commit '303e1ff1fec8b240b587bb18b981247a99833aa8':
  Initial changes for recents.
 2014-03-11 16:17:13 -07:00
RoboErik
1ebd4ad6cd Fix SDK build 
Change-Id: I4bf73294cc9d970e17d1cddb840b53cc42155d14
 2014-03-11 15:44:40 -07:00
Jessica Hummel
fbb96f0381 am 4cfde32f: Merge "Move the provisioning intents to DevicePolicyManager." 
* commit '4cfde32ff0105d7c8a4743e084f1c9775f4c6b5c':
  Move the provisioning intents to DevicePolicyManager.
 2014-03-11 12:21:05 -07:00
Winson Chung
303e1ff1fe Initial changes for recents. 
Change-Id: Ide2c202b4a5b25410f0f32bd0a81ccf817ede38f
 2014-03-11 12:03:08 -07:00
Jessica Hummel
f72078bdc5 Move the provisioning intents to DevicePolicyManager. 
Change-Id: Ibde867b193e64c1fda8d9c84b0d1be36a1592035
 2014-03-11 18:05:29 +00:00
Narayan Kamath
6c865430cd am 2802c173: am ad35099a: am b485d8e1: am 194e77aa: am 0f3fd6c6: Merge "Remove stray logging statement." 
* commit '2802c173d3a61727592e8908a261be33cfd974a9':
  Remove stray logging statement.
 2014-03-11 05:20:37 -07:00
Narayan Kamath
2802c173d3 am ad35099a: am b485d8e1: am 194e77aa: am 0f3fd6c6: Merge "Remove stray logging statement." 
* commit 'ad35099a87b52e1df86237911eecda5e12961ee4':
  Remove stray logging statement.
 2014-03-11 12:11:39 +00:00
Narayan Kamath
b485d8e1e4 am 194e77aa: am 0f3fd6c6: Merge "Remove stray logging statement." 
* commit '194e77aafe32cacc00f69b25bec6eeea67eb0205':
  Remove stray logging statement.
 2014-03-11 12:06:00 +00:00
Narayan Kamath
0f3fd6c66e Merge "Remove stray logging statement." 2014-03-11 12:00:55 +00:00
Narayan Kamath
c3955e7e5a Remove stray logging statement. 
bug: https://code.google.com/p/android/issues/detail?id=66974
Change-Id: Ie34c102de143cf6aeb16c78778dda3ef5e928380
 2014-03-11 11:08:41 +00:00
Jeff Brown
141c69bd3f am d0fd73d7: am 1c4d86c7: am f54d62dc: am fc7315c6: am 6d71e165: Merge "Round off when calculate next step in Seekbar" 
* commit 'd0fd73d7c5ddc1ff17097f24cdfcfc2120e57096':
  Round off when calculate next step in Seekbar
 2014-03-10 17:41:55 -07:00
Jeff Brown
6b8244999e am e769cdf0: am 1491aaf5: am 14006523: am 33282d66: am a41ddccd: Merge "Fixed typo errors in documentation" 
* commit 'e769cdf017bb5a8e45648ef1bdd657f5320b2691':
  Fixed typo errors in documentation
 2014-03-10 17:41:52 -07:00
Jeff Brown
129e8c0045 am 22c38e67: am 3c6bb4d4: am f2e837e5: am e7f7af96: am 35c8ebab: Merge "take account of RotationVector\'s new extra parameter" 
* commit '22c38e67d4e49f5f660f50fa4e1bd6359024cb91':
  take account of RotationVector's new extra parameter
 2014-03-10 17:41:41 -07:00
Jeff Brown
d0fd73d7c5 am 1c4d86c7: am f54d62dc: am fc7315c6: am 6d71e165: Merge "Round off when calculate next step in Seekbar" 
* commit '1c4d86c7b4eba393058db62fc1e61c9dc30aaa82':
  Round off when calculate next step in Seekbar
 2014-03-11 00:38:11 +00:00
Jeff Brown
e769cdf017 am 1491aaf5: am 14006523: am 33282d66: am a41ddccd: Merge "Fixed typo errors in documentation" 
* commit '1491aaf503de47491bc97457c77bb51c0320793e':
  Fixed typo errors in documentation
 2014-03-11 00:38:01 +00:00
Jeff Brown
22c38e67d4 am 3c6bb4d4: am f2e837e5: am e7f7af96: am 35c8ebab: Merge "take account of RotationVector\'s new extra parameter" 
* commit '3c6bb4d4ec58d03f023280c8be8d95d984c8d1f1':
  take account of RotationVector's new extra parameter
 2014-03-11 00:37:53 +00:00
Jeff Brown
f54d62dc80 am fc7315c6: am 6d71e165: Merge "Round off when calculate next step in Seekbar" 
* commit 'fc7315c6c17e6ebc559d2ea0afb8be64c5d7b86c':
  Round off when calculate next step in Seekbar
 2014-03-11 00:15:38 +00:00
Jeff Brown
1400652309 am 33282d66: am a41ddccd: Merge "Fixed typo errors in documentation" 
* commit '33282d66155e8d68acea512989ec61cb15fae1ce':
  Fixed typo errors in documentation
 2014-03-11 00:11:14 +00:00
Jeff Brown
f2e837e579 am e7f7af96: am 35c8ebab: Merge "take account of RotationVector\'s new extra parameter" 
* commit 'e7f7af964baa3c5d36abd163e33ad139310049d2':
  take account of RotationVector's new extra parameter
 2014-03-11 00:11:05 +00:00
Jeff Brown
6d71e165ba Merge "Round off when calculate next step in Seekbar" 2014-03-11 00:06:40 +00:00
Jeff Brown
a41ddccdc6 Merge "Fixed typo errors in documentation" 2014-03-11 00:06:25 +00:00
Jeff Brown
35c8ebab0a Merge "take account of RotationVector's new extra parameter" 2014-03-11 00:04:49 +00:00
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