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

79206 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Dong
c6693f6fee Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.so 
Change-Id: Ibe37c2e6ede6143dc4e27c6072867bc58aa1c08a
related-to-bug: 6647465
 2012-06-12 14:05:14 -07:00
Chris Wren
9b2cd15f0f Invert the sense of the two-figner direction on tablets. 
Bug: 6506376
Change-Id: Ife336c6695608f14554e18e32ea35f118d7f12e2
 2012-06-12 16:41:54 -04:00
Christopher Tate
4d3448db54 am 4cabbef8: Merge "Make sure to stop noHistory="true" activities properly" into jb-dev 
* commit '4cabbef8266c909997cf608d008920f5a2f49937':
  Make sure to stop noHistory="true" activities properly
 2012-06-12 13:41:31 -07:00
Christopher Tate
4cabbef826 Merge "Make sure to stop noHistory="true" activities properly" into jb-dev 2012-06-12 13:38:56 -07:00
John Spurlock
980d7b45ff am 36eeb6a5: Merge "StatusBar: Respond properly to global expand message" into jb-dev 
* commit '36eeb6a5be895bfba0405d34062d0db5b118a329':
  StatusBar: Respond properly to global expand message
 2012-06-12 13:31:30 -07:00
John Spurlock
36eeb6a5be Merge "StatusBar: Respond properly to global expand message" into jb-dev 2012-06-12 13:29:09 -07:00
Ying Wang
fbd982c14f am 9c463d9d: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '9c463d9d9f2601f139baad862b1b3276e126b12d':
  Import translations. DO NOT MERGE
 2012-06-12 13:22:27 -07:00
Ying Wang
9c463d9d9f Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-12 13:20:19 -07:00
Ying Wang
26879578e8 Import translations. DO NOT MERGE 
Change-Id: Iafceb53cc46753f25f460609e9db6fa227c15032
 2012-06-12 13:17:59 -07:00
Christopher Tate
5007ddded6 Make sure to stop noHistory="true" activities properly 
The code was correctly inducing a 'finish' when such an activity was
being stopped, but then was not continuing with the rest of the stop
bookkeeping at that point.  In some circumstances this could result
in an inconsistent state, with the activity marked as finishing but
neither in the foreground nor stopped.

Bug 6585403

Change-Id: Ib5c5be885bc6534e099e040d87a8589f7b7454ce
 2012-06-12 13:08:18 -07:00
Daniel Sandler
602ad1c978 "Two actions ought to be enough for anybody." 
Bug: 6650170
Change-Id: I5ee6990a8e556f9ee1fbfb0989db33f75b07f4ea
 2012-06-12 16:06:27 -04:00
Adam Powell
0d637d6f88 am 579ec308: Merge "MediaRouter work" into jb-dev 
* commit '579ec3086c9ce3616735bc3cf63246f052973a7f':
  MediaRouter work
 2012-06-12 12:46:02 -07:00
Justin Ho
11d536b381 am ceb80679: Merge "make the boot animation 32-bits to avoid banding" into jb-dev 
* commit 'ceb8067920043a430478be386c56c244355d4c9f':
  make the boot animation 32-bits to avoid banding
 2012-06-12 12:45:46 -07:00
Eric Laurent
2e1f18b9ba am dcf33b73: Merge "Made IAudioService.setBluetoothA2dpOn() not oneway" into jb-dev 
* commit 'dcf33b73159fe864f80514919775598e797e37d2':
  Made IAudioService.setBluetoothA2dpOn() not oneway
 2012-06-12 12:45:43 -07:00
Daniel Sandler
2aaa68e839 am 56b135b9: Merge "Put PLMN and SPN on one line in the notification panel." into jb-dev 
* commit '56b135b91051664ae9027f50e9f20b7fcf6565ba':
  Put PLMN and SPN on one line in the notification panel.
 2012-06-12 12:45:40 -07:00
Daniel Sandler
2e6f14dbd8 am 2c1a4c05: Merge "Suppress header flash when collapsing notifications panel." into jb-dev 
* commit '2c1a4c05b83e0461169bb846765ae415b4e79fcf':
  Suppress header flash when collapsing notifications panel.
 2012-06-12 12:45:36 -07:00
Gilles Debunne
735b9598a2 am a447eaca: Merge "Prevent a crash when maxLines is set to 0" into jb-dev 
* commit 'a447eaca555e45ebbbc5e4de2762e19dbca12980':
  Prevent a crash when maxLines is set to 0
 2012-06-12 12:45:27 -07:00
Dianne Hackborn
f59467b3d6 am aabd9c23: Merge "Fix issue #6634325: View.setKeepScreenOn and..." into jb-dev 
* commit 'aabd9c230f9849e8d52d2cb2e33bac7f163590d5':
  Fix issue #6634325: View.setKeepScreenOn and...
 2012-06-12 12:45:24 -07:00
