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

88778 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
587f5b74df am 55442201: am 9565ceb6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '55442201d4d6e854d91a265eb2841100891b6437':
  Import translations. DO NOT MERGE
 2012-10-04 21:47:09 -07:00
Baligh Uddin
963095b2a0 am a51d4ed9: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'a51d4ed9559bf500e91adbee4101ad5db4e14703':
  Import translations. DO NOT MERGE
 2012-10-04 21:47:09 -07:00
Baligh Uddin
55442201d4 am 9565ceb6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '9565ceb6094569a8c7ca719acf5b65ae194548a9':
  Import translations. DO NOT MERGE
 2012-10-04 21:45:45 -07:00
Baligh Uddin
9565ceb609 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-04 21:43:10 -07:00
Baligh Uddin
a51d4ed955 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-04 21:41:56 -07:00
Daniel Sandler
3e78586db6 am 689a55d8: am f5e2b2c2: Merge "DreamService API revisions." into jb-mr1-dev 
* commit '689a55d813a846d7b64f2bf1b6c86d9f9b5bdbea':
  DreamService API revisions.
 2012-10-04 21:01:13 -07:00
Daniel Sandler
689a55d813 am f5e2b2c2: Merge "DreamService API revisions." into jb-mr1-dev 
* commit 'f5e2b2c26c37d839e6559319d311b62598c6dade':
  DreamService API revisions.
 2012-10-04 20:58:27 -07:00
Daniel Sandler
f5e2b2c26c Merge "DreamService API revisions." into jb-mr1-dev 2012-10-04 20:56:08 -07:00
Daniel Sandler
2d78490292 DreamService API revisions. 
Reduce reliance on Service interface overrides, instead
steering clients to the DreamService-specific lifecycle
hooks:

  onAttachedToWindow .. onDreamingStarted ..
  onDreamingStopped .. onDetachedFromWindow

The old Dream.java is finally gone now too.

Bug: 7281802
Change-Id: Ib7802c3397fde60ad1132fa49831da182eef4d7a
 2012-10-04 23:38:15 -04:00
Jeff Brown
6513d7d446 am 11337984: am a07b1fff: Merge "Support animating just the backlight when turning off." into jb-mr1-dev 
* commit '113379842f659e5efa732ae99807b2c10383b304':
  Support animating just the backlight when turning off.
 2012-10-04 20:24:18 -07:00
Jeff Brown
7709f5d870 am 901d8666: am 29126cf0: Merge "Ensure we send at least one wakeup/gotosleep transition." into jb-mr1-dev 
* commit '901d8666f9421090cd33d3f2add66d39f93bf771':
  Ensure we send at least one wakeup/gotosleep transition.
 2012-10-04 20:24:14 -07:00
Jeff Brown
113379842f am a07b1fff: Merge "Support animating just the backlight when turning off." into jb-mr1-dev 
* commit 'a07b1fffbe7c43485b35ba83c9083a59ff328df1':
  Support animating just the backlight when turning off.
 2012-10-04 20:21:37 -07:00
Jeff Brown
901d8666f9 am 29126cf0: Merge "Ensure we send at least one wakeup/gotosleep transition." into jb-mr1-dev 
* commit '29126cf0f7992805b274510420485c95e3741598':
  Ensure we send at least one wakeup/gotosleep transition.
 2012-10-04 20:21:34 -07:00
Jeff Brown
a07b1fffbe Merge "Support animating just the backlight when turning off." into jb-mr1-dev 2012-10-04 20:20:25 -07:00
Jeff Brown
29126cf0f7 Merge "Ensure we send at least one wakeup/gotosleep transition." into jb-mr1-dev 2012-10-04 20:19:31 -07:00
Jim Miller
7e74c39980 am 639e18eb: am f0520930: Merge "Allow lower case for owner info in keyguard" into jb-mr1-dev 
* commit '639e18eb4f2bd38110167c7d8ea222df8faf5edd':
  Allow lower case for owner info in keyguard
 2012-10-04 19:44:34 -07:00
Jim Miller
639e18eb4f am f0520930: Merge "Allow lower case for owner info in keyguard" into jb-mr1-dev 
* commit 'f0520930441a228632423c486c2f0db3082ea781':
  Allow lower case for owner info in keyguard
 2012-10-04 19:43:00 -07:00
Christopher Tate
49bbbf2c1c am d87cb794: am 0cd3c976: Merge "Settings (and general) restore fixes" into jb-mr1-dev 
* commit 'd87cb794b063c503f4d732141904bd1edd5c5914':
  Settings (and general) restore fixes
 2012-10-04 19:40:38 -07:00
Jim Miller
f052093044 Merge "Allow lower case for owner info in keyguard" into jb-mr1-dev 2012-10-04 19:40:35 -07:00
Christopher Tate
d87cb794b0 am 0cd3c976: Merge "Settings (and general) restore fixes" into jb-mr1-dev 
* commit '0cd3c976a273a25c2d642064ade997bdf9d99855':
  Settings (and general) restore fixes
 2012-10-04 19:39:07 -07:00
