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

51906 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
8239b95d11 Merge "Fix issue with drawColor(color, Mode.Clear)" 2011-05-27 11:44:44 -07:00
Romain Guy
f09ef51889 Fix issue with drawColor(color, Mode.Clear) 
Change-Id: I486b24a5b609c6f8adb0276037ddb24af2b888b2
 2011-05-27 11:43:46 -07:00
Jason Sams
41d8165b94 Merge "Cleaup of rsComponent to remove GL types." 2011-05-27 11:37:45 -07:00
James Dong
ef9be20715 am 6c2db6fb: am 95f397ad: Merge "Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."" into honeycomb-mr2 
* commit '6c2db6fb1925f291cc9748cf3bf0897b9001c972':
  Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."
 2011-05-27 11:33:26 -07:00
James Dong
6c2db6fb19 am 95f397ad: Merge "Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."" into honeycomb-mr2 
* commit '95f397adb13aa69b15b53bb089078d4dbdb269f1':
  Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."
 2011-05-27 11:29:46 -07:00
Fabrice Di Meglio
5ff0f99b23 Merge "Add support for Gravity BEFORE and AFTER" 2011-05-27 11:28:43 -07:00
James Dong
95f397adb1 Merge "Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."" into honeycomb-mr2 2011-05-27 11:26:24 -07:00
Fabrice Di Meglio
6a03640539 Add support for Gravity BEFORE and AFTER 
- update layouts
- add Callback2 for RTL aware Drawable
- add unit tests

Change-Id: Ic64d0291e262170aff7297c6580b0b422eaa8d89
 2011-05-27 11:23:15 -07:00
James Dong
f1d8a30c95 Revert "DO NOT MERGE Correctly implement the CLEAR xfermode." 
This reverts commit e324197ecd14591d7db0572f50c0d21bbd269bb4.
 2011-05-27 11:17:39 -07:00
Tadashi G. Takaoka
ccb2bc6c15 am e0a82fcc: am 241c000c: Merge "Fix InputType determination of WebTextView (DO NOT MERGE)" into honeycomb-mr2 
* commit 'e0a82fcc6058e6297d11a040aae13e37a2439c14':
  Fix InputType determination of WebTextView (DO NOT MERGE)
 2011-05-27 10:55:23 -07:00
Martijn Coenen
0a266a186d Merge "Fix NdefRecord flags handling." 2011-05-27 10:55:13 -07:00
Scott Main
092b0bd9b6 am de43d71b: am f128d5d4: Merge "docs: adjust what\'s visible for online and offline docs" into honeycomb-mr2 
* commit 'de43d71bee336874a756545468d9adcf5e96e421':
  docs: adjust what's visible for online and offline docs
 2011-05-27 10:49:33 -07:00
Tadashi G. Takaoka
e0a82fcc60 am 241c000c: Merge "Fix InputType determination of WebTextView (DO NOT MERGE)" into honeycomb-mr2 
* commit '241c000cfb9299b4c6cfe3c7c1610f950d1a6e58':
  Fix InputType determination of WebTextView (DO NOT MERGE)
 2011-05-27 10:48:52 -07:00
Tadashi G. Takaoka
241c000cfb Merge "Fix InputType determination of WebTextView (DO NOT MERGE)" into honeycomb-mr2 2011-05-27 10:47:12 -07:00
Amith Yamasani
a4fa2cd1c0 Merge "Manual merge. Preference activity changes to work on smaller tablet screens and phones." 2011-05-27 10:24:59 -07:00
Romain Guy
eb2466b303 Merge "Prettify memory dump." 2011-05-27 10:23:09 -07:00
Scott Main
de43d71bee am f128d5d4: Merge "docs: adjust what\'s visible for online and offline docs" into honeycomb-mr2 
* commit 'f128d5d49b95971d580b07dfdbeb513a0eb3d2df':
  docs: adjust what's visible for online and offline docs
 2011-05-27 10:23:01 -07:00
Romain Guy
d2ba50ab86 Prettify memory dump. 
Change-Id: I071c6a04a144a96955d85f56dffc6162288ee33e
 2011-05-27 10:21:07 -07:00
