6 files changed, 21 insertions, 15 deletions
diff --git a/data/res/layout/floating_popup_menu_button.xml b/data/res/layout/floating_popup_menu_button.xml
index 6cbe8c80..c419e463 100644
--- a/data/res/layout/floating_popup_menu_button.xml
+++ b/data/res/layout/floating_popup_menu_button.xml
@@ -53,7 +53,6 @@
         android:ellipsize="end"
         android:fontFamily="sans-serif-medium"
         android:textSize="@dimen/floating_toolbar_text_size"
-        android:textAllCaps="true"
         android:textColor="?attr/floatingToolbarForegroundColor"
         android:background="@null"
         android:focusable="false"
diff --git a/data/res/layout/magnifier.xml b/data/res/layout/magnifier.xml
index 181e5e54..d6cd8b4e 100644
--- a/data/res/layout/magnifier.xml
+++ b/data/res/layout/magnifier.xml
@@ -18,10 +18,17 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="?android:attr/floatingToolbarPopupBackgroundDrawable">
-    <ImageView
-        android:id="@+id/magnifier_image"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+    android:layout_height="wrap_content">
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/magnifier_inner"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="?android:attr/floatingToolbarPopupBackgroundDrawable"
+        android:elevation="@android:dimen/magnifier_elevation">
+        <ImageView
+            android:id="@+id/magnifier_image"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    </LinearLayout>
 </LinearLayout>
diff --git a/data/res/layout/slice_grid.xml b/data/res/layout/slice_grid.xml
index 70df76b0..15ded7b3 100644
--- a/data/res/layout/slice_grid.xml
+++ b/data/res/layout/slice_grid.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<android.slice.views.GridView
+<android.app.slice.views.GridView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -21,4 +21,4 @@
     android:gravity="center_vertical"
     android:background="?android:attr/activatedBackgroundIndicator"
     android:clipToPadding="false">
-</android.slice.views.GridView>
+</android.app.slice.views.GridView>
diff --git a/data/res/layout/slice_message.xml b/data/res/layout/slice_message.xml
index a3279b65..96f8078f 100644
--- a/data/res/layout/slice_message.xml
+++ b/data/res/layout/slice_message.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<android.slice.views.MessageView
+<android.app.slice.views.MessageView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -48,4 +48,4 @@
         android:layout_alignStart="@android:id/title"
         android:textAppearance="?android:attr/textAppearanceListItem"
         android:maxLines="10" />
-</android.slice.views.MessageView>
+</android.app.slice.views.MessageView>
diff --git a/data/res/layout/slice_message_local.xml b/data/res/layout/slice_message_local.xml
index d4180f35..5c767ba6 100644
--- a/data/res/layout/slice_message_local.xml
+++ b/data/res/layout/slice_message_local.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<android.slice.views.MessageView
+<android.app.slice.views.MessageView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -35,4 +35,4 @@
         android:background="#ffeeeeee"
         android:maxLines="10" />
 
-</android.slice.views.MessageView>
+</android.app.slice.views.MessageView>
diff --git a/data/res/layout/slice_remote_input.xml b/data/res/layout/slice_remote_input.xml
index dc570c43..90d0c82b 100644
--- a/data/res/layout/slice_remote_input.xml
+++ b/data/res/layout/slice_remote_input.xml
@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 <!-- LinearLayout -->
-<android.slice.views.RemoteInputView
+<android.app.slice.views.RemoteInputView
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/remote_input"
         android:background="@drawable/slice_remote_input_bg"
@@ -73,4 +73,4 @@
 
     </FrameLayout>
 
-</android.slice.views.RemoteInputView>
-\ No newline at end of file
+</android.app.slice.views.RemoteInputView>
+\ No newline at end of file