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

88920 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
8339bf19ec Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-31 10:11:17 -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
Baligh Uddin
9ab7f479f9 Import translations. DO NOT MERGE 
Change-Id: I5a6cc89a0cdc7d6fa5be47c926e69555db4e9ba9
Auto-generated-cl: translation import
 2012-10-30 19:08:26 -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
31dfff783e am 5c12bc58: Merge remote-tracking branch \'goog/jb-mr1-lockscreen-dev\' into jb-mr1-dev 
* commit '5c12bc5851056f114893f3d381f9fc8785e2cdb0':
  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:07:43 -07:00
Ed Heyl
5c12bc5851 Merge remote-tracking branch 'goog/jb-mr1-lockscreen-dev' into jb-mr1-dev 2012-10-30 18:04:31 -07:00
Amith Yamasani
146378e7c2 am 20329dcb: Merge "QS uses nickname for multiuser and profile name for singleuser." into jb-mr1-dev 
* commit '20329dcb37fffca1de3ded6b58341e87cc43c4a9':
  QS uses nickname for multiuser and profile name for singleuser.
 2012-10-30 17:51:30 -07:00
Adam Cohen
a371e5315e Merge "Fix content alpha" into jb-mr1-lockscreen-dev 2012-10-30 17:51:03 -07:00
Amith Yamasani
20329dcb37 Merge "QS uses nickname for multiuser and profile name for singleuser." into jb-mr1-dev 2012-10-30 17:47:58 -07:00
Chet Haase
63f80350dc am 27f752eb: Merge "WindowManager shouldn\'t layout non-visible windows" into jb-mr1-dev 
* commit '27f752eb1d5c0f92fb38e7d6d0ea20b3b3b26a02':
  WindowManager shouldn't layout non-visible windows
 2012-10-30 17:45:57 -07:00
Chet Haase
2e6a65ca8f am 27f752eb: Merge "WindowManager shouldn\'t layout non-visible windows" into jb-mr1-dev 
* commit '27f752eb1d5c0f92fb38e7d6d0ea20b3b3b26a02':
  WindowManager shouldn't layout non-visible windows
 2012-10-30 17:45:55 -07:00
Amith Yamasani
77007ac6a4 am a07d047f: Merge "Don\'t clean up wallpaper map entry when stopping a user." into jb-mr1-dev 
* commit 'a07d047f34b28fdf7b3b342ceb31c8c982b24fd8':
  Don't clean up wallpaper map entry when stopping a user.
 2012-10-30 17:44:05 -07:00
Amith Yamasani
e3d8774d30 am a07d047f: Merge "Don\'t clean up wallpaper map entry when stopping a user." into jb-mr1-dev 
* commit 'a07d047f34b28fdf7b3b342ceb31c8c982b24fd8':
  Don't clean up wallpaper map entry when stopping a user.
 2012-10-30 17:44:04 -07:00
Chet Haase
27f752eb1d Merge "WindowManager shouldn't layout non-visible windows" into jb-mr1-dev 2012-10-30 17:42:43 -07:00
Adam Cohen
ab8635d179 Fix content alpha 
Change-Id: I13e8ad73baf768976240c1c7c5a2cb05d5d62061
 2012-10-30 17:40:43 -07:00
Amith Yamasani
a07d047f34 Merge "Don't clean up wallpaper map entry when stopping a user." into jb-mr1-dev 2012-10-30 17:40:13 -07:00
Danielle Millett
a0a230abf3 Merge "Removed makeInvisible() function" into jb-mr1-lockscreen-dev 2012-10-30 17:33:55 -07:00
Brian Colonna
d76b320b73 Merge "Fixed misplacement of cancel(X) button for Face Unlock" into jb-mr1-lockscreen-dev 2012-10-30 17:32:36 -07:00
Danielle Millett
54d181db0e Removed makeInvisible() function 
This is now being done inside stopUI instead of its own separate
call since it needs to be done on the UI thread inside FaceLockService.

Change-Id: Iaf3a203f7f201ba4dde4c878f457e765f11e6c0e
 2012-10-30 20:18:44 -04:00
