92145 Commits

Author SHA1 Message Date
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
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
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
The Android Automerger
469f6212b3 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-05 18:38:53 -08:00
Svetoslav Ganov
9d45666119 am c9300f19: am 0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev
* commit 'c9300f196335410483c5c07eccac620332b75def':
  View's visibility to the user not checking predecessor alpha.
2012-11-05 17:08:46 -08:00
Mike Cleron
21c2525441 am a0362c7b: am c87f198b: Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev
* commit 'a0362c7b17ade27103ab468e46fb00de002ce6fa':
  TextView not respecting "speak passwords" setting when adding before text to events.
2012-11-05 17:08:42 -08:00
Svetoslav Ganov
c9300f1963 am 0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev
* commit '0f4d5df5d815466398dba5f2d07aa98f18c35aaa':
  View's visibility to the user not checking predecessor alpha.
2012-11-05 17:06:25 -08:00
Mike Cleron
a0362c7b17 am c87f198b: Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev
* commit 'c87f198b8cd3b3cb5b3daf63df419b9377b9c7b8':
  TextView not respecting "speak passwords" setting when adding before text to events.
2012-11-05 17:06:21 -08:00
Svetoslav Ganov
0f4d5df5d8 Merge "View's visibility to the user not checking predecessor alpha." into jb-mr1-dev 2012-11-05 17:03:37 -08:00
Mike Cleron
c87f198b8c Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev 2012-11-05 17:03:06 -08:00
Romain Guy
11e65c3670 am 851f2b0e: am 6c642089: Merge "Add programmatic access to setters in TextClock Bug #7478328" into jb-mr1-dev
* commit '851f2b0e12bb61c43a3062cb359d5b13b26f97d5':
  Add programmatic access to setters in TextClock Bug #7478328
2012-11-05 16:42:06 -08:00
Baligh Uddin
063de3b93e am 19f8aa18: (-s ours) am 00b5ed8f: Merge commit \'b3f87c24ee86227e22b2db9b04f3d94519f230f9\' into jb-mr1-dev
* commit '19f8aa180a7ccb29b11a322378002e37517abfc9': (21 commits)
  Clearing connected message in stop fixes 7401152
  bouncer: hide more text and frame less.
  Recover from badly behaving 3rd party secure cameras.
  Show bouncer mode for Slide mode in keyguard if widget isn't expanded
  Making challenge come back if within the same gesture you return to the original page (issue 7422999)
  Ensure edge swiping is enforced immediately upon showing keyguard (issue 7453156)
  Fix issue 7468224, make sure to size pages if page changes
  If a default keyguard layout isn't specified, fallback to the default layout
  Use better signal for camera launch.
  Render camera widget on a background thread.
  Fully block user interactions when transitioning to camera.
  Fixing up overscroll / hints on tablet
  Cleaning up the overscroll effect
  Updating UI to new design, widget shouldn't expand until page settles (issue 7467435)
  Making screen hints just side page outlines, as per new design (issue 7467968)
  Clean up separator string in keyguard view
  Attempt to fix MENU key issue.
  Update DevicePolicyManager documentation with new keyguard flags
  Polish user selector accessibility.
  Fix pages disappearing (issue 7456885)
  ...
2012-11-05 16:42:05 -08:00
Romain Guy
851f2b0e12 am 6c642089: Merge "Add programmatic access to setters in TextClock Bug #7478328" into jb-mr1-dev
* commit '6c642089bcd13bf17d7c445b2ec89b62a79c9823':
  Add programmatic access to setters in TextClock Bug #7478328
2012-11-05 16:39:13 -08:00
Romain Guy
6c642089bc Merge "Add programmatic access to setters in TextClock Bug #7478328" into jb-mr1-dev 2012-11-05 16:36:39 -08:00
Baligh Uddin
19f8aa180a am 00b5ed8f: Merge commit \'b3f87c24ee86227e22b2db9b04f3d94519f230f9\' into jb-mr1-dev
* commit '00b5ed8fa9f2f38e15894519f3afeaae56e97e94': (21 commits)
  Clearing connected message in stop fixes 7401152
  bouncer: hide more text and frame less.
  Recover from badly behaving 3rd party secure cameras.
  Show bouncer mode for Slide mode in keyguard if widget isn't expanded
  Making challenge come back if within the same gesture you return to the original page (issue 7422999)
  Ensure edge swiping is enforced immediately upon showing keyguard (issue 7453156)
  Fix issue 7468224, make sure to size pages if page changes
  If a default keyguard layout isn't specified, fallback to the default layout
  Use better signal for camera launch.
  Render camera widget on a background thread.
  Fully block user interactions when transitioning to camera.
  Fixing up overscroll / hints on tablet
  Cleaning up the overscroll effect
  Updating UI to new design, widget shouldn't expand until page settles (issue 7467435)
  Making screen hints just side page outlines, as per new design (issue 7467968)
  Clean up separator string in keyguard view
  Attempt to fix MENU key issue.
  Update DevicePolicyManager documentation with new keyguard flags
  Polish user selector accessibility.
  Fix pages disappearing (issue 7456885)
  ...
2012-11-05 15:58:55 -08:00
Adam Powell
9ff6d4f8db Merge "Keyguard sanity checks for when layout is not yet complete" into jb-mr1-lockscreen-dev 2012-11-05 15:52:43 -08:00
Adam Powell
5a2c5f0efa Keyguard sanity checks for when layout is not yet complete
Bug 7470163

Change-Id: I1e5f860ab39633f6c5e2046f6f18424227842406
2012-11-05 15:44:29 -08:00
Marco Nelissen
ff25dd337d am 6791ebde: am 7a4d856c: Merge "Removed offensive music genre"
* commit '6791ebde5f951566058cb32d1adb03447876268c':
  Removed offensive music genre
2012-11-05 15:44:00 -08:00
Marco Nelissen
6791ebde5f am 7a4d856c: Merge "Removed offensive music genre"
* commit '7a4d856c881ef48ad590d9e5a0456c94d188898a':
  Removed offensive music genre
2012-11-05 15:41:31 -08:00
Adam Cohen
79e0f87500 Merge "Fix small widgets not showing up on tablet (issue 7471516)" into jb-mr1-lockscreen-dev 2012-11-05 15:22:45 -08:00
Adam Cohen
6f72b1c917 Fix small widgets not showing up on tablet (issue 7471516)
Change-Id: Ie217268ef9c96512942f64b8ffd7e1d54a0ea850
2012-11-05 15:20:42 -08:00
Baligh Uddin
af0d09be28 am 00b5ed8f: Merge commit \'b3f87c24ee86227e22b2db9b04f3d94519f230f9\' into jb-mr1-dev
* commit '00b5ed8fa9f2f38e15894519f3afeaae56e97e94':
2012-11-05 15:19:27 -08:00
Baligh Uddin
00b5ed8fa9 Merge commit 'b3f87c24ee86227e22b2db9b04f3d94519f230f9' into jb-mr1-dev 2012-11-05 15:02:02 -08:00
Marco Nelissen
7a4d856c88 Merge "Removed offensive music genre" 2012-11-05 14:50:09 -08:00