Addition of the "airplane cockpit" watch face -- unfinished. This commit is not yet ready to be merged into dev as more work is required for compatibility with multiple watches.

wear/src/main/AndroidManifest.xml

@@ -92,6 +92,25 @@
             </intent-filter>
         </service>
 
+        <service
+            android:name=".watchfaces.Cockpit"
+            android:allowEmbedded="true"
+            android:label="AAPS(Cockpit)"
+            android:permission="android.permission.BIND_WALLPAPER">
+            <meta-data
+                android:name="android.service.wallpaper"
+                android:resource="@xml/watch_face" />
+            <meta-data
+                android:name="com.google.android.wearable.watchface.preview"
+                android:resource="@drawable/watchface_cockpit" />
+
+            <intent-filter>
+                <action android:name="android.service.wallpaper.WallpaperService" />
+
+                <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE" />
+            </intent-filter>
+        </service>
+
         <service
             android:name=".watchfaces.LargeHome"
             android:allowEmbedded="true"

wear/src/main/java/info/nightscout/androidaps/watchfaces/BaseWatchFace.java

@@ -49,7 +49,7 @@ import lecho.lib.hellocharts.view.LineChartView;
 public  abstract class BaseWatchFace extends WatchFace implements SharedPreferences.OnSharedPreferenceChangeListener {
     public final static IntentFilter INTENT_FILTER;
     public static final long[] vibratePattern = {0,400,300,400,300,400};
-    public TextView mTime, mSgv, mDirection, mTimestamp, mUploaderBattery, mRigBattery, mDelta, mStatus, mBasalRate, mIOB1, mIOB2, mCOB1, mCOB2, mLoop, mDay, mMonth, isAAPSv2;
+    public TextView mTime, mSgv, mDirection, mTimestamp, mUploaderBattery, mRigBattery, mDelta, mStatus, mBasalRate, mIOB1, mIOB2, mCOB1, mCOB2, mLoop, mDay, mMonth, isAAPSv2, mHighLight, mLowLight;
     public double datetime;
     public RelativeLayout mRelativeLayout;
     public LinearLayout mLinearLayout, mLinearLayout2, mDate;
@@ -75,8 +75,8 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
     public PowerManager.WakeLock wakeLock;
     // related endTime manual layout
     public View layoutView;
-    private final Point displaySize = new Point();
+    public final Point displaySize = new Point();
-    private int specW, specH;
+    public int specW, specH;
     private LocalBroadcastManager localBroadcastManager;
     private MessageReceiver messageReceiver;
 
@@ -149,6 +149,8 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
                 mRigBattery = (TextView) stub.findViewById(R.id.rig_battery);
                 mDelta = (TextView) stub.findViewById(R.id.delta);
                 isAAPSv2 = (TextView) stub.findViewById(R.id.AAPSv2);
+                mHighLight = (TextView) stub.findViewById(R.id.highLight);
+                mLowLight = (TextView) stub.findViewById(R.id.lowLight);
                 mRelativeLayout = (RelativeLayout) stub.findViewById(R.id.main_layout);
                 mLinearLayout = (LinearLayout) stub.findViewById(R.id.secondary_layout);
                 mLinearLayout2 = (LinearLayout) stub.findViewById(R.id.tertiary_layout);
@@ -252,7 +254,7 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
                 sUploaderBattery = dataMap.getString("battery");
                 sRigBattery = dataMap.getString("rigBattery");
                 detailedIOB = dataMap.getBoolean("detailedIob");
-                sIOB1 = dataMap.getString("iobTotal");
+                sIOB1 = dataMap.getString("iobTotal") + "U";
                 sIOB2 = dataMap.getString("iobDetail");
                 sCOB1 = "Carb";
                 sCOB2 = dataMap.getString("cob");
@@ -325,6 +327,14 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
                 mCOB1.setVisibility(View.GONE);
                 mCOB2.setVisibility(View.GONE);
             }
