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

80357 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ying Wang
762b3b143c Merge "Import translations. DO NOT MERGE" 2012-06-12 13:33:04 -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
aafad2ef42 Import translations. DO NOT MERGE 
Change-Id: I382cf1aff2a8939ed276f4169ec7b853d0c981ac
 2012-06-12 13:28:08 -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
49a0b01bdc am 0d637d6f: am 579ec308: Merge "MediaRouter work" into jb-dev 
* commit '0d637d6f888cdddba554174284fb96f8354a15e4':
  MediaRouter work
 2012-06-12 13:01:30 -07:00
Justin Ho
746a2ca9f9 am 11d536b3: am ceb80679: Merge "make the boot animation 32-bits to avoid banding" into jb-dev 
* commit '11d536b38116e72a40829bd976f9f78f50d53d1a':
  make the boot animation 32-bits to avoid banding
 2012-06-12 13:01:27 -07:00
Eric Laurent
16e7127948 am 2e1f18b9: am dcf33b73: Merge "Made IAudioService.setBluetoothA2dpOn() not oneway" into jb-dev 
* commit '2e1f18b9ba9af40d5e1f0874e091b8f487a2d50d':
  Made IAudioService.setBluetoothA2dpOn() not oneway
 2012-06-12 13:01:24 -07:00
Daniel Sandler
c9b781b435 am 2aaa68e8: am 56b135b9: Merge "Put PLMN and SPN on one line in the notification panel." into jb-dev 
* commit '2aaa68e8391a1ba68d333cd298e53196ade0cf1e':
  Put PLMN and SPN on one line in the notification panel.
 2012-06-12 13:01:20 -07:00
Daniel Sandler
6e3990d8c1 am 2e6f14db: am 2c1a4c05: Merge "Suppress header flash when collapsing notifications panel." into jb-dev 
* commit '2e6f14dbd8c5d2a702da4735e4e348720de9c204':
  Suppress header flash when collapsing notifications panel.
 2012-06-12 13:01:17 -07:00
Gilles Debunne
30103f6698 am 735b9598: am a447eaca: Merge "Prevent a crash when maxLines is set to 0" into jb-dev 
* commit '735b9598a2c7824befbdfc55ef4991ca01550d84':
  Prevent a crash when maxLines is set to 0
 2012-06-12 13:01:15 -07:00
Dianne Hackborn
5ef59976b1 am f59467b3: am aabd9c23: Merge "Fix issue #6634325: View.setKeepScreenOn and..." into jb-dev 
* commit 'f59467b3d6c5df8bf90de799e212275e5c26de86':
  Fix issue #6634325: View.setKeepScreenOn and...
 2012-06-12 13:01:12 -07:00
Adam Powell
ca415c8529 am 345a3835: am f958732b: Merge "Fix docs" into jb-dev 
* commit '345a3835aafd01e837741aa6ea733d8dc1b7dd2b':
  Fix docs
 2012-06-12 13:01:09 -07:00
Jeff Brown
d3f97dc0fb am 14afbba6: am ea6b8188: Merge "Improve ANR diagnostics." into jb-dev 
* commit '14afbba66355fab168bed25c9bab33058372584a':
  Improve ANR diagnostics.
 2012-06-12 13:01:06 -07:00
Adam Powell
0c9c063179 am a20d99b1: am ae20ae1a: More MediaRouter features. 
* commit 'a20d99b17906cb371203be8ec4dc92d9a104f8dd':
  More MediaRouter features.
 2012-06-12 13:01:03 -07:00
Romain Guy
13292174fb am 4930649d: am 68cefd20: Merge "Textured text calls could be invisible Bug #6597730" into jb-dev 
* commit '4930649d35dcec1f234124e8b4f8abfac8ba6ea6':
  Textured text calls could be invisible Bug #6597730
 2012-06-12 13:00:59 -07:00
Craig Mautner
adda220b18 am 42db9369: am 78a9b676: Merge "Remove over aggressive optimization." into jb-dev 
* commit '42db93691896740e47918e212bed7668464a3b9d':
  Remove over aggressive optimization.
 2012-06-12 13:00:57 -07:00
Craig Mautner
30dd205a6b am 1c92459a: am 16a61a51: Merge "Revert "Merge errors."" into jb-dev 
* commit '1c92459a50c6b60550ffd4fceaa2fabeb5418ada':
  Revert "Merge errors."
 2012-06-12 13:00:53 -07:00
Craig Mautner
fbec92ca1a am d5759f1c: am 73220fa0: Merge "Merge errors." into jb-dev 
* commit 'd5759f1c2c8038d6c8275b1ba7dc93a40763088c':
  Merge errors.
 2012-06-12 13:00:50 -07:00
