OSDN Git Service

android-x86/frameworks-base.git
11 years agoam ffe3b5b8: Merge "Exempt the notification panel from animation lockout." into jb...
Daniel Sandler [Thu, 9 May 2013 18:30:58 +0000 (11:30 -0700)]
am ffe3b5b8: Merge "Exempt the notification panel from animation lockout." into jb-mr2-dev

* commit 'ffe3b5b89fa58f7b12a2fc690c89480fc16a9fd6':
  Exempt the notification panel from animation lockout.

11 years agoMerge "Exempt the notification panel from animation lockout." into jb-mr2-dev
Daniel Sandler [Thu, 9 May 2013 18:28:42 +0000 (18:28 +0000)]
Merge "Exempt the notification panel from animation lockout." into jb-mr2-dev

11 years agoam bee78812: Merge "Fix bug where we incorrectly clipped the bounds to the device...
Derek Sollenberger [Thu, 9 May 2013 18:26:29 +0000 (11:26 -0700)]
am bee78812: Merge "Fix bug where we incorrectly clipped the bounds to the device size." into jb-mr2-dev

* commit 'bee78812d0b3fc3d877ed0d954a0bb21ab7f2f3b':
  Fix bug where we incorrectly clipped the bounds to the device size.

11 years agoMerge "Fix bug where we incorrectly clipped the bounds to the device size." into...
Derek Sollenberger [Thu, 9 May 2013 18:23:56 +0000 (18:23 +0000)]
Merge "Fix bug where we incorrectly clipped the bounds to the device size." into jb-mr2-dev

11 years agoam dde8e539: Merge "Fix bug 8717690 Full-width Latin Letters Garbled on Tumblr App...
Raph Levien [Thu, 9 May 2013 18:07:33 +0000 (11:07 -0700)]
am dde8e539: Merge "Fix bug 8717690 Full-width Latin Letters Garbled on Tumblr App" into jb-mr2-dev

* commit 'dde8e539c3d76c98360e4cd1151cb15cba78a6b0':
  Fix bug 8717690 Full-width Latin Letters Garbled on Tumblr App

11 years agoMerge "Fix bug 8717690 Full-width Latin Letters Garbled on Tumblr App" into jb-mr2-dev
Raph Levien [Thu, 9 May 2013 18:04:39 +0000 (18:04 +0000)]
Merge "Fix bug 8717690 Full-width Latin Letters Garbled on Tumblr App" into jb-mr2-dev

11 years agoFix bug where we incorrectly clipped the bounds to the device size.
Derek Sollenberger [Thu, 9 May 2013 13:49:41 +0000 (09:49 -0400)]
Fix bug where we incorrectly clipped the bounds to the device size.

This CL also updates the documenation to make it clear that the API
returns in local space, not clipped to the size of the bitmap/device.

bug: 8747526
Change-Id: I389844672ce955341863f9940c3b401ab00dc1dc

11 years agoam 73094fbc: Merge "Don\'t allow non-authorized apps to access auth tokens" into...
Amith Yamasani [Thu, 9 May 2013 17:47:08 +0000 (10:47 -0700)]
am 73094fbc: Merge "Don\'t allow non-authorized apps to access auth tokens" into jb-mr2-dev

* commit '73094fbc23a4f6142f790f63b66ae5b553fb6e55':
  Don't allow non-authorized apps to access auth tokens

11 years agoMerge "Don't allow non-authorized apps to access auth tokens" into jb-mr2-dev
Amith Yamasani [Thu, 9 May 2013 17:43:16 +0000 (17:43 +0000)]
Merge "Don't allow non-authorized apps to access auth tokens" into jb-mr2-dev

11 years agoam 60ac308e: Merge "Defend against a system server crash." into jb-mr2-dev
Daniel Sandler [Thu, 9 May 2013 17:31:51 +0000 (10:31 -0700)]
am 60ac308e: Merge "Defend against a system server crash." into jb-mr2-dev

* commit '60ac308e1da302716fd6c5d805c513221039bac2':
  Defend against a system server crash.

11 years agoMerge "Defend against a system server crash." into jb-mr2-dev
Daniel Sandler [Thu, 9 May 2013 17:29:04 +0000 (17:29 +0000)]
Merge "Defend against a system server crash." into jb-mr2-dev

11 years agoam cb359697: Merge "DO NOT MERGE. Fix issue #8868003: Recents thumbnails scale....
Dianne Hackborn [Thu, 9 May 2013 17:23:08 +0000 (10:23 -0700)]
am cb359697: Merge "DO NOT MERGE.  Fix issue #8868003: Recents thumbnails scale..." into jb-mr2-dev

* commit 'cb35969708e88057bda7c54c7b3ac1d606ad95c5':
  DO NOT MERGE.  Fix issue #8868003: Recents thumbnails scale...

11 years agoMerge "DO NOT MERGE. Fix issue #8868003: Recents thumbnails scale..." into jb-mr2-dev
Dianne Hackborn [Thu, 9 May 2013 17:19:56 +0000 (17:19 +0000)]
Merge "DO NOT MERGE.  Fix issue #8868003: Recents thumbnails scale..." into jb-mr2-dev

