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

90167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Laurent
30717b6881 Merge "AudioService: undock audio glitch - DO NOT MERGE" into jb-mr1.1-dev 2012-11-08 12:57:44 -08:00
Eric Laurent
98e5c81438 am 73176865: Merge "audio service fix dock after crash - DO NOT MERGE" into jb-mr1.1-dev 
* commit '73176865a595c1d09edadcb124b57b4ffbaa5c3d':
  audio service fix dock after crash - DO NOT MERGE
 2012-11-08 12:52:47 -08:00
Eric Laurent
73176865a5 Merge "audio service fix dock after crash - DO NOT MERGE" into jb-mr1.1-dev 2012-11-08 12:49:50 -08:00
The Android Open Source Project
cc16a7efaa am 75993947: Reconcile with jb-mr1-release - do not merge 
* commit '75993947bbe31c6ace037228d90dd25152dcf7db':
 2012-11-08 09:51:24 -08:00
The Android Open Source Project
75993947bb Reconcile with jb-mr1-release - do not merge 
Change-Id: I5b5f12f167d5a0287dfd21c8f37f0f451c9242a4
 2012-11-08 09:48:48 -08:00
Daniel Sandler
9de5901bb3 Merge "Don't crash if no ECA." into jb-mr1-lockscreen-dev 2012-11-08 09:48:46 -08:00
Daniel Sandler
b499b1fa08 Don't crash if no ECA. 
(Phone landscape pattern lock, for example.)

Bug: 7502613
Change-Id: I3f48c4351ea04db2d8ad9a410166f60257f3d954
 2012-11-08 12:42:54 -05:00
Chris Wren
7d59cf9f10 Merge "allow pattern linear layout to manage message_area." into jb-mr1-lockscreen-dev 2012-11-08 09:40:21 -08:00
Amith Yamasani
081c36ded6 am bfb8a7b1: am 3fe2cb4d: Merge "Don\'t cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev 
* commit 'bfb8a7b19234998e28afe811a193a6514a349ea5':
  Don't cancel any notifications that are meant for all users, if no package is specified.
 2012-11-08 09:30:22 -08:00
Chris Wren
e1a8eee6d0 allow pattern linear layout to manage message_area. 
Bug: 7501923
Change-Id: I5126e760d8567380e2041ca01791f14c7b054adb
 2012-11-08 12:28:15 -05:00
Daniel Sandler
4eada64770 Merge "Only show the bouncer for the assistant if secure." into jb-mr1-lockscreen-dev 2012-11-08 09:28:14 -08:00
Amith Yamasani
bfb8a7b192 am 3fe2cb4d: Merge "Don\'t cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev 
* commit '3fe2cb4db60827889abd1f971910f807ae346488':
  Don't cancel any notifications that are meant for all users, if no package is specified.
 2012-11-08 09:27:23 -08:00
Eric Laurent
0214f2b856 AudioService: undock audio glitch - DO NOT MERGE 
merge from master:

"AudioService: improve low end dock audio control

Low end docks have a menu to enable use of audio
for media: automatically enabling/disabling use of audio
when the dock is connected/disconnected is useless
and can be the source of audio glitches.

Bug 7463620."

Change-Id: I3b7e7ebe660bb3f0e4367d2a3ed63ee76f78fe58
 2012-11-08 09:17:56 -08:00
Daniel Sandler
6ed3fcafdb Only show the bouncer for the assistant if secure. 
We do this by using the helpful tools in
KeyguardActivityLauncher which do all the right callbacks
and stuff.

(This assumes the assist gesture is sufficiently hard to
false that we don't need the extra step of bouncing the
glowpad unlock affordance.)

Bug: 7500637
Change-Id: Id68cb85cdfd741f43a5bce69118ec4209125d785
 2012-11-08 12:13:17 -05:00
Eric Laurent
cd3231f501 audio service fix dock after crash - DO NOT MERGE 
merge from master:
"audio service: set dock use on mediaserver restart

Restore forced usage of dock audio for media according to
current setting when media server restarts."

Bug 7485250.

