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

32291 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve Block
42bf092c47 Update run_layout_tests.py to give a useful error if DumpRenderTree2 is not found on the device 
Bug: 3006981
Change-Id: Ie789eb726bc051305371d4958c16ceca980ea1d1
 2010-09-28 13:12:36 +01:00
Steve Block
5c23ebadd4 Update the storage locations used by the Chromium HTTP stack 
This updates the strorage locations to better match those used by the
Android HTTP stack.

The corresponding external/webkit change is
https://android-git.corp.google.com/g/70643

Bug: 3039536
Change-Id: Ia7ea68d1472e96788a7fbaa6e8f7aa1ee51b3fb0
 2010-09-28 12:32:05 +01:00
Adam Powell
1d9fc8c504 Merge "Temporary hack to make context menu text visible on holo dialogs." 2010-09-27 23:17:34 -07:00
Adam Powell
e4679f1ed2 Temporary hack to make context menu text visible on holo dialogs. 
Real fix for this to come. MenuBuilder needs to not hardcode themes
and dialogs shouldn't either.

Change-Id: I393969acd1ef6956d7299cb2eff46708ce812d1d
 2010-09-27 23:12:39 -07:00
Adam Powell
81eeecc305 Merge "Fix some text styling for Holo.Light" 2010-09-27 22:29:15 -07:00
Adam Powell
385fe872ab Fix some text styling for Holo.Light 
Change-Id: Ia082c12b2b0cef044170ba92e9f837bd38516c8e
 2010-09-27 22:26:03 -07:00
Hung-ying Tyan
400f12b4dd Fix build. 
Change-Id: Iae02fabe42013705592f75748388daf8fa5ed54e
 2010-09-28 13:01:49 +08:00
Hung-ying Tyan
a57afb6a6c resolved conflicts for merge of 2a36a778 to master 
Change-Id: Ia70adeef06afddd29c827405fb5657bf9f5a29a3
 2010-09-28 12:17:44 +08:00
Gilles Debunne
747eb00eef 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
b740491871 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
4d5a8b5587 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
9ad750c502 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
2e86b2df05 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
27be57a231 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
Wu-cheng Li
de8652cbc1 resolved conflicts for merge of 191a25e1 to master 
Change-Id: I6f4940e337a992bf84e50bc1d22432593937499c
 2010-09-27 20:50:22 -07:00
Kenny Root
cc8f44bc81 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
64bbbb471e resolved conflicts for merge of a8bce7c8 to master 
Change-Id: I34526a3aed6591639e1a1bff8f42e0c5d8e328cc
 2010-09-27 20:25:20 -07:00
Vasu Nori
9b8a51e9d3 Merge "fix this: closing database twice fails with IllegalStateException" 2010-09-27 18:29:18 -07:00
Dharmaray Kundargi
eb1817844f Merge "work on review comments and code formating. Removed white spaces" 2010-09-27 18:28:00 -07:00
Vasu Nori
587423afb5 fix this: closing database twice fails with IllegalStateException 
Change-Id: Idda35e49d539845099b377872f9a6f0e0caa4626
 2010-09-27 18:26:25 -07:00
Dianne Hackborn
cca1f0e347 Allow all apps to call ContentResolver.getType(). 
I can't find the bug number for this, but it is needed for some things
we are doing where the app building an intent may not have access to the
URI in the data field.  This is for HC, but doing in GB to avoid introducing
integration issues.

Change-Id: I0cac971854198b18775d2a73deb80f23431bfbe2
 2010-09-27 18:05:44 -07:00
Dharmaray Kundargi
c73305cfd7 work on review comments and code formating. 
Removed white spaces

Change-Id: Ic54817bfc205be536ec086bdfd34b35b0eeac1a3
 2010-09-27 17:32:00 -07:00
Adam Powell
c63806d852 Holo themes and assets in progress 
Change-Id: Ic10480dc1c771d0ccd10f1d4014c945480fd6c0d
 2010-09-27 17:10:30 -07:00
Hung-ying Tyan
2a36a778d3 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
68ef7f3c3a Merge "Move SipService out of SystemServer to phone process." into gingerbread 2010-09-27 16:25:49 -07:00
Irfan Sheriff
1beeab70a2 Merge "use hostname when address null ProxyProperties parcelling" 2010-09-27 16:24:23 -07:00
Gilles Debunne
4e9243d55c 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
6442d92b10 Merge "Add support for transferring touch focus." 2010-09-27 16:11:23 -07:00
Jeff Brown
e65041225e Add support for transferring touch focus. 
Prerequisite for drag and drop.

Change-Id: Iedbe93ed0f3e1c4083130fe66b4ba06d416afce0
 2010-09-27 16:10:17 -07:00
Gilles Debunne
8d7057df40 Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread 2010-09-27 16:07:47 -07:00
Gilles Debunne
c49b259a62 Updated assets in status bar. DO NOT MERGE. 
Unlock has a 1 pixel offset that has to be fixed by code.

dropdown untested on device.

Most of these should be removed from SystemUI (revert 68833).

Pass 4.

Change-Id: Ibbbe4cc404151ec28768af98509082d77b303abe
 2010-09-27 15:56:26 -07:00
Joe Onorato
3ce57747d5 Merge "Don't show X for notifications that can't be cleared" 2010-09-27 15:55:23 -07:00
Joe Onorato
710e049a6e Merge "Hide the "Clear all" button in the notification panel if there are no clearable notifications." 2010-09-27 15:54:55 -07:00
Joe Onorato
a4a6503d30 Don't show X for notifications that can't be cleared 
Bug: 3038418
Change-Id: Ic27c2e686b918c0238b85658700925c51311df06
 2010-09-27 15:53:44 -07:00
Joe Onorato
5dd1169ae9 Hide the "Clear all" button in the notification panel if there are no clearable notifications. 
Change-Id: I7145036724939220e1f23fb91c62027b28663c20
 2010-09-27 15:34:04 -07:00
Nick Kralevich
d0cb228b9a 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
23142acffa Merge "squeeze a few more bits of randomness into /dev/random" into gingerbread 2010-09-27 15:23:45 -07:00
Winson Chung
55ee8f9329 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
Winson Chung
44e8ff9924 Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings. 
Change-Id: I15a78a5c5a18b041b1cc4a7500bd3ceccd780ea9
 2010-09-27 15:04:43 -07:00
Eric Fischer
7063eb1046 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
dc36da5148 Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread 2010-09-27 15:01:33 -07:00
Nick Kralevich
b91ec410c8 squeeze a few more bits of randomness into /dev/random 
Change-Id: Ida30c33985411f353c828b43ea26ca1b7e6502af
 2010-09-27 14:49:00 -07:00
Eric Fischer
eb2746a152 Trim unwanted whitespace from translations. DO NOT MERGE 
Change-Id: I39809e844c12e283f2ed65b8fc5a6fbe14311071
 2010-09-27 14:41:54 -07:00
Jeff Brown
464fb74e28 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
6d3ed72bf2 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
63555e36c9 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
0ba5b64784 Merge "Revert previous status bar assets. DO NOT MERGE." into gingerbread 2010-09-27 14:26:56 -07:00
Hung-ying Tyan
7e54ef71db Move SipService out of SystemServer to phone process. 
Companion CL: https://android-git/g/#change,70187
http://b/issue?id=2998069

Change-Id: I90923ac522ef363a4e04292f652d413c5a1526ad
 2010-09-28 05:19:35 +08:00
Chris Palmer
d4f1436d6a 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
1121c6ce8b Merge "Error checking for MVP matrix computation. Fixing more padding bugs." 2010-09-27 14:15:39 -07:00