11 years agoam 2c76016c: Merge "Fix error where clips/matrices are incorrectly transferred."...
Derek Sollenberger [Thu, 9 May 2013 12:02:52 +0000 (05:02 -0700)]
am 2c76016c: Merge "Fix error where clips/matrices are incorrectly transferred." into jb-mr2-dev

* commit '2c76016cbc1e426ab30d322745dfb6d4e6784138':
  Fix error where clips/matrices are incorrectly transferred.

11 years agoMerge "Fix error where clips/matrices are incorrectly transferred." into jb-mr2-dev
Derek Sollenberger [Thu, 9 May 2013 11:59:47 +0000 (11:59 +0000)]
Merge "Fix error where clips/matrices are incorrectly transferred." into jb-mr2-dev

11 years agoDO NOT MERGE. Fix issue #8868003: Recents thumbnails scale...
Dianne Hackborn [Wed, 8 May 2013 22:51:26 +0000 (15:51 -0700)]
DO NOT MERGE.  Fix issue #8868003: Recents thumbnails scale...

...+ zoom to wrong place

We need to make sure the overscan insets are never negative.

Change-Id: I6ca82acc2a6c887085a5d14d03a55ea78451e4b6

11 years agoam 5d6dc425: Merge "Filter out dangerous CharSequences in Notification." into jb...
Daniel Sandler [Thu, 9 May 2013 00:30:43 +0000 (17:30 -0700)]
am 5d6dc425: Merge "Filter out dangerous CharSequences in Notification." into jb-mr2-dev

* commit '5d6dc425287e5651e3a1fdc32591b8791dd9dd18':
  Filter out dangerous CharSequences in Notification.

11 years agoMerge "Filter out dangerous CharSequences in Notification." into jb-mr2-dev
Daniel Sandler [Thu, 9 May 2013 00:28:11 +0000 (00:28 +0000)]
Merge "Filter out dangerous CharSequences in Notification." into jb-mr2-dev

11 years agoam cfb09fac: Merge "The default home intent needs CATEGORY_DEFAULT" into jb-mr2-dev
Christopher Tate [Wed, 8 May 2013 23:13:20 +0000 (16:13 -0700)]
am cfb09fac: Merge "The default home intent needs CATEGORY_DEFAULT" into jb-mr2-dev

* commit 'cfb09fac73716291468b61f20ee1b7818d1dcfd1':
  The default home intent needs CATEGORY_DEFAULT

11 years agoMerge "The default home intent needs CATEGORY_DEFAULT" into jb-mr2-dev
Christopher Tate [Wed, 8 May 2013 23:09:49 +0000 (23:09 +0000)]
Merge "The default home intent needs CATEGORY_DEFAULT" into jb-mr2-dev

11 years agoam 4550dba5: Merge "Add wifi association test" into jb-mr2-dev
Xia Wang [Wed, 8 May 2013 22:21:12 +0000 (15:21 -0700)]
am 4550dba5: Merge "Add wifi association test" into jb-mr2-dev

* commit '4550dba53d49a689de6000e5e5864c28f91dd945':
  Add wifi association test

11 years agoMerge "Add wifi association test" into jb-mr2-dev
Xia Wang [Wed, 8 May 2013 22:17:35 +0000 (22:17 +0000)]
Merge "Add wifi association test" into jb-mr2-dev

11 years agoam 0dd85e4e: Merge "Dynamically togglable accessibility features improperly handled...
Svetoslav [Wed, 8 May 2013 21:37:03 +0000 (14:37 -0700)]
am 0dd85e4e: Merge "Dynamically togglable accessibility features improperly handled." into jb-mr2-dev

* commit '0dd85e4e99466709049ba913241612b6678732ca':
  Dynamically togglable accessibility features improperly handled.

11 years agoMerge "Dynamically togglable accessibility features improperly handled." into jb...
Svetoslav [Wed, 8 May 2013 21:33:43 +0000 (21:33 +0000)]
Merge "Dynamically togglable accessibility features improperly handled." into jb-mr2-dev

11 years agoam 35b7b0b8: Merge "Add system setting key for dialpad autocomplete" into jb-mr2-dev
Yorke Lee [Wed, 8 May 2013 21:33:31 +0000 (14:33 -0700)]
am 35b7b0b8: Merge "Add system setting key for dialpad autocomplete" into jb-mr2-dev

* commit '35b7b0b80000774b503f7d06bf3685836f22608f':
  Add system setting key for dialpad autocomplete

11 years agoMerge "Add system setting key for dialpad autocomplete" into jb-mr2-dev
Yorke Lee [Wed, 8 May 2013 21:29:38 +0000 (21:29 +0000)]
Merge "Add system setting key for dialpad autocomplete" into jb-mr2-dev

11 years agoam 6dee0a0f: Merge "Fix bug where thumbnails flashed more often in Recents" into...
Michael Jurka [Wed, 8 May 2013 21:10:44 +0000 (14:10 -0700)]
am 6dee0a0f: Merge "Fix bug where thumbnails flashed more often in Recents" into jb-mr2-dev

