drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
91,668 Commits 1 Branch 0 Tags
Commit Graph

6156 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
ab5202c3f1 Fix build - Add back symbol that's still needed 
Change-Id: Iee59db7950bd83a480baa0b63729b16563251ad9
 2012-10-31 11:35:48 -07:00
Ed Heyl
ec71d5d8e2 am 31dfff78: am 5c12bc58: Merge remote-tracking branch \'goog/jb-mr1-lockscreen-dev\' into jb-mr1-dev 
* commit '31dfff783eeb9ac856bc2fbfa14e7af5190fd717':
  Fix content alpha
  Removed makeInvisible() function
  Making the reordering play nice with the 3D widget carousel
  Fixed misplacement of cancel(X) button for Face Unlock
  Fill in logic in WidgetPager to ignore music when reordering.
  Attempt to fix bug on devices where multi-user support is disabled.
  Implement correct music widget positioning in keyguard
  Render camera widget correctly after shell restart.
  Moving persistence calls to background.
  FUL uses square aspect ratio for all layouts fixes b/7426399
  Addressing a couple comments on previous CL
  Impose a height & width downward on challenge views.
  Fixing some regressions in tablet reordering/deleting.
  Disable lockscreen window anim when launching camera.
 2012-10-30 18:10:09 -07:00
Brian Colonna
0ca9723327 Merge "FUL uses square aspect ratio for all layouts fixes b/7426399" into jb-mr1-lockscreen-dev 2012-10-30 13:41:52 -07:00
Brian Colonna
68d257d788 FUL uses square aspect ratio for all layouts fixes b/7426399 
When the referenced bug was filed, face unlock was only showing as a
tiny sliver on tablet layouts.  Due to other changes in the lockscreen
branch, it was no longer a sliver, but was still an incorrect layout,
with a width much greater than height.  This change makes face unlock
square for all layouts.

The face unlock RelativeLayout was replaced with a custom
FaceUnlockView derived from RelativeLayout.  The new view forces a
square layout using the same technique used by LockPatternView.

Note that there is still a bug where the pattern view covers the widget
area on portrait tablet layouts.  The face unlock view has this same
issue, but may resolve itself when the pattern bug is fixed.

Also note there are two other Face Unlock tablet bugs that existed
before this change (and therefore are not caused by this change):
 - flash during transition from spotlight animation to camera preview
 - PIN backup is upper-left instead of centered

Change-Id: I550eccfa3924f230a9dc43f0a9b59f1ea55a9273
 2012-10-30 14:48:55 -04:00
Daniel Sandler
8a26bf5aea Impose a height & width downward on challenge views. 
This means that challenges may no longer wrap_content, even
vertically. But it's the only way to rationalize across
different challenges, some of which want to be a fixed size,
some match_parent, and some wrap_content.

This change also fixes some problems with the password view
as well as PIN view (usable again on sw360 devices like
Galaxy Nexus).

Bug: 7427586
Change-Id: I648e68c5159fef7cf594d4bfe8f6d4bdd5da6b6a
Proto-Id: I280b4875a9deee5dfb7409bdfa8ed0b96fbd0cff
 2012-10-30 13:59:07 -04:00
Svetoslav Ganov
5aaaa76ed7 am 8f1aaa14: am 567fa759: Merge "Lockscreen accessibility - strings." into jb-mr1-lockscreen-dev 
* commit '8f1aaa147df64f86c95ed4598b34af7a72767cbe':
  Lockscreen accessibility - strings.
 2012-10-30 09:24:30 -07:00
Adam Powell
eff3fe06ec am 2d22c9d7: am cfc3086b: Keyguard polishing 
* commit '2d22c9d72038f8fc491c39bb964c5fbee15e0c7d':
  Keyguard polishing
 2012-10-30 09:24:12 -07:00
Jim Miller
ced4645173 am f4642bc8: am 0b728244: Update status area and emergency call logic to match new spec 
* commit 'f4642bc84b7d7d39d0455498b1944e492185c8d4':
  Update status area and emergency call logic to match new spec
 2012-10-30 09:17:45 -07:00
