ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
6,103 Commits 2 Branches 0 Tags 54 MiB
afdaafc286
Commit Graph

6103 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android (Google) Code Review
1b81805ebb Merge change 27315 into eclair 
* changes:
  Reset mPreventDrag at touch_down.
 2009-09-27 18:04:13 -04:00
Wei Huang
6a481a0ceb am fbb72631: add new column "real_date" for IM messages table. 
Merge commit 'fbb7263121923cd30d52ac4a35c4309b0a618ddb' into eclair-plus-aosp

* commit 'fbb7263121923cd30d52ac4a35c4309b0a618ddb':
  add new column "real_date" for IM messages table.
 2009-09-27 14:55:12 -07:00
Wei Huang
4c5544e2d3 am 6a07f9fb: Merge change 27301 into eclair 
Merge commit '6a07f9fbe9f270795d3338415ca03a3333ec50e3' into eclair-plus-aosp

* commit '6a07f9fbe9f270795d3338415ca03a3333ec50e3':
  bug 2148061: if PduBody is zero length, treat it as an empty message.
 2009-09-27 14:12:56 -07:00
Android (Google) Code Review
42937f2dec Merge change 27301 into eclair 
* changes:
  bug 2148061: if PduBody is zero length, treat it as an empty message.
 2009-09-27 17:04:44 -04:00
Dianne Hackborn
2262c2c2fa am ac939d08: Merge change 27291 into eclair 
Merge commit 'ac939d086c42afeaef0982cee0e5861184dd82eb' into eclair-plus-aosp

* commit 'ac939d086c42afeaef0982cee0e5861184dd82eb':
  Fix issue #2148939: Sholes slow to wake up in landscape mode
 2009-09-27 14:03:37 -07:00
Ray Chen
ef17e39ccd am cc96652c: Remove fflush when storing thumbanil to sdcard. 
Merge commit 'cc96652c7049569c1bc7b1f93ba454a7cb891fd8' into eclair-plus-aosp

* commit 'cc96652c7049569c1bc7b1f93ba454a7cb891fd8':
  Remove fflush when storing thumbanil to sdcard.
 2009-09-27 14:03:32 -07:00
Android (Google) Code Review
3839172532 Merge change 27291 into eclair 
* changes:
  Fix issue #2148939: Sholes slow to wake up in landscape mode
 2009-09-27 17:00:20 -04:00
Mike Lockwood
1c6dec82d9 am e7d60bfd: Merge change 27032 into eclair 
Merge commit 'e7d60bfdff35ad8eace600d2a6cb81163c966bb0' into eclair-plus-aosp

* commit 'e7d60bfdff35ad8eace600d2a6cb81163c966bb0':
  BatteryService: Specify low battery levels in resources.
 2009-09-27 12:47:37 -07:00
Nick Pelly
fa1fea64ff am 94bbfa47: Merge change 27142 into eclair 
Merge commit '94bbfa47b043c50e10e6558e461d018b7d13bb5d' into eclair-plus-aosp

* commit '94bbfa47b043c50e10e6558e461d018b7d13bb5d':
  Handle expiration of discovery mode in system server.
 2009-09-27 12:47:32 -07:00
Nick Pelly
9d8212f840 am 65dea14c: Merge change 27129 into eclair 
Merge commit '65dea14cafb357411c6f9307c6d9add60822aa33' into eclair-plus-aosp

* commit '65dea14cafb357411c6f9307c6d9add60822aa33':
  Bounds check read and write path in native code.
 2009-09-27 12:47:27 -07:00
Android (Google) Code Review
7d92f50d39 Merge change 27032 into eclair 
* changes:
  BatteryService: Specify low battery levels in resources.
 2009-09-27 15:43:17 -04:00
Android (Google) Code Review
c65b1a8f3e Merge change 27142 into eclair 
* changes:
  Handle expiration of discovery mode in system server.
 2009-09-27 15:42:14 -04:00