* commit '6dee0a0fe68096a6714b7d570241f61e4d6ea20a':
  Fix bug where thumbnails flashed more often in Recents

11 years agoMerge "Fix bug where thumbnails flashed more often in Recents" into jb-mr2-dev
Michael Jurka [Wed, 8 May 2013 21:07:21 +0000 (21:07 +0000)]
Merge "Fix bug where thumbnails flashed more often in Recents" into jb-mr2-dev

11 years agoFilter out dangerous CharSequences in Notification.
Daniel Sandler [Fri, 26 Apr 2013 20:23:09 +0000 (16:23 -0400)]
Filter out dangerous CharSequences in Notification.

If an app mistakenly puts some Parcelable implementation of
CharSequence in here, Bundle will try to marshal the derived
class, which is going to be bad news when we try to unparcel
it in another process.

Additionally add a proper stack trace to unparceling
failures (otherwise you have no idea where the bad parcel
was being used).

Bug: 8725271
Change-Id: Ide19b986d65c7f47929cf2dde4e62b762c469fee

11 years agoam 214cb0d4: am a086a70e: am 3f4d1bbd: am 52a37bf8: am 1d21aeca: am 148ce232: Merge...
Scott Main [Wed, 8 May 2013 20:14:30 +0000 (13:14 -0700)]
am 214cb0d4: am a086a70e: am 3f4d1bbd: am 52a37bf8: am 1d21aeca: am 148ce232: Merge "delete obsolete tips/references to cupcake" into jb-mr1.1-docs

* commit '214cb0d489a82b6cbe8a7c5ce8efbb77e985c166':
  delete obsolete tips/references to cupcake

11 years agoam a086a70e: am 3f4d1bbd: am 52a37bf8: am 1d21aeca: am 148ce232: Merge "delete obsole...
Scott Main [Wed, 8 May 2013 20:11:13 +0000 (13:11 -0700)]
am a086a70e: am 3f4d1bbd: am 52a37bf8: am 1d21aeca: am 148ce232: Merge "delete obsolete tips/references to cupcake" into jb-mr1.1-docs

* commit 'a086a70ecb6ca47831a6f5a60fb5d11df131d6bf':
  delete obsolete tips/references to cupcake

11 years agoam 3f4d1bbd: am 52a37bf8: am 1d21aeca: am 148ce232: Merge "delete obsolete tips/refer...
Scott Main [Wed, 8 May 2013 20:04:26 +0000 (13:04 -0700)]
am 3f4d1bbd: am 52a37bf8: am 1d21aeca: am 148ce232: Merge "delete obsolete tips/references to cupcake" into jb-mr1.1-docs

* commit '3f4d1bbddba1034af342a95b35a223615ad8bbbd':
  delete obsolete tips/references to cupcake

11 years agoam 52a37bf8: am 1d21aeca: am 148ce232: Merge "delete obsolete tips/references to...
Scott Main [Wed, 8 May 2013 20:01:51 +0000 (13:01 -0700)]
am 52a37bf8: am 1d21aeca: am 148ce232: Merge "delete obsolete tips/references to cupcake" into jb-mr1.1-docs

* commit '52a37bf8ab96c8ef897c4c35e33b4bbe6513de9f':
  delete obsolete tips/references to cupcake

11 years agoam 1d21aeca: am 148ce232: Merge "delete obsolete tips/references to cupcake" into...
Scott Main [Wed, 8 May 2013 19:59:29 +0000 (12:59 -0700)]
am 1d21aeca: am 148ce232: Merge "delete obsolete tips/references to cupcake" into jb-mr1.1-docs

* commit '1d21aeca286cb3993ed758fd111a7d945687ed96':
  delete obsolete tips/references to cupcake

11 years agoExempt the notification panel from animation lockout.
Daniel Sandler [Wed, 8 May 2013 19:57:06 +0000 (15:57 -0400)]
Exempt the notification panel from animation lockout.

We do a lot of launch-app-then-collapse, and it's a game to
see whether the app's window activity animation starts
before the panel has a chance to finish collapsing.

The winning move here is not to play.

Requires change I2773601d in f/b.
Bug: 8666124

Change-Id: I3e3f1c5a4a505ad7d487c804139445ffd499d8d4

11 years agoDon't allow non-authorized apps to access auth tokens
Amith Yamasani [Wed, 8 May 2013 19:57:01 +0000 (12:57 -0700)]
Don't allow non-authorized apps to access auth tokens

For restricted profiles, if an app tries to guess an account name and
requests an auth token, even though the framework is going to prompt
for permission, it could be authorized by someone who can't read.

If the app is not opting in to see accounts, don't let it get auth tokens
by verifying first that it's in the list of known accounts.

Bug: 8736380
Change-Id: I6caf88cfe14aa1023d55bcb28ad80ccd89eeb79b

11 years agoam 148ce232: Merge "delete obsolete tips/references to cupcake" into jb-mr1.1-docs
Scott Main [Wed, 8 May 2013 19:56:53 +0000 (12:56 -0700)]
am 148ce232: Merge "delete obsolete tips/references to cupcake" into jb-mr1.1-docs

