Fix bug #16319697 ACTION_DEVICE_INFO_SETTINGS intent causes Settings app to crash

- fix the way we are passing switchBarMarginStart / switchBarMarginEnd

Change-Id: Ic6e67643be10877a74ae68075460fa5fd4cc5da1

res/layout/settings_main.xml

@@ -33,7 +33,7 @@
                   android:layout_height="?android:attr/actionBarSize"
                   android:layout_width="match_parent"
                   android:background="@drawable/switchbar_background"
-                  android:theme="@android:style/Theme.Material"
+                  android:theme="?attr/switchBarTheme"
                 />
 
         <FrameLayout

res/layout/switch_bar.xml

@@ -23,7 +23,6 @@
               android:layout_height="wrap_content"
               android:layout_width="0dp"
               android:layout_weight="1"
-              android:layout_marginStart="?attr/switchBarMarginStart"
               android:layout_gravity="center_vertical"
               android:textAppearance="@style/TextAppearance.Switch"
               android:textAlignment="viewStart" />
@@ -32,7 +31,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginEnd="?attr/switchBarMarginEnd"
             android:background="@null" />
+
 </merge>