Adam Cohen
7ff5535895 Merge "Making the reordering play nice with the 3D widget carousel" into jb-mr1-lockscreen-dev 2012-10-30 17:11:02 -07:00
Dirk Dougherty
81f0583340 am 05728277: am c6df397e: am a76f1dfc: am c7255569: Merge "Doc change: fix broken link in publishing steps TOC." into jb-dev-docs 
* commit '0572827720e191b3e6fe4466ae09058f5d578c57':
  Doc change: fix broken link in publishing steps TOC.
 2012-10-30 17:10:19 -07:00
Dirk Dougherty
0a12d86d47 am 05728277: am c6df397e: am a76f1dfc: am c7255569: Merge "Doc change: fix broken link in publishing steps TOC." into jb-dev-docs 
* commit '0572827720e191b3e6fe4466ae09058f5d578c57':
  Doc change: fix broken link in publishing steps TOC.
 2012-10-30 17:10:19 -07:00
Casey Burkhardt
c7c972d832 Fixing view accessibility classification for recents. 
Change-Id: I0324fe322d97ee35105d7d71442fa79663e0fdfa
Bug: 7438790
 2012-10-30 17:09:28 -07:00
Adam Cohen
70009e426a Making the reordering play nice with the 3D widget carousel 
-> Ensuring that transforms, hidden side pages, alphas all transition
   and fade seamlessly to and from the carousel

Change-Id: I6197f17899135a9e551ff1691c63ad5a2bb1d0f7
 2012-10-30 17:08:59 -07:00
Dirk Dougherty
0572827720 am c6df397e: am a76f1dfc: am c7255569: Merge "Doc change: fix broken link in publishing steps TOC." into jb-dev-docs 
* commit 'c6df397effaf5417c8adcd72704cf7ceba59adfb':
  Doc change: fix broken link in publishing steps TOC.
 2012-10-30 17:07:02 -07:00
Dirk Dougherty
c6df397eff am a76f1dfc: am c7255569: Merge "Doc change: fix broken link in publishing steps TOC." into jb-dev-docs 
* commit 'a76f1dfc7740fa506c8ba4058e2ad8b90b476fe8':
  Doc change: fix broken link in publishing steps TOC.
 2012-10-30 17:04:48 -07:00
Dirk Dougherty
a76f1dfc77 am c7255569: Merge "Doc change: fix broken link in publishing steps TOC." into jb-dev-docs 
* commit 'c7255569bba20d94200dc05ffd5ce7b61bdc569c':
  Doc change: fix broken link in publishing steps TOC.
 2012-10-30 17:01:53 -07:00
Jim Miller
c8f7c5eb74 Merge "Fill in logic in WidgetPager to ignore music when reordering." into jb-mr1-lockscreen-dev 2012-10-30 16:57:53 -07:00
Dirk Dougherty
c7255569bb Merge "Doc change: fix broken link in publishing steps TOC." into jb-dev-docs 2012-10-30 16:56:58 -07:00
Jim Miller
bd0bf156c0 Merge "Implement correct music widget positioning in keyguard" into jb-mr1-lockscreen-dev 2012-10-30 16:55:12 -07:00
Dirk Dougherty
e31d80bdaa Doc change: fix broken link in publishing steps TOC. 
Change-Id: I1b7453dfe276be40a23f1bd59a463e6d4f9b0412
 2012-10-30 16:51:54 -07:00
Dianne Hackborn
a56395da5d am 77101993: Merge "Bring up unlock screen for FLAG_DISMISS_KEYGUARD." into jb-mr1-dev 
* commit '7710199376657415e5341f64a830aa50fcb117aa':
  Bring up unlock screen for FLAG_DISMISS_KEYGUARD.
 2012-10-30 16:39:54 -07:00
Dianne Hackborn
5b285941ac am 77101993: Merge "Bring up unlock screen for FLAG_DISMISS_KEYGUARD." into jb-mr1-dev 
* commit '7710199376657415e5341f64a830aa50fcb117aa':
  Bring up unlock screen for FLAG_DISMISS_KEYGUARD.
 2012-10-30 16:39:53 -07:00
Dianne Hackborn
7710199376 Merge "Bring up unlock screen for FLAG_DISMISS_KEYGUARD." into jb-mr1-dev 2012-10-30 16:37:19 -07:00
Chet Haase
9cceae9a5f WindowManager shouldn't layout non-visible windows 
A recent change in WindowManager made background windows perform layout
(when they should really be left alone). This resulted in artifacts
where rotating the device and then going to a backgrojnd activity (launcher,
Recents) would briefly show that activity in the wrong size/orientation, then
flash to the correct one after a proper layout.