* commit '148ce2322c5ce119b2dc6881d60dc60f8c336bfa':
  delete obsolete tips/references to cupcake

11 years agoMerge "delete obsolete tips/references to cupcake" into jb-mr1.1-docs
Scott Main [Wed, 8 May 2013 19:50:52 +0000 (19:50 +0000)]
Merge "delete obsolete tips/references to cupcake" into jb-mr1.1-docs

11 years agoAdd system setting key for dialpad autocomplete
Yorke Lee [Tue, 7 May 2013 17:49:44 +0000 (10:49 -0700)]
Add system setting key for dialpad autocomplete

Bug 8840243

Change-Id: Ib1fd631c8717dad2305e3507391cb2d96be2a847

11 years agoFix bug where thumbnails flashed more often in Recents
Michael Jurka [Wed, 8 May 2013 16:00:04 +0000 (18:00 +0200)]
Fix bug where thumbnails flashed more often in Recents

Bug: 8867698

Change-Id: I2773601d83507dbb55c3a1d0b723e3853e22d352

11 years agoAdd wifi association test
Xia Wang [Fri, 3 May 2013 04:19:40 +0000 (21:19 -0700)]
Add wifi association test

Change-Id: I1f3f49a1857835522c9c5e02ed4f530b83df1d02

11 years agoam 366b97ba: Merge "Fix bug #8839681 Reversed Textbox focus order on RTL and android...
Fabrice Di Meglio [Wed, 8 May 2013 18:17:25 +0000 (11:17 -0700)]
am 366b97ba: Merge "Fix bug #8839681 Reversed Textbox focus order on RTL and android:imeOptions="flagNoExtractUi"" into jb-mr2-dev

* commit '366b97ba25de237c42c815c5e8ca36303ce104df':
  Fix bug #8839681 Reversed Textbox focus order on RTL and android:imeOptions="flagNoExtractUi"

11 years agoam d7bf6d46: Merge "Fix bug #8846648 Reduce unnecessary drawing & GC in NetworkContro...
Fabrice Di Meglio [Wed, 8 May 2013 18:17:23 +0000 (11:17 -0700)]
am d7bf6d46: Merge "Fix bug #8846648 Reduce unnecessary drawing & GC in NetworkController/SignalClusterView" into jb-mr2-dev

* commit 'd7bf6d46bd636991885662da5e710b1cf08a44d8':
  Fix bug #8846648 Reduce unnecessary drawing & GC in NetworkController/SignalClusterView

11 years agoDynamically togglable accessibility features improperly handled.
Svetoslav [Wed, 8 May 2013 18:13:11 +0000 (11:13 -0700)]
Dynamically togglable accessibility features improperly handled.

Touch exploration and enhanced web accessibility can be toggled at
run time. However, the code that updates the state of these features
was not properly doing that. In particular, it did not write to the
settings if the feature gets disabled. Now the logic is much cleaner.
If there is a service that can request and requests a feature and
the feature is not enabled, we enabled it, otherwise the feature is
disabled.

bug:8790771

Change-Id: I218dfa12fd02220c94940b54f42bed578811a794

11 years agoMerge "Fix bug #8839681 Reversed Textbox focus order on RTL and android:imeOptions...
Fabrice Di Meglio [Wed, 8 May 2013 17:56:17 +0000 (17:56 +0000)]
Merge "Fix bug #8839681 Reversed Textbox focus order on RTL and android:imeOptions="flagNoExtractUi"" into jb-mr2-dev

11 years agoMerge "Fix bug #8846648 Reduce unnecessary drawing & GC in NetworkController/SignalCl...
Fabrice Di Meglio [Wed, 8 May 2013 17:50:18 +0000 (17:50 +0000)]
Merge "Fix bug #8846648 Reduce unnecessary drawing & GC in NetworkController/SignalClusterView" into jb-mr2-dev

11 years agoam 3cf3a0b3: Merge "Fix for TTS.setLanguage throwing MissingResourceException" into...
Fergus Henderson [Wed, 8 May 2013 17:47:56 +0000 (10:47 -0700)]
am 3cf3a0b3: Merge "Fix for TTS.setLanguage throwing MissingResourceException" into jb-mr2-dev

* commit '3cf3a0b30cd3d3be806eeb04861731d7ed6e6f23':
  Fix for TTS.setLanguage throwing MissingResourceException

11 years agoam a698a290: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 8 May 2013 17:47:52 +0000 (10:47 -0700)]
am a698a290: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit 'a698a29021934b7bf6e468e2949b05c79b268b05':
  Import translations. DO NOT MERGE

11 years agoMerge "Fix for TTS.setLanguage throwing MissingResourceException" into jb-mr2-dev
Fergus Henderson [Wed, 8 May 2013 17:42:00 +0000 (17:42 +0000)]
Merge "Fix for TTS.setLanguage throwing MissingResourceException" into jb-mr2-dev

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 8 May 2013 17:36:22 +0000 (17:36 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 8 May 2013 15:21:20 +0000 (08:21 -0700)]
Import translations. DO NOT MERGE