Jim Miller
f4642bc84b am 0b728244: Update status area and emergency call logic to match new spec 
* commit '0b728244dc87b4a453f2191c2cb37a86e91aee0a':
  Update status area and emergency call logic to match new spec
 2012-10-30 09:13:46 -07:00
Daniel Sandler
ee12c3063d am 0f527aa5: am bc676a0a: Merge "Improved handle touch interaction." into jb-mr1-lockscreen-dev 
* commit '0f527aa5f64ba43eb75a00baa162191b6bc8a076':
  Improved handle touch interaction.
 2012-10-30 08:53:13 -07:00
Daniel Sandler
c55eba7f97 am a01cfd01: am f002bf19: Merge "Bigger lock icon." into jb-mr1-lockscreen-dev 
* commit 'a01cfd01ac0e836c690cb9bf723c777dcf86d9c9':
  Bigger lock icon.
 2012-10-30 08:53:10 -07:00
Adam Cohen
c19401a793 am 7fb0021d: am effc03a9: Merge "Polish to 3d carousel and standard pager" into jb-mr1-lockscreen-dev 
* commit '7fb0021d18a6491fdc816027081bff8c8d65f5aa':
  Polish to 3d carousel and standard pager
 2012-10-30 08:53:02 -07:00
Chris Wren
b04d5c94e7 am fe9356c0: am 1d269e8e: Merge "single unlock target with honycomb semantics" into jb-mr1-lockscreen-dev 
* commit 'fe9356c074278f1a936fbd2d9eb00d9cf1914984':
  single unlock target with honycomb semantics
 2012-10-30 08:52:55 -07:00
Daniel Sandler
4f98fbe9a9 am 83372881: am fdbbbba4: Updated add-widget graphics 
* commit '8337288183c9b5e145b44dbc8bae77f463edb4fc':
  Updated add-widget graphics
 2012-10-30 08:52:52 -07:00
Daniel Sandler
0f527aa5f6 am bc676a0a: Merge "Improved handle touch interaction." into jb-mr1-lockscreen-dev 
* commit 'bc676a0a1d15e932ca74bb94f3ae392e0a9dbbe2':
  Improved handle touch interaction.
 2012-10-30 08:49:01 -07:00
Daniel Sandler
a01cfd01ac am f002bf19: Merge "Bigger lock icon." into jb-mr1-lockscreen-dev 
* commit 'f002bf19e841301388238ef19552c9dfc24d4d72':
  Bigger lock icon.
 2012-10-30 08:48:57 -07:00
Adam Cohen
7fb0021d18 am effc03a9: Merge "Polish to 3d carousel and standard pager" into jb-mr1-lockscreen-dev 
* commit 'effc03a952a881108fcbb51d4007ea0c21694077':
  Polish to 3d carousel and standard pager
 2012-10-30 08:48:48 -07:00
Chris Wren
fe9356c074 am 1d269e8e: Merge "single unlock target with honycomb semantics" into jb-mr1-lockscreen-dev 
* commit '1d269e8e8fc508f59e4010777f4da6a2feafb0a4':
  single unlock target with honycomb semantics
 2012-10-30 08:48:38 -07:00
Daniel Sandler
8337288183 am fdbbbba4: Updated add-widget graphics 
* commit 'fdbbbba4cd4807bed1200f714609d4000501d4ee':
  Updated add-widget graphics
 2012-10-30 08:48:35 -07:00
Svetoslav Ganov
3cd4640c0e Lockscreen accessibility - strings. 
Change-Id: Ia0f5a6356592f53081040667d20abf5f8eb09ad2
 2012-10-29 23:11:53 -07:00
Adam Powell
cfc3086b18 Keyguard polishing 
Integrate from proto app

* New assets

* Layout changes

* Dragging behavior change for sliding challenge

* Realign camera for new padding

Change-Id: Ia177c60f59f1fc74000d95fc39b048321acf1246
 2012-10-29 18:32:37 -07:00
Baligh Uddin
681c588aee am 4ee14e63: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '4ee14e6392b728ab8843fc4a785b70d3ea2701a6':
  Import translations. DO NOT MERGE
 2012-10-29 14:50:30 -07:00
