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

13840 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Palevich
b167e42c71 am cdb9839a: am 5d961085: Add a test of EGL pausing and resuming. 
Merge commit 'cdb9839a569819f233c6d0d9658ffa1fab938794' into kraken

* commit 'cdb9839a569819f233c6d0d9658ffa1fab938794':
  Add a test of EGL pausing and resuming.
 2010-03-29 12:24:48 -07:00
Jack Palevich
83d6f3a91b am 5d961085: Add a test of EGL pausing and resuming. 
Merge commit '5d961085c33d17e43330ed2d3ada03ffcfa04817' into froyo-plus-aosp

* commit '5d961085c33d17e43330ed2d3ada03ffcfa04817':
  Add a test of EGL pausing and resuming.
 2010-03-29 12:22:08 -07:00
Jack Palevich
4b1409812a Add a test of EGL pausing and resuming. 2010-03-29 12:16:55 -07:00
Irfan Sheriff
9d79ea49fb am 92380919: am b99fe5e6: cherry-pick 288b4ac94571e6f77036831708e7bb7c31874688 into froyo 
Merge commit '92380919cc54fb6f0b56d1c69ebbb66d4d78bfaa' into kraken

* commit '92380919cc54fb6f0b56d1c69ebbb66d4d78bfaa':
  cherry-pick 288b4ac94571e6f77036831708e7bb7c31874688 into froyo
 2010-03-29 12:12:48 -07:00
Irfan Sheriff
871a165bd5 am b99fe5e6: cherry-pick 288b4ac94571e6f77036831708e7bb7c31874688 into froyo 
Merge commit 'b99fe5e622aa5419d80c02e3fab614372f44bc2a' into froyo-plus-aosp

* commit 'b99fe5e622aa5419d80c02e3fab614372f44bc2a':
  cherry-pick 288b4ac94571e6f77036831708e7bb7c31874688 into froyo
 2010-03-29 12:07:37 -07:00
Romain Guy
0a1c1e2d9c am 1889f40a: am ab924c90: Merge "Make EditTextPreference scrollable. Bug #2549257" into froyo 
Merge commit '1889f40aa17bd658df1b7181d091a6dff631ec95' into kraken

* commit '1889f40aa17bd658df1b7181d091a6dff631ec95':
  Make EditTextPreference scrollable.
 2010-03-29 11:32:53 -07:00
Romain Guy
f145871a82 am ab924c90: Merge "Make EditTextPreference scrollable. Bug #2549257" into froyo 
Merge commit 'ab924c909a516eb71fef7c238a20c7755f8170ed' into froyo-plus-aosp

* commit 'ab924c909a516eb71fef7c238a20c7755f8170ed':
  Make EditTextPreference scrollable.
 2010-03-29 11:28:07 -07:00
Romain Guy
7416faf474 Merge "Make EditTextPreference scrollable. Bug #2549257" into froyo 2010-03-29 11:24:31 -07:00
The Android Open Source Project
a6523328b8 am 5849606d: merge from open-source master 
Merge commit '5849606df71fb3d5ce88b966cff8382deccd56b6' into kraken

* commit '5849606df71fb3d5ce88b966cff8382deccd56b6':
  Fix typos in comment.
  CursorToBulkCursorAdapter.close must call mCursor.close instead of mCursor.deactivate. This prevent us to call Cursor.close on cross process ContentProvider and may cause a database leak problem.
 2010-03-29 11:10:32 -07:00
The Android Open Source Project
902bb36798 merge from open-source master 
Change-Id: I6a7542e696e69bc8788f3b3b77fcec50512ba81c
 2010-03-29 11:04:30 -07:00
The Android Open Source Project
dfb969e693 am c89704a7: merge from open-source master 
Merge commit 'c89704a77f9c51ebd8c1cc6863e15ff402a56c86' into kraken

* commit 'c89704a77f9c51ebd8c1cc6863e15ff402a56c86':
  Fix Memory Leak When Switching Input Methods
 2010-03-29 11:03:33 -07:00
The Android Open Source Project
512f431601 merge from open-source master 
Change-Id: I6a8109d11dabc579501c598ab2927cf802797130
 2010-03-29 10:57:04 -07:00
