Jeff Brown
4bb6d07a8b
am 513b8ea1: am 3f1246a2: Merge "Coordinate screen on with the window manager." into jb-mr1-dev
...
* commit '513b8ea16fdedd7b6debd718798c0220edd61d7f':
Coordinate screen on with the window manager.
2012-10-05 15:00:47 -07:00
Romain Guy
88801b270f
Update TextureView's layer on size change
...
Bug #7171323
Change-Id: I24bedd7775ebf585ffcbd43b661e9c961f380c29
2012-10-05 14:58:33 -07:00
Jeff Brown
513b8ea16f
am 3f1246a2: Merge "Coordinate screen on with the window manager." into jb-mr1-dev
...
* commit '3f1246a29b58cf78ebe674ec0905ad1795027aac':
Coordinate screen on with the window manager.
2012-10-05 14:58:01 -07:00
Jeff Brown
3f1246a29b
Merge "Coordinate screen on with the window manager." into jb-mr1-dev
2012-10-05 14:55:26 -07:00
Christopher Tate
ba074a592a
am 3c9376b3: am d0f19930: Merge "Make sure settings writes are permission checked correctly" into jb-mr1-dev
...
* commit '3c9376b38b1ed26995324cebe69f10f8a7147408':
Make sure settings writes are permission checked correctly
2012-10-05 14:51:02 -07:00
Christopher Tate
3c9376b38b
am d0f19930: Merge "Make sure settings writes are permission checked correctly" into jb-mr1-dev
...
* commit 'd0f199308e5d040bf0a968114578d620fb6a9f61':
Make sure settings writes are permission checked correctly
2012-10-05 14:48:40 -07:00
Christopher Tate
d0f199308e
Merge "Make sure settings writes are permission checked correctly" into jb-mr1-dev
2012-10-05 14:46:01 -07:00
Jeff Brown
c38c9be031
Coordinate screen on with the window manager.
...
Bug: 7267457
Change-Id: Ic2c322253639e1f0b2e4e72a7b145025d0240f93
2012-10-05 14:39:23 -07:00
Dianne Hackborn
8855d469c2
am ebdc064d: am 7ef38ea9: Merge "Fix issue #7275122 : Wall paper jank when switching users" into jb-mr1-dev
...
* commit 'ebdc064ddb3accf28be8dd6661cfbc7ec5e3cc22':
Fix issue #7275122 : Wall paper jank when switching users
2012-10-05 13:00:31 -07:00
Dianne Hackborn
ebdc064ddb
am 7ef38ea9: Merge "Fix issue #7275122 : Wall paper jank when switching users" into jb-mr1-dev
...
* commit '7ef38ea9e5ee1d2fd58e818f37191a589793e236':
Fix issue #7275122 : Wall paper jank when switching users
2012-10-05 12:57:43 -07:00
Dianne Hackborn
7ef38ea9e5
Merge "Fix issue #7275122 : Wall paper jank when switching users" into jb-mr1-dev
2012-10-05 12:54:52 -07:00
Justin Ho
646fd9137e
am 62fe74c7: am 26bf1a7c: Merge "Revert "Updating Roboto fonts with updated Cyrillic glyphs and fixes to tabular numerals. Bug:7198855,7070912"" into jb-mr1-dev
...
* commit '62fe74c75e661fcf3e64f6e604f8b7cc387840f4':
Revert "Updating Roboto fonts with updated Cyrillic glyphs and fixes to tabular numerals. Bug:7198855,7070912"
2012-10-05 12:22:54 -07:00
Justin Ho
548f1b782c
am 4f4dda69: am f4037ff4: Merge "Revert "Updated Roboto fonts with correct T comma accent encoding"" into jb-mr1-dev
...
* commit '4f4dda69ee2dc6a235386ce733beda3f3abb17c5':
Revert "Updated Roboto fonts with correct T comma accent encoding"
2012-10-05 12:21:06 -07:00
Justin Ho
62fe74c75e
am 26bf1a7c: Merge "Revert "Updating Roboto fonts with updated Cyrillic glyphs and fixes to tabular numerals. Bug:7198855,7070912"" into jb-mr1-dev
...
* commit '26bf1a7c75df4cab5b62ade6b17f90701f1f0ebf':
Revert "Updating Roboto fonts with updated Cyrillic glyphs and fixes to tabular numerals. Bug:7198855,7070912"
2012-10-05 12:20:09 -07:00
Justin Ho
26bf1a7c75
Merge "Revert "Updating Roboto fonts with updated Cyrillic glyphs and fixes to tabular numerals. Bug:7198855,7070912"" into jb-mr1-dev
2012-10-05 12:18:26 -07:00
Justin Ho
4f4dda69ee
am f4037ff4: Merge "Revert "Updated Roboto fonts with correct T comma accent encoding"" into jb-mr1-dev
...
* commit 'f4037ff4b7118ba495f6cb23a334e12978f9ef7e':
Revert "Updated Roboto fonts with correct T comma accent encoding"
2012-10-05 12:18:24 -07:00
Justin Ho
f4037ff4b7
Merge "Revert "Updated Roboto fonts with correct T comma accent encoding"" into jb-mr1-dev
2012-10-05 12:15:16 -07:00
Christopher Tate
61695ffcbc
Make sure settings writes are permission checked correctly
...
The last bit of undoing the earlier tangle around query results having
observers under the calling user's identity. We do *not* want to drop
calling identity in the call() processing; we want the table-based
permission checks at the point of the underlying db operations to be
performed against that identity.
Bug 7265610
Change-Id: Ie0c9331ebd0918262a0a32b5b03b876fc2a92ca3
2012-10-05 12:05:13 -07:00
Dianne Hackborn
bce0cbb40d
Fix issue #7275122 : Wall paper jank when switching users
...
Change-Id: I2677c7641a01b4afe89db29cb5fc1af876f9d078
2012-10-05 11:06:53 -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
Justin Ho
3aeeaaf7b7
Revert "Updating Roboto fonts with updated Cyrillic glyphs and fixes to tabular numerals. Bug:7198855,7070912"
...
This reverts commit 0baa38065a0e3912f03e930fdda2e22f4a1a8c64
Change-Id: I716db7239f21e9b65ab2557135726778768064ba
2012-10-05 10:50:14 -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
Justin Ho
f07b5a5a46
Revert "Updated Roboto fonts with correct T comma accent encoding"
...
This reverts commit 439b85ef9d9248c616ec474662edcd885618977c
Change-Id: I53ce11b21401402f68896cd211d5781414596361
2012-10-05 10:45:01 -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
John Spurlock
ed332658df
am 5db47e38: am fcfd3e68: Merge "Fix upgrade case for Settings.Secure.USER_SETUP_COMPLETE." into jb-mr1-dev
...
* commit '5db47e384c14ea20c580c34188afc916cbb39ccc':
Fix upgrade case for Settings.Secure.USER_SETUP_COMPLETE.
2012-10-05 10:35:28 -07:00
John Spurlock
5db47e384c
am fcfd3e68: Merge "Fix upgrade case for Settings.Secure.USER_SETUP_COMPLETE." into jb-mr1-dev
...
* commit 'fcfd3e68ab5979b096de9df7fee20db53d8d806c':
Fix upgrade case for Settings.Secure.USER_SETUP_COMPLETE.
2012-10-05 10:33:13 -07:00
John Spurlock
fcfd3e68ab
Merge "Fix upgrade case for Settings.Secure.USER_SETUP_COMPLETE." into jb-mr1-dev
2012-10-05 10:31:05 -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
Daniel Sandler
42d696f6ce
am 5a824f4b: am 5b5d31b1: Merge "Lubricate a sticky notification panel." into jb-mr1-dev
...
* commit '5a824f4b1e3217e9dc86e094660e519697ebff47':
Lubricate a sticky notification panel.
2012-10-05 10:03:03 -07:00
Daniel Sandler
5a824f4b1e
am 5b5d31b1: Merge "Lubricate a sticky notification panel." into jb-mr1-dev
...
* commit '5b5d31b19b0bffe6f52d0436ac329933e1acc5a7':
Lubricate a sticky notification panel.
2012-10-05 10:00:27 -07:00
Daniel Sandler
fc3d5a1d89
am a4b48330: am d7620196: Merge "Restore rubberbanding on initial pulldown." into jb-mr1-dev
...
* commit 'a4b48330def7700e01f5f4f9ef4402d21576bdfb':
Restore rubberbanding on initial pulldown.
2012-10-05 10:00:17 -07:00
Daniel Sandler
a4b48330de
am d7620196: Merge "Restore rubberbanding on initial pulldown." into jb-mr1-dev
...
* commit 'd7620196e512e71b552bda8df48125b73d1c95d8':
Restore rubberbanding on initial pulldown.
2012-10-05 09:58:46 -07:00
Daniel Sandler
5b5d31b19b
Merge "Lubricate a sticky notification panel." into jb-mr1-dev
2012-10-05 09:58:12 -07:00
Daniel Sandler
d7620196e5
Merge "Restore rubberbanding on initial pulldown." into jb-mr1-dev
2012-10-05 09:56:20 -07:00
Daniel Sandler
c38bbc391a
Lubricate a sticky notification panel.
...
If the panel was left open when the screen was turned off,
in some cases it might get stuck in an "open" state (the
panel's expanded height would be nonzero) although the
status bar window is in fact fully collapsed (due to
makeExpandedInvisible). The next time the user would go to
open the panel, things would be in an inconsistent state and
the panel wouldn't come down (on phones, the settings panel
would be attempted, but still nothing would happen).
This was easiest to reproduce on the keyguard (turn on
screen, pull down panel, turn off screen).
Bug: 7260868
Change-Id: Iec0000ba020e5a519eb5b4d42ac273b6689a18bd
2012-10-05 12:21:38 -04:00
John Spurlock
7f1c248e80
Fix upgrade case for Settings.Secure.USER_SETUP_COMPLETE.
...
Existing primary users were never being marked as complete,
causing things that relied on this (e.g. showing the quick settings panel)
to break.
Bug:7282088
Change-Id: I9c8622f3cd0fb99a44477946d3db22fa2cbbc6fc
2012-10-05 11:45:18 -04:00
The Android Open Source Project
726a7b920e
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ib437bf886b664c56e4165f6336e7bcc00c420b3a
2012-10-05 08:16:43 -07:00
Daniel Sandler
a801f68624
Restore rubberbanding on initial pulldown.
...
Broken by change Id93d6a00.
Bug: 7286201
Change-Id: I4155076df09d548aa00ae3793f78e6c154cde5f1
2012-10-05 11:01:05 -04:00
The Android Automerger
b62f227741
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-05 06:59:36 -07:00
Satoshi Kataoka
3ba439d648
Fix the issue on the input method switch picker
...
Bug: 7292731
Change-Id: I8cb51dd01e4c467fff511d4ecee79426f9b2ed80
2012-10-05 19:01:06 +09: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
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