ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,622 Commits 2 Branches 0 Tags 54 MiB
05e4a0cf30
Commit Graph

5622 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Android (Google) Code Review
bc032920f4 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
43123766f5 Tighten up sample code. 
- Still fails to work; don't know why.
 2009-09-25 19:07:31 -07:00
Scott Main
7eabca7de5 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
ab7d22652c am 60d8b780: Merge change 27064 into donut 
Merge commit '60d8b78041e7b520e1f42b6419f5ab9b5fc1851b' into eclair

* commit '60d8b78041e7b520e1f42b6419f5ab9b5fc1851b':
  docs only.
 2009-09-25 17:58:05 -07:00
Robert Greenwalt
351a8955f3 am a16ca5ec: Merge change 27141 into eclair 
Merge commit 'a16ca5ec4ba936ed2731a74650b6882d0ffde404' into eclair-plus-aosp

* commit 'a16ca5ec4ba936ed2731a74650b6882d0ffde404':
  Fix ConnectivityManager's handling of apn switch.
 2009-09-25 17:57:27 -07:00
Android (Google) Code Review
85cf0fe87e Merge change 27064 into donut 
* changes:
  docs only. add information on provisional api level and fix some link titles
 2009-09-25 20:51:31 -04:00
Android (Google) Code Review
b4eedd0d5c Merge change 27141 into eclair 
* changes:
  Fix ConnectivityManager's handling of apn switch.
 2009-09-25 20:51:00 -04:00
Dianne Hackborn
c6b5f9900c am 05eeeace: Merge change 27178 into eclair 
Merge commit '05eeeacee6fc69d184cd4cc1146cf5d5ccdb6b45' into eclair-plus-aosp

* commit '05eeeacee6fc69d184cd4cc1146cf5d5ccdb6b45':
  Fix issue #2136448: googleapps crashes while adding 2nd gmail account
 2009-09-25 17:28:04 -07:00
Android (Google) Code Review
1144d9de75 Merge change 27178 into eclair 
* changes:
  Fix issue #2136448: googleapps crashes while adding 2nd gmail account
 2009-09-25 20:19:59 -04:00
Jason Sams
3c0e262d3c am 0c103af3: Merge change 27171 into eclair 
Merge commit '0c103af370f7f0ec59a51f43ec0f6bd51972d3cb' into eclair-plus-aosp

* commit '0c103af370f7f0ec59a51f43ec0f6bd51972d3cb':
  Fix remaining object leaks.  Change FountainView to tear down the rsContext and recreate on rotation to test teardown.
 2009-09-25 16:56:51 -07:00
Android (Google) Code Review
d0ab8e3a37 Merge change 27171 into eclair 
* changes:
  Fix remaining object leaks.  Change FountainView to tear down the rsContext and recreate on rotation to test teardown.
 2009-09-25 19:52:41 -04:00
Yu Shan Emily Lau
3fc95b7379 am 7756cbee: Merge change 27073 into eclair 
Merge commit '7756cbeef475127ed56bfeabecb3c291366a952f' into eclair-plus-aosp

* commit '7756cbeef475127ed56bfeabecb3c291366a952f':
  Removed the device type checking
 2009-09-25 16:47:24 -07:00
Jack Palevich
e9d64c7415 am 2a5eea30: Merge change 27168 into eclair 
Merge commit '2a5eea308fffed23ab96bedcddaf5e4cc91cec9e' into eclair-plus-aosp

* commit '2a5eea308fffed23ab96bedcddaf5e4cc91cec9e':
  Use EGLUtils to simplify choosing a configuration.
 2009-09-25 16:47:19 -07:00
Jason Sams
7e17442679 am aafc7b54: Merge change 27169 into eclair 
Merge commit 'aafc7b547c556da095777a7ed8aac71a68fa9b0a' into eclair-plus-aosp

* commit 'aafc7b547c556da095777a7ed8aac71a68fa9b0a':
  Improved object lifecycle tracking and fix leaks.
 2009-09-25 16:47:09 -07:00
Android (Google) Code Review
9b7ea7e7b4 Merge change 27073 into eclair 
* changes:
  Removed the device type checking
 2009-09-25 19:42:24 -04:00
Android (Google) Code Review
304caada6e Merge change 27168 into eclair 
* changes:
  Use EGLUtils to simplify choosing a configuration.
 2009-09-25 19:41:13 -04:00
Android (Google) Code Review
b7665bca15 Merge change 27169 into eclair 
* changes:
  Improved object lifecycle tracking and fix leaks.
 2009-09-25 19:38:40 -04:00
