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

50289 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
98041f02b4 am 270fbfed: am 37259203: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '270fbfede58e4971588755adfa7e70e0de07b8cf':
  Import revised translations.  DO NOT MERGE
 2011-05-10 14:23:46 -07:00
Eric Fischer
270fbfede5 am 37259203: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '372592032a0e552ca30faadac9be823bd397910b':
  Import revised translations.  DO NOT MERGE
 2011-05-10 14:21:08 -07:00
Eric Fischer
372592032a Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-05-10 14:18:10 -07:00
Andreas Huber
607e379ebc Merge "Properly honour any pending seek request when reading the first buffer after" 2011-05-10 14:12:06 -07:00
John Reck
2b3fcfb4cf Add ROOT_ID to Accounts column 
Change-Id: I4c3bbe90a91971085252b54d162c771fbb4b7711
 2011-05-10 14:07:18 -07:00
Andreas Huber
5fd43e3051 Properly honour any pending seek request when reading the first buffer after 
starting the audio player.

Change-Id: Ibedc1804a8c444e4d0f5be4eb87b22ed5d2c367d
 2011-05-10 14:05:02 -07:00
Eric Fischer
ca43ef6bc7 am affca8fa: am f3bd663c: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'affca8fa11aa731cdc8b4b4f2b5478f182b9fbbf':
  Import revised translations.  DO NOT MERGE
 2011-05-10 12:26:09 -07:00
Eric Fischer
affca8fa11 am f3bd663c: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'f3bd663c67fe3aa3e8ec728e90f19e3fa50c3fbd':
  Import revised translations.  DO NOT MERGE
 2011-05-10 12:21:32 -07:00
Eric Fischer
f3bd663c67 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 2011-05-10 12:18:21 -07:00
Joe Onorato
0fe56853fd am 37c077d3: am 81faa44c: Merge "Move / copy some framework and systemui resources from xlarge to large. The status bar now comes up on large tablets." into honeycomb-mr2 
* commit '37c077d3dc32cd42c145072b671a6d53563b0156':
  Move / copy some framework and systemui resources from xlarge to large.  The status bar now comes up on large tablets.
 2011-05-10 12:03:55 -07:00
Joe Onorato
37c077d3dc am 81faa44c: Merge "Move / copy some framework and systemui resources from xlarge to large. The status bar now comes up on large tablets." into honeycomb-mr2 
* commit '81faa44c48911e4a63adaa1c92c5a40ea3c58ffb':
  Move / copy some framework and systemui resources from xlarge to large.  The status bar now comes up on large tablets.
 2011-05-10 12:01:40 -07:00
Joe Onorato
81faa44c48 Merge "Move / copy some framework and systemui resources from xlarge to large. The status bar now comes up on large tablets." into honeycomb-mr2 2011-05-10 11:59:42 -07:00
Joe Onorato
5f9f7ff4b7 Move / copy some framework and systemui resources from xlarge to large. The status bar now comes up 
on large tablets.

Change-Id: I42d810a5b8e61b2959e30abef91477152495d39f
 2011-05-10 11:58:22 -07:00
Robert Greenwalt
441bc9a6f4 am e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTE 
* commit 'e6848faceff58f84f671dbc73be08ef7890fea09':
  Fix the adding of host routes.
 2011-05-10 11:53:57 -07:00
Robert Greenwalt
e6848facef Merge "Fix the adding of host routes." into honeycomb-LTE 2011-05-10 11:51:36 -07:00
Wink Saville
1f3278e111 Refactor IccRecords and IccCard 
IccRecords is now full base class for RuimRecords and SIMRecords
so we can use the IccRecords to represent both Ruim and SIM records
class.

Rename mSIMRecords to mIccRecords in PhoneBase.

Remove mRuimRecords.

Change-Id: If6afff3f99d41830c947de13c26586deff923c6f
 2011-05-10 11:33:10 -07:00
Robert Greenwalt
f43396caaa Fix the adding of host routes. 
We used to just add

Change-Id: I991e4cc976cc2932887dd3242fd50e013d521b0a
 2011-05-10 11:27:46 -07:00