Baligh Uddin
4ee14e6392 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-29 14:47:53 -07:00
Adam Cohen
14bc0bd5be am 40011d6f: am 8daee807: Merge "3D carousel initial stab -- paging outlines / alpha effects pending design" into jb-mr1-lockscreen-dev 
* commit '40011d6fef363e4cdc9c90ba3139e9199801c786':
  3D carousel initial stab -- paging outlines / alpha effects pending design
 2012-10-29 14:23:12 -07:00
Daniel Sandler
4ac6f4922b am 3d6438c8: am 1f887cb2: Merge "Make the add widget button hitrectangle smaller." into jb-mr1-lockscreen-dev 
* commit '3d6438c89448341416a4da705d35338626d72c90':
  Make the add widget button hitrectangle smaller.
 2012-10-29 14:22:38 -07:00
John Spurlock
2123456ae2 am f04a6ee7: am af5b49c1: Merge "Update swipe edge size to match ux prototype." into jb-mr1-lockscreen-dev 
* commit 'f04a6ee7058a65cc1d2e24c5e572eb03b4914ed0':
  Update swipe edge size to match ux prototype.
 2012-10-29 14:22:25 -07:00
Amith Yamasani
b67f91b672 am 16f18a4c: am 08482454: Merge "Fix the user name for the owner." into jb-mr1-dev 
* commit '16f18a4ce879c53a06cffc552a5d25e73bed5327':
  Fix the user name for the owner.
 2012-10-29 14:22:11 -07:00
Adam Cohen
40011d6fef am 8daee807: Merge "3D carousel initial stab -- paging outlines / alpha effects pending design" into jb-mr1-lockscreen-dev 
* commit '8daee807532861239740a31689255fddf11574c1':
  3D carousel initial stab -- paging outlines / alpha effects pending design
 2012-10-29 14:01:20 -07:00
Daniel Sandler
3d6438c894 am 1f887cb2: Merge "Make the add widget button hitrectangle smaller." into jb-mr1-lockscreen-dev 
* commit '1f887cb2928695c81df9cfbbb730225ee81051dd':
  Make the add widget button hitrectangle smaller.
 2012-10-29 14:00:43 -07:00
John Spurlock
f04a6ee705 am af5b49c1: Merge "Update swipe edge size to match ux prototype." into jb-mr1-lockscreen-dev 
* commit 'af5b49c12dc2ff83b3d43663f4fda09401fb7d3f':
  Update swipe edge size to match ux prototype.
 2012-10-29 14:00:32 -07:00
Amith Yamasani
16f18a4ce8 am 08482454: Merge "Fix the user name for the owner." into jb-mr1-dev 
* commit '084824548f9706db8356ed4480c282288ffc0bd0':
  Fix the user name for the owner.
 2012-10-29 13:55:57 -07:00
John Spurlock
aa9aa440cb am ee12f5aa: am 47cde77b: Fix camera bugs found overnight. 
* commit 'ee12f5aa5701a0ace1bb61ea599cb024494b22cc':
  Fix camera bugs found overnight.
 2012-10-29 13:36:56 -07:00
Adam Powell
e7c8c76d4a am 300772e6: am 6f35209e: Integrate assets from UX; drag/bouncer animation behavior in slider 
* commit '300772e6f8c8d313457ea7eb0e7be4b670403f77':
  Integrate assets from UX; drag/bouncer animation behavior in slider
 2012-10-29 13:36:50 -07:00
Jim Miller
2d1c6770e5 am 3dd3a41a: am 9b1db682: Fix issue where security view sometimes doesn\'t show. 
* commit '3dd3a41aabfae3d5d27809b067da99568a516e22':
  Fix issue where security view sometimes doesn't show.
 2012-10-29 13:36:44 -07:00
Adam Powell
79cec380a3 am 0d980a3b: am 0b1b5522: Keyguard bouncer notifications; focus moving and the bouncer; slops 
* commit '0d980a3b298a233ed4bbb39955c47a95e51d53c8':
  Keyguard bouncer notifications; focus moving and the bouncer; slops
 2012-10-29 13:36:19 -07:00
John Spurlock
cdf6c25d62 am eb4c0cb5: am 2e8a98e2: Merge "Manual frameworks/base merge from lockhotness (camera)." into jb-mr1-lockscreen-dev 
* commit 'eb4c0cb5098bfceae762594621f4b5125ca7bbe4':
  Manual frameworks/base merge from lockhotness (camera).
 2012-10-29 13:36:03 -07:00