Scott Main
f128d5d49b Merge "docs: adjust what's visible for online and offline docs" into honeycomb-mr2 2011-05-27 10:17:41 -07:00
Scott Main
c0324b89f5 docs: adjust what's visible for online and offline docs 
Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08
 2011-05-27 10:15:31 -07:00
Brian Carlstrom
4fdf396219 Merge "Tracking merge of dalvik-dev to master" 2011-05-27 10:12:34 -07:00
Tadashi G. Takaoka
f7145d5d66 Fix InputType determination of WebTextView (DO NOT MERGE) 
The InpuType from <input type="email" /> has been broken.

Change-Id: Ie37de69682410cdd58c29910d483e924f5b614b6
Related-Bug: 4490948
Cherry-pick: Ibd7f2977a177f1d97e3a29ac44220e5136bbd653
 2011-05-28 01:56:25 +09:00
Tadashi G. Takaoka
93bfbc0fc3 Merge "Fix InputType determination of WebTextView" 2011-05-27 09:54:02 -07:00
Gilles Debunne
9a3a884864 Replacement spans correctly measured in TextView 
Bug 4444591

Change-Id: I74c94445806d6c00b0971146cac57363c7d3f205
 2011-05-27 09:34:09 -07:00
Gilles Debunne
a019ba7995 Merge "EditText notifies the IME when a suggestion is picked." 2011-05-27 09:26:53 -07:00
Wink Saville
205a2c3a3e am 178b0660: Merge "DataConnection FailCause should use errorCode rather than ordinal." into honeycomb-LTE 
* commit '178b066096d94f078fdb32bf9f66755bae34819d':
  DataConnection FailCause should use errorCode rather than ordinal.
 2011-05-27 09:15:19 -07:00
Wink Saville
178b066096 Merge "DataConnection FailCause should use errorCode rather than ordinal." into honeycomb-LTE 2011-05-27 09:03:48 -07:00
Ramesh Sudini
98288aa3de DataConnection FailCause should use errorCode rather than ordinal. 
Change-Id: I45c5bca73b04f74eee7ab4858c8e28350e0ffb89
 2011-05-27 08:59:20 -07:00
Martijn Coenen
8bede17047 Fix NdefRecord flags handling. 
NdefMessages created from byte arrays set the wrong flags on
NdefRecord: every record had at least FLAG_MB|FLAG_ME set, instead of actually
setting the flags from the byte-stream itself. Fixed by creating an internal
constructor which can take the flags.

Public constructor remains the same, as we don't want to bother application
writers with these flags - they can be inferred from the context in which the
record is used. Getting the flags is not a public operation on an NdefRecord
either. However, applications can get the byte[] representation and it
is reasonable for them to expect the flags byte to be set correctly.

Change-Id: Ic32411688dd092c55b1aeccbba9635792e15a671
 2011-05-27 08:18:18 -07:00
Tadashi G. Takaoka
2c0a809315 Fix InputType determination of WebTextView 
The InpuType from <input type="email" /> has been broken.

Related-Bug: 4490948
Change-Id: Ibd7f2977a177f1d97e3a29ac44220e5136bbd653
 2011-05-27 22:00:07 +09:00
Ben Murdoch
bf4659605c Merge WebKit at r80534: Update user agent string. 
Change-Id: I86a25c2370e1f658f83607f9fe30356bcb916b36
 2011-05-27 12:31:19 +01:00
Brian Carlstrom
a7284f0e72 Tracking merge of dalvik-dev to master 
Adapt to change in the way MockWebServer sets up CONNECT proxies.
  git cherry-pick --no-commit c7e2feee5e7908a019a0de91123c1feb9bdc38bc

React to move of Base64 in libcore
  git cherry-pick --no-commit 119f7ebdd1f8df3a8ff8e3b8056bff725d569253

Expose and document android.net.HttpResponseCache.
  git cherry-pick --no-commit 7b73f0fdb8c032a65c55610541d66385bd8bcbe6)

make update-api

Change-Id: Ieb48b304ea38ee8c2ec01e860d99b1404583889e
 2011-05-27 01:21:50 -07:00
