OSDN Git Service

android-x86/frameworks-base.git
12 years agoLockScreen: don't update KeyStore password on unlock
Kenny Root [Fri, 21 Sep 2012 22:00:25 +0000 (15:00 -0700)]
LockScreen: don't update KeyStore password on unlock

The Gingerbread migration case updated the password when the user
unlocked their device. This is probably not needed anymore and disturbs
multi-user, so just remove it.

Bug: 7169463
Change-Id: Ie62eb9f3fee6953b1123cb7ef3665d519632c6f7

12 years agoMerge "Push dropbox logging into libcore." into jb-mr1-dev
Geremy Condra [Thu, 20 Sep 2012 18:23:42 +0000 (11:23 -0700)]
Merge "Push dropbox logging into libcore." into jb-mr1-dev

12 years agoMerge "Remove pointless exception supression." into jb-mr1-dev
Geremy Condra [Thu, 20 Sep 2012 18:22:14 +0000 (11:22 -0700)]
Merge "Remove pointless exception supression." into jb-mr1-dev

12 years agoMerge "Add multi user volume management" into jb-mr1-dev
Eric Laurent [Thu, 20 Sep 2012 18:18:17 +0000 (11:18 -0700)]
Merge "Add multi user volume management" into jb-mr1-dev

12 years agoMerge "Remove logging for old version mismatches." into jb-mr1-dev
Geremy Condra [Thu, 20 Sep 2012 17:33:03 +0000 (10:33 -0700)]
Merge "Remove logging for old version mismatches." into jb-mr1-dev

12 years agoMerge "Fix DPI scaling on TVDPI" into jb-mr1-dev
John Reck [Thu, 20 Sep 2012 17:21:40 +0000 (10:21 -0700)]
Merge "Fix DPI scaling on TVDPI" into jb-mr1-dev

12 years agoMerge changes I87c2ab9e,I2dafcc34,I731c96c2 into jb-mr1-dev
Elliott Hughes [Thu, 20 Sep 2012 17:05:43 +0000 (10:05 -0700)]
Merge changes I87c2ab9e,I2dafcc34,I731c96c2 into jb-mr1-dev

* changes:
  Fix formatDateRange month names for Farsi.
  Use localized digits for Time formatting.
  Use proper digits in formatElapsedTime and format3339

12 years agoMerge "Add tests for pass-by-value kernels." into jb-mr1-dev
Stephen Hines [Thu, 20 Sep 2012 16:55:25 +0000 (09:55 -0700)]
Merge "Add tests for pass-by-value kernels." into jb-mr1-dev

12 years agoMerge "add cleanspec." into jb-mr1-dev
Jason Sams [Thu, 20 Sep 2012 16:21:39 +0000 (09:21 -0700)]
Merge "add cleanspec." into jb-mr1-dev

12 years agoadd cleanspec.
Jason Sams [Thu, 20 Sep 2012 16:12:43 +0000 (09:12 -0700)]
add cleanspec.

Change-Id: I5aa58efa7c48809d1f05c8ad48332508597b9869

12 years agofix underfull content bug in inbox and big text templates.
Chris Wren [Thu, 20 Sep 2012 14:35:54 +0000 (10:35 -0400)]
fix underfull content bug in inbox and big text templates.

Bug: 7172721
Change-Id: I22019009eec31ca18b54eec5f6ed5b626cee1540

12 years agoMerge "Fire "dreaming started" and "dreaming stopped" broadcasts." into jb-mr1-dev
John Spurlock [Thu, 20 Sep 2012 12:45:53 +0000 (05:45 -0700)]
Merge "Fire "dreaming started" and "dreaming stopped" broadcasts." into jb-mr1-dev

12 years agoRemove pointless exception supression.
Geremy Condra [Thu, 20 Sep 2012 08:40:03 +0000 (01:40 -0700)]
Remove pointless exception supression.

Bug: 7198235
Change-Id: I3371403a79fd3e01d46678d58129d36eb921d10a

12 years agoMerge "Cleanup blur test, remove deprecated functions." into jb-mr1-dev
Jason Sams [Thu, 20 Sep 2012 08:09:49 +0000 (01:09 -0700)]
Merge "Cleanup blur test, remove deprecated functions." into jb-mr1-dev