Daniel Lehmann
00bc318438 am 3e9032e6: Merge "Increase name-label height so that "g" isn\'t cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts Bug:2542703 Bug:2549485" into froyo 
Merge commit '3e9032e646c898a725c256c90031494cc349eea0' into kraken

* commit '3e9032e646c898a725c256c90031494cc349eea0':
  Increase name-label height so that "g" isn't cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts
 2010-03-29 10:37:41 -07:00
Daniel Lehmann
f4edb1a5e7 Merge "Increase name-label height so that "g" isn't cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts Bug:2542703 Bug:2549485" into froyo 2010-03-29 10:30:54 -07:00
Jean-Michel Trivi
8fcda8069e am 0737d77a: Merge "Implement audio focus support in the notification manager." into froyo 
Merge commit '0737d77ac3964e4db8218ca61a1eaaae31a74f1c' into kraken

* commit '0737d77ac3964e4db8218ca61a1eaaae31a74f1c':
  Implement audio focus support in the notification manager.
 2010-03-29 10:14:28 -07:00
Jean-Michel Trivi
472cc8e787 Merge "Implement audio focus support in the notification manager." into froyo 2010-03-29 10:05:28 -07:00
Grace Kloba
b1a0cfb451 am 51b97011: cherry-pick 4a4f9886a789ece80f127397c1c7ad7f543b78fa into froyo 
Merge commit '51b97011b73c10b832ea4ad10637f761802e125d' into kraken

* commit '51b97011b73c10b832ea4ad10637f761802e125d':
  cherry-pick 4a4f9886a789ece80f127397c1c7ad7f543b78fa into froyo
 2010-03-29 09:44:05 -07:00
Leon Clarke
cfa4b21ffb am 7c3006f5: http://b/issue?id=2496591 When receiving a message to delete the root layer, delay it until the next new picture message, so that the layers only disappear when we start displaying the new page, and not the moment the DOM on the old page is destroyed. 
Merge commit '7c3006f53ac02adeac7396726cdc0bf5d6d01926' into kraken

* commit '7c3006f53ac02adeac7396726cdc0bf5d6d01926':
  http://b/issue?id=2496591
 2010-03-29 09:10:58 -07:00
Wu-cheng Li
5978ba527a am 0ca25191: Add some comments for zoom methods. 
Merge commit '0ca25191c663ef229f1f475b17899f2017ed6980' into kraken

* commit '0ca25191c663ef229f1f475b17899f2017ed6980':
  Add some comments for zoom methods.
 2010-03-29 02:08:09 -07:00
Jack Palevich
1903a137ec am 4a65900c: Turn off logging. 
Merge commit '4a65900cd69b79e6e47d275575eaeb5bb2487f9f' into kraken

* commit '4a65900cd69b79e6e47d275575eaeb5bb2487f9f':
  Turn off logging.
 2010-03-27 15:12:31 -07:00
Dirk Dougherty
2fffa15dc2 am 7205b0fc: Merge "cherry-pick 7d39f981badf7ec75138d6ef97d37c57a63ab5f0 to froyo." into froyo 
Merge commit '7205b0fcb43e9309e2516420d235a1df0b3cd04a' into kraken

* commit '7205b0fcb43e9309e2516420d235a1df0b3cd04a':
  cherry-pick 7d39f981badf7ec75138d6ef97d37c57a63ab5f0 to froyo.
 2010-03-27 13:08:53 -07:00
Dianne Hackborn
bbc6df6f41 am 4c8a63ca: Merge "Fix issue #2538228: Intents targeting browsers constantly nagging" into froyo 
Merge commit '4c8a63ca4d4ac18f593fd9c235f18ba1f691eef7' into kraken

* commit '4c8a63ca4d4ac18f593fd9c235f18ba1f691eef7':
  Fix issue #2538228: Intents targeting browsers constantly nagging
 2010-03-27 13:08:50 -07:00
Dirk Dougherty
5c89351936 am 5c2a502b: cherry-pick 72aadeb013548cfdc317b5f6fec9dab9551911b8 to froyo. 
Merge commit '5c2a502bffc05d54c8de3456fee5aec5b99ff3e9' into kraken

* commit '5c2a502bffc05d54c8de3456fee5aec5b99ff3e9':
  cherry-pick 72aadeb013548cfdc317b5f6fec9dab9551911b8 to froyo.
 2010-03-27 13:08:48 -07:00
