Initial API Level 14 (ICS) port

CyanogenMod · Nov 10, 2012 · a209dd3 · a209dd3
1 parent 2f9d3a4
commit a209dd3
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 8 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -21,7 +21,8 @@
 
   <original-package android:name="com.cyanogenmod.filemanager" />
 
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="16" />
+  <!-- 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/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
@@ -301,7 +301,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 = getNavigationView(NavigationActivity.
@@ -320,7 +322,7 @@ public Uri[] createBeamUris(NfcEvent event) {
                     }
                     return null;
                 }
-            }, this);
+            }, this);*/
         }
 
         // Show welcome message

diff --git a/src/com/cyanogenmod/filemanager/adapters/TwoColumnsMenuListAdapter.java b/src/com/cyanogenmod/filemanager/adapters/TwoColumnsMenuListAdapter.java
@@ -200,7 +200,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/dialogs/FilesystemInfoDialog.java b/src/com/cyanogenmod/filemanager/ui/dialogs/FilesystemInfoDialog.java
@@ -317,7 +317,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
@@ -480,7 +480,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)
     }
 }