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

92174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
7d16e89494 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: Iff336b51ffc2893168e67406d96bc6dd97735b7e
 2012-11-06 12:37:23 -08:00
The Android Open Source Project
ab58af3673 am 32477a8d: am 55e7bdc7: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
* commit '32477a8dbf812795a19529d52c4ec2e079989cef':
 2012-11-06 12:26:57 -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
Romain Guy
9d547d6934 Merge "Clarify ViewStub.setVisibility() documentation to state that it works after inflation." 2012-11-06 10:52:10 -08:00
The Android Automerger
af73b9e4bc merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-06 02:25:30 -08:00