Change-Id: Id91ccb35503df68ecc0c3f59c1601e0adf74e876
Auto-generated-cl: translation import

11 years agoFix error where clips/matrices are incorrectly transferred.
Derek Sollenberger [Wed, 8 May 2013 14:59:47 +0000 (10:59 -0400)]
Fix error where clips/matrices are incorrectly transferred.

In these cases the caller passes in a NULL bitmap and expects it
to clear the canvas state. This change preserves that behavior.

bug: 8738494
Change-Id: I7ebf6a74bab3c2822849a3404de3828fec8d3084

11 years agoFix for TTS.setLanguage throwing MissingResourceException
Przemyslaw Szczepaniak [Wed, 8 May 2013 14:26:15 +0000 (15:26 +0100)]
Fix for TTS.setLanguage throwing MissingResourceException

Change I766f106b9165932de17de84bdd422d0fc0ae27f1 made getISO3*
methods throw MissingResourceException if locale was invalid.
This causes regression on last android release, where invalid
locale was silently ignored.

+ fix for .isLanguageAvailable

Bug: 8709594
Change-Id: Ieada6b90dc53cfdf0a4e2b4ca69854b811d0fec2

11 years agoam acd341d8: Merge "OO NOT MERGE allow connected location providers location access...
Victoria Lease [Wed, 8 May 2013 14:41:56 +0000 (07:41 -0700)]
am acd341d8: Merge "OO NOT MERGE allow connected location providers location access" into jb-mr2-dev

* commit 'acd341d8682ca57c1066d664725ebc72f5ef10c1':
  OO NOT MERGE allow connected location providers location access

11 years agoMerge "OO NOT MERGE allow connected location providers location access" into jb-mr2-dev
Victoria Lease [Wed, 8 May 2013 14:40:15 +0000 (14:40 +0000)]
Merge "OO NOT MERGE allow connected location providers location access" into jb-mr2-dev

11 years agoThe default home intent needs CATEGORY_DEFAULT
Christopher Tate [Wed, 8 May 2013 01:47:38 +0000 (18:47 -0700)]
The default home intent needs CATEGORY_DEFAULT

Because the resolve activity always assumes CATEGORY_DEFAULT, there are odd
cases where apps with malformed intent filters wind up interfering with
users' ability to specify a preferred launcher app.

Bug 8805220

Change-Id: I4c1295dc844e442eec6efd603ce11b673879dd5a

11 years agoam d28653df: Merge "Add the trace tag for Dalvik." into jb-mr2-dev
Jamie Gennis [Wed, 8 May 2013 01:23:20 +0000 (18:23 -0700)]
am d28653df: Merge "Add the trace tag for Dalvik." into jb-mr2-dev

* commit 'd28653df6580b76559374580764aa2e86d6c2f48':
  Add the trace tag for Dalvik.

11 years agoMerge "Add the trace tag for Dalvik." into jb-mr2-dev
Jamie Gennis [Wed, 8 May 2013 01:21:33 +0000 (01:21 +0000)]
Merge "Add the trace tag for Dalvik." into jb-mr2-dev

11 years agoam 239a0c0e: Ensure ViewRootImpl.setAccessibilityFocus() doesn\'t crash when reentrant.
Alan Viverette [Wed, 8 May 2013 00:43:18 +0000 (17:43 -0700)]
am 239a0c0e: Ensure ViewRootImpl.setAccessibilityFocus() doesn\'t crash when reentrant.

* commit '239a0c0e6a6fc36025fdb1c662e1c7acaec144bb':
  Ensure ViewRootImpl.setAccessibilityFocus() doesn't crash when reentrant.

11 years agoEnsure ViewRootImpl.setAccessibilityFocus() doesn't crash when reentrant.
Alan Viverette [Wed, 8 May 2013 00:17:35 +0000 (17:17 -0700)]
Ensure ViewRootImpl.setAccessibilityFocus() doesn't crash when reentrant.

Internal state must be cleared before calling any methods on the focus
host, since the method may be called again from the host and attempt to
recycle the same AccessibilityNodeInfo twice.

BUG: 8856860
Change-Id: I0410989fd6f3ce3ce29de8edebdfbf3847188843

11 years agoam 81a8bb1c: am 0974061e: (-s ours) am 1181564f: am 42fb3abd: DO NOT MERGE. cherrypic...
Xavier Ducrohet [Tue, 7 May 2013 23:13:25 +0000 (16:13 -0700)]
am 81a8bb1c: am 0974061e: (-s ours) am 1181564f: am 42fb3abd: DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be

* commit '81a8bb1ca9df314faf6de09cc2da0a1db70c7391':
  DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be

11 years agoam 0974061e: (-s ours) am 1181564f: am 42fb3abd: DO NOT MERGE. cherrypick from I3653f...
Xavier Ducrohet [Tue, 7 May 2013 23:12:14 +0000 (16:12 -0700)]
am 0974061e: (-s ours) am 1181564f: am 42fb3abd: DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be

