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

89685 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Adam Powell
dd1dd60770 am d811f27f: am 9ff6d4f8: Merge "Keyguard sanity checks for when layout is not yet complete" into jb-mr1-lockscreen-dev 
* commit 'd811f27f777d71da7ff226e72a68b09f30c39324':
  Keyguard sanity checks for when layout is not yet complete
 2012-11-06 12:48:02 -08:00
Adam Cohen
eead927499 am 4e8a47e0: am 79e0f875: Merge "Fix small widgets not showing up on tablet (issue 7471516)" into jb-mr1-lockscreen-dev 
* commit '4e8a47e01cd0fd409f998e00976b1249c6b2f963':
  Fix small widgets not showing up on tablet (issue 7471516)
 2012-11-06 12:47:58 -08:00
Baligh Uddin
59880dfd2e am 0ca353fb: am af0d09be: am 00b5ed8f: Merge commit \'b3f87c24ee86227e22b2db9b04f3d94519f230f9\' into jb-mr1-dev 
* commit '0ca353fbd38345f0bdbcbc1028e0d292e9271392':
 2012-11-06 12:47:54 -08:00
Adam Powell
833b29a82d am 58bbc5f7: am 5da6430f: Optimize keyguard/IME interactions 
* commit '58bbc5f7889946a5cbd58f5af41c1127edef1a0e':
  Optimize keyguard/IME interactions
 2012-11-06 12:47:51 -08:00
Joe Malin
82ecdcc0f7 am cc2a14a8: am ff91b179: am db426cc0: am 046671af: am fbcfb5d0: am 50c2275c: Android Training: CursorLoader 
* commit 'cc2a14a8cec51e02a74a7a55215c0edd7160f1b5':
 2012-11-06 12:47:47 -08:00
John Spurlock
b93031e0a6 am 65cbcbea: Remove add widget transition jank (insecure). 
* commit '65cbcbea8a88a14dd9a001d23d09f0a02b0b3805':
  Remove add widget transition jank (insecure).
 2012-11-06 12:44:28 -08:00
John Spurlock
8aa623628c am ae73c690: Fix regression in camera transition. 
* commit 'ae73c6908ffd3c450d56a4fde95513cfff19d8a2':
  Fix regression in camera transition.
 2012-11-06 12:44:21 -08:00
Michael Jurka
3eaa876cf3 am 08924d00: Merge "Supporting EXTRA_APPWIDGET_OPTIONS correctly" into jb-mr1-lockscreen-dev 
* commit '08924d007f2323b6fb57c858732d32b1083da639':
  Supporting EXTRA_APPWIDGET_OPTIONS correctly
 2012-11-06 12:44:18 -08:00
Jim Miller
be2ca79abf am 7dfc588a: Workaround for layout bug in SIM PIN/PUK views 
* commit '7dfc588a9db81a797b881aab41ac8951bebb033d':
  Workaround for layout bug in SIM PIN/PUK views
 2012-11-06 12:44:15 -08:00
Jim Miller
8eb3048acc am 87d0366d: Fix NPE caused by applications that try to hide keyguard while it\'s not showing 
* commit '87d0366d9e41a0fb1e20cc021ba391ed92fab385':
  Fix NPE caused by applications that try to hide keyguard while it's not showing
 2012-11-06 12:44:07 -08:00
Svetoslav Ganov
e97c6faadb am bb8abae5: am 0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev 
* commit 'bb8abae507119612b4168b951354516b0bf7112d':
 2012-11-06 12:44:03 -08:00
Mike Cleron
f154c9bdf8 am 624ea441: am c87f198b: Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev 
* commit '624ea44120dcf8e7305bbb54072417f189855187':
 2012-11-06 12:44:00 -08:00
Romain Guy
a8e1d11963 am 06da3378: am 6c642089: Merge "Add programmatic access to setters in TextClock Bug #7478328" into jb-mr1-dev 
* commit '06da33787620b20f59db8ae8df2b3414fa724fc2':
 2012-11-06 12:43:55 -08:00
Winson Chung
6d47e9fc86 am 48275d2d: Adding bouncer animation on PagedView. (Bug 7459660) 
* commit '48275d2de99ff2556031929c48f295d3f93447b6':
  Adding bouncer animation on PagedView. (Bug 7459660)
 2012-11-06 12:43:52 -08:00
Adam Powell
d811f27f77 am 9ff6d4f8: Merge "Keyguard sanity checks for when layout is not yet complete" into jb-mr1-lockscreen-dev 
* commit '9ff6d4f8db8d3d7a6f22afa726685feb47694fbe':
  Keyguard sanity checks for when layout is not yet complete
 2012-11-06 12:43:49 -08:00
Adam Cohen
4e8a47e01c am 79e0f875: Merge "Fix small widgets not showing up on tablet (issue 7471516)" into jb-mr1-lockscreen-dev 
* commit '79e0f875002d7bde5cf71053f9e9f054e9b5ffa2':
  Fix small widgets not showing up on tablet (issue 7471516)
 2012-11-06 12:43:46 -08:00
Baligh Uddin
0ca353fbd3 am af0d09be: am 00b5ed8f: Merge commit \'b3f87c24ee86227e22b2db9b04f3d94519f230f9\' into jb-mr1-dev 
* commit 'af0d09be288214e01a4cc661a8173bb11c453061':
 2012-11-06 12:43:42 -08:00
Adam Powell
58bbc5f788 am 5da6430f: Optimize keyguard/IME interactions 
* commit '5da6430fff7812e58ee7e9a05c62d72c36f366c8':
  Optimize keyguard/IME interactions
 2012-11-06 12:43:39 -08:00
Joe Malin
cc2a14a8ce am ff91b179: am db426cc0: am 046671af: am fbcfb5d0: am 50c2275c: Android Training: CursorLoader 
* commit 'ff91b179d37f5ab1e3cdcd179ee5799220b51ba8':
 2012-11-06 12:43:36 -08:00
The Android Open Source Project
32477a8dbf am 55e7bdc7: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
* commit '55e7bdc772047fe6232b51c2900e82eb354dafe5': (128 commits)
  Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991)
  Fix ordering bug
  Track size changes correctly for static wallpapers
  Stop reloading wallpaper bitmap
  Avoid redundant wallpaper loading/drawing
  Show clear all when returning from flip quick settings.
  Fade out the notification/settings panels just before close.
  Fix Bluetooth QS tile.
  Fixes for QS:
  Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."
  Hide settings button from tablet notification panel.
  Quickening.
  Fix ApplicationInfo copy ctor
  Fix NPE in quick settings tiles.
  Fix for bug 7358703 Gmail ANR when trying to compose a message
  Fix inoperative "Forgot pattern" button when face unlock enabled
  Add new tablet sound set Bug: 7351672
  Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457
  Flipping quick settings!
  Flag window animation transactions as animations.
  ...
 2012-11-06 12:20:38 -08:00
The Android Open Source Project
55e7bdc772 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
Change-Id: I72634b08506c4fed29edd474553cb416dce9cc8e
 2012-11-06 12:17:05 -08:00