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

92225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
805337ab5f resolved conflicts for merge of ef44a77f to jb-mr1-dev-plus-aosp 
Change-Id: Iad4319796be4b9ad74580f8c20a4e8cb30569f87
 2012-11-08 07:43:15 -05:00
John Spurlock
9a962d7c7d am 64091a1d: am 8aa62362: am ae73c690: Fix regression in camera transition. 
* commit '64091a1da0e87937ad42c8ae0d5e3dd3913b297b':
  Fix regression in camera transition.
 2012-11-07 15:06:45 -08:00
Michael Jurka
e4cc20d114 am 7dfbe2d6: am 3eaa876c: am 08924d00: Merge "Supporting EXTRA_APPWIDGET_OPTIONS correctly" into jb-mr1-lockscreen-dev 
* commit '7dfbe2d6a7a3d6f11d522f44b5339c7a6d3f2a1b':
  Supporting EXTRA_APPWIDGET_OPTIONS correctly
 2012-11-07 15:06:41 -08:00
Jim Miller
449f48ff3b am bb9e7dca: am be2ca79a: am 7dfc588a: Workaround for layout bug in SIM PIN/PUK views 
* commit 'bb9e7dcae96c8913050166c9cc949e9f1c3c8d1f':
  Workaround for layout bug in SIM PIN/PUK views
 2012-11-07 15:06:37 -08:00
Jim Miller
d3bd6eb8b2 am 16ddf343: am 8eb3048a: am 87d0366d: Fix NPE caused by applications that try to hide keyguard while it\'s not showing 
* commit '16ddf343a61dfc93ff9a6fc4721b8fb16010da48':
  Fix NPE caused by applications that try to hide keyguard while it's not showing
 2012-11-07 15:06:33 -08:00
Svetoslav Ganov
63121bd6c1 am ab77b5e6: am e97c6faa: am bb8abae5: am 0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev 
* commit 'ab77b5e6a251075fdfc7990f4d34a8d5896cfbce':
 2012-11-07 15:06:29 -08:00
Mike Cleron
fe583a7024 am d97d16f0: am f154c9bd: am 624ea441: am c87f198b: Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev 
* commit 'd97d16f0d1693657938a9c08099ad352d0946b6f':
 2012-11-07 15:06:26 -08:00
Romain Guy
39fe96c7b8 am c4101b2b: am a8e1d119: am 06da3378: am 6c642089: Merge "Add programmatic access to setters in TextClock Bug #7478328" into jb-mr1-dev 
* commit 'c4101b2b96d7958e26da5a7b3d14cc2540f8002a':
 2012-11-07 15:06:22 -08:00
Jean-Baptiste Queru
476fceaba3 Merge 5418dd92 
Change-Id: I50cd61c9dce55d528005b8d36dddf5cc62af89a8
 2012-11-07 14:41:18 -08:00
Kenny Root
58ed5d748c am 768d9e1a: Merge "Correct executable bit for source files" 
* commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04':
  Correct executable bit for source files
 2012-11-07 11:52:12 -08:00
Kenny Root
768d9e1a72 Merge "Correct executable bit for source files" 2012-11-07 11:45:14 -08:00
Elliott Hughes
9197d170b7 am fec5f611: Merge "It\'s 2012. We\'re always WITH_JIT." 
* commit 'fec5f611fef4fc3b7afa5d7194f4f40d156157ac':
  It's 2012. We're always WITH_JIT.
 2012-11-07 10:48:26 -08:00
Kenny Root
3a084af2e9 Correct executable bit for source files 
Many media files and source code files were marked as executable in Git.
Remove those.

Also a shell script and python script were not marked as executable.

Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5
 2012-11-07 10:27:31 -08:00
Elliott Hughes
fec5f611fe Merge "It's 2012. We're always WITH_JIT." 2012-11-07 09:57:16 -08:00
Irfan Sheriff
f264e8e34e am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev 
* commit '567a2919f3ad66dcb972e45411d18a4515d9f0b1':
  Stop supplicant and dhcp before start
 2012-11-06 17:43:05 -08:00
Irfan Sheriff
567a2919f3 Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev 2012-11-06 17:39:46 -08:00
Sascha Prueter
a517fc3a39 am ee8fab8b: am 872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev 
* commit 'ee8fab8be5806381904e1fec4ed0123ca39e2b4f':
  Use a consistent policy for filtering wake keys.
 2012-11-06 17:17:51 -08:00
Elliott Hughes
be8b47f6ce It's 2012. We're always WITH_JIT. 
Change-Id: Ia3d1a1b1df06816f2cfa3879ec669b34c62cf9b9
 2012-11-06 17:16:21 -08:00
Sascha Prueter
ee8fab8be5 am 872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev 
* commit '872965bb22ba74a06b755547883c5d0de62bb956':
  Use a consistent policy for filtering wake keys.
 2012-11-06 17:14:59 -08:00
