87904 Commits

Author SHA1 Message Date
Chris Wren
74c5d53e2f am b524f4b9: Merge "add some defensive code to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev
* commit 'b524f4b928fe3ac9c71657a323cff4b3321344da':
  add some defensive code to enableUserSelectorIfNecessary.
2012-11-07 18:29:27 -08:00
Daniel Sandler
e4e6c97ea4 am 2d09880d: am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev
* commit '2d09880d0352895dcd7ae3d4cdca95e4503b23ed':
2012-11-07 18:29:23 -08:00
Baligh Uddin
7086987652 am 62e2374b: am 32226b73: (-s ours) Import translations. DO NOT MERGE
* commit '62e2374baa822bc98ef8e5ad8b10a55379433ef1':
2012-11-07 18:29:20 -08:00
Baligh Uddin
d9550886a8 am d44c4344: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit 'd44c4344aa85ece3443ffdd410e9619650cbd39f':
  Import translations. DO NOT MERGE
2012-11-07 18:29:16 -08:00
Adam Cohen
b579714c12 am 8f837a69: Merge "Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)" into jb-mr1-lockscreen-dev
* commit '8f837a690b0da2579157cdcc30503e0dd67f429d':
  Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)
2012-11-07 18:29:13 -08:00
Baligh Uddin
4d0e5e0e15 am db60b675: am fc958f12: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'db60b67533f0e8e0366a926204bc852412285320':
2012-11-07 18:29:10 -08:00
Irfan Sheriff
1f6cf5fade Merge "Re-use existing thread" into jb-mr1.1-dev 2012-11-07 16:43:26 -08:00
Sascha Prueter
eb3aa44c10 am 972dd431: Merge "Final icon for notifications panel" into jb-mr1-dev
* commit '972dd431f81432f1bbb33d2e7f34fcd5f4764870':
  Final icon for notifications panel
2012-11-07 14:12:33 -08:00
Sascha Prueter
972dd431f8 Merge "Final icon for notifications panel" into jb-mr1-dev 2012-11-07 14:08:22 -08:00
Victoria Lease
4abe2d3d36 am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev
* commit 'ad84f7f46b0207a7ad316b4df37c1f02c889cca9':
  disable geofences for secondary users
2012-11-07 14:01:31 -08:00
Victoria Lease
ad84f7f46b Merge "disable geofences for secondary users" into jb-mr1-dev 2012-11-07 13:56:46 -08:00
Irfan Sheriff
cd3d75f35d Re-use existing thread
Bug: 7377541
Change-Id: I097f2288ebfc2b4a9782cbced19d9c36d0703acb
2012-11-07 13:02:08 -08:00
Chris Wren
b524f4b928 Merge "add some defensive code to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev 2012-11-07 12:39:54 -08:00
Daniel Sandler
2d09880d03 am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev
* commit 'afc5210a811da3824d75e32d998370203aba1968':
  Fix docs to refer to the correct class.
2012-11-07 12:37:28 -08:00
Daniel Sandler
7b5a92766a am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev
* commit 'afc5210a811da3824d75e32d998370203aba1968':
  Fix docs to refer to the correct class.
2012-11-07 12:37:28 -08:00
Daniel Sandler
afc5210a81 Merge "Fix docs to refer to the correct class." into jb-mr1-dev 2012-11-07 12:35:01 -08:00
Chris Wren
91f080c777 add some defensive code to enableUserSelectorIfNecessary.
Bug: 7437751
Change-Id: I3f8e317624f158fce0d58be69b733699a208d802
2012-11-07 15:21:37 -05:00
Baligh Uddin
62e2374baa am 32226b73: (-s ours) Import translations. DO NOT MERGE
* commit '32226b73ca908b2ee45c6ee651437aec2ab93489':
  Import translations. DO NOT MERGE
2012-11-07 11:58:11 -08:00
Baligh Uddin
0d29833f96 am 32226b73: Import translations. DO NOT MERGE
* commit '32226b73ca908b2ee45c6ee651437aec2ab93489':
  Import translations. DO NOT MERGE