* commit '0974061e941f3aa8c3c5c71ca996be5f93a6a865':
  DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be

11 years agoam 1181564f: am 42fb3abd: DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1...
Xavier Ducrohet [Tue, 7 May 2013 23:05:58 +0000 (16:05 -0700)]
am 1181564f: am 42fb3abd: DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be

* commit '1181564fc482171c4c9a84b3c7c1f06ca6eaf2b6':
  DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be

11 years agoam 42fb3abd: DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
Xavier Ducrohet [Tue, 7 May 2013 23:03:31 +0000 (16:03 -0700)]
am 42fb3abd: DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be

* commit '42fb3abd4b7463626983c1a2768788c901f2e71a':
  DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be

11 years agoFix bug #8839681 Reversed Textbox focus order on RTL and android:imeOptions="flagNoEx...
Fabrice Di Meglio [Tue, 7 May 2013 22:39:55 +0000 (15:39 -0700)]
Fix bug #8839681 Reversed Textbox focus order on RTL and android:imeOptions="flagNoExtractUi"

- make SequentialFocusComparator RTL-aware

Change-Id: I3d9cc81f777d16933a8e1b69f8ed63efa5be0925

11 years agoam 02f7f449: Merge "Correct java API docs for MediaDrm offline use case" into jb...
Jeff Tinker [Tue, 7 May 2013 22:38:40 +0000 (15:38 -0700)]
am 02f7f449: Merge "Correct java API docs for MediaDrm offline use case" into jb-mr2-dev

* commit '02f7f449739ae3429b0bf834cebcb2b1bcade8c1':
  Correct java API docs for MediaDrm offline use case

11 years agoDO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
Xavier Ducrohet [Fri, 21 Dec 2012 17:54:02 +0000 (09:54 -0800)]
DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be

Add single crunch command to aapt. do not merge.

Previously the crunch command would work on a full res folder
and output a full res folder (with only the drawables). This
was only used in the SDK.

The incremental logic is moved to the SDK build system so we
change the crunch command (or rather add a new one) to only
crunch a single file.

(cherry picked from commit b1f6ad82dd8d1702617a757a88430604b3131fac)

Change-Id: Ifa0dceed93708658f950322f36c13b6ebe7ab0f3

11 years agoMerge "Correct java API docs for MediaDrm offline use case" into jb-mr2-dev
Jeff Tinker [Tue, 7 May 2013 22:36:50 +0000 (22:36 +0000)]
Merge "Correct java API docs for MediaDrm offline use case" into jb-mr2-dev

11 years agoOO NOT MERGE allow connected location providers location access
Victoria Lease [Tue, 7 May 2013 21:22:02 +0000 (14:22 -0700)]
OO NOT MERGE allow connected location providers location access

Cherry-pick of I0c383eb82ed041e57a7d32321df2d67b462d4e21 from master

Oops, it seems the fused location provider was being denied access
to locations when any user other than the primary device owner is
logged in. This was breaking the fused location provider entirely
for all secondary users of a given device.

Bug: 8766225
Change-Id: Ic0db5f2094828c897a405abb0dca6ac39a2ca526

11 years agoAdd the trace tag for Dalvik.
Jamie Gennis [Tue, 7 May 2013 22:22:31 +0000 (15:22 -0700)]
Add the trace tag for Dalvik.

Bug: 8856374
Change-Id: Id0fbdb8f7a487c5831edcd2c6c64a7da63aec03d

11 years agoCorrect java API docs for MediaDrm offline use case
Jeff Tinker [Tue, 7 May 2013 21:51:17 +0000 (14:51 -0700)]
Correct java API docs for MediaDrm offline use case

Documentation only change, no APIs are affected

Change-Id: I4f3978751928de503f51afa77e0983d4c385ff7b
related-to-bug: 8621588

11 years agoam e2322bdd: Merge "Don\'t back up the scan-always setting." into jb-mr2-dev
Robert Greenwalt [Tue, 7 May 2013 20:48:49 +0000 (13:48 -0700)]
am e2322bdd: Merge "Don\'t back up the scan-always setting." into jb-mr2-dev

* commit 'e2322bdd7865552aa31f93bbf4e60d4d9a7d0973':
  Don't back up the scan-always setting.

11 years agoMerge "Don't back up the scan-always setting." into jb-mr2-dev
Robert Greenwalt [Tue, 7 May 2013 20:45:03 +0000 (20:45 +0000)]
Merge "Don't back up the scan-always setting." into jb-mr2-dev

11 years agoFix bug #8846648 Reduce unnecessary drawing & GC in NetworkController/SignalClusterView
Fabrice Di Meglio [Tue, 7 May 2013 18:32:51 +0000 (11:32 -0700)]
Fix bug #8846648 Reduce unnecessary drawing & GC in NetworkController/SignalClusterView

- use onRtlPropertiesChanged(int) callback for resetting drawables

Change-Id: I53eaa1fe6a211d89e2f2a9581631fb39c7c243c3

11 years agoDon't back up the scan-always setting.
Robert Greenwalt [Tue, 7 May 2013 19:33:15 +0000 (12:33 -0700)]
Don't back up the scan-always setting.