Sascha Prueter
872965bb22 Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev 2012-11-06 17:11:26 -08:00
Jeff Brown
1c2e4948a1 Use a consistent policy for filtering wake keys. 
Previously wake keys were filtered differently depending on whether
a keyguard was showing.  If the user disables the keyguard then
no filtering was applied, which means that the volume key may
wake your device while in your pocket.

This change ensures that we use the same policy consistently
regardless of whether keyguard is showing.  The behavior is
otherwise the same.

Removed the "Locked" suffix on a method that was actually
being called without a lock held and which in fact does not
require it.

Bug: 7481025
Change-Id: I704c71ca009bc5437f349f858b9de7c77ea73e4b
 2012-11-06 16:48:15 -08:00
Romain Guy
b37e5d756f am 7b9b41c1: am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev 
* commit '7b9b41c18d0dc9d238111fa1865c72e4a5bb22cc':
  Dismiss error icon on setError(null) [regression] Bug #7442935
 2012-11-06 16:21:05 -08:00
Romain Guy
7b9b41c18d am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev 
* commit '1b3b2544e647a40094b9c9df2c94e34df7921da5':
  Dismiss error icon on setError(null) [regression] Bug #7442935
 2012-11-06 16:18:23 -08:00
Romain Guy
1b3b2544e6 Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev 2012-11-06 16:15:27 -08:00
Eino-Ville Talvala
9671e6e116 am e980adfd: am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev 
* commit 'e980adfd7085e99e57722e5576798c0ccdfb3f20':
  Camera: Document new video snapshot picture size behavior.
 2012-11-06 16:13:42 -08:00
Eino-Ville Talvala
e980adfd70 am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev 
* commit '4a1b6e42424d08da0d22a24464e568034ea557ee':
  Camera: Document new video snapshot picture size behavior.
 2012-11-06 16:10:55 -08:00
Eino-Ville Talvala
4a1b6e4242 Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev 2012-11-06 16:06:01 -08:00
Romain Guy
d1cc1878cc Dismiss error icon on setError(null) [regression] 
Bug #7442935

Change-Id: I783d868173637007be326e20795cbb4cb8c7b899
 2012-11-06 16:03:37 -08:00
Romain Guy
a1ca6d39f9 am a75a41e9: am 9d547d69: Merge "Clarify ViewStub.setVisibility() documentation to state that it works after inflation." 
* commit 'a75a41e9b12c90638fbff9ce69b2820f334bdda3':
  Clarify ViewStub.setVisibility() documentation to state that it works after inflation.
 2012-11-06 15:58:08 -08:00
Romain Guy
a75a41e9b1 am 9d547d69: Merge "Clarify ViewStub.setVisibility() documentation to state that it works after inflation." 
* commit '9d547d6934f64189e368c0b190fb4cf49c95a557':
  Clarify ViewStub.setVisibility() documentation to state that it works after inflation.
 2012-11-06 15:55:22 -08:00
Irfan Sheriff
511d5346ce Stop supplicant and dhcp before start 
Bug: 7227463
Change-Id: Iaa0df7522edc38d25fae2bbda8d24490e997e733
 2012-11-06 15:53:32 -08:00
Adam Powell
b5f27ddb3e am dd1dd607: am d811f27f: am 9ff6d4f8: Merge "Keyguard sanity checks for when layout is not yet complete" into jb-mr1-lockscreen-dev 
* commit 'dd1dd60770dccf83bba3e4abab2221f2bb7f1e1d':
  Keyguard sanity checks for when layout is not yet complete
 2012-11-06 15:30:49 -08:00
Jean-Baptiste Queru
ecf372213d Merge eead9274 
Change-Id: If59b9cf13297d3a556810501621cce65947ccf95
 2012-11-06 15:16:09 -08:00
Victoria Lease
66f3d7f3c8 am 446ffe00: am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev 
* commit '446ffe00cd402e18c041fb36c4d0d03429186224':
  Fires geofence if the device is already in the geofence area.
 2012-11-06 15:12:44 -08:00
Robert Greenwalt
08db1ceba2 am bbe5cafe: Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev 
* commit 'bbe5cafeebbbd08516909a3d9d12d5d319cba345':
  Add Coin graphic to premium-sms dialog.
 2012-11-06 15:11:04 -08:00
Victoria Lease
446ffe00cd am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev 
* commit 'e6299d5af702dd17eb3585dbe84d29c289bfa8da':
  Fires geofence if the device is already in the geofence area.
 2012-11-06 15:09:37 -08:00
Robert Greenwalt
bbe5cafeeb Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev 2012-11-06 15:07:35 -08:00
Victoria Lease
e6299d5af7 Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev 2012-11-06 15:06:16 -08:00
The Android Open Source Project
927372aec3 am f3456803: Reconcile with jb-mr1-release - do not merge 
* commit 'f3456803fed4ff529dea53fd9bc338887886acf9':
 2012-11-06 13:29:21 -08:00
The Android Open Source Project
f3456803fe Reconcile with jb-mr1-release - do not merge 
Change-Id: I6206907ad603bf70ca2c9ca3b9afc136fe2a1695
 2012-11-06 13:26:48 -08:00