OSDN Git Service
Winson Chung [Fri, 26 Oct 2012 23:24:01 +0000 (16:24 -0700)]
Merge "Making the PagedView full screen on tablets." into jb-mr1-lockscreen-dev
Dianne Hackborn [Fri, 26 Oct 2012 23:21:48 +0000 (16:21 -0700)]
am
8a6f6a8c: Merge "Fix issue #
7419050: Time is not getting updated after launching Clock" into jb-mr1-dev
* commit '
8a6f6a8ca9824891cc841d8c6ebd72a74c7d2580':
Fix issue #
7419050: Time is not getting updated after launching Clock
Dianne Hackborn [Fri, 26 Oct 2012 23:18:29 +0000 (16:18 -0700)]
Merge "Fix issue #
7419050: Time is not getting updated after launching Clock" into jb-mr1-dev
Adam Cohen [Fri, 26 Oct 2012 23:11:23 +0000 (16:11 -0700)]
Merge "3D carousel initial stab -- paging outlines / alpha effects pending design" into jb-mr1-lockscreen-dev
Adam Cohen [Thu, 25 Oct 2012 02:25:44 +0000 (19:25 -0700)]
3D carousel initial stab -- paging outlines / alpha effects pending design
Change-Id: I2d9851472472a0affa9b46b2508fc7a1cb8c9779
Michael Jurka [Fri, 26 Oct 2012 23:10:23 +0000 (16:10 -0700)]
Merge "Fix bug where it wasn't possible to add widgets" into jb-mr1-lockscreen-dev
Michael Jurka [Fri, 26 Oct 2012 23:06:12 +0000 (16:06 -0700)]
Fix bug where it wasn't possible to add widgets
- Happened when you were down to 0 widgets (which
won't be possible in future, but fixing this as
well)
Amith Yamasani [Fri, 26 Oct 2012 22:57:10 +0000 (15:57 -0700)]
am
08482454: Merge "Fix the user name for the owner." into jb-mr1-dev
* commit '
084824548f9706db8356ed4480c282288ffc0bd0':
Fix the user name for the owner.
Amith Yamasani [Fri, 26 Oct 2012 22:54:55 +0000 (15:54 -0700)]
Merge "Fix the user name for the owner." into jb-mr1-dev
Winson Chung [Fri, 26 Oct 2012 22:41:27 +0000 (15:41 -0700)]
Making the PagedView full screen on tablets.
- Fixing issue where last page would not be reorderable on devices that have no camera.
Change-Id: If810d9fc95d180a54f8cec793099ccaa59b2ff15
Fabrice Di Meglio [Fri, 26 Oct 2012 22:31:43 +0000 (15:31 -0700)]
am
07ce0ca2: Merge "Fix bug #
7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev
* commit '
07ce0ca265274c5ba95e6ec3e0950e38b8ce97ea':
Fix bug #
7419054 TextView Drawables resolution is broken in RTL mode
Jeff Brown [Fri, 26 Oct 2012 22:28:41 +0000 (15:28 -0700)]
am
4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev
* commit '
4e0bf7c48638f5c9b222c8781809019df0b39048':
Add MediaRouter API to get presentation display.
Daniel Sandler [Fri, 26 Oct 2012 22:28:37 +0000 (15:28 -0700)]
am
50e1f9eb: Merge "Final icon for (Day)dreams." into jb-mr1-dev
* commit '
50e1f9eb9333451f0e07b1878b5a78bbcdec27ab':
Final icon for (Day)dreams.
Adam Powell [Fri, 26 Oct 2012 22:25:23 +0000 (15:25 -0700)]
Merge "Fix lockscreen slider bugs" into jb-mr1-lockscreen-dev
Fabrice Di Meglio [Fri, 26 Oct 2012 22:18:30 +0000 (15:18 -0700)]
Merge "Fix bug #
7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev
Adam Powell [Fri, 26 Oct 2012 22:12:30 +0000 (15:12 -0700)]
Fix lockscreen slider bugs
Integrate from proto app
* Positioning at the lower end
* Transparency animations
* Show security frame when dragging until it fully settles
Change-Id: Ic5e5b0bbaa50a123c3492b63c15df3ffba37832d
Jeff Brown [Fri, 26 Oct 2012 20:52:02 +0000 (13:52 -0700)]
Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev
Dianne Hackborn [Fri, 26 Oct 2012 20:39:41 +0000 (13:39 -0700)]
Fix issue #
7419050: Time is not getting updated after launching Clock
Change-Id: Iaa8de2d3732bffd63fcd4fafba50955d1776611d
John Spurlock [Fri, 26 Oct 2012 20:04:54 +0000 (13:04 -0700)]
Merge "Implement "sticky" widget logic." into jb-mr1-lockscreen-dev
John Spurlock [Fri, 26 Oct 2012 19:29:59 +0000 (15:29 -0400)]
Implement "sticky" widget logic.
(frameworks/base)
Used after screen-off, and after launching camera.
Bug:
7418847
Change-Id: I5179e6af13be4494fde77fde2cdb5610ab888dac
Daniel Sandler [Fri, 26 Oct 2012 19:39:06 +0000 (12:39 -0700)]
Merge "Make the add widget button hitrectangle smaller." into jb-mr1-lockscreen-dev
Daniel Sandler [Fri, 26 Oct 2012 19:29:12 +0000 (12:29 -0700)]
Merge "Final icon for (Day)dreams." into jb-mr1-dev
Daniel Sandler [Fri, 26 Oct 2012 19:11:53 +0000 (15:11 -0400)]
Final icon for (Day)dreams.
Bug:
7395321
Change-Id: I20ec252a1bf69664a6687016d281ad680d76a48f
Daniel Sandler [Fri, 26 Oct 2012 18:49:11 +0000 (14:49 -0400)]
Make the add widget button hitrectangle smaller.
Bug:
7421953
Proto-Id: I04fe3f06a7c53603dc38434a18cc52053ccc6bac
Change-Id: Ie26ad9a9c683f41bd8bf0b0b24e6832ab32d9469
Daniel Sandler [Fri, 26 Oct 2012 17:57:56 +0000 (10:57 -0700)]
Merge "Remove the handle headroom if the challenge is open." into jb-mr1-lockscreen-dev
Fabrice Di Meglio [Fri, 26 Oct 2012 00:42:39 +0000 (17:42 -0700)]
Fix bug #
7419054 TextView Drawables resolution is broken in RTL mode
- check layout direction previous value in the onResolveDrawables(int) callback
- dont do any Drawables resolution if we cannot resolve the layout direction
- also remove unnecessary call to resolveRtlPropertiesIfNeeded() in ViewGroup when
adding a child as the call to resolveRtlPropertiesIfNeeded() will be done into
the measure() call itself later
Change-Id: I62237af3d307dfea203f7f2865551d1c61a0e0b8
Amith Yamasani [Tue, 23 Oct 2012 01:19:27 +0000 (18:19 -0700)]
Fix the user name for the owner.
Use a version number to update the name to Owner, from Primary.
For new installations, use the correct localized string.
Bug:
7417150
Fix a typo in the permission description.
Bug:
7333304
Change-Id: I123741e581c6a02d4597b3cd81f2ca48a8587e2a
Daniel Sandler [Fri, 26 Oct 2012 16:50:27 +0000 (12:50 -0400)]
Remove the handle headroom if the challenge is open.
This change also moves to an absolute-distance model of
tracking the panel instead of a delta model; this allows us
to make the decision about the handle size in only one place
(when first detecting the gesture) instead of requiring us
to mix it into the arithmetic everywhere.
Also fixes the drag-too-slowly-and-the-panel-doesn't-move
problem.
Change-Id: I9bdbadd968134ad5ad67eaef9539536fb5cfe1a1
Proto-Id: I0c2f484da89f063995384c263aa9f5f03339ed7c
Daniel Sandler [Fri, 26 Oct 2012 15:55:16 +0000 (08:55 -0700)]
Merge "Expand top of touchable area of challenge drag handle." into jb-mr1-lockscreen-dev
John Spurlock [Fri, 26 Oct 2012 15:27:32 +0000 (08:27 -0700)]
Merge "Update swipe edge size to match ux prototype." into jb-mr1-lockscreen-dev
Daniel Sandler [Fri, 26 Oct 2012 15:25:49 +0000 (11:25 -0400)]
Expand top of touchable area of challenge drag handle.
Change-Id: I8d471041205cd929e899903daae61d5ac948597c
Proto-Id: I5f44a135451c1cd86bbe4fb8ebd1af7609715ce3
John Spurlock [Fri, 26 Oct 2012 15:25:21 +0000 (11:25 -0400)]
Update swipe edge size to match ux prototype.
Change-Id: I0712c445d015615793b47310875c2cfcdeb574c1
Chris Wren [Fri, 26 Oct 2012 13:45:43 +0000 (09:45 -0400)]
lock out clicks while switching.
Bug:
7416992
Change-Id: Ic0fcf809c4d9bb3515dd1168d427f8b22d5f76b6
Proto-Id: I0ea871fb012feb2e17249e37a9253861f2ef5011
John Spurlock [Fri, 26 Oct 2012 12:25:51 +0000 (08:25 -0400)]
Fix camera bugs found overnight.
- Fix crash in CameraWidgetFrame after rotating to landscape
- Fix pages drift to the left bug
- Address Jim's comments on c/245706
- Disable camera widget if landscape
Bug:
7419070
Bug:
7417798
Bug:
7418781
Change-Id: I5c730c7c1baf3c1872367b6392e6786578765298
Adam Powell [Fri, 26 Oct 2012 03:49:32 +0000 (20:49 -0700)]
Integrate assets from UX; drag/bouncer animation behavior in slider
Integrated changes from prototype app
Change-Id: I5f017431531b6d12aca89a674d865402c60c2104
Jeff Brown [Thu, 25 Oct 2012 04:28:33 +0000 (21:28 -0700)]
Add MediaRouter API to get presentation display.
This new API makes it possible for an application to ask on
which Display it should show a Presentation based on the currently
selected media route.
Also added a new API on DisplayManager to query displays that
support a certain category of uses.
Improved the documentation of the Presentation class to explain
how to choose an appropriate Display for presentation.
Bug:
7409073
Change-Id: Iab451215e570ae55f3718fc228303143c800fe51
Jim Miller [Fri, 26 Oct 2012 02:31:19 +0000 (19:31 -0700)]
Fix issue where security view sometimes doesn't show.
Since the code is now very careful about loading layouts, we
sometimes get into a situation where the security view isn't shown.
This CL ensures the security method is shown at least once
when the view is inflated.
Change-Id: If80a46adb868d92194610eccaf9d8d6c2a2c5b3d
Jim Miller [Thu, 25 Oct 2012 05:08:49 +0000 (22:08 -0700)]
Cleanup keyguard signals
- remove redundant signals that were causing keyguard to be rebuilt unnecessarily.
- add a check to ensure we only handle configuration changes if the view is actually showing
- only reconstruct view if screen is turning off or if the configuration changes.
Change-Id: Ia9c7830e370feed6af36cc139d4cd3c5ca0be4fd
Michael Jurka [Thu, 25 Oct 2012 18:44:31 +0000 (11:44 -0700)]
Persist reordering/deleting widgets on keyguard
Also, clean up warnings from unused imports
Change-Id: Id0ef12a584ffdaa8a4fb64ffe93d0dda0af398ec
Robert Ly [Thu, 25 Oct 2012 23:34:10 +0000 (16:34 -0700)]
am
148d4131: am
5b45e337: am
d6bbf71d: am
ea502b27: Merge "docs: animations au class" into jb-dev-docs
* commit '
148d413164ce0a780236ffb8ada15cad81be6ce7':
docs: animations au class
Robert Ly [Thu, 25 Oct 2012 23:32:18 +0000 (16:32 -0700)]
am
5b45e337: am
d6bbf71d: am
ea502b27: Merge "docs: animations au class" into jb-dev-docs
* commit '
5b45e33770f072e281ddf8cda2ecc039a6caedfc':
docs: animations au class
Robert Ly [Thu, 25 Oct 2012 23:29:09 +0000 (16:29 -0700)]
am
d6bbf71d: am
ea502b27: Merge "docs: animations au class" into jb-dev-docs
* commit '
d6bbf71dc552d54ffde25e8c00ed96630a5221a6':
docs: animations au class
Robert Ly [Thu, 25 Oct 2012 23:26:57 +0000 (16:26 -0700)]
am
ea502b27: Merge "docs: animations au class" into jb-dev-docs
* commit '
ea502b27020872003f1d2be1fb2644b04cc59a67':
docs: animations au class
Robert Ly [Thu, 25 Oct 2012 23:24:03 +0000 (16:24 -0700)]
Merge "docs: animations au class" into jb-dev-docs
Jim Miller [Thu, 25 Oct 2012 21:35:19 +0000 (14:35 -0700)]
Merge "Route signals from SlidingChalleng to SecurityView" into jb-mr1-lockscreen-dev
John Spurlock [Thu, 25 Oct 2012 21:17:22 +0000 (14:17 -0700)]
am
5c87f533: Merge "Revert part of fix for b/
7377776 to fix b/
7411356." into jb-mr1-dev
* commit '
5c87f5334a7414f32e32bcfb0d6c56b07048d058':
Revert part of fix for b/
7377776 to fix b/
7411356.
John Spurlock [Thu, 25 Oct 2012 21:14:51 +0000 (14:14 -0700)]
Merge "Revert part of fix for b/
7377776 to fix b/
7411356." into jb-mr1-dev
Jim Miller [Thu, 25 Oct 2012 05:21:40 +0000 (22:21 -0700)]
Route signals from SlidingChalleng to SecurityView
This maps activity on the SlidingChallenge to the security
challenge view. Currently it calls onPause() on the SecurityView
if the view is on the move or is hidden.
Change-Id: Ide5f2200e45d8996fa91af06ac2059c3d125ea6f
Adam Powell [Thu, 25 Oct 2012 20:39:30 +0000 (13:39 -0700)]
Keyguard bouncer notifications; focus moving and the bouncer; slops
Integrate changes from prototype app
* Add callbacks for bouncer state changes
* Dismiss the bouncer if focus leaves the challenge area
* Increase edge swipe region, treat this as a slop for
SlidingChallengeLayout's drag handle. (This allows edge swipes in
the drag handle area to still page widgets instead.)
Change-Id: I732de1a8d999a34c7cc8aa8ed99e24b597f3444c
Robert Ly [Wed, 3 Oct 2012 21:20:26 +0000 (14:20 -0700)]
docs: animations au class
Change-Id: I776ccdf44014fe38dd55dedfed8730306d2a2cea
John Spurlock [Thu, 25 Oct 2012 20:15:30 +0000 (16:15 -0400)]
Revert part of fix for b/
7377776 to fix b/
7411356.
This means the visual glitch is possible again, but reduced since
the layout transitions are disabled.
It's more important to bring back nav buttons for incoming calls
(for the secure, screen off case).
Bug:
7411356
Change-Id: I83005a77930ec7f70a613b3396f85ab1a5fdd96c
Chet Haase [Thu, 25 Oct 2012 19:23:20 +0000 (12:23 -0700)]
am
9023cf91: Merge "Set wallpaper bitmap reference to null before reloading" into jb-mr1-dev
* commit '
9023cf91018c75a179d04256fd4e306065528117':
Set wallpaper bitmap reference to null before reloading
Chet Haase [Thu, 25 Oct 2012 19:19:18 +0000 (12:19 -0700)]
Merge "Set wallpaper bitmap reference to null before reloading" into jb-mr1-dev
Daniel Sandler [Thu, 25 Oct 2012 18:59:53 +0000 (11:59 -0700)]
Merge "Fix Google Now on lockscreen." into jb-mr1-lockscreen-dev
Chet Haase [Thu, 25 Oct 2012 00:37:00 +0000 (17:37 -0700)]
Set wallpaper bitmap reference to null before reloading
Give the GC a chance to collect the current bitmap if it needs to,
as it allocates memory for the next one. This helps avoid OOM situations
that can sometimes occur in extreme circumstances (huge bitmaps)
Also set the default_wallpaper to the right default size.
Issue #
7352961 Wallpaper edge is cut-off while scrolling through home page
Change-Id: If76b55061d04b29af7f66a6162e307b8b53bf4ae
Fabrice Di Meglio [Thu, 25 Oct 2012 18:45:06 +0000 (11:45 -0700)]
am
3e297339: Merge "FIx bug #
7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev
* commit '
3e297339f8b77d54f520d5471c90c9d04e78400e':
FIx bug #
7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants
Fabrice Di Meglio [Thu, 25 Oct 2012 18:41:20 +0000 (11:41 -0700)]
Merge "FIx bug #
7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants" into jb-mr1-dev
John Spurlock [Thu, 25 Oct 2012 18:40:11 +0000 (11:40 -0700)]
Merge "Manual frameworks/base merge from lockhotness (camera)." into jb-mr1-lockscreen-dev
John Spurlock [Thu, 25 Oct 2012 18:35:19 +0000 (14:35 -0400)]
Manual frameworks/base merge from lockhotness (camera).
Change-Id: I8649ef77b706120a2297ddccd9bbb4d7ddf026a9
Proto-Id: Ia60ed9ee263b6053b9ca00d71fbd3ffc64a96278
Fabrice Di Meglio [Thu, 25 Oct 2012 18:22:39 +0000 (11:22 -0700)]
FIx bug #
7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT and View.TEXT_ALIGNMENT_DEFAULT constants
- made them private and final
- fixed comment
Change-Id: Ia1d22329edb7ac26e7bcd0489770a99ad41c4f0e
Svetoslav Ganov [Thu, 25 Oct 2012 18:13:28 +0000 (11:13 -0700)]
am
324cfc54: Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev
* commit '
324cfc54ed3527b98069f87665504a423bab63e4':
Accessibility layer in inconsistent state after running UI test automation tests.
Svetoslav Ganov [Thu, 25 Oct 2012 18:09:01 +0000 (11:09 -0700)]
Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev
Daniel Sandler [Thu, 25 Oct 2012 17:28:33 +0000 (13:28 -0400)]
Fix Google Now on lockscreen.
We can't make the navbar slippery anymore if lockscreen is
going to intercept all the touches. :)
Bug:
7413021
Change-Id: I1658262e43c37d0b1a554cda434ac43c0a0a86c0
Svetoslav Ganov [Thu, 25 Oct 2012 02:45:07 +0000 (19:45 -0700)]
Accessibility layer in inconsistent state after running UI test automation tests.
1. The accessibility layer has a back door for a UI test automation code running
from the shell to attach. The unregister code does an incorrect identity check
and as a result the register UI test automation service is not disconnected
until its process is killed. The fix is super safe and simple.
bug:
7409261
Change-Id: I4b1da18be6c5619dadd4a58fca6724529bc59dea
Daniel Sandler [Thu, 25 Oct 2012 15:16:45 +0000 (08:16 -0700)]
Merge "Haptics for PIN enter key" into jb-mr1-lockscreen-dev
Daniel Sandler [Thu, 25 Oct 2012 15:12:56 +0000 (11:12 -0400)]
Haptics for PIN enter key
Change-Id: Ie9d026847a6231b89cba55baf74e795f30ac857d
Daniel Sandler [Thu, 25 Oct 2012 14:58:16 +0000 (07:58 -0700)]
Merge "Haptics for PIN keys." into jb-mr1-lockscreen-dev
Daniel Sandler [Thu, 25 Oct 2012 14:46:37 +0000 (10:46 -0400)]
Haptics for PIN keys.
Change-Id: I65b12a614f344faef140334658ec1e627094e05e
Bryan Mawhinney [Thu, 25 Oct 2012 09:09:49 +0000 (02:09 -0700)]
am
33c0a616: Merge "Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)" into jb-mr1-dev
* commit '
33c0a616dbd284b47cc8e6af2eec358fba7c701f':
Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)
Bryan Mawhinney [Thu, 25 Oct 2012 09:06:35 +0000 (02:06 -0700)]
Merge "Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)" into jb-mr1-dev
Daniel Sandler [Wed, 24 Oct 2012 04:21:32 +0000 (00:21 -0400)]
PIN pad cosmetics.
Also pull the Klondike telephone exchange letter strings out
into arrays.xml so we can override it for specific locales.
Change-Id: Idf79ff8bfd53e5a8277271cc85ac7a1784ae3b64
Daniel Sandler [Thu, 25 Oct 2012 03:19:34 +0000 (23:19 -0400)]
Cleaning up password input.
Starting to try to show the IME at the right times.
Change-Id: Idc681304c309022666a03c26885a5c94ab4ec2a2
Daniel Sandler [Thu, 25 Oct 2012 05:17:22 +0000 (01:17 -0400)]
Add ECA to PIN view
Change-Id: I46e854dc8d5920bb506ac9996af7ea3ca845468a
Jim Miller [Thu, 25 Oct 2012 03:18:00 +0000 (20:18 -0700)]
Merge "Fix new password view in keyguard" into jb-mr1-lockscreen-dev
Jim Miller [Thu, 25 Oct 2012 03:14:47 +0000 (20:14 -0700)]
Fix new password view in keyguard
The IME wasn't coming up in password mode because the base class always
returned 'false' for needsInput().
Change-Id: Ia5bf508b3e08fa6980e83103322711857af74680
Michael Jurka [Thu, 25 Oct 2012 01:45:10 +0000 (18:45 -0700)]
Fix build
Michael Jurka [Thu, 25 Oct 2012 01:28:21 +0000 (18:28 -0700)]
Merge "Adding ability to add multiple widgets to keyguard" into jb-mr1-lockscreen-dev
Dianne Hackborn [Thu, 25 Oct 2012 01:02:05 +0000 (18:02 -0700)]
am
ead7d90e: Merge "Fix issue #
7408647: Add getUserCount() API" into jb-mr1-dev
* commit '
ead7d90e8b049c9689560015dbb761242fd86c99':
Fix issue #
7408647: Add getUserCount() API
Daniel Sandler [Thu, 25 Oct 2012 00:59:09 +0000 (17:59 -0700)]
am
38c904a6: Merge changes Ia0c2450f,I0fac062f into jb-mr1-dev
* commit '
38c904a6bc3cc215940ec0d8f96cda9376ff0133':
Be a little more lenient with panel-open gestures.
Missing copyright headers.
Dianne Hackborn [Thu, 25 Oct 2012 00:58:13 +0000 (17:58 -0700)]
Merge "Fix issue #
7408647: Add getUserCount() API" into jb-mr1-dev
Daniel Sandler [Thu, 25 Oct 2012 00:55:10 +0000 (17:55 -0700)]
Merge changes Ia0c2450f,I0fac062f into jb-mr1-dev
* changes:
Be a little more lenient with panel-open gestures.
Missing copyright headers.
Michael Jurka [Wed, 24 Oct 2012 19:46:49 +0000 (12:46 -0700)]
Adding ability to add multiple widgets to keyguard
Bug:
7381803
Adam Powell [Wed, 24 Oct 2012 23:26:56 +0000 (16:26 -0700)]
Beginnings of bouncer support; add scrims and state tracking
Integrating from prototype app
Change-Id: Ib142cf371c5997f547266d8af7e25129fb4e1343
Dianne Hackborn [Wed, 24 Oct 2012 22:22:21 +0000 (15:22 -0700)]
Fix issue #
7408647: Add getUserCount() API
Change-Id: Ib4e8e2300757e0941fae8fbc46c4323f5e2d7d6b
Irfan Sheriff [Wed, 24 Oct 2012 22:26:41 +0000 (15:26 -0700)]
am
4e7f2ffe: Merge "Handle group tear down only at group removed event" into jb-mr1-dev
* commit '
4e7f2ffe1791807636ac542f73016773c30daa92':
Handle group tear down only at group removed event
Irfan Sheriff [Wed, 24 Oct 2012 22:23:46 +0000 (15:23 -0700)]
Merge "Handle group tear down only at group removed event" into jb-mr1-dev
Irfan Sheriff [Wed, 24 Oct 2012 20:34:31 +0000 (13:34 -0700)]
Handle group tear down only at group removed event
Handling group removal at disconnect causes issues where supplicant keeps
the group and then the next invocation fails
Bug:
7403755
Change-Id: Iea7e5ec98486607f8e2c4a55be3743e0545a9da7
Jeff Brown [Wed, 24 Oct 2012 21:58:28 +0000 (14:58 -0700)]
am
900e0ba5: Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev
* commit '
900e0ba5163bd03becf49922dfdfad07460716f0':
Dim the screen quickly in response to user activity timeout.
Jeff Brown [Wed, 24 Oct 2012 21:55:28 +0000 (14:55 -0700)]
Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev
Jeff Brown [Wed, 24 Oct 2012 21:46:26 +0000 (14:46 -0700)]
Dim the screen quickly in response to user activity timeout.
Reverts a previous change that made the screen dim slowly instead.
The quick transition does a better job of attracting the user's
attention to the fact that the screen is about to turn off
unless the user touches the screen.
Bug:
7386034
Change-Id: I81e4d8939f6791b96352004984a9e5b2aab79788
Adam Powell [Wed, 24 Oct 2012 21:00:04 +0000 (14:00 -0700)]
Integrate changes from lockscreen proto app
Fix padding/layout issues in MultiPaneChallengeLayout
Change-Id: I610b4c0cc321a690fa29d071d6a960c05ffbe3a7
Romain Guy [Wed, 24 Oct 2012 20:53:43 +0000 (13:53 -0700)]
am
99333315: Merge "Ensure we have a GL context before deleting View layers Bug #
7391098" into jb-mr1-dev
* commit '
9933331506c91e535ba277bef9c44e1852ccf16c':
Ensure we have a GL context before deleting View layers Bug #
7391098
Baligh Uddin [Wed, 24 Oct 2012 20:51:28 +0000 (13:51 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Romain Guy [Wed, 24 Oct 2012 20:50:11 +0000 (13:50 -0700)]
Merge "Ensure we have a GL context before deleting View layers Bug #
7391098" into jb-mr1-dev
Baligh Uddin [Wed, 24 Oct 2012 20:50:22 +0000 (13:50 -0700)]
am
188bf0e6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
188bf0e63c30fa557dc897faf1b55da045b23ca0':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Oct 2012 20:47:21 +0000 (13:47 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Amith Yamasani [Wed, 24 Oct 2012 20:33:38 +0000 (13:33 -0700)]
am
cd668554: Merge "Fix a crash in InputMethodManagerService due to permission failure." into jb-mr1-dev
* commit '
cd668554417f089aa0ae013a29ab81864b4b4685':
Fix a crash in InputMethodManagerService due to permission failure.
Amith Yamasani [Wed, 24 Oct 2012 20:29:52 +0000 (13:29 -0700)]
Merge "Fix a crash in InputMethodManagerService due to permission failure." into jb-mr1-dev
Chris Wren [Wed, 24 Oct 2012 20:27:39 +0000 (13:27 -0700)]
Merge "remove debug logs." into jb-mr1-lockscreen-dev
Victoria Lease [Wed, 24 Oct 2012 20:26:38 +0000 (13:26 -0700)]
am
f704e9f6: Merge "revise android.location.Geofence documentation" into jb-mr1-dev
* commit '
f704e9f67745d1f1c01058f4c74b06d157b4054d':
revise android.location.Geofence documentation