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

36263 Commits

Author SHA1 Message Date
Raph Levien
85e25c478a am 44d21eb5: am 6f3f7c68: am 9dc11eb8: Merge "Fix for 7281523 android.text.cts.SelectionTest#testMoveRight failures" into jb-mr1-dev 
* commit '44d21eb5fcfd8f25920ccc3abccf3aedbf01f5df':
  Fix for 7281523 android.text.cts.SelectionTest#testMoveRight failures
 2012-10-05 11:02:24 -07:00
Raph Levien
44d21eb5fc am 6f3f7c68: am 9dc11eb8: Merge "Fix for 7281523 android.text.cts.SelectionTest#testMoveRight failures" into jb-mr1-dev 
* commit '6f3f7c681fa824c35b09ebf2978ff853f5a270e3':
  Fix for 7281523 android.text.cts.SelectionTest#testMoveRight failures
 2012-10-05 10:59:51 -07:00
Raph Levien
6f3f7c681f am 9dc11eb8: Merge "Fix for 7281523 android.text.cts.SelectionTest#testMoveRight failures" into jb-mr1-dev 
* commit '9dc11eb848bfcd463e504133e4e356c7e6497842':
  Fix for 7281523 android.text.cts.SelectionTest#testMoveRight failures
 2012-10-05 10:56:41 -07:00
Raph Levien
9dc11eb848 Merge "Fix for 7281523 android.text.cts.SelectionTest#testMoveRight failures" into jb-mr1-dev 2012-10-05 10:53:46 -07:00
Philip Milne
7dffdc33ba am e0ca5807: am 22238285: am 04b09636: Merge "Fix for bug: 7281620. Blank line after date in status widget disappears." into jb-mr1-dev 
* commit 'e0ca5807da770f6c7e2beee64560e0c8c97d2770':
  Fix for bug: 7281620. Blank line after date in status widget disappears.
 2012-10-05 10:49:18 -07:00
Philip Milne
e0ca5807da am 22238285: am 04b09636: Merge "Fix for bug: 7281620. Blank line after date in status widget disappears." into jb-mr1-dev 
* commit '222382855d0a15e35c0da785092d2d2a8043c3b4':
  Fix for bug: 7281620. Blank line after date in status widget disappears.
 2012-10-05 10:47:43 -07:00
Philip Milne
222382855d am 04b09636: Merge "Fix for bug: 7281620. Blank line after date in status widget disappears." into jb-mr1-dev 
* commit '04b0963669ed6e55b8a779288ba8d4f8b92bc98f':
  Fix for bug: 7281620. Blank line after date in status widget disappears.
 2012-10-05 10:45:09 -07:00
Philip Milne
04b0963669 Merge "Fix for bug: 7281620. Blank line after date in status widget disappears." into jb-mr1-dev 2012-10-05 10:42:46 -07:00
Philip Milne
0223ffaa04 Fix for bug: 7281620. Blank line after date in status widget disappears. 
Change-Id: I9e8e31e14e17643551c3bf89bac898d91c3d37ca
 2012-10-05 10:27:42 -07:00
Jeff Hamilton
2dd1816661 am 69813a0d: am 7fe70683: am 20de160c: Revert "Changes to support updating location providers." 
* commit '69813a0db10d7c64ed93a2871028a79052c9950f':
  Revert "Changes to support updating location providers."
 2012-10-05 00:55:52 -07:00
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
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 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
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
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
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
Adam Cohen
c5bbd1c6a5 am 451d49b3: am a39c5c36: am 327424d6: Merge "Plumbing to allow keyguard to be shown with user switcher (issue 7175023)" into jb-mr1-dev 
* commit '451d49b34c8399a3479ca96addcc11857b6afb3e':
  Plumbing to allow keyguard to be shown with user switcher (issue 7175023)
 2012-10-04 18:08:36 -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
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
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
7952056c71 am b1e93505: am 25f5a71f: am 17f36d15: Merge "Allow phone to go to sleep while in call." into jb-mr1-dev 
* commit 'b1e93505ae479c657fd2cfc21ddabadec8a03f6a':
  Allow phone to go to sleep while in call.
 2012-10-04 17:39:07 -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
Dianne Hackborn
33f9cb8cf0 Fix issue #7290206: Need API to get/look up user serial number 
Change-Id: I1713215e7c205b1b66c36488f89e3fbf4572cb97
 2012-10-04 17:15:10 -07:00
Jeff Brown
93cbbb25a5 Allow phone to go to sleep while in call. 
Bug: 7279383
Change-Id: Ia05490218f40a1843507b95ff48fa07910e582d4
 2012-10-04 16:22:04 -07:00
Jeff Brown
2e65fa2cc3 am 6ac19fe0: am 4fb5b85a: am dce8b948: Merge "Fix parceling of display info flags." into jb-mr1-dev 
* commit '6ac19fe0b02c05089e53e380a980b4f646739b30':
  Fix parceling of display info flags.
 2012-10-04 15:33:35 -07:00
Jeff Brown
6ac19fe0b0 am 4fb5b85a: am dce8b948: Merge "Fix parceling of display info flags." into jb-mr1-dev 
* commit '4fb5b85a5be88028398e67f37b2d7f802550d9fd':
  Fix parceling of display info flags.
 2012-10-04 15:31:07 -07:00
Adam Powell
0a027ded5f am 5e1b345f: am 64f369bb: am b4fad85c: Merge "Fix regression in AbsListView CHOICE_MODE_SINGLE" into jb-mr1-dev 
* commit '5e1b345f41a01e46e2bddf53e3b0c73b3877333c':
  Fix regression in AbsListView CHOICE_MODE_SINGLE
 2012-10-04 15:30:16 -07:00
Adam Powell
5e1b345f41 am 64f369bb: am b4fad85c: Merge "Fix regression in AbsListView CHOICE_MODE_SINGLE" into jb-mr1-dev 
* commit '64f369bbc55a1ca9a88db298dff34fba38c1daae':
  Fix regression in AbsListView CHOICE_MODE_SINGLE
 2012-10-04 15:27:47 -07:00
Jeff Brown
4fb5b85a5b am dce8b948: Merge "Fix parceling of display info flags." into jb-mr1-dev 
* commit 'dce8b948320e933e46e4a38c496f56555472495f':
  Fix parceling of display info flags.
 2012-10-04 15:27:15 -07:00
Adam Powell
64f369bbc5 am b4fad85c: Merge "Fix regression in AbsListView CHOICE_MODE_SINGLE" into jb-mr1-dev 
* commit 'b4fad85ca0ed258e4f8de8045c707a4bf2a6ce66':
  Fix regression in AbsListView CHOICE_MODE_SINGLE
 2012-10-04 15:25:36 -07:00