Adam Powell
aa4fa2c5b7 Merge "Sync holo button bar styles with UX." 2011-05-26 18:56:08 -07:00
Romain Guy
afe68c689f Merge "Remove extraneous log." 2011-05-26 18:49:30 -07:00
Romain Guy
bc7cdb6783 Remove extraneous log. 
Change-Id: I91b248410d69836c7a3b56eb0867224ccb4a5336
 2011-05-26 18:48:49 -07:00
Adam Powell
15a7b814e9 Sync holo button bar styles with UX. 
Change-Id: I9588f1beb014262bf71d97521b0f371c85977923
 2011-05-26 18:40:52 -07:00
Romain Guy
8eed7aded7 Merge "Fix texture coordinates for sub-bitmap rendering." 2011-05-26 18:40:13 -07:00
Romain Guy
1e59f9d10d Fix texture coordinates for sub-bitmap rendering. 
Change-Id: I05a31775e03f5b223a55a5144d420351abac89be
 2011-05-26 18:39:34 -07:00
Gilles Debunne
b1619e5615 EditText notifies the IME when a suggestion is picked. 
Bug 4443922

Change-Id: Ie1e5a8164bf80bcfb48036c9337e649dc0d8a2fb
 2011-05-26 18:28:22 -07:00
Wink Saville
08c00205a7 am 885f8cd7: Merge "DataConnection : Have a separate alarm for each APN type." into honeycomb-LTE 
* commit '885f8cd75f27ec6dc8ca75233bbcdc86ed041c8c':
  DataConnection : Have a separate alarm for each APN type.
 2011-05-26 18:23:17 -07:00
Wink Saville
37a4069ff9 am e55e5e7c: Merge "Derive ICC status from multiple application status for UICC" into honeycomb-LTE 
* commit 'e55e5e7c406bdedc67c6e536c981146e2b335b43':
  Derive ICC status from multiple application status for UICC
 2011-05-26 18:21:29 -07:00
Wink Saville
885f8cd75f Merge "DataConnection : Have a separate alarm for each APN type." into honeycomb-LTE 2011-05-26 18:19:08 -07:00
Wink Saville
e55e5e7c40 Merge "Derive ICC status from multiple application status for UICC" into honeycomb-LTE 2011-05-26 18:18:52 -07:00
Matthew Xie
a860764402 Merge "Add wide band speech feature flag" 2011-05-26 18:13:08 -07:00
James Dong
22bf7a7ea7 Add some comment to MediaRecorder.stop() about the stop() failure (-1007) 
o The intended failure happens if stop() call comes immediately after start() call
  before any media data from the output of the encoder is received.

Change-Id: I62fad123ac67e2f566ba555e84c0c3faf2adfd99
 2011-05-26 17:45:00 -07:00
Dianne Hackborn
5c2e4d20df am 8fcbfb52: am 94250ac6: Merge "Add new supports-screens attributes for declaring the compatible screens." into honeycomb-mr2 
* commit '8fcbfb52607263754b6d3895a112f792c5c3a12e':
  Add new supports-screens attributes for declaring the compatible screens.
 2011-05-26 17:12:36 -07:00
Dianne Hackborn
8fcbfb5260 am 94250ac6: Merge "Add new supports-screens attributes for declaring the compatible screens." into honeycomb-mr2 
* commit '94250ac69c6e07534e4781d3479dccb79d8c366c':
  Add new supports-screens attributes for declaring the compatible screens.
 2011-05-26 17:09:39 -07:00
Kazuhiro Ondo
e14a59e96c Derive ICC status from multiple application status for UICC 
If UICC with multiple applications are used, delive the status
based on both status instead of just looking at one.

Change-Id: I98cf689327e5302bb4174985935511aff02939f6
 2011-05-26 17:09:25 -07:00
Ramesh Sudini
69d0855ed2 DataConnection : Have a separate alarm for each APN type. 
Change-Id: I0769f3e2a7c60bd833af7c24eb661d368bac2598
 2011-05-26 17:09:07 -07:00
Dianne Hackborn
94250ac69c Merge "Add new supports-screens attributes for declaring the compatible screens." into honeycomb-mr2 2011-05-26 17:07:52 -07:00