Dirk Dougherty
2bb51bb203 am 63c5a2bc: am e4e8dffd: am 0d5196b9: am 5f8f0a0d: Merge "Doc change: add Android 3.1 highlights and version notes." into honeycomb-mr1 
* commit '63c5a2bc39839804442ba2800b6d974d0391f2cc':
  Doc change: add Android 3.1 highlights and version notes.
 2011-05-10 11:15:54 -07:00
Scott Main
6d98a19190 am 315595d1: am 6b2c8f00: am fef7b625: am 7f3cf449: Merge "docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enab 
* commit '315595d10dfd4b8fe32cfe45a53f9e342bf0a699':
  docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and add screen support on 1.5
 2011-05-10 11:15:51 -07:00
Dianne Hackborn
037b54cf3c am 652dbb7d: am 837bdc49: Merge "Fix scaling of batched motion events." into honeycomb-mr2 
* commit '652dbb7dca84ee3b350225cb38824fe3773af42b':
  Fix scaling of batched motion events.
 2011-05-10 11:15:39 -07:00
Wink Saville
37eca253af am d649887a: am eb8da0fe: Merge "Fix issue on infinite retry config in RetryManager" into honeycomb-LTE 
* commit 'd649887a43efb435f1ea2255c364d8c214552aef':
  Fix issue on infinite retry config in RetryManager
 2011-05-10 11:15:25 -07:00
Wink Saville
e8a0619b03 am d1736a3d: am d237bcb2: Merge "Add unset and setOnIccRefresh." into honeycomb-LTE 
* commit 'd1736a3ddae04f5cbe4ebc0ba31e605b6bdae72c':
  Add unset and setOnIccRefresh.
 2011-05-10 11:14:51 -07:00
Dianne Hackborn
652dbb7dca am 837bdc49: Merge "Fix scaling of batched motion events." into honeycomb-mr2 
* commit '837bdc4919aedfea8c0ba492d964eb921d4e302d':
  Fix scaling of batched motion events.
 2011-05-10 11:01:50 -07:00
Dianne Hackborn
fd26ed1a28 Merge "resolved conflicts for merge of 05be6d6f to master" 2011-05-10 10:59:29 -07:00
Dianne Hackborn
837bdc4919 Merge "Fix scaling of batched motion events." into honeycomb-mr2 2011-05-10 10:58:44 -07:00
Kristian Monsen
39201b017f Merge "Deprecating webkit API's that might not be supported in the future" 2011-05-10 10:57:52 -07:00
James Dong
a403a938e9 Add support for platform-specific recording start time offset 
o This start time offset is used in the media framework to eliminate
  the recording sound in the recorded file.

Change-Id: I97926a74f0743b8a4f985d51334e8d1486a318ea
related-to-bug: 4390777
 2011-05-10 10:32:19 -07:00
Wink Saville
5e4ab52859 Merge "Add unset and setOnIccRefresh." 2011-05-10 10:25:46 -07:00
Wink Saville
c2e6a104aa Add unset and setOnIccRefresh. 
A temporary hack as some binaries are using these methods.

Bug: 4401309
Change-Id: I046f78f56c4a9300355e68488735da227991a773
 2011-05-10 10:24:15 -07:00
Kristian Monsen
fc77165d44 Deprecating webkit API's that might not be supported in the future 
Change-Id: I992ae207f29a95daff991768cc6fe190471978cd
 2011-05-10 16:53:51 +01:00
Ben Murdoch
bb40896e66 Merge WebKit at r74534: Update browser user agent. 
Change-Id: I6959d2f1f9b69209deb255e442791f6447fe6b05
 2011-05-10 15:38:51 +01:00
Kristian Monsen
cbb59db7ee Enable platform notifications for chrome http stack 
Change-Id: I386aef25010c95b15fb6a8edc96e59e538540306
 2011-05-10 14:13:16 +01:00
Dirk Dougherty
63c5a2bc39 am e4e8dffd: am 0d5196b9: am 5f8f0a0d: Merge "Doc change: add Android 3.1 highlights and version notes." into honeycomb-mr1 
* commit 'e4e8dffd41c0f7aaf005418b71cae7738ad868d2':
  Doc change: add Android 3.1 highlights and version notes.
 2011-05-10 00:46:26 -07:00
Scott Main
315595d10d am 6b2c8f00: am fef7b625: am 7f3cf449: Merge "docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen fil 
* commit '6b2c8f00c95d05a8ca410ff74451fd0701f36119':
  docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and add screen support on 1.5
 2011-05-10 00:46:21 -07:00
