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

87998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
271add4e09 am 899e6c73: Merge "Fix bug where SearchPanel wasn\'t launching assist intent when keyguard is gone." into jb-mr1-lockscreen-dev 
* commit '899e6c738341698c71689e31630c0b8663057e44':
  Fix bug where SearchPanel wasn't launching assist intent when keyguard is gone.
 2012-11-08 13:08:55 -08:00
Michael Jurka
47674796bc am eb963f04: Enforce max number of 5 lockscreen widgets 
* commit 'eb963f046dadd1304379db0b14c17e47c89913f4':
  Enforce max number of 5 lockscreen widgets
 2012-11-08 13:08:51 -08:00
Adam Cohen
38515e9a4c am c8ed8d32: Merge "Adding user activity when the challenge is slid down" into jb-mr1-lockscreen-dev 
* commit 'c8ed8d32603d21e1af9a682cc5f1655d2388cfba':
  Adding user activity when the challenge is slid down
 2012-11-08 13:08:48 -08:00
Jim Miller
6c7d2c248c am e1a473b0: Merge "Don\'t show ECA in landscape mode on phones." into jb-mr1-lockscreen-dev 
* commit 'e1a473b0d4d56f4258fc4c6ab4c9d4d0fe3fd3cc':
  Don't show ECA in landscape mode on phones.
 2012-11-08 13:08:45 -08:00
Jim Miller
2c29deaa26 am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev 
* commit '6be441c532688762b735ae2a1276195b40bf33b4':
  Add mechanism to kick keyguard to show the assistant
 2012-11-08 13:08:41 -08:00
Adam Powell
2cfb9373fa am 5dd8b008: Merge "add bouncer frame to glowpad." into jb-mr1-lockscreen-dev 
* commit '5dd8b00891faff39ecadb1a0322e14528883bfe3':
  add bouncer frame to glowpad.
 2012-11-08 13:08:38 -08:00
Adam Powell
f3eaabb932 am a9fa92e8: Keyguard - force showing the status bar 
* commit 'a9fa92e889a9dbc94c25e4ba1d67ce24929b834f':
  Keyguard - force showing the status bar
 2012-11-08 13:08:35 -08:00
Jim Miller
e0dd7c463b am 2cacda5f: Disable interactive mode for full-screen security views in keyguard. 
* commit '2cacda5fc92a28a44a37e25b96093a9cc1346080':
  Disable interactive mode for full-screen security views in keyguard.
 2012-11-08 13:08:31 -08:00
Adam Cohen
640cf0ab0a am 1e0f6faf: Merge "Clean up some flashy jank (issue 7454766)" into jb-mr1-lockscreen-dev 
* commit '1e0f6faf5abea0aae49bdae973bd15b675817224':
  Clean up some flashy jank (issue 7454766)
 2012-11-08 13:08:28 -08:00
Winson Chung
1882596608 am 70c2f873: Synchronizing bouncer duration with page scaling duration. 
* commit '70c2f8736437ebb6073c3b6dab2e08e6dd9f39a6':
  Synchronizing bouncer duration with page scaling duration.
 2012-11-08 13:08:24 -08:00
Daniel Sandler
3a54aaed02 am 838195db: Merge "Compress lockscreen\'s account login fallback to fit." into jb-mr1-lockscreen-dev 
* commit '838195db8f69968690971977e4b615df39504465':
  Compress lockscreen's account login fallback to fit.
 2012-11-08 13:08:17 -08:00
Amith Yamasani
318d87fb04 am 9eacab8a: am 3fe2cb4d: Merge "Don\'t cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev 
* commit '9eacab8abee6b8d154f5de2513fcbaed313c4b24':
 2012-11-08 13:08:09 -08:00
Adam Powell
868edfdee6 am e7e210cb: Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev 
* commit 'e7e210cb4373877785130ff06ad4e6635592eaa8':
  Fiddle with keyguard glowpad layouts
 2012-11-08 13:08:06 -08:00
Winson Chung
062e01c5f6 am 2635750f: Adding workaround to fix issue where the bouncer animation had the wrong pivot. 
* commit '2635750fa7f835d102c3fd52b18e00d364d9ae42':
  Adding workaround to fix issue where the bouncer animation had the wrong pivot.
 2012-11-08 13:08:03 -08:00
