From 883ed3000e2811b494682d04296f8fce1006f16f Mon Sep 17 00:00:00 2001
From: ziadb <ziadb@google.com>
Date: Fri, 27 Jul 2018 15:23:50 -0400
Subject: SkAR Java: fixed runtime bugs, better UI

Bug: skia:
Change-Id: Ibfee885f5ed655c2f838d637406406da90f0c6fd
Reviewed-on: https://skia-review.googlesource.com/144033
Reviewed-by: Mike Reed <reed@google.com>
---
 .../apps/skar_java/src/main/res/menu/main_menu.xml | 37 ++++++++--------------
 .../skar_java/src/main/res/menu/platte_bar.xml     | 12 +++++--
 2 files changed, 22 insertions(+), 27 deletions(-)

(limited to 'platform_tools/android/apps/skar_java/src/main/res/menu')

diff --git a/platform_tools/android/apps/skar_java/src/main/res/menu/main_menu.xml b/platform_tools/android/apps/skar_java/src/main/res/menu/main_menu.xml
index 3b96c92651..4e75bc47c7 100644
--- a/platform_tools/android/apps/skar_java/src/main/res/menu/main_menu.xml
+++ b/platform_tools/android/apps/skar_java/src/main/res/menu/main_menu.xml
@@ -17,44 +17,33 @@
 -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <group
-        android:id="@+id/menu_top">
-        <item
-            android:id="@+id/reset_paint"
-            android:title="Reset Finger Painting"/>
-    </group>
-    <group
-        android:id="@+id/menu_middle"
+    <group android:id="@+id/menu_painting"
         android:checkableBehavior="single">
         <item
             android:id="@+id/smooth_paint"
-            android:title="Smooth Painting" />
-        <item
-            android:id="@+id/rough_paint"
-            android:title="Rough Painting" />
+            android:checkable="true"
+            android:checked="true"
+            android:title="@string/menu_painting_smooth" />
     </group>
 
-
-    <group
-        android:id="@+id/menu_bottom"
-        android:checkableBehavior="single">
-
+    <group android:id="@+id/menu_drawables">
         <item
             android:id="@+id/draw_circle"
-            android:title="Circle" >
+            android:checked="true"
+            android:checkable="true"
+            android:title="@string/menu_drawable_circle" >
         </item>
         <item
             android:id="@+id/draw_rect"
-            android:title="Rect" >
+            android:title="@string/menu_drawable_rect" >
         </item>
         <item
-            android:id="@+id/draw_animation"
-            android:title="Animation" >
+            android:id="@+id/draw_text"
+            android:title="@string/menu_drawable_text" >
         </item>
         <item
-            android:id="@+id/draw_text"
-            android:title="Text" >
+            android:id="@+id/draw_animation"
+            android:title="@string/menu_drawable_animation" >
         </item>
     </group>
-
 </menu>
\ No newline at end of file
diff --git a/platform_tools/android/apps/skar_java/src/main/res/menu/platte_bar.xml b/platform_tools/android/apps/skar_java/src/main/res/menu/platte_bar.xml
index 0e28cae592..b20ab1ea60 100644
--- a/platform_tools/android/apps/skar_java/src/main/res/menu/platte_bar.xml
+++ b/platform_tools/android/apps/skar_java/src/main/res/menu/platte_bar.xml
@@ -19,11 +19,17 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/palette_red"
-        android:title="Red" />
+        android:icon="@drawable/splash"
+        android:iconTint="@android:color/holo_red_dark"
+        android:title="@string/palette_red" />
     <item
         android:id="@+id/palette_green"
-        android:title="Green" />
+        android:icon="@drawable/splash"
+        android:iconTint="@android:color/holo_green_dark"
+        android:title="@string/palette_green" />
     <item
         android:id="@+id/palette_reset"
-        android:title="Reset" />
+        android:icon="@drawable/clear"
+        android:iconTint="@android:color/black"
+        android:title="@string/palette_reset" />
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3