OSDN Git Service
Adam Cohen [Wed, 7 Nov 2012 19:13:37 +0000 (11:13 -0800)]
am
7741e620: Merge "Making sure the sticky widget logic works with music" into jb-mr1-lockscreen-dev
* commit '
7741e6209ab4c6425ee4156631f54fe9bfce5fc3':
Making sure the sticky widget logic works with music
Adam Cohen [Wed, 7 Nov 2012 19:13:34 +0000 (11:13 -0800)]
am
0e1608c0: Merge "Attempted fix for issue
7469415" into jb-mr1-lockscreen-dev
* commit '
0e1608c0277155c49f78a0f6980e5c5cb9afc0b8':
Attempted fix for issue
7469415
Amith Yamasani [Wed, 7 Nov 2012 19:13:31 +0000 (11:13 -0800)]
am
5eac4d85: am
f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev
* commit '
5eac4d852bdc62964acd1c8805b6e9cd8301f262':
Chris Wren [Wed, 7 Nov 2012 19:13:27 +0000 (11:13 -0800)]
am
9f79d0db: Merge "make challengeShowing sticky across bounce." into jb-mr1-lockscreen-dev
* commit '
9f79d0db09818e94b6c2089f952d1ef42e1e1fae':
make challengeShowing sticky across bounce.
Chris Wren [Wed, 7 Nov 2012 19:13:24 +0000 (11:13 -0800)]
am
f7e47a00: Merge "specify start value: Drawables don\'t have getAlpha(). also, some clean up." into jb-mr1-lockscreen-dev
* commit '
f7e47a003ada4b225dcafe722ab0de35a846b58a':
specify start value: Drawables don't have getAlpha(). also, some clean up.
The Android Open Source Project [Wed, 7 Nov 2012 18:19:50 +0000 (10:19 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I3d0120226503d1aa5538039f17811e01131d99c8
Roman Nurik [Wed, 7 Nov 2012 17:52:36 +0000 (09:52 -0800)]
am
512950a9: Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev
* commit '
512950a9713f79f2900c73201906436d12da8639':
docs: Minor Nexus 10 fix in Device Art Generator
Roman Nurik [Wed, 7 Nov 2012 17:49:37 +0000 (09:49 -0800)]
Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev
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
Svetoslav Ganov [Wed, 7 Nov 2012 01:49:15 +0000 (17:49 -0800)]
am
5fff5f01: Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev
* commit '
5fff5f01f8af05164d5d7be72bdadee46360ba92':
Make partially visible widget pages not important for accessibility.
Svetoslav Ganov [Wed, 7 Nov 2012 01:46:32 +0000 (17:46 -0800)]
Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev
Irfan Sheriff [Wed, 7 Nov 2012 01:39:45 +0000 (17:39 -0800)]
Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev
Sascha Prueter [Wed, 7 Nov 2012 01:14:59 +0000 (17:14 -0800)]
am
872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev
* commit '
872965bb22ba74a06b755547883c5d0de62bb956':
Use a consistent policy for filtering wake keys.
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:18:23 +0000 (16:18 -0800)]
am
1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #
7442935" into jb-mr1-dev
* commit '
1b3b2544e647a40094b9c9df2c94e34df7921da5':
Dismiss error icon on setError(null) [regression] Bug #
7442935
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:10:55 +0000 (16:10 -0800)]
am
4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev
* commit '
4a1b6e42424d08da0d22a24464e568034ea557ee':
Camera: Document new video snapshot picture size behavior.
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
Irfan Sheriff [Sun, 4 Nov 2012 06:20:38 +0000 (23:20 -0700)]
Stop supplicant and dhcp before start
Bug:
7227463
Change-Id: Iaa0df7522edc38d25fae2bbda8d24490e997e733
Svetoslav Ganov [Tue, 6 Nov 2012 23:22:11 +0000 (15:22 -0800)]
Make partially visible widget pages not important for accessibility.
1. If the lockscreen has more than one widet, the left and right widget
pages are partially on the screen and visible. Therefore they may
take accessibility focus so the user will hear a prompt that he is
on the partially visible widget page but will not be able to interact
with it - confusing. This change makes partially shown windget frames
not important for accessibility.
bug:
7454355
Change-Id: I475b21e215474a4421acaec485cde64dc4e2aee5
Victoria Lease [Tue, 6 Nov 2012 23:09:37 +0000 (15:09 -0800)]
am
e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev
* commit '
e6299d5af702dd17eb3585dbe84d29c289bfa8da':
Fires geofence if the device is already in the geofence area.
Robert Greenwalt [Tue, 6 Nov 2012 23:07:35 +0000 (15:07 -0800)]
Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev
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
Adam Cohen [Tue, 6 Nov 2012 21:40:29 +0000 (13:40 -0800)]
Merge "Making sure the sticky widget logic works with music" into jb-mr1-lockscreen-dev
The Android Open Source Project [Tue, 6 Nov 2012 21:26:48 +0000 (13:26 -0800)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I6206907ad603bf70ca2c9ca3b9afc136fe2a1695
Adam Cohen [Tue, 6 Nov 2012 21:23:24 +0000 (13:23 -0800)]
Merge "Attempted fix for issue
7469415" into jb-mr1-lockscreen-dev
Adam Cohen [Tue, 6 Nov 2012 19:46:25 +0000 (11:46 -0800)]
Making sure the sticky widget logic works with music
-> Also, ensure that subsequent calls to showAppropriateWidget
don't blow away your current page.
Change-Id: I7195e35f306526c371b9546ab48bc408868eff51
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:58:39 +0000 (12:58 -0800)]
am
f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev
* commit '
f763b71756d4d810e78e368fbcd56ff8a844f62c':
Authenticate correct user's account when pattern fails multiple times.
Amith Yamasani [Tue, 6 Nov 2012 20:58:35 +0000 (12:58 -0800)]
am
f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev
* commit '
f763b71756d4d810e78e368fbcd56ff8a844f62c':
Authenticate correct user's account when pattern fails multiple times.
Chris Wren [Tue, 6 Nov 2012 20:56:56 +0000 (12:56 -0800)]
Merge "make challengeShowing sticky across bounce." into jb-mr1-lockscreen-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
John Spurlock [Tue, 6 Nov 2012 20:44:28 +0000 (12:44 -0800)]
am
65cbcbea: Remove add widget transition jank (insecure).
* commit '
65cbcbea8a88a14dd9a001d23d09f0a02b0b3805':
Remove add widget transition jank (insecure).
John Spurlock [Tue, 6 Nov 2012 20:44:21 +0000 (12:44 -0800)]
am
ae73c690: Fix regression in camera transition.
* commit '
ae73c6908ffd3c450d56a4fde95513cfff19d8a2':
Fix regression in camera transition.
Michael Jurka [Tue, 6 Nov 2012 20:44:18 +0000 (12:44 -0800)]
am
08924d00: Merge "Supporting EXTRA_APPWIDGET_OPTIONS correctly" into jb-mr1-lockscreen-dev
* commit '
08924d007f2323b6fb57c858732d32b1083da639':
Supporting EXTRA_APPWIDGET_OPTIONS correctly
Jim Miller [Tue, 6 Nov 2012 20:44:15 +0000 (12:44 -0800)]
am
7dfc588a: Workaround for layout bug in SIM PIN/PUK views
* commit '
7dfc588a9db81a797b881aab41ac8951bebb033d':
Workaround for layout bug in SIM PIN/PUK views
Jim Miller [Tue, 6 Nov 2012 20:44:07 +0000 (12:44 -0800)]
am
87d0366d: Fix NPE caused by applications that try to hide keyguard while it\'s not showing
* commit '
87d0366d9e41a0fb1e20cc021ba391ed92fab385':
Fix NPE caused by applications that try to hide keyguard while it's not showing
Svetoslav Ganov [Tue, 6 Nov 2012 20:44:03 +0000 (12:44 -0800)]
am
bb8abae5: am
0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev
* commit '
bb8abae507119612b4168b951354516b0bf7112d':
Mike Cleron [Tue, 6 Nov 2012 20:44:00 +0000 (12:44 -0800)]
am
624ea441: am
c87f198b: Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev
* commit '
624ea44120dcf8e7305bbb54072417f189855187':
Romain Guy [Tue, 6 Nov 2012 20:43:55 +0000 (12:43 -0800)]
am
06da3378: am
6c642089: Merge "Add programmatic access to setters in TextClock Bug #
7478328" into jb-mr1-dev
* commit '
06da33787620b20f59db8ae8df2b3414fa724fc2':
Winson Chung [Tue, 6 Nov 2012 20:43:52 +0000 (12:43 -0800)]
am
48275d2d: Adding bouncer animation on PagedView. (Bug
7459660)
* commit '
48275d2de99ff2556031929c48f295d3f93447b6':
Adding bouncer animation on PagedView. (Bug
7459660)
Adam Powell [Tue, 6 Nov 2012 20:43:49 +0000 (12:43 -0800)]
am
9ff6d4f8: Merge "Keyguard sanity checks for when layout is not yet complete" into jb-mr1-lockscreen-dev
* commit '
9ff6d4f8db8d3d7a6f22afa726685feb47694fbe':
Keyguard sanity checks for when layout is not yet complete
Adam Cohen [Tue, 6 Nov 2012 20:43:46 +0000 (12:43 -0800)]
am
79e0f875: Merge "Fix small widgets not showing up on tablet (issue
7471516)" into jb-mr1-lockscreen-dev
* commit '
79e0f875002d7bde5cf71053f9e9f054e9b5ffa2':
Fix small widgets not showing up on tablet (issue
7471516)
Baligh Uddin [Tue, 6 Nov 2012 20:43:42 +0000 (12:43 -0800)]
Adam Powell [Tue, 6 Nov 2012 20:43:39 +0000 (12:43 -0800)]
am
5da6430f: Optimize keyguard/IME interactions
* commit '
5da6430fff7812e58ee7e9a05c62d72c36f366c8':
Optimize keyguard/IME interactions
Joe Malin [Tue, 6 Nov 2012 20:43:36 +0000 (12:43 -0800)]
Chris Wren [Tue, 6 Nov 2012 20:39:47 +0000 (12:39 -0800)]
Merge "specify start value: Drawables don't have getAlpha(). also, some clean up." into jb-mr1-lockscreen-dev
Chris Wren [Tue, 6 Nov 2012 19:45:18 +0000 (14:45 -0500)]
make challengeShowing sticky across bounce.
Bug:
7482335
Change-Id: I94811c778c66c78655988f7ff6e4c6d59dac831d
Proto-Id: I3e10968c2a627ac392f39ffc3a6ae5fb33f78117
Chris Wren [Tue, 6 Nov 2012 19:01:24 +0000 (14:01 -0500)]
specify start value: Drawables don't have getAlpha().
also, some clean up.
Bug:
7477513
Change-Id: Iaf05c1ae78ed4e7ba9d4cd3c713b5862a04b61f6
Proto-Id: I28d0569b88a978e1fff2acad1869bc10751dc37f
The Android Open Source Project [Tue, 6 Nov 2012 20:17:05 +0000 (12:17 -0800)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I72634b08506c4fed29edd474553cb416dce9cc8e
Adam Cohen [Tue, 6 Nov 2012 19:24:23 +0000 (11:24 -0800)]
Attempted fix for issue
7469415
Change-Id: Ica81bf4197dc2c4fadd8fa07cb9c895b55b5702b
Robert Greenwalt [Tue, 2 Oct 2012 23:14:27 +0000 (16:14 -0700)]
Add Coin graphic to premium-sms dialog.
bug:
7205024
bug:
7180681
Change-Id: Iece09d89598aefc5fd879587c65e5b179569e8e5
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
Roman Nurik [Tue, 6 Nov 2012 14:29:07 +0000 (06:29 -0800)]
docs: Minor Nexus 10 fix in Device Art Generator
Change-Id: Ie0fb08d484de812f064d141551963bc37c91267b
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