94608 Commits

Author SHA1 Message Date
Baligh Uddin
5b0398448b Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-lockscreen-dev 2012-10-31 10:37:04 -07:00
Baligh Uddin
c061cef351 Revert "Import translations. DO NOT MERGE"
Broken Build: 
frameworks/base/core/res/res/values/symbols.xml:558: error: Symbol 'keyguard_accessibility_widget_changed' declared with <java-symbol> not defined
make: *** [out/target/common/obj/APPS/framework-res_intermediates/package-export.apk] Error 1

This reverts commit 9ab7f479f9ca5f1e27aa09b5f6073d88b8e98f60

Change-Id: I448e20bb060ebfe5f351b5a3d906d9e7768252b1
2012-10-31 10:35:37 -07:00
Baligh Uddin
8029f74fb8 Revert "Import translations. DO NOT MERGE"
Broken Build:
frameworks/base/core/res/res/values/symbols.xml:558: error: Symbol 'keyguard_accessibility_widget_changed' declared with <java-symbol> not defined
make: *** [out/target/common/obj/APPS/framework-res_intermediates/package-export.apk] Error 1


This reverts commit 30a3eeaa4bc8d654b6ff3beb109b6af3f347b135

Change-Id: I505c6c1f3444c80519fbee50d7dda656f5c9b76e
2012-10-31 10:35:22 -07:00
Baligh Uddin
86e39cf6d4 Merge "Revert "Import translations. DO NOT MERGE"" 2012-10-31 10:33:28 -07:00
Baligh Uddin
666a629873 Revert "Import translations. DO NOT MERGE"
Broken Build:
frameworks/base/core/res/res/values/symbols.xml:558: error: Symbol 'keyguard_accessibility_widget_changed' declared with <java-symbol> not defined
make: *** [out/target/common/obj/APPS/framework-res_intermediates/package-export.apk] Error 1

This reverts commit c9346832109236cf880343651e4bd3227a2c7f71

Change-Id: Iecba0e628a2a754b652c3b8af3ccc19c3f0d4ccb
2012-10-31 10:32:47 -07:00
Baligh Uddin
c8661421db am 9d0504fe: (-s ours) am 74db3bb8: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '9d0504fe6aa89ca5efe2dd7d32ec961aaca3d7ec':
  Import translations. DO NOT MERGE
2012-10-31 10:25:39 -07:00
Baligh Uddin
887b9fe29f am 4137ff1c: (-s ours) am 8339bf19: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '4137ff1c0341e1820528c1ef89ff6104a863de20':
  Import translations. DO NOT MERGE
2012-10-31 10:25:36 -07:00
Baligh Uddin
9d0504fe6a am 74db3bb8: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '74db3bb81bd67429ecd7a8b7273c02c1cf51c055':
  Import translations. DO NOT MERGE
2012-10-31 10:23:36 -07:00
Baligh Uddin
d1a753cefe Merge "Import translations. DO NOT MERGE" 2012-10-31 10:23:35 -07:00
Baligh Uddin
4137ff1c03 am 8339bf19: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '8339bf19ece1bbf2b4441e1e07d7fa8e331111d9':
  Import translations. DO NOT MERGE
2012-10-31 10:23:35 -07:00
Baligh Uddin
e8b0c0e702 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 2012-10-31 10:22:14 -07:00
Baligh Uddin
74db3bb81b Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-31 10:20:16 -07:00
Baligh Uddin
a1d2c6de85 Merge "Import translations. DO NOT MERGE" 2012-10-31 10:14:14 -07:00
Baligh Uddin
02dfd644c9 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 2012-10-31 10:13:00 -07:00
Baligh Uddin
8339bf19ec Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-31 10:11:17 -07:00
The Android Open Source Project
81d2bdd513 am 69376b74: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '69376b74b5b45b5d45193242e1609ae5eecd0a77': (23 commits)
  Fix ordering bug
  Track size changes correctly for static wallpapers
  Stop reloading wallpaper bitmap
  Avoid redundant wallpaper loading/drawing
  Show clear all when returning from flip quick settings.
  Fade out the notification/settings panels just before close.
  Fix Bluetooth QS tile.
  Fixes for QS:
  Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."
  Hide settings button from tablet notification panel.
  Quickening.
  Fix ApplicationInfo copy ctor
  Fix NPE in quick settings tiles.
  Fix for bug 7358703 Gmail ANR when trying to compose a message
  Fix inoperative "Forgot pattern" button when face unlock enabled
  Add new tablet sound set Bug: 7351672
  Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457
  Flipping quick settings!
  Flag window animation transactions as animations.
  Fix inoperative "Forgot pattern" button when face unlock enabled
  ...