Android (Google) Code Review
8def6f8e7d Merge change 27129 into eclair 
* changes:
  Bounds check read and write path in native code.
 2009-09-27 15:41:51 -04:00
Grace Kloba
c69a6a4358 am e03848eb: Merge change 27154 into eclair 
Merge commit 'e03848eb93fde30aee4201f8b41b91fa57475bc2' into eclair-plus-aosp

* commit 'e03848eb93fde30aee4201f8b41b91fa57475bc2':
  When change from narrow screen to wide screen, we will
 2009-09-27 12:32:47 -07:00
Android (Google) Code Review
7b3a540a31 Merge change 27154 into eclair 
* changes:
  When change from narrow screen to wide screen, we will leave the mMinZoomScale to 1.0
 2009-09-27 15:24:48 -04:00
Marco Nelissen
f99e52076a am 0faa5c6c: Merge change 27271 into eclair 
Merge commit '0faa5c6c5a6da598fd6cdac3a5c1f1f9a2090ad2' into eclair-plus-aosp

* commit '0faa5c6c5a6da598fd6cdac3a5c1f1f9a2090ad2':
  Only scan windows media files when those codecs are enabled.
 2009-09-27 12:24:17 -07:00
Android (Google) Code Review
1c07ba141d Merge change 27271 into eclair 
* changes:
  Only scan windows media files when those codecs are enabled.
 2009-09-27 15:19:27 -04:00
Mike Cleron
2a4d181d3b am 954e98e0: Merge change 27267 into eclair 
Merge commit '954e98e023568b354aeec0a54668155ad9083398' into eclair-plus-aosp

* commit '954e98e023568b354aeec0a54668155ad9083398':
  Add official assets for tabs in compatibility mode
 2009-09-27 11:12:55 -07:00
Android (Google) Code Review
a83302cb61 Merge change 27267 into eclair 
* changes:
  Add official assets for tabs in compatibility mode
 2009-09-27 14:05:05 -04:00
Christopher Tate
7574d680be am 141e4f1d: Merge change 27177 into eclair 
Merge commit '141e4f1d69186104c3e169ee7365b62bc425859a' into eclair-plus-aosp

* commit '141e4f1d69186104c3e169ee7365b62bc425859a':
  Add auto-brightness mode to the list of backed-up settings
 2009-09-27 10:26:39 -07:00
Android (Google) Code Review
8314dfdfec Merge change 27177 into eclair 
* changes:
  Add auto-brightness mode to the list of backed-up settings
 2009-09-27 13:20:44 -04:00
Dmitri Plotnikov
400ce4fcfa am 8e55eacc: Changing contact status to Presence-based 
Merge commit '8e55eaccffeda078d7389b7fb66b0c6df347bf31' into eclair-plus-aosp

* commit '8e55eaccffeda078d7389b7fb66b0c6df347bf31':
  Changing contact status to Presence-based
 2009-09-27 08:34:10 -07:00
Mike Cleron
f887e09037 am db9c3f2e: Merge change 27188 into eclair 
Merge commit 'db9c3f2e9adb2763ff79aaed9b27df31c71dc735' into eclair-plus-aosp

* commit 'db9c3f2e9adb2763ff79aaed9b27df31c71dc735':
  Fix 2146581: Make tabs work for donut apps
 2009-09-27 00:36:15 -07:00
Android (Google) Code Review
8073e420f7 Merge change 27188 into eclair 
* changes:
  Fix 2146581: Make tabs work for donut apps Use different tab assets with the original coloring scheme for apps that are not Eclair-aware.
 2009-09-27 03:31:59 -04:00
Dianne Hackborn
ea23536b2f am 23976407: Maybe fix issue #2145012: Array bounds exception in touch event processing 
Merge commit '2397640740e053af7ef4aa742467f723186d5ad7' into eclair-plus-aosp

