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

3009 Commits

Author SHA1 Message Date
Eric Fischer
c8c3729506 Import revised translations. 
Change-Id: I0e0b132f5f4678721fd07193605341b4b68885fe
 2011-03-17 16:51:07 -07:00
Jeff Brown
5949f89f3c Merge "Add 3D mode key and others." 2011-03-16 11:46:00 -07:00
Jeff Brown
9812aed276 Add 3D mode key and others. 
Related to an AOSP change request.

Change-Id: I3f4f84b56a1af626a8783f5ecbb823eb12ba9fbe
 2011-03-16 11:31:42 -07:00
Justin Ho
f97e147e51 am 30d7eb02: am 6ad9cc9a: am 6764ecf8: Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1 
* commit '30d7eb02b5e9533efc41e1fc98eac5c5a6891903':
  Integrating new ADB USB debugging asset Bug: #6699FF
 2011-03-15 23:50:40 -07:00
Justin Ho
73394399d8 am 201bc41e: am 750a4a26: am 141505a9: Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1 
* commit '201bc41e0cbb07dba5365f33ba9885c02977ed6a':
  Fix expander list group indicator Bug: #6699FF
 2011-03-15 23:50:37 -07:00
Justin Ho
6ad9cc9afd am 6764ecf8: Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1 
* commit '6764ecf8630af4c6260007e688cea0056ecf4ec7':
  Integrating new ADB USB debugging asset Bug: #6699FF
 2011-03-15 23:44:12 -07:00
Justin Ho
750a4a2623 am 141505a9: Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1 
* commit '141505a9769099ac38eacb62409a75ff891860a1':
  Fix expander list group indicator Bug: #6699FF
 2011-03-15 23:44:08 -07:00
Eric Fischer
a78327da45 am acca1600: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'acca16004fd58c2b8c489f031281b58551551dc8':
  Import revised translations.  DO NOT MERGE
 2011-03-15 23:29:10 -07:00
Justin Ho
6764ecf863 Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1 2011-03-15 16:52:07 -07:00
Justin Ho
141505a976 Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1 2011-03-15 16:47:27 -07:00
Justin Ho
75fe135e62 Integrating new ADB USB debugging asset 
Bug: #6699FF

Change-Id: Iab8debef59178d56ea78883a5737b7614649f948
 2011-03-15 16:40:36 -07:00
Justin Ho
a5c064e0d9 Fix expander list group indicator 
Bug: #6699FF

Change-Id: I48f2ecb2246ad5d5e11d7e9122b6ef90c764b571
 2011-03-15 16:38:58 -07:00
Eric Fischer
4670b4d95c Import revised translations. DO NOT MERGE 
Change-Id: Ief48781413cadb2a9bd786974e4688ac222d7b36
 2011-03-15 14:40:53 -07:00
Amith Yamasani
68feabc4e3 am 4a04f11b: am 7e978441: Merge "Use more padding on the sides for SearchView" into honeycomb-mr1 
* commit '4a04f11b437d7d92d580c7c8b0b4b54876b6a934':
  Use more padding on the sides for SearchView
 2011-03-15 13:01:17 -07:00
Amith Yamasani
4a04f11b43 am 7e978441: Merge "Use more padding on the sides for SearchView" into honeycomb-mr1 
* commit '7e978441eeed9defb1031cc17c2857cf06cf825a':
  Use more padding on the sides for SearchView
 2011-03-15 12:50:35 -07:00
Eric Fischer
b2389eaada Merge "Import revised translations." 2011-03-15 12:00:49 -07:00
Amith Yamasani
7e978441ee Merge "Use more padding on the sides for SearchView" into honeycomb-mr1 2011-03-15 10:47:01 -07:00
Eric Fischer
0d1d2a7a2c Import revised translations. 
Change-Id: Ic97284d3867608cbc0f018eb2472affbc783b675
 2011-03-15 10:37:23 -07:00
Justin Ho
24f4e33faf am 71ee3ba0: am f47a1683: Merge "Updated HTML5 media playback controls Bug: 4080127" into honeycomb-mr1 
* commit '71ee3ba0f08b4be70bf986ea2c7f9f5261bca8a2':
  Updated HTML5 media playback controls Bug: 4080127
 2011-03-14 18:31:08 -07:00