Change-Id: Ie67b80ede1ed92d223dd96de83c1beb985dfba06
 2012-11-08 09:05:22 -08:00
John Spurlock
14adfe425e Address comments from merged "Fix remaining jank in sec..." 
Cleanup based on post-merge comments on:
  I554ddffb7981488fa8a81933842b0c7730e775f3

Bug:7482560
Change-Id: I06b2bc91da9dfddd06db69efb9e7ad45c304f709
 2012-11-08 10:29:26 -05:00
John Spurlock
7a73344bbe Minimal fix for stuck google now. 
Bug:7500409
Change-Id: I1570d72e08fbe520ac07eed2ee40b6571fa1fe3c
 2012-11-08 09:08:14 -05:00
Jim Miller
899e6c7383 Merge "Fix bug where SearchPanel wasn't launching assist intent when keyguard is gone." into jb-mr1-lockscreen-dev 2012-11-08 02:31:08 -08:00
Michael Jurka
eb963f046d Enforce max number of 5 lockscreen widgets 
Change-Id: I7b7fca18174736c8f1aa0018f7399982c80b1cb0
 2012-11-08 02:06:38 -08:00
Jim Miller
bac6d4bf3c Fix bug where SearchPanel wasn't launching assist intent when keyguard is gone. 
Fixes bug 7499778

Change-Id: I450755b8839717f0f13241cb57f0015cf78569d9
 2012-11-08 01:27:09 -08:00
Adam Cohen
c8ed8d3260 Merge "Adding user activity when the challenge is slid down" into jb-mr1-lockscreen-dev 2012-11-08 01:03:50 -08:00
Jim Miller
e1a473b0d4 Merge "Don't show ECA in landscape mode on phones." into jb-mr1-lockscreen-dev 2012-11-08 01:00:12 -08:00
Jim Miller
9e0a250600 Don't show ECA in landscape mode on phones. 
Fixes bug 7490941

Change-Id: I8a65aed0b4efc8676b95ad5fea6a7f4ac7d944d0
 2012-11-08 00:57:31 -08:00
Jim Miller
6be441c532 Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev 2012-11-08 00:51:26 -08:00
Adam Cohen
08c83ef488 Adding user activity when the challenge is slid down 
Change-Id: I54a7dcf79718090dac6ec5991185712cc2abca37
 2012-11-08 00:45:49 -08:00
Jim Miller
4eeb4f664a Add mechanism to kick keyguard to show the assistant 
Fixes bug 7499778

Change-Id: Ic9ea514feb489feeee6716f40bdb9792842f9515
 2012-11-08 00:39:04 -08:00
Adam Powell
5dd8b00891 Merge "add bouncer frame to glowpad." into jb-mr1-lockscreen-dev 2012-11-08 00:28:58 -08:00
Adam Powell
a9fa92e889 Keyguard - force showing the status bar 
Change-Id: I168293497a829346ba6f9566370c418ef1a09f8f
 2012-11-08 00:03:49 -08:00
Chris Wren
efbfa685b6 add bouncer frame to glowpad. 
Bug: 7497916
Change-Id: I6bddbfc91c89b0855eba0dcec46bc1b88684b8ad
 2012-11-07 23:29:17 -08:00
Jim Miller
2cacda5fc9 Disable interactive mode for full-screen security views in keyguard. 
Change-Id: Ied038ba96ba3a6e6f6b4bd25a4c5be74814596fe
 2012-11-07 23:20:02 -08:00
Adam Cohen
1e0f6faf5a Merge "Clean up some flashy jank (issue 7454766)" into jb-mr1-lockscreen-dev 2012-11-07 22:09:55 -08:00
Winson Chung
70c2f87364 Synchronizing bouncer duration with page scaling duration. 
Change-Id: I9fba381582a083ce2ab26375698c5a6f3d554a1b
 2012-11-07 21:48:06 -08:00
Adam Cohen
44dc141376 Clean up some flashy jank (issue 7454766) 
Change-Id: I809f3afbbb70e82847aa4851d20058a2c483a32e
 2012-11-07 21:39:56 -08:00
