ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity
36,021 Commits 2 Branches 0 Tags 54 MiB
6717a36a94
Commit Graph

36021 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Sandler
ca210f35a9 Merge "ICS updates to notification layouts." 2011-06-17 12:43:21 -07:00
Jeff Sharkey
10c5aba129 Merge "Avoid clobbering UID stats when not yet loaded." 2011-06-17 11:28:31 -07:00
Philip Milne
694b819b74 Merge "Change includeMarginsInAlignment flag to aligmentMode property." 2011-06-17 11:22:36 -07:00
John Reck
054e426e40 Merge "Add textZoom setting" 2011-06-17 10:51:23 -07:00
Jamie Gennis
28bca1a772 Merge "SurfaceTexture: enable a test that now passes." 2011-06-17 10:45:15 -07:00
Jamie Gennis
4661a50121 Merge "SurfaceTexture: enable a test that is now passing." 2011-06-17 10:45:01 -07:00
Irfan Sheriff
a5d569451e Merge "Fix IP address cleanup on network disconnect" 2011-06-17 10:09:36 -07:00
Daniel Sandler
156cd35f95 Merge "Make the Notify Builder test usable on phones." 2011-06-17 05:58:59 -07:00
Wu-cheng Li
77a61dcd3a Merge "Mention device policay manager in Camera.open javadoc." 2011-06-17 00:18:21 -07:00
Irfan Sheriff
5c5ba7eb9a Merge "Fix network state handling" 2011-06-16 20:54:04 -07:00
Chia-chi Yeh
2ed48f4e5d Merge "VPN: make the file descriptor non-blocking by default." 2011-06-16 19:03:57 -07:00
Jim Miller
27be8cf10b Merge "Update GridLayout constructors to properly handle DEBUG=true" 2011-06-16 18:32:44 -07:00
Adam Powell
746d24e918 Merge "Dialog-o-rama!" 2011-06-16 18:31:18 -07:00
Mathias Agopian
a2ceb7bc2a am 3b916233: (-s ours) am 48294b0d: am e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE) 
* commit '3b916233cbbbcc5bbc703213af5e647910956cbc':
  Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
 2011-06-16 18:18:47 -07:00
Mathias Agopian
e2fc756f7d am 48294b0d: am e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE) 
* commit '48294b0d9388cff632f0e6ae5220305d342c76fb':
  Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
 2011-06-16 18:15:19 -07:00
Mathias Agopian
f588d1dc95 am e7d3ee9d: Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE) 
* commit 'e7d3ee9d81de13e992c7d063ca472d480956b0c6':
  Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)
 2011-06-16 18:09:56 -07:00
Mathias Agopian
debc234c24 Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE) 
Also revert all dependent changes:
This reverts commit 8e18668d14adf601cbe5973030c310ec23d88461.
This reverts commit 69b4587bfbb3e98f793959d9123340360fa233a2.
This reverts commit a9c9a4baf24700e8817d47d8ea8da1742caea0b5.
This reverts commit 2c0042b666a969091c931614f2fc0dce2f1cfac8.
This reverts commit f6c8206735e7e078461e5f2aef6e1a1446fdd075.
This reverts commit 24855c09173a6caaec7dcedd0c2d7ce15121d39b.

Change-Id: I33e699640f3f59e42fa03c99a9a1b7af0d27d4d8
 2011-06-16 17:22:28 -07:00
John Wang
01c92ac2a4 am e21217af: (-s ours) am c6b32054: am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2 
* commit 'e21217af6480c45212517a68b2b6e583c4dc27c9':
  Revert "Do not merge. Return null id for Non-phone device."
 2011-06-16 17:20:06 -07:00
John Wang
cfa204826c am c6b32054: am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2 
* commit 'c6b32054c67901b0627ad99e4bd8b15c5cc2fb90':
  Revert "Do not merge. Return null id for Non-phone device."
 2011-06-16 17:14:28 -07:00
Maarten Hooft
472ad61aef am 769bf5d5: am 42781a11: am d76baeb4: Merge "Import revised Croatian translations." into gingerbread 
* commit '769bf5d59ef1b6a9bce9d64d9761def735d6af65':
  Import revised Croatian translations.
 2011-06-16 17:05:19 -07:00
John Wang
0fcbbddfcf am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2 
* commit 'c826f92e6f90f4157afd4ed69c6907ff768a0d6b':
  Revert "Do not merge. Return null id for Non-phone device."
 2011-06-16 16:50:05 -07:00
John Wang
3c44627702 Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2 2011-06-16 16:47:18 -07:00
Dianne Hackborn
2909e5e671 Merge "resolved conflicts for merge of 872a1e79 to master" 2011-06-16 16:38:07 -07:00
Fabrice Di Meglio
3ebb0c39a6 Merge "Update BiDiTest app for testing View padding" 2011-06-16 16:20:51 -07:00
Svetoslav Ganov
78ed75f25a Merge "Accessiiblity in right state upon connection of a test agent." 2011-06-16 16:15:20 -07:00
Romain Guy
ccc9d0959c Merge "Prevent TweetDeck from crashing." 2011-06-16 16:14:06 -07:00
Dianne Hackborn
e4ab0a6661 resolved conflicts for merge of 872a1e79 to master 
Change-Id: I50253b22f181729d4e748970acf1a3ad868ccd74
 2011-06-16 16:01:27 -07:00
