OSDN Git Service
John Spurlock [Thu, 20 Sep 2012 13:24:20 +0000 (06:24 -0700)]
am
e0de5bff: Merge "Fire "dreaming started" and "dreaming stopped" broadcasts." into jb-mr1-dev
* commit '
e0de5bfff2e74ee566ac2d053052de09aa25e54b':
Fire "dreaming started" and "dreaming stopped" broadcasts.
Jason Sams [Thu, 20 Sep 2012 13:23:51 +0000 (06:23 -0700)]
am
8e356e08: Merge "Cleanup blur test, remove deprecated functions." into jb-mr1-dev
* commit '
8e356e089d4b9cf1cd0f31ceead666f8e75d4c28':
Cleanup blur test, remove deprecated functions.
Jeff Brown [Thu, 20 Sep 2012 13:23:43 +0000 (06:23 -0700)]
am
f803ff4f: Merge "Make wifi display state changes more robust." into jb-mr1-dev
* commit '
f803ff4f743f63dbbb9382d1e1ef7adc25a88e24':
Make wifi display state changes more robust.
Baligh Uddin [Thu, 20 Sep 2012 13:23:27 +0000 (06:23 -0700)]
am
e02acec9: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
e02acec9ea52b0f04b891adeb17ad9d5e42f86da':
Import translations. DO NOT MERGE
Jeff Brown [Thu, 20 Sep 2012 13:23:20 +0000 (06:23 -0700)]
am
925ad51b: Merge "Add support for remembering Wifi display devices." into jb-mr1-dev
* commit '
925ad51bd82b34fa26a462a303781c610e635450':
Add support for remembering Wifi display devices.
Jim Miller [Thu, 20 Sep 2012 13:23:08 +0000 (06:23 -0700)]
am
d5d853ec: 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 th
* commit '
d5d853ec48bc4ad3d6f0ec5cdc20821550cbf3f8':
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
Romain Guy [Thu, 20 Sep 2012 13:23:04 +0000 (06:23 -0700)]
am
4c97ef90: Merge "Add support for QCOM_tiled_rendering Bug #
7186819" into jb-mr1-dev
* commit '
4c97ef9094f7a52dbc983ed12ce5f3b586f2d769':
Add support for QCOM_tiled_rendering Bug #
7186819
Jeff Sharkey [Thu, 20 Sep 2012 13:22:39 +0000 (06:22 -0700)]
am
4e7b551f: Merge "Move HAS_TRANSIENT_STATE flag into a safe area." into jb-mr1-dev
* commit '
4e7b551fbffa6112821ed6cfeedd6128463fccd0':
Move HAS_TRANSIENT_STATE flag into a safe area.
Jeff Sharkey [Thu, 20 Sep 2012 13:22:35 +0000 (06:22 -0700)]
am
c3e3311c: Merge "Migrate network stats from removed users." into jb-mr1-dev
* commit '
c3e3311c050f47a229e1b49f1fdf685669d79d53':
Migrate network stats from removed users.
Christopher Tate [Thu, 20 Sep 2012 13:22:26 +0000 (06:22 -0700)]
am
c575e007: Merge "setShowGTalkServiceStatus() is deprecated but tested by CTS" into jb-mr1-dev
* commit '
c575e007e59e00db7c1f3f2b2ea57cc24dd7c2de':
setShowGTalkServiceStatus() is deprecated but tested by CTS
Baligh Uddin [Thu, 20 Sep 2012 13:22:21 +0000 (06:22 -0700)]
am
30ddd69d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
30ddd69d07bafc1c9f906cfd176992ebaa58068e':
Import translations. DO NOT MERGE
John Reck [Thu, 20 Sep 2012 13:22:05 +0000 (06:22 -0700)]
am
4be07ade: Merge "Revert "Test aggressive throttling"" into jb-mr1-dev
* commit '
4be07ade3658da9345067780520ddbd266900ee4':
Revert "Test aggressive throttling"
Jeff Sharkey [Thu, 20 Sep 2012 13:21:27 +0000 (06:21 -0700)]
am
4046e012: Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev
* commit '
4046e012887fff1f36dfd3eddc6f354d4c2497fc':
Migrate UI to supportsMultipleUsers().
Kenny Root [Thu, 20 Sep 2012 13:21:02 +0000 (06:21 -0700)]
am
55552094: Merge "Update preloaded-classes for JB-MR1" into jb-mr1-dev
* commit '
55552094a25dd737dc24be94eb0fe5ed0397fcdb':
Update preloaded-classes for JB-MR1
Craig Mautner [Thu, 20 Sep 2012 13:20:35 +0000 (06:20 -0700)]
am
6704a48b: Merge "Fixes to Starting window and Wallpaper windows." into jb-mr1-dev
* commit '
6704a48bd06f01d2933f83e9b5eda4ed9846bab7':
Fixes to Starting window and Wallpaper windows.
Dianne Hackborn [Thu, 20 Sep 2012 13:20:31 +0000 (06:20 -0700)]
am
52716deb: Merge "Fix deadlock in LockPatternUtils by using local id." into jb-mr1-dev
* commit '
52716deb4008da1d566dfd711edc0a9c6de5f79f':
Fix deadlock in LockPatternUtils by using local id.
Craig Mautner [Thu, 20 Sep 2012 13:20:25 +0000 (06:20 -0700)]
am
8f301e66: Merge "Add debug for b/
7094175." into jb-mr1-dev
* commit '
8f301e666873e4a9feaace38a0b184a5f3ce7003':
Add debug for b/
7094175.
Christopher Tate [Thu, 20 Sep 2012 13:20:17 +0000 (06:20 -0700)]
am
a1c46636: Merge "Disable content observer cross-user permission checks..." into jb-mr1-dev
* commit '
a1c46636dd533e889e1f3b3326fa0d851928df4f':
Disable content observer cross-user permission checks...
Dianne Hackborn [Thu, 20 Sep 2012 13:20:13 +0000 (06:20 -0700)]
am
390392ff: Merge "Changes to support side-loading of apps from other users." into jb-mr1-dev
* commit '
390392ff3ef0114544eab3db4093c1c7aba825da':
Changes to support side-loading of apps from other users.
Baligh Uddin [Thu, 20 Sep 2012 13:20:08 +0000 (06:20 -0700)]
am
f8d618cb: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
f8d618cb6e634c158efbbf93dad74edd3090559c':
Import translations. DO NOT MERGE
Adam Powell [Thu, 20 Sep 2012 13:20:00 +0000 (06:20 -0700)]
am
10bd4106: am
baed0a8f: am
56fd88d8: am
ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController"
* commit '
10bd4106efc22efd57875a2fb914110475c91856':
Implement resolving of icon attributes to resIds in AlertController
Fabrice Di Meglio [Thu, 20 Sep 2012 13:19:55 +0000 (06:19 -0700)]
am
072533e9: Merge "Fix bug #
7146516 Padding can be "over" resolved" into jb-mr1-dev
* commit '
072533e934e759b95228ba61152e7d958b641b96':
Fix bug #
7146516 Padding can be "over" resolved
Fabrice Di Meglio [Thu, 20 Sep 2012 13:19:52 +0000 (06:19 -0700)]
am
efa56852: Merge "Fix some typos in Javadoc for Accessibility APIs" into jb-mr1-dev
* commit '
efa568525fc7755ac49e44e75246b2be1ef5269f':
Fix some typos in Javadoc for Accessibility APIs
Raph Levien [Thu, 20 Sep 2012 13:19:44 +0000 (06:19 -0700)]
am
d79dd344: Merge "Add Roboto Thin and Thin Italic fonts, as sans-serif-thin family" into jb-mr1-dev
* commit '
d79dd34482b7a9252485c28ff17aede669f70986':
Add Roboto Thin and Thin Italic fonts, as sans-serif-thin family
Dianne Hackborn [Thu, 20 Sep 2012 13:19:39 +0000 (06:19 -0700)]
am
09ad0832: Merge "Switch to showing top-most thumbnail of recent apps." into jb-mr1-dev
* commit '
09ad0832e0c28fa43a2e2bf53bef87df39bd4416':
Switch to showing top-most thumbnail of recent apps.
Scott Main [Thu, 20 Sep 2012 13:19:34 +0000 (06:19 -0700)]
am
5580005c: am
9198495b: am
19a39686: am
b79d8ecc: udpate media formats for JB
* commit '
5580005cc7f333e15326b219a0ff06b7c6eca529':
udpate media formats for JB
Jeff Sharkey [Thu, 20 Sep 2012 13:19:30 +0000 (06:19 -0700)]
am
a490bddc: Merge changes I4513afbd,I20e2194c into jb-mr1-dev
* commit '
a490bddc8bf0812973dee34ead5c04c87e7ecb15':
Make getMediaStorageDirectory() user-aware.
Lockdown should only augment connected networks.
Glenn Kasten [Thu, 20 Sep 2012 13:19:24 +0000 (06:19 -0700)]
am
549be8be: Merge "New API for querying audio properties" into jb-mr1-dev
* commit '
549be8beadf5ad2a56b7f4269d419753c0d61be8':
New API for querying audio properties
Baligh Uddin [Thu, 20 Sep 2012 13:18:56 +0000 (06:18 -0700)]
am
7b6ec1f6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
7b6ec1f6fd4f2858063d2d441b6118ac22da5569':
Import translations. DO NOT MERGE
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
Jason Sams [Thu, 20 Sep 2012 08:09:49 +0000 (01:09 -0700)]
Merge "Cleanup blur test, remove deprecated functions." into jb-mr1-dev
Jason Sams [Thu, 20 Sep 2012 08:07:35 +0000 (01:07 -0700)]
Cleanup blur test, remove deprecated functions.
Change-Id: I4136110692fdba8a644806fe8c92bfaacc930ca6
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
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
Baligh Uddin [Thu, 20 Sep 2012 05:41:41 +0000 (22:41 -0700)]
Merge "Import translations. DO NOT MERGE" 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
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
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
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
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
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
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
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
Jeff Sharkey [Thu, 20 Sep 2012 01:58:06 +0000 (18:58 -0700)]
Merge "Migrate network stats from removed users." 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
Baligh Uddin [Thu, 20 Sep 2012 01:18:53 +0000 (18:18 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
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
John Reck [Thu, 20 Sep 2012 00:06:50 +0000 (17:06 -0700)]
Merge "Revert "Test aggressive throttling"" into jb-mr1-dev
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
Baligh Uddin [Wed, 19 Sep 2012 23:23:03 +0000 (16:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I23706cb8f364984ad92ab1ce927b108539c141c6
Auto-generated-cl: translation import
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
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
Jeff Sharkey [Wed, 19 Sep 2012 21:52:33 +0000 (14:52 -0700)]
Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev
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
Kenny Root [Wed, 19 Sep 2012 21:32:20 +0000 (14:32 -0700)]
Merge "Update preloaded-classes for JB-MR1" into jb-mr1-dev
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
Kenny Root [Wed, 19 Sep 2012 20:08:12 +0000 (13:08 -0700)]
Update preloaded-classes for JB-MR1
Bug:
5213043
Change-Id: I13fa58fded8e47d2f11d1fbe6724bd81ce35276a
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
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
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
Jeff Sharkey [Wed, 19 Sep 2012 20:14:30 +0000 (13:14 -0700)]
Migrate UI to supportsMultipleUsers().
Bug:
7194531
Change-Id: Ifbbe3b4d954f8d11fb1c94674e5e7f8e21264c75
Craig Mautner [Wed, 19 Sep 2012 20:07:53 +0000 (13:07 -0700)]
Merge "Add debug for b/
7094175." 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
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
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
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
Baligh Uddin [Wed, 19 Sep 2012 19:39:49 +0000 (12:39 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Wed, 19 Sep 2012 19:34:40 +0000 (12:34 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
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
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
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
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
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
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
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
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
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
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.
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
Glenn Kasten [Wed, 19 Sep 2012 18:13:58 +0000 (11:13 -0700)]
Merge "New API for querying audio properties" into jb-mr1-dev
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
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
Adam Powell [Wed, 19 Sep 2012 17:51:40 +0000 (10:51 -0700)]
Merge "Implement resolving of icon attributes to resIds in AlertController"
Baligh Uddin [Wed, 19 Sep 2012 16:28:07 +0000 (09:28 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Baligh Uddin [Wed, 19 Sep 2012 16:14:58 +0000 (09:14 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Narayan Kamath [Wed, 19 Sep 2012 12:51:22 +0000 (05:51 -0700)]
am
5d1a870a: Merge "Add APIs to enable SNI and session tickets on sockets." into jb-mr1-dev
* commit '
5d1a870a25f7495755432a42cf8c81818dc369fa':
Add APIs to enable SNI and session tickets on sockets.
Irfan Sheriff [Wed, 19 Sep 2012 12:50:40 +0000 (05:50 -0700)]
am
5d4206a5: Merge "Get strings in" into jb-mr1-dev
* commit '
5d4206a55c5336a163408422ba3302f5fd8463f7':
Get strings in
Jim Miller [Wed, 19 Sep 2012 12:50:33 +0000 (05:50 -0700)]
am
5d8d169b: Merge "Fix wrong pattern count in keyguard pattern security view." into jb-mr1-dev
* commit '
5d8d169bbb0325665d600415bc7b4add2dbcaf75':
Fix wrong pattern count in keyguard pattern security view.
Amith Yamasani [Wed, 19 Sep 2012 12:50:07 +0000 (05:50 -0700)]
am
4adb9d34: Merge "DevicePolicyManager per user" into jb-mr1-dev
* commit '
4adb9d34162b109db3c67e352ad50c76dc7f2d45':
DevicePolicyManager per user
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
Scott Main [Tue, 18 Sep 2012 17:40:49 +0000 (10:40 -0700)]
udpate media formats for JB
Change-Id: Ide41c5dde11298e875c957467c39262dafadcc4c
Irfan Sheriff [Wed, 19 Sep 2012 05:34:34 +0000 (22:34 -0700)]
Merge "Get strings in" into jb-mr1-dev
Irfan Sheriff [Wed, 19 Sep 2012 04:01:35 +0000 (21:01 -0700)]
Get strings in
Bug:
65904101
Bug:
7087564
Change-Id: Ic4887a737a640010e12efd2a16b24af2215ba72a
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
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
Amith Yamasani [Wed, 19 Sep 2012 03:00:44 +0000 (20:00 -0700)]
Merge "DevicePolicyManager per user" into jb-mr1-dev
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
Jason Sams [Wed, 19 Sep 2012 02:13:35 +0000 (19:13 -0700)]
am
2d95a33d: Merge "Fix build. Missed current.txt in previous checkin." into jb-mr1-dev
* commit '
2d95a33dc3a463b197d4597b38f5ae124de25017':
Fix build. Missed current.txt in previous checkin.
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
Jason Sams [Wed, 19 Sep 2012 02:10:34 +0000 (19:10 -0700)]
Fix build. Missed current.txt in previous checkin.
Change-Id: I458944fbd9b04526068d03330620ad4805b5c993