12 years agoCleanup blur test, remove deprecated functions.
Jason Sams [Thu, 20 Sep 2012 08:07:35 +0000 (01:07 -0700)]
Cleanup blur test, remove deprecated functions.

Change-Id: I4136110692fdba8a644806fe8c92bfaacc930ca6

12 years agoMerge "Make wifi display state changes more robust." into jb-mr1-dev
Jeff Brown [Thu, 20 Sep 2012 06:21:17 +0000 (23:21 -0700)]
Merge "Make wifi display state changes more robust." into jb-mr1-dev

12 years agoMake wifi display state changes more robust.
Jeff Brown [Thu, 20 Sep 2012 06:09:23 +0000 (23:09 -0700)]
Make wifi display state changes more robust.

Bug: 7178216
Change-Id: Icceaeb61730b0b4916cdda44459f4c69553e303c

12 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 20 Sep 2012 05:41:41 +0000 (22:41 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

12 years agoMerge "Add support for remembering Wifi display devices." into jb-mr1-dev
Jeff Brown [Thu, 20 Sep 2012 05:14:01 +0000 (22:14 -0700)]
Merge "Add support for remembering Wifi display devices." into jb-mr1-dev

12 years agoAdd support for remembering Wifi display devices.
Jeff Brown [Wed, 19 Sep 2012 18:33:42 +0000 (11:33 -0700)]
Add support for remembering Wifi display devices.

Add a setting to globally disable Wifi display.

Fixed a bug where the wifi display broadcast receiver
was running on the wrong thread.

Removed the wifi-display QuickSettings dialog, all functionality
has been moved to Settings.

Bug: 7178216
Bug: 7192799
Change-Id: I9796baac8245d664cf28fa147b9ed978d81d8ab9

12 years agoPush dropbox logging into libcore.
Geremy Condra [Thu, 20 Sep 2012 01:07:42 +0000 (18:07 -0700)]
Push dropbox logging into libcore.

Change-Id: I74c0644c6938d28c20c42d88d995ffb56a71d703

12 years agoMerge "Update keyguard selector view to match UX design spec - Use new Roboto-Thin...
Jim Miller [Thu, 20 Sep 2012 04:26:50 +0000 (21:26 -0700)]
Merge "Update keyguard selector view to match UX design spec - Use new Roboto-Thin font - Add new keyguard-specific date format - Layout tweaks to keyguard selector screen. - Add smart EmergencyButton class - Add selective upper-casing of components on the display to enable later UX decision - Work around SIM state bug" into jb-mr1-dev

12 years agoRemove logging for old version mismatches.
Geremy Condra [Thu, 20 Sep 2012 04:22:42 +0000 (21:22 -0700)]
Remove logging for old version mismatches.

Since this has no security consequence and triggered by a variety
of totally innocuous things it seems like log noise and so should
be removed.

Bug: 7198235
Change-Id: I80ed5acb378a4c42d5d223b633309bf9526dbf3d

12 years agoMerge "Add support for QCOM_tiled_rendering Bug #7186819" into jb-mr1-dev
Romain Guy [Thu, 20 Sep 2012 04:12:18 +0000 (21:12 -0700)]
Merge "Add support for QCOM_tiled_rendering Bug #7186819" into jb-mr1-dev

12 years agoAdd support for QCOM_tiled_rendering
Romain Guy [Thu, 20 Sep 2012 00:25:38 +0000 (17:25 -0700)]
Add support for QCOM_tiled_rendering
Bug #7186819

This optional OpenGL extension can be used by tiled renderers to optimize
copies from main memory to tiles memory.

Change-Id: Id4a5d64e61ad17f50e773e8104b9bf584bb65077

12 years agoAdd tests for pass-by-value kernels.
Stephen Hines [Tue, 18 Sep 2012 04:52:48 +0000 (21:52 -0700)]
Add tests for pass-by-value kernels.

Bug: 7166741

Change-Id: I8bb37b9205c146a922c141665a86ce8013ad4f0a

12 years agoUpdate keyguard selector view to match UX design spec
Jim Miller [Thu, 20 Sep 2012 03:44:16 +0000 (20:44 -0700)]
Update keyguard selector view to match UX design spec
- Use new Roboto-Thin font
- Add new keyguard-specific date format
- Layout tweaks to keyguard selector screen.
- Add smart EmergencyButton class
- Add selective upper-casing of components on the display to enable later UX decision
- Work around SIM state bug

Bug: 7094419
Change-Id: Ic7e0f30697c14d4946372509d98ad81bf6a23c92

12 years agoMerge "Move HAS_TRANSIENT_STATE flag into a safe area." into jb-mr1-dev
Jeff Sharkey [Thu, 20 Sep 2012 02:16:24 +0000 (19:16 -0700)]
Merge "Move HAS_TRANSIENT_STATE flag into a safe area." into jb-mr1-dev

12 years agoMove HAS_TRANSIENT_STATE flag into a safe area.
Jeff Sharkey [Thu, 20 Sep 2012 02:06:22 +0000 (19:06 -0700)]
Move HAS_TRANSIENT_STATE flag into a safe area.

Previously, this flag conflicted with other text direction flags,
which can cause weird interactions across the View hierarchy,
specifically with ListView.

Also adds dumpFlags() utility to dump values of all know flags for
documentation and sanity checking.

Bug: 7189738
Change-Id: Iceb2f93f68a800e19a5889ced93abcce4932b067

12 years agoMerge "Migrate network stats from removed users." into jb-mr1-dev
Jeff Sharkey [Thu, 20 Sep 2012 01:58:06 +0000 (18:58 -0700)]
Merge "Migrate network stats from removed users." into jb-mr1-dev

12 years agoMerge "setShowGTalkServiceStatus() is deprecated but tested by CTS" into jb-mr1-dev
Christopher Tate [Thu, 20 Sep 2012 01:35:07 +0000 (18:35 -0700)]
Merge "setShowGTalkServiceStatus() is deprecated but tested by CTS" into jb-mr1-dev

12 years agoFix DPI scaling on TVDPI
John Reck [Thu, 20 Sep 2012 01:21:08 +0000 (18:21 -0700)]
Fix DPI scaling on TVDPI

 Bug: 6891214
 tvdpi has a density of 1.3312501 which we fail on as we assume
 you can take density and multiply by 100, cast to an int, and
 divide by 100f to get back to the original density. Force this
 assumption to be true by truncating density

Change-Id: I0caeb7768ee002f935b41c77a5579ffeed491f82

12 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 20 Sep 2012 01:18:53 +0000 (18:18 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

12 years agosetShowGTalkServiceStatus() is deprecated but tested by CTS
Christopher Tate [Thu, 20 Sep 2012 00:18:18 +0000 (17:18 -0700)]
setShowGTalkServiceStatus() is deprecated but tested by CTS

So its implementation has to hang around on that basis.

Bug 7164713

Change-Id: Ibb59932b3b6d275d8ac8e091774b08256a258db1

12 years agoMerge "Revert "Test aggressive throttling"" into jb-mr1-dev
John Reck [Thu, 20 Sep 2012 00:06:50 +0000 (17:06 -0700)]
Merge "Revert "Test aggressive throttling"" into jb-mr1-dev

12 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 19 Sep 2012 23:23:58 +0000 (16:23 -0700)]
Import translations. DO NOT MERGE

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

12 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 19 Sep 2012 22:52:51 +0000 (15:52 -0700)]
Import translations. DO NOT MERGE

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