We ask the user during device setup to configure this setting -
if we then restore from backup we clobber what they just selected.

Instead, just let them chose during setup and don't back it up.

bug:8825150
Change-Id: I3f2b2291c86a4008bb8ea2468164d9c6c673cbb0

11 years agoam 84ce55cf: Merge "Don\'t limit the overscan frame to the window frame." into jb...
Craig Mautner [Tue, 7 May 2013 19:32:50 +0000 (12:32 -0700)]
am 84ce55cf: Merge "Don\'t limit the overscan frame to the window frame." into jb-mr2-dev

* commit '84ce55cfd50bdfc7054de5ee9f69de7cf08b61ae':
  Don't limit the overscan frame to the window frame.

11 years agoMerge "Don't limit the overscan frame to the window frame." into jb-mr2-dev
Craig Mautner [Tue, 7 May 2013 19:24:56 +0000 (19:24 +0000)]
Merge "Don't limit the overscan frame to the window frame." into jb-mr2-dev

11 years agoam aa64548d: Merge "Fixed unreleased wake lock isues and NPE." into jb-mr2-dev
Zhentao Sun [Tue, 7 May 2013 18:44:46 +0000 (11:44 -0700)]
am aa64548d: Merge "Fixed unreleased wake lock isues and NPE." into jb-mr2-dev

* commit 'aa64548d9f7ee0d3378bc62657e0b86d486038d6':
  Fixed unreleased wake lock isues and NPE.

11 years agoMerge "Fixed unreleased wake lock isues and NPE." into jb-mr2-dev
Zhentao Sun [Tue, 7 May 2013 18:43:24 +0000 (18:43 +0000)]
Merge "Fixed unreleased wake lock isues and NPE." into jb-mr2-dev

11 years agoDon't limit the overscan frame to the window frame.
Craig Mautner [Tue, 7 May 2013 18:41:27 +0000 (11:41 -0700)]
Don't limit the overscan frame to the window frame.

Fixes bug 8829372.

Change-Id: I803ae60fcc38649c0a7a9cb39429333755e47e2b

11 years agoDefend against a system server crash.
Daniel Sandler [Tue, 7 May 2013 17:53:47 +0000 (13:53 -0400)]
Defend against a system server crash.

Bug: 8575629
Change-Id: Iafc8ab2f7460c8eacc37fc077cf5a3df16cf2911

11 years agoam 0c99050e: am 9207be90: am b80b4bfd: am 3c8ecd30: am b2606b3f: am c98612a9: some...
Scott Main [Tue, 7 May 2013 17:25:11 +0000 (10:25 -0700)]
am 0c99050e: am 9207be90: am b80b4bfd: am 3c8ecd30: am b2606b3f: am c98612a9: some more search tags

* commit '0c99050eb3114d9ebe6e44e353de1ed6a8822558':
  some more search tags

11 years agoam 9207be90: am b80b4bfd: am 3c8ecd30: am b2606b3f: am c98612a9: some more search...
Scott Main [Tue, 7 May 2013 17:23:17 +0000 (10:23 -0700)]
am 9207be90: am b80b4bfd: am 3c8ecd30: am b2606b3f: am c98612a9: some more search tags

* commit '9207be9078a59ecd93073e6892c5c75b47b342d6':
  some more search tags

11 years agoam b80b4bfd: am 3c8ecd30: am b2606b3f: am c98612a9: some more search tags
Scott Main [Tue, 7 May 2013 17:20:58 +0000 (10:20 -0700)]
am b80b4bfd: am 3c8ecd30: am b2606b3f: am c98612a9: some more search tags

* commit 'b80b4bfdae8d9eb7e8ad6c7a44f92d9fd2b9e6d9':
  some more search tags

11 years agoam 3c8ecd30: am b2606b3f: am c98612a9: some more search tags
Scott Main [Tue, 7 May 2013 17:19:04 +0000 (10:19 -0700)]
am 3c8ecd30: am b2606b3f: am c98612a9: some more search tags

* commit '3c8ecd30b41511b84c13c341e2b471a81e19e875':
  some more search tags

11 years agoam b2606b3f: am c98612a9: some more search tags
Scott Main [Tue, 7 May 2013 17:16:40 +0000 (10:16 -0700)]
am b2606b3f: am c98612a9: some more search tags

* commit 'b2606b3fe8906fb14db07b5dc099ff0b52db4c29':
  some more search tags

11 years agoam c98612a9: some more search tags
Scott Main [Tue, 7 May 2013 17:15:11 +0000 (10:15 -0700)]
am c98612a9: some more search tags

* commit 'c98612a9b2293f8ae29389dd484d7b384c7d37ad':
  some more search tags

11 years agosome more search tags
Scott Main [Wed, 24 Apr 2013 18:43:41 +0000 (11:43 -0700)]
some more search tags

Change-Id: Id48d3214619e5d860e39e8f1d9d814e17956feb1