2012-11-07 11:57:36 -08:00
Baligh Uddin
32226b73ca Import translations. DO NOT MERGE
Change-Id: I82793ad9ed66b4e2924b3c32a2292bad69b56579
Auto-generated-cl: translation import
2012-11-07 11:54:30 -08:00
Baligh Uddin
d44c4344aa Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 2012-11-07 11:52:29 -08:00
Adam Cohen
8f837a690b Merge "Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)" into jb-mr1-lockscreen-dev 2012-11-07 11:51:06 -08:00
Adam Cohen
4eb36cfdca Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)
Change-Id: I736816dac8cea47632fbdbc75b367f2c6216dff7
2012-11-07 11:45:30 -08:00
Baligh Uddin
db60b67533 am fc958f12: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'fc958f12f639a6a9cb676b0d1e30ed67b4f5a455':
  Import translations. DO NOT MERGE
2012-11-07 11:42:46 -08:00
Baligh Uddin
b97aadec0f am fc958f12: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'fc958f12f639a6a9cb676b0d1e30ed67b4f5a455':
  Import translations. DO NOT MERGE
2012-11-07 11:42:04 -08:00
Baligh Uddin
fc958f12f6 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-11-07 11:39:41 -08:00
The Android Open Source Project
63985103f3 Reconcile with jb-mr1-release - do not merge
Change-Id: I290ad0de0601dc3c49366d7b9d44d9d30021559d
2012-11-07 11:36:42 -08:00
Baligh Uddin
2d6a1b778d Import translations. DO NOT MERGE
Change-Id: Ia0befbcb0a476a7afffa3cd748625fa9f32e826f
Auto-generated-cl: translation import
2012-11-07 11:34:53 -08:00
John Spurlock
66453ff534 am 506fd3b0: Merge "Low battery dialog should use UserHandle.CURRENT." into jb-mr1-dev
* commit '506fd3b02ef4b036aceb66db76ca93c55254bfcf':
  Low battery dialog should use UserHandle.CURRENT.
2012-11-07 11:34:47 -08:00
John Spurlock
506fd3b02e Merge "Low battery dialog should use UserHandle.CURRENT." into jb-mr1-dev 2012-11-07 11:31:30 -08:00
Romain Guy
fcd7ad4e28 am 59d73ab6: Merge "Respond to ticks when a timezone is set and it doesn\'t display seconds Bug #7489774" into jb-mr1-dev
* commit '59d73ab6fcc80b9e08ff06cfc13617a2f65af60e':
  Respond to ticks when a timezone is set and it doesn't display seconds Bug #7489774
2012-11-07 11:18:55 -08:00
The Android Automerger
5246b8a8e2 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-07 11:18:07 -08:00
Romain Guy
59d73ab6fc Merge "Respond to ticks when a timezone is set and it doesn't display seconds Bug #7489774" into jb-mr1-dev 2012-11-07 11:15:36 -08:00
Roman Nurik
081e6b7daf am 0fc1b5ec: am 512950a9: Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev
* commit '0fc1b5ecba383f7d3a5e6154a9569ec7d35d64ce':
2012-11-07 11:15:13 -08:00
Baligh Uddin
dac8d6d999 am a40ec75e: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit 'a40ec75eb3be19b35d10071e93c5b0997eafb0d0':
  Import translations. DO NOT MERGE
2012-11-07 11:15:07 -08:00
Daniel Sandler
6f562e9fab am 1b803450: Merge "Show the assist ring on center-button longpress on lockscreen." into jb-mr1-lockscreen-dev
* commit '1b803450255ba1d4e173bd75d5cd9679c5a98915':
  Show the assist ring on center-button longpress on lockscreen.
2012-11-07 11:15:03 -08:00
Baligh Uddin
b38b3ed123 am 8dbf3b8d: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
* commit '8dbf3b8df0f29d457155e5831dbecf5ba4fff98e':
  Import translations. DO NOT MERGE