12 years agoMigrate network stats from removed users.
Jeff Sharkey [Wed, 19 Sep 2012 21:10:39 +0000 (14:10 -0700)]
Migrate network stats from removed users.

When a user is removed, migrate all network stats belonging to that
user into special UID_REMOVED bucket.  Also removes those stats from
kernel to avoid double-counting if another user is created.

Bug: 7194784
Change-Id: I03f1d660fe3754566326b7749cae8068fc224ea9

12 years agoMerge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev
Jeff Sharkey [Wed, 19 Sep 2012 21:52:33 +0000 (14:52 -0700)]
Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev

12 years agoFire "dreaming started" and "dreaming stopped" broadcasts.
John Spurlock [Sat, 25 Aug 2012 16:08:03 +0000 (12:08 -0400)]
Fire "dreaming started" and "dreaming stopped" broadcasts.

Dream manager now fires broadcast intents when entering + exiting
dreamland (except when testing).

Power manager can now listen for dreams ending, using polling only
as a backstop.

Also:
 - Bullet-proof dream-manager/dream against known failure modes
 - Add new read/write dream permissions
 - Refactor dream-manager to delegate work + state management into
   a new DreamController class, via a handler

Bug:6999949
Bug:7152024
Change-Id: I986bb7812209d8c95ae1d660a5eee5998a7b08b1

