OSDN Git Service
Jeff Brown [Thu, 1 Nov 2012 22:47:55 +0000 (15:47 -0700)]
am
676adb58: am
62831a7b: Merge "Eliminate potential reentrance from unregisterInputChannel." into jb-mr1-dev
* commit '
676adb589103e452f7d441c04b3386f30062b919':
Eliminate potential reentrance from unregisterInputChannel.
Jeff Brown [Thu, 1 Nov 2012 22:45:50 +0000 (15:45 -0700)]
am
62831a7b: Merge "Eliminate potential reentrance from unregisterInputChannel." into jb-mr1-dev
* commit '
62831a7bd02868316ad1a16dcf13c98896fdbbdc':
Eliminate potential reentrance from unregisterInputChannel.
Jeff Brown [Thu, 1 Nov 2012 22:42:32 +0000 (15:42 -0700)]
Merge "Eliminate potential reentrance from unregisterInputChannel." into jb-mr1-dev
Scott Main [Thu, 1 Nov 2012 22:42:11 +0000 (15:42 -0700)]
am
7b076cee: am
30fd78e2: am
a47776c9: am
2cff3eea: am
f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs
* commit '
7b076ceec4d62aa8d65696f368f16cbf5dbf60e0':
new dashboard stats for 11/1, platform version only
Scott Main [Thu, 1 Nov 2012 22:40:03 +0000 (15:40 -0700)]
am
30fd78e2: am
a47776c9: am
2cff3eea: am
f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs
* commit '
30fd78e27294cd7104f6589ab10f3f3dd1e65fcc':
new dashboard stats for 11/1, platform version only
Scott Main [Thu, 1 Nov 2012 22:37:31 +0000 (15:37 -0700)]
am
a47776c9: am
2cff3eea: am
f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs
* commit '
a47776c9f889242b3bcff0ff2d113d50da342262':
new dashboard stats for 11/1, platform version only
Scott Main [Thu, 1 Nov 2012 22:34:42 +0000 (15:34 -0700)]
am
2cff3eea: am
f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs
* commit '
2cff3eeaeb419fcdfc7307c2c52a653483c76ddb':
new dashboard stats for 11/1, platform version only
Scott Main [Thu, 1 Nov 2012 22:31:53 +0000 (15:31 -0700)]
am
f19804b5: Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs
* commit '
f19804b5e994d183e6f6eeb512f74f2380ffd533':
new dashboard stats for 11/1, platform version only
Laurent Tu [Thu, 1 Nov 2012 22:30:08 +0000 (15:30 -0700)]
am
e730010e: am
7ab7f538: Hide new location APIs and undeprecate old ones
* commit '
e730010edc460384298a2833d82c5e4dc1e75756':
Hide new location APIs and undeprecate old ones
Scott Main [Thu, 1 Nov 2012 22:28:33 +0000 (15:28 -0700)]
Merge "new dashboard stats for 11/1, platform version only" into jb-dev-docs
Laurent Tu [Thu, 1 Nov 2012 22:28:08 +0000 (15:28 -0700)]
am
7ab7f538: Hide new location APIs and undeprecate old ones
* commit '
7ab7f538924371a9dd4be7a27a6ae3b4c04b301c':
Hide new location APIs and undeprecate old ones
Laurent Tu [Tue, 30 Oct 2012 21:54:02 +0000 (14:54 -0700)]
Hide new location APIs and undeprecate old ones
Hide all new location APIs related to LocationRequest/Geofence and
undeprecate all deprecated APIs consequently to the LocationRequest and
Geofence introduction. Also introduce LocationRequestUnbundled for
LocationProviders to use.
Change-Id: I5b116c7d342041f45b341c88a4b6813571118018
Scott Main [Thu, 1 Nov 2012 22:20:47 +0000 (15:20 -0700)]
am
6a66cfce: am
465c3753: Merge "docs: misc changes for new manifest attributes, including fix for bug
7443821 bug
7442263" into jb-mr1-dev
* commit '
6a66cfce8bd564664ea77d9204df91e98af2a2f1':
docs: misc changes for new manifest attributes, including fix for bug
7443821 bug
7442263
Dianne Hackborn [Thu, 1 Nov 2012 22:17:49 +0000 (15:17 -0700)]
am
f1db87cb: am
b9372de0: Merge "More debugging for issue #
7343200 Fails to show wallpaper in the..." into jb-mr1-dev
* commit '
f1db87cb163049698e6f336fbf1447714c966443':
More debugging for issue #
7343200 Fails to show wallpaper in the...
Scott Main [Thu, 1 Nov 2012 22:17:44 +0000 (15:17 -0700)]
am
465c3753: Merge "docs: misc changes for new manifest attributes, including fix for bug
7443821 bug
7442263" into jb-mr1-dev
* commit '
465c37533ac1fb76d76b062452ae19afb84aab0a':
docs: misc changes for new manifest attributes, including fix for bug
7443821 bug
7442263
Dianne Hackborn [Thu, 1 Nov 2012 22:15:56 +0000 (15:15 -0700)]
am
b9372de0: Merge "More debugging for issue #
7343200 Fails to show wallpaper in the..." into jb-mr1-dev
* commit '
b9372de07d3329928f28104bb997aab57237504c':
More debugging for issue #
7343200 Fails to show wallpaper in the...
Scott Main [Thu, 1 Nov 2012 20:15:26 +0000 (13:15 -0700)]
new dashboard stats for 11/1, platform version only
Change-Id: If6e9633170793e45abfdc94ef215f45edd64e547
Scott Main [Thu, 1 Nov 2012 22:14:24 +0000 (15:14 -0700)]
Merge "docs: misc changes for new manifest attributes, including fix for bug
7443821 bug
7442263" into jb-mr1-dev
Victoria Lease [Thu, 1 Nov 2012 22:12:40 +0000 (15:12 -0700)]
am
07fcfef2: am
1e701979: Merge "fix NLP for COARSE applications, build FLP with SDK" into jb-mr1-dev
* commit '
07fcfef27d0cc64a12a1a04879456c8a155e2993':
fix NLP for COARSE applications, build FLP with SDK
Dianne Hackborn [Thu, 1 Nov 2012 22:12:22 +0000 (15:12 -0700)]
Merge "More debugging for issue #
7343200 Fails to show wallpaper in the..." into jb-mr1-dev
Victoria Lease [Thu, 1 Nov 2012 22:10:47 +0000 (15:10 -0700)]
am
1e701979: Merge "fix NLP for COARSE applications, build FLP with SDK" into jb-mr1-dev
* commit '
1e701979a031f42ee0fa0a07b151f6c61314e2e4':
fix NLP for COARSE applications, build FLP with SDK
Dianne Hackborn [Thu, 1 Nov 2012 21:22:28 +0000 (14:22 -0700)]
More debugging for issue #
7343200 Fails to show wallpaper in the...
...background for lockscreen sometimes and remains black / blank
There was a bunch of state not being put into the dumpsys output.
In particular, the current wallpaper target of the WindowAnimator
was not being included. I think the problem is that these targets
are not being updated from the main window manager state at some
point where they need to be.
Change-Id: Ic795047f6aea9b6f72d5550bccc9f8d76c6ecb67
Victoria Lease [Thu, 1 Nov 2012 22:07:56 +0000 (15:07 -0700)]
Merge "fix NLP for COARSE applications, build FLP with SDK" into jb-mr1-dev
Svetoslav Ganov [Thu, 1 Nov 2012 21:55:26 +0000 (14:55 -0700)]
am
b3ec0639: am
7e1a45d8: Merge "Fix accessibility API injection." into jb-mr1-dev
* commit '
b3ec0639a942792517bff62498b58bce4bd5dc91':
Fix accessibility API injection.
Svetoslav Ganov [Thu, 1 Nov 2012 21:52:28 +0000 (14:52 -0700)]
am
7e1a45d8: Merge "Fix accessibility API injection." into jb-mr1-dev
* commit '
7e1a45d8af9d02fc552d65f2abcaefe3096b2c9c':
Fix accessibility API injection.
Svetoslav Ganov [Thu, 1 Nov 2012 21:49:19 +0000 (14:49 -0700)]
Merge "Fix accessibility API injection." into jb-mr1-dev
Chris Craik [Thu, 1 Nov 2012 21:40:04 +0000 (14:40 -0700)]
am
7494f0c0: am
a84c9639: Merge "Avoid tesselation path when useCenter is set" into jb-mr1-dev
* commit '
7494f0c04b1abd010207ee5c7e8c9aff6d69c956':
Avoid tesselation path when useCenter is set
Chris Craik [Thu, 1 Nov 2012 21:37:07 +0000 (14:37 -0700)]
am
a84c9639: Merge "Avoid tesselation path when useCenter is set" into jb-mr1-dev
* commit '
a84c963936bf23ac4aaec3b17cd70ce50906b24a':
Avoid tesselation path when useCenter is set
Chris Craik [Thu, 1 Nov 2012 21:33:57 +0000 (14:33 -0700)]
Merge "Avoid tesselation path when useCenter is set" into jb-mr1-dev
Robert Ly [Thu, 1 Nov 2012 21:28:25 +0000 (14:28 -0700)]
am
1fcc8f48: am
f9e7b618: am
93a9a0a2: am
0fc15da0: am
677c1e14: Merge "docs: google market -> google play" into jb-dev-docs
* commit '
1fcc8f486d02f354361e877f13061be622d218e2':
docs: google market -> google play
Robert Ly [Thu, 1 Nov 2012 21:26:19 +0000 (14:26 -0700)]
am
f9e7b618: am
93a9a0a2: am
0fc15da0: am
677c1e14: Merge "docs: google market -> google play" into jb-dev-docs
* commit '
f9e7b61867316057f80a92804da0b5800bd4c01a':
docs: google market -> google play
alanv [Thu, 1 Nov 2012 21:25:01 +0000 (14:25 -0700)]
Fix accessibility API injection.
Also adds a heartbeat check so that if something does go wrong while adding
the JavaScript APIs, we don't attempt to use the JavaScript-based screen
reader.
Bug:
7450237
Change-Id: Ifbce77cf93115f658386c520b8226941607b2afe
Robert Ly [Thu, 1 Nov 2012 21:23:30 +0000 (14:23 -0700)]
am
93a9a0a2: am
0fc15da0: am
677c1e14: Merge "docs: google market -> google play" into jb-dev-docs
* commit '
93a9a0a2bc2173d942f2c37d0751a9e4df8ecb24':
docs: google market -> google play
Robert Ly [Thu, 1 Nov 2012 21:19:18 +0000 (14:19 -0700)]
am
0fc15da0: am
677c1e14: Merge "docs: google market -> google play" into jb-dev-docs
* commit '
0fc15da00597c5a017c1d8eed8f34064c702e4c2':
docs: google market -> google play
Robert Ly [Thu, 1 Nov 2012 21:16:47 +0000 (14:16 -0700)]
am
677c1e14: Merge "docs: google market -> google play" into jb-dev-docs
* commit '
677c1e14fbd991a46b5496d0873b7ca155fd71fb':
docs: google market -> google play
Robert Ly [Thu, 1 Nov 2012 21:14:26 +0000 (14:14 -0700)]
Merge "docs: google market -> google play" into jb-dev-docs
Joe Malin [Thu, 1 Nov 2012 21:08:52 +0000 (14:08 -0700)]
am
48464f15: am
1f177cb8: am
e639d67a: am
d2e16346: am
ac294abb: Revision to Notifications API guide
* commit '
48464f15f9f4ea77aa19a521635afbd8376b9098':
Revision to Notifications API guide
Joe Malin [Thu, 1 Nov 2012 21:06:12 +0000 (14:06 -0700)]
am
1f177cb8: am
e639d67a: am
d2e16346: am
ac294abb: Revision to Notifications API guide
* commit '
1f177cb87a87b26fe302298f96197766ebddaf96':
Revision to Notifications API guide
Joe Malin [Thu, 1 Nov 2012 21:00:54 +0000 (14:00 -0700)]
am
e639d67a: am
d2e16346: am
ac294abb: Revision to Notifications API guide
* commit '
e639d67aeb0e2758f2480c25e8ab007918701ed3':
Revision to Notifications API guide
Joe Malin [Thu, 1 Nov 2012 20:58:02 +0000 (13:58 -0700)]
am
d2e16346: am
ac294abb: Revision to Notifications API guide
* commit '
d2e163461ee8aa79d4560f38e924a7edc44ad4dd':
Revision to Notifications API guide
Victoria Lease [Wed, 31 Oct 2012 22:54:05 +0000 (15:54 -0700)]
fix NLP for COARSE applications, build FLP with SDK
In this commit, we provide a means for unbundled location providers
to attach an EXTRA_NO_GPS_LOCATION to the Locations that they report.
We also build FusedLocation against the SDK rather than the internal
tree.
Used in conjunction with I394ded497b8de40d1f85618bff282553cdf378cb
to fix NLP for applications with only ACCESS_COARSE_LOCATION
permission.
Bug:
7453355
Change-Id: Ie696f7abff9ef5237740ab87fe9f537a1c812c54
Joe Malin [Thu, 1 Nov 2012 20:55:08 +0000 (13:55 -0700)]
am
ac294abb: Revision to Notifications API guide
* commit '
ac294abb40483fc734e22833371d95cbb161ec87':
Revision to Notifications API guide
Joe Malin [Tue, 16 Oct 2012 17:32:15 +0000 (10:32 -0700)]
Revision to Notifications API guide
Change-Id: I52229dfdff3649e03a1fbce91234c8b2a544502a
Zhihai Xu [Thu, 1 Nov 2012 19:47:49 +0000 (12:47 -0700)]
am
9ae23b7d: am
0de49148: Merge "Fix for BluetoothAdapter.getAddress() when BT is off on some devices" into jb-mr1-dev
* commit '
9ae23b7d2215de2737fb3752ad9af19bbe07388c':
Fix for BluetoothAdapter.getAddress() when BT is off on some devices
Zhihai Xu [Thu, 1 Nov 2012 19:45:01 +0000 (12:45 -0700)]
am
0de49148: Merge "Fix for BluetoothAdapter.getAddress() when BT is off on some devices" into jb-mr1-dev
* commit '
0de49148f07c7f0b3b45cec0ef502db4b9163711':
Fix for BluetoothAdapter.getAddress() when BT is off on some devices
Zhihai Xu [Thu, 1 Nov 2012 19:43:27 +0000 (12:43 -0700)]
Merge "Fix for BluetoothAdapter.getAddress() when BT is off on some devices" into jb-mr1-dev
Scott Main [Thu, 1 Nov 2012 18:56:13 +0000 (11:56 -0700)]
am
df55c297: am
56a3ce03: Merge "docs: update description for location permissions bug:
6996667" into jb-mr1-dev
* commit '
df55c2979edbc8a91a24cc1c3967300937b37645':
docs: update description for location permissions bug:
6996667
Scott Main [Thu, 1 Nov 2012 18:54:15 +0000 (11:54 -0700)]
am
56a3ce03: Merge "docs: update description for location permissions bug:
6996667" into jb-mr1-dev
* commit '
56a3ce038eb03a527b475779d7abf694da1879bc':
docs: update description for location permissions bug:
6996667
Scott Main [Thu, 1 Nov 2012 18:47:43 +0000 (11:47 -0700)]
Merge "docs: update description for location permissions bug:
6996667" into jb-mr1-dev
Romain Guy [Thu, 1 Nov 2012 18:28:13 +0000 (11:28 -0700)]
am
9c0010f8: am
998d03bd: Merge "A new clock widget to create lock screen appwidgets" into jb-mr1-dev
* commit '
9c0010f856d623845b20a7dd13c024023626623c':
A new clock widget to create lock screen appwidgets
Chris Craik [Thu, 1 Nov 2012 18:27:03 +0000 (11:27 -0700)]
Avoid tesselation path when useCenter is set
bug:
7458300
The tesselation path doesn't handle sharp joins.
Change-Id: I28bf03f3b72fc584a205daa40934dda17031098f
Romain Guy [Thu, 1 Nov 2012 18:26:10 +0000 (11:26 -0700)]
am
998d03bd: Merge "A new clock widget to create lock screen appwidgets" into jb-mr1-dev
* commit '
998d03bd943053741bab17a8ef0abb355f6bc3ae':
A new clock widget to create lock screen appwidgets
Romain Guy [Thu, 1 Nov 2012 18:23:17 +0000 (11:23 -0700)]
Merge "A new clock widget to create lock screen appwidgets" into jb-mr1-dev
Scott Main [Thu, 1 Nov 2012 17:55:02 +0000 (10:55 -0700)]
docs: update description for location permissions
bug:
6996667
Change-Id: I3b5d706d98b56386a88b33a343721ff7432063b9
Scott Main [Wed, 31 Oct 2012 00:02:18 +0000 (17:02 -0700)]
docs: misc changes for new manifest attributes,
including fix for bug
7443821
bug
7442263
Change-Id: I20b712bf2b0379c70ff28682025d6f30817a6c36
Scott Main [Thu, 1 Nov 2012 17:04:51 +0000 (10:04 -0700)]
am
985e9b8d: am
8761e143: docs: Clarify the callback mechanisms for LocationRequest and clarify horizontal geofencing
* commit '
985e9b8d49ea613d902368bb4a4777ed269802a3':
docs: Clarify the callback mechanisms for LocationRequest and clarify horizontal geofencing
Scott Main [Thu, 1 Nov 2012 16:58:40 +0000 (09:58 -0700)]
am
8761e143: docs: Clarify the callback mechanisms for LocationRequest and clarify horizontal geofencing
* commit '
8761e143c987fc48d854818988cde44700c9f602':
docs: Clarify the callback mechanisms for LocationRequest and clarify horizontal geofencing
Scott Main [Tue, 30 Oct 2012 02:11:41 +0000 (19:11 -0700)]
docs: Clarify the callback mechanisms for LocationRequest
and clarify horizontal geofencing
Change-Id: I8ff264d7a12c8ec3c79854e008aeeb5f922ad459
The Android Open Source Project [Thu, 1 Nov 2012 14:52:02 +0000 (07:52 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I412cbce1e453fb33c6706c8b194957e6b36eff58
Zhihai Xu [Wed, 31 Oct 2012 23:08:57 +0000 (16:08 -0700)]
Fix for BluetoothAdapter.getAddress() when BT is off on some devices
There are two problem, 1.If we have wrong bluetooth address in
global settings db, we never will update it 2. We need enable bluetooth
to get the bluetooth address for some devices. For 1, we fix it by add
a valid flag in global setting db, this flag will be set when we stored
correct address and name to db. We only load the name and address from
global setting db when this valid flag is set during power up.
For2. we will read BT address after bluetooth is at ON state.
bug
7440409
Change-Id: Ic4740b3f0b2fcd214c7ca8393f7331c140eec66d
Xia Wang [Thu, 1 Nov 2012 04:23:31 +0000 (21:23 -0700)]
am
f1e32af5: am
c86e8dff: Merge "Fix WiFi stress test" into jb-mr1-dev
* commit '
f1e32af5ae629a1a0f73ee12aa6390ea9e527d32':
Fix WiFi stress test
Xia Wang [Thu, 1 Nov 2012 04:20:38 +0000 (21:20 -0700)]
am
c86e8dff: Merge "Fix WiFi stress test" into jb-mr1-dev
* commit '
c86e8dffd04804f7f975c80325bc3ae70e7e972a':
Fix WiFi stress test
Xia Wang [Thu, 1 Nov 2012 04:18:28 +0000 (21:18 -0700)]
Merge "Fix WiFi stress test" into jb-mr1-dev
Michael Jurka [Thu, 1 Nov 2012 03:35:57 +0000 (20:35 -0700)]
am
40d90211: am
c8dc8eb3: Merge "Use new keyguard appwidget picker" into jb-mr1-lockscreen-dev
* commit '
40d90211fe038219ef6595a8d56e5d9b390e2f89':
Use new keyguard appwidget picker
Adam Powell [Thu, 1 Nov 2012 03:35:53 +0000 (20:35 -0700)]
am
302b6819: am
077105ba: Merge "Fix some drag behavior bugs in keyguard" into jb-mr1-lockscreen-dev
* commit '
302b6819cdedefff5d7ec74133bf73a461eab99f':
Fix some drag behavior bugs in keyguard
Chet Haase [Thu, 1 Nov 2012 03:35:50 +0000 (20:35 -0700)]
am
437e1a9c: am
4f721f10: am
fe28ff0d: Merge "Fix for regression in WindowManager orientation changes" into jb-mr1-dev
* commit '
437e1a9c5bbb7929e5379813888edee489c09e70':
Jeff Brown [Thu, 1 Nov 2012 03:35:46 +0000 (20:35 -0700)]
am
ba16031a: am
409c89c3: am
c1c53e56: Merge "Fix dream/keyguard infinite layout loop." into jb-mr1-dev
* commit '
ba16031aa15713ea2ed979d40be02b7ca99d4990':
Raph Levien [Thu, 1 Nov 2012 03:35:42 +0000 (20:35 -0700)]
am
19d7cc38: am
688d0381: am
c01d1045: Merge "Fix for bug
7400445 regression in background drawable" into jb-mr1-dev
* commit '
19d7cc3814c59fcedb7d181c3fb17b3e8bb4ed00':
Baligh Uddin [Thu, 1 Nov 2012 03:35:39 +0000 (20:35 -0700)]
am
28ce2ed9: am
4bce83ee: am
9e3a900c: Merge "Revert "Removed symbol causing compile breakage."" into jb-mr1-dev
* commit '
28ce2ed9ba8148626cecfec5b6501847f5c1e3e0':
Baligh Uddin [Thu, 1 Nov 2012 03:35:36 +0000 (20:35 -0700)]
am
7960244c: am
13d02d04: am
83e9187d: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
* commit '
7960244c499049e231043e760452f32070ae8493':
Baligh Uddin [Thu, 1 Nov 2012 03:35:31 +0000 (20:35 -0700)]
am
7a767180: am
47f52d75: am
a68aa4e3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
7a7671807c9d0ffafb4a70335d9adfc81b723ed6':
Baligh Uddin [Thu, 1 Nov 2012 03:35:27 +0000 (20:35 -0700)]
am
f97b62bd: am
6697c682: am
dd733251: Merge "Removed symbol causing compile breakage." into jb-mr1-dev
* commit '
f97b62bd18094b69f120341ae1dd98df8d0d23f7':
Svetoslav Ganov [Thu, 1 Nov 2012 03:35:24 +0000 (20:35 -0700)]
am
0c777537: am
cdb80888: Merge "Fix keypad accessibility." into jb-mr1-lockscreen-dev
* commit '
0c77753749bf0372a3876ba5f8a45d497208614c':
Fix keypad accessibility.
Baligh Uddin [Thu, 1 Nov 2012 03:35:20 +0000 (20:35 -0700)]
am
22815f1d: am
0e06223c: am
6bd881bd: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
22815f1df619a0cfee3b7483ade51121fa36c8d6':
Svetoslav Ganov [Thu, 1 Nov 2012 03:35:17 +0000 (20:35 -0700)]
am
708d8db9: am
51cfc540: Merge "Accessibility of the lock screen - strings" into jb-mr1-lockscreen-dev
* commit '
708d8db946e048527a56a23accfaa2e94333ca5c':
Accessibility of the lock screen - strings
Amith Yamasani [Thu, 1 Nov 2012 03:35:13 +0000 (20:35 -0700)]
am
53bcda4f: am
7f5bade1: am
03f7ebfe: Merge "Relax permission requirements for posting notifications across users" into jb-mr1-dev
* commit '
53bcda4f57135e7ed0f40ce82e359020c92660d5':
Jim Miller [Thu, 1 Nov 2012 03:35:10 +0000 (20:35 -0700)]
am
57dcf248: am
170c8d93: Merge "Remove extra KeyguardViewStateManager construction" into jb-mr1-lockscreen-dev
* commit '
57dcf248d61dfc72f7b4519dd1cbb02bf8f342f5':
Remove extra KeyguardViewStateManager construction
Chris Wren [Thu, 1 Nov 2012 03:35:06 +0000 (20:35 -0700)]
am
5bbf7ef8: am
f778bfdf: Merge "Update bouncer behavior on tablets." into jb-mr1-lockscreen-dev
* commit '
5bbf7ef83d7c7c99ed020bf25c745c242f14785f':
Update bouncer behavior on tablets.
Baligh Uddin [Thu, 1 Nov 2012 03:35:05 +0000 (20:35 -0700)]
am
971c086e: (-s ours) am
5b039844: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-lockscreen-dev
* commit '
971c086ea5e133f875b1656d2de3b5f028b4614f':
Revert "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 1 Nov 2012 03:32:10 +0000 (20:32 -0700)]
am
f6afd134: am
e8b0c0e7: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
f6afd1347665af463d536fa1626b03bef219bffe':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 1 Nov 2012 03:32:09 +0000 (20:32 -0700)]
am
bdb64499: (-s ours) am
02dfd644: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '
bdb644994d7d4b04d19849f892f03eb304cd4562':
Import translations. DO NOT MERGE
Romain Guy [Thu, 1 Nov 2012 03:31:58 +0000 (20:31 -0700)]
A new clock widget to create lock screen appwidgets
This new widget replaces DigitalClock. It listens to all the correct
system events and offer the ability to customize the formatting
patterns in 12-hour and 24-hour modes. It also supports fixed
time zones to create world clocks.
One more step towards becoming ClockOS!
Change-Id: I677e5dfca8cd8c8d1f8c49e54d7507f4d1885bf4
Dave Burke [Thu, 1 Nov 2012 02:42:00 +0000 (19:42 -0700)]
Adam Powell [Thu, 1 Nov 2012 02:41:55 +0000 (19:41 -0700)]
am
45d2f164: am
e74fcc0e: Merge "Fix keyguard bugs" into jb-mr1-lockscreen-dev
* commit '
45d2f164877a8bfd4e99666b00d56169b23ff979':
Fix keyguard bugs
Michael Jurka [Thu, 1 Nov 2012 02:41:51 +0000 (19:41 -0700)]
am
7b1deee1: am
3c416dfc: Merge "Fix crash on boot" into jb-mr1-lockscreen-dev
* commit '
7b1deee1554ca8f4a4d6d79091eea7358a1b3bce':
Fix crash on boot
Jim Miller [Thu, 1 Nov 2012 02:41:46 +0000 (19:41 -0700)]
am
2bf287c8: am
162fc8e6: Merge "Re-enable transition animation between face unlock and backup" into jb-mr1-lockscreen-dev
* commit '
2bf287c884f18e0f5c18c738d2d9b42d34323857':
Re-enable transition animation between face unlock and backup
Jim Miller [Thu, 1 Nov 2012 02:41:40 +0000 (19:41 -0700)]
am
c3ab855a: am
e0ec5d42: Merge "Fix potential null pointer exeption in keyguard" into jb-mr1-lockscreen-dev
* commit '
c3ab855a35bafcf3138316fc8d20c2a3933d40f5':
Fix potential null pointer exeption in keyguard
Svetoslav Ganov [Thu, 1 Nov 2012 02:41:36 +0000 (19:41 -0700)]
am
acb544dd: am
8ea7cbe6: Merge "Lockscreen accessibility - strings." into jb-mr1-lockscreen-dev
* commit '
acb544dda8861b7da84c8c078d87a7a713f363a8':
Lockscreen accessibility - strings.
Svetoslav Ganov [Thu, 1 Nov 2012 02:41:32 +0000 (19:41 -0700)]
am
253cbc43: am
4a85b9f3: am
0bd6f96f: Merge "Fixing view accessibility classification for recents." into jb-mr1-dev
* commit '
253cbc43323ff52fdb731d4867b4886207d5a655':
Ed Heyl [Thu, 1 Nov 2012 02:41:30 +0000 (19:41 -0700)]
am
aa5f5a22: am
1f928787: am
5c12bc58: Merge remote-tracking branch \'goog/jb-mr1-lockscreen-dev\' into jb-mr1-dev
* commit '
aa5f5a22754db00be8b7d4fd7fb9c36a5ad393ed':
Amith Yamasani [Thu, 1 Nov 2012 02:41:26 +0000 (19:41 -0700)]
am
1fa4fc55: am
d2f616f2: am
20329dcb: Merge "QS uses nickname for multiuser and profile name for singleuser." into jb-mr1-dev
* commit '
1fa4fc558173d2491b06eed272c8cc848d575109':
Amith Yamasani [Thu, 1 Nov 2012 02:41:24 +0000 (19:41 -0700)]
am
d505aa90: am
7277d5d9: QS uses nickname for multiuser and profile name for singleuser.
* commit '
d505aa908812a8e05b12ceee63ccdf7f0957fbf9':
QS uses nickname for multiuser and profile name for singleuser.
Michael Jurka [Thu, 1 Nov 2012 02:37:43 +0000 (19:37 -0700)]
am
c8dc8eb3: Merge "Use new keyguard appwidget picker" into jb-mr1-lockscreen-dev
* commit '
c8dc8eb3275a6d05e27824f322796e97e5e50e2f':
Use new keyguard appwidget picker
Adam Powell [Thu, 1 Nov 2012 02:37:39 +0000 (19:37 -0700)]
am
077105ba: Merge "Fix some drag behavior bugs in keyguard" into jb-mr1-lockscreen-dev
* commit '
077105bae304d92c61ec5d164549eb028d4b283b':
Fix some drag behavior bugs in keyguard
Chet Haase [Thu, 1 Nov 2012 02:37:35 +0000 (19:37 -0700)]
am
4f721f10: am
fe28ff0d: Merge "Fix for regression in WindowManager orientation changes" into jb-mr1-dev
* commit '
4f721f101dafb4d756471fa99b3e796f11c2b38e':
Jeff Brown [Thu, 1 Nov 2012 02:37:32 +0000 (19:37 -0700)]
am
409c89c3: am
c1c53e56: Merge "Fix dream/keyguard infinite layout loop." into jb-mr1-dev
* commit '
409c89c35838a0a5402abb253dc24ea959db6c5e':
Raph Levien [Thu, 1 Nov 2012 02:37:28 +0000 (19:37 -0700)]
am
688d0381: am
c01d1045: Merge "Fix for bug
7400445 regression in background drawable" into jb-mr1-dev
* commit '
688d038173a40f68ec2d06183978e4aaddbb9806':
Baligh Uddin [Thu, 1 Nov 2012 02:37:24 +0000 (19:37 -0700)]
am
4bce83ee: am
9e3a900c: Merge "Revert "Removed symbol causing compile breakage."" into jb-mr1-dev
* commit '
4bce83ee052b21df275822d11b07fb1fdf214cc9':
Baligh Uddin [Thu, 1 Nov 2012 02:37:21 +0000 (19:37 -0700)]
am
13d02d04: am
83e9187d: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev
* commit '
13d02d042737dd13d858151d1e28090e90ebb4a2':
Baligh Uddin [Thu, 1 Nov 2012 02:37:17 +0000 (19:37 -0700)]
am
47f52d75: am
a68aa4e3: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
47f52d754a738d0231312bafe8eaa0da8d0b3cde':