ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
21,815 Commits 2 Branches 0 Tags 54 MiB
2341fd66b9
Commit Graph

21815 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
2341fd66b9 am 26d5786f: am 9c37447e: Merge "Fix pointer index when splitting secondary pointers." into gingerbread 
Merge commit '26d5786fb1a43d82b40fa908e1220a018b748c93'

* commit '26d5786fb1a43d82b40fa908e1220a018b748c93':
  Fix pointer index when splitting secondary pointers.
 2010-09-28 12:47:13 -07:00
Adam Powell
2b086f71fa Merge "No action bars for default holo dialog theme" 2010-09-28 11:58:53 -07:00
Xavier Ducrohet
71db673b8b Merge "Improve error reporting in the layoutlib class replacement test." 2010-09-28 10:59:46 -07:00
Hung-ying Tyan
ceac44e104 am 1738252a: am 32346522: Merge "Don\'t enter DISCONNECTING state when the call/connection is not alive" into gingerbread 
Merge commit '1738252a596c71851cabf5835acb3584ad6b3191'

* commit '1738252a596c71851cabf5835acb3584ad6b3191':
  Don't enter DISCONNECTING state when the call/connection is not alive
 2010-09-28 10:56:34 -07:00
Romain Guy
a0d19f9674 Merge "Display the correct expected name when loading the wrong adapter." 2010-09-28 10:35:09 -07:00
Gil Dobjanschi
1855132d97 Merge "Validate Overlay and effect duration and start time." 2010-09-28 10:08:53 -07:00
repo sync . build/envsetup.sh lunch passion-en
a82ade0bad am 8c665807: (-s ours) am 4fc3d2f0: DO NOT MERGE 
Merge commit '8c66580759b3085866e1f9f1ca9af1a60220e574'

* commit '8c66580759b3085866e1f9f1ca9af1a60220e574':
  DO NOT MERGE
 2010-09-28 09:30:16 -07:00
Steve Block
76b0ed516a Merge changes Ic62f60d9,I04a01634 
* changes:
  Provide a useful message in DumpRenderTree2 GUI when the host server is not running
  Prevent DumpRenderTree2 from crashing when the host server is not running
 2010-09-28 07:09:45 -07:00
Mike Lockwood
51f950a884 Merge changes I2491a2ce,Ie1c88bd8 
* changes:
  MtpCursor: Fix long to int truncation bug
  MtpCursor: Remove some unused variables
 2010-09-28 06:17:40 -07:00
Adam Powell
8f8ff6a5c3 Merge "Temporary hack to make context menu text visible on holo dialogs." 2010-09-27 23:17:34 -07:00
Adam Powell
f466136951 Merge "Fix some text styling for Holo.Light" 2010-09-27 22:29:15 -07:00
Hung-ying Tyan
1014f60186 resolved conflicts for merge of 2a36a778 to master 
Change-Id: Ia70adeef06afddd29c827405fb5657bf9f5a29a3
 2010-09-28 12:17:44 +08:00
Gilles Debunne
9a9ec41961 am 4e9243d5: (-s ours) am 8d7057df: Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread 
Merge commit '4e9243d55ce183542c74550e503ea583643599a0'

* commit '4e9243d55ce183542c74550e503ea583643599a0':
  Updated assets in status bar. DO NOT MERGE.
 2010-09-27 21:03:40 -07:00
Nick Kralevich
abba28ff35 am d0cb228b: am 23142acf: Merge "squeeze a few more bits of randomness into /dev/random" into gingerbread 
Merge commit 'd0cb228b9af0b67fa3372ee075287e7409249550'

* commit 'd0cb228b9af0b67fa3372ee075287e7409249550':
  squeeze a few more bits of randomness into /dev/random
 2010-09-27 21:03:30 -07:00
Winson Chung
ceeb3823db am 55ee8f93: am 44e8ff99: Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings. 
Merge commit '55ee8f9329b4e99427dddc692e3d8ff10d9c9eef'

* commit '55ee8f9329b4e99427dddc692e3d8ff10d9c9eef':
  Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
 2010-09-27 21:03:17 -07:00
Eric Fischer
fa8b818204 am 7063eb10: (-s ours) am dc36da51: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread 
Merge commit '7063eb104657d1fa3f5e030b4657a9541ec6b054'

* commit '7063eb104657d1fa3f5e030b4657a9541ec6b054':
  Trim unwanted whitespace from translations.  DO NOT MERGE
 2010-09-27 21:03:02 -07:00
Gilles Debunne
126f463bd5 am 63555e36: (-s ours) am 0ba5b647: Merge "Revert previous status bar assets. DO NOT MERGE." into gingerbread 
Merge commit '63555e36c9dd9b38624ae275ffc3f598a5112057'