11 years agoam 4c95c537: Merge "Optimize list view scrolls Bug #8108706" into jb-mr2-dev
Romain Guy [Tue, 7 May 2013 02:09:25 +0000 (19:09 -0700)]
am 4c95c537: Merge "Optimize list view scrolls Bug #8108706" into jb-mr2-dev

* commit '4c95c5377a75a3d6c5f3ed8b09a56071d51fadb1':
  Optimize list view scrolls Bug #8108706

11 years agoMerge "Optimize list view scrolls Bug #8108706" into jb-mr2-dev
Romain Guy [Tue, 7 May 2013 02:05:37 +0000 (02:05 +0000)]
Merge "Optimize list view scrolls Bug #8108706" into jb-mr2-dev

11 years agoam a6303d8a: am 67430e8e: am 2e52e815: am 6b6fd9d1: am 36aa2759: am b582c678: Doc...
Dirk Dougherty [Tue, 7 May 2013 01:51:11 +0000 (18:51 -0700)]
am a6303d8a: am 67430e8e: am 2e52e815: am 6b6fd9d1: am 36aa2759: am b582c678: Doc change: delete legacy intl dir and update toc\'s for devsite-compatible lang strings.

* commit 'a6303d8a211543a8e1f5fd2425024a1c4d0f88ff':
  Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.

11 years agoam 67430e8e: am 2e52e815: am 6b6fd9d1: am 36aa2759: am b582c678: Doc change: delete...
Dirk Dougherty [Tue, 7 May 2013 01:49:14 +0000 (18:49 -0700)]
am 67430e8e: am 2e52e815: am 6b6fd9d1: am 36aa2759: am b582c678: Doc change: delete legacy intl dir and update toc\'s for devsite-compatible lang strings.

* commit '67430e8ec735c83f1f3304da7037e518aef6128a':
  Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.

11 years agoam 2e52e815: am 6b6fd9d1: am 36aa2759: am b582c678: Doc change: delete legacy intl...
Dirk Dougherty [Tue, 7 May 2013 01:47:29 +0000 (18:47 -0700)]
am 2e52e815: am 6b6fd9d1: am 36aa2759: am b582c678: Doc change: delete legacy intl dir and update toc\'s for devsite-compatible lang strings.

* commit '2e52e815b009fcabb407b9bd0363e0eced6c0229':
  Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.

11 years agoam 6b6fd9d1: am 36aa2759: am b582c678: Doc change: delete legacy intl dir and update...
Dirk Dougherty [Tue, 7 May 2013 01:44:53 +0000 (18:44 -0700)]
am 6b6fd9d1: am 36aa2759: am b582c678: Doc change: delete legacy intl dir and update toc\'s for devsite-compatible lang strings.

* commit '6b6fd9d1f0c829b1bd23c776b98f564848731ea2':
  Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.

11 years agoam 36aa2759: am b582c678: Doc change: delete legacy intl dir and update toc\'s for...
Dirk Dougherty [Tue, 7 May 2013 01:43:20 +0000 (18:43 -0700)]
am 36aa2759: am b582c678: Doc change: delete legacy intl dir and update toc\'s for devsite-compatible lang strings.

* commit '36aa2759998cbfff7e5baff8b422cbeebd95d5db':
  Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.

11 years agoOptimize list view scrolls
Romain Guy [Tue, 7 May 2013 01:42:08 +0000 (18:42 -0700)]
Optimize list view scrolls
Bug #8108706

Change-Id: I8679b584132e82b7bb3301a38800de4ddfc57be6

11 years agoam b582c678: Doc change: delete legacy intl dir and update toc\'s for devsite-compati...
Dirk Dougherty [Tue, 7 May 2013 01:41:31 +0000 (18:41 -0700)]
am b582c678: Doc change: delete legacy intl dir and update toc\'s for devsite-compatible lang strings.

* commit 'b582c678c88df2848023b7f27f4bc0ab2249e1e1':
  Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.

11 years agoDoc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.
Dirk Dougherty [Sat, 4 May 2013 17:54:52 +0000 (10:54 -0700)]
Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.

Change-Id: Ie390d2bbd8abc0d063c1f313797e8c3d21d27490

11 years agoam a4d7214d: am 12829256: am 13ae720b: am e7ae74f1: am 5bde4bc5: am 1cd65b30: delete...
Scott Main [Tue, 7 May 2013 00:44:33 +0000 (17:44 -0700)]
am a4d7214d: am 12829256: am 13ae720b: am e7ae74f1: am 5bde4bc5: am 1cd65b30: delete a few unused/obsolete files and add redirects

* commit 'a4d7214dbebfbab151023bea52b5dfe166b058e0':
  delete a few unused/obsolete files and add redirects

11 years agoam 12829256: am 13ae720b: am e7ae74f1: am 5bde4bc5: am 1cd65b30: delete a few unused...
Scott Main [Tue, 7 May 2013 00:33:52 +0000 (17:33 -0700)]
am 12829256: am 13ae720b: am e7ae74f1: am 5bde4bc5: am 1cd65b30: delete a few unused/obsolete files and add redirects

* commit '1282925654f82e6df7a1fb0503de36ee951c126d':
  delete a few unused/obsolete files and add redirects