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

34543 Commits

Author SHA1 Message Date
Jaewan Kim
cdca5cac5f am 68c9d259: Merge "EthernetDataTracker: Return proper interface name" 
* commit '68c9d2592cf492a37194522aa21ae01d6d7e1f4b':
  EthernetDataTracker: Return proper interface name
 2014-03-13 05:28:49 -07:00
Jaewan Kim
68c9d2592c Merge "EthernetDataTracker: Return proper interface name" 2014-03-13 12:07:36 +00:00
Fabrice Di Meglio
7211da3401 am a7124cdd: Merge "Cleanup ContextThemeWrapper" 
* commit 'a7124cdd83723027f5880fa96f0c285a7615f3fa':
  Cleanup ContextThemeWrapper
 2014-03-12 13:07:34 -07:00
Fabrice Di Meglio
a7124cdd83 Merge "Cleanup ContextThemeWrapper" 2014-03-12 20:02:48 +00:00
Jose Lima
d4b720aa0c am 9d50ea90: am c770e064: am dd0db799: am 5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev 
* commit '9d50ea90f7072a7fa87d022663f2d25b906ed2ad':
  Added LEANBACK_LAUNCHER Intent category
 2014-03-12 08:22:52 -07:00
John Spurlock
aaa0bc0736 am f0b56b58: am 2fcac8ba: am b41c951f: am cb5f813b: am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs 
* commit 'f0b56b580579c63caaa4d775231ccbad65b61af5':
  Fix doc typos in Vibrator.java
 2014-03-12 08:22:40 -07:00
Jose Lima
9d50ea90f7 am c770e064: am dd0db799: am 5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev 
* commit 'c770e064effb79c33472f54652bd95aa14a8d6ec':
  Added LEANBACK_LAUNCHER Intent category
 2014-03-12 15:19:37 +00:00
John Spurlock
f0b56b5805 am 2fcac8ba: am b41c951f: am cb5f813b: am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs 
* commit '2fcac8ba6fe870d78eca7b75c0e846a229f08819':
  Fix doc typos in Vibrator.java
 2014-03-12 15:19:23 +00:00
Jeff Brown
6f657baae1 am f08ea09f: Merge "Retain display when creating specialized contexts." 
* commit 'f08ea09fc0d85a60dbd270fbb80ea93127356554':
  Retain display when creating specialized contexts.
 2014-03-11 20:45:19 -07:00
Jeff Brown
f08ea09fc0 Merge "Retain display when creating specialized contexts." 2014-03-12 03:43:17 +00:00
Jeff Brown
defd4a6b04 Retain display when creating specialized contexts. 
Fixed a bug that cause Context.createPackageContext() to discard
display information.  Likewise also fixes issues where the
activity token, override configuration, user handle, and
restriction state might be discarded.

As part of this change, reworked how Contexts are created to make
initialization easier to understand and less error-prone.
The init() methods have been removed and most of the state is
now stored in final variables.

Bug: 12015587
Change-Id: If795851f1cd078bef889b76a52e00d9b3c06ab11
 2014-03-11 19:30:00 -07:00
Dianne Hackborn
b26a34e3c8 am 5c719495: Merge "Reduce wake lock noise in battery history." 
* commit '5c719495724987a405e29b1623dfe613e9a4cdf5':
  Reduce wake lock noise in battery history.
 2014-03-11 16:17:25 -07:00
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
Dianne Hackborn
5c71949572 Merge "Reduce wake lock noise in battery history." 2014-03-11 22:59:21 +00: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
Jose Lima
dd0db799ee am 5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev 
* commit '5f0c0498a1382ef955cccca95920ec878fe2a64c':
  Added LEANBACK_LAUNCHER Intent category
 2014-03-11 19:19:11 +00:00
John Spurlock
b41c951fb1 am cb5f813b: am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs 
* commit 'cb5f813bb642e72777643dcd2bcbd92cc2039388':
  Fix doc typos in Vibrator.java
 2014-03-11 19:18:59 +00:00
Winson Chung
303e1ff1fe Initial changes for recents. 
Change-Id: Ide2c202b4a5b25410f0f32bd0a81ccf817ede38f
 2014-03-11 12:03:08 -07:00
Jose Lima
5f0c0498a1 Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev 2014-03-11 18:08:53 +00:00
Jessica Hummel
f72078bdc5 Move the provisioning intents to DevicePolicyManager. 
Change-Id: Ibde867b193e64c1fda8d9c84b0d1be36a1592035
 2014-03-11 18:05:29 +00:00
John Spurlock
cb5f813bb6 am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs 
* commit '0a3cb2ce1b2472b7e4ca6739eaeaa50975abf6ab':
  Fix doc typos in Vibrator.java
 2014-03-11 17:43:46 +00:00
Jose Lima
38b75b6126 Added LEANBACK_LAUNCHER Intent category 
Change-Id: I4f5ccfa9725106f558972c73abbe3f9435267c75
 2014-03-11 10:43:31 -07:00
Dianne Hackborn
e5167ca61e Reduce wake lock noise in battery history. 
When the work source of a wake lock was changed, this would
cause the old wake lock to be released in battery stats before
the new one was acquired (the power manager would correctly
keep holding the associated wake lock).  This resulted in a
pointless entry in the battery history showing the last wake
lock being released and a new one acquired.

This change adds a new path in to battery stats to report
when a wake lock has changed, allowing it to acquire the
new wake locks first before the old ones, so it can't drop
down to zero wake locks.  This also provides better timing
information, as the same current time can be used for both
operations.

In addition, added a new kind of history entry for the
current time, so you can tell when in actual world clock
time the battery data is happening.

Change-Id: Ibbf2eed83bb93f31f60267889b7bc5b9e71e355f
 2014-03-11 10:02:40 -07: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