+        //deal with cases where there is only the value shown for COB, and not the label
+        } else if (mCOB2 != null) {
+            mCOB2.setText(sCOB2);
+            if (sharedPrefs.getBoolean("show_cob", true)) {
+                mCOB2.setVisibility(View.VISIBLE);
+            } else {
+                mCOB2.setVisibility(View.GONE);
+            }
         }
 
         if (mIOB1 != null && mIOB2 != null) {
@@ -332,13 +342,9 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
                 mIOB1.setVisibility(View.VISIBLE);
                 mIOB2.setVisibility(View.VISIBLE);
                 if (detailedIOB) {
-                    mIOB1.setTextSize(14);
-                    mIOB2.setTextSize(10);
                     mIOB1.setText("IOB " + sIOB1);
                     mIOB2.setText(sIOB2);
                 } else {
-                    mIOB1.setTextSize(10);
-                    mIOB2.setTextSize(14);
                     mIOB1.setText("IOB");
                     mIOB2.setText(sIOB1);
                 }
@@ -346,6 +352,18 @@ public  abstract class BaseWatchFace extends WatchFace implements SharedPreferen
                 mIOB1.setVisibility(View.GONE);
                 mIOB2.setVisibility(View.GONE);
             }
+        //deal with cases where there is only the value shown for IOB, and not the label
+        } else if (mIOB2 != null) {
+            if (sharedPrefs.getBoolean("show_iob", true)) {
+                mIOB2.setVisibility(View.VISIBLE);
+                if (detailedIOB) {
+                    mIOB2.setText(sIOB2);
+                } else {
+                    mIOB2.setText(sIOB1);
+                }
+            } else {
+                mIOB2.setText("");
+            }
         }
 
         if (mTimestamp != null) {

wear/src/main/java/info/nightscout/androidaps/watchfaces/Cockpit.java

@@ -0,0 +1,132 @@
+package info.nightscout.androidaps.watchfaces;
+
+import android.content.Intent;
+import android.support.wearable.view.WatchViewStub;
+import android.support.wearable.watchface.WatchFaceStyle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.interaction.menus.MainMenuActivity;
+
+/**
+ * Created by Andrew on 18/11/2017.
+ */
+
+public class Cockpit extends BaseWatchFace {
+
+    private long sgvTapTime = 0;
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        LayoutInflater inflater = (LayoutInflater) getSystemService(LAYOUT_INFLATER_SERVICE);
+        layoutView = inflater.inflate(R.layout.activity_cockpit, null);
+        performViewSetup();
+        final WatchViewStub stub = (WatchViewStub) layoutView.findViewById(R.id.watch_view_stub);
+    }
+
+    @Override
+    protected void onTapCommand(int tapType, int x, int y, long eventTime) {
+
+        if (mSgv != null) {
+
+            int extra = (mSgv.getRight() - mSgv.getLeft()) / 2;
+            if (tapType == TAP_TYPE_TAP &&
+                    x + extra >= mSgv.getLeft() &&
+                    x - extra <= mSgv.getRight() &&
+                    y >= mSgv.getTop() &&
+                    y <= mSgv.getBottom()) {
+                if (eventTime - sgvTapTime < 800) {
+                    Intent intent = new Intent(this, MainMenuActivity.class);
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    startActivity(intent);
+                }
+                sgvTapTime = eventTime;
+            }
+        }
+    }
+
+    @Override
+    protected WatchFaceStyle getWatchFaceStyle(){
+        return new WatchFaceStyle.Builder(this).setAcceptsTapEvents(true).build();
+    }
+
+    protected void setColorDark() {
+
+        /*
+        //set text sizes
+        float scaleFactor = specH / 400f; //the design assumes 400dp is the default screen height.
+        if (mTime != null) mTime.setTextSize(18*scaleFactor);
+        if (mSgv != null) mSgv.setTextSize(38*scaleFactor);
+        if (mDirection != null) mDirection.setTextSize(30*scaleFactor);
+        if (mDelta != null) mDelta.setTextSize(14*scaleFactor);
+        if (mBasalRate != null) mBasalRate.setTextSize(14*scaleFactor);
+        if (mIOB2 != null) mIOB2.setTextSize(14*scaleFactor);
+        if (mCOB2 != null) mCOB2.setTextSize(14*scaleFactor);
+        if (mUploaderBattery != null) mUploaderBattery.setTextSize(14*scaleFactor);
+        if (mRigBattery != null) mRigBattery.setTextSize(14*scaleFactor);
+        if (mTimestamp != null) mTimestamp.setTextSize(14*scaleFactor);
+        if (mLoop != null) mLoop.setTextSize(14*scaleFactor);
+        if (mHighLight != null) mHighLight.setTextSize(8*scaleFactor);
+        if (mLowLight != null) mLowLight.setTextSize(8*scaleFactor);
+        if (isAAPSv2 != null) isAAPSv2.setTextSize(16*scaleFactor);
+        */
+
+        Log.d("Lights", "mHighLight is " + mHighLight + " and mLowLight is " + mLowLight + ". sgvLevel is " + sgvLevel);
+        if (mHighLight != null && mLowLight != null) {
+            if (sgvLevel == 1) {
+                mHighLight.setBackgroundResource(R.drawable.airplane_led_yellow_lit);
+                mLowLight.setBackgroundResource(R.drawable.airplane_led_grey_unlit);
+            } else if (sgvLevel == 0) {
+                mHighLight.setBackgroundResource(R.drawable.airplane_led_grey_unlit);
+                mLowLight.setBackgroundResource(R.drawable.airplane_led_grey_unlit);
+            } else if (sgvLevel == -1) {
+                mHighLight.setBackgroundResource(R.drawable.airplane_led_grey_unlit);
+                mLowLight.setBackgroundResource(R.drawable.airplane_led_red_lit);
+            }
+        }
+
+        int paddingPixel;
+        int paddingDp;
+        float density = this.getResources().getDisplayMetrics().density;
+
+        if (sharedPrefs.getBoolean("show_uploader_battery", true) && sharedPrefs.getBoolean("show_rig_battery", false)) {
+            paddingPixel = 8;
+            mUploaderBattery.setTextSize(10);
+            mRigBattery.setTextSize(10);
+        } else {
+            paddingPixel = 3;
+            mUploaderBattery.setTextSize(14);
+            mRigBattery.setTextSize(14);
+        }
+        paddingDp = (int)(paddingPixel * density);
+        mUploaderBattery.setPadding(0, paddingDp,0,0);
+        mRigBattery.setPadding(0, paddingDp,0,0);
+
+        if (mIOB2 != null) {
+            if (detailedIOB) {
+                paddingPixel = 8;
+                mIOB2.setTextSize(10);
+            } else {
+                paddingPixel = 3;
+                mIOB2.setTextSize(14);
+            }
+            paddingDp = (int)(paddingPixel * density);
+            mIOB2.setPadding(0, paddingDp,0,0);
+        }
+
+        invalidate();
+
+    }
+
+    protected void setColorLowRes() {
+        setColorDark();
+    }
+
+    protected void setColorBright() {
+        setColorDark();
+    }
+}

