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

78968 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
5f1907316e am 955a0169: Fix 6613962: Update keyguard to use new GlowPadView UX design. 
* commit '955a016922ea49f154d190b054a202559b41a4d3':
  Fix 6613962: Update keyguard to use new GlowPadView UX design.
 2012-06-12 19:41:44 -07:00
Jim Miller
955a016922 Fix 6613962: Update keyguard to use new GlowPadView UX design. 
Change-Id: I4f1ef3107e5550f7df9dcb412943a84b66432b7d
 2012-06-12 19:16:08 -07:00
Craig Mautner
1d48ca51de am 1c958102: Merge "Set detached wallpaper on the scale up animation." into jb-dev 
* commit '1c9581023ced89a209fca9c4e40305f8e0859732':
  Set detached wallpaper on the scale up animation.
 2012-06-12 19:06:46 -07:00
Craig Mautner
1c9581023c Merge "Set detached wallpaper on the scale up animation." into jb-dev 2012-06-12 19:04:01 -07:00
Jeff Sharkey
9eabf916dc am f6f7f1d2: Low disk space string change, surface state. 
* commit 'f6f7f1d2dc6e8fad5d6ff9a56af9929488873b4f':
  Low disk space string change, surface state.
 2012-06-12 18:36:07 -07:00
Jeff Sharkey
f6f7f1d2dc Low disk space string change, surface state. 
Surface current low disk state through IPackageManager for use in
Settings app.

Bug: 6576409
Change-Id: I9ae9ce99a2faa3015a237036c03567d1ae11628f
 2012-06-12 17:12:08 -07:00
Jeff Brown
b8b29fa7f1 am fdcac45b: Merge "Print extended SQLite error code." into jb-dev 
* commit 'fdcac45b6767caaac70c30fd974dce61119f79d7':
  Print extended SQLite error code.
 2012-06-12 16:09:34 -07:00
Jeff Brown
fdcac45b67 Merge "Print extended SQLite error code." into jb-dev 2012-06-12 16:06:03 -07:00
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
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
Robert Greenwalt
460abe97b0 Merge "Add support for Caller Name Display" 2012-06-12 15:17:39 -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
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
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