* commit '63555e36c9dd9b38624ae275ffc3f598a5112057':
  Revert previous status bar assets. DO NOT MERGE.
 2010-09-27 21:02:41 -07:00
Chris Palmer
cb3459e248 am d4f1436d: (-s ours) am 143e6109: DO NOT MERGE Clarify the explanation of Android\'s security design. 
Merge commit 'd4f1436d6abf60bb299cc57330f7fc37cb161853'

* commit 'd4f1436d6abf60bb299cc57330f7fc37cb161853':
  DO NOT MERGE Clarify the explanation of Android's security design.
 2010-09-27 21:02:20 -07:00
Jeff Brown
1f1889e8af am 9c37447e: Merge "Fix pointer index when splitting secondary pointers." into gingerbread 
Merge commit '9c37447e5c3555e4063777e4ef82e355e57f4c68' into gingerbread-plus-aosp

* commit '9c37447e5c3555e4063777e4ef82e355e57f4c68':
  Fix pointer index when splitting secondary pointers.
 2010-09-27 21:00:44 -07:00
Jeff Brown
ced8172ac1 Merge "Fix pointer index when splitting secondary pointers." into gingerbread 2010-09-27 20:57:02 -07:00
Jeff Brown
ffb16d601b Fix pointer index when splitting secondary pointers. 
Change-Id: Ib01e810ea5b64501b1303000bbef0f0a1db2114e
 2010-09-27 20:54:28 -07:00
Wu-cheng Li
81948205bf resolved conflicts for merge of 191a25e1 to master 
Change-Id: I6f4940e337a992bf84e50bc1d22432593937499c
 2010-09-27 20:50:22 -07:00
Kenny Root
94ccf3aa46 am e7dd4e38: am 04a426f5: Merge "Use buffered I/O during certificate parsing" into gingerbread 
Merge commit 'e7dd4e38c47f2f7760d1ce4f86d6321e17f98d1d'

* commit 'e7dd4e38c47f2f7760d1ce4f86d6321e17f98d1d':
  Use buffered I/O during certificate parsing
 2010-09-27 20:32:56 -07:00
Dianne Hackborn
1c33f0c8e5 resolved conflicts for merge of a8bce7c8 to master 
Change-Id: I34526a3aed6591639e1a1bff8f42e0c5d8e328cc
 2010-09-27 20:25:20 -07:00
Hung-ying Tyan
1f9798de77 am 32346522: Merge "Don\'t enter DISCONNECTING state when the call/connection is not alive" into gingerbread 
Merge commit '3234652242f54e3366e7c74e5a0cf0a7da5871b4' into gingerbread-plus-aosp

* commit '3234652242f54e3366e7c74e5a0cf0a7da5871b4':
  Don't enter DISCONNECTING state when the call/connection is not alive
 2010-09-27 19:26:11 -07:00
Hung-ying Tyan
813ccddc02 Merge "Don't enter DISCONNECTING state when the call/connection is not alive" into gingerbread 2010-09-27 19:23:35 -07:00
Vasu Nori
3395d343e4 Merge "fix this: closing database twice fails with IllegalStateException" 2010-09-27 18:29:18 -07:00
Dharmaray Kundargi
a12769453a Merge "work on review comments and code formating. Removed white spaces" 2010-09-27 18:28:00 -07:00
repo sync . build/envsetup.sh lunch passion-en
0bf2a8bd67 am 4fc3d2f0: DO NOT MERGE 
Merge commit '4fc3d2f0b3237390c37ccc4701bc68e4aa5f9b7a' into gingerbread-plus-aosp

* commit '4fc3d2f0b3237390c37ccc4701bc68e4aa5f9b7a':
  DO NOT MERGE
 2010-09-27 17:51:45 -07:00
Hung-ying Tyan
915db0da45 am 68ef7f3c: Merge "Move SipService out of SystemServer to phone process." into gingerbread 
Merge commit '68ef7f3c3a8deb0e14b0b6325876b23cecc191b3' into gingerbread-plus-aosp

* commit '68ef7f3c3a8deb0e14b0b6325876b23cecc191b3':
  Move SipService out of SystemServer to phone process.
 2010-09-27 16:29:33 -07:00
Hung-ying Tyan
6e0e4c4f11 Merge "Move SipService out of SystemServer to phone process." into gingerbread 2010-09-27 16:25:49 -07:00
Irfan Sheriff
044b14cfee Merge "use hostname when address null ProxyProperties parcelling" 2010-09-27 16:24:23 -07:00
Gilles Debunne
46fc90c680 am 8d7057df: Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread 
Merge commit '8d7057df401af668335c38273bc62872e4dbf538' into gingerbread-plus-aosp

