ラップタイム表示エリアを少し変更。

diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/MainActivity.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/MainActivity.java
index cf7bbdc..8f80de6 100644 (file)
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/MainActivity.java
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/MainActivity.java
@@ -227,7 +227,7 @@ public class MainActivity extends WearableActivity implements IClickCallback, My
 
                 btn2.setImageResource(R.drawable.ic_format_list_bulleted_black_24dp);
                 btn2.setBackgroundColor(bgColor);
-                btn2.setVisibility(View.INVISIBLE);
+                btn2.setVisibility(View.VISIBLE);
                 btn2.invalidate();
 
                 btn3.setImageResource(R.drawable.ic_refresh_black_24dp);

diff --git a/wear/src/main/res/layout-notround/activity_main.xml b/wear/src/main/res/layout-notround/activity_main.xml
index 72bd30f..2dd4ace 100644 (file)
--- a/wear/src/main/res/layout-notround/activity_main.xml
+++ b/wear/src/main/res/layout-notround/activity_main.xml
@@ -87,39 +87,41 @@
             android:layout_below="@id/main_counter"
             android:textSize="8pt"
             android:text="@string/blank" />
-
-        <TextView
-            android:id="@+id/sub_counter2"
-            android:textColor="@color/dark_grey"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textAlignment="textStart"
-            android:layout_alignStart="@id/main_counter"
-            android:layout_below="@id/sub_counter1"
-            android:textSize="8pt"
-            android:text="@string/blank" />
+            android:id="@+id/lap_time_area"
+            android:orientation="vertical"
+            android:scrollbarAlwaysDrawVerticalTrack="true"
+            android:layout_below="@id/sub_counter1">
 
-        <TextView
-            android:id="@+id/sub_counter3"
-            android:textColor="@color/dark_grey"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAlignment="textStart"
-            android:layout_alignStart="@id/main_counter"
-            android:layout_below="@id/sub_counter2"
-            android:textSize="8pt"
-            android:text="@string/blank" />
+            <TextView
+                android:id="@+id/sub_counter2"
+                android:textColor="@color/dark_grey"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAlignment="textStart"
+                android:textSize="7pt"
+                android:text="@string/blank" />
 
-        <TextView
-            android:id="@+id/sub_counter4"
-            android:textColor="@color/dark_grey"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAlignment="textStart"
-            android:layout_alignStart="@id/main_counter"
-            android:layout_below="@id/sub_counter3"
-            android:textSize="8pt"
-            android:text="@string/blank" />
+            <TextView
+                android:id="@+id/sub_counter3"
+                android:textColor="@color/dark_grey"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAlignment="textStart"
+                android:textSize="7pt"
+                android:text="@string/blank" />
+
+            <TextView
+                android:id="@+id/sub_counter4"
+                android:textColor="@color/dark_grey"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAlignment="textStart"
+                android:textSize="7pt"
+                android:text="@string/blank" />
+        </LinearLayout>
 
         <View
             android:id="@+id/background"

diff --git a/wear/src/main/res/layout-round/activity_main.xml b/wear/src/main/res/layout-round/activity_main.xml
index e72ac50..0293822 100644 (file)
--- a/wear/src/main/res/layout-round/activity_main.xml
+++ b/wear/src/main/res/layout-round/activity_main.xml
@@ -87,38 +87,41 @@
             android:textSize="7pt"
             android:text="@string/blank" />
 
-        <TextView
-            android:id="@+id/sub_counter2"
-            android:textColor="@color/dark_grey"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textAlignment="textStart"
-            android:layout_alignStart="@id/main_counter"
-            android:layout_below="@id/sub_counter1"
-            android:textSize="7pt"
-            android:text="@string/blank" />
+            android:id="@+id/lap_time_area"
+            android:orientation="vertical"
+            android:scrollbarAlwaysDrawVerticalTrack="true"
+            android:layout_below="@id/sub_counter1">
 
-        <TextView
-            android:id="@+id/sub_counter3"
-            android:textColor="@color/dark_grey"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAlignment="textStart"
-            android:layout_alignStart="@id/main_counter"
-            android:layout_below="@id/sub_counter2"
-            android:textSize="7pt"
-            android:text="@string/blank" />
+            <TextView
+                android:id="@+id/sub_counter2"
+                android:textColor="@color/dark_grey"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAlignment="textStart"
+                android:textSize="7pt"
+                android:text="@string/blank" />
 
-        <TextView
-            android:id="@+id/sub_counter4"
-            android:textColor="@color/dark_grey"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAlignment="textStart"
-            android:layout_alignStart="@id/main_counter"
-            android:layout_below="@id/sub_counter3"
-            android:textSize="7pt"
-            android:text="@string/blank" />
+            <TextView
+                android:id="@+id/sub_counter3"
+                android:textColor="@color/dark_grey"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAlignment="textStart"
+                android:textSize="7pt"
+                android:text="@string/blank" />
+
+            <TextView
+                android:id="@+id/sub_counter4"
+                android:textColor="@color/dark_grey"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAlignment="textStart"
+                android:textSize="7pt"
+                android:text="@string/blank" />
+        </LinearLayout>
 
         <View
             android:id="@+id/background"