wear/src/main/java/info/nightscout/androidaps/watchfaces/Home2.java

@@ -76,6 +76,8 @@ public class Home2 extends BaseWatchFace {
         mMonth.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_midColor));
         mLoop.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_midColor));
 
+        setIobTextSize();
+
         if (sgvLevel == 1) {
             mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_highColor));
             mDirection.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_highColor));
@@ -150,6 +152,7 @@ public class Home2 extends BaseWatchFace {
             pointSize = 2;
             setupCharts();
         }
+        setIobTextSize();
     }
 
     protected void setColorBright() {
@@ -167,6 +170,8 @@ public class Home2 extends BaseWatchFace {
             mMonth.setTextColor(Color.BLACK);
             mLoop.setTextColor(Color.BLACK);
 
+            setIobTextSize();
+
             if (sgvLevel == 1) {
                 mSgv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_highColor));
                 mDirection.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.light_highColor));
@@ -213,4 +218,25 @@ public class Home2 extends BaseWatchFace {
             setColorDark();
         }
     }
+
+    protected void setIobTextSize() {
+
+        if (mIOB1 != null && mIOB2 != null) {
+
+            if (detailedIOB) {
+                mIOB1.setTextSize(14);
+                mIOB2.setTextSize(10);
+            } else {
+                mIOB1.setTextSize(10);
+                mIOB2.setTextSize(14);
+            }
+        //deal with cases where there is only the value shown for IOB, and not the label
+        } else if (mIOB2 != null) {
+            if (detailedIOB) {
+                mIOB2.setTextSize(10);
+            } else {
+                mIOB2.setTextSize(14);
+            }
+        }
+    }
 }

