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

91279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Hamilton
69813a0db1 am 7fe70683: am 20de160c: Revert "Changes to support updating location providers." 
* commit '7fe7068362e4e383390c039488dab65caa51df3b':
  Revert "Changes to support updating location providers."
 2012-10-05 00:52:44 -07:00
Jeff Hamilton
7fe7068362 am 20de160c: Revert "Changes to support updating location providers." 
* commit '20de160ca32a8f2936a80ffd70551a22e2371d25':
  Revert "Changes to support updating location providers."
 2012-10-05 00:48:48 -07:00
Jeff Hamilton
20de160ca3 Revert "Changes to support updating location providers." 
This reverts commit c19efc204aee1f0f3164dc21bd2ef3fdd4259c71.
 2012-10-05 02:32:52 -05:00
Matthew Xie
b0207b39ad am 0c578546: am 91d1d156: am d21b4839: Merge "Add multi user support for bluetooth" into jb-mr1-dev 
* commit '0c5785465c7937fb748553d85724afb4bfc6473a':
  Add multi user support for bluetooth
 2012-10-04 23:29:57 -07:00
Matthew Xie
0c5785465c am 91d1d156: am d21b4839: Merge "Add multi user support for bluetooth" into jb-mr1-dev 
* commit '91d1d15624d831eb822ac97dde1916762e136015':
  Add multi user support for bluetooth
 2012-10-04 23:27:17 -07:00
Matthew Xie
91d1d15624 am d21b4839: Merge "Add multi user support for bluetooth" into jb-mr1-dev 
* commit 'd21b483904057212ab1654b8ef606d41f2d3fe46':
  Add multi user support for bluetooth
 2012-10-04 23:24:27 -07:00
Matthew Xie
d21b483904 Merge "Add multi user support for bluetooth" into jb-mr1-dev 2012-10-04 23:21:34 -07:00
Raph Levien
577b07197b Fix for 7281523 android.text.cts.SelectionTest#testMoveRight failures 
The failures were caused by the implementation of doTextRunCursor
passing a too-small value for contextCount into the underlying
getTextRunAdvances call (it wasn't accounting for the start offset).
Thus, when getTextRunAdvances made a copy of the text for its cache key,
it was getting a partial copy.

This patch fixes the size so the cache key always has a full copy of the
text.

Change-Id: I57e3ac6de7aef0e1f1c7000dc3d653f9b0d623d2
 2012-10-04 23:15:12 -07:00
Jim Miller
45186a6ea5 am 169514fe: am 74ab4268: am efd7b267: Merge "More userActivity() calls in keyguard" into jb-mr1-dev 
* commit '169514fef68efa652a036dbe73745dc75005b947':
  More userActivity() calls in keyguard
 2012-10-04 22:28:58 -07:00
Jim Miller
169514fef6 am 74ab4268: am efd7b267: Merge "More userActivity() calls in keyguard" into jb-mr1-dev 
* commit '74ab4268f6881081e325c8acb6f2574dca7cdb66':
  More userActivity() calls in keyguard
 2012-10-04 22:25:20 -07:00
Jim Miller
74ab4268f6 am efd7b267: Merge "More userActivity() calls in keyguard" into jb-mr1-dev 
* commit 'efd7b26797cc64be0d1156f7ba15b5c6b99597e0':
  More userActivity() calls in keyguard
 2012-10-04 22:23:34 -07:00
Jim Miller
efd7b26797 Merge "More userActivity() calls in keyguard" into jb-mr1-dev 2012-10-04 22:21:12 -07:00
Daniel Sandler
cccd6ada95 am 8b14fda4: am f7eef4e3: am 2a04e740: Merge "Updated clock hands for Quick Settings." into jb-mr1-dev 
* commit '8b14fda4f36c86eaa8b4c9e072398d61228a26d7':
  Updated clock hands for Quick Settings.
 2012-10-04 22:17:15 -07:00
Daniel Sandler
8b14fda4f3 am f7eef4e3: am 2a04e740: Merge "Updated clock hands for Quick Settings." into jb-mr1-dev 
* commit 'f7eef4e3bc6a91b102288e0930b8fb1f0198dc48':
  Updated clock hands for Quick Settings.
 2012-10-04 22:15:02 -07:00
Daniel Sandler
f7eef4e3bc am 2a04e740: Merge "Updated clock hands for Quick Settings." into jb-mr1-dev 
* commit '2a04e740973c7a0781263d4a351c249449f556ec':
  Updated clock hands for Quick Settings.
 2012-10-04 22:12:16 -07:00
Daniel Sandler
2a04e74097 Merge "Updated clock hands for Quick Settings." into jb-mr1-dev 2012-10-04 22:09:31 -07:00
Daniel Sandler
96b248affa Updated clock hands for Quick Settings. 
Bug: 7281063
Change-Id: I03e7ca236c8cdc809e112e2e844a0006e73ab504
 2012-10-05 01:07:07 -04:00
Jim Miller
9cf2c523d8 More userActivity() calls in keyguard 
Some security screens aren't currently calling userActivity().  As such,
they allow keyguard to timeout before the user has a chance to enter
the required information.

The fix uses a TextWatcher to look for changes in the input text
and call userActivity() appropriately.

bug 7291431

Change-Id: I6d7889cc01a4d6bdbefefc5af478e812c35b1a49
 2012-10-04 22:02:29 -07:00
Baligh Uddin
588fee150c am b17afcce: (-s ours) am 8946d568: am b2908854: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'b17afccede4770a9b260b88d89446e5893e81e72':
  Import translations. DO NOT MERGE
 2012-10-04 22:00:57 -07:00
Baligh Uddin
b17afccede am 8946d568: am b2908854: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '8946d568bcdf13e3da45619a33aac4a4209236f7':
  Import translations. DO NOT MERGE
 2012-10-04 21:58:47 -07:00
Baligh Uddin
8946d568bc am b2908854: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'b29088540b2ecb3046277fbeb5ee1c87abe74d95':
  Import translations. DO NOT MERGE
 2012-10-04 21:56:26 -07:00
Baligh Uddin
4dc41ea864 am 1b189145: (-s ours) am 9fc2f894: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '1b189145ff9d3efc1996231eb4b9bd73dad490de':
  Import translations. DO NOT MERGE
 2012-10-04 21:55:11 -07:00
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