* commit '2397640740e053af7ef4aa742467f723186d5ad7':
  Maybe fix issue #2145012: Array bounds exception in touch event processing
 2009-09-26 17:52:29 -07:00
Dianne Hackborn
cd0f4c91fd am 093f5810: Merge change 27238 into eclair 
Merge commit '093f581090d8cf98f5877746d924107f7695dd8b' into eclair-plus-aosp

* commit '093f581090d8cf98f5877746d924107f7695dd8b':
  The touch screen is probably a feature.
 2009-09-26 17:06:41 -07:00
Android (Google) Code Review
7705cb0523 Merge change 27238 into eclair 
* changes:
  The touch screen is probably a feature.
 2009-09-26 20:00:07 -04:00
Evan Millar
c1f563aad7 am 3579c4c6: Merge change 27234 into eclair 
Merge commit '3579c4c6729dd8aa077550531a8337bf0664b23d' into eclair-plus-aosp

* commit '3579c4c6729dd8aa077550531a8337bf0664b23d':
  Fix http://b/issue?id=2106682 (Don't show status if we don't have it).
 2009-09-26 14:54:47 -07:00
Android (Google) Code Review
a6b35d69aa Merge change 27234 into eclair 
* changes:
  Fix http://b/issue?id=2106682 (Don't show status if we don't have it).
 2009-09-26 17:49:12 -04:00
Tadashi G. Takaoka
c83b180167 am f06e9984: Merge change 26993 into eclair 
Merge commit 'f06e9984e833907057065946cf68ff95d6af1ead' into eclair-plus-aosp

* commit 'f06e9984e833907057065946cf68ff95d6af1ead':
  Pass provider authority to SyncActivityTooManyDeletes
 2009-09-26 14:13:08 -07:00
Android (Google) Code Review
c13e31871c Merge change 26993 into eclair 
* changes:
  Pass provider authority to SyncActivityTooManyDeletes
 2009-09-26 17:06:47 -04:00
Evan Millar
05e4a0cf30 am b27a1166: Merge change 27233 into eclair 
Merge commit 'b27a1166d538afaf2be480cc0101645ea7b3964f' into eclair-plus-aosp

* commit 'b27a1166d538afaf2be480cc0101645ea7b3964f':
  Change longClick -> click in ContactHeaderWidget.
 2009-09-26 13:40:11 -07:00
Android (Google) Code Review
081dc7b4fc Merge change 27233 into eclair 
* changes:
  Change longClick -> click in ContactHeaderWidget.
 2009-09-26 16:32:18 -04:00
Dianne Hackborn
2089380b6d am 075a18d6: Turn on haptic feedback by default. 
Merge commit '075a18d607c3aa8386b4d06aea22f4bfacbe447b' into eclair-plus-aosp

* commit '075a18d607c3aa8386b4d06aea22f4bfacbe447b':
  Turn on haptic feedback by default.
 2009-09-26 13:03:05 -07:00
Jesse Wilson
243ff1ae92 am 5648dbb1: Merge change 27159 into eclair 
Merge commit '5648dbb1dabc0231fe953ad45916c067c79986c8' into eclair-plus-aosp

* commit '5648dbb1dabc0231fe953ad45916c067c79986c8':
  DO NOT MERGE: Cleaning up the PipedStreamTest
 2009-09-26 11:21:16 -07:00
Android (Google) Code Review
73ec2db0fd Merge change 27159 into eclair 
* changes:
  DO NOT MERGE: Cleaning up the PipedStreamTest
 2009-09-26 14:12:23 -04:00
Jesse Wilson
1df3b6f7f1 am 2d6c325e: API XML changes to accompany dalvik.system deprecation. 
Merge commit '2d6c325e780143a7725aaa32af11f8a4658f7cd3' into eclair-plus-aosp

* commit '2d6c325e780143a7725aaa32af11f8a4658f7cd3':
  API XML changes to accompany dalvik.system deprecation.
 2009-09-26 10:48:09 -07:00