Maarten Hooft
7ded3a1a73 am 42781a11: am d76baeb4: Merge "Import revised Croatian translations." into gingerbread 
* commit '42781a11ce9e346a24fbb6214f8f214845464213':
  Import revised Croatian translations.
 2011-06-16 15:55:14 -07:00
Maarten Hooft
dc1a5d75a5 am d76baeb4: Merge "Import revised Croatian translations." into gingerbread 
* commit 'd76baeb4d836c33cc68cbb0c2e237c066f368529':
  Import revised Croatian translations.
 2011-06-16 15:48:55 -07:00
RoboErik
4bf6ceb063 Merge "Adds more docs to classes in CalendarContract" 2011-06-16 15:44:08 -07:00
Maarten Hooft
fad4d64a42 Merge "Import revised Croatian translations." into gingerbread 2011-06-16 15:41:20 -07:00
Dianne Hackborn
4b466a84a3 am 9a73c4d3: am 2f04883f: SDK only: integrate new sample code, deprecating along the way. 
* commit '9a73c4d3a9c7ce02f80b078ca9ba5106234ecd9c':
  SDK only: integrate new sample code, deprecating along the way.
 2011-06-16 15:25:22 -07:00
Dianne Hackborn
2f5e3d3871 am 2f04883f: SDK only: integrate new sample code, deprecating along the way. 
* commit '2f04883ff880966d63d1aa4a1c7b05e497cfcc58':
  SDK only: integrate new sample code, deprecating along the way.
 2011-06-16 15:22:10 -07:00
Alex Sakhartchouk
48b210b5f9 Merge "Adding ability to read back fbo data to renderscript" 2011-06-16 15:15:14 -07:00
Dianne Hackborn
a0a9796e68 am 810dc598: am f1c5dbbd: am abd4dffc: Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into honeycomb-mr2 
* commit '810dc5980c504a89974c07fcbd28a2b5dffb47de':
  New orientation handling.  Only impacts SDK (aapt dump badging).
 2011-06-16 14:57:59 -07:00
Dianne Hackborn
f743c85612 am f1c5dbbd: am abd4dffc: Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into honeycomb-mr2 
* commit 'f1c5dbbd457bb14d3673508aaba497cdc328a1ef':
  New orientation handling.  Only impacts SDK (aapt dump badging).
 2011-06-16 14:55:01 -07:00
Robert Greenwalt
551ce48577 am 9bf1a0c3: (-s ours) am 62385d5e: am 6b93f976: Merge "DO NOT MERGE" into honeycomb-mr2 
* commit '9bf1a0c3c7e3c26df170519867c5daeee959791e':
  DO NOT MERGE
 2011-06-16 14:54:33 -07:00
Robert Greenwalt
ede5a0efac am 62385d5e: am 6b93f976: Merge "DO NOT MERGE" into honeycomb-mr2 
* commit '62385d5e3183d35b22618fb91bb2dfa0de7e5fd4':
  DO NOT MERGE
 2011-06-16 14:50:22 -07:00
Dianne Hackborn
08f1885b8e am abd4dffc: Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into honeycomb-mr2 
* commit 'abd4dffc86202d48e50bd21807574fa861854dca':
  New orientation handling.  Only impacts SDK (aapt dump badging).
 2011-06-16 14:49:08 -07:00
Dianne Hackborn
9240137679 Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into honeycomb-mr2 2011-06-16 14:47:53 -07:00
Robert Greenwalt
cda357ea8e am 6b93f976: Merge "DO NOT MERGE" into honeycomb-mr2 
* commit '6b93f976c0cec32be39b3a17ea8195c4ac6b8052':
  DO NOT MERGE
 2011-06-16 14:44:57 -07:00
Fabrice Di Meglio
162b99068b Merge "Update getLayoutDirectionFromLocale() for using ICU" 2011-06-16 14:41:50 -07:00
Robert Greenwalt
865fc6c36c Merge "DO NOT MERGE" into honeycomb-mr2 2011-06-16 14:40:25 -07:00
Chet Haase
cb401b89a5 Merge "Fix crash in ViewPropertyAnimator for unparented view." 2011-06-16 14:06:36 -07:00
Xavier Ducrohet
4ebcb9c7c0 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2011-06-16 14:04:57 -07:00
Xavier Ducrohet
0ec630ff0e am 0be8522b: am d1abd94f: am 04ce8111: Bring in more layout lib changes from hc-mr1. 
* commit '0be8522b430aca8d90023d7c7e5ef510aa48adc7':
  Bring in more layout lib changes from hc-mr1.
 2011-06-16 14:04:18 -07:00
Xavier Ducrohet
359922943d am d1abd94f: am 04ce8111: Bring in more layout lib changes from hc-mr1. 
* commit 'd1abd94f57c0162186c57aea98790e8fa281e0a2':
  Bring in more layout lib changes from hc-mr1.
 2011-06-16 13:55:30 -07:00
RoboErik
cbeb66b801 Merge "Add DroidDocs to Events class" 2011-06-16 13:51:16 -07:00
Xavier Ducrohet
ad322e2091 am 04ce8111: Bring in more layout lib changes from hc-mr1. 
* commit '04ce81113107d2bfa0b8248b13145b4cf24cb943':
  Bring in more layout lib changes from hc-mr1.
 2011-06-16 13:39:31 -07:00
Jeff Sharkey
593f01ddf5 Merge "DownloadManager flags for network policy." 2011-06-16 13:39:02 -07:00