OSDN Git Service
The Android Automerger [Wed, 7 Nov 2012 02:04:04 +0000 (18:04 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Sascha Prueter [Wed, 7 Nov 2012 01:11:26 +0000 (17:11 -0800)]
Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev
Jeff Brown [Wed, 7 Nov 2012 00:32:01 +0000 (16:32 -0800)]
Use a consistent policy for filtering wake keys.
Previously wake keys were filtered differently depending on whether
a keyguard was showing. If the user disables the keyguard then
no filtering was applied, which means that the volume key may
wake your device while in your pocket.
This change ensures that we use the same policy consistently
regardless of whether keyguard is showing. The behavior is
otherwise the same.
Removed the "Locked" suffix on a method that was actually
being called without a lock held and which in fact does not
require it.
Bug:
7481025
Change-Id: I704c71ca009bc5437f349f858b9de7c77ea73e4b
Romain Guy [Wed, 7 Nov 2012 00:15:26 +0000 (16:15 -0800)]
Merge "Dismiss error icon on setError(null) [regression] Bug #
7442935" into jb-mr1-dev
Eino-Ville Talvala [Wed, 7 Nov 2012 00:06:00 +0000 (16:06 -0800)]
Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev
Romain Guy [Tue, 6 Nov 2012 01:43:25 +0000 (17:43 -0800)]
Dismiss error icon on setError(null) [regression]
Bug #
7442935
Change-Id: I783d868173637007be326e20795cbb4cb8c7b899
Victoria Lease [Tue, 6 Nov 2012 23:06:15 +0000 (15:06 -0800)]
Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev
The Android Automerger [Tue, 6 Nov 2012 21:13:34 +0000 (13:13 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Amith Yamasani [Tue, 6 Nov 2012 20:56:16 +0000 (12:56 -0800)]
Merge "Authenticate correct user's account when pattern fails multiple times." into jb-mr1-dev
Victoria Lease [Fri, 2 Nov 2012 23:24:08 +0000 (16:24 -0700)]
Fires geofence if the device is already in the geofence area.
Process the location of the fence as soon as it is added.
Clarified how the distance to the fence was being used.
Added more debug logs (disabled by default).
Fixed a numerical overflow in the location request if the
distance to the border of the nearest fence was greater
than about 2000Km.
Removed a useless call to request location updates passively
when the geofence manager is initialized. We have no need
of location updates unless there are active geofences.
The effect of this call was undone the next time the location
request was updated anyhow.
Changed the location request to always request a fastest update
interval of 0 which accomplishes the goal of passively
monitoring all updates. This does not increase the power
consumption because we are conservative about choosing
a minimum location update interval. We're simply stating
that the geofence manager is willing to handle a higher
report rate which is very important.
Subject location to a "freshness test" - only use relatively
recent locations for geofence testing.
Run all geofence updates on the handler and avoid making
multiple redundant calls into the location manager when
updating the provider requirements.
Ensure that we update geofences correctly even if we don't
know the initial location of the device at the time the
geofence is created.
Pin update interval value to the range [1m..2hr].
Distance to fence is now distance to fence's border, not
distance to fence's centre.
Bug:
7466334
Change-Id: I28e571ecfc508d5ceb9bb2afcabaaf05abb26369
John Spurlock [Tue, 6 Nov 2012 16:39:34 +0000 (11:39 -0500)]
Remove add widget transition jank (insecure).
Refactor to use common activity launcher.
Still work to do on secure.
Bug:
7482560
Change-Id: I2f8869afe8172850e1cb019a051aaeb49bb8c5bc
John Spurlock [Tue, 6 Nov 2012 14:44:39 +0000 (09:44 -0500)]
Fix regression in camera transition.
Caused by: Ic18188a2a3caa9dfde8785611242b1c9925f7b87
"Adding bouncer animation on PagedView."
Bug:
7483566
Change-Id: Ie0b4e7cf3d4dc717cac02c7cf8a1ec24b9b860a6
Michael Jurka [Tue, 6 Nov 2012 07:06:29 +0000 (23:06 -0800)]
Merge "Supporting EXTRA_APPWIDGET_OPTIONS correctly" into jb-mr1-lockscreen-dev
Jim Miller [Tue, 6 Nov 2012 06:45:35 +0000 (22:45 -0800)]
Workaround for layout bug in SIM PIN/PUK views
This prevents a degenerate layout while we figure out what's
going on.
Change-Id: I99d1c6e5ce59fd48a74258158208270b775c1511
Jim Miller [Tue, 6 Nov 2012 04:28:09 +0000 (20:28 -0800)]
Fix NPE caused by applications that try to hide keyguard while it's not showing
Fixes bug
7466360
Change-Id: Idec4c60c2ca2477e49e0f4526ae2357353d4a1e3
Michael Jurka [Tue, 6 Nov 2012 02:57:10 +0000 (18:57 -0800)]
Supporting EXTRA_APPWIDGET_OPTIONS correctly
The Android Automerger [Tue, 6 Nov 2012 02:38:53 +0000 (18:38 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Amith Yamasani [Tue, 6 Nov 2012 00:46:02 +0000 (16:46 -0800)]
Authenticate correct user's account when pattern fails multiple times.
Bug:
7473142
Provide hidden methods in AccountManager for querying accounts and
authenticating for a specific user. Lockscreen is running in the
system process. Allow only system process to access accounts across
users.
Also make sure to launch the lock settings screen on the just reset
user using startActivityAsUser()
Change-Id: Ifefc0039ba2b51396b8bd0268f36d5271a3d8676
Svetoslav Ganov [Tue, 6 Nov 2012 01:05:50 +0000 (17:05 -0800)]
am
0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev
* commit '
0f4d5df5d815466398dba5f2d07aa98f18c35aaa':
View's visibility to the user not checking predecessor alpha.
Mike Cleron [Tue, 6 Nov 2012 01:05:47 +0000 (17:05 -0800)]
am
c87f198b: Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev
* commit '
c87f198b8cd3b3cb5b3daf63df419b9377b9c7b8':
TextView not respecting "speak passwords" setting when adding before text to events.
Svetoslav Ganov [Tue, 6 Nov 2012 01:03:36 +0000 (17:03 -0800)]
Merge "View's visibility to the user not checking predecessor alpha." into jb-mr1-dev
Mike Cleron [Tue, 6 Nov 2012 01:03:06 +0000 (17:03 -0800)]
Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev
Romain Guy [Tue, 6 Nov 2012 00:39:37 +0000 (16:39 -0800)]
am
6c642089: Merge "Add programmatic access to setters in TextClock Bug #
7478328" into jb-mr1-dev
* commit '
6c642089bcd13bf17d7c445b2ec89b62a79c9823':
Add programmatic access to setters in TextClock Bug #
7478328
Romain Guy [Tue, 6 Nov 2012 00:35:45 +0000 (16:35 -0800)]
Merge "Add programmatic access to setters in TextClock Bug #
7478328" into jb-mr1-dev
Winson Chung [Mon, 5 Nov 2012 18:56:31 +0000 (10:56 -0800)]
Adding bouncer animation on PagedView. (Bug
7459660)
- Adding Remove text for translations.
Change-Id: Ic18188a2a3caa9dfde8785611242b1c9925f7b87
Adam Powell [Mon, 5 Nov 2012 23:52:42 +0000 (15:52 -0800)]
Merge "Keyguard sanity checks for when layout is not yet complete" into jb-mr1-lockscreen-dev
Adam Powell [Mon, 5 Nov 2012 23:41:07 +0000 (15:41 -0800)]
Keyguard sanity checks for when layout is not yet complete
Bug
7470163
Change-Id: I1e5f860ab39633f6c5e2046f6f18424227842406
Adam Cohen [Mon, 5 Nov 2012 23:22:45 +0000 (15:22 -0800)]
Merge "Fix small widgets not showing up on tablet (issue
7471516)" into jb-mr1-lockscreen-dev
Adam Cohen [Mon, 5 Nov 2012 23:20:30 +0000 (15:20 -0800)]
Fix small widgets not showing up on tablet (issue
7471516)
Change-Id: Ie217268ef9c96512942f64b8ffd7e1d54a0ea850
Baligh Uddin [Mon, 5 Nov 2012 23:19:27 +0000 (15:19 -0800)]
Baligh Uddin [Mon, 5 Nov 2012 23:02:02 +0000 (15:02 -0800)]
Adam Powell [Mon, 5 Nov 2012 22:16:59 +0000 (14:16 -0800)]
Optimize keyguard/IME interactions
Change the keyguard window to LAYOUT_IN_SCREEN | LAYOUT_INSET_DECOR
and make the ViewManagerHost fitSystemWindows. This eliminates the
need to resize the actual window and associated surfaces when the IME
comes and goes.
Force the widget pager to measure at the fullscreen size of the
keyguard, even if the IME is showing. This causes the widgets to clip
instead of resize, removing a few more moving parts that can be
distracting/affect performance.
Partially improves bug
7427586
Change-Id: I0d86d0ca8045f737fa97ca5d1e7f6a49f746b999
Romain Guy [Mon, 5 Nov 2012 22:16:32 +0000 (14:16 -0800)]
Add programmatic access to setters in TextClock
Bug #
7478328
Add missing annotation to let appwidgets change values programmatically
Change-Id: I6e9b095e93e4e90bd96e127344354c0dfa46cd86
Joe Malin [Mon, 5 Nov 2012 22:07:07 +0000 (14:07 -0800)]
am
db426cc0: am
046671af: am
fbcfb5d0: am
50c2275c: Android Training: CursorLoader
* commit '
db426cc0a695ab699969d0b7750dd79e5922321b':
Android Training: CursorLoader
Joe Malin [Mon, 5 Nov 2012 22:04:09 +0000 (14:04 -0800)]
am
046671af: am
fbcfb5d0: am
50c2275c: Android Training: CursorLoader
* commit '
046671afbcbe043f0b2aa4edc42b21fd2abf7586':
Android Training: CursorLoader
Svetoslav Ganov [Mon, 5 Nov 2012 21:53:43 +0000 (13:53 -0800)]
TextView not respecting "speak passwords" setting when adding before text to events.
1. If the speak passwords settings is on, the accessibility events emitted from a
TextView should contain the text and before text of the source. The settings
shows the users consent to put the source's text in the event. While the code
that populates the current text in the accessibility event respects the
setting, the one that populates the before text does not. As a result the
fact that the user has typed a letter cannot be echoed by an accessibility
service.
bug:
7468768
Change-Id: I7580c37936d742f42653315b2591e268a634d22b
Joe Malin [Mon, 5 Nov 2012 22:01:46 +0000 (14:01 -0800)]
am
fbcfb5d0: am
50c2275c: Android Training: CursorLoader
* commit '
fbcfb5d0f899e0b3c89334d43b45907337cf7f36':
Android Training: CursorLoader
Joe Malin [Mon, 5 Nov 2012 21:59:48 +0000 (13:59 -0800)]
am
50c2275c: Android Training: CursorLoader
* commit '
50c2275cff28c4a216f6924584e43cd64b90a3bf':
Android Training: CursorLoader
Joe Malin [Sat, 20 Oct 2012 19:41:40 +0000 (12:41 -0700)]
Android Training: CursorLoader
Change-Id: Ia8d723b5ce32002597b9444b8c7eff07b1ab29c8
Chris Wren [Mon, 5 Nov 2012 20:24:10 +0000 (12:24 -0800)]
Merge "bouncer: hide more text and frame less." into jb-mr1-lockscreen-dev
Scott Main [Mon, 5 Nov 2012 19:38:10 +0000 (11:38 -0800)]
am
44c4bba2: Merge "docs: fix markup error bug:
7456071" into jb-mr1-dev
* commit '
44c4bba2530b430895ef1c72e8ce2712e8ca9f6e':
docs: fix markup error bug:
7456071
Scott Main [Mon, 5 Nov 2012 19:35:23 +0000 (11:35 -0800)]
Merge "docs: fix markup error bug:
7456071" into jb-mr1-dev
Scott Main [Mon, 5 Nov 2012 19:25:17 +0000 (11:25 -0800)]
docs: fix markup error
bug:
7456071
Change-Id: I3d34a2d6741784d9b33af54afd6d97803720264d
Scott Main [Mon, 5 Nov 2012 19:15:55 +0000 (11:15 -0800)]
am
737a20fd: Merge "docs: explain implicit permissions applied by sdk versions bug:
7453055" into jb-mr1-dev
* commit '
737a20fda62fe9885f74e208ac21a1574c1593f7':
docs: explain implicit permissions applied by sdk versions bug:
7453055
Scott Main [Mon, 5 Nov 2012 19:12:11 +0000 (11:12 -0800)]
Merge "docs: explain implicit permissions applied by sdk versions bug:
7453055" into jb-mr1-dev
Eino-Ville Talvala [Mon, 5 Nov 2012 18:33:55 +0000 (10:33 -0800)]
Camera: Document new video snapshot picture size behavior.
On some devices, video snapshot may return pictures that are smaller
than requested. Make that clear.
Bug:
7475089
Change-Id: I0bd759072a7f954e517f3d09cb676fb23f863912
Steven Ross [Mon, 5 Nov 2012 18:49:31 +0000 (13:49 -0500)]
Clearing connected message in stop fixes
7401152
We can stop before the service connected message is processed, in which case
we should clear the message. Otherwise it can cause us to start up the UI
before the camera is open, causing a crash.
I was unable to reproduce this issue, but it theoretically will happen, and
the bug report shows all the symptoms of this series of events.
Change-Id: I60d295883b08ac58ccf0f3fc6d152b8b75fe9b18
Chris Wren [Mon, 5 Nov 2012 18:16:31 +0000 (13:16 -0500)]
bouncer: hide more text and frame less.
Bug:
7464865
Change-Id: Ic8dac2582c014922143919f142fd36eb720dd3a9
Proto-Id: Id80601c9ffbdc34669b485e943b42cee237898f3
Amith Yamasani [Mon, 5 Nov 2012 17:33:57 +0000 (09:33 -0800)]
am
fca8d258: Merge "Remove power menu user switcher" into jb-mr1-dev
* commit '
fca8d258c5699ad2703d46181c492e78e1dc87a8':
Remove power menu user switcher
Amith Yamasani [Mon, 5 Nov 2012 17:31:48 +0000 (09:31 -0800)]
Merge "Remove power menu user switcher" into jb-mr1-dev
John Spurlock [Fri, 2 Nov 2012 17:09:25 +0000 (13:09 -0400)]
Recover from badly behaving 3rd party secure cameras.
Bug:
7473953
Change-Id: I8daf18c85d951e03fa1c98dda5f255327f96f0ba
Jim Miller [Mon, 5 Nov 2012 03:08:40 +0000 (19:08 -0800)]
Show bouncer mode for Slide mode in keyguard if widget isn't expanded
Change-Id: If225198b0c6b122fef854ddd91e49c1071b74d50
Adam Cohen [Mon, 5 Nov 2012 01:55:44 +0000 (17:55 -0800)]
Merge "Making challenge come back if within the same gesture you return to the original page (issue
7422999)" into jb-mr1-lockscreen-dev
Baligh Uddin [Mon, 5 Nov 2012 01:49:01 +0000 (17:49 -0800)]
am
8cf1ea90: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
8cf1ea908dbb2c1a1252cecdc6d0f961373502aa':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 5 Nov 2012 01:47:33 +0000 (17:47 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Baligh Uddin [Mon, 5 Nov 2012 01:43:31 +0000 (17:43 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Adam Cohen [Mon, 5 Nov 2012 01:23:25 +0000 (17:23 -0800)]
Making challenge come back if within the same gesture you return to the original page (issue
7422999)
Change-Id: I8ada54ca39ebebc15295f93a2d9029f3b7915acb
Adam Cohen [Sun, 4 Nov 2012 22:00:05 +0000 (14:00 -0800)]
Ensure edge swiping is enforced immediately upon showing keyguard (issue
7453156)
Change-Id: I197a5304bbea904b58494a9dcb7ff95ff3c4a52b
Adam Cohen [Sun, 4 Nov 2012 21:20:26 +0000 (13:20 -0800)]
Fix issue
7468224, make sure to size pages if page changes
Change-Id: I8b3d7573eda7ed8e6a9aa479e61737fb12e26b92
Adam Cohen [Sun, 4 Nov 2012 20:03:12 +0000 (12:03 -0800)]
If a default keyguard layout isn't specified, fallback to the default layout
-> Also fixing a typo in AppWidgetProvider clone() -- this was the cause of
the "couldn't load widget". It wasn't getting expressed before for various
reasons.
Change-Id: Ib7114565a414d66facd8b4baeb97d5a71e96b5e9
John Spurlock [Sun, 4 Nov 2012 18:48:42 +0000 (13:48 -0500)]
Use better signal for camera launch.
Keyguard set-hidden instead of window lost focus.
Tested with face unlock.
Bug:
7464536
Change-Id: I6171c96699d1b1ccfebd7a14179d90963fb8aa54
John Spurlock [Sun, 4 Nov 2012 16:11:47 +0000 (11:11 -0500)]
Render camera widget on a background thread.
Bug:
7470978
Change-Id: Ieace005ac42d39ac4c146673910e6681f38e8f56
John Spurlock [Sun, 4 Nov 2012 14:42:42 +0000 (09:42 -0500)]
Fully block user interactions when transitioning to camera.
Bug:
7464265
Change-Id: I654b3d7c455f782495946988bb2e5198ff4252ec
Dianne Hackborn [Sun, 4 Nov 2012 06:37:36 +0000 (23:37 -0700)]
am
2ea9bae7: Fix issue #
7457380: IME leaves a mark after user switching
* commit '
2ea9bae7121f1df5461437d7d08fa550cdf6e0b0':
Fix issue #
7457380: IME leaves a mark after user switching
Adam Cohen [Sun, 4 Nov 2012 03:02:33 +0000 (20:02 -0700)]
Fixing up overscroll / hints on tablet
Change-Id: I8b0ce30b02b2d13d71826d6765d154f5ab89072b
Adam Cohen [Sun, 4 Nov 2012 02:10:56 +0000 (19:10 -0700)]
Cleaning up the overscroll effect
Change-Id: I685693fa178fb7b6418145554eb320b1a62d7462
Adam Cohen [Sun, 4 Nov 2012 00:10:07 +0000 (17:10 -0700)]
Updating UI to new design, widget shouldn't expand until page settles (issue
7467435)
-> If the challenge is showing and the page is swiped, instead of immediately
sliding down the security and expanding the small widget, we instead
quickly fade out the security and keep the widget+frame small until
the page settles and fades out.
Change-Id: I0f376dcd863744b977a1c5ccc7a46a5c6fdb891d
Adam Cohen [Sat, 3 Nov 2012 05:03:23 +0000 (22:03 -0700)]
Merge "Making screen hints just side page outlines, as per new design (issue
7467968)" into jb-mr1-lockscreen-dev
Adam Cohen [Sat, 3 Nov 2012 05:00:57 +0000 (22:00 -0700)]
Making screen hints just side page outlines, as per new design (issue
7467968)
Change-Id: Iff66e0b01cca89337227e54033f6245d6833a5ff
Dianne Hackborn [Sat, 3 Nov 2012 01:43:48 +0000 (18:43 -0700)]
Fix issue #
7457380: IME leaves a mark after user switching
The gnarly stuff where we keep track of the old input method
window as if it was still there was sitting around leaving things
in a stuck state. Now we clear this out at key points in the
window manager (freezing screen, user change), and the input
method manager service is less aggressive about asking the window
manager to do it.
Also fixed a problem that was causing flickers during some
wallpaper transitions -- when we are animating two things on
top of the wallpaper and one of them disappears, we need to
make sure the wallpaper target points to whatever the current
target should be (if any), not left pointing to the old target
that has gone away.
Change-Id: I2fb9600f569a5bd5e3528aaf24cde9340af56cb0
Jim Miller [Sat, 3 Nov 2012 00:35:12 +0000 (17:35 -0700)]
Merge "Attempt to fix MENU key issue." into jb-mr1-lockscreen-dev
The Android Automerger [Sat, 3 Nov 2012 00:34:34 +0000 (17:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jim Miller [Sat, 3 Nov 2012 00:33:41 +0000 (17:33 -0700)]
Merge "Clean up separator string in keyguard view" into jb-mr1-lockscreen-dev
Jim Miller [Sat, 3 Nov 2012 00:26:52 +0000 (17:26 -0700)]
Clean up separator string in keyguard view
The whitespace in the string was being removed by aapt.
Change-Id: I0c6a3e6960feb80cc0263d3f63005aee8bd0a7cd
Baligh Uddin [Fri, 2 Nov 2012 23:49:33 +0000 (16:49 -0700)]
Jim Miller [Fri, 2 Nov 2012 23:39:22 +0000 (16:39 -0700)]
Attempt to fix MENU key issue.
Bug
7467642
Change-Id: If9ee91fc17b454dd47945e800e90d76c0faa7f3d
Baligh Uddin [Fri, 2 Nov 2012 23:46:18 +0000 (16:46 -0700)]
Svetoslav Ganov [Fri, 2 Nov 2012 23:03:06 +0000 (16:03 -0700)]
View's visibility to the user not checking predecessor alpha.
1. A view is visible to the user if is attached to a visible window,
its visibility is VISIBLE, its alpha is not zero, all its
predecessors have visibility VISIBLE and non zero alpha, the
view is not fully covered by predecessors and is within the
screen.
The function that computes whether a view is visible for
accessibility purposes was not taking into account the
predecessors' alpha.
bug:
7454355
Change-Id: I7609f4366da260091d68e5b25832498843fd3d0a
Jim Miller [Fri, 2 Nov 2012 23:20:51 +0000 (16:20 -0700)]
Merge "Update DevicePolicyManager documentation with new keyguard flags" into jb-mr1-lockscreen-dev
Svetoslav Ganov [Fri, 2 Nov 2012 22:55:01 +0000 (15:55 -0700)]
Merge "Polish user selector accessibility." into jb-mr1-lockscreen-dev
Jeff Sharkey [Fri, 2 Nov 2012 22:52:49 +0000 (15:52 -0700)]
am
1c743650: Merge "Sanity check network stats coming from disk." into jb-mr1-dev
* commit '
1c743650addb9f632dd3eb39d4b17109ee4171f5':
Sanity check network stats coming from disk.
Jeff Sharkey [Fri, 2 Nov 2012 22:49:19 +0000 (15:49 -0700)]
Merge "Sanity check network stats coming from disk." into jb-mr1-dev
Amith Yamasani [Fri, 2 Nov 2012 22:38:17 +0000 (15:38 -0700)]
Remove power menu user switcher
Bug:
7466189
Change-Id: Ieb5e637f3e0b557eb616b5531a0a05a38a788fab
Jeff Sharkey [Fri, 2 Nov 2012 21:48:20 +0000 (14:48 -0700)]
Sanity check network stats coming from disk.
Throw early when structure is unstable, which allows the normal
recoverFromWtf() path to recover automatically.
Bug:
7440485
Change-Id: Ic150d17daac4de7c9ff3489025403a9b485b4620
Adam Cohen [Fri, 2 Nov 2012 22:35:18 +0000 (15:35 -0700)]
Merge "Fix pages disappearing (issue
7456885)" into jb-mr1-lockscreen-dev
Jim Miller [Fri, 2 Nov 2012 22:33:20 +0000 (15:33 -0700)]
Update DevicePolicyManager documentation with new keyguard flags
Change-Id: Idb1fa306a5706ba5b9543d7dff5450a4af5c394f
Svetoslav Ganov [Fri, 2 Nov 2012 18:49:22 +0000 (11:49 -0700)]
Polish user selector accessibility.
1. The current user was not announced as such.
2. The event for a user switch was not sent.
Change-Id: Ib3caf1f9e93ea1f0b5450246601bc37f416be6da
Amith Yamasani [Fri, 2 Nov 2012 22:30:21 +0000 (15:30 -0700)]
am
e96e0a1a: Merge "Resolve USER_ALL when inflating notification views." into jb-mr1-dev
* commit '
e96e0a1a759a524072cc3fb1dfd3ec01e18ef67f':
Resolve USER_ALL when inflating notification views.
Adam Cohen [Fri, 2 Nov 2012 22:25:32 +0000 (15:25 -0700)]
Fix pages disappearing (issue
7456885)
Change-Id: I51e4510da06a9b81aaefb8b2165234297ad4de92
Amith Yamasani [Fri, 2 Nov 2012 22:26:28 +0000 (15:26 -0700)]
Merge "Resolve USER_ALL when inflating notification views." into jb-mr1-dev
Laurent Tu [Fri, 2 Nov 2012 22:18:46 +0000 (15:18 -0700)]
am
685cc8c7: Merge "Decrement number of updates in LocationRequest" into jb-mr1-dev
* commit '
685cc8c7cba0bef5257bf00e9821e82a2dbbfc91':
Decrement number of updates in LocationRequest
Laurent Tu [Fri, 2 Nov 2012 22:15:28 +0000 (15:15 -0700)]
Merge "Decrement number of updates in LocationRequest" into jb-mr1-dev
Dianne Hackborn [Fri, 2 Nov 2012 22:13:36 +0000 (15:13 -0700)]
am
8ae0420e: Merge "Fix issue #
7343200: Fails to show wallpaper in the background for..." into jb-mr1-dev
* commit '
8ae0420e4b4169855608d404e389a66ce7253a36':
Fix issue #
7343200: Fails to show wallpaper in the background for...
Dianne Hackborn [Fri, 2 Nov 2012 22:10:16 +0000 (15:10 -0700)]
Merge "Fix issue #
7343200: Fails to show wallpaper in the background for..." into jb-mr1-dev
Raph Levien [Fri, 2 Nov 2012 22:08:43 +0000 (15:08 -0700)]
am
d9134e7a: Merge "Revert partial RTL\'ization of Editor.setError()" into jb-mr1-dev
* commit '
d9134e7aa1679878245b67ed1a318acb19d0c717':
Revert partial RTL'ization of Editor.setError()
Raph Levien [Fri, 2 Nov 2012 22:05:07 +0000 (15:05 -0700)]
Merge "Revert partial RTL'ization of Editor.setError()" into jb-mr1-dev
Geremy Condra [Fri, 2 Nov 2012 21:28:54 +0000 (14:28 -0700)]
am
0600ab78: am
b14c9900: am
a295ba44: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-dev
* commit '
0600ab78354894e0a8559dc8eacefbef02d1249b':
Change android.permission.SERIAL_PORT to signature|system.
Geremy Condra [Fri, 2 Nov 2012 21:26:34 +0000 (14:26 -0700)]
am
b14c9900: am
a295ba44: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-dev
* commit '
b14c9900cbbaca6361030d8fc8d6515cc9e06e10':
Change android.permission.SERIAL_PORT to signature|system.
Geremy Condra [Fri, 2 Nov 2012 21:22:31 +0000 (14:22 -0700)]
am
a295ba44: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-dev
* commit '
a295ba44793e5601c8574bdcb07313420aa6500c':
Change android.permission.SERIAL_PORT to signature|system.
Dianne Hackborn [Thu, 1 Nov 2012 23:28:16 +0000 (16:28 -0700)]
Fix issue #
7343200: Fails to show wallpaper in the background for...
...lockscreen sometimes and remains black / blank
The problem was that we were using the animation-side wallpaper state
in cases where it was not updated yet.
The mWallpaperTarget variable is propagated over to the animation
side when the main window manager state updates. On the animation
side, this is used by hideWallpapersLocked() to determine if the
current wallpaper should be hidden.
The problem is that various paths to hideWallpapersLocked() can
come from the layout side of the window manager instead of the
animation side. This causes the problem here because in this case
the wallpaper state may not have yet been propagated to the
animation side, so it could incorrectly decide to hide the wallpaper
because it thinks there is not a target when in fact a target is
set in the layout side. This won't get fixed until some time way
later that the layout side decides that a new window is being shown
that may need to have the wallpaper shown.
The fix here is pretty gross, but as safe as possible -- the
hideWallpapersLocked() function now uses either the animation or
layout wallpaper state depending on where the call to it is coming
from.
Change-Id: I9250bfeae6e11c1761760bcc696fdb33fb5c8a5f