Christopher Tate
0cd3c976a2 Merge "Settings (and general) restore fixes" into jb-mr1-dev 2012-10-04 19:36:41 -07:00
Christopher Tate
5067685ccf Settings (and general) restore fixes 
Pro tem, we ignore wifi configuration data when restoring system settings.
This is not ideal, but it *does* mean we do not bounce wifi off and on
again during the extended restore process, which in turn means we don't
interfere with things like the Play Store's download of applications.
We do continue to back up wifi configuration, and will start using that
data again when the new implementation that restores AP configurations
without having to bounce wifi comes to pass.

Also, this CL fixes a longstanding bug in BackupDataInput.skipEntityData()
that was being reproduced reliably once settings restore was skipping
the wifi-related entities in the restore stream.

Bug 7249405

Change-Id: I61520a9a116b66ebdf95734d09d9afd46406df01
 2012-10-04 19:10:11 -07:00
Jim Miller
9fdabab7e9 Allow lower case for owner info in keyguard 
bug 7094419

Change-Id: Ic89d51f1d490b99a9cdd897b71057be37004301a
 2012-10-04 18:47:18 -07:00
Jeff Brown
a52772ff26 Support animating just the backlight when turning off. 
Bug: 7224614
Change-Id: Ic9fa7a9e458c89d347b03bce6829f952bdf3b6a5
 2012-10-04 18:39:24 -07:00
Jeff Hamilton
35512ab006 am f2e292f5: am 82b94649: Merge "Changes to support updating location providers." into jb-mr1-dev 
* commit 'f2e292f5548fe791e5b5c882e5e2088e7417e8dc':
  Changes to support updating location providers.
 2012-10-04 18:29:51 -07:00
Jeff Hamilton
f2e292f554 am 82b94649: Merge "Changes to support updating location providers." into jb-mr1-dev 
* commit '82b946496e2a503b5b21af318af5be828a223a44':
  Changes to support updating location providers.
 2012-10-04 18:28:02 -07:00
Jeff Hamilton
82b946496e Merge "Changes to support updating location providers." into jb-mr1-dev 2012-10-04 18:23:45 -07:00
Dianne Hackborn
82e9bd113a am a9e9eb70: am 0cdbd077: Merge "Fix issue #7290206: Need API to get/look up user serial number" into jb-mr1-dev 
* commit 'a9e9eb7026331d4f0ba2fcebeca184df0463b9f2':
  Fix issue #7290206: Need API to get/look up user serial number
 2012-10-04 18:21:47 -07:00
Raph Levien
4726609212 am 32d932c7: am 19348623: Merge "Updated Roboto fonts with correct T comma accent encoding" into jb-mr1-dev 
* commit '32d932c72d268a4f29d0febae951742126ddac72':
  Updated Roboto fonts with correct T comma accent encoding
 2012-10-04 18:21:44 -07:00
Dianne Hackborn
a9e9eb7026 am 0cdbd077: Merge "Fix issue #7290206: Need API to get/look up user serial number" into jb-mr1-dev 
* commit '0cdbd0776d141011567e63158aa0a430362425ef':
  Fix issue #7290206: Need API to get/look up user serial number
 2012-10-04 18:20:41 -07:00
Dianne Hackborn
0cdbd0776d Merge "Fix issue #7290206: Need API to get/look up user serial number" into jb-mr1-dev 2012-10-04 18:19:01 -07:00
Raph Levien
32d932c72d am 19348623: Merge "Updated Roboto fonts with correct T comma accent encoding" into jb-mr1-dev 
* commit '19348623fa006a87e668a1c69c412b0ff5da88c9':
  Updated Roboto fonts with correct T comma accent encoding
 2012-10-04 18:19:00 -07:00
Raph Levien
19348623fa Merge "Updated Roboto fonts with correct T comma accent encoding" into jb-mr1-dev 2012-10-04 18:15:55 -07:00
Amith Yamasani
a32c4ec5f3 am 21f0777c: am c192c649: Merge "Fix serial number assignment for new user on a freshly wiped device" into jb-mr1-dev 
* commit '21f0777c1145f931d0f11c8f235a83c4e6edc4eb':
  Fix serial number assignment for new user on a freshly wiped device
 2012-10-04 18:07:40 -07:00
Adam Cohen
451d49b34c am a39c5c36: am 327424d6: Merge "Plumbing to allow keyguard to be shown with user switcher (issue 7175023)" into jb-mr1-dev 
* commit 'a39c5c369af24cc25f77b9ac97dfffae41c73eb6':
  Plumbing to allow keyguard to be shown with user switcher (issue 7175023)
 2012-10-04 18:05:48 -07:00
