ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity
31,807 Commits 2 Branches 0 Tags 54 MiB
f518993012
Commit Graph

31807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
a330ca6cd0 am d5e8dae8: Import revised translations. DO NOT MERGE 
* commit 'd5e8dae883f8343e7adfb1f4388d742002e5eb8e':
  Import revised translations.  DO NOT MERGE
 2011-03-14 15:14:59 -07:00
Scott Main
712a7fb381 am c899d32e: docs: update search dev guide with SearcView widget 
* commit 'c899d32e8be988b46c37206827a0a1a7a4b809a6':
  docs: update search dev guide with SearcView widget
 2011-03-14 15:14:36 -07:00
Eric Fischer
40655edecd am e0b33ce0: Add "new incognito window" translations. 
* commit 'e0b33ce0c3ebdb7aa73af5350bb5bdcd26f59370':
  Add "new incognito window" translations.
 2011-03-14 15:14:22 -07:00
Nicolas Roard
c9eb44612b 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
Scott Main
93e683b4e4 am 2213a4ac: am 462012db: am abdf0d53: docs: update search dev guide with SearcView widget 
* commit '2213a4aca030151f6590a998200daa9865202343':
  docs: update search dev guide with SearcView widget
 2011-03-14 14:59:11 -07:00
Eric Fischer
5486e6dcb7 am 95176382: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 
* commit '951763824168d08d3f54ba22917756d769486b8b':
 2011-03-14 14:58:50 -07:00
Eric Fischer
48456a6bf3 am 9f7b4ba6: Import revised translations. DO NOT MERGE 
* commit '9f7b4ba69ca809d6909b8863d3570f970edcb7bf':
  Import revised translations.  DO NOT MERGE
 2011-03-14 14:58:45 -07:00
Eric Fischer
d1204459c8 am aa3ea7be: Add "new incognito window" translations. 
* commit 'aa3ea7be0c78e8aa5f3a32b0decba03edba00686':
  Add "new incognito window" translations.
 2011-03-14 14:58:39 -07:00
Jamie Gennis
1a4efdc224 Merge "gl2_yuvtex: use the gralloc-provided stride." into honeycomb-mr1 2011-03-14 14:49:37 -07:00
Huahui Wu
48e7f35d10 am b71020ef: Merge "b/3392594 keep the remain touch points when one is ended." into honeycomb-mr1 
* commit 'b71020ef4018195a21d2538ea3767b901610daf4':
  b/3392594 keep the remain touch points when one is ended.
 2011-03-14 14:46:27 -07:00
Huahui Wu
b8847d1bbb Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 2011-03-14 14:46:26 -07:00
Huahui Wu
b9ab7f5478 Merge "b/3392594 keep the remain touch points when one is ended." into honeycomb-mr1 2011-03-14 14:43:46 -07:00
Scott Main
3758c1b419 am 462012db: am abdf0d53: docs: update search dev guide with SearcView widget 
* commit '462012db70fb73431bb25909d73e45fea9fc5911':
  docs: update search dev guide with SearcView widget
 2011-03-14 14:42:51 -07:00
Eric Fischer
605afd89e3 Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 2011-03-14 14:42:50 -07:00
Scott Main
529031662f am abdf0d53: docs: update search dev guide with SearcView widget 
* commit 'abdf0d533c292709e51cee2c1213d5e44baca963':
  docs: update search dev guide with SearcView widget
 2011-03-14 14:36:56 -07:00
Eric Fischer
7175cacc8c am 175121a5: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '175121a513f4cea91d7950d6b3978383d3b2a352':
  Import revised translations.  DO NOT MERGE
 2011-03-14 14:29:05 -07:00