12 years agoMerge "Update preloaded-classes for JB-MR1" into jb-mr1-dev
Kenny Root [Wed, 19 Sep 2012 21:32:20 +0000 (14:32 -0700)]
Merge "Update preloaded-classes for JB-MR1" into jb-mr1-dev

12 years agoRevert "Test aggressive throttling"
John Reck [Wed, 19 Sep 2012 21:26:26 +0000 (14:26 -0700)]
Revert "Test aggressive throttling"

Bug: 7182109
This reverts commit c7c85b34dad5ee722bd9f14318c1e0e4237d529e.

Change-Id: Ibc8837b97450ec6e77a0e9dd509280ff780bb22b

12 years agoAdd multi user volume management
Eric Laurent [Wed, 19 Sep 2012 18:24:41 +0000 (11:24 -0700)]
Add multi user volume management

Notification and Alarm volumes are per user: they are saved and restored
when the foreground user changes.
Media volume is global: it is still saved and restored per user for
implentation reasons but is copied from one user to the next to ensure
media playback volume continuity when switching users.

Ringer mode (silent, vibrate...) is now a global setting.

Bug 7128886.

Change-Id: I9f4f5a0a3985552bca61c2cc3bbe5a144db755a6

12 years agoUpdate preloaded-classes for JB-MR1
Kenny Root [Wed, 19 Sep 2012 20:08:12 +0000 (13:08 -0700)]
Update preloaded-classes for JB-MR1

Bug: 5213043
Change-Id: I13fa58fded8e47d2f11d1fbe6724bd81ce35276a

12 years agoMerge "Fixes to Starting window and Wallpaper windows." into jb-mr1-dev
Craig Mautner [Wed, 19 Sep 2012 20:29:44 +0000 (13:29 -0700)]
Merge "Fixes to Starting window and Wallpaper windows." into jb-mr1-dev

12 years agoMerge "Fix deadlock in LockPatternUtils by using local id." into jb-mr1-dev
Dianne Hackborn [Wed, 19 Sep 2012 20:28:11 +0000 (13:28 -0700)]
Merge "Fix deadlock in LockPatternUtils by using local id." into jb-mr1-dev

12 years agoFix deadlock in LockPatternUtils by using local id.
Craig Mautner [Wed, 19 Sep 2012 20:18:29 +0000 (13:18 -0700)]
Fix deadlock in LockPatternUtils by using local id.

Activity manager now updates window manager's current user id
directly and immediately rather than waiting for a broadcast
update. Window manager passes this through policy to the
KeyguardViewMediator and into LockPatternUtils. LockPatternUtils
no longer goes to Activity to get the current user id if it finds
that its local id is non-default.

Fixes bug 7193726.

Change-Id: Id5613e7a9fe9e5b49e83c26b74504f587c3998c2

12 years agoMigrate UI to supportsMultipleUsers().
Jeff Sharkey [Wed, 19 Sep 2012 20:14:30 +0000 (13:14 -0700)]
Migrate UI to supportsMultipleUsers().

Bug: 7194531
Change-Id: Ifbbe3b4d954f8d11fb1c94674e5e7f8e21264c75

12 years agoMerge "Add debug for b/7094175." into jb-mr1-dev
Craig Mautner [Wed, 19 Sep 2012 20:07:53 +0000 (13:07 -0700)]
Merge "Add debug for b/7094175." into jb-mr1-dev

12 years agoMerge "Disable content observer cross-user permission checks..." into jb-mr1-dev
Christopher Tate [Wed, 19 Sep 2012 20:01:32 +0000 (13:01 -0700)]
Merge "Disable content observer cross-user permission checks..." into jb-mr1-dev

12 years agoMerge "Changes to support side-loading of apps from other users." into jb-mr1-dev
Dianne Hackborn [Wed, 19 Sep 2012 19:52:32 +0000 (12:52 -0700)]
Merge "Changes to support side-loading of apps from other users." into jb-mr1-dev

