Commit Graph

36235 Commits

Author SHA1 Message Date
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
Michael Jurka
769e5f0b30 am 18b5b1f4: am a15eeacf: Merge "Fix bug where it wasn\'t possible to add widgets" into jb-mr1-lockscreen-dev
* commit '18b5b1f46298ad35398d8ba3dbd3156ad14296e6':
  Fix bug where it wasn't possible to add widgets
2012-10-29 14:23:08 -07:00
John Spurlock
46d9322fc7 am e25974c3: am 011717d0: Merge "Implement "sticky" widget logic." into jb-mr1-lockscreen-dev
* commit 'e25974c347e29221bfaa9ce071797469f0bfc4f4':
  Implement "sticky" widget logic.
2012-10-29 14:22:44 -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
Fabrice Di Meglio
024e70c815 am dd80335e: am 07ce0ca2: Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev
* commit 'dd80335edde688794db3260bcea7f732430abaf1':
  Fix bug #7419054 TextView Drawables resolution is broken in RTL mode
2012-10-29 14:22:04 -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
Michael Jurka
18b5b1f462 am a15eeacf: Merge "Fix bug where it wasn\'t possible to add widgets" into jb-mr1-lockscreen-dev
* commit 'a15eeacff99650cb9151106438fb61b73d4e749a':
  Fix bug where it wasn't possible to add widgets
2012-10-29 14:01:10 -07:00
John Spurlock
e25974c347 am 011717d0: Merge "Implement "sticky" widget logic." into jb-mr1-lockscreen-dev
* commit '011717d0648878eedec9e6de90b8fba12f550df7':
  Implement "sticky" widget logic.
2012-10-29 14:00:48 -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
Fabrice Di Meglio
dd80335edd 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
2012-10-29 13:55:46 -07:00
Justin Koh
e8d85f6d1f am 56d9696b: Merge "Expose PreferenceManager constructor / Preference#performClick" into jb-mr1-aah-dev
* commit '56d9696bb717ab0c7deebf4c84b0ff2094bd6cff':
  Expose PreferenceManager constructor / Preference#performClick
2012-10-29 13:37:17 -07:00
Jeff Brown
46a0ec73b6 am 14012e1d: am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev
* commit '14012e1d1b3c96048955e22d2bb73b9c63189a54':
  Add MediaRouter API to get presentation display.
2012-10-29 13:37:10 -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
Michael Jurka
6dd6d43a8b am b1c5ec17: am 1254f2f4: Persist reordering/deleting widgets on keyguard
* commit 'b1c5ec176d899b560f51e496b7719241d6ff8693':
  Persist reordering/deleting widgets on keyguard
2012-10-29 13:36:36 -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
Michael Jurka
24ddf1f12d am fc00e67c: am 8b3dd400: Fix build
* commit 'fc00e67cb0c2242920103162dfc4328fcfee74ed':
  Fix build
2012-10-29 13:35:26 -07:00
Michael Jurka
56dfba037c am e88eebbb: am 147dfc86: Merge "Adding ability to add multiple widgets to keyguard" into jb-mr1-lockscreen-dev
* commit 'e88eebbb3ba8999cd81e79dc62a8dd14c64b592d':
  Adding ability to add multiple widgets to keyguard
2012-10-29 13:35:20 -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
Justin Koh
56d9696bb7 Merge "Expose PreferenceManager constructor / Preference#performClick" into jb-mr1-aah-dev 2012-10-29 13:33:01 -07:00
Jeff Brown
14012e1d1b am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev
* commit '4e0bf7c48638f5c9b222c8781809019df0b39048':
  Add MediaRouter API to get presentation display.
2012-10-29 13:32:02 -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
Michael Jurka
b1c5ec176d am 1254f2f4: Persist reordering/deleting widgets on keyguard
* commit '1254f2f42f7173ef51d0034975ab5cb7d44f8209':
  Persist reordering/deleting widgets on keyguard
2012-10-29 13:31:27 -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
Michael Jurka
fc00e67cb0 am 8b3dd400: Fix build
* commit '8b3dd40019db2c5744b3adceb75a231311bc00b7':
  Fix build
2012-10-29 13:30:20 -07:00
Michael Jurka
e88eebbb3b am 147dfc86: Merge "Adding ability to add multiple widgets to keyguard" into jb-mr1-lockscreen-dev
* commit '147dfc8642ecbdce527d18bdbeece7b7d05dc883':
  Adding ability to add multiple widgets to keyguard
2012-10-29 13:30:16 -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
Adam Powell
82da5b173c am c0657fb3: Integrate changes from lockscreen proto app
* commit 'c0657fb36ce5ede652e8af084e484d07abfb449d':
  Integrate changes from lockscreen proto app
2012-10-29 13:29:43 -07:00
Baligh Uddin
b7565416d8 am ea2078e8: am 985dc142: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit 'ea2078e82f7ef274a6c587a3fe55ab35beef43e9':
  Import translations. DO NOT MERGE
2012-10-29 12:49:43 -07:00
Baligh Uddin
98c56ebcba am b7ac4cbe: am 2171fa1c: am 0fa4cf5b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'b7ac4cbe50197d6c11427599c66b79b3b26cb491':
2012-10-29 12:49:39 -07:00
John Spurlock
8a109dba86 am 8c480e4b: am 86b6357e: Manual f/b merge of lockhotness camera integration.
* commit '8c480e4b1fbc867135384d357803eeeeeff7bc47':
  Manual f/b merge of lockhotness camera integration.
2012-10-29 12:49:05 -07:00
Adam Powell
c1a034aa93 am 7e83e339: am 848a5557: Merge "Fix up GlowPadView attributes" into jb-mr1-lockscreen-dev
* commit '7e83e339533b2c3a3170a0a9f48449dcc6cc0fbb':
  Fix up GlowPadView attributes
2012-10-29 12:49:02 -07:00
Jim Miller
0e0d6fbab4 am 412b6a5e: am 19a52670: Merge latest prototype changes into keyguard
* commit '412b6a5ef27280fb2c83b29a2ef830ebd9b4cf41':
  Merge latest prototype changes into keyguard
2012-10-29 12:48:58 -07:00
Baligh Uddin
ea2078e82f am 985dc142: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '985dc142642c43e54c15a436027a11d9b61ab3d8':
  Import translations. DO NOT MERGE
2012-10-29 12:46:05 -07:00