Satoshi Kataoka
4280233813 am 0f300c70: am 284b2053: Merge "Support multi-user switch in TextServicesManagerService" into jb-mr1-dev 
* commit '0f300c7045f150722532fd50dd78f6fcb4c4f395':
  Support multi-user switch in TextServicesManagerService
 2012-10-04 18:05:45 -07:00
Amith Yamasani
21f0777c11 am c192c649: Merge "Fix serial number assignment for new user on a freshly wiped device" into jb-mr1-dev 
* commit 'c192c649ba3b79dff70c5ccf981d631b929b5778':
  Fix serial number assignment for new user on a freshly wiped device
 2012-10-04 18:05:34 -07:00
Adam Powell
7eff1d28e2 am 123436eb: am 2ee1f656: Merge "MediaRouter/Wireless Display - correct initial state" into jb-mr1-dev 
* commit '123436ebd5adc528c23e378bd552d9548a8a27ad':
  MediaRouter/Wireless Display - correct initial state
 2012-10-04 18:03:58 -07:00
Amith Yamasani
c192c649ba Merge "Fix serial number assignment for new user on a freshly wiped device" into jb-mr1-dev 2012-10-04 18:03:47 -07:00
Adam Cohen
a39c5c369a am 327424d6: Merge "Plumbing to allow keyguard to be shown with user switcher (issue 7175023)" into jb-mr1-dev 
* commit '327424d69b99213e872e91f05feba2d0a137d6c7':
  Plumbing to allow keyguard to be shown with user switcher (issue 7175023)
 2012-10-04 18:03:36 -07:00
Satoshi Kataoka
0f300c7045 am 284b2053: Merge "Support multi-user switch in TextServicesManagerService" into jb-mr1-dev 
* commit '284b20538764afe2500be6ba5b1f3a057123ffc9':
  Support multi-user switch in TextServicesManagerService
 2012-10-04 18:03:33 -07:00
Jeff Brown
5430835934 Ensure we send at least one wakeup/gotosleep transition. 
This fixes an issue where the device would not lock immediately
when the user quickly pressed power off / power on even if
configured to do so.  We were suppressing the screen off
and wake up broadcast in this case.

Now we make sure to always send at least one broadcast to
indicate the transition.  We still collapse back-to-back
full cycle transitions though so as not to end up enqueuing
useless broadcasts.

Bug: 7061116
Change-Id: I7211c5fd963c271c2b0aceb4d2f746063c629079
 2012-10-04 18:03:11 -07:00
Adam Powell
123436ebd5 am 2ee1f656: Merge "MediaRouter/Wireless Display - correct initial state" into jb-mr1-dev 
* commit '2ee1f6567d2bc25c58f212354ffd09df18fc0b25':
  MediaRouter/Wireless Display - correct initial state
 2012-10-04 18:01:52 -07:00
Christian Robertson
439b85ef9d Updated Roboto fonts with correct T comma accent encoding 
Updated Roboto fonts fixing issue where Tcommaaccent and Tcedilla
characters were encoded improperly (their values were switched). This
patch addresses bug 7198855 and bug 7070912. Original was mistakenly
submitted to master but should be applied to jb-mr1-dev instead.

Also, this commit reverts the addition of RobotoCondensed-Light and its
italic, for which we don't have any build file or XML metadata support.

Change-Id: If1c592474f1f7199e98bb98edf4de6466b43fa51
 2012-10-04 18:01:14 -07:00
Adam Cohen
327424d69b Merge "Plumbing to allow keyguard to be shown with user switcher (issue 7175023)" into jb-mr1-dev 2012-10-04 18:01:09 -07:00
Satoshi Kataoka
284b205387 Merge "Support multi-user switch in TextServicesManagerService" into jb-mr1-dev 2012-10-04 18:01:09 -07:00
Adam Powell
2ee1f6567d Merge "MediaRouter/Wireless Display - correct initial state" into jb-mr1-dev 2012-10-04 18:00:01 -07:00
Adam Cohen
f752202bee Plumbing to allow keyguard to be shown with user switcher (issue 7175023) 
-> Also reduced calls to lockNow, and moved this call in ActivityManagerService

Change-Id: I9ba34ca902f7c0f71fa4ec302104688ca8d11f55
 2012-10-04 17:53:01 -07:00
Jeff Brown
b1e93505ae am 25f5a71f: am 17f36d15: Merge "Allow phone to go to sleep while in call." into jb-mr1-dev 
* commit '25f5a71f31d8cb526f04c833c5b67e59369c725f':
  Allow phone to go to sleep while in call.
 2012-10-04 17:37:29 -07:00
Jeff Brown
25f5a71f31 am 17f36d15: Merge "Allow phone to go to sleep while in call." into jb-mr1-dev 
* commit '17f36d154f1a8ebe72fc35af332f5c0069503364':
  Allow phone to go to sleep while in call.
 2012-10-04 17:35:29 -07:00