* commit '8d7057df401af668335c38273bc62872e4dbf538':
  Updated assets in status bar. DO NOT MERGE.
 2010-09-27 16:17:28 -07:00
Jeff Brown
16076ad4df Merge "Add support for transferring touch focus." 2010-09-27 16:11:23 -07:00
Jeff Brown
744c559ac7 Add support for transferring touch focus. 
Prerequisite for drag and drop.

Change-Id: Iedbe93ed0f3e1c4083130fe66b4ba06d416afce0
 2010-09-27 16:10:17 -07:00
Gilles Debunne
eec02f9bad Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread 2010-09-27 16:07:47 -07:00
Joe Onorato
c785da2021 Merge "Don't show X for notifications that can't be cleared" 2010-09-27 15:55:23 -07:00
Joe Onorato
7f5a241395 Merge "Hide the "Clear all" button in the notification panel if there are no clearable notifications." 2010-09-27 15:54:55 -07:00
Nick Kralevich
1fcf429f15 am 23142acf: Merge "squeeze a few more bits of randomness into /dev/random" into gingerbread 
Merge commit '23142acffab69738b967812fdbdf7bbda18a44d8' into gingerbread-plus-aosp

* commit '23142acffab69738b967812fdbdf7bbda18a44d8':
  squeeze a few more bits of randomness into /dev/random
 2010-09-27 15:26:51 -07:00
Nick Kralevich
fe5e2b58c3 Merge "squeeze a few more bits of randomness into /dev/random" into gingerbread 2010-09-27 15:23:45 -07:00
Winson Chung
5772eb1d25 am 44e8ff99: Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings. 
Merge commit '44e8ff9924db43ee2470d868ce31b1c039c99b35' into gingerbread-plus-aosp

* commit '44e8ff9924db43ee2470d868ce31b1c039c99b35':
  Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
 2010-09-27 15:08:57 -07:00
Eric Fischer
96d205574b am dc36da51: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread 
Merge commit 'dc36da514832484f61b432291c6f5dca9f2c30bd' into gingerbread-plus-aosp

* commit 'dc36da514832484f61b432291c6f5dca9f2c30bd':
  Trim unwanted whitespace from translations.  DO NOT MERGE
 2010-09-27 15:04:35 -07:00
Eric Fischer
5e9c93e6e4 Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread 2010-09-27 15:01:33 -07:00
Jeff Brown
e457038905 am 9785bf0f: am 14a288da: Merge "Add suuport for splitting touch events across windows." into gingerbread 
Merge commit '9785bf0f2b6b8758aed7ded3b996a2ef0be89919'

* commit '9785bf0f2b6b8758aed7ded3b996a2ef0be89919':
  Add suuport for splitting touch events across windows.
 2010-09-27 14:40:38 -07:00
Joe Onorato
5c4a60fb63 am 761427f8: am 524ae7dd: Merge "We only need at most one tty icon." into gingerbread 
Merge commit '761427f85b7b7478801dcb4e0fb2f1b824cf1268'

* commit '761427f85b7b7478801dcb4e0fb2f1b824cf1268':
  We only need at most one tty icon.
 2010-09-27 14:38:37 -07:00
Gilles Debunne
10082c6cad am 0ba5b647: Merge "Revert previous status bar assets. DO NOT MERGE." into gingerbread 
Merge commit '0ba5b647842ab71f4b1a3080ca113eb646371d91' into gingerbread-plus-aosp

* commit '0ba5b647842ab71f4b1a3080ca113eb646371d91':
  Revert previous status bar assets. DO NOT MERGE.
 2010-09-27 14:32:06 -07:00
Gilles Debunne
4b21b13986 Merge "Revert previous status bar assets. DO NOT MERGE." into gingerbread 2010-09-27 14:26:56 -07:00
Chris Palmer
f842cbb8e8 am 143e6109: DO NOT MERGE Clarify the explanation of Android\'s security design. 
Merge commit '143e61097e3aa2f6fd2951c707f35c35d3be25e3' into gingerbread-plus-aosp

* commit '143e61097e3aa2f6fd2951c707f35c35d3be25e3':
  DO NOT MERGE Clarify the explanation of Android's security design.
 2010-09-27 14:18:15 -07:00
Alex Sakhartchouk
be8f3fb3cf Merge "Error checking for MVP matrix computation. Fixing more padding bugs." 2010-09-27 14:15:39 -07:00
Vasu Nori
7dded15818 Merge "reduce synchronization on SQLiteDatabase wherever possible" 2010-09-27 14:15:08 -07:00