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

80326 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
8cdfd60d27 am 15319ded: am 460abe97: Merge "Add support for Caller Name Display" 
* commit '15319ded1545dbb266273439063caf6ca23629f5':
  Add support for Caller Name Display
 2012-06-12 15:58:10 -07:00
Robert Greenwalt
15319ded15 am 460abe97: Merge "Add support for Caller Name Display" 
* commit '460abe97b06fd42cc37bdebb7f0ad4a7ef0e8bde':
  Add support for Caller Name Display
 2012-06-12 15:53:59 -07:00
Craig Mautner
7dc4c08495 am 12f0104e: am 4d6a0df3: Merge "Do not cancel animations when switching." into jb-dev 
* commit '12f0104ec729346d078a0afc9a79ab9fc023cce0':
  Do not cancel animations when switching.
 2012-06-12 15:52:31 -07:00
Craig Mautner
a803371535 Set detached wallpaper on the scale up animation. 
This keeps the background wallpaper from disappearing when expanding an
app that has a wallpaper background (e.g. clock).

Fixes bug 6649988. The second half of the bug, the first half will be
reissued as a new bug.

Change-Id: I209c9038469e4133586a927c92ef64ae43fb937f
 2012-06-12 15:50:45 -07:00
Craig Mautner
12f0104ec7 am 4d6a0df3: Merge "Do not cancel animations when switching." into jb-dev 
* commit '4d6a0df37930309f8e138499785483d9dcadf7d9':
  Do not cancel animations when switching.
 2012-06-12 15:48:34 -07:00
Craig Mautner
4d6a0df379 Merge "Do not cancel animations when switching." into jb-dev 2012-06-12 15:45:37 -07:00
Jeff Brown
ca309f212d Print extended SQLite error code. 
Bug: 6538393
Change-Id: I2b010c6a1127887717af67ec588c3df8bf41afe6
 2012-06-12 15:39:09 -07:00
Romain Guy
95fc7a246f Merge "Remove ViewTreeObserver allocations" 2012-06-12 15:27:06 -07:00
Romain Guy
c39ed4a6e5 Remove ViewTreeObserver allocations 
A couple of allocations remain to handle possibly recursive listeners.

Change-Id: I72fd271c2fc4f4ad427a27e0665f780cae117aea
 2012-06-12 15:23:52 -07:00
Robert Greenwalt
460abe97b0 Merge "Add support for Caller Name Display" 2012-06-12 15:17:39 -07:00
James Dong
0b1d806188 am 05fee7bd: am 085c4825: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.so" into jb-dev 
* commit '05fee7bddba9a00ed33392e78fddefbebf79b0b4':
  Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.so
 2012-06-12 14:53:10 -07:00
Christopher Tate
e9f6b86d1c am 4d3448db: am 4cabbef8: Merge "Make sure to stop noHistory="true" activities properly" into jb-dev 
* commit '4d3448db54e274b8c5f10ddef204882320e631ec':
  Make sure to stop noHistory="true" activities properly
 2012-06-12 14:53:00 -07:00
John Spurlock
c4283c6660 am 980d7b45: am 36eeb6a5: Merge "StatusBar: Respond properly to global expand message" into jb-dev 
* commit '980d7b45ffef0f747e4cb3020c3c8a1e421b5f9e':
  StatusBar: Respond properly to global expand message
 2012-06-12 14:52:56 -07:00
Ying Wang
7834663ed1 am fbd982c1: (-s ours) am 9c463d9d: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'fbd982c14f3507b8d85413096d8f38cf3f36c75f':
  Import translations. DO NOT MERGE
 2012-06-12 14:52:52 -07:00
James Dong
05fee7bddb am 085c4825: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.so" into jb-dev 
* commit '085c4825897bbbfa0f8564c2de45f74d7bea4029':
  Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.so
 2012-06-12 14:22:59 -07:00
James Dong
085c482589 Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.so" into jb-dev 2012-06-12 14:20:31 -07:00
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
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
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