Jim Miller
e9c881c66d am ae0161e7: Merge "Don\'t handle click events on the emergency button in bouncer mode" into jb-mr1-lockscreen-dev 
* commit 'ae0161e7af280a35e975dc26457ab4f704d37d0a':
  Don't handle click events on the emergency button in bouncer mode
 2012-11-08 13:07:59 -08:00
Daniel Sandler
1323fe3ed4 am 71b7d891: Merge "New asset for assist affordance on lockscreen." into jb-mr1-lockscreen-dev 
* commit '71b7d891fc95d360df7a52c7008c92859b9dfdb8':
  New asset for assist affordance on lockscreen.
 2012-11-08 13:07:56 -08:00
Adam Powell
75298e337a am d8e2fdf7: Merge "Use stable layouts for keyguard/SlidingChallengeLayout" into jb-mr1-lockscreen-dev 
* commit 'd8e2fdf7345f448f332ea8a551172f48563f77aa':
  Use stable layouts for keyguard/SlidingChallengeLayout
 2012-11-08 13:07:50 -08:00
Jim Miller
f3add313dc am 3c9297c3: Merge "Attempt to fix NegativeArraySizeException crash in keyguard" into jb-mr1-lockscreen-dev 
* commit '3c9297c3cb739b9aec9ccff7e4e3e05006edb836':
  Attempt to fix NegativeArraySizeException crash in keyguard
 2012-11-08 13:07:46 -08:00
Daniel Sandler
0e767b2958 am 5c533884: Merge "Make dismissKeyguardLw use KeyguardViewMediator.dismiss()." into jb-mr1-lockscreen-dev 
* commit '5c533884ead3bb8a8e2e4e8d79587a81dbe31700':
  Make dismissKeyguardLw use KeyguardViewMediator.dismiss().
 2012-11-08 13:07:43 -08:00
Winson Chung
27ed0c2d00 am 4181e8a4: Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)" into jb-mr1-lockscreen-dev 
* commit '4181e8a4ac07e118724f7935928d2c3a1bb291f7':
  Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)
 2012-11-08 13:07:39 -08:00
Adam Cohen
efacf14349 am 85c4281a: Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev 
* commit '85c4281aae518c27ca3f95e330f6aa56159e1328':
  Fixing up overscroll asset / sizing
 2012-11-08 13:07:36 -08:00
Jim Miller
4bd4b78f33 am 5da893c9: Merge "Add one more check for detecting crashes while inflating multiuser widget" into jb-mr1-lockscreen-dev 
* commit '5da893c93b55c83b07558a1648f53dfec89b1f32':
  Add one more check for detecting crashes while inflating multiuser widget
 2012-11-08 13:07:32 -08:00
Svetoslav Ganov
0e538548d7 am cd1f3095: Merge "Slide unlock cannot get accessibility focus." into jb-mr1-lockscreen-dev 
* commit 'cd1f3095056bd4148030f6f6c514387d623db800':
  Slide unlock cannot get accessibility focus.
 2012-11-08 13:07:29 -08:00
Jim Miller
b1938777af am 40962880: Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev 
* commit '40962880225c74d8f776e6ce03f1ec6dde63ef04':
  Implement fallback clock in keyguard
 2012-11-08 13:07:25 -08:00
Michael Jurka
090c790c1c am fd8c388f: Merge "Fix bug where newly added widget wasn\'t always shown" into jb-mr1-lockscreen-dev 
* commit 'fd8c388f028de046e5f5ed36880e98f67e6bb481':
  Fix bug where newly added widget wasn't always shown
 2012-11-08 13:07:21 -08:00
Adam Cohen
9477f8dee1 am 3e66286f: Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev 
* commit '3e66286f7cf33ef13fd9f4f033816b84828c1f2b':
  Fixing up glowpad scaling issues (issue 7494378)
 2012-11-08 13:07:18 -08:00
Adam Powell
0fcb5cda5f am c717d110: Merge "Fix keyguard measurement bugs" into jb-mr1-lockscreen-dev 
* commit 'c717d110ae5c2531a75420386f99ad8957732dbf':
  Fix keyguard measurement bugs
 2012-11-08 13:07:14 -08:00
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
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
75993947bb Reconcile with jb-mr1-release - do not merge 
Change-Id: I5b5f12f167d5a0287dfd21c8f37f0f451c9242a4
 2012-11-08 09:48:48 -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
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
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