Daniel Sandler
87942cf46f
am b57693d7: am e7689b82: am 3a54aaed: am 838195db: Merge "Compress lockscreen\'s account login fallback to fit." into jb-mr1-lockscreen-dev
...
* commit 'b57693d7c45e56ef9bff516f0b92dfdc7daa94b3':
Compress lockscreen's account login fallback to fit.
2012-11-08 15:57:36 -08:00
Adam Powell
8d53e1bfcb
am 805f386d: am ef79efdc: am 868edfde: am e7e210cb: Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev
...
* commit '805f386d518b2c810cbb37f67f8eb4f42157e229':
Fiddle with keyguard glowpad layouts
2012-11-08 15:57:28 -08:00
Winson Chung
6044249b6b
am 1540a21f: am 29f16178: am 27ed0c2d: am 4181e8a4: Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)" into jb-mr1-lockscreen-dev
...
* commit '1540a21f3d8fb5c1fcd7f1fcc8f4e63d644c27d1':
Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)
2012-11-08 15:56:54 -08:00
Adam Cohen
82f9474ed3
am bd8c736b: am 79d4bf6e: am efacf143: am 85c4281a: Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev
...
* commit 'bd8c736bfdef9072d55058cdc8ca4b661336778c':
Fixing up overscroll asset / sizing
2012-11-08 15:56:46 -08:00
Jim Miller
16ccfa2309
am 0927eb21: am bb01e9b8: am b1938777: am 40962880: Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev
...
* commit '0927eb21125dd9438159b22ffff27c8fdbcbfedb':
Implement fallback clock in keyguard
2012-11-08 15:56:31 -08:00
Adam Cohen
7a81cffa9b
am 92f828f2: am 24b1764e: am 9477f8de: am 3e66286f: Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev
...
* commit '92f828f2a4f873871ddd4b6f81812f94cc0bd227':
Fixing up glowpad scaling issues (issue 7494378)
2012-11-08 15:56:23 -08:00
Daniel Sandler
b57693d7c4
am e7689b82: am 3a54aaed: am 838195db: Merge "Compress lockscreen\'s account login fallback to fit." into jb-mr1-lockscreen-dev
...
* commit 'e7689b82fa8a544289e7bcbb33ac6b33da6c9648':
Compress lockscreen's account login fallback to fit.
2012-11-08 15:46:32 -08:00
Adam Powell
805f386d51
am ef79efdc: am 868edfde: am e7e210cb: Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev
...
* commit 'ef79efdc479ea8d5ec623c14260e775f9e6a474b':
Fiddle with keyguard glowpad layouts
2012-11-08 15:46:25 -08:00
Winson Chung
1540a21f3d
am 29f16178: am 27ed0c2d: am 4181e8a4: Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)" into jb-mr1-lockscreen-dev
...
* commit '29f161781c4544c7b1e78c8d1ae07605b3dcde86':
Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)
2012-11-08 15:45:59 -08:00
Adam Cohen
bd8c736bfd
am 79d4bf6e: am efacf143: am 85c4281a: Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev
...
* commit '79d4bf6e2f241d9d648789cdd5170e48614cc764':
Fixing up overscroll asset / sizing
2012-11-08 15:45:55 -08:00
Jim Miller
0927eb2112
am bb01e9b8: am b1938777: am 40962880: Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev
...
* commit 'bb01e9b82f296102f9f5fdcf0545d61664e6ca06':
Implement fallback clock in keyguard
2012-11-08 15:45:43 -08:00
Adam Cohen
92f828f2a4
am 24b1764e: am 9477f8de: am 3e66286f: Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev
...
* commit '24b1764e6c1996926ecba280f236ab05cec68b2c':
Fixing up glowpad scaling issues (issue 7494378)
2012-11-08 15:45:35 -08:00
Chris Wren
8531a0bec7
am 1ed908ec: am 193cd46c: am 53d81968: am cf9ee4c5: Merge "Don\'t pop the IME for passwors at ScreenOn on tablets." into jb-mr1-lockscreen-dev
...
* commit '1ed908ec3762da543143b84144cc4bf7743e2da6':
Don't pop the IME for passwors at ScreenOn on tablets.
2012-11-08 15:38:19 -08:00
Brian Colonna
a2e07821d8
am 318e8189: am 1e85c8ed: am 9885568e: am 6b4ab7f1: Merge "Centering FUL fixes b/7480608" into jb-mr1-lockscreen-dev
...
* commit '318e81896b46b33d01c942ed82387bd087e65c65':
Centering FUL fixes b/7480608
2012-11-08 15:38:15 -08:00
Adam Powell
eaa0cc8a37
am c4e0614b: am e7394d1e: am 3c0a353a: am 9799714f: Keyguard layout tweaking/reworking
...
* commit 'c4e0614bcaf6e4cabb7b532d876ed1c2fe7a85bf':
Keyguard layout tweaking/reworking
2012-11-08 15:37:59 -08:00
Daniel Sandler
2a08223fd6
am 744fa85f: am f6a5070b: am f74cac46: am 9edc48e2: Merge "Updated assets." into jb-mr1-lockscreen-dev
...
* commit '744fa85f12fdb4b601339c12abe342ada2dc8e18':
Updated assets.
2012-11-08 15:37:55 -08:00
Chris Wren
1ed908ec37
am 193cd46c: am 53d81968: am cf9ee4c5: Merge "Don\'t pop the IME for passwors at ScreenOn on tablets." into jb-mr1-lockscreen-dev
...
* commit '193cd46c47e7552c6b92b20aef51064d87e88d84':
Don't pop the IME for passwors at ScreenOn on tablets.
2012-11-08 15:33:31 -08:00
Brian Colonna
318e81896b
am 1e85c8ed: am 9885568e: am 6b4ab7f1: Merge "Centering FUL fixes b/7480608" into jb-mr1-lockscreen-dev
...
* commit '1e85c8edfb39aa951134599b6019a7fa4fc8b4a7':
Centering FUL fixes b/7480608
2012-11-08 15:33:27 -08:00
Adam Powell
c4e0614bca
am e7394d1e: am 3c0a353a: am 9799714f: Keyguard layout tweaking/reworking
...
* commit 'e7394d1eef3ef8a89ec6ceea8f0318f38ac67b33':
Keyguard layout tweaking/reworking
2012-11-08 15:33:09 -08:00
Daniel Sandler
744fa85f12
am f6a5070b: am f74cac46: am 9edc48e2: Merge "Updated assets." into jb-mr1-lockscreen-dev
...
* commit 'f6a5070bf59ecc5497196f923930d28286b49287':
Updated assets.
2012-11-08 15:33:05 -08:00
Jean-Baptiste Queru
7c8d2b63c0
Merge from jb-mr1-dev-plus-aosp
...
Change-Id: I28afbc0b04c22b9416973dc4d37783404997a4a3
2012-11-08 15:19:11 -08:00
Jean-Baptiste Queru
c23cfe57a9
Merge remote-tracking branch 'goog/jb-mr1-dev-plus-aosp' into HEAD
2012-11-08 14:48:54 -08:00
Jean-Baptiste Queru
5189fca3df
Merge commit '9a962d7c7df9ff762e3d9798cde868ad73b164db' into HEAD
2012-11-08 14:48:28 -08:00
Jean-Baptiste Queru
de8717c5f2
Merge commit '5418dd92ac6a0e60493ea85d9ac3a0f0d6155908' into HEAD
2012-11-08 14:44:44 -08:00
Jean-Baptiste Queru
40a419c2a5
Merge commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6' into HEAD
2012-11-08 14:44:35 -08:00
Jean-Baptiste Queru
d35f576ea0
Merge commit 'eead92749924e47ba6758bbded560b6aab0d7485' into HEAD
2012-11-08 14:40:34 -08:00
Jean-Baptiste Queru
ce2a3746b8
merge 19f8aa180a7ccb29b11a322378002e37517abfc9
...
Change-Id: I9922b99379cd653b7a707cb2b635c1d544972f51
2012-11-08 14:13:21 -08:00
Daniel Sandler
3a54aaed02
am 838195db: Merge "Compress lockscreen\'s account login fallback to fit." into jb-mr1-lockscreen-dev
...
* commit '838195db8f69968690971977e4b615df39504465':
Compress lockscreen's account login fallback to fit.
2012-11-08 13:08:17 -08:00
Adam Powell
868edfdee6
am e7e210cb: Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev
...
* commit 'e7e210cb4373877785130ff06ad4e6635592eaa8':
Fiddle with keyguard glowpad layouts
2012-11-08 13:08:06 -08:00
Winson Chung
27ed0c2d00
am 4181e8a4: Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)" into jb-mr1-lockscreen-dev
...
* commit '4181e8a4ac07e118724f7935928d2c3a1bb291f7':
Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)
2012-11-08 13:07:39 -08:00
Adam Cohen
efacf14349
am 85c4281a: Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev
...
* commit '85c4281aae518c27ca3f95e330f6aa56159e1328':
Fixing up overscroll asset / sizing
2012-11-08 13:07:36 -08:00
Jim Miller
b1938777af
am 40962880: Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev
...
* commit '40962880225c74d8f776e6ce03f1ec6dde63ef04':
Implement fallback clock in keyguard
2012-11-08 13:07:25 -08:00
Adam Cohen
9477f8dee1
am 3e66286f: Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev
...
* commit '3e66286f7cf33ef13fd9f4f033816b84828c1f2b':
Fixing up glowpad scaling issues (issue 7494378)
2012-11-08 13:07:18 -08:00
Robert Greenwalt
1f030df226
am 744c5204: am 08db1ceb: am bbe5cafe: Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev
...
* commit '744c520472d59c59f5320e1b0cf0801418eba773':
Add Coin graphic to premium-sms dialog.
2012-11-08 06:18:25 -08:00
Robert Greenwalt
744c520472
am 08db1ceb: am bbe5cafe: Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev
...
* commit '08db1ceba24925cd8a710aa0153519351a9fa2c7':
Add Coin graphic to premium-sms dialog.
2012-11-08 06:13:17 -08:00
Daniel Sandler
838195db8f
Merge "Compress lockscreen's account login fallback to fit." into jb-mr1-lockscreen-dev
2012-11-07 21:18:44 -08:00
Daniel Sandler
cf2b7a261d
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
2012-11-08 00:09:37 -05:00
Adam Powell
3fbbbb66b6
Fiddle with keyguard glowpad layouts
...
Also add hierarchyviewer support for KeyguardSecurityView LayoutParams
Bug 7497272
Bug 7459668
Change-Id: I5d03751571d0af66f4c9d08a9d9ca476b32735ac
2012-11-07 20:47:23 -08:00
Winson Chung
4181e8a4ac
Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)" into jb-mr1-lockscreen-dev
2012-11-07 17:50:24 -08:00
Winson Chung
c065a5d727
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
2012-11-07 17:44:42 -08:00
Adam Cohen
85c4281aae
Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev
2012-11-07 17:08:31 -08:00
Adam Cohen
d51700b3cc
Fixing up overscroll asset / sizing
...
-> No more jaggies! yay (issue 7459049)
-> Fixed up weird overscroll state (issue 7489094)
Change-Id: I5d6714a6f5f007ea0f73e4cf34a20572c5f43f64
2012-11-07 16:54:35 -08:00
Jim Miller
4096288022
Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev
2012-11-07 16:05:46 -08:00
Jim Miller
edc74abf8a
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
2012-11-07 15:58:47 -08:00
Jim Miller
9210016ff9
am 449f48ff: am bb9e7dca: am be2ca79a: am 7dfc588a: Workaround for layout bug in SIM PIN/PUK views
...
* commit '449f48ff3bc99544ecf1676ed15a4126beea1f1e':
Workaround for layout bug in SIM PIN/PUK views
2012-11-07 15:10:12 -08:00
Jim Miller
449f48ff3b
am bb9e7dca: am be2ca79a: am 7dfc588a: Workaround for layout bug in SIM PIN/PUK views
...
* commit 'bb9e7dcae96c8913050166c9cc949e9f1c3c8d1f':
Workaround for layout bug in SIM PIN/PUK views
2012-11-07 15:06:37 -08:00
Jean-Baptiste Queru
f5a79d313e
am 476fceab: Merge 5418dd92
...
* commit '476fceaba3e8c8d5b775fc07ad098792fc757f76':
Adding bouncer animation on PagedView. (Bug 7459660)
2012-11-07 14:54:34 -08:00
Adam Cohen
3e66286f7c
Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev
2012-11-07 14:44:12 -08:00
Adam Cohen
f988bdfbae
Fixing up glowpad scaling issues (issue 7494378)
...
Change-Id: I55c0f7a3774d42d4f5893b12bc0c08690268e351
2012-11-07 14:43:33 -08:00
Jean-Baptiste Queru
476fceaba3
Merge 5418dd92
...
Change-Id: I50cd61c9dce55d528005b8d36dddf5cc62af89a8
2012-11-07 14:41:18 -08:00