Justin Ho
c460a3f61b am 1586c133: am cc886b93: Merge "Fixing naming for disabled paste assets Updated paste assets" into honeycomb-mr1 
* commit '1586c133a3305045af277b69fec6f0f14bb234df':
  Fixing naming for disabled paste assets Updated paste assets
 2011-03-14 18:31:06 -07:00
Justin Ho
86269a1e7e am 7bc341cf: am 3e317542: Merge "Updated textfield search assets Bug: 3321263" into honeycomb-mr1 
* commit '7bc341cf80fb5d6b4a8a3304c672341ed9810825':
  Updated textfield search assets Bug: 3321263
 2011-03-14 18:31:03 -07:00
Justin Ho
71ee3ba0f0 am f47a1683: Merge "Updated HTML5 media playback controls Bug: 4080127" into honeycomb-mr1 
* commit 'f47a16837cc0516e23811850f69839bb2f7ac95b':
  Updated HTML5 media playback controls Bug: 4080127
 2011-03-14 18:25:45 -07:00
Justin Ho
1586c133a3 am cc886b93: Merge "Fixing naming for disabled paste assets Updated paste assets" into honeycomb-mr1 
* commit 'cc886b93681b75a9b89331930435e0f527b2c3d7':
  Fixing naming for disabled paste assets Updated paste assets
 2011-03-14 18:25:43 -07:00
Justin Ho
7bc341cf80 am 3e317542: Merge "Updated textfield search assets Bug: 3321263" into honeycomb-mr1 
* commit '3e3175428c81501d72cda3c026b927ca6408243f':
  Updated textfield search assets Bug: 3321263
 2011-03-14 18:25:40 -07:00
Justin Ho
f47a16837c Merge "Updated HTML5 media playback controls Bug: 4080127" into honeycomb-mr1 2011-03-14 18:24:13 -07:00
Justin Ho
cc886b9368 Merge "Fixing naming for disabled paste assets Updated paste assets" into honeycomb-mr1 2011-03-14 18:24:06 -07:00
Justin Ho
3e3175428c Merge "Updated textfield search assets Bug: 3321263" into honeycomb-mr1 2011-03-14 18:23:18 -07:00
Justin Ho
4a21cabb9f Fixing naming for disabled paste assets 
Updated paste assets

Bug: 4083486
Change-Id: I21bc469ef42c4eca4bcbea953f3c9e3a72b13388
 2011-03-14 18:19:25 -07:00
Justin Ho
db92972c53 Updated HTML5 media playback controls 
Bug: 4080127

Change-Id: I89e7822f18c11536aea92adf4a01a5af61ed1186
 2011-03-14 18:01:36 -07:00
Nicolas Roard
ac1aa45ed9 am 373ece1f: am 65c28204: Merge "Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)" into honeycomb-mr1 
* commit '373ece1fa158d72152712b36674a9c114a40b649':
  Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)
 2011-03-14 16:36:50 -07:00
Nicolas Roard
373ece1fa1 am 65c28204: Merge "Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)" into honeycomb-mr1 
* commit '65c282042dab1dfa75b10517190ba38834782c3b':
  Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)
 2011-03-14 15:39:37 -07:00
Nicolas Roard
da9b9b248a am 21f86159: am b6866f81: am 0fd8fa33: Merge "Adding placeholders for the fullscreen button used by the browser for HTML5 video" into honeycomb-mr1 
* commit '21f86159ffa78dd4bd7fec2053dc2413f0cc7288':
  Adding placeholders for the fullscreen button used by the browser for HTML5 video
 2011-03-14 15:27:25 -07:00
Nicolas Roard
b6866f81a9 am 0fd8fa33: Merge "Adding placeholders for the fullscreen button used by the browser for HTML5 video" into honeycomb-mr1 
* commit '0fd8fa33e28df28568532c30f53a91a8d652b35d':
  Adding placeholders for the fullscreen button used by the browser for HTML5 video
 2011-03-14 15:21:46 -07:00