Eric Fischer
8cf7363ba7 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
Eric Fischer
b066ddc849 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-14 14:17:01 -07:00
Eric Fischer
230de7bfc0 Merge "Add "new incognito window" translations." into honeycomb-mr1 2011-03-14 14:13:29 -07:00
Ramesh Sudini
acd5de1b85 am e62dee25: Do not merge: Telephony: Rename lte_on_cdma property. 
* commit 'e62dee25e50c04c235cd37df66e4ef123b761663':
  Do not merge: Telephony: Rename lte_on_cdma property.
 2011-03-14 13:49:36 -07:00
Ramesh Sudini
fe974fc806 am f5727615: Do not merge: Telephony: Corrections to LTE and eHRPD constant values. 
* commit 'f57276154aaa587524374db8e0d7228383611bf3':
  Do not merge: Telephony: Corrections to LTE and eHRPD constant values.
 2011-03-14 13:47:48 -07:00
Wink Saville
95315a5c8a am f90c2609: Do not merge: Add outputting "on" or "off" setRadioPower. 
* commit 'f90c26090402a517aa68cade7f452bc1ad85e654':
  Do not merge: Add outputting "on" or "off" setRadioPower.
 2011-03-14 13:47:44 -07:00
Ramesh Sudini
0eca33c915 am c06c5c1a: Do not merge: Telephony: Fix config to reflect the correct CM conn type. 
* commit 'c06c5c1a13da26c8435f2d4b72a41a38e1d463b8':
  Do not merge: Telephony: Fix config to reflect the correct CM conn type.
 2011-03-14 13:47:42 -07:00
Wink Saville
732e0d2e17 am 124e2872: Do not merge: Have createAllDataConnectionList create the RetryManager inside the loop. 
* commit '124e28728b16cb63c700a323b9dfb1348580c896':
  Do not merge: Have createAllDataConnectionList create the RetryManager inside the loop.
 2011-03-14 13:47:39 -07:00
Wink Saville
654e381e67 am 321b730a: Do not merge: Remove mRetryMgr and directly use DataConnection retry mgr. 
* commit '321b730a9d34b237c26075d963c8febf8d62eff1':
  Do not merge: Remove mRetryMgr and directly use DataConnection retry mgr.
 2011-03-14 13:47:36 -07:00
Ying Wang
a68f3ad15a am bf079216: Dist classes.jar with full class files inside 
* commit 'bf079216c607b660a0ad219df6c4752906a7fc61':
  Dist classes.jar with full class files inside
 2011-03-14 13:45:34 -07:00
Wink Saville
adf53bf027 am d6398ad3: Merge "Do not merge: Fix 3G connectivity bug 3513741." into honeycomb-LTE 
* commit 'd6398ad3ce962a6345d18b166ae8484a4259f6f2':
  Do not merge: Fix 3G connectivity bug 3513741.
 2011-03-14 13:44:50 -07:00
Wink Saville
9460cac2ff am 08d79acc: Merge "Do not merge: RIL: Merge Issue. LTE SIM additions." into honeycomb-LTE 
* commit '08d79acc462a395a6fb6d0b126eb4d97466962c7':
  Do not merge: RIL: Merge Issue. LTE SIM additions.
 2011-03-14 13:44:48 -07:00
Wink Saville
8ce508231f am 7fbae1d2: Merge "Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer." into honeycomb-LTE 
* commit '7fbae1d23c99383d0dbaa1be35a41246934e3ce4':
  Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer.
 2011-03-14 13:44:45 -07:00
Wink Saville
536c9e41b1 am 16b7f051: Merge "Do not merge: LTE: Fix SST for CDMALTEPhone." into honeycomb-LTE 
* commit '16b7f051f71e276f4dd45455e92c33a0894bab10':
  Do not merge: LTE: Fix SST for CDMALTEPhone.
 2011-03-14 13:44:43 -07:00
Wink Saville
ea1b0c6b66 am 9e22c33c: Merge "Do not merge: Clean up LTE code change" into honeycomb-LTE 
* commit '9e22c33c2b6ff5c9a45ebac88d048f6f61557e82':
  Do not merge: Clean up LTE code change
 2011-03-14 13:44:40 -07:00
