Jim Miller
e23ced5ecc
am 51171688: am 7f210cbb: am 103a734b: Merge "Fix bug where lockout timeout is shown for SIM in keyguard" into klp-dev
...
* commit '51171688154947124fe8868cdcd43fbbe4fff495':
Fix bug where lockout timeout is shown for SIM in keyguard
2013-10-14 10:52:29 -07:00
Jim Miller
11ea370b79
am 8360bde1: am d04244d4: am 7fa498bf: Merge "Disable the camera and search buttons while we\'re in bouncer mode." into klp-dev
...
* commit '8360bde120e71389cc3b7a436a95e0e5a4e98bca':
Disable the camera and search buttons while we're in bouncer mode.
2013-10-14 10:52:24 -07:00
Jim Miller
1398e8944f
am c57b9430: am 0cdab579: am 39eaeb99: Merge "Update clock to use 14dp instead of 12dp for status info." into klp-dev
...
* commit 'c57b9430444683654eb45ac93df6df2e9a36e09f':
Update clock to use 14dp instead of 12dp for status info.
2013-10-14 10:51:57 -07:00
Adam Powell
f5631334eb
am 2f6a29ed: am 6e158a2b: am 18e12147: Merge "Tighten up the KG transport control layout for stability" into klp-dev
...
* commit '2f6a29ed68adf467a30086a5165da983b910ce94':
Tighten up the KG transport control layout for stability
2013-10-14 10:51:33 -07:00
Adam Powell
0f58327f6a
am b0d1ee90: am e9ced533: am f5176922: Use INVISIBLE instead of GONE to hide KG transport buttons
...
* commit 'b0d1ee9033e72a457f19563c966cd28ed647aa83':
Use INVISIBLE instead of GONE to hide KG transport buttons
2013-10-14 10:51:23 -07:00
Jim Miller
a200cad2d3
am c2bf92d4: am 09abd164: am 2222a508: Merge "Fix problem where PhoneWindowManager waits for keyguard to draw" into klp-dev
...
* commit 'c2bf92d42a032c9dadd25904a5b0f183585dc024':
Fix problem where PhoneWindowManager waits for keyguard to draw
2013-10-14 10:50:02 -07:00
Jim Miller
a9c6cb6013
am c69fa275: am 8eebe3b5: am dc70340d: Merge "Enable time format localization in keyguard" into klp-dev
...
* commit 'c69fa2751350355370a85ab0b92655b73047b91e':
Enable time format localization in keyguard
2013-10-14 10:49:40 -07:00
Jim Miller
a2319d1210
am 4f2bcde9: am 51f2d8ef: am 11def8f0: Merge "Delay all widget additions in keyguard until after boot completes" into klp-dev
...
* commit '4f2bcde9db26523fd7c048be1b502f12328ee60c':
Delay all widget additions in keyguard until after boot completes
2013-10-14 10:48:30 -07:00
Jim Miller
7c4f3b8134
am a55feec8: am f89ff85f: Merge "Hide the camera and search icons when switching to the camera page" into klp-dev
...
* commit 'a55feec8d2c982628a7357fcfbfb0102aa693771':
Hide the camera and search icons when switching to the camera page
2013-10-13 17:49:03 -07:00
Jim Miller
f89ff85f6c
Merge "Hide the camera and search icons when switching to the camera page" into klp-dev
2013-10-14 00:44:13 +00:00
Jim Miller
fadccf1d0e
Hide the camera and search icons when switching to the camera page
...
Partial fix for bug 11190737
Change-Id: I8b14a0b32cec51fe381f8ef110a13623d8324938
2013-10-13 17:26:39 -07:00
Jim Miller
91feb766f9
am 43b0ce62: am 05da3280: Merge "Fix warp animation in keyguard" into klp-dev
...
* commit '43b0ce62c8322f2d4d3cd9946083968a0f14102c':
Fix warp animation in keyguard
2013-10-13 17:12:06 -07:00
Jim Miller
05da328078
Merge "Fix warp animation in keyguard" into klp-dev
2013-10-14 00:06:49 +00:00
Jim Miller
afef5b23a1
Fix warp animation in keyguard
...
This fixes a problem where the warp page was remaining onscreen due to a
race between the animation completing and releasing the finger. The fix
is to track when the page is onscreen or when the warp is still animating
to ensure we hide it when we're done.
Change-Id: Ie53c65d276032da16cd42ec84b23ae812fc7e2eb
2013-10-13 17:02:11 -07:00
Jim Miller
5117168815
am 7f210cbb: am 103a734b: Merge "Fix bug where lockout timeout is shown for SIM in keyguard" into klp-dev
...
* commit '7f210cbbea61bae3c70e230d84fdae4f1f9d00b3':
Fix bug where lockout timeout is shown for SIM in keyguard
2013-10-13 16:02:29 -07:00
Jim Miller
8360bde120
am d04244d4: am 7fa498bf: Merge "Disable the camera and search buttons while we\'re in bouncer mode." into klp-dev
...
* commit 'd04244d482b3062b1790a636779785a50243b4cc':
Disable the camera and search buttons while we're in bouncer mode.
2013-10-13 16:02:26 -07:00
Jim Miller
103a734b66
Merge "Fix bug where lockout timeout is shown for SIM in keyguard" into klp-dev
2013-10-13 22:54:21 +00:00
Jim Miller
7fa498bf9b
Merge "Disable the camera and search buttons while we're in bouncer mode." into klp-dev
2013-10-13 22:53:37 +00:00
Jim Miller
c57b943044
am 0cdab579: am 39eaeb99: Merge "Update clock to use 14dp instead of 12dp for status info." into klp-dev
...
* commit '0cdab579a44fdb8900b7490b1d9816f0970c6ebb':
Update clock to use 14dp instead of 12dp for status info.
2013-10-13 14:29:34 -07:00
Jim Miller
39eaeb99c3
Merge "Update clock to use 14dp instead of 12dp for status info." into klp-dev
2013-10-13 21:24:42 +00:00
Jim Miller
94a52da03b
Update clock to use 14dp instead of 12dp for status info.
...
Fixes bug 11195120
Change-Id: Ifa24ad80f64363e2cc815de67d2e99a27eef3425
2013-10-13 14:13:56 -07:00
Adam Powell
2f6a29ed68
am 6e158a2b: am 18e12147: Merge "Tighten up the KG transport control layout for stability" into klp-dev
...
* commit '6e158a2bcb03bf54424fad6025c7ccd0b91baec0':
Tighten up the KG transport control layout for stability
2013-10-13 12:15:17 -07:00
Adam Powell
18e1214790
Merge "Tighten up the KG transport control layout for stability" into klp-dev
2013-10-13 19:07:43 +00:00
Adam Powell
00298a5126
Tighten up the KG transport control layout for stability
...
Decrease margin between elements to allow the transport controls to
fully fit within the space allotted on some devices. This prevents
unwanted resizing and shuffling when the challenge is swiped downward
to make more room for the current widget page.
Also remove some unused views from features not currently supported.
Bug 11158270
Change-Id: Id5b19a9399760e291495a16def315c7ad6437450
2013-10-13 11:55:08 -07:00
Adam Powell
b0d1ee9033
am e9ced533: am f5176922: Use INVISIBLE instead of GONE to hide KG transport buttons
...
* commit 'e9ced533fab98f8b0272768d3b916be01c73f1c4':
Use INVISIBLE instead of GONE to hide KG transport buttons
2013-10-13 11:14:37 -07:00
Adam Powell
f51769221c
Use INVISIBLE instead of GONE to hide KG transport buttons
...
Maintain a stable/predictable button layout when a remote control
client shows or hides specific transport control buttons.
Bug 11195246
Change-Id: I0e745150127c5e354ed2752c379e05ea8e0bd33d
2013-10-13 10:39:04 -07:00
Jim Miller
7d5e00ab2b
Fix bug where lockout timeout is shown for SIM in keyguard
...
Fixes bug 11193577
Change-Id: I62964c478bdb060ea6964009fc99bc3d7b5e3f80
2013-10-11 22:45:57 -07:00
Jim Miller
c2bf92d42a
am 09abd164: am 2222a508: Merge "Fix problem where PhoneWindowManager waits for keyguard to draw" into klp-dev
...
* commit '09abd164e722dfc03dad48106a557217563d3b21':
Fix problem where PhoneWindowManager waits for keyguard to draw
2013-10-11 21:35:24 -07:00
Jim Miller
2222a508e7
Merge "Fix problem where PhoneWindowManager waits for keyguard to draw" into klp-dev
2013-10-12 04:29:01 +00:00
Jim Miller
6a3cceb4d9
Fix problem where PhoneWindowManager waits for keyguard to draw
...
This fixes a problem where PhoneWindowManager times out waiting
for keyguard to draw when it's disabled. Instead, we pass a null
token back which allows PhoneWindowManager to continue.
Fixes bug 11190932
Change-Id: I041ea1d88dca681476d9477a3aab54559976b312
2013-10-11 21:23:32 -07:00
Jim Miller
e657a82ee1
Disable the camera and search buttons while we're in bouncer mode.
...
Fixes 11191334
Change-Id: I035f9e4e3d033fac6e1660b2d357ddac6f36bcbf
2013-10-11 19:49:31 -07:00
Alan Viverette
99f2f5e704
Don't clip keyguard security container children (e.g. glow pad)
...
BUG: 11112606
Change-Id: I5145004f16dd805161e530b8836cc9c1f177427b
2013-10-11 19:19:44 -07:00
Jim Miller
c69fa27513
am 8eebe3b5: am dc70340d: Merge "Enable time format localization in keyguard" into klp-dev
...
* commit '8eebe3b5bcdbdb1998d17bb7a058bd9ba26234c9':
Enable time format localization in keyguard
2013-10-11 18:11:05 -07:00
Jim Miller
0c48689b08
Enable time format localization in keyguard
...
Fixes bug 11173871
Change-Id: Ife44c93b01770a3349343d034fe6adb1c6d66185
2013-10-11 17:50:35 -07:00
Jim Miller
4f2bcde9db
am 51f2d8ef: am 11def8f0: Merge "Delay all widget additions in keyguard until after boot completes" into klp-dev
...
* commit '51f2d8ef9da5008dda4b99157774327ed9138ab8':
Delay all widget additions in keyguard until after boot completes
2013-10-11 14:43:55 -07:00
Jim Miller
51f2d8ef9d
am 11def8f0: Merge "Delay all widget additions in keyguard until after boot completes" into klp-dev
...
* commit '11def8f06a3c03a0056e9fa010b28622d9d88d2b':
Delay all widget additions in keyguard until after boot completes
2013-10-11 14:40:57 -07:00
Jim Miller
11def8f06a
Merge "Delay all widget additions in keyguard until after boot completes" into klp-dev
2013-10-11 21:38:05 +00:00
Alan Viverette
40c610f672
am 32f3e15c: am 625f3978: am 8da6bc53: Merge "Resize lock screen widgets when IME is open." into klp-dev
...
* commit '32f3e15c77bd294b43c02229708d4047faaa8830':
Resize lock screen widgets when IME is open.
2013-10-11 10:40:20 -07:00
Alan Viverette
32f3e15c77
am 625f3978: am 8da6bc53: Merge "Resize lock screen widgets when IME is open." into klp-dev
...
* commit '625f397843f2799756577791478e132ce9f55063':
Resize lock screen widgets when IME is open.
2013-10-11 10:37:01 -07:00
Alan Viverette
625f397843
am 8da6bc53: Merge "Resize lock screen widgets when IME is open." into klp-dev
...
* commit '8da6bc53c89020de7e6c252bcb1e658f4fb0c32f':
Resize lock screen widgets when IME is open.
2013-10-11 10:34:08 -07:00
Alan Viverette
8da6bc53c8
Merge "Resize lock screen widgets when IME is open." into klp-dev
2013-10-11 17:30:59 +00:00
Baligh Uddin
f87aac1b32
Merge "Import translations. DO NOT MERGE"
2013-10-11 15:08:48 +00:00
Baligh Uddin
d52cfad38f
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
2013-10-11 15:08:44 +00:00
Baligh Uddin
491ad45fee
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-10-11 15:08:39 +00:00
Jim Miller
9ccf123ee0
Delay all widget additions in keyguard until after boot completes
...
Fixes bug 11013685
Change-Id: Ic74b2d5cf80f090b0168d384f65c15b0d256c74c
2013-10-10 22:49:40 -07:00
Adam Powell
59bb250510
am 000fa146: am ad1d8b68: am 1db8cf12: Merge "Toggle wallpaper window flag when setting custom keyguard background" into klp-dev
...
* commit '000fa14613995d830022bccc2cc573653258b725':
Toggle wallpaper window flag when setting custom keyguard background
2013-10-10 20:16:52 -07:00
Adam Powell
000fa14613
am ad1d8b68: am 1db8cf12: Merge "Toggle wallpaper window flag when setting custom keyguard background" into klp-dev
...
* commit 'ad1d8b68b6286f88be510d23f7dcfa4cd6dc5b36':
Toggle wallpaper window flag when setting custom keyguard background
2013-10-10 20:15:13 -07:00
Adam Powell
ad1d8b68b6
am 1db8cf12: Merge "Toggle wallpaper window flag when setting custom keyguard background" into klp-dev
...
* commit '1db8cf12a985425a73d24875d9d308c14c0b4359':
Toggle wallpaper window flag when setting custom keyguard background
2013-10-10 20:12:40 -07:00
Adam Powell
1db8cf12a9
Merge "Toggle wallpaper window flag when setting custom keyguard background" into klp-dev
2013-10-11 03:09:35 +00:00
Jim Miller
dec5ca0d82
am 0cbca144: am 5537dc21: am bea75db9: Merge "Fit and finish for camera affordance animations in keyguard - better timing - animate warp back when finger is released. - Improve on/off screen animation for warped view - Re-use existing constants for consistent timing.
...
* commit '0cbca144127f4db8f13f09cfe3b1837d1145e174':
Fit and finish for camera affordance animations in keyguard - better timing - animate warp back when finger is released. - Improve on/off screen animation for warped view - Re-use existing constants for consistent timing. - Hide the challenge area when the camera page is settling. - Reduce jank when camera page starts snap transition. - Prevent warping from going to previous page - Smoothly blend between PagedView and Warp animations when scrolling starts.
2013-10-10 20:08:45 -07:00