Daniel Sandler
838195db8f Merge "Compress lockscreen's account login fallback to fit." into jb-mr1-lockscreen-dev 2012-11-07 21:18:44 -08:00
Amith Yamasani
9eacab8abe am 3fe2cb4d: Merge "Don\'t cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev 
* commit '3fe2cb4db60827889abd1f971910f807ae346488':
  Don't cancel any notifications that are meant for all users, if no package is specified.
 2012-11-07 21:16:00 -08:00
Amith Yamasani
3fe2cb4db6 Merge "Don't cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev 2012-11-07 21:12:54 -08:00
Daniel Sandler
cf2b7a261d Compress lockscreen's account login fallback to fit. 
- ECA will not be shown in this mode
 - The login button shares a row with the password field

Nice and tidy.

Bug: 7456674
Change-Id: I38d04dcb7ee32d0b289f03f9e8dcbe38ba23a119
 2012-11-08 00:09:37 -05:00
Adam Powell
e7e210cb43 Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev 2012-11-07 21:06:31 -08:00
Winson Chung
2635750fa7 Adding workaround to fix issue where the bouncer animation had the wrong pivot. 
Change-Id: I500fb765cf206b97cc0b585c195cc647cc8e63f1
 2012-11-07 20:57:33 -08:00
Satoshi Kataoka
4424951fa5 am 1e29e49c: Merge "Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI" into jb-mr1.1-dev 
* commit '1e29e49cf8b2654f999b2fdb16e8f7f262b73c68':
  Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI
 2012-11-07 20:50:37 -08:00
Satoshi Kataoka
1e29e49cf8 Merge "Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI" into jb-mr1.1-dev 2012-11-07 20:48:01 -08:00
Adam Powell
3fbbbb66b6 Fiddle with keyguard glowpad layouts 
Also add hierarchyviewer support for KeyguardSecurityView LayoutParams

Bug 7497272
Bug 7459668

Change-Id: I5d03751571d0af66f4c9d08a9d9ca476b32735ac
 2012-11-07 20:47:23 -08:00
Jim Miller
ae0161e7af Merge "Don't handle click events on the emergency button in bouncer mode" into jb-mr1-lockscreen-dev 2012-11-07 19:52:08 -08:00
Daniel Sandler
71b7d891fc Merge "New asset for assist affordance on lockscreen." into jb-mr1-lockscreen-dev 2012-11-07 19:28:05 -08:00
Sascha Prueter
ef378ae204 am 14c89330: am de974f6f: am 972dd431: Merge "Final icon for notifications panel" into jb-mr1-dev 
* commit '14c89330aefe3db10b53181f130f391061b8616a':
 2012-11-07 18:35:20 -08:00
Victoria Lease
5def893095 am d9da50ba: am eb6cbc22: am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev 
* commit 'd9da50ba0e06c86c03868660108e4d366f47acd5':
 2012-11-07 18:35:16 -08:00
Chris Wren
483483f85e am c0cbe8ab: am 8e3bf41d: Merge "add logging to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev 
* commit 'c0cbe8ab5ef916d3c3d90831f93e559bc79636cc':
  add logging to enableUserSelectorIfNecessary.
 2012-11-07 18:35:13 -08:00
Chris Wren
29cc94898f am 74c5d53e: am b524f4b9: Merge "add some defensive code to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev 
* commit '74c5d53e2fd8e2e783f9126c0bb75fda2cfd210c':
  add some defensive code to enableUserSelectorIfNecessary.
 2012-11-07 18:35:09 -08:00
Daniel Sandler
5e6944bc00 am e4e6c97e: am 2d09880d: am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev 
* commit 'e4e6c97ea40365e73ccf94c15b081887a0714a53':
 2012-11-07 18:35:06 -08:00
Baligh Uddin
24ee3595dc am 70869876: am 62e2374b: am 32226b73: (-s ours) Import translations. DO NOT MERGE 
* commit '7086987652213ac5870fb93dea3a8d78f1a3928b':
 2012-11-07 18:35:02 -08:00