CyanogenMod · Nov 10, 2012 · Nov 13, 2012 · Nov 13, 2012 · Nov 17, 2012 · Nov 18, 2012
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -21,7 +21,8 @@
 
   <original-package android:name="com.cyanogenmod.filemanager" />
 
-  <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="17" />
+  <!-- Updated to be 14 for CM9 / ICS compatibility -->
+  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14" />
 
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />

diff --git a/libs/color-picker-view/src/afzkl/development/mColorPicker/views/APILevel17.java b/libs/color-picker-view/src/afzkl/development/mColorPicker/views/APILevel17.java
@@ -0,0 +1,30 @@
+package afzkl.development.mColorPicker.views;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+/*
+ * Fill in API Level 17 gaps that are in use in CMFileManager
+ */
+public class APILevel17 {
+
+	private static final AtomicInteger sNextGeneratedId = new AtomicInteger(1);
+
+	/**
+	 * Generate a value suitable for use in {@link #setId(int)}.
+	 * This value will not collide with ID values generated at build time by aapt for R.id.
+	 *
+	 * @return a generated ID value
+	 */
+	public static int generateViewId() {
+		for (;;) {
+			final int result = sNextGeneratedId.get();
+			// aapt-generated IDs have the high byte nonzero; clamp to the range under that.
+			int newValue = result + 1;
+			if (newValue > 0x00FFFFFF) newValue = 1; // Roll over to 1, not 0.
+			if (sNextGeneratedId.compareAndSet(result, newValue)) {
+				return result;
+			}
+		}
+	}
+
+}
diff --git a/libs/color-picker-view/src/afzkl/development/mColorPicker/views/ColorDialogView.java b/libs/color-picker-view/src/afzkl/development/mColorPicker/views/ColorDialogView.java
@@ -111,7 +111,7 @@ private void init() {
         // Create the scrollview over the dialog
         final int dlgMarging = (int)convertDpToPixel(DEFAULT_MARGIN_DP);
         ScrollView sv = new ScrollView(getContext());
-        sv.setId(generateViewId());
+        sv.setId(APILevel17.generateViewId());
         RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(
                 android.view.ViewGroup.LayoutParams.MATCH_PARENT,
                 android.view.ViewGroup.LayoutParams.WRAP_CONTENT);
@@ -121,7 +121,7 @@ private void init() {
 
         // Now the vertical layout
         LinearLayout ll = new LinearLayout(getContext());
-        ll.setId(generateViewId());
+        ll.setId(APILevel17.generateViewId());
         lp = new RelativeLayout.LayoutParams(
                 android.view.ViewGroup.LayoutParams.MATCH_PARENT,
                 android.view.ViewGroup.LayoutParams.MATCH_PARENT);
@@ -199,7 +199,7 @@ public CharSequence filter(CharSequence source, int start,
         this.etColor.addTextChangedListener(this);
 
         LinearLayout ll1 = new LinearLayout(getContext());
-        ll1.setId(generateViewId());
+        ll1.setId(APILevel17.generateViewId());
         RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(
                 android.view.ViewGroup.LayoutParams.MATCH_PARENT,
                 android.view.ViewGroup.LayoutParams.WRAP_CONTENT);
@@ -223,7 +223,7 @@ public CharSequence filter(CharSequence source, int start,
     private int createColorPicker(ViewGroup parent, int belowOf) {
         final int dlgMarging = (int)convertDpToPixel(DEFAULT_MARGIN_DP);
         this.mPickerView = new ColorPickerView(getContext());
-        this.mPickerView.setId(generateViewId());
+        this.mPickerView.setId(APILevel17.generateViewId());
         this.mPickerView.setOnColorChangedListener(this);
         RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(
                 android.view.ViewGroup.LayoutParams.MATCH_PARENT,
@@ -274,7 +274,7 @@ private int createColorsPanel(ViewGroup parent, int belowOf) {
         sep1.setTextSize(TypedValue.COMPLEX_UNIT_SP, DEFAULT_TEXT_SIZE_SP);
 
         LinearLayout ll1 = new LinearLayout(getContext());
-        ll1.setId(generateViewId());
+        ll1.setId(APILevel17.generateViewId());
         RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(
                 android.view.ViewGroup.LayoutParams.MATCH_PARENT,
                 android.view.ViewGroup.LayoutParams.WRAP_CONTENT);
@@ -306,7 +306,7 @@ private int createColorsPanel(ViewGroup parent, int belowOf) {
         sep2.setTextSize(TypedValue.COMPLEX_UNIT_SP, DEFAULT_TEXT_SIZE_SP);
 
         LinearLayout ll2 = new LinearLayout(getContext());
-        ll2.setId(generateViewId());
+        ll2.setId(APILevel17.generateViewId());
         lp = new RelativeLayout.LayoutParams(
                 android.view.ViewGroup.LayoutParams.MATCH_PARENT, panelHeight);
         lp.setMargins(dlgMarging, 0, dlgMarging, dlgMarging/2);

diff --git a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
@@ -332,7 +332,9 @@ protected void onCreate(Bundle state) {
         //Initialize nfc adapter
         NfcAdapter mNfcAdapter = NfcAdapter.getDefaultAdapter(this);
         if (mNfcAdapter != null) {
-            mNfcAdapter.setBeamPushUrisCallback(new NfcAdapter.CreateBeamUrisCallback() {
+//FIXME: Disabled for now; Not familiar with NFC stuff [yet]
+mNfcAdapter = null;
+/*            mNfcAdapter.setBeamPushUrisCallback(new NfcAdapter.CreateBeamUrisCallback() {
                 @Override
                 public Uri[] createBeamUris(NfcEvent event) {
                     List<FileSystemObject> selectedFiles =
@@ -351,7 +353,7 @@ public Uri[] createBeamUris(NfcEvent event) {
                     }
                     return null;
                 }
-            }, this);
+            }, this);*/
         }
 
         //Initialize activity

diff --git a/src/com/cyanogenmod/filemanager/adapters/TwoColumnsMenuListAdapter.java b/src/com/cyanogenmod/filemanager/adapters/TwoColumnsMenuListAdapter.java
@@ -207,7 +207,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
             tvText2.setOnLongClickListener(this);
             tvText2.setTag(String.format("%d|%d", position, menuItem2.getItemId())); //$NON-NLS-1$
         } else {
-            tvText2.setBackground(null);
+            tvText2.setBackgroundDrawable(null); // Fix for CM9 (ICS)
             tvText2.setClickable(false);
             tvText2.setOnClickListener(null);
             tvText2.setOnLongClickListener(null);

diff --git a/src/com/cyanogenmod/filemanager/ui/ThemeManager.java b/src/com/cyanogenmod/filemanager/ui/ThemeManager.java
@@ -463,14 +463,14 @@ public void setBackgroundDrawable(Context ctx, View view, String resource) {
             String resId = String.format("%s_%s", this.mId, resource); //$NON-NLS-1$
             int id = this.mResources.getIdentifier(resId, "drawable", this.mPackage); //$NON-NLS-1$
             if (id != 0) {
-                view.setBackground(this.mResources.getDrawable(id));
+                view.setBackgroundDrawable(this.mResources.getDrawable(id));
                 return;
             }
 
             // Default theme
             id = mDefaultTheme.mResources.getIdentifier(
                     resource, "drawable", mDefaultTheme.mPackage); //$NON-NLS-1$
-            view.setBackground(mDefaultTheme.mResources.getDrawable(id));
+            view.setBackgroundDrawable(mDefaultTheme.mResources.getDrawable(id));
         }
 
         /**

diff --git a/src/com/cyanogenmod/filemanager/ui/dialogs/FilesystemInfoDialog.java b/src/com/cyanogenmod/filemanager/ui/dialogs/FilesystemInfoDialog.java
@@ -304,7 +304,7 @@ public void run() {
                     boolean mountAllowed = MountPointHelper.isMountAllowed(this.mMountPoint);
                     if (mountAllowed) {
                         this.mInfoMsgView.setVisibility(View.GONE);
-                        this.mInfoMsgView.setBackground(null);
+                        this.mInfoMsgView.setBackgroundDrawable(null); // Fix for CM9 (ICS)
                         this.mSwStatus.setEnabled(true);
                         this.mIsMountAllowed = true;
                         break;

diff --git a/src/com/cyanogenmod/filemanager/ui/dialogs/FsoPropertiesDialog.java b/src/com/cyanogenmod/filemanager/ui/dialogs/FsoPropertiesDialog.java
@@ -532,7 +532,7 @@ public void onClick(View v) {
                 if (superuser) {
                     this.mInfoMsgView.setOnClickListener(null);
                     this.mInfoMsgView.setVisibility(View.GONE);
-                    this.mInfoMsgView.setBackground(null);
+                    this.mInfoMsgView.setBackgroundDrawable(null); // Fix for CM9 (ICS)
 
                     // Enable controls
                     this.mSpnOwner.setEnabled(true);

diff --git a/src/com/cyanogenmod/filemanager/ui/widgets/SelectionView.java b/src/com/cyanogenmod/filemanager/ui/widgets/SelectionView.java
@@ -87,7 +87,7 @@ private void init() {
                     @Override
                     public void onGlobalLayout() {
                         SelectionView.this.mViewHeight = getHeight();
-                        getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                        getViewTreeObserver().removeGlobalOnLayoutListener(this); // Fix for CM9 (ICS)
                         setVisibility(View.GONE);
                         LayoutParams params = (LayoutParams)SelectionView.this.getLayoutParams();
                         params.height = 0;

diff --git a/src/com/cyanogenmod/filemanager/ui/widgets/TransparentNonFocusableButtonItem.java b/src/com/cyanogenmod/filemanager/ui/widgets/TransparentNonFocusableButtonItem.java
@@ -66,6 +66,6 @@ public TransparentNonFocusableButtonItem(Context context, AttributeSet attrs, in
      */
     private void init() {
         //Remove focus
-        setBackground(null);
+        setBackgroundDrawable(null); // Fix for CM9 (ICS)
     }
 }
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
@@ -4,7 +4,7 @@
 
   <original-package android:name="com.cyanogenmod.filemanager.test" />
 
-  <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="17" />
+  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14" />
 
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />