OSDN Git Service
Geremy Condra [Mon, 12 Nov 2012 20:08:04 +0000 (12:08 -0800)]
am
8b73fc1a: (-s ours) am
2b4bc305: Merge "DO NOT MERGE Control access to tts objects" into jb-dev
* commit '
8b73fc1ad3c0698de1ee2a9a8672e55a66ac6f9e':
DO NOT MERGE Control access to tts objects
Scott Main [Mon, 12 Nov 2012 20:07:47 +0000 (12:07 -0800)]
am
65b59f50: am
1af587b3: am
4623c0d8: docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.
* commit '
65b59f5035686f63ebc7d4f8ccc1172b30618ee6':
docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.
Katie McCormick [Mon, 12 Nov 2012 18:07:09 +0000 (10:07 -0800)]
resolved conflicts for merge of
7f9a0535 to jb-mr1-dev
Change-Id: I8aee63b128a833ff8c2aaf2167850815033766dd
David Agnew [Sat, 10 Nov 2012 04:03:26 +0000 (23:03 -0500)]
When in vibrate mode, all notifications will vibrate.
(Unless the notification specifies no ringtone AND no
vibration, in which case it will remain silent.)
Bug:
7516358
Change-Id: I926d0fe0165b9622cd117e6c3ef6e3637772b444
Scott Main [Sat, 10 Nov 2012 04:59:18 +0000 (20:59 -0800)]
Merge "docs: update Tools landing page with info for developer options" into jb-mr1-dev
Scott Main [Sat, 10 Nov 2012 04:47:51 +0000 (20:47 -0800)]
docs: update Tools landing page with info for developer options
Change-Id: I1b2ce4e6a27b365a7ec8823fce56c613b1651b1d
Baligh Uddin [Fri, 9 Nov 2012 17:56:53 +0000 (09:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I293bcd411943a50960328eb2ef836f4b9ba2295e
Auto-generated-cl: translation import
Adam Cohen [Fri, 9 Nov 2012 00:35:45 +0000 (16:35 -0800)]
Merge "Preventing more than five widgets from being added in the carousel (issue
7502935)" into jb-mr1-dev
Adam Cohen [Fri, 9 Nov 2012 00:35:41 +0000 (16:35 -0800)]
Merge "Deferring size callbacks until boot completed (issue
7469267)" into jb-mr1-dev
Adam Cohen [Thu, 8 Nov 2012 21:01:08 +0000 (13:01 -0800)]
Deferring size callbacks until boot completed (issue
7469267)
-> Also bumping priority of the boot completed receiver
Change-Id: I7b68a29b4a8c927713bfbc1f4585f96ce0c47f35
Geremy Condra [Thu, 8 Nov 2012 22:26:39 +0000 (14:26 -0800)]
am
2b4bc305: Merge "DO NOT MERGE Control access to tts objects" into jb-dev
* commit '
2b4bc305a2305d1dda66e054d228b4708575ff8d':
DO NOT MERGE Control access to tts objects
Geremy Condra [Thu, 8 Nov 2012 22:22:47 +0000 (14:22 -0800)]
Merge "DO NOT MERGE Control access to tts objects" into jb-dev
Winson Chung [Thu, 8 Nov 2012 19:54:55 +0000 (11:54 -0800)]
Preventing more than five widgets from being added in the carousel (issue
7502935)
Change-Id: I26e6e154992e56b128d541578ffd3891776a3f7a
Dianne Hackborn [Thu, 8 Nov 2012 21:16:10 +0000 (13:16 -0800)]
Merge "Remove extraneous logs." into jb-mr1-dev
Dianne Hackborn [Thu, 8 Nov 2012 19:12:09 +0000 (11:12 -0800)]
Remove extraneous logs.
Change-Id: I4c47d36748de91bd6fddc419afbf59552bf63e9a
Daniel Sandler [Thu, 8 Nov 2012 17:48:28 +0000 (09:48 -0800)]
Merge "Don't crash if no ECA." into jb-mr1-lockscreen-dev
Daniel Sandler [Thu, 8 Nov 2012 17:42:54 +0000 (12:42 -0500)]
Don't crash if no ECA.
(Phone landscape pattern lock, for example.)
Bug:
7502613
Change-Id: I3f48c4351ea04db2d8ad9a410166f60257f3d954
Chris Wren [Thu, 8 Nov 2012 17:40:20 +0000 (09:40 -0800)]
Merge "allow pattern linear layout to manage message_area." into jb-mr1-lockscreen-dev
Chris Wren [Thu, 8 Nov 2012 17:28:15 +0000 (12:28 -0500)]
allow pattern linear layout to manage message_area.
Bug:
7501923
Change-Id: I5126e760d8567380e2041ca01791f14c7b054adb
Daniel Sandler [Thu, 8 Nov 2012 17:28:13 +0000 (09:28 -0800)]
Merge "Only show the bouncer for the assistant if secure." into jb-mr1-lockscreen-dev
Daniel Sandler [Thu, 8 Nov 2012 14:58:27 +0000 (09:58 -0500)]
Only show the bouncer for the assistant if secure.
We do this by using the helpful tools in
KeyguardActivityLauncher which do all the right callbacks
and stuff.
(This assumes the assist gesture is sufficiently hard to
false that we don't need the extra step of bouncing the
glowpad unlock affordance.)
Bug:
7500637
Change-Id: Id68cb85cdfd741f43a5bce69118ec4209125d785
John Spurlock [Thu, 8 Nov 2012 15:29:26 +0000 (10:29 -0500)]
Address comments from merged "Fix remaining jank in sec..."
Cleanup based on post-merge comments on:
I554ddffb7981488fa8a81933842b0c7730e775f3
Bug:
7482560
Change-Id: I06b2bc91da9dfddd06db69efb9e7ad45c304f709
John Spurlock [Thu, 8 Nov 2012 14:08:14 +0000 (09:08 -0500)]
Minimal fix for stuck google now.
Bug:
7500409
Change-Id: I1570d72e08fbe520ac07eed2ee40b6571fa1fe3c
Jim Miller [Thu, 8 Nov 2012 10:31:07 +0000 (02:31 -0800)]
Merge "Fix bug where SearchPanel wasn't launching assist intent when keyguard is gone." into jb-mr1-lockscreen-dev
Michael Jurka [Thu, 8 Nov 2012 08:32:29 +0000 (00:32 -0800)]
Enforce max number of 5 lockscreen widgets
Change-Id: I7b7fca18174736c8f1aa0018f7399982c80b1cb0
Jim Miller [Thu, 8 Nov 2012 09:20:55 +0000 (01:20 -0800)]
Fix bug where SearchPanel wasn't launching assist intent when keyguard is gone.
Fixes bug
7499778
Change-Id: I450755b8839717f0f13241cb57f0015cf78569d9
Adam Cohen [Thu, 8 Nov 2012 09:03:49 +0000 (01:03 -0800)]
Merge "Adding user activity when the challenge is slid down" into jb-mr1-lockscreen-dev
Jim Miller [Thu, 8 Nov 2012 09:00:12 +0000 (01:00 -0800)]
Merge "Don't show ECA in landscape mode on phones." into jb-mr1-lockscreen-dev
Jim Miller [Thu, 8 Nov 2012 05:23:32 +0000 (21:23 -0800)]
Don't show ECA in landscape mode on phones.
Fixes bug
7490941
Change-Id: I8a65aed0b4efc8676b95ad5fea6a7f4ac7d944d0
Jim Miller [Thu, 8 Nov 2012 08:51:25 +0000 (00:51 -0800)]
Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev
Adam Cohen [Thu, 8 Nov 2012 08:25:47 +0000 (00:25 -0800)]
Adding user activity when the challenge is slid down
Change-Id: I54a7dcf79718090dac6ec5991185712cc2abca37
Jim Miller [Thu, 8 Nov 2012 08:04:29 +0000 (00:04 -0800)]
Add mechanism to kick keyguard to show the assistant
Fixes bug
7499778
Change-Id: Ic9ea514feb489feeee6716f40bdb9792842f9515
Adam Powell [Thu, 8 Nov 2012 08:28:58 +0000 (00:28 -0800)]
Merge "add bouncer frame to glowpad." into jb-mr1-lockscreen-dev
Adam Powell [Thu, 8 Nov 2012 08:03:34 +0000 (00:03 -0800)]
Keyguard - force showing the status bar
Change-Id: I168293497a829346ba6f9566370c418ef1a09f8f
Chris Wren [Thu, 8 Nov 2012 00:18:46 +0000 (19:18 -0500)]
add bouncer frame to glowpad.
Bug:
7497916
Change-Id: I6bddbfc91c89b0855eba0dcec46bc1b88684b8ad
Jim Miller [Thu, 8 Nov 2012 06:40:20 +0000 (22:40 -0800)]
Disable interactive mode for full-screen security views in keyguard.
Change-Id: Ied038ba96ba3a6e6f6b4bd25a4c5be74814596fe
Adam Cohen [Thu, 8 Nov 2012 06:09:48 +0000 (22:09 -0800)]
Merge "Clean up some flashy jank (issue
7454766)" into jb-mr1-lockscreen-dev
Winson Chung [Thu, 8 Nov 2012 05:47:12 +0000 (21:47 -0800)]
Synchronizing bouncer duration with page scaling duration.
Change-Id: I9fba381582a083ce2ab26375698c5a6f3d554a1b
Adam Cohen [Thu, 8 Nov 2012 04:50:39 +0000 (20:50 -0800)]
Clean up some flashy jank (issue
7454766)
Change-Id: I809f3afbbb70e82847aa4851d20058a2c483a32e
Daniel Sandler [Thu, 8 Nov 2012 05:18:35 +0000 (21:18 -0800)]
Merge "Compress lockscreen's account login fallback to fit." into jb-mr1-lockscreen-dev
Amith Yamasani [Thu, 8 Nov 2012 05:16:00 +0000 (21:16 -0800)]
am
3fe2cb4d: Merge "Don\'t cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev
* commit '
3fe2cb4db60827889abd1f971910f807ae346488':
Don't cancel any notifications that are meant for all users, if no package is specified.
Amith Yamasani [Thu, 8 Nov 2012 05:12:54 +0000 (21:12 -0800)]
Merge "Don't cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev
Daniel Sandler [Thu, 8 Nov 2012 05:09:37 +0000 (00:09 -0500)]
Compress lockscreen's account login fallback to fit.
- ECA will not be shown in this mode
- The login button shares a row with the password field
Nice and tidy.
Bug:
7456674
Change-Id: I38d04dcb7ee32d0b289f03f9e8dcbe38ba23a119
Adam Powell [Thu, 8 Nov 2012 05:06:31 +0000 (21:06 -0800)]
Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev
Winson Chung [Thu, 8 Nov 2012 04:57:06 +0000 (20:57 -0800)]
Adding workaround to fix issue where the bouncer animation had the wrong pivot.
Change-Id: I500fb765cf206b97cc0b585c195cc647cc8e63f1
Adam Powell [Thu, 8 Nov 2012 04:34:00 +0000 (20:34 -0800)]
Fiddle with keyguard glowpad layouts
Also add hierarchyviewer support for KeyguardSecurityView LayoutParams
Bug
7497272
Bug
7459668
Change-Id: I5d03751571d0af66f4c9d08a9d9ca476b32735ac
Jim Miller [Thu, 8 Nov 2012 03:52:08 +0000 (19:52 -0800)]
Merge "Don't handle click events on the emergency button in bouncer mode" into jb-mr1-lockscreen-dev
Daniel Sandler [Thu, 8 Nov 2012 03:28:04 +0000 (19:28 -0800)]
Merge "New asset for assist affordance on lockscreen." into jb-mr1-lockscreen-dev
Adam Powell [Thu, 8 Nov 2012 02:31:45 +0000 (18:31 -0800)]
Merge "Use stable layouts for keyguard/SlidingChallengeLayout" into jb-mr1-lockscreen-dev
Daniel Sandler [Thu, 8 Nov 2012 02:17:57 +0000 (21:17 -0500)]
New asset for assist affordance on lockscreen.
Bug:
7468726
Change-Id: Ia906256f667597ac92b07ee0f5b967048b5e25d5
Adam Powell [Thu, 8 Nov 2012 02:07:15 +0000 (18:07 -0800)]
Use stable layouts for keyguard/SlidingChallengeLayout
When coming back from the secure camera we will be transitioning from
fullscreen back to not-fullscreen with regard to the status bar. Flag
SlidingChallengeLayout to force the window to have stable insets so
that our layout doesn't jump around during this transition.
Set the same flag in MultiPaneChallengeLayout as well so that similar
cases with other activities are also covered.
Bug
7498950
Change-Id: I1b65e04d1404e764ddad29472b70cf791d6801f9
Jim Miller [Thu, 8 Nov 2012 01:32:30 +0000 (17:32 -0800)]
Don't handle click events on the emergency button in bouncer mode
This fixes a bug where the emergency call button was hidden, but not
gone. This adds a call to setVisibility(INVISIBLE) when the alpha
is animated to 0 and restore it when bouncer mode is dismissed.
Fixes bug
7498389
Change-Id: I0898542ff7c666c8f41175a330b72d3450475739
Jim Miller [Thu, 8 Nov 2012 02:09:14 +0000 (18:09 -0800)]
Merge "Attempt to fix NegativeArraySizeException crash in keyguard" into jb-mr1-lockscreen-dev
Daniel Sandler [Thu, 8 Nov 2012 02:03:10 +0000 (18:03 -0800)]
Merge "Make dismissKeyguardLw use KeyguardViewMediator.dismiss()." into jb-mr1-lockscreen-dev
Winson Chung [Thu, 8 Nov 2012 01:50:17 +0000 (17:50 -0800)]
Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug
7493984)" into jb-mr1-lockscreen-dev
Winson Chung [Thu, 8 Nov 2012 01:17:33 +0000 (17:17 -0800)]
Fixing issue where you can reorder/delete a non-widget page. (Bug
7493984)
- Laying out the drop target without padding from the multiuser picker
Change-Id: Icd3528a13f84a789341a841645bfde4e51fd1747
Scott Main [Thu, 8 Nov 2012 01:33:09 +0000 (17:33 -0800)]
am
1af587b3: am
4623c0d8: docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.
* commit '
1af587b346035320363a08c190f8b61a69cf0e7c':
docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.
Scott Main [Thu, 8 Nov 2012 01:30:22 +0000 (17:30 -0800)]
am
4623c0d8: docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.
* commit '
4623c0d842403bf2ae4b622590325c3635aaf563':
docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.
Scott Main [Wed, 7 Nov 2012 19:08:01 +0000 (11:08 -0800)]
docs: Add basic tool help pages for SDK and AVD Manager.
The SDK Manager page is needed particularly as a reference by
some pages rather than pointing to the installation guide.
Change-Id: Ie835e310f62cdc88bd6318e82f48e36bdd8e117a
Adam Cohen [Thu, 8 Nov 2012 01:08:30 +0000 (17:08 -0800)]
Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev
Jim Miller [Thu, 8 Nov 2012 01:01:34 +0000 (17:01 -0800)]
Merge "Add one more check for detecting crashes while inflating multiuser widget" into jb-mr1-lockscreen-dev
Amith Yamasani [Thu, 8 Nov 2012 00:58:30 +0000 (16:58 -0800)]
Don't cancel any notifications that are meant for all users, if no package is specified.
Bug:
7490028
Otherwise notifications such as the USB debugging and OTA notifications will be
dismissed when any user is stopped.
Change-Id: I0ae0c1136a999dd3aade99ca9e71c714b359eab4
Adam Cohen [Thu, 8 Nov 2012 00:26:46 +0000 (16:26 -0800)]
Fixing up overscroll asset / sizing
-> No more jaggies! yay (issue
7459049)
-> Fixed up weird overscroll state (issue
7489094)
Change-Id: I5d6714a6f5f007ea0f73e4cf34a20572c5f43f64
Svetoslav Ganov [Thu, 8 Nov 2012 00:39:21 +0000 (16:39 -0800)]
Merge "Slide unlock cannot get accessibility focus." into jb-mr1-lockscreen-dev
Jim Miller [Thu, 8 Nov 2012 00:15:13 +0000 (16:15 -0800)]
Add one more check for detecting crashes while inflating multiuser widget
Fix bug
7437751
Change-Id: I2e1d94458db9e56e049dae32f088b13a21803217
Jim Miller [Thu, 8 Nov 2012 00:05:38 +0000 (16:05 -0800)]
Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev
Jim Miller [Wed, 7 Nov 2012 05:46:11 +0000 (21:46 -0800)]
Implement fallback clock in keyguard
This clock is shown if widgets are ever disabled by DPM and the
default clock package is not enabled.
Fixes bug
7469367
Change-Id: I8cf140c0fc00dd56265e3a332aff2fe3b41e3ec0
Svetoslav Ganov [Wed, 7 Nov 2012 23:54:56 +0000 (15:54 -0800)]
Slide unlock cannot get accessibility focus.
1. There are two overlaid views, one is the GlowPadView and the
other is the SlidingChallengeLayout. Since the GlowPadView is
on top of the other view it has to consume the hover events or
they will be dispatched to the view behind it which results
the the GlowPadView not getting accessibility focus.
bug:
7496770
Change-Id: Iae3b1777e490c56e33560a016fc04a92226bfb66
Michael Jurka [Wed, 7 Nov 2012 23:01:56 +0000 (15:01 -0800)]
Merge "Fix bug where newly added widget wasn't always shown" into jb-mr1-lockscreen-dev
Adam Cohen [Wed, 7 Nov 2012 22:44:11 +0000 (14:44 -0800)]
Merge "Fixing up glowpad scaling issues (issue
7494378)" into jb-mr1-lockscreen-dev
Adam Cohen [Wed, 7 Nov 2012 22:28:23 +0000 (14:28 -0800)]
Fixing up glowpad scaling issues (issue
7494378)
Change-Id: I55c0f7a3774d42d4f5893b12bc0c08690268e351
Michael Jurka [Wed, 7 Nov 2012 21:45:53 +0000 (13:45 -0800)]
Fix bug where newly added widget wasn't always shown
Bug:
7491900
Change-Id: I878eea745ee6127b757aa945631c1a4eb08d9936
Adam Powell [Wed, 7 Nov 2012 22:14:24 +0000 (14:14 -0800)]
Merge "Fix keyguard measurement bugs" into jb-mr1-lockscreen-dev
Sascha Prueter [Wed, 7 Nov 2012 22:12:40 +0000 (14:12 -0800)]
am
972dd431: Merge "Final icon for notifications panel" into jb-mr1-dev
* commit '
972dd431f81432f1bbb33d2e7f34fcd5f4764870':
Final icon for notifications panel
Sascha Prueter [Wed, 7 Nov 2012 22:08:21 +0000 (14:08 -0800)]
Merge "Final icon for notifications panel" into jb-mr1-dev
Adam Powell [Wed, 7 Nov 2012 22:07:23 +0000 (14:07 -0800)]
Fix keyguard measurement bugs
Bug
7493748
Bug
7493764
Change-Id: I2182ec4347eefc80198e675684bc5d195f947763
Victoria Lease [Wed, 7 Nov 2012 22:01:41 +0000 (14:01 -0800)]
am
ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev
* commit '
ad84f7f46b0207a7ad316b4df37c1f02c889cca9':
disable geofences for secondary users
Victoria Lease [Wed, 7 Nov 2012 21:55:58 +0000 (13:55 -0800)]
Merge "disable geofences for secondary users" into jb-mr1-dev
Chris Wren [Wed, 7 Nov 2012 21:49:03 +0000 (13:49 -0800)]
Merge "add logging to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev
Chris Wren [Wed, 7 Nov 2012 21:38:33 +0000 (16:38 -0500)]
add logging to enableUserSelectorIfNecessary.
Bug:
7437751
Change-Id: I4a223ac68f780dac212ee5ed0729d59278fd1e4b
Daniel Sandler [Wed, 7 Nov 2012 20:07:12 +0000 (15:07 -0500)]
Make dismissKeyguardLw use KeyguardViewMediator.dismiss().
It previously did some of the logic of dismiss() itself:
checking to see if the KG is secure, and if not, proceeding
to call keyguardDone() to actually hide everything. But now
that we have the "bouncer" authentication UI, the WM should
let the keyguard challenge the user to see if even a secure
keyguard should be dismissed. (Insecure keyguards should
behave exactly has they did before.)
Unless, of course, the KVM is in a "dismissable" state, in
which case it's safe to call keyguardDone() directly. (This
can happen if the user has *already* authenticated and we're
ending up in this codepath in response.)
Bug:
7458531
Change-Id: I9571acf19f9bcc16bba7a826f916da7be8ca9c33
Chris Wren [Wed, 7 Nov 2012 20:38:04 +0000 (12:38 -0800)]
Merge "add some defensive code to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev
Daniel Sandler [Wed, 7 Nov 2012 20:37:28 +0000 (12:37 -0800)]
am
afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev
* commit '
afc5210a811da3824d75e32d998370203aba1968':
Fix docs to refer to the correct class.
Daniel Sandler [Wed, 7 Nov 2012 20:35:00 +0000 (12:35 -0800)]
Merge "Fix docs to refer to the correct class." into jb-mr1-dev
Chris Wren [Wed, 7 Nov 2012 20:20:27 +0000 (15:20 -0500)]
add some defensive code to enableUserSelectorIfNecessary.
Bug:
7437751
Change-Id: I3f8e317624f158fce0d58be69b733699a208d802
Baligh Uddin [Wed, 7 Nov 2012 19:58:11 +0000 (11:58 -0800)]
am
32226b73: (-s ours) Import translations. DO NOT MERGE
* commit '
32226b73ca908b2ee45c6ee651437aec2ab93489':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 7 Nov 2012 19:54:30 +0000 (11:54 -0800)]
Import translations. DO NOT MERGE
Change-Id: I82793ad9ed66b4e2924b3c32a2292bad69b56579
Auto-generated-cl: translation import
Baligh Uddin [Wed, 7 Nov 2012 19:51:37 +0000 (11:51 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Adam Cohen [Wed, 7 Nov 2012 19:51:05 +0000 (11:51 -0800)]
Merge "Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue
7492235)" into jb-mr1-lockscreen-dev
Adam Cohen [Wed, 7 Nov 2012 19:45:30 +0000 (11:45 -0800)]
Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue
7492235)
Change-Id: I736816dac8cea47632fbdbc75b367f2c6216dff7
Baligh Uddin [Wed, 7 Nov 2012 19:42:46 +0000 (11:42 -0800)]
am
fc958f12: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
fc958f12f639a6a9cb676b0d1e30ed67b4f5a455':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 7 Nov 2012 19:39:41 +0000 (11:39 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 7 Nov 2012 19:34:53 +0000 (11:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia0befbcb0a476a7afffa3cd748625fa9f32e826f
Auto-generated-cl: translation import
John Spurlock [Wed, 7 Nov 2012 19:31:29 +0000 (11:31 -0800)]
Merge "Low battery dialog should use UserHandle.CURRENT." into jb-mr1-dev
Romain Guy [Wed, 7 Nov 2012 19:15:35 +0000 (11:15 -0800)]
Merge "Respond to ticks when a timezone is set and it doesn't display seconds Bug #
7489774" into jb-mr1-dev
Daniel Sandler [Wed, 7 Nov 2012 19:04:42 +0000 (14:04 -0500)]
Fix docs to refer to the correct class.
Bug:
6676920
Change-Id: Ib79635cb3ff464b4686268fcf64b99cacaa9e627
Roman Nurik [Wed, 7 Nov 2012 17:52:44 +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
Baligh Uddin [Wed, 7 Nov 2012 17:46:54 +0000 (09:46 -0800)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Daniel Sandler [Wed, 7 Nov 2012 17:42:35 +0000 (09:42 -0800)]
Merge "Show the assist ring on center-button longpress on lockscreen." into jb-mr1-lockscreen-dev