Dirk Dougherty
e4e8dffd41 am 0d5196b9: am 5f8f0a0d: Merge "Doc change: add Android 3.1 highlights and version notes." into honeycomb-mr1 
* commit '0d5196b972044da44a844acd9cdffde9d5aa696d':
  Doc change: add Android 3.1 highlights and version notes.
 2011-05-10 00:37:02 -07:00
Scott Main
6b2c8f00c9 am fef7b625: am 7f3cf449: Merge "docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and ad 
* commit 'fef7b62506a74d0133b60fd1d6ae9bf54bf599c9':
  docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and add screen support on 1.5
 2011-05-10 00:36:59 -07:00
Dirk Dougherty
0d5196b972 am 5f8f0a0d: Merge "Doc change: add Android 3.1 highlights and version notes." into honeycomb-mr1 
* commit '5f8f0a0d40675bc4d373121ffdd22730f3701662':
  Doc change: add Android 3.1 highlights and version notes.
 2011-05-10 00:34:09 -07:00
Scott Main
fef7b62506 am 7f3cf449: Merge "docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and add screen supp 
* commit '7f3cf449fe1b90b902a37ddc3c05ec7aa236e584':
  docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and add screen support on 1.5
 2011-05-10 00:34:06 -07:00
Dirk Dougherty
5f8f0a0d40 Merge "Doc change: add Android 3.1 highlights and version notes." into honeycomb-mr1 2011-05-09 22:58:37 -07:00
Dirk Dougherty
b7c7f15737 Doc change: add Android 3.1 highlights and version notes. 
Change-Id: Ifbc7df004d8aca9073d6397fad282a57ad4f1b74
 2011-05-09 22:50:25 -07:00
Irfan Sheriff
97b4cf783f Move Wifi Ap configuration to flat file 
Secure settings are accessible by applications without
permissions. Move to a system-only accessible file

Bug: 4391796
Change-Id: I5448943d26cccce39dd4f32423c68dad4bbf50ad
 2011-05-09 22:46:55 -07:00
Dianne Hackborn
e7d25b74b0 Fix scaling of batched motion events. 
Change-Id: I1e070c936f7b2e8f1bb7ebae62b1df0aa6998b82
 2011-05-09 21:19:26 -07:00
Wink Saville
d649887a43 am eb8da0fe: Merge "Fix issue on infinite retry config in RetryManager" into honeycomb-LTE 
* commit 'eb8da0fec2ea577f14e5c5c4dcca1eea0b8261fc':
  Fix issue on infinite retry config in RetryManager
 2011-05-09 20:34:24 -07:00
Wink Saville
d1736a3dda am d237bcb2: Merge "Add unset and setOnIccRefresh." into honeycomb-LTE 
* commit 'd237bcb241b2be8b2f3f3baed87fce973de00fa7':
  Add unset and setOnIccRefresh.
 2011-05-09 20:32:34 -07:00
Wink Saville
eb8da0fec2 Merge "Fix issue on infinite retry config in RetryManager" into honeycomb-LTE 2011-05-09 20:31:45 -07:00
Wink Saville
d237bcb241 Merge "Add unset and setOnIccRefresh." into honeycomb-LTE 2011-05-09 20:29:55 -07:00
Wink Saville
987cd49966 Add unset and setOnIccRefresh. 
A temporary hack as some binaries are using these methods.

Change-Id: I4ee63df82acf167ab5f434e63bd073e84e1fdf71
 2011-05-09 20:27:54 -07:00
Dianne Hackborn
aa9d84c37e resolved conflicts for merge of 05be6d6f to master 
Change-Id: Ic6a6c5bb300f6f1d43f9ed550b284282b4f16212
 2011-05-09 19:00:59 -07:00
Scott Main
7f3cf449fe Merge "docs: update screen support doc to de-emphasize support for 1.5 this includes a variety of other revisions to reorganize some of the content in the main document and also add separate documents for how to enable screen filtering and add screen support on 1.5" into honeycomb-mr1 2011-05-09 18:32:10 -07:00
Dounia Berrada
940a198f52 Adding functions to query the state of a WebElement. 
Change-Id: I85dbbfbf6b6172d6a8cf6e437f414ecef0872e36
 2011-05-09 18:02:55 -07:00