Jeff Sharkey
4d87028dc5 am 05701839: Remove query parameters for delaying group updates. 
Merge commit '057018399c7ce6d3893ee5fc622f1592f51773b9' into eclair-plus-aosp

* commit '057018399c7ce6d3893ee5fc622f1592f51773b9':
  Remove query parameters for delaying group updates.
 2009-09-26 05:35:15 -07:00
Dima Zavin
a141021b57 am ed5ecdba: egl: temporarily also include eglTerminate->eglInitialize hack for 8k 
Merge commit 'ed5ecdba36648973be3033a045e2ece8bf039e4a' into eclair-plus-aosp

* commit 'ed5ecdba36648973be3033a045e2ece8bf039e4a':
  egl: temporarily also include eglTerminate->eglInitialize hack for 8k
 2009-09-26 02:00:13 -07:00
Dima Zavin
7695a5865e egl: temporarily also include eglTerminate->eglInitialize hack for 8k 
Change-Id: Id5c51e54e733b24e5d5d5de0dcca84ac53afd3a9
Signed-off-by: Dima Zavin <dima@android.com>
 2009-09-26 01:00:49 -07:00
Jason Sams
c3c98c6ea5 am f075b4e7: Fix fountain crash. 
Merge commit 'f075b4e713c4e10e4cea12c856fcf4aaab9c29d4' into eclair-plus-aosp

* commit 'f075b4e713c4e10e4cea12c856fcf4aaab9c29d4':
  Fix fountain crash.
 2009-09-25 20:38:01 -07:00
Jeff Hamilton
49f5d902c3 am a6c402fb: Merge change 27212 into eclair 
Merge commit 'a6c402fb0ec4298413e1d37c53f0524ea3325854' into eclair-plus-aosp

* commit 'a6c402fb0ec4298413e1d37c53f0524ea3325854':
  Fix the build.
 2009-09-25 20:04:25 -07:00
Jack Palevich
44b72e9ad9 am 8b854e0d: Merge change 27211 into eclair 
Merge commit '8b854e0d59512004028f96a93016e614c7df478a' into eclair-plus-aosp

* commit '8b854e0d59512004028f96a93016e614c7df478a':
  Fix build.
 2009-09-25 20:04:20 -07:00
Android (Google) Code Review
659ab93594 Merge change 27212 into eclair 
* changes:
  Fix the build.
 2009-09-25 22:57:07 -04:00
Jeff Hamilton
1e8393fab5 Fix the build. 
Change-Id: Ie4b61f8e8dde864c4d99b8723cd5ff290a373279
 2009-09-25 21:56:25 -05:00
Android (Google) Code Review
cf35b106c8 Merge change 27211 into eclair 
* changes:
  Fix build.
 2009-09-25 22:55:31 -04:00
Jack Palevich
f1006c23c6 Fix build. 2009-09-25 19:55:07 -07:00
Jack Palevich
26b3ecf766 am 056ade1b: Merge change 27203 into eclair 
Merge commit '056ade1ba976eed5f9b3139ee96b9eb3a26f6283' into eclair-plus-aosp

* commit '056ade1ba976eed5f9b3139ee96b9eb3a26f6283':
  Tighten up sample code.
 2009-09-25 19:16:18 -07:00
Jack Palevich
59c2917b62 am 07e0dce4: Merge change 27202 into eclair 
Merge commit '07e0dce441ea056710efd76d7df18b8833de772a' into eclair-plus-aosp

* commit '07e0dce441ea056710efd76d7df18b8833de772a':
  Check for failure to create EGL surfaces and contexts.
 2009-09-25 19:16:13 -07:00
Android (Google) Code Review
9ec779dab3 Merge change 27203 into eclair 
* changes:
  Tighten up sample code.
 2009-09-25 22:08:15 -04:00