wear/src/main/res/layout/activity_cockpit.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.wearable.view.WatchViewStub
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/watch_view_stub"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:rectLayout="@layout/rect_cockpit"
+    app:roundLayout="@layout/round_cockpit"
+    tools:context=".watchfaces.Cockpit"
+    tools:deviceIds="wear"/>

wear/src/main/res/layout/activity_home_2.xml

@@ -6,7 +6,7 @@
     android:id="@+id/watch_view_stub"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    app:rectLayout="@layout/rect_activity_home"
+    app:rectLayout="@layout/rect_activity_home_2"
     app:roundLayout="@layout/round_activity_home_2"
     tools:context=".watchfaces.Home"
     tools:deviceIds="wear"/>

wear/src/main/res/layout/rect_activity_home_2.xml

@@ -0,0 +1,298 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    android:layout_height="match_parent" tools:context=".watchfaces.Home2" tools:deviceIds="wear_square"
+    android:background="@color/black"
+    android:id="@+id/main_layout">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:textAlignment="center"
+        android:weightSum="1">
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAlignment="center"
+            android:paddingTop="15dp"
+            android:weightSum="1"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center_horizontal"
+            android:layout_marginTop="-5dp">
+
+            <TextView
+                android:id="@+id/loop"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal|bottom"
+                android:layout_marginBottom="2dp"
+                android:background="@drawable/loop_grey_25"
+                android:gravity="center|right"
+                android:paddingRight="7dp"
+                android:paddingTop="-2dp"
+                android:text="--'"
+                android:textAlignment="center"
+                android:textColor="#FFFFFF"
+                android:textSize="14sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/sgv"
+                android:textSize="38sp"
+                android:text="---"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="#FFFFFF"
+                android:layout_gravity="center_horizontal|bottom"
+                android:gravity="bottom|right"
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp"
+                android:layout_marginBottom="-2dp"
+                android:paddingTop="-2dp" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_gravity="center_horizontal"
+                android:baselineAligned="false"
+                android:gravity="center_vertical"
+                android:orientation="vertical"
+                android:textAlignment="center"
+                android:weightSum="1">
+
+                <TextView
+                    android:id="@+id/direction"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal|bottom"
+                    android:gravity="center_horizontal|bottom"
+                    android:text="--"
+                    android:textAlignment="center"
+                    android:textColor="#FFFFFF"
+                    android:textSize="22sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/timestamp"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom"
+                    android:layout_marginBottom="2dp"
+                    android:gravity="center_horizontal|bottom"
+                    android:paddingEnd="8dp"
+                    android:paddingStart="6dp"
+                    android:text="--'"
+                    android:textColor="#FFFFFF"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/light_grey"
+            android:id="@+id/secondary_layout"
+            android:padding="1dp">
+
+            <LinearLayout
+                android:orientation="horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAlignment="center"
+                android:layout_gravity="center_horizontal">
+
+                <TextView
+                    android:id="@+id/delta"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="delta"
+                    android:textAlignment="center"
+                    android:textColor="#000000"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/uploader_battery"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="10sp"
+                    android:text="--%"
+                    android:textAlignment="center"
+                    android:textColor="#000000"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/rig_battery"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="10sp"
+                    android:text="--%"
+                    android:textAlignment="center"
+                    android:textColor="#000000"
+                    android:textSize="14sp"
+                    android:textStyle="bold"
+                    android:visibility="gone" />
+
+                <TextView
+                    android:id="@+id/tmpBasal"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="10sp"
+                    android:text="-.--U/h"
+                    android:textAlignment="center"
+                    android:textColor="#000000"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/AAPSv2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text=""
+                    android:visibility="gone" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/tertiary_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/black"
+            android:orientation="vertical"
+            android:padding="1dp">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:orientation="horizontal"
+                android:textAlignment="center">
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center_horizontal"
+                    android:baselineAligned="false"
+                    android:gravity="center_horizontal"
+                    android:orientation="vertical"
+                    android:textAlignment="center">
+
+                    <TextView
+                        android:id="@+id/cob_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Carb"
+                        android:textColor="#FFFFFF"
+                        android:textSize="10sp"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/cobView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="--g"
+                        android:textAlignment="center"
+                        android:textColor="#FFFFFF"
+                        android:textSize="14sp"
+                        android:textStyle="bold" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/watch_time"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="-3dp"
+                    android:layout_marginTop="-2dp"
+                    android:paddingLeft="20sp"
+                    android:text="12:00"
+                    android:textAlignment="center"
+                    android:textColor="#FFFFFF"
+                    android:textSize="30sp" />
+
+                <LinearLayout
+                    android:id="@+id/date_time"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical|center_horizontal"
+                    android:gravity="center_horizontal"
+                    android:orientation="vertical"
+                    android:paddingLeft="2sp"
+                    android:textAlignment="center"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:id="@+id/day"
+                        android:layout_width="23dp"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_horizontal"
+                        android:text="day"
+                        android:textAlignment="center"
+                        android:textColor="#FFFFFF"
+                        android:textSize="12sp" />
+
+                    <TextView
+                        android:id="@+id/month"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_horizontal"
+                        android:text="mth"
+                        android:textColor="#FFFFFF"
+                        android:textSize="12sp" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:gravity="center_horizontal"
+                    android:orientation="vertical"
+                    android:paddingLeft="18sp"
+                    android:textAlignment="center">
+
+                    <TextView
+                        android:id="@+id/iob_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="IOB"
+                        android:textAlignment="center"
+                        android:textColor="#FFFFFF"
+                        android:textSize="10sp"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/iobView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="--U"
+                        android:textColor="#FFFFFF"
+                        android:textSize="14sp"
+                        android:textStyle="bold" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <lecho.lib.hellocharts.view.LineChartView
+            android:id="@+id/chart"
+            android:layout_width="match_parent"
+            android:layout_height="75dp"
+            android:layout_gravity="bottom"
+            android:gravity="center_horizontal|top" />
+
+    </LinearLayout>
+
+</RelativeLayout>