Wink Saville
4deedeb0e7 am c3853f36: Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE 
* commit 'c3853f36645f2f4f4801d6465e82095cf38ea043':
  Do not merge: Add some input checking to prevent problems
 2011-03-14 13:44:37 -07:00
Wink Saville
846d2b4f27 Merge "Do not merge: Fix 3G connectivity bug 3513741." into honeycomb-LTE 2011-03-14 13:43:05 -07:00
Wink Saville
35f9c49542 am c15cf635: Merge "Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-LTE 
* commit 'c15cf6353ee1c1cae83039a19fb8d5e5c7d76804':
  Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
 2011-03-14 13:42:50 -07:00
Wink Saville
456b90a3a6 Merge "Do not merge: RIL: Merge Issue. LTE SIM additions." into honeycomb-LTE 2011-03-14 13:42:49 -07:00
Wink Saville
fc2aa886fe Merge "Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer." into honeycomb-LTE 2011-03-14 13:42:24 -07:00
Wink Saville
1ad816a48f Merge "Do not merge: LTE: Fix SST for CDMALTEPhone." into honeycomb-LTE 2011-03-14 13:42:07 -07:00
Wink Saville
b979cc999b Merge "Do not merge: Clean up LTE code change" into honeycomb-LTE 2011-03-14 13:41:42 -07:00
Wink Saville
34840b1c6e Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE 2011-03-14 13:41:26 -07:00
Gilles Debunne
b66cc3d5fc am 816dd3d4: (-s ours) resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp 
* commit '816dd3d443108b473965f97123eef7300f53615f':
  Double tap on a word no longer opens context menu. DO NOT MERGE
 2011-03-14 13:41:14 -07:00
Wink Saville
32abb2088b 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
Mike Lockwood
d35aa6953c am 78b8e1be: Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread 
* commit '78b8e1be97c61f7e0b28b145fadd0c646fd1c46b':
  DO NOT MERGE: backport recent USB accessory changes from honeycomb
 2011-03-14 13:37:54 -07:00
Simon Wilson
ab42c6e9bd am ee3f6ef2: Merge "DO NOT MERGE Support WiMAX Settings & ticker message" into gingerbread 
* commit 'ee3f6ef2fc7bcfae9d8af8430760388f653a10c8':
  DO NOT MERGE Support WiMAX Settings & ticker message
 2011-03-14 13:34:18 -07:00
Daniel Sandler
1d54dc2d85 am 45660662: Merge "Workaround unknown ERI indices." into gingerbread 
* commit '45660662e61e8cc3ff13144668767a86d1d5b7f4':
  Workaround unknown ERI indices.
 2011-03-14 13:34:08 -07:00
Mike Lockwood
d24c514601 Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread 2011-03-14 13:17:24 -07:00
Gilles Debunne
4feb59c624 resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp 
Change-Id: I7f9c71eeb9fc5e01856f764930c6f168741cc9da
 2011-03-14 12:57:01 -07:00
Irfan Sheriff
00ff0ca922 am 9b1ea0bd: am e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1 
* commit '9b1ea0bd2c9af64c424fa4fef327108cb376b74f':
  Backup and restore IP and proxy settings
 2011-03-14 11:56:03 -07:00
Irfan Sheriff
2de4863141 am e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1 
* commit 'e21110f8b1e4aa884f7a4e2164ae90dab8d5f3fa':
  Backup and restore IP and proxy settings
 2011-03-14 11:50:38 -07:00
Kenny Root
ea6193c275 am 206c62ed: am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp" 
* commit '206c62ed34dc8a48fd6c907d95456226949f42dd':
  Remove unnecessary SkImageDecoder_libjpeg.cpp
 2011-03-14 11:49:56 -07:00
Irfan Sheriff
bd9100b11b Merge "Backup and restore IP and proxy settings" into honeycomb-mr1 2011-03-14 11:48:35 -07:00