12 years agoDisable content observer cross-user permission checks...
Christopher Tate [Wed, 19 Sep 2012 19:46:54 +0000 (12:46 -0700)]
Disable content observer cross-user permission checks...

... until we have a solid fix for the singleton ContentProvider
problem cases in place.

Bug 7190837

Change-Id: Ibbef2ddc594896ba7b9217e2856c3e393f525af6

12 years agoChanges to support side-loading of apps from other users.
Dianne Hackborn [Wed, 19 Sep 2012 19:42:37 +0000 (12:42 -0700)]
Changes to support side-loading of apps from other users.

Change-Id: I5b7c0aa0dc9566b29d5980dc7f42a508a61a58d3

12 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 19 Sep 2012 19:34:40 +0000 (12:34 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

12 years agoam baed0a8f: am 56fd88d8: am ab12f0f7: Merge "Implement resolving of icon attributes...
Adam Powell [Wed, 19 Sep 2012 19:26:06 +0000 (12:26 -0700)]
am baed0a8f: am 56fd88d8: am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController"

* commit 'baed0a8f0b43191c8f001e064ff42cf27a305d87':
  Implement resolving of icon attributes to resIds in AlertController

12 years agoam 56fd88d8: am ab12f0f7: Merge "Implement resolving of icon attributes to resIds...
Adam Powell [Wed, 19 Sep 2012 19:21:15 +0000 (12:21 -0700)]
am 56fd88d8: am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController"

* commit '56fd88d87ff607f65a963b5500b27ae3d4d2670e':
  Implement resolving of icon attributes to resIds in AlertController

12 years agoMerge "Fix bug #7146516 Padding can be "over" resolved" into jb-mr1-dev
Fabrice Di Meglio [Wed, 19 Sep 2012 19:11:48 +0000 (12:11 -0700)]
Merge "Fix bug #7146516 Padding can be "over" resolved" into jb-mr1-dev

12 years agoam ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController"
Adam Powell [Wed, 19 Sep 2012 18:56:40 +0000 (11:56 -0700)]
am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController"

* commit 'ab12f0f72c22143523e2bce7d58d9f1021abde5c':
  Implement resolving of icon attributes to resIds in AlertController

12 years agoMerge "Fix some typos in Javadoc for Accessibility APIs" into jb-mr1-dev
Fabrice Di Meglio [Wed, 19 Sep 2012 18:55:30 +0000 (11:55 -0700)]
Merge "Fix some typos in Javadoc for Accessibility APIs" into jb-mr1-dev

12 years agoMerge "Add Roboto Thin and Thin Italic fonts, as sans-serif-thin family" into jb...
Raph Levien [Wed, 19 Sep 2012 18:53:03 +0000 (11:53 -0700)]
Merge "Add Roboto Thin and Thin Italic fonts, as sans-serif-thin family" into jb-mr1-dev

12 years agoMerge "Switch to showing top-most thumbnail of recent apps." into jb-mr1-dev
Dianne Hackborn [Wed, 19 Sep 2012 18:40:17 +0000 (11:40 -0700)]
Merge "Switch to showing top-most thumbnail of recent apps." into jb-mr1-dev

12 years agoam 9198495b: am 19a39686: am b79d8ecc: udpate media formats for JB
Scott Main [Wed, 19 Sep 2012 18:27:42 +0000 (11:27 -0700)]
am 9198495b: am 19a39686: am b79d8ecc: udpate media formats for JB

* commit '9198495b2767c507eb983f94b0449f23516240db':
  udpate media formats for JB

12 years agoSwitch to showing top-most thumbnail of recent apps.
Dianne Hackborn [Wed, 19 Sep 2012 17:59:14 +0000 (10:59 -0700)]
Switch to showing top-most thumbnail of recent apps.

The way it should have been, and with the new recents enter animation
the way it must be.

Added a new method to retrieve this thumbnail, since it would be less
efficient to use the existing API (which always returns the "base"
thumbnail).  Probably at some point that existing API should be tweaked
to always return the top thumbnail instead, but that is for a later time.

Also removed code that would clear the thumbnail associated with an
activity when it is resumed.  I don't think there should ever be a
reason to clear a thumbnail -- it's much better to have *something*
for the task, even if it is a little out of date.

Change-Id: I83e6ca6403eb2df5e4de3009dfe8c210e8cf8d5b

12 years agoMerge changes I4513afbd,I20e2194c into jb-mr1-dev
Jeff Sharkey [Wed, 19 Sep 2012 18:22:14 +0000 (11:22 -0700)]
Merge changes I4513afbd,I20e2194c into jb-mr1-dev

* changes:
  Make getMediaStorageDirectory() user-aware.
  Lockdown should only augment connected networks.

12 years agoam 19a39686: am b79d8ecc: udpate media formats for JB
Scott Main [Wed, 19 Sep 2012 18:22:02 +0000 (11:22 -0700)]
am 19a39686: am b79d8ecc: udpate media formats for JB

* commit '19a39686b7bcf5c47cc0e2f99caca7beb9173212':
  udpate media formats for JB

12 years agoMerge "New API for querying audio properties" into jb-mr1-dev
Glenn Kasten [Wed, 19 Sep 2012 18:13:58 +0000 (11:13 -0700)]
Merge "New API for querying audio properties" into jb-mr1-dev

12 years agoFixes to Starting window and Wallpaper windows.
Craig Mautner [Tue, 18 Sep 2012 22:04:34 +0000 (15:04 -0700)]
Fixes to Starting window and Wallpaper windows.

- Checking for found wallpaper to match either mWallpaperTarget
or mLowerWallpaperTarget keeps from swapping the layers while
transitioning between two wallpaper activities.

- Fade out RecentsActivity while bringing up selected activity. This
keeps the RecentsActivity from showing through a launching wallpaper
activity.

- When moving a starting window from one activity to another clear
the startingDisplayed flag in the old activity.

- When moving a starting window from one activity to another assign
the new activity's mAppAnimator to the starting window's mWinAnimator.

- Only treat a wallpaper transition as entering if the mWallpaperTarget
is visible and not being hidden. Keeps from assigning the wrong
animation when activities are launched back to back and the
mWallpaperTarget is still animating away.

Fixes bug 7148089.

Change-Id: Idd405b1ba113f3345ca2116d141b474abe5bd4c0

12 years agoam b79d8ecc: udpate media formats for JB
Scott Main [Wed, 19 Sep 2012 18:00:23 +0000 (11:00 -0700)]
am b79d8ecc: udpate media formats for JB

* commit 'b79d8ecc27c0c7a8c2f8dcc1a752450e4d7d39e2':
  udpate media formats for JB

12 years agoMerge "Implement resolving of icon attributes to resIds in AlertController"
Adam Powell [Wed, 19 Sep 2012 17:51:40 +0000 (10:51 -0700)]
Merge "Implement resolving of icon attributes to resIds in AlertController"

12 years agoMerge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 19 Sep 2012 16:14:58 +0000 (09:14 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

12 years agoMerge "Add APIs to enable SNI and session tickets on sockets." into jb-mr1-dev
Narayan Kamath [Wed, 19 Sep 2012 08:31:34 +0000 (01:31 -0700)]
Merge "Add APIs to enable SNI and session tickets on sockets." into jb-mr1-dev

12 years agoudpate media formats for JB
Scott Main [Tue, 18 Sep 2012 17:40:49 +0000 (10:40 -0700)]
udpate media formats for JB

Change-Id: Ide41c5dde11298e875c957467c39262dafadcc4c

12 years agoMerge "Get strings in" into jb-mr1-dev
Irfan Sheriff [Wed, 19 Sep 2012 05:34:34 +0000 (22:34 -0700)]
Merge "Get strings in" into jb-mr1-dev

12 years agoGet strings in
Irfan Sheriff [Wed, 19 Sep 2012 04:01:35 +0000 (21:01 -0700)]
Get strings in

Bug: 65904101
Bug: 7087564
Change-Id: Ic4887a737a640010e12efd2a16b24af2215ba72a

12 years agoMerge "Fix wrong pattern count in keyguard pattern security view." into jb-mr1-dev
Jim Miller [Wed, 19 Sep 2012 04:06:41 +0000 (21:06 -0700)]
Merge "Fix wrong pattern count in keyguard pattern security view." into jb-mr1-dev

12 years agoFix wrong pattern count in keyguard pattern security view.
Jim Miller [Wed, 19 Sep 2012 03:52:55 +0000 (20:52 -0700)]
Fix wrong pattern count in keyguard pattern security view.

This fixes a bug introduced in I085c5ec8 where keyguard attempts to emulate
slippery windows with views.  In order to do so,  the code was overloading
dispatchTouchEvent().  It would allow the super (a ViewGroup) to dispatch
the events and then would dispatch them itself to sub views.  In the case
where an event overlaps an actual child view, it would  result in 2 copies of the event
per window layer (there are 2).  This results in 2 events per layer for the
top two views in the hierarchy. So each actual pattern attempt would count as 4
attempts to the system.

The solution is to overload onTouchEvent() at each level in the view hierarchy,
which means that we ignore events that were already handled by a child window
of the parent.

This change also disables slippery windows for keyguard because it causes
vertical patterns to be ignored.

Fixes bug 7191277

Change-Id: I4df217f2bf382134d93113b8d55b0d71e0e23677

12 years agoMerge "DevicePolicyManager per user" into jb-mr1-dev
Amith Yamasani [Wed, 19 Sep 2012 03:00:44 +0000 (20:00 -0700)]
Merge "DevicePolicyManager per user" into jb-mr1-dev

12 years agoFix some typos in Javadoc for Accessibility APIs
Fabrice Di Meglio [Wed, 19 Sep 2012 02:34:34 +0000 (19:34 -0700)]
Fix some typos in Javadoc for Accessibility APIs

Change-Id: Ie3ca20e1c3bb11fb59bd7dcaed9ea92be320b3eb

12 years agoMerge "Fix build. Missed current.txt in previous checkin." into jb-mr1-dev
Jason Sams [Wed, 19 Sep 2012 02:11:17 +0000 (19:11 -0700)]
Merge "Fix build.  Missed current.txt in previous checkin." into jb-mr1-dev

12 years agoFix build. Missed current.txt in previous checkin.
Jason Sams [Wed, 19 Sep 2012 02:10:34 +0000 (19:10 -0700)]
Fix build.  Missed current.txt in previous checkin.

Change-Id: I458944fbd9b04526068d03330620ad4805b5c993

12 years agoMerge "Add test for layer updates optimizations" into jb-mr1-dev
Romain Guy [Wed, 19 Sep 2012 02:01:25 +0000 (19:01 -0700)]
Merge "Add test for layer updates optimizations" into jb-mr1-dev

12 years agoAdd test for layer updates optimizations
Romain Guy [Wed, 19 Sep 2012 01:59:59 +0000 (18:59 -0700)]
Add test for layer updates optimizations

Optimizations are following.

Change-Id: I120e1d0c08d8068fcac46515f37a4ae510e5f3a3

12 years agoMerge "Further tune config_minScalingSpan for small screen devices." into jb-mr1-dev
Adam Powell [Wed, 19 Sep 2012 01:49:32 +0000 (18:49 -0700)]
Merge "Further tune config_minScalingSpan for small screen devices." into jb-mr1-dev

12 years agoMerge "Clean up and publish the YUV to RGB intrinsic." into jb-mr1-dev
Jason Sams [Wed, 19 Sep 2012 01:43:09 +0000 (18:43 -0700)]
Merge "Clean up and publish the YUV to RGB intrinsic." into jb-mr1-dev

12 years agoMerge "Make invalidateOptionsMenu asynchronous" into jb-mr1-dev
Adam Powell [Wed, 19 Sep 2012 01:42:58 +0000 (18:42 -0700)]
Merge "Make invalidateOptionsMenu asynchronous" into jb-mr1-dev

12 years agoMake invalidateOptionsMenu asynchronous
Adam Powell [Wed, 19 Sep 2012 01:34:08 +0000 (18:34 -0700)]
Make invalidateOptionsMenu asynchronous

Process any pending menu invalidations on the animation tick, before
traversals are performed. Collapse multiple menu invalidations
together.

Bug 7189372

Change-Id: I7a33ae9813980eb8fbcc958804de2c03328ecca8

12 years agoClean up and publish the YUV to RGB intrinsic.
Jason Sams [Wed, 19 Sep 2012 01:23:15 +0000 (18:23 -0700)]
Clean up and publish the YUV to RGB intrinsic.

Change-Id: Iffb346a5d751f0bae123455869bda8db37d542ff

12 years agoMerge "Don't allow more than 3 actively running users at a time." into jb-mr1-dev
Dianne Hackborn [Wed, 19 Sep 2012 01:22:15 +0000 (18:22 -0700)]
Merge "Don't allow more than 3 actively running users at a time." into jb-mr1-dev

12 years agoDon't allow more than 3 actively running users at a time.
Dianne Hackborn [Tue, 18 Sep 2012 22:48:21 +0000 (15:48 -0700)]
Don't allow more than 3 actively running users at a time.

Change-Id: Ic047c62b518a0faaa7b507343909330044ec290b

12 years agoMerge "Move X509TrustManagerExtensions to correct directory" into jb-mr1-dev
Andy Stadler [Wed, 19 Sep 2012 00:51:09 +0000 (17:51 -0700)]
Merge "Move X509TrustManagerExtensions to correct directory" into jb-mr1-dev

12 years agoMove X509TrustManagerExtensions to correct directory
Andy Stadler [Wed, 19 Sep 2012 00:40:14 +0000 (17:40 -0700)]
Move X509TrustManagerExtensions to correct directory

Also removed unused imports.

Original Change-Id: If117ffd2240a7bf3437115f3cf2f766c4e249600

Change-Id: I66886ee9792c23a1e421022fd1f675fdf35ea049

12 years agoMerge "AudioService: Send "becoming noisy" intent when USB accessory audio is disconn...
Mike Lockwood [Wed, 19 Sep 2012 00:12:37 +0000 (17:12 -0700)]
Merge "AudioService: Send "becoming noisy" intent when USB accessory audio is disconnected" into jb-mr1-dev

12 years agoMerge "mutate() didn't work as advertised Bug #7162705" into jb-mr1-dev
Romain Guy [Wed, 19 Sep 2012 00:03:04 +0000 (17:03 -0700)]
Merge "mutate() didn't work as advertised Bug #7162705" into jb-mr1-dev

12 years agoMerge "Refactor Carrier text as a movable module." into jb-mr1-dev
Jim Miller [Wed, 19 Sep 2012 00:00:37 +0000 (17:00 -0700)]
Merge "Refactor Carrier text as a movable module." into jb-mr1-dev

12 years agomutate() didn't work as advertised
Romain Guy [Tue, 18 Sep 2012 23:56:11 +0000 (16:56 -0700)]
mutate() didn't work as advertised
Bug #7162705

Change-Id: I15b2663fa7f1c71a2a3479134b8b7f37bfcbc607

12 years agoFix formatDateRange month names for Farsi.
Elliott Hughes [Tue, 18 Sep 2012 23:21:09 +0000 (16:21 -0700)]
Fix formatDateRange month names for Farsi.

This removes the LLLs seen in Calendar and Settings, for example.

Bug: 6811327
Change-Id: I87c2ab9ee8d897171ce7ca4fe06cfa8b11d36536

12 years agoMake getMediaStorageDirectory() user-aware.
Jeff Sharkey [Tue, 18 Sep 2012 22:54:52 +0000 (15:54 -0700)]
Make getMediaStorageDirectory() user-aware.

Bug: 7173591
Change-Id: I4513afbd8c3d6a31cd66d8a149be4071d5a4d24c

12 years agoLockdown should only augment connected networks.
Jeff Sharkey [Tue, 18 Sep 2012 22:44:16 +0000 (15:44 -0700)]
Lockdown should only augment connected networks.

Bug: 7148397
Change-Id: I20e2194c874544b272b9ec8b63391d91b0a22f49

12 years agoMerge "Minimize state changes when updating layers" into jb-mr1-dev
Romain Guy [Tue, 18 Sep 2012 22:43:04 +0000 (15:43 -0700)]
Merge "Minimize state changes when updating layers" into jb-mr1-dev

12 years agoMerge "Fix bug #7173155 API REVIEW: android.view.View" into jb-mr1-dev
Fabrice Di Meglio [Tue, 18 Sep 2012 22:42:34 +0000 (15:42 -0700)]
Merge "Fix bug #7173155 API REVIEW: android.view.View" into jb-mr1-dev