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

9517 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Nelissen
0ddbc35dc4 Only scan windows media files when those codecs are enabled. 2009-09-27 11:25:49 -07:00
Mike Cleron
6a1f439903 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
954e98e023 Merge change 27267 into eclair 
* changes:
  Add official assets for tabs in compatibility mode
 2009-09-27 14:05:05 -04:00
Mike Cleron
68d9254d59 Add official assets for tabs in compatibility mode 2009-09-27 11:00:14 -07:00
Christopher Tate
2d5168f650 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
141e4f1d69 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
2a2e6ba829 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
Dmitri Plotnikov
8e55eaccff Changing contact status to Presence-based 
Change-Id: I35589e87f1e1743413d3f10509e9eccc333aa2fb
 2009-09-27 08:23:58 -07:00
Mike Cleron
5cf07feb3d 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
db9c3f2e9a 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
25ff4e8c81 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
2397640740 Maybe fix issue #2145012: Array bounds exception in touch event processing 
Change-Id: I223d9ae29f22f08cb8426ccd8bbadeedd5db3fc3
 2009-09-26 17:34:50 -07:00
Dianne Hackborn
bc21ba2410 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
093f581090 Merge change 27238 into eclair 
* changes:
  The touch screen is probably a feature.
 2009-09-26 20:00:07 -04:00
Dianne Hackborn
039c68e756 The touch screen is probably a feature. 
Also extend the feature APIs a bit.

Change-Id: I99e932d7f4e61edb0e20f75c55e9831e4b59a14d
 2009-09-26 16:39:23 -07:00
Evan Millar
c321ab992d 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
3579c4c672 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
Evan Millar
695800047c Fix http://b/issue?id=2106682 (Don't show status if we don't have it). 
Change-Id: I1636914ef47fc5319f2593d3e7aea33e523be3c7
 2009-09-26 14:47:38 -07:00
Tadashi G. Takaoka
0198a9ce3a 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
f06e9984e8 Merge change 26993 into eclair 
* changes:
  Pass provider authority to SyncActivityTooManyDeletes
 2009-09-26 17:06:47 -04:00
Evan Millar
8290ab7533 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
b27a1166d5 Merge change 27233 into eclair 
* changes:
  Change longClick -> click in ContactHeaderWidget.
 2009-09-26 16:32:18 -04:00
Evan Millar
bf07e03291 Change longClick -> click in ContactHeaderWidget. 
Also don't enable it by default, but add an api to explicitly request
it.

Change-Id: I75fa4bfddba7a1800dec24e6a068eca614370a26
 2009-09-26 13:30:01 -07:00
Dianne Hackborn
9f70430684 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
Dianne Hackborn
075a18d607 Turn on haptic feedback by default. 
Change-Id: I85efeca1a0aca91992e28236077c668e0d14cbbb
 2009-09-26 12:43:19 -07:00
Jesse Wilson
c27d57182a 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
5648dbb1da Merge change 27159 into eclair 
* changes:
  DO NOT MERGE: Cleaning up the PipedStreamTest
 2009-09-26 14:12:23 -04:00
Jesse Wilson
b9b6b17d73 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
Jesse Wilson
e78fcbac04 DO NOT MERGE: Cleaning up the PipedStreamTest 2009-09-26 09:28:17 -07:00
Jesse Wilson
2d6c325e78 API XML changes to accompany dalvik.system deprecation. 
See https://android-git.corp.google.com/g/26570
 2009-09-26 09:09:10 -07:00
Jeff Sharkey
67e40117f7 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
Jeff Sharkey
057018399c Remove query parameters for delaying group updates. 
Callers should instead use applyBatch(), which now delays
any visible updates until the transation finishes.  This
partially fixes http://b/2075275
 2009-09-26 02:14:43 -07:00
Dima Zavin
434462f0c9 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
ed5ecdba36 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
abd8c8ac93 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
Jason Sams
f075b4e713 Fix fountain crash. 2009-09-25 20:24:54 -07:00
Jeff Hamilton
3b5fa27552 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
ee61acdc53 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
a6c402fb0e Merge change 27212 into eclair 
* changes:
  Fix the build.
 2009-09-25 22:57:07 -04:00
Jeff Hamilton
a8370e3fdc Fix the build. 
Change-Id: Ie4b61f8e8dde864c4d99b8723cd5ff290a373279
 2009-09-25 21:56:25 -05:00
Android (Google) Code Review
8b854e0d59 Merge change 27211 into eclair 
* changes:
  Fix build.
 2009-09-25 22:55:31 -04:00
Jack Palevich
d7de5ffb30 Fix build. 2009-09-25 19:55:07 -07:00
Jack Palevich
b44d9e150a 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
a46c138ab3 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
056ade1ba9 Merge change 27203 into eclair 
* changes:
  Tighten up sample code.
 2009-09-25 22:08:15 -04:00
Android (Google) Code Review
07e0dce441 Merge change 27202 into eclair 
* changes:
  Check for failure to create EGL surfaces and contexts.
 2009-09-25 22:07:59 -04:00
Jack Palevich
aa3b0bee51 Tighten up sample code. 
- Still fails to work; don't know why.
 2009-09-25 19:07:31 -07:00
Jack Palevich
2e26fc08aa Check for failure to create EGL surfaces and contexts. 2009-09-25 19:06:30 -07:00
Scott Main
dd9649931f am f80e7d9c: am 60d8b780: Merge change 27064 into donut 
Merge commit 'f80e7d9cca1730506599ded8e32064e86b51344f' into eclair-plus-aosp

* commit 'f80e7d9cca1730506599ded8e32064e86b51344f':
  docs only.
 2009-09-25 18:03:11 -07:00
Scott Main
f80e7d9cca am 60d8b780: Merge change 27064 into donut 
Merge commit '60d8b78041e7b520e1f42b6419f5ab9b5fc1851b' into eclair

* commit '60d8b78041e7b520e1f42b6419f5ab9b5fc1851b':
  docs only.
 2009-09-25 17:58:05 -07:00