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

92889 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
c1bd157f50 am d98e6dc6: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'd98e6dc68021dad263783a0f21e3f861589eb694':
  Import translations. DO NOT MERGE
 2012-11-08 06:26:45 -08:00
Baligh Uddin
b7232a2e45 am 20040daf: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '20040dafbc5f0a0b432d9c41c2da6d7ba7791327':
  Import translations. DO NOT MERGE
 2012-11-08 06:26:41 -08:00
Svetoslav Ganov
f3e03e234f am dc564945: am 7ccb2806: am 5fff5f01: Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev 
* commit 'dc564945bb7382768e28e45c6fc2452e3f4d9da9':
  Make partially visible widget pages not important for accessibility.
 2012-11-08 06:14:37 -08:00
Irfan Sheriff
37794c200f am f264e8e3: am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev 
* commit 'f264e8e34e32bfb8e7e75b61b9da9b6f219690b0':
  Stop supplicant and dhcp before start
 2012-11-08 06:14:33 -08:00
Sascha Prueter
f107bda0ad am a517fc3a: am ee8fab8b: am 872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev 
* commit 'a517fc3a393b075a677ef3052e22749951ede8fa':
  Use a consistent policy for filtering wake keys.
 2012-11-08 06:14:25 -08:00
Romain Guy
a965fc5e8f am b37e5d75: am 7b9b41c1: am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev 
* commit 'b37e5d756f04489ff95226e26ebfdf141d135f91':
  Dismiss error icon on setError(null) [regression] Bug #7442935
 2012-11-08 06:14:11 -08:00
Eino-Ville Talvala
f4334f63c5 am 9671e6e1: am e980adfd: am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev 
* commit '9671e6e116bbb8a82784457382cab3f90289e31b':
  Camera: Document new video snapshot picture size behavior.
 2012-11-08 06:14:01 -08:00
Victoria Lease
44d927ca83 am 66f3d7f3: am 446ffe00: am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev 
* commit '66f3d7f3c8247b59516cbc4ad13bea4e0b8c0ef9':
  Fires geofence if the device is already in the geofence area.
 2012-11-08 06:13:21 -08:00
Robert Greenwalt
744c520472 am 08db1ceb: am bbe5cafe: Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev 
* commit '08db1ceba24925cd8a710aa0153519351a9fa2c7':
  Add Coin graphic to premium-sms dialog.
 2012-11-08 06:13:17 -08:00
The Android Open Source Project
7139007202 am 927372ae: am f3456803: Reconcile with jb-mr1-release - do not merge 
* commit '927372aec399b7c63d193c57c69b57065e7b66e5':
 2012-11-08 06:12:45 -08:00
Justin Koh
4608a0aec2 am 41048d67: Merge "Support new touchpad event protocol." into jb-mr1-aah-dev 
* commit '41048d670d42075732723e72d7f303498690ea99':
  Support new touchpad event protocol.
 2012-11-08 06:12:30 -08:00
Justin Koh
a1459793d4 am 58e0fb9a: Merge "Trigger Google Now intent with swipe from bottom" into jb-mr1-aah-dev 
* commit '58e0fb9adbe579a068849a7865a7f1bce7531d1c':
  Trigger Google Now intent with swipe from bottom
 2012-11-08 06:12:26 -08:00
Amith Yamasani
cb5cb740b5 am aecee8a9: am 717797db: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev 
* commit 'aecee8a98543118dacec14a94052243754560e9d':
  Authenticate correct user's account when pattern fails multiple times.
 2012-11-08 06:12:21 -08:00
John Spurlock
7a73344bbe Minimal fix for stuck google now. 
Bug:7500409
Change-Id: I1570d72e08fbe520ac07eed2ee40b6571fa1fe3c
 2012-11-08 09:08:14 -05:00
John Spurlock
805337ab5f resolved conflicts for merge of ef44a77f to jb-mr1-dev-plus-aosp 
Change-Id: Iad4319796be4b9ad74580f8c20a4e8cb30569f87
 2012-11-08 07:43:15 -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
Baligh Uddin
eeb747c559 am d9550886: am d44c4344: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit 'd9550886a88e4a6894aa28ed2ed8cdb63b67a385':
  Import translations. DO NOT MERGE
 2012-11-07 18:34:59 -08:00
Adam Cohen
fdfa4b7d52 am b579714c: am 8f837a69: Merge "Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)" into jb-mr1-lockscreen-dev 
* commit 'b579714c12fcf981a0ed172d6f7d48d5f65c2fab':
  Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)
 2012-11-07 18:34:55 -08:00