This fix is a simple workaround, leaving in the original fix that the code
change addressed (for keyguard orientation changes), while going back to the
previous (don't layout gone windows) for all other cases.

Issue #7428221 sometimes recents is drawn off-center and then fixes itself

Change-Id: I41b47933c2bd86f29133853d3387bb7294be8f48
 2012-10-30 16:35:45 -07:00
Brian Colonna
ddbf138d11 Fixed misplacement of cancel(X) button for Face Unlock 
Before the FUL service started, the FUL cancel button was positioned
off of the right side of the window.  This was because the
FaceUnlockView (derived from RelativeLayout) was calling
super.onMeasure() incorrectly, preventing it from using the new
'square' size when laying out child views.

Change-Id: I2f1e86617da5c8f37123febab2e433288bdea062
 2012-10-30 18:34:39 -04:00
Jim Miller
e0566da2da Fill in logic in WidgetPager to ignore music when reordering. 
This moves music state management into KeyguardViewStateManager to allow
KeyguardWidgetPager access to it.

Fixes bug 7442977

Change-Id: I113b6d1c8848d60ae53b99e697b33e1e33d67853
 2012-10-30 14:57:29 -07:00
Amith Yamasani
aac4d9fe55 QS uses nickname for multiuser and profile name for singleuser. 
Bug: 7400662
Change-Id: I3299ee70acaa7341ec11b4774426e22182ffd170
 2012-10-30 14:32:45 -07:00
Jim Miller
33384ed696 Merge "Attempt to fix bug on devices where multi-user support is disabled." into jb-mr1-lockscreen-dev 2012-10-30 14:25:12 -07:00
Jim Miller
26e6c2e442 Attempt to fix bug on devices where multi-user support is disabled. 
Bug 7437751

Change-Id: Iff9f6a5a91fb9dd69b7176a5febb1d6e158d90b6
 2012-10-30 14:21:41 -07:00
Jim Miller
bdca3c0a21 Implement correct music widget positioning in keyguard 
This always inserts the music widget to the left of the camera
widget if it exists or as the right-most widget when music is
playing.

Fixes bug 7425361

Change-Id: Ida992fbdde254a2de0ab12c63e003ccfeab7a94a
 2012-10-30 14:06:09 -07:00
Brian Colonna
0ca9723327 Merge "FUL uses square aspect ratio for all layouts fixes b/7426399" into jb-mr1-lockscreen-dev 2012-10-30 13:41:52 -07:00
Victoria Lease
517303e05b am ac14efce: Merge "DO NOT MERGE suggest LocationRequest rather than Criteria" into jb-mr1-dev 
* commit 'ac14efce4b9575ac1de567073d7088162d4d2eed':
  DO NOT MERGE suggest LocationRequest rather than Criteria
 2012-10-30 13:31:44 -07:00
Victoria Lease
1863738c77 am ac14efce: (-s ours) Merge "DO NOT MERGE suggest LocationRequest rather than Criteria" into jb-mr1-dev 
* commit 'ac14efce4b9575ac1de567073d7088162d4d2eed':
  DO NOT MERGE suggest LocationRequest rather than Criteria
 2012-10-30 13:31:36 -07:00
Victoria Lease
95ba9e8ba3 am 8756c60c: Merge "DO NOT MERGE clarify Geofence.createCircle() param ranges" into jb-mr1-dev 
* commit '8756c60c42e56cd3667c6eae0d2ae7025b457031':
  DO NOT MERGE clarify Geofence.createCircle() param ranges
 2012-10-30 13:28:00 -07:00
Victoria Lease
54f1ce1d2b am 8756c60c: (-s ours) Merge "DO NOT MERGE clarify Geofence.createCircle() param ranges" into jb-mr1-dev 
* commit '8756c60c42e56cd3667c6eae0d2ae7025b457031':
  DO NOT MERGE clarify Geofence.createCircle() param ranges
 2012-10-30 13:27:38 -07:00
Victoria Lease
ac14efce4b Merge "DO NOT MERGE suggest LocationRequest rather than Criteria" into jb-mr1-dev 2012-10-30 13:26:38 -07:00
Victoria Lease
8756c60c42 Merge "DO NOT MERGE clarify Geofence.createCircle() param ranges" into jb-mr1-dev 2012-10-30 13:24:26 -07:00