2012-10-31 09:22:49 -07:00
The Android Open Source Project
69376b74b5 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ic363e92df81b458869dc8c26ad02642886b0538a
2012-10-31 09:16:38 -07:00
Dave Burke
39a8790574 am 026c6254: am ee6e3354: am 86e1b966: Fix ordering bug
* commit '026c6254d71bba9924eca0ae07230f3b6005758b':
  Fix ordering bug
2012-10-30 21:56:13 -07:00
Dave Burke
b95bc6870a Fix ordering bug
Bug: 7445381
Change-Id: I585b8cdd528b05db0737eab815c4172760aece14
2012-10-30 21:54:15 -07:00
Dave Burke
026c6254d7 am ee6e3354: am 86e1b966: Fix ordering bug
* commit 'ee6e3354484233de65da431f0e2abbcd695d7dca':
  Fix ordering bug
2012-10-30 21:53:16 -07:00
Dave Burke
1b33342b00 am 86e1b966: Fix ordering bug
* commit '86e1b96666af3693ec1bf220272fbc90d73d3cde':
  Fix ordering bug
2012-10-30 21:51:11 -07:00
Dave Burke
ee6e335448 am 86e1b966: Fix ordering bug
* commit '86e1b96666af3693ec1bf220272fbc90d73d3cde':
  Fix ordering bug
2012-10-30 21:51:08 -07:00
Dave Burke
86e1b96666 Fix ordering bug
Bug: 7445381
Change-Id: I585b8cdd528b05db0737eab815c4172760aece14
2012-10-30 21:45:12 -07:00
Adam Powell
e74fcc0eb1 Merge "Fix keyguard bugs" into jb-mr1-lockscreen-dev 2012-10-30 21:00:40 -07:00
Adam Powell
cdf8b48745 Fix keyguard bugs
Integrate from proto app

Get some layout/alignment right between security views, bouncer,
etc. Expand the space available for the more cramped security views
when not in the bouncer.

Fix bug 7434391 - don't allow widget swiping in bouncer mode. Fix a
few other bouncer-related state tracking problems as well.

Use layers when moving the security view around.

Change-Id: Ied14bab8bb5c3d997c734a3ae657b766c427253f
2012-10-30 20:57:10 -07:00
Michael Jurka
3c416dfcc0 Merge "Fix crash on boot" into jb-mr1-lockscreen-dev 2012-10-30 20:55:49 -07:00
Michael Jurka
536f067c34 Fix crash on boot 2012-10-30 20:50:21 -07:00
Jim Miller
162fc8e64b Merge "Re-enable transition animation between face unlock and backup" into jb-mr1-lockscreen-dev 2012-10-30 20:43:52 -07:00
Jim Miller
22ae05d50c Re-enable transition animation between face unlock and backup
Change-Id: Ia90cf73e400f45c8b73f34cbc521dcbc62258ca8
2012-10-30 20:37:57 -07:00
Jim Miller
e0ec5d428f Merge "Fix potential null pointer exeption in keyguard" into jb-mr1-lockscreen-dev 2012-10-30 20:18:10 -07:00
Jim Miller
82b517be0b Fix potential null pointer exeption in keyguard
The code was adding default widgets before setting mViewStateManager, which means the
callback from the transport control might access mViewStateManager before it's set.