Dirk Dougherty
df8f3f2967 am 1f196f29: Merge "cherry-pick af4786bcb5945f72e8639d74611cd5f9b0236710 to froyo" into froyo 
Merge commit '1f196f29127f9a05d0bd0553d2f3db2ad983df14' into kraken

* commit '1f196f29127f9a05d0bd0553d2f3db2ad983df14':
  cherry-pick af4786bcb5945f72e8639d74611cd5f9b0236710 to froyo
 2010-03-27 13:08:44 -07:00
Dirk Dougherty
b77145f07b Merge "cherry-pick 7d39f981badf7ec75138d6ef97d37c57a63ab5f0 to froyo." into froyo 2010-03-26 18:25:05 -07:00
Dianne Hackborn
aabe5c8201 Merge "Fix issue #2538228: Intents targeting browsers constantly nagging" into froyo 2010-03-26 18:06:52 -07:00
Dirk Dougherty
b064ca2ed8 Merge "cherry-pick af4786bcb5945f72e8639d74611cd5f9b0236710 to froyo" into froyo 2010-03-26 17:50:26 -07:00
Romain Guy
1f4533d967 am 213b9805: Merge "Don\'t assume there\'s a selected position in touch mode. Bug #2520743" into froyo 
Merge commit '213b9805e31ae9de26c740c04e04af2090759e52' into kraken

* commit '213b9805e31ae9de26c740c04e04af2090759e52':
  Don't assume there's a selected position in touch mode.
 2010-03-26 17:37:08 -07:00
Romain Guy
23d74e222d Merge "Don't assume there's a selected position in touch mode. Bug #2520743" into froyo 2010-03-26 17:30:40 -07:00
Dirk Dougherty
a341d89195 am a947fce3: cherry-pick fda3521ea37b53c1dc633c39845e4e8f25c3234f into froyo 
Merge commit 'a947fce312fb0670ed4e5a486cf9dbd226baa948' into kraken

* commit 'a947fce312fb0670ed4e5a486cf9dbd226baa948':
  cherry-pick fda3521ea37b53c1dc633c39845e4e8f25c3234f into froyo
 2010-03-26 17:02:28 -07:00
Dirk Dougherty
9e76c183c3 am 7986a167: Merge "Cherry-pick 97432e866eedd2a179242fa7017e03b6febe4887 to froyo." into froyo 
Merge commit '7986a167d0d8078f33d3ab580252e2f0849e1fad' into kraken

* commit '7986a167d0d8078f33d3ab580252e2f0849e1fad':
  Cherry-pick 97432e866eedd2a179242fa7017e03b6febe4887 to froyo.
 2010-03-26 17:02:25 -07:00
Jean-Michel Trivi
723ed30bff am c7d2e169: Merge "Cherry-picking this fix into Froyo." into froyo 
Merge commit 'c7d2e169c04de37717c2320184f87caed6be7769' into kraken

* commit 'c7d2e169c04de37717c2320184f87caed6be7769':
  Cherry-picking this fix into Froyo.
 2010-03-26 16:27:47 -07:00
Dirk Dougherty
31cfa6050b Merge "Cherry-pick 97432e866eedd2a179242fa7017e03b6febe4887 to froyo." into froyo 2010-03-26 16:27:07 -07:00
Jean-Michel Trivi
e6be51a9e4 Merge "Cherry-picking this fix into Froyo." into froyo 2010-03-26 16:17:38 -07:00
Grace Kloba
8abb099df5 am 307a2b59: Merge "Remove long_press when WebView lost window focus. Reset touch mode too." into froyo 
Merge commit '307a2b59ba9666c071f5c5b03f58700e7c28ea35' into kraken

* commit '307a2b59ba9666c071f5c5b03f58700e7c28ea35':
  Remove long_press when WebView lost window focus.
 2010-03-26 15:40:18 -07:00
Grace Kloba
7d840798d0 Merge "Remove long_press when WebView lost window focus. Reset touch mode too." into froyo 2010-03-26 15:30:26 -07:00
Christopher Tate
76d2da1356 am 9c3cee98: API CHANGE: Backup/restore API changes requested by the API Council 
Merge commit '9c3cee9824026764275e4d84ba9b5d9fdc5da690' into kraken