Adam Powell
345a3835aa am f958732b: Merge "Fix docs" into jb-dev 
* commit 'f958732bd3924205d9f8bda94f4f6e3bb4045b28':
  Fix docs
 2012-06-12 12:43:57 -07:00
Jeff Brown
14afbba663 am ea6b8188: Merge "Improve ANR diagnostics." into jb-dev 
* commit 'ea6b8188320202da072285b08fe6c0ee5c3f71e5':
  Improve ANR diagnostics.
 2012-06-12 12:43:52 -07:00
Adam Powell
a20d99b179 am ae20ae1a: More MediaRouter features. 
* commit 'ae20ae1a8aaa013813c356ae1d9541ca7ff020ae':
  More MediaRouter features.
 2012-06-12 12:43:48 -07:00
Romain Guy
4930649d35 am 68cefd20: Merge "Textured text calls could be invisible Bug #6597730" into jb-dev 
* commit '68cefd201809372a547257a273b805cabbd0da68':
  Textured text calls could be invisible Bug #6597730
 2012-06-12 12:43:36 -07:00
Craig Mautner
42db936918 am 78a9b676: Merge "Remove over aggressive optimization." into jb-dev 
* commit '78a9b67691d08e7347ab7bed7708fa09680ee71f':
  Remove over aggressive optimization.
 2012-06-12 12:43:33 -07:00
Craig Mautner
1c92459a50 am 16a61a51: Merge "Revert "Merge errors."" into jb-dev 
* commit '16a61a51ffdf0490d3fd201c8679a990723f7d8e':
  Revert "Merge errors."
 2012-06-12 12:43:29 -07:00
Craig Mautner
d5759f1c2c am 73220fa0: Merge "Merge errors." into jb-dev 
* commit '73220fa083f6b2b302434ad081dd062505744ed8':
  Merge errors.
 2012-06-12 12:43:26 -07:00
Dianne Hackborn
007f2b40f9 am f9d80b6b: Merge "Rework media router to be per-context with global process state." into jb-dev 
* commit 'f9d80b6b940540b5d7be22ae310e047fcd2472a8':
  Rework media router to be per-context with global process state.
 2012-06-12 12:43:20 -07:00
Michael Jurka
823e202845 am 64dbcd64: Merge "Tweak recents out animation a bit more" into jb-dev 
* commit '64dbcd64be34f83e51229891da865ca047b4f5f4':
  Tweak recents out animation a bit more
 2012-06-12 12:43:17 -07:00
Jeff Brown
62007aba19 am 519e91ef: Merge "Detect bad behavior earlier in Choreographer." into jb-dev 
* commit '519e91ef84aab79d0e18ba72e8a133d2306b821c':
  Detect bad behavior earlier in Choreographer.
 2012-06-12 12:43:01 -07:00
Victoria Lease
1b15102fc0 am 72b8fc7e: Merge "Revert "Fix fake bold for fallback fonts in frameworks."" into jb-dev 
* commit '72b8fc7e6da2f335880750513401d680417dfd13':
  Revert "Fix fake bold for fallback fonts in frameworks."
 2012-06-12 12:42:54 -07:00
Adam Powell
bee681a1d5 am fbce66cb: Merge "Further work on MediaRouter" into jb-dev 
* commit 'fbce66cb259cb63b43fda654db68152b8b4a2c2f':
  Further work on MediaRouter
 2012-06-12 12:42:48 -07:00
Mathias Agopian
0b986a7b3d am 0d8eba64: Merge "Enable HW accelerated window shade for all devices" into jb-dev 
* commit '0d8eba64b2ee2921915e0f6793ddd2d8f44e2428':
  Enable HW accelerated window shade for all devices
 2012-06-12 12:42:41 -07:00
Romain Guy
265888fe6a am 6b5caee4: Merge "Prevent crash in WebView when disabling the hw renderer Bug #6596807" into jb-dev 
* commit '6b5caee49085c63b0197fd1e5e952f3b76abe33d':
  Prevent crash in WebView when disabling the hw renderer Bug #6596807
 2012-06-12 12:42:32 -07:00
Svetoslav Ganov
5d15f40a19 am f372e331: Merge "NPE when iterating by character and word in Launcher widgets." into jb-dev 
* commit 'f372e331e46bb9852520fa76c76f99ad99441893':
  NPE when iterating by character and word in Launcher widgets.
 2012-06-12 12:42:27 -07:00
