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

87871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Romain Guy
96f6491aa7 am 475255bf: am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev 
* commit '475255bffc792b48e18213a6bfde0fc9ebeb4a34':
 2012-11-07 11:14:11 -08:00
Eino-Ville Talvala
f83ace0b4b am 688d98fe: am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev 
* commit '688d98fe2185774322aa87dffd656fad471823ef':
 2012-11-07 11:14:07 -08:00
Adam Powell
de565f3bcb am 7136544c: Merge "Keyguard - MultiPaneChallengeLayout measurement/layout changes" into jb-mr1-lockscreen-dev 
* commit '7136544c06c2d10c7a1c6aa8715d2b717221aee8':
  Keyguard - MultiPaneChallengeLayout measurement/layout changes
 2012-11-07 11:14:04 -08:00
Victoria Lease
b000c36207 am 8d803258: am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev 
* commit '8d803258ca1550583d03c1a24c5c6d4b38535ba8':
 2012-11-07 11:14:01 -08:00
Chris Wren
888322a659 am 5fcca70d: Merge "animating challenge closed should close the challenge." into jb-mr1-lockscreen-dev 
* commit '5fcca70d280a789002f540ea04b9d7ae5d7fe324':
  animating challenge closed should close the challenge.
 2012-11-07 11:13:57 -08:00
Winson Chung
43ecd1912c am 6cf53bb3: Using screen dimensions to calculate the expanded PagedView dimensions. 
* commit '6cf53bb3a94ec5a6eebc96a315dac32d042f1945':
  Using screen dimensions to calculate the expanded PagedView dimensions.
 2012-11-07 11:13:52 -08:00
Jim Miller
fe7e94a094 am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev 
* commit '088fb915f73584fbeaf05f5cbaa95b8a944b94cb':
  Add isSafeModeEnabled() API to WindowManagerService
 2012-11-07 11:13:48 -08:00
Danielle Millett
2f4be247b6 am 2d9fae2b: Merge "Removing callbacks in onDetachedFromWindow, fixes b/7465673" into jb-mr1-lockscreen-dev 
* commit '2d9fae2bcfbc8021873a39b3935644e9b9fb5af2':
  Removing callbacks in onDetachedFromWindow, fixes b/7465673
 2012-11-07 11:13:43 -08:00
Adam Cohen
441d3401bf am 7741e620: Merge "Making sure the sticky widget logic works with music" into jb-mr1-lockscreen-dev 
* commit '7741e6209ab4c6425ee4156631f54fe9bfce5fc3':
  Making sure the sticky widget logic works with music
 2012-11-07 11:13:37 -08:00
Adam Cohen
a7af02098a am 0e1608c0: Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev 
* commit '0e1608c0277155c49f78a0f6980e5c5cb9afc0b8':
  Attempted fix for issue 7469415
 2012-11-07 11:13:34 -08:00
Amith Yamasani
22559dc5bf am 5eac4d85: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev 
* commit '5eac4d852bdc62964acd1c8805b6e9cd8301f262':
 2012-11-07 11:13:31 -08:00
Chris Wren
950f947cea am 9f79d0db: Merge "make challengeShowing sticky across bounce." into jb-mr1-lockscreen-dev 
* commit '9f79d0db09818e94b6c2089f952d1ef42e1e1fae':
  make challengeShowing sticky across bounce.
 2012-11-07 11:13:27 -08:00
Chris Wren
98f95b3af1 am f7e47a00: Merge "specify start value: Drawables don\'t have getAlpha(). also, some clean up." into jb-mr1-lockscreen-dev 
* commit 'f7e47a003ada4b225dcafe722ab0de35a846b58a':
  specify start value: Drawables don't have getAlpha(). also, some clean up.
 2012-11-07 11:13:24 -08:00
The Android Open Source Project
a8540f2ae3 Reconcile with jb-mr1-release - do not merge 
Change-Id: I3d0120226503d1aa5538039f17811e01131d99c8
 2012-11-07 10:19:51 -08:00
Roman Nurik
0fc1b5ecba am 512950a9: Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev 
* commit '512950a9713f79f2900c73201906436d12da8639':
  docs: Minor Nexus 10 fix in Device Art Generator
 2012-11-07 09:52:44 -08:00
Roman Nurik
a93f94d32c am 512950a9: Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev 
* commit '512950a9713f79f2900c73201906436d12da8639':
  docs: Minor Nexus 10 fix in Device Art Generator
 2012-11-07 09:52:36 -08:00
Roman Nurik
512950a971 Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev 2012-11-07 09:49:37 -08:00
Baligh Uddin
a40ec75eb3 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 2012-11-07 09:47:00 -08:00
Daniel Sandler
1b80345025 Merge "Show the assist ring on center-button longpress on lockscreen." into jb-mr1-lockscreen-dev 2012-11-07 09:42:36 -08:00
Baligh Uddin
8dbf3b8df0 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 2012-11-07 09:39:39 -08:00
Chris Wren
cf9ee4c55d Merge "Don't pop the IME for passwors at ScreenOn on tablets." into jb-mr1-lockscreen-dev 2012-11-07 09:12:32 -08:00
Brian Colonna
6b4ab7f170 Merge "Centering FUL fixes b/7480608" into jb-mr1-lockscreen-dev 2012-11-07 09:00:05 -08:00
Brian Colonna
275016703e Centering FUL fixes b/7480608 
A simple one-line change to center FUL horizontally.  This looked
really bad on tablets when the charging text was showing as FUL was
obviously off-center compared to the text.  It was also off-center
on phones, which looked particularly bad when going to the backup.

Change-Id: Id0e3039a67c9bb746a8c9948e82ff87b6c815e1b
 2012-11-07 11:53:49 -05:00
Chris Wren
a042ac9064 Don't pop the IME for passwors at ScreenOn on tablets. 
Change-Id: I4c157559b2a70021d55211607c1d62ba73adc590
 2012-11-07 11:53:41 -05:00
John Spurlock
f55769fefa Low battery dialog should use UserHandle.CURRENT. 
Bug:7493313
Change-Id: Ie753633c550e4ce679fbb6f9e0c6adf56392ec87
 2012-11-07 11:50:33 -05:00
John Spurlock
34c4fe523a Fix remaining jank in secure add-widget transition. 
Wait for activity to launch before dismissing the keyguard.
Otherwise we see launcher/last activity waiting for the
picker to start up.

Also remove camera transition workaround obviated by:
  Iefee62061962625b622ff2cf9a307d9429c2ad54

Bug:7482560
Change-Id: I554ddffb7981488fa8a81933842b0c7730e775f3
 2012-11-07 10:22:06 -05:00
Michael Jurka
cabcc59007 Merge "Allowing rotation while adding lockscreen widgets" into jb-mr1-lockscreen-dev 2012-11-07 01:16:11 -08:00
Michael Jurka
192d6d4ee2 Allowing rotation while adding lockscreen widgets 
Also cleaning up some unused code

Bug: 7468012
 2012-11-07 01:12:26 -08:00
Adam Cohen
1361758f90 Merge "Giving glow pad the brains to scale itself dynamically (issue 7449554)" into jb-mr1-lockscreen-dev 2012-11-06 23:31:49 -08:00