* commit '9c3cee9824026764275e4d84ba9b5d9fdc5da690':
  API CHANGE: Backup/restore API changes requested by the API Council
 2010-03-26 14:48:09 -07:00
Brett Chabot
6174678c5d am a3de7455: Move PackageManagerTests and AsecTests. 
Merge commit 'a3de74555120cc4dc205a3f93ef44c843b8d64a8' into kraken

* commit 'a3de74555120cc4dc205a3f93ef44c843b8d64a8':
  Move PackageManagerTests and AsecTests.
 2010-03-26 14:31:39 -07:00
Grace Kloba
4834776fdf am 092cfaaa: Merge "cherry-picked bf4650ca39c9153e38c76280ceb5e9af48b67751 to froyo" into froyo 
Merge commit '092cfaaa22795b7e63f2e55ff9102a569ec17efe' into kraken

* commit '092cfaaa22795b7e63f2e55ff9102a569ec17efe':
  cherry-picked bf4650ca39c9153e38c76280ceb5e9af48b67751 to froyo
 2010-03-26 14:31:35 -07:00
Dianne Hackborn
369ab3c336 am d49258fe: Fix issue #2544466: Car Home brightness icon comes and goes while phone is in car dock in FRE83 
Merge commit 'd49258fed489bcd72a2b2a6ce3a3c38d4b2531e6' into kraken

* commit 'd49258fed489bcd72a2b2a6ce3a3c38d4b2531e6':
  Fix issue #2544466: Car Home brightness icon comes and goes while phone is in car dock in FRE83
 2010-03-26 14:31:32 -07:00
Jean-Baptiste Queru
fba7532531 am fc6d1ba9: Merge "Hide download manager." into froyo 
Merge commit 'fc6d1ba930111ef7a51d91908f489ca9469fc572' into kraken

* commit 'fc6d1ba930111ef7a51d91908f489ca9469fc572':
  Hide download manager.
 2010-03-26 14:31:28 -07:00
Joe Onorato
e5d6809d45 am 89837b25: Merge "Fix StatusBarService deadlock for real this time." into froyo 
Merge commit '89837b25c85929b29288fd42727c44093548fced' into kraken

* commit '89837b25c85929b29288fd42727c44093548fced':
  Fix StatusBarService deadlock for real this time.
 2010-03-26 14:31:23 -07:00
Daniel Sandler
1c1c8486e1 am 4ea1eea5: (-s ours) Merge "Redesigned keyguard layout in the no-SIM case. DO NOT MERGE" into froyo 
Merge commit '4ea1eea55bedcf83e643f7847f5f0a3ccce35187' into kraken

* commit '4ea1eea55bedcf83e643f7847f5f0a3ccce35187':
  Redesigned keyguard layout in the no-SIM case. DO NOT MERGE
 2010-03-26 14:31:17 -07:00
Grace Kloba
afa2eac17a Merge "cherry-picked bf4650ca39c9153e38c76280ceb5e9af48b67751 to froyo" into froyo 2010-03-26 13:55:34 -07:00
Jean-Baptiste Queru
881d7baebe Merge "Hide download manager." into froyo 2010-03-26 12:25:11 -07:00
Joe Onorato
6c0bef2d9b Merge "Fix StatusBarService deadlock for real this time." into froyo 2010-03-26 12:14:49 -07:00
Daniel Sandler
949270ac56 Merge "Redesigned keyguard layout in the no-SIM case. DO NOT MERGE" into froyo 2010-03-26 11:41:34 -07:00
Brad Fitzpatrick
e9a8c1c0d5 Merge "Clarify some Binder docs regarding things that are thread-local." 2010-03-25 21:02:46 -07:00
Mathias Agopian
3791f20082 Merge "fix [2236865] STOPSHIP: bump soft gl and egl minor version number" 2010-03-25 20:22:58 -07:00
Mathias Agopian
988fce5ee5 fix [2236865] STOPSHIP: bump soft gl and egl minor version number 
this is to allow developpers to deal with potiential differences
between the softgl versions.

Change-Id: I7ec2451d6af1be29818d66215b22977405d403e8
 2010-03-25 20:21:12 -07:00