Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,409 Commits 3 Branches 0 Tags
11ace0015bd7e045358dadeabcb44f12f28fde0b
Commit Graph

48409 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
11ace0015b am e8b669cb: (-s ours) am 71d25778: Merge "Switch to SkSafeUnref for better portability" 
* commit 'e8b669cbd7b690349c908ce6c9ce3b342139de04':
  Switch to SkSafeUnref for better portability
 2011-05-12 15:52:03 -07:00
Jean-Baptiste Queru
e8b669cbd7 am 71d25778: Merge "Switch to SkSafeUnref for better portability" 
* commit '71d25778c61327bf82d0e81cd78175a9ee74420a':
  Switch to SkSafeUnref for better portability
 2011-05-12 15:38:07 -07:00
Teng-Hui Zhu
858daa1fbb am a0e661b4: am c1a005c3: Merge "Fix the Uri parsing issue" into honeycomb-mr2 
* commit 'a0e661b4e4f489fa7c5c2ebadcffc8e6f71132eb':
  Fix the Uri parsing issue
 2011-05-12 15:05:29 -07:00
Dianne Hackborn
0e59729b10 am 97280816: am 0f1de9ad: New compat mode front end: UI and persistence. 
* commit '972808164adde6c0784e9c836d06219a9cf7eb7f':
  New compat mode front end: UI and persistence.
 2011-05-12 15:05:19 -07:00
Teng-Hui Zhu
a0e661b4e4 am c1a005c3: Merge "Fix the Uri parsing issue" into honeycomb-mr2 
* commit 'c1a005c356c18ffb676f16b2f6d6d8f361abafe2':
  Fix the Uri parsing issue
 2011-05-12 15:01:56 -07:00
Dianne Hackborn
972808164a am 0f1de9ad: New compat mode front end: UI and persistence. 
* commit '0f1de9adde0b52d2a385a76232bd7ac30c3eeea2':
  New compat mode front end: UI and persistence.
 2011-05-12 15:01:53 -07:00
Jean-Baptiste Queru
71d25778c6 Merge "Switch to SkSafeUnref for better portability" 2011-05-12 14:19:26 -07:00
Teng-Hui Zhu
c1a005c356 Merge "Fix the Uri parsing issue" into honeycomb-mr2 2011-05-12 14:11:25 -07:00
Wink Saville
9c7c879414 am 76a118dd: Merge "Fix initialization of RouteInfo" into honeycomb-LTE 
* commit '76a118dd9e1bc8be33e1e22b7264b7f918f6f050':
  Fix initialization of RouteInfo
 2011-05-12 14:03:31 -07:00
Teng-Hui Zhu
64855da755 Fix the Uri parsing issue 
Switching back to use the setDataSource with Uri, which can handle both the
file and http path correctly.

Change-Id: I5bfc1d01a8de0a4f8640ffceafbc17984833097a
 2011-05-12 13:53:48 -07:00
Dianne Hackborn
0f1de9adde New compat mode front end: UI and persistence. 
Adds a really crappy UI for toggling compat mode.

Persists compat mode selection across boots.

Turns on compat mode by default for newly installed apps.

Change-Id: Idc83494397bd17c41450bc9e9a05e4386c509399
 2011-05-12 13:28:45 -07:00
Wink Saville
76a118dd9e Merge "Fix initialization of RouteInfo" into honeycomb-LTE 2011-05-12 13:26:44 -07:00
Jean-Baptiste Queru
c9e22e9aff Switch to SkSafeUnref for better portability 
Change-Id: Ia146a4728b5eb92626462effe42521ca73454a7d
 2011-05-12 08:22:35 -07:00
Kazuhiro Ondo
8c0b528a47 Fix initialization of RouteInfo 
IPv6 gateway is not correctly set in RouteInfo

Change-Id: I24b1ab71a64e3097c9ba641899240fc27847b86c
 2011-05-11 16:02:00 -07:00
Irfan Sheriff
f450fd6af6 am aa1fd701: (-s ours) am 8dd85f80: Merge "Move Wifi Ap configuration to flat file" into gingerbread 
* commit 'aa1fd70100d1af393c8d4ebe9cb36a8fa15a3633':
  Move Wifi Ap configuration to flat file
 2011-05-11 10:06:33 -07:00
Irfan Sheriff
aa1fd70100 am 8dd85f80: Merge "Move Wifi Ap configuration to flat file" into gingerbread 
* commit '8dd85f80ba9c463f5616b47eceb620fe21203f4f':
  Move Wifi Ap configuration to flat file
 2011-05-11 09:45:36 -07:00
Irfan Sheriff
8dd85f80ba Merge "Move Wifi Ap configuration to flat file" into gingerbread 2011-05-11 09:15:48 -07:00
Robert Ly
9d93c9c4d7 am 65bab344: am f3cdea93: am a45e4f4d: doc change: adding link to pic board 
* commit '65bab344789b248cdc9334523e3b04f5a2c155b4':
  doc change: adding link to pic board
 2011-05-11 09:11:41 -07:00
Robert Ly
65bab34478 am f3cdea93: am a45e4f4d: doc change: adding link to pic board 
* commit 'f3cdea937b8b659f959d5e77f4a17f749f85c6ae':
  doc change: adding link to pic board
 2011-05-11 09:08:42 -07:00
Robert Ly
f3cdea937b am a45e4f4d: doc change: adding link to pic board 
* commit 'a45e4f4df59e4037408f6b9c0ddf4a7c57eaa273':
  doc change: adding link to pic board
 2011-05-11 09:04:52 -07:00
Robert Ly
a45e4f4df5 doc change: adding link to pic board 
Change-Id: I1ac52d18285285f6e330265db15f103a473a26de
 2011-05-10 22:57:31 -07:00
Wink Saville
e86dbac583 am db08ff76: Merge "Refactor IccRecords and IccCard" into honeycomb-LTE 
* commit 'db08ff768b144c6ad8b326300d95c0c60e40f2eb':
  Refactor IccRecords and IccCard
 2011-05-10 16:31:36 -07:00
Wink Saville
db08ff768b Merge "Refactor IccRecords and IccCard" into honeycomb-LTE 2011-05-10 16:28:33 -07:00
Conley Owens
041aa34e08 am 87d86044: am bcd029b6: Merge "Add missing clean-up of idmap file descriptors." 
* commit '87d86044c0f15ae2ffc0350271c76ff874fb413b':
  Add missing clean-up of idmap file descriptors.
 2011-05-10 16:19:29 -07:00
Jake Hamby
ee60f3fb1b resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp 
Change-Id: I2b569ada3baec2dc486296623063bc2b504c5e96
 2011-05-10 15:52:15 -07:00
Eric Fischer
6819c677b9 am 98041f02: am 270fbfed: am 37259203: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '98041f02b471b100056c3dc16e50f04a059f9a58':
  Import revised translations.  DO NOT MERGE
 2011-05-10 14:27:23 -07:00
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
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
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
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
837bdc4919 Merge "Fix scaling of batched motion events." into honeycomb-mr2 2011-05-10 10:58:44 -07: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