wear/src/main/res/layout/rect_cockpit.xml

@@ -0,0 +1,335 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    android:layout_height="match_parent" tools:context=".watchfaces.Cockpit" tools:deviceIds="wear_square"
+    android:id="@+id/main_layout">
+
+
+    <LinearLayout
+        android:id="@+id/outside"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:background="@drawable/airplane_cockpit_outside_clouds"
+        android:orientation="vertical"
+        android:textAlignment="center"
+        android:weightSum="1">
+
+
+        <LinearLayout
+            android:id="@+id/inside"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:background="@drawable/airplane_cockpit"
+            android:elevation="5dp"
+            android:orientation="vertical"
+            android:textAlignment="center"
+            android:weightSum="1">
+
+            <LinearLayout
+                android:id="@+id/windows"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:orientation="vertical"
+                android:textAlignment="center"
+                android:weightSum="1">
+
+                <LinearLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="-5dp"
+                    android:gravity="center_horizontal"
+                    android:orientation="horizontal"
+                    android:paddingTop="15dp"
+                    android:textAlignment="center"
+                    android:weightSum="1">
+
+                    <LinearLayout
+                        android:id="@+id/warnings"
+                        android:layout_width="wrap_content"
+                        android:layout_height="fill_parent"
+                        android:layout_gravity="center_horizontal"
+                        android:baselineAligned="false"
+                        android:gravity="center_vertical|center_horizontal"
+                        android:orientation="vertical"
+                        android:paddingTop="4dp"
+                        android:textAlignment="center"
+                        android:weightSum="1">
+
+                        <TextView
+                            android:id="@+id/highLabel"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:gravity="center_vertical|center_horizontal"
+                            android:text="H"
+                            android:textAlignment="center"
+                            android:textColor="@color/black"
+                            android:textSize="8sp"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:id="@+id/highLight"
+                            android:layout_width="fill_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:background="@drawable/airplane_led_grey_unlit"
+                            android:gravity="center_vertical|center_horizontal"
+                            android:textAlignment="center"
+                            android:textColor="#FFFFFF"
+                            android:textSize="8sp" />
+
+                        <TextView
+                            android:id="@+id/lowLight"
+                            android:layout_width="fill_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="bottom"
+                            android:layout_marginTop="14dp"
+                            android:autoText="false"
+                            android:background="@drawable/airplane_led_grey_unlit"
+                            android:gravity="center_horizontal|center"
+                            android:textAlignment="center"
+                            android:textColor="#FFFFFF"
+                            android:textSize="8sp" />
+
+                        <TextView
+                            android:id="@+id/lowLabel"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:gravity="center_vertical|center_horizontal"
+                            android:text="L"
+                            android:textAlignment="center"
+                            android:textColor="@color/black"
+                            android:textSize="8sp"
+                            android:textStyle="bold" />
+
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/dashboard"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/AAPSv2"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="AAPSv2"
+                        android:textSize="16sp"
+                        android:visibility="invisible" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/instruments"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:padding="1dp">
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:orientation="horizontal"
+                        android:textAlignment="center">
+
+                        <LinearLayout
+                            android:id="@+id/panel1"
+                            android:layout_width="70dp"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="center_horizontal"
+                            android:baselineAligned="false"
+                            android:gravity="center_horizontal"
+                            android:orientation="vertical"
+                            android:textAlignment="center">
+
+                            <TextView
+                                android:id="@+id/sgv"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="14dp"
+                                android:text="---"
+                                android:textColor="#FFFFFF"
+                                android:textSize="38sp" />
+
+                            <TextView
+                                android:id="@+id/timestamp"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="end"
+                                android:layout_marginRight="14dp"
+                                android:layout_marginTop="17dp"
+                                android:text="--'"
+                                android:textAlignment="center"
+                                android:textColor="#FFFFFF"
+                                android:textSize="14sp"
+                                android:textStyle="bold" />
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:id="@+id/panel2"
+                            android:layout_width="60dp"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="center_horizontal"
+                            android:baselineAligned="false"
+                            android:gravity="center_horizontal"
+                            android:orientation="vertical"
+                            android:paddingEnd="4dp"
+                            android:paddingStart="4dp"
+                            android:textAlignment="center">
+
+                            <LinearLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:orientation="horizontal"
+                                android:textAlignment="center">
+
+                                <TextView
+                                    android:id="@+id/watch_time"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="3dp"
+                                    android:text="12:00"
+                                    android:textAlignment="center"
+                                    android:textColor="@color/primary_text_dark"
+                                    android:textSize="18sp"
+                                    android:textStyle="bold" />
+
+                            </LinearLayout>
+
+                            <TextView
+                                android:id="@+id/tmpBasal"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="4dp"
+                                android:text="-.--U/h"
+                                android:textAlignment="center"
+                                android:textColor="@color/primary_text_dark"
+                                android:textSize="14sp"
+                                android:textStyle="bold" />
+
+                            <TextView
+                                android:id="@+id/iobView"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="4dp"
+                                android:text="--U"
+                                android:textColor="#FFFFFF"
+                                android:textSize="14sp"
+                                android:textStyle="bold" />
+
+                            <TextView
+                                android:id="@+id/cobView"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="3dp"
+                                android:text="--g"
+                                android:textAlignment="center"
+                                android:textColor="#FFFFFF"
+                                android:textSize="14sp"
+                                android:textStyle="bold" />
+
+                            <LinearLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:orientation="horizontal"
+                                android:textAlignment="center">
+
+                                <TextView
+                                    android:id="@+id/uploader_battery"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="5dp"
+                                    android:text="--%"
+                                    android:textAlignment="center"
+                                    android:textColor="@color/primary_text_dark"
+                                    android:textSize="14sp"
+                                    android:textStyle="bold" />
+
+                                <TextView
+                                    android:id="@+id/rig_battery"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:paddingLeft="10sp"
+                                    android:text="--%"
+                                    android:textAlignment="center"
+                                    android:textColor="#000000"
+                                    android:textSize="14sp"
+                                    android:textStyle="bold"
+                                    android:visibility="gone" />
+
+                            </LinearLayout>
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:id="@+id/panel3"
+                            android:layout_width="70dp"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="center_horizontal"
+                            android:baselineAligned="false"
+                            android:gravity="center_horizontal"
+                            android:orientation="vertical"
+                            android:textAlignment="center">
+
+
+                            <TextView
+                                android:id="@+id/direction"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal|bottom"
+                                android:layout_marginTop="6dp"
+                                android:gravity="center_horizontal|bottom"
+                                android:text="--"
+                                android:textAlignment="center"
+                                android:textColor="#FFFFFF"
+                                android:textSize="30sp"
+                                android:textStyle="bold" />
+
+                            <TextView
+                                android:id="@+id/delta"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="delta"
+                                android:textAlignment="center"
+                                android:textColor="@color/primary_text_dark"
+                                android:textSize="14sp"
+                                android:textStyle="bold" />
+
+                            <TextView
+                                android:id="@+id/loop"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="start"
+                                android:layout_marginLeft="11dp"
+                                android:layout_marginTop="15dp"
+                                android:background="@drawable/loop_grey_25"
+                                android:gravity="center"
+                                android:text="--'"
+                                android:textAlignment="center"
+                                android:textColor="#FFFFFF"
+                                android:textSize="14sp"
+                                android:textStyle="bold" />
+
+                        </LinearLayout>
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</RelativeLayout>