Dianne Hackborn
863df9aa30 am 409d563b: Merge "DO NOT MERGE: Cherry-pick 2ed524966d3c4bd04ea5f54026ed59558d73cd44 to JB." into jb-dev 
* commit '409d563b51853fc9dce6b4c02df84f58ec887afd':
  DO NOT MERGE: Cherry-pick 2ed524966d3c4bd04ea5f54026ed59558d73cd44 to JB.
 2012-06-12 12:42:01 -07:00
Craig Mautner
0721bde26c am 47adf865: Merge "Fix exposing wallpaper on rotations and other." into jb-dev 
* commit '47adf865bddf6c81051d457e04785408d2710f60':
  Fix exposing wallpaper on rotations and other.
 2012-06-12 12:41:50 -07:00
Dianne Hackborn
6892f1ec96 am 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" into jb-dev 
* commit '0f6471ace77387560988964ed0679f843bba6f1f':
  Fix issue #6641368: can't launch gallery
 2012-06-12 12:41:36 -07:00
Eric Fischer
19e046c4d2 am 1b159f66: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '1b159f66eed528f9cda04a316a1958a7ce79ee48':
  Import translations. DO NOT MERGE
 2012-06-12 12:41:20 -07:00
Chia-chi Yeh
a2becffcf2 am d667aebf: Merge "VPN: move VpnDialogs away from system uid." into jb-dev 
* commit 'd667aebfb34085960e2b41a2f52d10ae749ec44c':
  VPN: move VpnDialogs away from system uid.
 2012-06-12 12:41:12 -07:00
Jeff Brown
7d9a18eeb6 Merge "resolved conflicts for merge of 926a5c50 to jb-dev-plus-aosp" into jb-dev-plus-aosp 2012-06-12 12:37:42 -07:00
Adam Powell
579ec3086c Merge "MediaRouter work" into jb-dev 2012-06-12 12:04:24 -07:00
Adam Powell
b35c445f34 MediaRouter work 
Fix a bug where MediaRouter would crash on creation

Add click listener for app-supplied extended settings on the route
selection dialog.

Change-Id: I2991db1720b5c574148e250526984592f4dc3c44
 2012-06-12 11:26:39 -07:00
Justin Ho
ceb8067920 Merge "make the boot animation 32-bits to avoid banding" into jb-dev 2012-06-12 11:22:44 -07:00
Craig Mautner
9fec779587 Do not cancel animations when switching. 
Was canceling ongoing animations when starting a new animation which
caused the window of the first animation to restart. This looked
janky. The original cancellation was put in to stop the incorrect
animation being selected when quickly switching between an incoming
app and the homescreen. Reversing the cancellation no longer exposes
the original problem it was put in to fix.

One way to duplicate what this is fixing.
1. Slow down animations to 10x.
2. Run ApiDemos/App/Alert Dialogs/List dialog
3. Tap outside the list dialog and then tap the home button.
Tapping outside the list dialog causes the list dialog to animate
away. Tapping the home button then causes the app to animate away.
Before this fix the list dialog would revert to full size before
the app animates away. With this fix the list dialog continues its
original animation as the app animates away.

Fixes bug 6600726.

Change-Id: I29c940254808a321c3b6c2e4f4b7c78a72b47899
 2012-06-12 11:13:41 -07:00
Eric Laurent
dcf33b7315 Merge "Made IAudioService.setBluetoothA2dpOn() not oneway" into jb-dev 2012-06-12 11:10:33 -07:00
Jeff Brown
f195b80c2b resolved conflicts for merge of 926a5c50 to jb-dev-plus-aosp 
Change-Id: I1426b282bb4c392b0a5bcb96760c04f215a26b4e
 2012-06-12 11:10:26 -07:00
Daniel Sandler
56b135b910 Merge "Put PLMN and SPN on one line in the notification panel." into jb-dev 2012-06-12 11:04:14 -07:00
Daniel Sandler
2c1a4c05b8 Merge "Suppress header flash when collapsing notifications panel." into jb-dev 2012-06-12 11:04:08 -07:00
Gilles Debunne
a447eaca55 Merge "Prevent a crash when maxLines is set to 0" into jb-dev 2012-06-12 10:47:31 -07:00
Dianne Hackborn
aabd9c230f Merge "Fix issue #6634325: View.setKeepScreenOn and..." into jb-dev 2012-06-12 10:40:11 -07:00
John Spurlock
8506149f61 StatusBar: Respond properly to global expand message 
Fix timing issue in PhoneStatusBar#animateExpand(). Also, notification panel
drag handle (when expanded) reflects movement immediately.

To test animateExpand():
  $ adb shell service call statusbar 1

Bug: 6629916
Change-Id: I22bb09fc4c9d97c93ba8d7aed8921b60f5ebd610
 2012-06-12 13:27:14 -04:00