Daniel Sandler
0608c84310 am 165303f6: am d5692742: PIN pad cosmetics. 
* commit '165303f6453e641b9ffe666d434c9ae581a8ab7e':
  PIN pad cosmetics.
 2012-10-29 13:35:46 -07:00
Daniel Sandler
67df65a497 am 51b0919d: am 2c1ce056: Cleaning up password input. 
* commit '51b0919d301c10717c910928c5a03048e224f01f':
  Cleaning up password input.
 2012-10-29 13:35:42 -07:00
Daniel Sandler
119ddb84c5 am 9e126b92: am 51d39f2d: Add ECA to PIN view 
* commit '9e126b92513388331b8af969d2d6f80b0408f795':
  Add ECA to PIN view
 2012-10-29 13:35:38 -07:00
Adam Powell
aacd795b18 am 662bf7b2: am eee20931: Beginnings of bouncer support; add scrims and state tracking 
* commit '662bf7b23e74bb7b92c3ace8ddfdeea1a6791961':
  Beginnings of bouncer support; add scrims and state tracking
 2012-10-29 13:35:07 -07:00
Adam Powell
76fe94c067 am 82da5b17: am c0657fb3: Integrate changes from lockscreen proto app 
* commit '82da5b173c586ce085a85421ebebdd281508f0ba':
  Integrate changes from lockscreen proto app
 2012-10-29 13:34:52 -07:00
John Spurlock
ee12f5aa57 am 47cde77b: Fix camera bugs found overnight. 
* commit '47cde77bc7ac5c3a1e486691596a7534ad855ff2':
  Fix camera bugs found overnight.
 2012-10-29 13:31:48 -07:00
Adam Powell
300772e6f8 am 6f35209e: Integrate assets from UX; drag/bouncer animation behavior in slider 
* commit '6f35209e728a7a9a56afbbdefd3d7bfa1e05ea73':
  Integrate assets from UX; drag/bouncer animation behavior in slider
 2012-10-29 13:31:40 -07:00
Jim Miller
3dd3a41aab am 9b1db682: Fix issue where security view sometimes doesn\'t show. 
* commit '9b1db682c32d103974b0f1193b50e77e254d5589':
  Fix issue where security view sometimes doesn't show.
 2012-10-29 13:31:36 -07:00
Adam Powell
0d980a3b29 am 0b1b5522: Keyguard bouncer notifications; focus moving and the bouncer; slops 
* commit '0b1b552268bc6641cc5d01fb80c12258da9c6985':
  Keyguard bouncer notifications; focus moving and the bouncer; slops
 2012-10-29 13:31:12 -07:00
John Spurlock
eb4c0cb509 am 2e8a98e2: Merge "Manual frameworks/base merge from lockhotness (camera)." into jb-mr1-lockscreen-dev 
* commit '2e8a98e269486700d985f842806ce70e3a394dc9':
  Manual frameworks/base merge from lockhotness (camera).
 2012-10-29 13:30:56 -07:00
Daniel Sandler
165303f645 am d5692742: PIN pad cosmetics. 
* commit 'd5692742c1ff056e9fe55a495632229c86ed5384':
  PIN pad cosmetics.
 2012-10-29 13:30:36 -07:00
Daniel Sandler
51b0919d30 am 2c1ce056: Cleaning up password input. 
* commit '2c1ce0564fbd329e9e9ccfca100c69cfc1fd2645':
  Cleaning up password input.
 2012-10-29 13:30:32 -07:00
Daniel Sandler
9e126b9251 am 51d39f2d: Add ECA to PIN view 
* commit '51d39f2df9ed787644290fbff49b3a8282444c9a':
  Add ECA to PIN view
 2012-10-29 13:30:28 -07:00
Adam Powell
662bf7b23e am eee20931: Beginnings of bouncer support; add scrims and state tracking 
* commit 'eee209313d564be37b8fc068f785b3844cd6597e':
  Beginnings of bouncer support; add scrims and state tracking
 2012-10-29 13:30:00 -07:00