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

90804 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
7bfb48dda0 Merge "Import translations. DO NOT MERGE" 2012-10-04 21:54:18 -07:00
Baligh Uddin
b29088540b Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-04 21:53:02 -07:00
Baligh Uddin
1b189145ff am 9fc2f894: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '9fc2f894deedeb3178e0ab55cf161897ceca8f5e':
  Import translations. DO NOT MERGE
 2012-10-04 21:53:00 -07:00
Baligh Uddin
9fc2f894de Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-04 21:51:07 -07:00
Baligh Uddin
67aeac6ece am 587f5b74: (-s ours) am 55442201: am 9565ceb6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '587f5b74df080d62abdbc0fce6e5f2aac5e0d937':
  Import translations. DO NOT MERGE
 2012-10-04 21:50:03 -07:00
Baligh Uddin
988d8e6d4c am 963095b2: (-s ours) am a51d4ed9: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '963095b2a099783272c906a942975370265d1fb8':
  Import translations. DO NOT MERGE
 2012-10-04 21:49:59 -07:00
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
0f46bdafd0 Merge "Import translations. DO NOT MERGE" 2012-10-04 21:44:28 -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
ac377c849a am 3e78586d: am 689a55d8: am f5e2b2c2: Merge "DreamService API revisions." into jb-mr1-dev 
* commit '3e78586db6ee28d5052fe9934104dec4c2e87f8b':
  DreamService API revisions.
 2012-10-04 21:03:20 -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
8d4aa2d32d am 6513d7d4: am 11337984: am a07b1fff: Merge "Support animating just the backlight when turning off." into jb-mr1-dev 
* commit '6513d7d446173184d3f2a143a9f9bd641a23dcec':
  Support animating just the backlight when turning off.
 2012-10-04 20:34:45 -07:00
Jeff Brown
6716c15c6a am 7709f5d8: am 901d8666: am 29126cf0: Merge "Ensure we send at least one wakeup/gotosleep transition." into jb-mr1-dev 
* commit '7709f5d87078da7640dd0c6a58187e25932656ef':
  Ensure we send at least one wakeup/gotosleep transition.
 2012-10-04 20:34:41 -07:00
Jim Miller
e1668bf708 am 7e74c399: am 639e18eb: am f0520930: Merge "Allow lower case for owner info in keyguard" into jb-mr1-dev 
* commit '7e74c39980669c238307122a2ebbfcb225f7a8a4':
  Allow lower case for owner info in keyguard
 2012-10-04 20:34:35 -07:00
Christopher Tate
f52745c274 am 49bbbf2c: am d87cb794: am 0cd3c976: Merge "Settings (and general) restore fixes" into jb-mr1-dev 
* commit '49bbbf2c1c96432f1f599d5573931470117be45a':
  Settings (and general) restore fixes
 2012-10-04 20:34:31 -07:00
Jeff Hamilton
a3d37a6c4a am 35512ab0: am f2e292f5: am 82b94649: Merge "Changes to support updating location providers." into jb-mr1-dev 
* commit '35512ab00697ce50f9ff5a39f3f3a4ccb7e3b7f0':
  Changes to support updating location providers.
 2012-10-04 20:34:13 -07: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
Dianne Hackborn
438e76f016 am 82e9bd11: am a9e9eb70: am 0cdbd077: Merge "Fix issue #7290206: Need API to get/look up user serial number" into jb-mr1-dev 
* commit '82e9bd113a812ea3507f53469ba7f161532b62ec':
  Fix issue #7290206: Need API to get/look up user serial number
 2012-10-04 19:34:09 -07:00
Raph Levien
ca58572e25 am 47266092: am 32d932c7: am 19348623: Merge "Updated Roboto fonts with correct T comma accent encoding" into jb-mr1-dev 
* commit '47266092124657587eb61467fde3778cc4356a56':
  Updated Roboto fonts with correct T comma accent encoding
 2012-10-04 19:34:05 -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
Matthew Xie
fca9d63635 Add multi user support for bluetooth 
Create a BLUETOOTH_STACK permission to share between all users of
Bluetooth apk. Bluetooth Manager binds to apk of current user
bug 6925422

Change-Id: I2df5546e977c2d77bc66d97d12479d933826922a
 2012-10-04 18:35:42 -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
Amith Yamasani
d8d842ad05 No breadcrumbs for single-pane preferences 
Bug: 7274530
Change-Id: I6a4b6321a72ad38a757098ea470ac58d4294639b
 2012-10-04 18:16:59 -07:00
Jeff Brown
cb1518db83 Fix parceling of display info flags. 
Bug: 7283429
Change-Id: I5365a3b06d9b9f2414f9a9d2c94b0906c41b4ece
 2012-10-04 18:16:41 -07:00