Eric Fischer
2d59a94716 am 29f10747: am 9f70f526: Merge "Add "new incognito window" translations." into honeycomb-mr1 
* commit '29f107476d577e073748c29a9e31c573620684be':
  Add "new incognito window" translations.
 2011-03-14 15:18:52 -07:00
Nicolas Roard
3efaa34015 Adding placeholders for the large play button 
used by the browser for HTML5 video (the button will appear
surimposed to the video)

bug:4080127
Change-Id: I681d2a4a3de1b2db64ffb3bbf4ce883320c771f1
 2011-03-14 15:14:28 -07:00
Nicolas Roard
0fd8fa33e2 Merge "Adding placeholders for the fullscreen button used by the browser for HTML5 video" into honeycomb-mr1 2011-03-14 15:11:55 -07:00
Amith Yamasani
7341727e8e Use more padding on the sides for SearchView 
Bug: 4088716

Change-Id: I2e49a38939c13a5fa57333dc745a82fdf3ead8f8
 2011-03-14 14:54:04 -07:00
Eric Fischer
9f7b4ba69c Import revised translations. DO NOT MERGE 
Change-Id: I5d1b5c2891ffd19e45dbc6d20caf3449147f7218
 2011-03-14 14:31:58 -07:00
Eric Fischer
aa3ea7be0c Add "new incognito window" translations. 
These are all unfortunately for the "window" version instead of the
"tab" version because I didn't realize that there were two versions.

Change-Id: If9a4bd6d0d70fe8992b4bf63e674865080f8c597
 2011-03-14 14:31:42 -07:00
Eric Fischer
29f107476d am 9f70f526: Merge "Add "new incognito window" translations." into honeycomb-mr1 
* commit '9f70f5268fac9c2dd5ed4cb9582da5931c846a91':
  Add "new incognito window" translations.
 2011-03-14 14:28:58 -07:00
Justin Ho
5e6b4b0392 Updated textfield search assets 
Bug: 3321263

Change-Id: I3e453f5d969cc94b11ec51a3807bc74948473833
 2011-03-14 14:19:17 -07:00
Eric Fischer
175121a513 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-14 14:17:01 -07:00
Eric Fischer
9f70f5268f Merge "Add "new incognito window" translations." into honeycomb-mr1 2011-03-14 14:13:29 -07:00
Eric Fischer
7b31d5c84f Import revised translations. DO NOT MERGE 
Change-Id: I5d1b5c2891ffd19e45dbc6d20caf3449147f7218
 2011-03-14 14:06:03 -07:00
Nicolas Roard
5ee534cf88 Adding placeholders for the fullscreen button 
used by the browser for HTML5 video

bug:4080127
Change-Id: I8fedef7eb0442de547ff083f15f6fcc7a9fea791
 2011-03-14 13:59:04 -07:00
Ramesh Sudini
c06c5c1a13 Do not merge: Telephony: Fix config to reflect the correct CM conn type. 
Reflect the correct connectivity manager connection type in the config.xml.

Change-Id: Ida4d0a6275addda6fe11878fa96dbac70283df91
 2011-03-14 13:44:30 -07:00
Wink Saville
c15cf6353e Merge "Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-LTE 2011-03-14 13:40:58 -07:00
Wink Saville
9d7d62801d Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support" 
This reverts commit eca208fae6d1b6ae9c8c0e42eee092e86dbddbb7
and is the first of the LTE commits in master being back ported
to the LTE branch.

Change-Id: I17d4a1b779ed74bc7dfb409d2c1a30f60fdb27c7
 2011-03-14 12:25:04 -07:00
Gilles Debunne
3c03047bd4 am f2f3627f: am 8503af84: Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1 
* commit 'f2f3627f658931e9e8162cc6d066e4cccd81bd10':
  Paste popup uses a disabled icon when there is nothing to paste.
 2011-03-14 12:06:59 -07:00
Nick Pelly
d1c49d681c am a64e2ad4: resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp 
* commit 'a64e2ad4da3612586594a19489a2b5d44f3f23a0':
  Implement new NFC-EE API's as shared library (frameworks/base).
 2011-03-14 12:04:51 -07:00