10 inch tablet fixes

hidekiy · Dec 30, 2013 · 874af94 · 874af94
1 parent 2be1666
commit 874af94
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/coinbase-android/res/layout-sw800dp/activity_main.xml b/coinbase-android/res/layout-sw800dp/activity_main.xml
@@ -9,7 +9,8 @@
 
     <View android:layout_width="1dp"
           android:layout_height="match_parent"
-          android:background="#dddddd" />
+          android:background="#dddddd"
+          android:id="@+id/activity_main_divider"/>
 
     <!-- The main content view -->
     <include layout="@layout/activity_main_content" />

diff --git a/coinbase-android/src/com/coinbase/android/MainActivity.java b/coinbase-android/src/com/coinbase/android/MainActivity.java
@@ -183,7 +183,7 @@ public void onCreate(Bundle savedInstanceState) {
     mViewFlipper = (ViewFlipper) findViewById(R.id.flipper);
 
     // Configure the DrawerLayout (never pin menu on POS app)
-    mPinSlidingMenu = getResources().getBoolean(R.bool.pin_sliding_menu) && BuildConfig.type == BuildType.CONSUMER;
+    mPinSlidingMenu = getResources().getBoolean(R.bool.pin_sliding_menu);
     getSupportActionBar().setHomeButtonEnabled(!mPinSlidingMenu);
 
     if(!mPinSlidingMenu) {
@@ -219,6 +219,10 @@ public void onDrawerOpened(View drawerView) {
 
     // Set up Sliding Menu list
     mMenuListView = (ListView) findViewById(R.id.drawer);
+    if (BuildConfig.type == BuildType.MERCHANT && mPinSlidingMenu) {
+      mMenuListView.setVisibility(View.GONE);
+      findViewById(R.id.activity_main_divider).setVisibility(View.GONE);
+    }
     createProfileView();
     int shortestWidth = Math.min(getResources().getDisplayMetrics().widthPixels, getResources().getDisplayMetrics().heightPixels);
     int dWidthCalc = (int) (shortestWidth * (3.0/4.0)),