Skip to content

Commit a0dfb10

Browse files
committed
remove android version digit
1 parent 2430f0a commit a0dfb10

File tree

5 files changed

+14
-25
lines changed

5 files changed

+14
-25
lines changed

src/cn/trinea/android/common/constant/AndroidConstants.java

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/cn/trinea/android/common/service/HttpCache.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010

1111
import android.content.Context;
1212
import android.os.AsyncTask;
13-
import android.os.Build.VERSION;
14-
import cn.trinea.android.common.constant.AndroidConstants;
13+
import android.os.Build;
1514
import cn.trinea.android.common.constant.HttpConstants;
1615
import cn.trinea.android.common.dao.HttpCacheDao;
1716
import cn.trinea.android.common.dao.impl.HttpCacheDaoImpl;
@@ -155,7 +154,7 @@ public HttpResponse httpGet(HttpRequest request) {
155154
*/
156155
public void httpGet(String url, HttpCacheListener listener) {
157156
// if bigger than android 4.0 use executeOnExecutor, else use execute
158-
if (VERSION.SDK_INT >= AndroidConstants.ICE_CREAM_SANDWICH) {
157+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
159158
new HttpCacheStringAsyncTask(listener).executeOnExecutor(THREAD_POOL_EXECUTOR, url);
160159
} else {
161160
new HttpCacheStringAsyncTask(listener).execute(url);
@@ -175,7 +174,12 @@ public void httpGet(String url, HttpCacheListener listener) {
175174
* something
176175
*/
177176
public void httpGet(HttpRequest request, HttpCacheListener listener) {
178-
new HttpCacheRequestAsyncTask(listener).executeOnExecutor(THREAD_POOL_EXECUTOR, request);
177+
// if bigger than android 4.0 use executeOnExecutor, else use execute
178+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
179+
new HttpCacheRequestAsyncTask(listener).executeOnExecutor(THREAD_POOL_EXECUTOR, request);
180+
} else {
181+
new HttpCacheRequestAsyncTask(listener).execute(request);
182+
}
179183
}
180184

181185
/**

src/cn/trinea/android/common/util/DownloadManagerPro.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,8 @@ private static void initResumeMethod() {
208208
* @return
209209
*/
210210
public String getFileName(long downloadId) {
211-
return getString(downloadId, (Build.VERSION.SDK_INT < 11 ? COLUMN_LOCAL_URI : COLUMN_LOCAL_FILENAME));
211+
return getString(downloadId, (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB ? COLUMN_LOCAL_URI
212+
: COLUMN_LOCAL_FILENAME));
212213
}
213214

214215
/**

src/cn/trinea/android/common/util/PackageUtils.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -524,13 +524,14 @@ private static String getInstallLocationParams() {
524524
public static void startInstalledAppDetails(Context context, String packageName) {
525525
Intent intent = new Intent();
526526
int sdkVersion = Build.VERSION.SDK_INT;
527-
if (sdkVersion >= 9) {
527+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) {
528528
intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
529529
intent.setData(Uri.fromParts("package", packageName, null));
530530
} else {
531531
intent.setAction(Intent.ACTION_VIEW);
532532
intent.setClassName("com.android.settings", "com.android.settings.InstalledAppDetails");
533-
intent.putExtra((sdkVersion == 8 ? "pkg" : "com.android.settings.ApplicationPkgName"), packageName);
533+
intent.putExtra((sdkVersion == Build.VERSION_CODES.FROYO ? "pkg"
534+
: "com.android.settings.ApplicationPkgName"), packageName);
534535
}
535536
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
536537
context.startActivity(intent);

src/cn/trinea/android/common/util/ViewUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public static int getListViewHeightBasedOnChildren(ListView view) {
8484
// if (view == null || view.getChildCount() <= 0) {
8585
// return 0;
8686
// }
87-
// if (Build.VERSION.SDK_INT >= 11) {
87+
// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
8888
// return getNumColumnsCompat11(view);
8989
//
9090
// } else {

0 commit comments

Comments
 (0)