Merge pull request #79 from doncung/RemoveFilterTouches

Remove filter touches when obscured from layouts to allow for screen …
box · Mar 28, 2017 · 5599cc0 · 5599cc0
2 parents 28752e2 + 36c0374
commit 5599cc0
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 9 deletions.
diff --git a/box-share-sdk/build.gradle b/box-share-sdk/build.gradle
@@ -7,9 +7,9 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 10001
-        versionName "1.0.1-SNAPSHOT"
-        version "1.0.1-SNAPSHOT"
+        versionCode 21000
+        versionName "2.1.0"
+        version "2.1.0"
         group "com.box"
     }
     buildTypes {
@@ -42,7 +42,7 @@ dependencies {
     compile 'com.android.support:appcompat-v7:23.1.1'
     // If using local dependency instead of maven, use the path pointing to the content sdk to replace
     // the maven dependency. e.g.:compile project(':box-android-content-sdk:box-content-sdk')
-    compile 'com.box:box-android-sdk:4.0.+'
+    compile 'com.box:box-android-sdk:4.0.8'
     compile "com.splitwise:tokenautocomplete:2.0.5@aar"
 }
 

diff --git a/box-share-sdk/src/main/java/com/box/androidsdk/share/activities/BoxActivity.java b/box-share-sdk/src/main/java/com/box/androidsdk/share/activities/BoxActivity.java
@@ -7,12 +7,14 @@
 import android.support.v7.app.ActionBarActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.Toast;
 
 import com.box.androidsdk.content.BoxApiBookmark;
 import com.box.androidsdk.content.BoxApiCollaboration;
 import com.box.androidsdk.content.BoxApiFile;
 import com.box.androidsdk.content.BoxApiFolder;
+import com.box.androidsdk.content.BoxConfig;
 import com.box.androidsdk.content.BoxFutureTask;
 import com.box.androidsdk.content.models.BoxIteratorCollaborations;
 import com.box.androidsdk.content.models.BoxSession;
@@ -46,6 +48,9 @@ public abstract class BoxActivity extends ActionBarActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        if (BoxConfig.IS_FLAG_SECURE){
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
+        }
         String userId = null;
         if (savedInstanceState != null && savedInstanceState.getSerializable(CollaborationUtils.EXTRA_ITEM) != null){
             userId = savedInstanceState.getString(CollaborationUtils.EXTRA_USER_ID);

diff --git a/box-share-sdk/src/main/res/layout/activity_collaborations.xml b/box-share-sdk/src/main/res/layout/activity_collaborations.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="@color/box_sharesdk_background"
-    android:filterTouchesWhenObscured="true">
+    android:filterTouchesWhenObscured="false">
     <include layout="@layout/view_action_bar" />
     <FrameLayout
         android:id="@+id/fragmentContainer"

diff --git a/box-share-sdk/src/main/res/layout/activity_invite_collaborators.xml b/box-share-sdk/src/main/res/layout/activity_invite_collaborators.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="@color/box_sharesdk_background"
-    android:filterTouchesWhenObscured="true">
+    android:filterTouchesWhenObscured="false">
     <include layout="@layout/view_action_bar" />
     <FrameLayout
         android:id="@+id/fragmentContainer"

diff --git a/box-share-sdk/src/main/res/layout/activity_shared_link.xml b/box-share-sdk/src/main/res/layout/activity_shared_link.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:background="@color/box_sharesdk_background"
     android:orientation="vertical"
-    android:filterTouchesWhenObscured="true">
+    android:filterTouchesWhenObscured="false">
     <include layout="@layout/view_action_bar" />
     <FrameLayout
         android:id="@+id/fragmentContainer"

diff --git a/box-share-sdk/src/main/res/layout/activity_shared_link_access.xml b/box-share-sdk/src/main/res/layout/activity_shared_link_access.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:background="@color/box_sharesdk_background"
     android:orientation="vertical"
-    android:filterTouchesWhenObscured="true">
+    android:filterTouchesWhenObscured="false">
     <include layout="@layout/view_action_bar" />
     <FrameLayout
         android:id="@+id/fragmentContainer"

diff --git a/box-share-sdk/src/main/res/layout/fragment_collaboration_roles_dialog.xml b/box-share-sdk/src/main/res/layout/fragment_collaboration_roles_dialog.xml
@@ -5,7 +5,7 @@
     android:background="@color/background_material_light"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:filterTouchesWhenObscured="true"
+    android:filterTouchesWhenObscured="false"
     android:minWidth="360dp">
     <ScrollView
         android:layout_width="match_parent"