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
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
John Spurlock
91ee32504b am ed332658: am 5db47e38: am fcfd3e68: Merge "Fix upgrade case for Settings.Secure.USER_SETUP_COMPLETE." into jb-mr1-dev 
* commit 'ed332658df2f7a89961842b560242cc6b859bd4b':
  Fix upgrade case for Settings.Secure.USER_SETUP_COMPLETE.
 2012-10-05 10:38:13 -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
a9a4eef71d am 42d696f6: am 5a824f4b: am 5b5d31b1: Merge "Lubricate a sticky notification panel." into jb-mr1-dev 
* commit '42d696f6ce92524eaca13dbe057efd7aaca1ca57':
  Lubricate a sticky notification panel.
 2012-10-05 10:04:52 -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
7a03775e6e am fc3d5a1d: am a4b48330: am d7620196: Merge "Restore rubberbanding on initial pulldown." into jb-mr1-dev 
* commit 'fc3d5a1d895bf8a0d6a1efcd7f2c46e99aba2499':
  Restore rubberbanding on initial pulldown.
 2012-10-05 10:02:12 -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
cf6edffb5b am 726a7b92: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '726a7b920e5ac97b75972aec58a3018294731232':
  No breadcrumbs for single-pane preferences
  Fix parceling of display info flags.
  Read in the disable-keyguard-features flag from the XML file
  Updating Roboto fonts with updated Cyrillic glyphs and fixes to tabular numerals. Bug:7198855,7070912
 2012-10-05 08:20:44 -07: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
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
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