Dianne Hackborn
d4a0c49ffa am 007f2b40: am f9d80b6b: Merge "Rework media router to be per-context with global process state." into jb-dev 
* commit '007f2b40f952eab8951c6b22302a59a955a20561':
  Rework media router to be per-context with global process state.
 2012-06-12 13:00:47 -07:00
Michael Jurka
c528b7199a am 823e2028: am 64dbcd64: Merge "Tweak recents out animation a bit more" into jb-dev 
* commit '823e20284588f785b96764ba24efb7b8f63895d7':
  Tweak recents out animation a bit more
 2012-06-12 13:00:43 -07:00
Jeff Brown
2dc7232140 am 62007aba: am 519e91ef: Merge "Detect bad behavior earlier in Choreographer." into jb-dev 
* commit '62007aba1998055cf6ab3e610ed97dbe06341056':
  Detect bad behavior earlier in Choreographer.
 2012-06-12 13:00:40 -07:00
Victoria Lease
49ccb116e9 am 1b15102f: am 72b8fc7e: Merge "Revert "Fix fake bold for fallback fonts in frameworks."" into jb-dev 
* commit '1b15102fc040f59c72c6453dee15b791f54c9f06':
  Revert "Fix fake bold for fallback fonts in frameworks."
 2012-06-12 13:00:37 -07:00
Adam Powell
ea99d9af2d am bee681a1: am fbce66cb: Merge "Further work on MediaRouter" into jb-dev 
* commit 'bee681a1d54062dc0833cc9a45aac7b20725c1bb':
  Further work on MediaRouter
 2012-06-12 13:00:33 -07:00
Mathias Agopian
9a0fca43f7 am 0b986a7b: am 0d8eba64: Merge "Enable HW accelerated window shade for all devices" into jb-dev 
* commit '0b986a7b3d93a6a33d723d2d2d432e946b0ef331':
  Enable HW accelerated window shade for all devices
 2012-06-12 13:00:31 -07:00
Romain Guy
bc62684f02 am 265888fe: am 6b5caee4: Merge "Prevent crash in WebView when disabling the hw renderer Bug #6596807" into jb-dev 
* commit '265888fe6a57d5b77279c97b68cfa25865267e6b':
  Prevent crash in WebView when disabling the hw renderer Bug #6596807
 2012-06-12 13:00:28 -07:00
Svetoslav Ganov
23ef5fcff4 am 5d15f40a: am f372e331: Merge "NPE when iterating by character and word in Launcher widgets." into jb-dev 
* commit '5d15f40a19be01fa9c5a9674b31b6b18774cbeac':
  NPE when iterating by character and word in Launcher widgets.
 2012-06-12 13:00:25 -07:00
Dianne Hackborn
0f9e241a24 am 863df9aa: (-s ours) am 409d563b: Merge "DO NOT MERGE: Cherry-pick 2ed524966d3c4bd04ea5f54026ed59558d73cd44 to JB." into jb-dev 
* commit '863df9aa3091c69ac675e83db16d586e47f7b2f7':
  DO NOT MERGE: Cherry-pick 2ed524966d3c4bd04ea5f54026ed59558d73cd44 to JB.
 2012-06-12 13:00:22 -07:00
Craig Mautner
69d00187c1 am 0721bde2: am 47adf865: Merge "Fix exposing wallpaper on rotations and other." into jb-dev 
* commit '0721bde26c73861bb40a5732cb63741d13776e36':
  Fix exposing wallpaper on rotations and other.
 2012-06-12 13:00:19 -07:00
Dianne Hackborn
b1add0b8f2 am 6892f1ec: am 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" into jb-dev 
* commit '6892f1ec9670432f1cab71813592077bea991a8b':
  Fix issue #6641368: can't launch gallery
 2012-06-12 13:00:15 -07:00
Eric Fischer
830dfe41d1 am 19e046c4: (-s ours) am 1b159f66: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '19e046c4d2f11e6ed5d324122996080942e94569':
  Import translations. DO NOT MERGE
 2012-06-12 13:00:08 -07:00
Chia-chi Yeh
7c727e50f1 am a2becffc: am d667aebf: Merge "VPN: move VpnDialogs away from system uid." into jb-dev 
* commit 'a2becffcf2a19889b90256a8479e276081ce6108':
  VPN: move VpnDialogs away from system uid.
 2012-06-12 12:59:59 -07:00
Amith Yamasani
82f47c95b6 Merge "Disable lockscreen using a system property." 2012-06-12 12:57:18 -07: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