wear/src/main/res/layout/round_activity_home_2.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" tools:context=".watchfaces.Home" tools:deviceIds="wear_round"
+    android:layout_height="match_parent" tools:context=".watchfaces.Home2" tools:deviceIds="wear_round"
     android:background="@color/black"
     android:id="@+id/main_layout">
 

wear/src/main/res/layout/round_cockpit.xml

@@ -0,0 +1,325 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    android:layout_height="match_parent" tools:context=".watchfaces.Cockpit" tools:deviceIds="wear_round"
+    android:id="@+id/main_layout"
+    android:background="@drawable/airplane_cockpit_outside_clouds">
+
+
+        <LinearLayout
+            android:id="@+id/inside"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:background="@drawable/airplane_cockpit"
+            android:elevation="5dp"
+            android:orientation="vertical"
+            android:textAlignment="center"
+            android:weightSum="1">
+
+            <LinearLayout
+                android:id="@+id/windows"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:orientation="vertical"
+                android:textAlignment="center"
+                android:weightSum="1">
+
+                <LinearLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="-5dp"
+                    android:gravity="center_horizontal"
+                    android:orientation="horizontal"
+                    android:paddingTop="15dp"
+                    android:textAlignment="center"
+                    android:weightSum="1">
+
+                    <LinearLayout
+                        android:id="@+id/warnings"
+                        android:layout_width="wrap_content"
+                        android:layout_height="fill_parent"
+                        android:layout_gravity="center_horizontal"
+                        android:baselineAligned="false"
+                        android:gravity="center_vertical|center_horizontal"
+                        android:orientation="vertical"
+                        android:paddingTop="4dp"
+                        android:textAlignment="center"
+                        android:weightSum="1">
+
+                        <TextView
+                            android:id="@+id/highLabel"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:gravity="center_vertical|center_horizontal"
+                            android:text="H"
+                            android:textAlignment="center"
+                            android:textColor="@color/primary_text_dark"
+                            android:textSize="8sp"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:id="@+id/highLight"
+                            android:layout_width="fill_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:background="@drawable/airplane_led_grey_unlit"
+                            android:gravity="center_vertical|center_horizontal"
+                            android:textAlignment="center"
+                            android:textColor="@color/primary_text_dark"
+                            android:textSize="8sp" />
+
+                        <TextView
+                            android:id="@+id/lowLight"
+                            android:layout_width="fill_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="bottom"
+                            android:layout_marginTop="14dp"
+                            android:autoText="false"
+                            android:background="@drawable/airplane_led_grey_unlit"
+                            android:gravity="center_horizontal|center"
+                            android:textAlignment="center"
+                            android:textColor="@color/primary_text_dark"
+                            android:textSize="8sp" />
+
+                        <TextView
+                            android:id="@+id/lowLabel"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:gravity="center_vertical|center_horizontal"
+                            android:text="L"
+                            android:textAlignment="center"
+                            android:textColor="@color/primary_text_dark"
+                            android:textSize="8sp"
+                            android:textStyle="bold" />
+
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/dashboard"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/AAPSv2"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="AAPSv2"
+                        android:textSize="16sp"
+                        android:visibility="invisible" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/instruments"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:padding="1dp">
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:orientation="horizontal"
+                        android:textAlignment="center">
+
+                        <LinearLayout
+                            android:id="@+id/panel1"
+                            android:layout_width="70dp"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="center_horizontal"
+                            android:baselineAligned="false"
+                            android:gravity="center_horizontal"
+                            android:orientation="vertical"
+                            android:textAlignment="center">
+
+                            <TextView
+                                android:id="@+id/sgv"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="14dp"
+                                android:text="---"
+                                android:textColor="@color/primary_text_dark"
+                                android:textSize="38sp" />
+
+                            <TextView
+                                android:id="@+id/timestamp"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="end"
+                                android:layout_marginRight="15dp"
+                                android:layout_marginTop="21dp"
+                                android:text="--'"
+                                android:textAlignment="center"
+                                android:textColor="@color/primary_text_dark"
+                                android:textSize="14sp"
+                                android:textStyle="bold" />
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:id="@+id/panel2"
+                            android:layout_width="60dp"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="center_horizontal"
+                            android:baselineAligned="false"
+                            android:gravity="center_horizontal"
+                            android:orientation="vertical"
+                            android:paddingEnd="4dp"
+                            android:paddingStart="4dp"
+                            android:textAlignment="center">
+
+                            <LinearLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:orientation="horizontal"
+                                android:textAlignment="center">
+
+                                <TextView
+                                    android:id="@+id/watch_time"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="3dp"
+                                    android:text="12:00"
+                                    android:textAlignment="center"
+                                    android:textColor="@color/primary_text_dark"
+                                    android:textSize="18sp"
+                                    android:textStyle="bold" />
+
+                            </LinearLayout>
+
+                            <TextView
+                                android:id="@+id/tmpBasal"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="7dp"
+                                android:text="-.--U/h"
+                                android:textAlignment="center"
+                                android:textColor="@color/primary_text_dark"
+                                android:textSize="14sp"
+                                android:textStyle="bold" />
+
+                            <TextView
+                                android:id="@+id/iobView"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="3dp"
+                                android:text="--U"
+                                android:textColor="@color/primary_text_dark"
+                                android:textSize="14sp"
+                                android:textStyle="bold" />
+
+                            <TextView
+                                android:id="@+id/cobView"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="4dp"
+                                android:text="--g"
+                                android:textAlignment="center"
+                                android:textColor="#FFFFFF"
+                                android:textSize="14sp"
+                                android:textStyle="bold" />
+
+                            <LinearLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal"
+                                android:orientation="horizontal"
+                                android:textAlignment="center">
+
+                                <TextView
+                                    android:id="@+id/uploader_battery"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="3dp"
+                                    android:text="--%"
+                                    android:textAlignment="center"
+                                    android:textColor="@color/primary_text_dark"
+                                    android:textSize="14sp"
+                                    android:textStyle="bold" />
+
+                                <TextView
+                                    android:id="@+id/rig_battery"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginLeft="5dp"
+                                    android:layout_marginTop="4dp"
+                                    android:text="--%"
+                                    android:textAlignment="center"
+                                    android:textColor="@color/primary_text_dark"
+                                    android:textSize="14sp"
+                                    android:textStyle="bold"
+                                    android:visibility="gone" />
+
+                            </LinearLayout>
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:id="@+id/panel3"
+                            android:layout_width="70dp"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="center_horizontal"
+                            android:baselineAligned="false"
+                            android:gravity="center_horizontal"
+                            android:orientation="vertical"
+                            android:textAlignment="center">
+
+
+                            <TextView
+                                android:id="@+id/direction"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_horizontal|bottom"
+                                android:layout_marginTop="6dp"
+                                android:gravity="center_horizontal|bottom"
+                                android:text="--"
+                                android:textAlignment="center"
+                                android:textColor="#FFFFFF"
+                                android:textSize="30sp"
+                                android:textStyle="bold" />
+
+                            <TextView
+                                android:id="@+id/delta"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="delta"
+                                android:textAlignment="center"
+                                android:textColor="@color/primary_text_dark"
+                                android:textSize="14sp"
+                                android:textStyle="bold" />
+
+                            <TextView
+                                android:id="@+id/loop"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="start"
+                                android:layout_marginLeft="11dp"
+                                android:layout_marginTop="19dp"
+                                android:background="@drawable/loop_grey_25"
+                                android:gravity="center"
+                                android:text="--'"
+                                android:textAlignment="center"
+                                android:textColor="@color/primary_text_dark"
+                                android:textSize="14sp"
+                                android:textStyle="bold" />
+
+                        </LinearLayout>
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+</RelativeLayout>