Change-Id: I985a3c8062d0660519cb4a4c8c1b42c7c90f4ac7
2012-10-30 20:12:53 -07:00
The Android Automerger
02a5988f41 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-30 20:12:18 -07:00
Baligh Uddin
264c880e04 Import translations. DO NOT MERGE
Change-Id: Ifa24744eebd08c289b015a1b2556c7632df52cb5
Auto-generated-cl: translation import
2012-10-30 19:36:50 -07:00
Baligh Uddin
ad0ceadf27 Import translations. DO NOT MERGE
Change-Id: I93ab875ed71833efc99917a6474f1401fb47c263
Auto-generated-cl: translation import
2012-10-30 19:35:18 -07:00
Baligh Uddin
7fc99e8911 Import translations. DO NOT MERGE
Change-Id: I01d1dafe9b0dc9d6fb4d90ff97fc39cbeca4f3f8
Auto-generated-cl: translation import
2012-10-30 19:34:07 -07:00
Baligh Uddin
d66c41c56b Import translations. DO NOT MERGE
Change-Id: I6df01942373d95ef42198afb69cf892fbdbec798
Auto-generated-cl: translation import
2012-10-30 19:32:59 -07:00
Baligh Uddin
c934683210 Import translations. DO NOT MERGE
Change-Id: I21fa45d0c31549882d1153262cc234ac46fdddab
Auto-generated-cl: translation import
2012-10-30 19:24:02 -07:00
Baligh Uddin
30a3eeaa4b Import translations. DO NOT MERGE
Change-Id: I0909dffc40bf6e8325b97aa0c5a0ccc07830b330
Auto-generated-cl: translation import
2012-10-30 19:13:28 -07:00
Baligh Uddin
a7cd483e4d Import translations. DO NOT MERGE
Change-Id: I359781293df3f79daa98691719636baac0f93afb
Auto-generated-cl: translation import
2012-10-30 19:10:48 -07:00
Baligh Uddin
9ab7f479f9 Import translations. DO NOT MERGE
Change-Id: I5a6cc89a0cdc7d6fa5be47c926e69555db4e9ba9
Auto-generated-cl: translation import
2012-10-30 19:08:26 -07:00
Jeff Brown
c8018ebe7c Fix dream/keyguard infinite layout loop.
Bug: 7427191
Change-Id: If48d39cf890274607fd13cdd4d85c6c234ce5a2c
2012-10-30 18:40:54 -07:00
Svetoslav Ganov
8ea7cbe6f3 Merge "Lockscreen accessibility - strings." into jb-mr1-lockscreen-dev 2012-10-30 18:40:51 -07:00
Svetoslav Ganov
0b6e2a45d8 Lockscreen accessibility - strings.
Change-Id: Ic38c2d3e3052979f4f1569e851f365c10d8c93f0
2012-10-30 18:39:16 -07:00
Svetoslav Ganov
5150cb9a30 am 6c86c8ef: am 1728e550: am 0bd6f96f: Merge "Fixing view accessibility classification for recents." into jb-mr1-dev
* commit '6c86c8efda7c35ed856815b50c43dd4e3c4b1950':
  Fixing view accessibility classification for recents.
2012-10-30 18:37:58 -07:00
Svetoslav Ganov
6c86c8efda am 1728e550: am 0bd6f96f: Merge "Fixing view accessibility classification for recents." into jb-mr1-dev
* commit '1728e5509ee650eaebb53f42b47aa5e601819f1c':
  Fixing view accessibility classification for recents.
2012-10-30 18:34:56 -07:00
Svetoslav Ganov
4a85b9f36c am 0bd6f96f: Merge "Fixing view accessibility classification for recents." into jb-mr1-dev
* commit '0bd6f96ff0b5f29b08205518c4060f0d38a9cdcc':
  Fixing view accessibility classification for recents.
2012-10-30 18:34:15 -07:00
Svetoslav Ganov
1728e5509e am 0bd6f96f: Merge "Fixing view accessibility classification for recents." into jb-mr1-dev
* commit '0bd6f96ff0b5f29b08205518c4060f0d38a9cdcc':
  Fixing view accessibility classification for recents.
2012-10-30 18:33:29 -07:00
Svetoslav Ganov
0bd6f96ff0 Merge "Fixing view accessibility classification for recents." into jb-mr1-dev 2012-10-30 18:30:45 -07:00
Ed Heyl
b7df8c9630 am ec71d5d8: am 31dfff78: am 5c12bc58: Merge remote-tracking branch \'goog/jb-mr1-lockscreen-dev\' into jb-mr1-dev
* commit 'ec71d5d8e2e4ff5eb2ca0bd765326806c19e698a':
  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:13:05 -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