Neel Parekh
00d5e25ccd am 6ecacd40: Center name when no status. Also shows the status if exists (not actually hooked up yet though). 
Merge commit '6ecacd40dd56d80d6b7b8454d8f4c04124c8d899' into eclair-plus-aosp

* commit '6ecacd40dd56d80d6b7b8454d8f4c04124c8d899':
  Center name when no status.
 2009-09-25 16:33:11 -07:00
Jack Palevich
18e24f9525 Use EGLUtils to simplify choosing a configuration. 
Doesn't actually select anything, possibly due to device driver errors.
 2009-09-25 16:25:19 -07:00
Dianne Hackborn
dc06a1d9c6 am 48c84052: Merge change 27162 into eclair 
Merge commit '48c84052e25c1ac1cdb6c86ac2d231d40a7801af' into eclair-plus-aosp

* commit '48c84052e25c1ac1cdb6c86ac2d231d40a7801af':
  Fix Activity.overridePendingTransition().
 2009-09-25 16:21:02 -07:00
Neel Parekh
71522c46f4 am 35468254: Merge change 26720 into eclair 
Merge commit '3546825421cab5330583633ed854134c35d1c08d' into eclair-plus-aosp

* commit '3546825421cab5330583633ed854134c35d1c08d':
  Allow us to set the contact uri without setting the fast track's uri
 2009-09-25 16:11:46 -07:00
Android (Google) Code Review
6cd277daf3 Merge change 27162 into eclair 
* changes:
  Fix Activity.overridePendingTransition().
 2009-09-25 19:11:43 -04:00
Fred Quintana
6076afd82d am 6ecaff15: add a optional String to the key of notifications to allow users to scope them 
Merge commit '6ecaff15836581336b1e8fad6ac42f3ff4a13544' into eclair-plus-aosp

* commit '6ecaff15836581336b1e8fad6ac42f3ff4a13544':
  add a optional String to the key of notifications to allow users
 2009-09-25 16:11:40 -07:00
Android (Google) Code Review
9d0d0c7f91 Merge change 26720 into eclair 
* changes:
  Allow us to set the contact uri without setting the fast track's uri
 2009-09-25 19:05:10 -04:00
Evan Millar
91bce74fd3 am ed7f0955: Merge change 27150 into eclair 
Merge commit 'ed7f0955b7a4535c963b0de2b89e41febfd1416e' into eclair-plus-aosp

* commit 'ed7f0955b7a4535c963b0de2b89e41febfd1416e':
  Fix FasttrackBadgeWidget pressed state.
 2009-09-25 15:50:40 -07:00
Android (Google) Code Review
fd805277ed Merge change 27150 into eclair 
* changes:
  Fix FasttrackBadgeWidget pressed state.
 2009-09-25 18:44:25 -04:00
Jason Sams
334b3a81c3 am f37b258c: Merge change 27146 into eclair 
Merge commit 'f37b258c88e339b482696183def08f5c9437a0ff' into eclair-plus-aosp

* commit 'f37b258c88e339b482696183def08f5c9437a0ff':
  Reduce debugging spew and add props to selectivly re-enable it.
 2009-09-25 15:35:28 -07:00
Scott Main
8cec2a276f am ba14fff7: am 12242678: docs only. fix broken links 
Merge commit 'ba14fff7fd44c5174cb14b86c82c707dd03463d1' into eclair-plus-aosp

* commit 'ba14fff7fd44c5174cb14b86c82c707dd03463d1':
  docs only.
 2009-09-25 15:35:22 -07:00
Android (Google) Code Review
e25be5c3f5 Merge change 27146 into eclair 
* changes:
  Reduce debugging spew and add props to selectivly re-enable it.
 2009-09-25 18:27:25 -04:00
Scott Main
eae7986ae7 am 12242678: docs only. fix broken links 
Merge commit '122426780008b9920a15798f1a2bb210779b5a9d' into eclair

* commit '122426780008b9920a15798f1a2bb210779b5a9d':
  docs only.
 2009-09-25 15:26:28 -07:00
Jason Sams
a56ca5f5a6 am 2896f7d6: Merge change 27137 into eclair 
Merge commit '2896f7d67aebfc1c4f251155649e82e8490339fc' into eclair-plus-aosp

* commit '2896f7d67aebfc1c4f251155649e82e8490339fc':
  Improve renderscript context teardown.  Track object in the system and then force their cleanup by releasing all user references once destroy context is called.  Java layer will no longer send destroy notifications for objects garbage collected once a context is destroyed.
 2009-09-25 15:05:51 -07:00