2012-11-07 11:15:00 -08:00
Chris Wren
53d819687e am cf9ee4c5: Merge "Don\'t pop the IME for passwors at ScreenOn on tablets." into jb-mr1-lockscreen-dev
* commit 'cf9ee4c55db750f86fdcb765c4f21c44bb4bc893':
  Don't pop the IME for passwors at ScreenOn on tablets.
2012-11-07 11:14:56 -08:00
Brian Colonna
9885568eb7 am 6b4ab7f1: Merge "Centering FUL fixes b/7480608" into jb-mr1-lockscreen-dev
* commit '6b4ab7f170ea54e5b99cf0635d3803a9407439d7':
  Centering FUL fixes b/7480608
2012-11-07 11:14:53 -08:00
John Spurlock
3dcb3628c7 am 34c4fe52: Fix remaining jank in secure add-widget transition.
* commit '34c4fe523ad96fb59cec28832b38806d04a6bebf':
  Fix remaining jank in secure add-widget transition.
2012-11-07 11:14:50 -08:00
Michael Jurka
c70379347e am cabcc590: Merge "Allowing rotation while adding lockscreen widgets" into jb-mr1-lockscreen-dev
* commit 'cabcc5900790daaa9ca4d080848c9b505c3de126':
  Allowing rotation while adding lockscreen widgets
2012-11-07 11:14:45 -08:00
Adam Cohen
96c3f7e5f2 am 1361758f: Merge "Giving glow pad the brains to scale itself dynamically (issue 7449554)" into jb-mr1-lockscreen-dev
* commit '1361758f90e3c247e2da953913ef424041d1c847':
  Giving glow pad the brains to scale itself dynamically (issue 7449554)
2012-11-07 11:14:41 -08:00
Adam Powell
3c0a353a05 am 9799714f: Keyguard layout tweaking/reworking
* commit '9799714f6c69efe50e21a6073b879140e5e792b7':
  Keyguard layout tweaking/reworking
2012-11-07 11:14:38 -08:00
Daniel Sandler
f74cac4699 am 9edc48e2: Merge "Updated assets." into jb-mr1-lockscreen-dev
* commit '9edc48e26354f6a7282e68851a6d9ba734c7ceb1':
  Updated assets.
2012-11-07 11:14:34 -08:00
Jim Miller
52bf955e3e am 9d0d796f: Merge "Fix emergency call area updates." into jb-mr1-lockscreen-dev
* commit '9d0d796f47524da7abe018ca6ad892b819a0e66f':
  Fix emergency call area updates.
2012-11-07 11:14:31 -08:00
Adam Cohen
16a3f4c9f9 am 42164efa: Merge "Ensuring bindAppWidget isn\'t called until boot completed (issue 7469267)" into jb-mr1-lockscreen-dev
* commit '42164efac3f4422e66d176de24e1a0857cacabab':
  Ensuring bindAppWidget isn't called until boot completed (issue 7469267)
2012-11-07 11:14:28 -08:00
Michael Jurka
1aad5be916 am 835579e8: Merge "Removing sticky widgets in lockscreen" into jb-mr1-lockscreen-dev
* commit '835579e8173700be78368827d5c042ac4f698e29':
  Removing sticky widgets in lockscreen
2012-11-07 11:14:24 -08:00
Svetoslav Ganov
1cbb449c0c am ad9f594e: am 5fff5f01: Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev
* commit 'ad9f594e1ca36d4b847ec14e9ccf6e2d40bbc388':
2012-11-07 11:14:21 -08:00
Sascha Prueter
6285533207 am bc69698c: am 872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev
* commit 'bc69698c8f1fdf7abc9ffb0225e47633617f5628':
2012-11-07 11:14:17 -08:00
Jim Miller
259e3121d3 am 51117262: Handle DevicePolicyManagement and safe mode when inflating widgets
* commit '51117262c8fadb6d227d137e83ad66996b013141':
  Handle DevicePolicyManagement and safe mode when inflating widgets
2012-11-07 11:14:14 -08:00