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

92206 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Elliott Hughes
be8b47f6ce It's 2012. We're always WITH_JIT. 
Change-Id: Ia3d1a1b1df06816f2cfa3879ec669b34c62cf9b9
 2012-11-06 17:16:21 -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
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
Justin Koh
41048d670d Merge "Support new touchpad event protocol." into jb-mr1-aah-dev 2012-11-06 13:22:26 -08:00
Justin Koh
58e0fb9adb Merge "Trigger Google Now intent with swipe from bottom" into jb-mr1-aah-dev 2012-11-06 13:20:51 -08:00
The Android Automerger
f0de33bef1 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-06 13:13:34 -08:00
Amith Yamasani
aecee8a985 am 717797db: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev 
* commit '717797db3e59ec34190e1230ebdeafecd14f4948':
  Authenticate correct user's account when pattern fails multiple times.
 2012-11-06 13:00:40 -08:00
Amith Yamasani
717797db3e am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev 
* commit 'f763b71756d4d810e78e368fbcd56ff8a844f62c':
  Authenticate correct user's account when pattern fails multiple times.
 2012-11-06 12:58:39 -08:00
Amith Yamasani
f763b71756 Merge "Authenticate correct user's account when pattern fails multiple times." into jb-mr1-dev 2012-11-06 12:56:17 -08:00
Baligh Uddin
3ee5aeb2de am 59880dfd: am 0ca353fb: am af0d09be: am 00b5ed8f: Merge commit \'b3f87c24ee86227e22b2db9b04f3d94519f230f9\' into jb-mr1-dev 
* commit '59880dfd2e2078a21a9d4f79a8ea2ae52aa8bdb3':
 2012-11-06 12:51:09 -08:00
Adam Powell
2d5a68b4a7 am 833b29a8: am 58bbc5f7: am 5da6430f: Optimize keyguard/IME interactions 
* commit '833b29a82dfdcdce22e4035aa79edb52c9281f18':
  Optimize keyguard/IME interactions
 2012-11-06 12:51:05 -08:00
Joe Malin
aa0762b7b5 am 82ecdcc0: am cc2a14a8: am ff91b179: am db426cc0: am 046671af: am fbcfb5d0: am 50c2275c: Android Training: CursorLoader 
* commit '82ecdcc0f78b55dbb38a99f36e2ebac4148c99be':
 2012-11-06 12:51:02 -08:00
John Spurlock
ef44a77f91 am b93031e0: am 65cbcbea: Remove add widget transition jank (insecure). 
* commit 'b93031e0a64f3ec2548063cec6ea63b54be92c93':
  Remove add widget transition jank (insecure).
 2012-11-06 12:48:36 -08:00
John Spurlock
64091a1da0 am 8aa62362: am ae73c690: Fix regression in camera transition. 
* commit '8aa623628cbc7b859b1f94e5a09882fbe8cb209d':
  Fix regression in camera transition.
 2012-11-06 12:48:33 -08:00
Michael Jurka
7dfbe2d6a7 am 3eaa876c: am 08924d00: Merge "Supporting EXTRA_APPWIDGET_OPTIONS correctly" into jb-mr1-lockscreen-dev 
* commit '3eaa876cf317d064de1a32f1d34fd83b6e960e0b':
  Supporting EXTRA_APPWIDGET_OPTIONS correctly
 2012-11-06 12:48:29 -08:00
Jim Miller
bb9e7dcae9 am be2ca79a: am 7dfc588a: Workaround for layout bug in SIM PIN/PUK views 
* commit 'be2ca79abf2b1e5eb257560aa99ab48059e48cc8':
  Workaround for layout bug in SIM PIN/PUK views
 2012-11-06 12:48:26 -08:00
Jim Miller
16ddf343a6 am 8eb3048a: am 87d0366d: Fix NPE caused by applications that try to hide keyguard while it\'s not showing 
* commit '8eb3048acc2a3fddf0d6acfb43e69696672ae706':
  Fix NPE caused by applications that try to hide keyguard while it's not showing
 2012-11-06 12:48:22 -08:00
Svetoslav Ganov
ab77b5e6a2 am e97c6faa: am bb8abae5: am 0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev 
* commit 'e97c6faadb7d1b51d1dd194d4ccc47e299d09ba9':
 2012-11-06 12:48:19 -08:00
Mike Cleron
d97d16f0d1 am f154c9bd: am 624ea441: am c87f198b: Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev 
* commit 'f154c9bdf81f20cf813064dd4e7e43805095b97a':
 2012-11-06 12:48:15 -08:00
Romain Guy
c4101b2b96 am a8e1d119: am 06da3378: am 6c642089: Merge "Add programmatic access to setters in TextClock Bug #7478328" into jb-mr1-dev 
* commit 'a8e1d119630ca3d351262ca3f3a11dda4e6edf75':
 2012-11-06 12:48:11 -08:00
Winson Chung
5418dd92ac am 6d47e9fc: am 48275d2d: Adding bouncer animation on PagedView. (Bug 7459660) 
* commit '6d47e9fc867ece4340869f72d9484c9e5eb71873':
  Adding bouncer animation on PagedView. (Bug 7459660)
 2012-11-06 12:48:06 -08:00