Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev

app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt

@@ -175,6 +175,10 @@ class WizardDialog : DaggerDialogFragment() {
             }
             dismiss()
         }
+        binding.bgEnabledIcon.setOnClickListener { binding.bgCheckbox.isChecked = !binding.bgCheckbox.isChecked }
+        binding.trendEnabledIcon.setOnClickListener { binding.bgTrendCheckbox.isChecked = !binding.bgTrendCheckbox.isChecked }
+        binding.cobEnabledIcon.setOnClickListener { binding.cobCheckbox.isChecked = !binding.cobCheckbox.isChecked; processCobCheckBox(); }
+        binding.iobEnabledIcon.setOnClickListener { if (!binding.cobCheckbox.isChecked) binding.iobCheckbox.isChecked = !binding.iobCheckbox.isChecked }
         // cancel button
         binding.cancel.setOnClickListener {
             aapsLogger.debug(LTag.APS, "Dialog canceled: ${this.javaClass.name}")

build.gradle

@@ -81,7 +81,7 @@ allprojects {
     // Source: https://issuetracker.google.com/issues/174695268
     configurations.configureEach {
         resolutionStrategy {
-            force 'org.xerial:sqlite-jdbc:3.34.0'
+            force 'org.xerial:sqlite-jdbc:3.36.0.3'
         }
     }
 }

medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt

@@ -759,6 +759,7 @@ class MedtronicHistoryData @Inject constructor(
         }
 
         var previousItem: TempBasalProcessDTO? = null
+        val removalList : MutableList<TempBasalProcessDTO> = arrayListOf()
 
         // fix for Zero TBRs
         for (tempBasalProcessDTO in processList) {
@@ -768,8 +769,18 @@ class MedtronicHistoryData @Inject constructor(
                 pheEnd.atechDateTime = DateTimeUtil.getATDWithAddedSeconds(tempBasalProcessDTO.itemOne.atechDateTime, -2)
                 pheEnd.addDecodedData("Object", TempBasalPair(0.0, false, 0))
 
+                val initialDuration = previousItem.durationAsSeconds
+
                 previousItem.itemTwo = pheEnd
 
+                if (previousItem.durationAsSeconds <=0) {
+                    // if we have duration of 0 or less, then we have invalid entry which needs to be removed
+                    removalList.add(previousItem)
+                } else if (previousItem.durationAsSeconds > initialDuration) {
+                    // if duration with last item is longer than planned TBR duration we remove previous item and leave original duration
+                    previousItem.itemTwo = null
+                }
+
                 previousItem = null
             }
             if (tempBasalProcessDTO.itemOneTbr!!.isZeroTBR) {
@@ -777,6 +788,13 @@ class MedtronicHistoryData @Inject constructor(
             }
         }
 
+        // removing previously tagged item
+        if (removalList.isNotEmpty()) {
+            for (tempBasalProcessDTO in removalList) {
+                processList.remove(tempBasalProcessDTO)
+            }
+        }
+
         return processList
     }
 

medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalProcessDTO.kt

@@ -12,7 +12,11 @@ class TempBasalProcessDTO constructor(var itemOne: PumpHistoryEntry,
         set(value) {
             field = value
             if (objectType == ObjectType.TemporaryBasal) {
-                itemTwoTbr = value!!.getDecodedDataEntry("Object") as TempBasalPair
+                if (value!=null) {
+                    itemTwoTbr = value.getDecodedDataEntry("Object") as TempBasalPair
+                } else {
+                    itemTwoTbr = null
+                }
             }
         }
 

medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryDataUTest.kt

@@ -86,4 +86,47 @@ class MedtronicHistoryDataUTest : TestBase() {
     }
 
 
+    @Test
+    fun createTBRProcessList_SpecialCase() {
+
+        var unitToTest = MedtronicHistoryData(packetInjector, aapsLogger, sp, rh, rxBus, activePlugin,
+                                              medtronicUtil,   medtronicPumpHistoryDecoder,
+                                              medtronicPumpStatus,
+                                              pumpSync,
+                                              pumpSyncStorage)
+
+
+        val gson = Gson()
+
+        val fileText = ClassLoader.getSystemResource("tbr_data_special.json").readText()
+
+        val listType: Type = object : TypeToken<MutableList<PumpHistoryEntry?>?>() {}.getType()
+        val yourClassList: MutableList<PumpHistoryEntry> = gson.fromJson(fileText, listType)
+
+        for (pumpHistoryEntry in yourClassList) {
+            val stringObject = pumpHistoryEntry.decodedData["Object"] as LinkedTreeMap<String,Object>
+
+            val rate : Double = stringObject.get("insulinRate") as Double
+            val durationMinutes: Double = stringObject.get("durationMinutes") as Double
+            val durationMinutesInt : Int = durationMinutes.toInt()
+
+            var  tmbPair = TempBasalPair(rate, false, durationMinutesInt)
+
+            pumpHistoryEntry.decodedData.remove("Object")
+            pumpHistoryEntry.addDecodedData("Object", tmbPair)
+        }
+
+        System.out.println("TBR Pre-Process List (Special): " + gson.toJson(yourClassList))
+
+        val createTBRProcessList = unitToTest.createTBRProcessList(yourClassList)
+
+        System.out.println("TBR Process List (Special): " + createTBRProcessList.size)
+
+        for (tempBasalProcessDTO in createTBRProcessList) {
+            System.out.println(tempBasalProcessDTO.toTreatmentString())
+        }
+
+    }
+
+
 }

wear/src/main/java/info/nightscout/androidaps/data/RawDisplayData.java

@@ -135,7 +135,7 @@ public class RawDisplayData {
     }
 
     private void updateData(DataMap dataMap) {
-        wearUtil.getWakeLock("readingPrefs", 50);
+        PowerManager.WakeLock wl = wearUtil.getWakeLock("readingPrefs", 50);
         sgvLevel = dataMap.getLong("sgvLevel");
         datetime = dataMap.getLong("timestamp");
         sSgv = dataMap.getString("sgvString");
@@ -143,6 +143,7 @@ public class RawDisplayData {
         sDelta = dataMap.getString("delta");
         sAvgDelta = dataMap.getString("avgDelta");
         sUnits = dataMap.getString("glucoseUnits");
+        wearUtil.releaseWakeLock(wl);
     }
 
     public DataMap updateStatusFromMessage(Intent intent, PowerManager.WakeLock wakeLock) {
@@ -156,7 +157,7 @@ public class RawDisplayData {
     }
 
     private void updateStatus(DataMap dataMap) {
-        wearUtil.getWakeLock("readingPrefs", 50);
+        PowerManager.WakeLock wl = wearUtil.getWakeLock("readingPrefs", 50);
         sBasalRate = dataMap.getString("currentBasal");
         sUploaderBattery = dataMap.getString("battery");
         sRigBattery = dataMap.getString("rigBattery");
@@ -170,6 +171,7 @@ public class RawDisplayData {
         externalStatusString = dataMap.getString("externalStatusString");
         batteryLevel = dataMap.getInt("batteryLevel");
         openApsStatus = dataMap.getLong("openApsStatus");
+        wearUtil.releaseWakeLock(wl);
     }
 
     public DataMap updateBasalsFromMessage(Intent intent, PowerManager.WakeLock wakeLock) {
@@ -183,8 +185,9 @@ public class RawDisplayData {
     }
 
     private void updateBasals(DataMap dataMap) {
-        wearUtil.getWakeLock("readingPrefs", 500);
+        PowerManager.WakeLock wl = wearUtil.getWakeLock("readingPrefs", 500);
         loadBasalsAndTemps(dataMap);
+        wearUtil.releaseWakeLock(wl);
     }
 
     private void loadBasalsAndTemps(DataMap dataMap) {
@@ -194,7 +197,7 @@ public class RawDisplayData {
             for (DataMap temp : temps) {
                 TempWatchData twd = new TempWatchData();
                 twd.startTime = temp.getLong("starttime");
-                twd.startBasal =  temp.getDouble("startBasal");
+                twd.startBasal = temp.getDouble("startBasal");
                 twd.endTime = temp.getLong("endtime");
                 twd.endBasal = temp.getDouble("endbasal");
                 twd.amount = temp.getDouble("amount");

wear/src/main/java/info/nightscout/androidaps/interaction/utils/PlusMinusEditText.java

@@ -3,19 +3,20 @@ package info.nightscout.androidaps.interaction.utils;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-import android.support.wearable.input.RotaryEncoder;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.core.view.InputDeviceCompat;
+import androidx.core.view.MotionEventCompat;
+
 import java.text.NumberFormat;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-
 /**
  * Created by mike on 28.06.2016.
  */
@@ -35,6 +36,12 @@ public class PlusMinusEditText implements View.OnKeyListener,
     boolean allowZero = false;
     boolean roundRobin;
 
+    private int mChangeCounter = 0;
+    private long mLastChange = 0;
+    private final static int THRESHOLD_COUNTER = 5;
+    private final static int THRESHOLD_COUNTER_LONG = 10;
+    private final static int THRESHOLD_TIME = 100;
+
     private final Handler mHandler;
     private ScheduledExecutorService mUpdater;
 
@@ -68,7 +75,7 @@ public class PlusMinusEditText implements View.OnKeyListener,
     private static final int MSG_DEC = 1;
 
     public PlusMinusEditText(View view, int editTextID, int plusID, int minusID, Double initValue, Double minValue, Double maxValue, Double step, NumberFormat formater, boolean allowZero) {
-        this( view,  editTextID,  plusID,  minusID,  initValue,  minValue,  maxValue,  step,  formater,  allowZero, false);
+        this(view, editTextID, plusID, minusID, initValue, minValue, maxValue, step, formater, allowZero, false);
     }
 
     public PlusMinusEditText(View view, int editTextID, int plusID, int minusID, Double initValue, Double minValue, Double maxValue, Double step, NumberFormat formater, boolean allowZero, boolean roundRobin) {
@@ -121,10 +128,11 @@ public class PlusMinusEditText implements View.OnKeyListener,
     public void setStep(Double step) {
         this.step = step;
     }
+
     private void inc(int multiplier) {
         value += step * multiplier;
         if (value > maxValue) {
-            if(roundRobin){
+            if (roundRobin) {
                 value = minValue;
             } else {
                 value = maxValue;
@@ -134,10 +142,10 @@ public class PlusMinusEditText implements View.OnKeyListener,
         updateEditText();
     }
 
-    private void dec( int multiplier) {
+    private void dec(int multiplier) {
         value -= step * multiplier;
         if (value < minValue) {
-            if(roundRobin){
+            if (roundRobin) {
                 value = maxValue;
             } else {
                 value = minValue;
@@ -211,13 +219,21 @@ public class PlusMinusEditText implements View.OnKeyListener,
 
     @Override
     public boolean onGenericMotion(View v, MotionEvent ev) {
-        if (ev.getAction() == MotionEvent.ACTION_SCROLL && RotaryEncoder.isFromRotaryEncoder(ev)) {
+        if (ev.getAction() == MotionEvent.ACTION_SCROLL && ev.isFromSource(InputDeviceCompat.SOURCE_ROTARY_ENCODER)) {
-            float delta = -RotaryEncoder.getRotaryAxisValue(ev);
+            long now = System.currentTimeMillis();
+            if (now - mLastChange > THRESHOLD_TIME) mChangeCounter = 0;
+
+            int dynamicMultiplier = mChangeCounter < THRESHOLD_COUNTER ? 1 :
+                    mChangeCounter < THRESHOLD_COUNTER_LONG ? 2 : 4;
+
+            float delta = -ev.getAxisValue(MotionEventCompat.AXIS_SCROLL);
             if (delta > 0) {
-                inc(1);
+                inc(dynamicMultiplier);
             } else {
-                dec(1);
+                dec(dynamicMultiplier);
             }
+            mLastChange = System.currentTimeMillis();
+            mChangeCounter++;
             return true;
         }
         return false;

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

@@ -5,11 +5,13 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
+import android.content.res.Resources;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Point;
 import android.graphics.Rect;
+import android.graphics.Typeface;
 import android.os.BatteryManager;
 import android.os.PowerManager;
 import android.os.Vibrator;
@@ -37,6 +39,7 @@ import com.ustwo.clockwise.wearable.WatchFace;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 
 import javax.inject.Inject;
 
@@ -70,13 +73,11 @@ public abstract class BaseWatchFace extends WatchFace implements SharedPreferenc
 
     public final Point displaySize = new Point();
     public TextView mTime, mHour, mMinute, mTimePeriod, mSgv, mDirection, mTimestamp, mUploaderBattery, mRigBattery, mDelta, mAvgDelta, mStatus, mBasalRate, mIOB1, mIOB2, mCOB1, mCOB2, mBgi, mLoop, mDay, mDayName, mMonth, isAAPSv2, mHighLight, mLowLight;
-    public TextView mSimpleSvg, mSimpleDirection, mSimpleTime;
     public ImageView mGlucoseDial, mDeltaGauge, mHourHand, mMinuteHand;
-    public View mSimpleUi;
     public RelativeLayout mRelativeLayout;
     public LinearLayout mLinearLayout, mLinearLayout2, mDate, mChartTap, mMainMenuTap;
     public int ageLevel = 1;
-    public int loopLevel = 1;
+    public int loopLevel = -1;
     public int highColor = Color.YELLOW;
     public int lowColor = Color.RED;
     public int midColor = Color.WHITE;
@@ -96,20 +97,32 @@ public abstract class BaseWatchFace extends WatchFace implements SharedPreferenc
     // related endTime manual layout
     public View layoutView;
     public int specW, specH;
-    public boolean forceSquareCanvas = false;  //set to true by the Steampunk watch face.
+    public boolean forceSquareCanvas = false; // Set to true by the Steampunk watch face.
     public String sMinute = "0";
     public String sHour = "0";
     protected SharedPreferences sharedPrefs;
     private LocalBroadcastManager localBroadcastManager;
     private MessageReceiver messageReceiver;
     private BroadcastReceiver batteryReceiver;
-    protected boolean isCharging = false;
+    private int colorDarkHigh, colorDarkMid, colorDarkLow;
+    private java.text.DateFormat timeFormat;
+    private SimpleDateFormat sdfDay, sdfMonth, sdfHour, sdfPeriod, sdfDayName, sdfMinute;
+    private Paint mBackgroundPaint, mTimePaint, mSvgPaint, mDirectionPaint;
+    private Date mDateTime;
+    private String mLastSvg = "", mLastDirection = "";
+    private float mYOffset = 0;
+    private Intent mBatteryStatus;
 
     @Override
     public void onCreate() {
         // Not derived from DaggerService, do injection here
         AndroidInjection.inject(this);
         super.onCreate();
+
+        colorDarkHigh = ContextCompat.getColor(getApplicationContext(), R.color.dark_highColor);
+        colorDarkMid = ContextCompat.getColor(getApplicationContext(), R.color.dark_midColor);
+        colorDarkLow = ContextCompat.getColor(getApplicationContext(), R.color.dark_lowColor);
+
         rawData = new RawDisplayData(wearUtil);
         Display display = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
         display.getSize(displaySize);
@@ -127,10 +140,15 @@ public abstract class BaseWatchFace extends WatchFace implements SharedPreferenc
         persistence.turnOff();
 
         setupBatteryReceiver();
+        initFormats();
+        setupSimpleUi();
     }
 
     private void setupBatteryReceiver() {
-        if (sharedPrefs.getBoolean("simplify_ui_charging", false) && batteryReceiver == null) {
+        IntentFilter iFilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
+        mBatteryStatus = this.registerReceiver(null, iFilter);
+        String setting = sharedPrefs.getString("simplify_ui", "off");
+        if (setting.equals("charging") || setting.equals("ambient_charging") && batteryReceiver == null) {
             IntentFilter intentBatteryFilter = new IntentFilter();
             intentBatteryFilter.addAction(BatteryManager.ACTION_CHARGING);
             intentBatteryFilter.addAction(BatteryManager.ACTION_DISCHARGING);
@@ -145,6 +163,48 @@ public abstract class BaseWatchFace extends WatchFace implements SharedPreferenc
         }
     }
 
+    private void initFormats() {
+        Locale locale = Locale.getDefault();
+        timeFormat = DateFormat.getTimeFormat(BaseWatchFace.this);
+        sdfMinute = new SimpleDateFormat("mm", locale);
+        sdfHour = DateFormat.is24HourFormat(this) ? new SimpleDateFormat("HH", locale) : new SimpleDateFormat("hh", locale);
+        sdfPeriod = new SimpleDateFormat("a", locale);
+        sdfDay = new SimpleDateFormat("dd", locale);
+        sdfDayName = new SimpleDateFormat("E", locale);
+        sdfMonth = new SimpleDateFormat("MMM", locale);
+    }
+
+    private void setupSimpleUi() {
+        mDateTime = new Date();
+
+        int black = ContextCompat.getColor(getApplicationContext(), R.color.black);
+        mBackgroundPaint = new Paint();
+        mBackgroundPaint.setColor(black);
+
+        final Typeface NORMAL_TYPEFACE = Typeface.create(Typeface.SANS_SERIF, Typeface.NORMAL);
+        final Typeface BOLD_TYPEFACE = Typeface.create(Typeface.SANS_SERIF, Typeface.BOLD);
+        int white = ContextCompat.getColor(getApplicationContext(), R.color.white);
+
+        Resources resources = this.getResources();
+        float textSizeSvg = resources.getDimension(R.dimen.simple_ui_svg_text_size);
+        float textSizeDirection = resources.getDimension(R.dimen.simple_ui_direction_text_size);
+        float textSizeTime = resources.getDimension(R.dimen.simple_ui_time_text_size);
+        mYOffset = resources.getDimension(R.dimen.simple_ui_y_offset);
+
+        mSvgPaint = createTextPaint(NORMAL_TYPEFACE, white, textSizeSvg);
+        mDirectionPaint = createTextPaint(BOLD_TYPEFACE, white, textSizeDirection);
+        mTimePaint = createTextPaint(NORMAL_TYPEFACE, white, textSizeTime);
+    }
+
+    private Paint createTextPaint(Typeface typeface, int colour, float textSize) {
+        Paint paint = new Paint();
+        paint.setColor(colour);
+        paint.setTypeface(typeface);
+        paint.setAntiAlias(true);
+        paint.setTextSize(textSize);
+        return paint;
+    }
+
     @Override
     protected void onLayout(WatchShape shape, Rect screenBounds, WindowInsets screenInsets) {
         super.onLayout(shape, screenBounds, screenInsets);
@@ -153,71 +213,63 @@ public abstract class BaseWatchFace extends WatchFace implements SharedPreferenc
     }
 
     public void performViewSetup() {
-        final WatchViewStub stub = layoutView.findViewById(R.id.watch_view_stub);
+        final WatchViewStub layoutStub = layoutView.findViewById(R.id.watch_view_stub);
         IntentFilter messageFilter = new IntentFilter(Intent.ACTION_SEND);
 
         messageReceiver = new MessageReceiver();
         localBroadcastManager = LocalBroadcastManager.getInstance(this);
         localBroadcastManager.registerReceiver(messageReceiver, messageFilter);
 
-        stub.setOnLayoutInflatedListener(new WatchViewStub.OnLayoutInflatedListener() {
+        layoutStub.setOnLayoutInflatedListener((WatchViewStub stub) -> {
-                                             @Override
+            mTime = stub.findViewById(R.id.watch_time);
-                                             public void onLayoutInflated(WatchViewStub stub) {
+            mHour = stub.findViewById(R.id.hour);
-                                                 mTime = stub.findViewById(R.id.watch_time);
+            mMinute = stub.findViewById(R.id.minute);
-                                                 mHour = stub.findViewById(R.id.hour);
+            mTimePeriod = stub.findViewById(R.id.timePeriod);
-                                                 mMinute = stub.findViewById(R.id.minute);
+            mDay = stub.findViewById(R.id.day);
-                                                 mTimePeriod = stub.findViewById(R.id.timePeriod);
+            mDayName = stub.findViewById(R.id.dayname);
-                                                 mDay = stub.findViewById(R.id.day);
+            mMonth = stub.findViewById(R.id.month);
-                                                 mDayName = stub.findViewById(R.id.dayname);
+            mDate = stub.findViewById(R.id.date_time);
-                                                 mMonth = stub.findViewById(R.id.month);
+            mLoop = stub.findViewById(R.id.loop);
-                                                 mDate = stub.findViewById(R.id.date_time);
+            mSgv = stub.findViewById(R.id.sgv);
-                                                 mLoop = stub.findViewById(R.id.loop);
+            mDirection = stub.findViewById(R.id.direction);
-                                                 mSgv = stub.findViewById(R.id.sgv);
+            mTimestamp = stub.findViewById(R.id.timestamp);
-                                                 mDirection = stub.findViewById(R.id.direction);
+            mIOB1 = stub.findViewById(R.id.iob_text);
-                                                 mTimestamp = stub.findViewById(R.id.timestamp);
+            mIOB2 = stub.findViewById(R.id.iobView);
-                                                 mIOB1 = stub.findViewById(R.id.iob_text);
+            mCOB1 = stub.findViewById(R.id.cob_text);
-                                                 mIOB2 = stub.findViewById(R.id.iobView);
+            mCOB2 = stub.findViewById(R.id.cobView);
-                                                 mCOB1 = stub.findViewById(R.id.cob_text);
+            mBgi = stub.findViewById(R.id.bgiView);
-                                                 mCOB2 = stub.findViewById(R.id.cobView);
+            mStatus = stub.findViewById(R.id.externaltstatus);
-                                                 mBgi = stub.findViewById(R.id.bgiView);
+            mBasalRate = stub.findViewById(R.id.tmpBasal);
-                                                 mStatus = stub.findViewById(R.id.externaltstatus);
+            mUploaderBattery = stub.findViewById(R.id.uploader_battery);
-                                                 mBasalRate = stub.findViewById(R.id.tmpBasal);
+            mRigBattery = stub.findViewById(R.id.rig_battery);
-                                                 mUploaderBattery = stub.findViewById(R.id.uploader_battery);
+            mDelta = stub.findViewById(R.id.delta);
-                                                 mRigBattery = stub.findViewById(R.id.rig_battery);
+            mAvgDelta = stub.findViewById(R.id.avgdelta);
-                                                 mDelta = stub.findViewById(R.id.delta);
+            isAAPSv2 = stub.findViewById(R.id.AAPSv2);
-                                                 mAvgDelta = stub.findViewById(R.id.avgdelta);
+            mHighLight = stub.findViewById(R.id.highLight);
-                                                 isAAPSv2 = stub.findViewById(R.id.AAPSv2);
+            mLowLight = stub.findViewById(R.id.lowLight);
-                                                 mHighLight = stub.findViewById(R.id.highLight);
+            mRelativeLayout = stub.findViewById(R.id.main_layout);
-                                                 mLowLight = stub.findViewById(R.id.lowLight);
+            mLinearLayout = stub.findViewById(R.id.secondary_layout);
-                                                 mRelativeLayout = stub.findViewById(R.id.main_layout);
+            mLinearLayout2 = stub.findViewById(R.id.tertiary_layout);
-                                                 mLinearLayout = stub.findViewById(R.id.secondary_layout);
+            mGlucoseDial = stub.findViewById(R.id.glucose_dial);
-                                                 mLinearLayout2 = stub.findViewById(R.id.tertiary_layout);
+            mDeltaGauge = stub.findViewById(R.id.delta_pointer);
-                                                 mGlucoseDial = stub.findViewById(R.id.glucose_dial);
+            mHourHand = stub.findViewById(R.id.hour_hand);
-                                                 mDeltaGauge = stub.findViewById(R.id.delta_pointer);
+            mMinuteHand = stub.findViewById(R.id.minute_hand);
-                                                 mHourHand = stub.findViewById(R.id.hour_hand);
+            mChartTap = stub.findViewById(R.id.chart_zoom_tap);
-                                                 mMinuteHand = stub.findViewById(R.id.minute_hand);
+            mMainMenuTap = stub.findViewById(R.id.main_menu_tap);
-                                                 mChartTap = stub.findViewById(R.id.chart_zoom_tap);
+            chart = stub.findViewById(R.id.chart);
-                                                 mMainMenuTap = stub.findViewById(R.id.main_menu_tap);
+            layoutSet = true;
-                                                 chart = stub.findViewById(R.id.chart);
+            setupCharts();
-                                                 mSimpleUi = stub.findViewById(R.id.simple_ui);
+            setDataFields();
-                                                 mSimpleSvg = stub.findViewById(R.id.simple_sgv);
+            missedReadingAlert();
-                                                 mSimpleDirection = stub.findViewById(R.id.simple_direction);
+        });
-                                                 mSimpleTime = stub.findViewById(R.id.simple_watch_time);
-                                                 layoutSet = true;
-                                                 setDataFields();
-                                                 setColor();
-                                             }
-                                         }
-        );
         wakeLock.acquire(50);
     }
 
     public int ageLevel() {
         if (timeSince() <= (1000 * 60 * 12)) {
             return 1;
-        } else {
-            return 0;
         }
+        return 0;
     }
 
     public double timeSince() {
@@ -226,7 +278,7 @@ public abstract class BaseWatchFace extends WatchFace implements SharedPreferenc
 
     public String readingAge(boolean shortString) {
         if (rawData.datetime == 0) {
-            return shortString ? "--'" : "-- Minute ago";
+            return shortString ? "--" : "-- Minute ago";
         }
         int minutesAgo = (int) Math.floor(timeSince() / (1000 * 60));
         if (minutesAgo == 1) {
@@ -250,45 +302,79 @@ public abstract class BaseWatchFace extends WatchFace implements SharedPreferenc
     }
 
     @Override
-    protected void onDraw(Canvas canvas) {
+    protected long getInteractiveModeUpdateRate() {
-        if (layoutSet) {
+        return 60 * 1000L; // Only call onTimeChanged every 60 seconds
-            setupCharts();
+    }
 
-            mRelativeLayout.measure(specW, specH);
+    @Override
-            if (forceSquareCanvas) {
+    protected void onDraw(Canvas canvas) {
-                mRelativeLayout.layout(0, 0, displaySize.x, displaySize.x);  //force a square for Steampunk watch face.
+        if (isSimpleUi()) {
-            } else {
+            onDrawSimpleUi(canvas);
-                mRelativeLayout.layout(0, 0, displaySize.x, displaySize.y);
+        } else {
+            if (layoutSet) {
+                mRelativeLayout.measure(specW, specH);
+                int y = forceSquareCanvas ? displaySize.x : displaySize.y; // Square Steampunk
+                mRelativeLayout.layout(0, 0, displaySize.x, y);
+                mRelativeLayout.draw(canvas);
             }
-            mRelativeLayout.draw(canvas);
-            Log.d("onDraw", "draw");
         }
     }
 
+    protected void onDrawSimpleUi(Canvas canvas) {
+        canvas.drawRect(0, 0, displaySize.x, displaySize.y, mBackgroundPaint);
+        float xHalf = displaySize.x / 2f;
+        float yThird = displaySize.y / 3f;
+
+        boolean isOutdated = rawData.datetime > 0 && ageLevel() <= 0;
+        mSvgPaint.setStrikeThruText(isOutdated);
+
+        mSvgPaint.setColor(getBgColour(rawData.sgvLevel));
+        mDirectionPaint.setColor(getBgColour(rawData.sgvLevel));
+
+        String sSvg = rawData.sSgv;
+        float svgWidth = mSvgPaint.measureText(sSvg);
+
+        String sDirection = " " + rawData.sDirection + "\uFE0E";
+        float directionWidth = mDirectionPaint.measureText(sDirection);
+
+        float xSvg = xHalf - (svgWidth + directionWidth) / 2;
+        canvas.drawText(sSvg, xSvg, yThird + mYOffset, mSvgPaint);
+        float xDirection = xSvg + svgWidth;
+        canvas.drawText(sDirection, xDirection, yThird + mYOffset, mDirectionPaint);
+
+        String sTime = timeFormat.format(mDateTime);
+        float xTime = xHalf - mTimePaint.measureText(sTime) / 2f;
+        canvas.drawText(timeFormat.format(mDateTime), xTime, yThird * 2f + mYOffset, mTimePaint);
+    }
+
+    int getBgColour(long level) {
+        if (level == 1) {
+            return colorDarkHigh;
+        }
+        if (level == 0) {
+            return colorDarkMid;
+        }
+        return colorDarkLow;
+    }
+
     @Override
     protected void onTimeChanged(WatchFaceTime oldTime, WatchFaceTime newTime) {
         if (layoutSet && (newTime.hasHourChanged(oldTime) || newTime.hasMinuteChanged(oldTime))) {
-            wakeLock.acquire(50);
+            long now = System.currentTimeMillis();
+            mDateTime.setTime(now);
 
-            setDataFields();
+            PowerManager.WakeLock wl = wearUtil.getWakeLock("readingPrefs", 50);
-            setColor();
             missedReadingAlert();
             checkVibrateHourly(oldTime, newTime);
-
+            if (!isSimpleUi()) {
-            mRelativeLayout.measure(specW, specH);
+                setDataFields();
-            if (forceSquareCanvas) {
-                mRelativeLayout.layout(0, 0, displaySize.x, displaySize.x);  //force a square for Steampunk watch face.
-            } else {
-                mRelativeLayout.layout(0, 0, displaySize.x, displaySize.y);
             }
-            invalidate();
+            wearUtil.releaseWakeLock(wl);
         }
     }
 
     private boolean isCharging() {
-        IntentFilter iFilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
+        int status = mBatteryStatus.getIntExtra(BatteryManager.EXTRA_STATUS, -1);
-        Intent batteryStatus = this.registerReceiver(null, iFilter);
-        int status = batteryStatus.getIntExtra(BatteryManager.EXTRA_STATUS, -1);
         return status == BatteryManager.BATTERY_STATUS_CHARGING ||
                 status == BatteryManager.BATTERY_STATUS_FULL;
     }
@@ -304,15 +390,13 @@ public abstract class BaseWatchFace extends WatchFace implements SharedPreferenc
     }
 
     public void setDataFields() {
-
         setDateAndTime();
-
         if (mSgv != null) {
             if (sharedPrefs.getBoolean("showBG", true)) {
                 mSgv.setText(rawData.sSgv);
                 mSgv.setVisibility(View.VISIBLE);
             } else {
-                //leave the textview there but invisible, as a height holder for the empty space above the white line
+                // Leave the textview there but invisible, as a height holder for the empty space above the white line
                 mSgv.setVisibility(View.INVISIBLE);
                 mSgv.setText("");
             }
@@ -322,7 +406,7 @@ public abstract class BaseWatchFace extends WatchFace implements SharedPreferenc
 
         if (mDirection != null) {
             if (sharedPrefs.getBoolean("show_direction", true)) {
-                mDirection.setText(rawData.sDirection+"\uFE0E");
+                mDirection.setText(rawData.sDirection + "\uFE0E");
                 mDirection.setVisibility(View.VISIBLE);
             } else {
                 mDirection.setVisibility(View.GONE);
@@ -356,7 +440,7 @@ public abstract class BaseWatchFace extends WatchFace implements SharedPreferenc
                 mCOB1.setVisibility(View.GONE);
                 mCOB2.setVisibility(View.GONE);
             }
-            //deal with cases where there is only the value shown for COB, and not the label
+            // Deal with cases where there is only the value shown for COB, and not the label
         } else if (mCOB2 != null) {
             mCOB2.setText(rawData.sCOB2);
             if (sharedPrefs.getBoolean("show_cob", true)) {
@@ -381,7 +465,7 @@ public abstract class BaseWatchFace extends WatchFace implements SharedPreferenc
                 mIOB1.setVisibility(View.GONE);
                 mIOB2.setVisibility(View.GONE);
             }
-            //deal with cases where there is only the value shown for IOB, and not the label
+            // 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);
@@ -400,11 +484,8 @@ public abstract class BaseWatchFace extends WatchFace implements SharedPreferenc
                 if (isAAPSv2 != null) {
                     mTimestamp.setText(readingAge(true));
                 } else {
-                    if (sharedPrefs.getBoolean("showExternalStatus", true)) {
+                    boolean shortString = sharedPrefs.getBoolean("showExternalStatus", true);
-                        mTimestamp.setText(readingAge(true));
+                    mTimestamp.setText(readingAge(shortString));
-                    } else {
-                        mTimestamp.setText(readingAge(false));
-                    }
                 }
                 mTimestamp.setVisibility(View.VISIBLE);
             } else {
@@ -479,78 +560,43 @@ public abstract class BaseWatchFace extends WatchFace implements SharedPreferenc
                         mLoop.setBackgroundResource(R.drawable.loop_green_25);
                     }
                 } else {
-                    mLoop.setText("-'");
+                    loopLevel = -1;
+                    mLoop.setText("-");
+                    mLoop.setBackgroundResource(R.drawable.loop_grey_25);
                 }
             } else {
                 mLoop.setVisibility(View.GONE);
             }
         }
-        setDataFieldsSimpleUi();
-    }
 
-    void setDataFieldsSimpleUi() {
+        setColor();
-        if (sharedPrefs.getBoolean("simplify_ui_charging", false) && isCharging()) {
-            mSimpleUi.setVisibility(View.VISIBLE);
-
-            mSimpleSvg.setText(rawData.sSgv);
-            if (ageLevel() <= 0) {
-                mSimpleSvg.setPaintFlags(mSimpleSvg.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
-            } else {
-                mSimpleSvg.setPaintFlags(mSimpleSvg.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG);
-            }
-            if (rawData.sgvLevel == 1) {
-                mSimpleSvg.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_highColor));
-                mSimpleDirection.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_highColor));
-            } else if (rawData.sgvLevel == 0) {
-                mSimpleSvg.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_midColor));
-                mSimpleDirection.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_midColor));
-            } else if (rawData.sgvLevel == -1) {
-                mSimpleSvg.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_lowColor));
-                mSimpleDirection.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.dark_lowColor));
-            }
-
-            mSimpleDirection.setText(rawData.sDirection+"\uFE0E");
-
-            final java.text.DateFormat timeFormat = DateFormat.getTimeFormat(BaseWatchFace.this);
-            mSimpleTime.setText(timeFormat.format(System.currentTimeMillis()));
-        } else {
-            mSimpleUi.setVisibility(View.GONE);
-        }
     }
 
     @Override
     protected void on24HourFormatChanged(boolean is24HourFormat) {
-        setDateAndTime();
+        initFormats();
+        if (!isSimpleUi()) {
+            setDataFields();
+        }
+        invalidate();
     }
 
     public void setDateAndTime() {
-
-        final java.text.DateFormat timeFormat = DateFormat.getTimeFormat(BaseWatchFace.this);
         if (mTime != null) {
-            mTime.setText(timeFormat.format(System.currentTimeMillis()));
+            mTime.setText(timeFormat.format(mDateTime));
         }
 
-        Date now = new Date();
+        sMinute = sdfMinute.format(mDateTime);
-        SimpleDateFormat sdfHour;
+        sHour = sdfHour.format(mDateTime);
-        SimpleDateFormat sdfMinute = new SimpleDateFormat("mm");
-        if (DateFormat.is24HourFormat(this)) {
-            sdfHour = new SimpleDateFormat("HH");
-        } else {
-            sdfHour = new SimpleDateFormat("hh");
-        }
-        sHour = sdfHour.format(now);
-        sMinute = sdfMinute.format(now);
-
         if (mHour != null && mMinute != null) {
             mHour.setText(sHour);
             mMinute.setText(sMinute);
         }
 
-        if(mTimePeriod != null) {
+        if (mTimePeriod != null) {
             if (!DateFormat.is24HourFormat(this)) {
                 mTimePeriod.setVisibility(View.VISIBLE);
-                SimpleDateFormat sdfPeriod = new SimpleDateFormat("a");
+                mTimePeriod.setText(sdfPeriod.format(mDateTime).toUpperCase());
-                mTimePeriod.setText(sdfPeriod.format(now).toUpperCase());
             } else {
                 mTimePeriod.setVisibility(View.GONE);
             }
@@ -559,14 +605,11 @@ public abstract class BaseWatchFace extends WatchFace implements SharedPreferenc
         if (mDate != null && mDay != null && mMonth != null) {
             if (sharedPrefs.getBoolean("show_date", false)) {
                 if (mDayName != null) {
-                    SimpleDateFormat sdfDayName = new SimpleDateFormat("E");
+                    mDayName.setText(sdfDayName.format(mDateTime));
-                    mDayName.setText(sdfDayName.format(now));
                 }
 
-                SimpleDateFormat sdfDay = new SimpleDateFormat("dd");
+                mDay.setText(sdfDay.format(mDateTime));
-                SimpleDateFormat sdfMonth = new SimpleDateFormat("MMM");
+                mMonth.setText(sdfMonth.format(mDateTime));
-                mDay.setText(sdfDay.format(now));
-                mMonth.setText(sdfMonth.format(now));
                 mDate.setVisibility(View.VISIBLE);
             } else {
                 mDate.setVisibility(View.GONE);
@@ -588,7 +631,7 @@ public abstract class BaseWatchFace extends WatchFace implements SharedPreferenc
     public void strikeThroughSgvIfNeeded() {
         if (mSgv != null) {
             if (sharedPrefs.getBoolean("showBG", true)) {
-                if (ageLevel() <= 0) {
+                if (ageLevel() <= 0 && rawData.datetime > 0) {
                     mSgv.setPaintFlags(mSgv.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
                 } else {
                     mSgv.setPaintFlags(mSgv.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG);
@@ -598,30 +641,45 @@ public abstract class BaseWatchFace extends WatchFace implements SharedPreferenc
     }
 
     protected void onWatchModeChanged(WatchMode watchMode) {
-
+        lowResMode = isLowRes(watchMode);
-        if (lowResMode ^ isLowRes(watchMode)) { //if there was a change in lowResMode
+        if (isSimpleUi()) {
-            lowResMode = isLowRes(watchMode);
+            setSimpleUiAntiAlias();
-            setColor();
+        } else {
-        } else if (!sharedPrefs.getBoolean("dark", true)) {
+            setDataFields();
-            //in bright mode: different colours if active:
-            setColor();
         }
+        invalidate();
+    }
+
+    void setSimpleUiAntiAlias() {
+        boolean antiAlias = getCurrentWatchMode() == WatchMode.AMBIENT;
+        mSvgPaint.setAntiAlias(antiAlias);
+        mDirectionPaint.setAntiAlias(antiAlias);
+        mTimePaint.setAntiAlias(antiAlias);
     }
 
     private boolean isLowRes(WatchMode watchMode) {
         return (watchMode == WatchMode.LOW_BIT) || (watchMode == WatchMode.LOW_BIT_BURN_IN); // || (watchMode == WatchMode.LOW_BIT_BURN_IN);
     }
 
+    private boolean isSimpleUi() {
+        String simplify = sharedPrefs.getString("simplify_ui", "off");
+        if (simplify.equals("off")) {
+            return false;
+        }
+        if ((simplify.equals("ambient") || simplify.equals("ambient_charging")) && getCurrentWatchMode() == WatchMode.AMBIENT) {
+            return true;
+        }
+        return (simplify.equals("charging") || simplify.equals("ambient_charging")) && isCharging();
+    }
+
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
         setupBatteryReceiver();
         if ("delta_granularity".equals(key)) {
             ListenerService.requestData(this);
         }
-
         if (layoutSet) {
             setDataFields();
-            setColor();
         }
         invalidate();
     }
@@ -634,13 +692,16 @@ public abstract class BaseWatchFace extends WatchFace implements SharedPreferenc
 
     public void missedReadingAlert() {
         int minutes_since = (int) Math.floor(timeSince() / (1000 * 60));
-        if (minutes_since >= 16 && ((minutes_since - 16) % 5) == 0) {
+        if (rawData.datetime == 0 || minutes_since >= 16 && ((minutes_since - 16) % 5) == 0) {
-            ListenerService.requestData(this); // attempt endTime recover missing data
+            ListenerService.requestData(this); // Attempt endTime recover missing data
         }
     }
 
     public void setupCharts() {
-        if (rawData.bgDataList.size() > 0) { //Dont crash things just because we dont have values, people dont like crashy things
+        if (isSimpleUi()) {
+            return;
+        }
+        if (rawData.bgDataList.size() > 0) { // Dont crash things just because we dont have values, people dont like crashy things
             int timeframe = Integer.parseInt(sharedPrefs.getString("chart_timeframe", "3"));
             if (lowResMode) {
                 bgGraphBuilder = new BgGraphBuilder(getApplicationContext(), rawData, pointSize, midColor, gridColor, basalBackgroundColor, basalCenterColor, bolusColor, Color.GREEN, timeframe);
@@ -657,31 +718,36 @@ public abstract class BaseWatchFace extends WatchFace implements SharedPreferenc
     public class MessageReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context context, Intent intent) {
+            PowerManager.WakeLock wl = wearUtil.getWakeLock("readingPrefs", 50);
 
-            if (layoutSet) {
+            final DataMap dataMap = rawData.updateDataFromMessage(intent, wakeLock);
-                final DataMap dataMap = rawData.updateDataFromMessage(intent, wakeLock);
+            if (chart != null && dataMap != null) {
-                if (chart != null && dataMap != null) {
+                rawData.addToWatchSet(dataMap);
-                    rawData.addToWatchSet(dataMap);
+                setupCharts();
-                    setupCharts();
+            }
+            rawData.updateStatusFromMessage(intent, wakeLock);
+            rawData.updateBasalsFromMessage(intent, wakeLock);
+
+            if (isSimpleUi()) {
+                if (needUpdate()) {
+                    invalidate();
                 }
-                rawData.updateStatusFromMessage(intent, wakeLock);
-            }
-
-            setDataFields();
-            setColor();
-
-            if (layoutSet) {
-                rawData.updateBasalsFromMessage(intent, wakeLock);
-            }
-
-            mRelativeLayout.measure(specW, specH);
-            if (forceSquareCanvas) {
-                mRelativeLayout.layout(0, 0, displaySize.x, displaySize.x);  //force a square for Steampunk watch face.
             } else {
-                mRelativeLayout.layout(0, 0, displaySize.x, displaySize.y);
+                setupCharts();
+                setDataFields();
+                invalidate();
             }
-            invalidate();
+            wearUtil.releaseWakeLock(wl);
         }
     }
 
+    private boolean needUpdate() {
+        if (mLastSvg.equals(rawData.sSgv) && mLastDirection.equals(rawData.sDirection)) {
+            return false;
+        }
+        mLastSvg = rawData.sSgv;
+        mLastDirection = rawData.sDirection;
+        return true;
+    }
+
 }

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

@@ -60,7 +60,9 @@ public class Cockpit extends BaseWatchFace {
             }
         }
 
-        if (loopLevel == 1) {
+        if (loopLevel == -1) {
+            mLoop.setBackgroundResource(R.drawable.loop_grey_25);
+        } else if (loopLevel == 1) {
             mLoop.setBackgroundResource(R.drawable.loop_green_25);
         } else {
             mLoop.setBackgroundResource(R.drawable.loop_red_25);

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

@@ -117,7 +117,9 @@ public class Home2 extends BaseWatchFace {
         mBasalRate.setTextColor(dividerTxtColor);
         mBgi.setTextColor(dividerTxtColor);
 
-        if (loopLevel == 1) {
+        if (loopLevel == -1) {
+            mLoop.setBackgroundResource(R.drawable.loop_grey_25);
+        } else if (loopLevel == 1) {
             mLoop.setBackgroundResource(R.drawable.loop_green_25);
         } else {
             mLoop.setBackgroundResource(R.drawable.loop_red_25);
@@ -226,7 +228,9 @@ public class Home2 extends BaseWatchFace {
             mBasalRate.setTextColor(dividerTxtColor);
             mBgi.setTextColor(dividerTxtColor);
 
-            if (loopLevel == 1) {
+            if (loopLevel == -1) {
+                mLoop.setBackgroundResource(R.drawable.loop_grey_25);
+            } else if (loopLevel == 1) {
                 mLoop.setBackgroundResource(R.drawable.loop_green_25);
             } else {
                 mLoop.setBackgroundResource(R.drawable.loop_red_25);

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

@@ -67,7 +67,7 @@ public class Steampunk extends BaseWatchFace {
     protected void setColorDark() {
 
         if (mLinearLayout2 != null) {
-            if (ageLevel() <= 0) {
+            if (ageLevel() <= 0 && rawData.datetime != 0) {
                 mLinearLayout2.setBackgroundResource(R.drawable.redline);
                 mTimestamp.setTextColor(getResources().getColor(R.color.red_600));
             } else {
@@ -108,6 +108,7 @@ public class Steampunk extends BaseWatchFace {
 
             if (rotationAngle > 330) rotationAngle = 330;                       //if the glucose value is higher than 330 then show "HIGH" on the dial. ("HIGH" is at 330 degrees on the dial)
             if (rotationAngle != 0 && rotationAngle < 30) rotationAngle = 30;   //if the glucose value is lower than 30 show "LOW" on the dial. ("LOW" is at 30 degrees on the dial)
+            if (lastEndDegrees == 0) lastEndDegrees = rotationAngle;
 
             //rotate glucose dial
             RotateAnimation rotate = new RotateAnimation(

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

@@ -559,11 +559,6 @@
         </LinearLayout>
     </LinearLayout>
 
-    <include
-        android:id="@+id/simple_ui"
-        layout="@layout/simple_ui"
-        android:visibility="gone" />
-
     <!--   FLAGs   -->
     <TextView
         android:id="@+id/AAPSv2"

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

@@ -154,9 +154,4 @@
 
     </LinearLayout>
 
-    <include
-        android:id="@+id/simple_ui"
-        layout="@layout/simple_ui"
-        android:visibility="gone" />
-
 </RelativeLayout>

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

@@ -370,9 +370,4 @@
 
     </LinearLayout>
 
-    <include
-        android:id="@+id/simple_ui"
-        layout="@layout/simple_ui"
-        android:visibility="gone" />
-
 </RelativeLayout>

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

@@ -136,9 +136,4 @@
 
     </LinearLayout>
 
-    <include
-        android:id="@+id/simple_ui"
-        layout="@layout/simple_ui"
-        android:visibility="gone" />
-
 </RelativeLayout>

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

@@ -488,9 +488,4 @@
 
     </LinearLayout>
 
-    <include
-        android:id="@+id/simple_ui"
-        layout="@layout/simple_ui"
-        android:visibility="gone" />
-
 </RelativeLayout>

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

@@ -378,9 +378,4 @@
         android:layout_height="wrap_content"
         android:visibility="gone"/>
 
-    <include
-        android:id="@+id/simple_ui"
-        layout="@layout/simple_ui"
-        android:visibility="gone" />
-
 </RelativeLayout>

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

@@ -560,11 +560,6 @@
         </LinearLayout>
     </LinearLayout>
 
-    <include
-        android:id="@+id/simple_ui"
-        layout="@layout/simple_ui"
-        android:visibility="gone" />
-
     <!--   FLAGs   -->
     <TextView
         android:id="@+id/AAPSv2"

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

@@ -152,9 +152,4 @@
 
     </LinearLayout>
 
-    <include
-        android:id="@+id/simple_ui"
-        layout="@layout/simple_ui"
-        android:visibility="gone" />
-
 </RelativeLayout>

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

@@ -383,9 +383,4 @@
 
     </LinearLayout>
 
-    <include
-        android:id="@+id/simple_ui"
-        layout="@layout/simple_ui"
-        android:visibility="gone" />
-
 </RelativeLayout>

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

@@ -135,9 +135,4 @@
 
     </LinearLayout>
 
-    <include
-        android:id="@+id/simple_ui"
-        layout="@layout/simple_ui"
-        android:visibility="gone" />
-
 </RelativeLayout>

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

@@ -488,9 +488,4 @@
 
     </LinearLayout>
 
-    <include
-        android:id="@+id/simple_ui"
-        layout="@layout/simple_ui"
-        android:visibility="gone" />
-
 </RelativeLayout>

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

@@ -378,9 +378,4 @@
         android:layout_height="wrap_content"
         android:visibility="gone"/>
 
-    <include
-        android:id="@+id/simple_ui"
-        layout="@layout/simple_ui"
-        android:visibility="gone" />
-
 </RelativeLayout>

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

@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="@color/black"
-    android:orientation="vertical"
-    android:weightSum="100">
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_weight="50"
-        android:gravity="center_horizontal">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal|bottom"
-            android:layout_marginBottom="5dp"
-            android:gravity="center_horizontal"
-            android:orientation="horizontal"
-            android:textAlignment="center">
-
-            <TextView
-                android:id="@+id/simple_sgv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                android:layout_marginBottom="-2dp"
-                android:gravity="bottom|end"
-                android:text="---"
-                android:textColor="@color/white"
-                android:textSize="50sp" />
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:layout_gravity="center_horizontal"
-                android:baselineAligned="false"
-                android:gravity="center_horizontal"
-                android:orientation="vertical"
-                android:textAlignment="center"
-                android:weightSum="1">
-
-                <TextView
-                    android:id="@+id/simple_direction"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal|bottom"
-                    android:layout_marginTop="-2dp"
-                    android:layout_marginBottom="-5dp"
-                    android:gravity="center_horizontal|bottom"
-                    android:text="--"
-                    android:textColor="@color/white"
-                    android:textSize="35sp"
-                    android:textStyle="bold" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_weight="50"
-        android:gravity="center_horizontal">
-
-        <TextView
-            android:id="@+id/simple_watch_time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal|top"
-            android:layout_marginTop="5dp"
-            android:text="12:00"
-            android:textColor="#FFFFFF"
-            android:textSize="35sp" />
-    </LinearLayout>
-
-</LinearLayout>

wear/src/main/res/values/arrays.xml

@@ -65,4 +65,18 @@
         <item>none</item>
     </string-array>
 
+    <string-array name="watchface_simplify_ui_name">
+        <item>@string/simple_ui_off</item>
+        <item>@string/simple_ui_charging</item>
+        <item>@string/simple_ui_always_on</item>
+        <item>@string/simple_ui_always_on_charging</item>
+    </string-array>
+
+    <string-array name="watchface_simplify_ui_values">
+        <item>off</item>
+        <item>charging</item>
+        <item>ambient</item>
+        <item>ambient_charging</item>
+    </string-array>
+
 </resources>

wear/src/main/res/values/dimens.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+    <dimen name="simple_ui_svg_text_size">50sp</dimen>
+    <dimen name="simple_ui_direction_text_size">35sp</dimen>
+    <dimen name="simple_ui_time_text_size">35sp</dimen>
+    <dimen name="simple_ui_y_offset">5dp</dimen>
+</resources>

wear/src/main/res/values/strings.xml

@@ -136,8 +136,8 @@
     <string name="color_name_white">white</string>
     <string name="color_name_black">black</string>
     <string name="color_name_multicolor">multicolor</string>
-    <string name="pref_simplify_ui_charging">Simplify Charging UI</string>
+    <string name="pref_simplify_ui">Simplify UI</string>
-    <string name="pref_simplify_ui_charging_sum">Only show time and BG when charging</string>
+    <string name="pref_simplify_ui_sum">Only show time and BG</string>
 
 
     <string name="pref_vibrate_hourly">Vibrate hourly</string>
@@ -157,5 +157,9 @@
     <string name="bolus_progress_channel_description">Bolus progress and cancel</string>
     <string name="bolus_progress_silent_channel_description">Bolus progress and cancel with less vibrations</string>
 
+    <string name="simple_ui_off">Off</string>
+    <string name="simple_ui_charging">During Charging</string>
+    <string name="simple_ui_always_on">Always On Mode</string>
+    <string name="simple_ui_always_on_charging">Always On and Charging</string>
 
 </resources>

wear/src/main/res/xml/preferences.xml

@@ -5,16 +5,16 @@
     <CheckBoxPreference
         android:defaultValue="true"
         android:key="show_iob"
-        android:title="@string/pref_show_iob"
         android:summary="Show insulin on board."
+        android:title="@string/pref_show_iob"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
 
     <CheckBoxPreference
         android:defaultValue="true"
         android:key="show_cob"
-        android:title="@string/pref_show_cob"
         android:summary="Show carb on board."
+        android:title="@string/pref_show_cob"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
 
@@ -24,7 +24,7 @@
         android:summary="Show BG."
         android:title="@string/pref_show_bg"
         app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on"/>
+        app:wear_iconOn="@drawable/settings_on" />
 
     <CheckBoxPreference
         android:defaultValue="true"
@@ -32,7 +32,7 @@
         android:summary="Show delta."
         android:title="@string/pref_show_delta"
         app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on"/>
+        app:wear_iconOn="@drawable/settings_on" />
 
     <CheckBoxPreference
         android:defaultValue="true"
@@ -40,14 +40,14 @@
         android:summary="Show the avgDelta."
         android:title="@string/pref_show_avgdelta"
         app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on"/>
+        app:wear_iconOn="@drawable/settings_on" />
     <CheckBoxPreference
         android:defaultValue="true"
         android:key="show_direction"
         android:summary="Show direction arrow"
         android:title="@string/pref_show_direction_arrow"
         app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on"/>
+        app:wear_iconOn="@drawable/settings_on" />
 
     <CheckBoxPreference
         android:defaultValue="true"
@@ -55,7 +55,7 @@
         android:summary="Minutes since last reading."
         android:title="@string/pref_show_ago"
         app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on"/>
+        app:wear_iconOn="@drawable/settings_on" />
 
     <CheckBoxPreference
         android:defaultValue="true"
@@ -85,15 +85,13 @@
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
 
-
-
     <CheckBoxPreference
         android:defaultValue="false"
         android:key="highlight_basals"
         android:summary="Better visible basal rate and temp basals"
         android:title="@string/pref_highlight_basals"
         app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on"/>
+        app:wear_iconOn="@drawable/settings_on" />
 
     <ListPreference
         android:defaultValue="3"
@@ -103,14 +101,12 @@
         android:summary="Chart Timeframe"
         android:title="@string/pref_chart_timeframe" />
 
-
-
     <CheckBoxPreference
         android:defaultValue="true"
         android:key="units_mgdl"
-        android:title="@string/pref_units_for_actions"
-        android:summaryOn="mg/dl"
         android:summaryOff="mmol/l"
+        android:summaryOn="mg/dl"
+        android:title="@string/pref_units_for_actions"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
 
@@ -128,7 +124,7 @@
         android:summary="Wizard from watch possible"
         android:title="@string/pref_wizard_in_menu"
         app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on"/>
+        app:wear_iconOn="@drawable/settings_on" />
 
     <CheckBoxPreference
         android:defaultValue="true"
@@ -143,7 +139,7 @@
         android:summary="Prime/Fill from watch possible"
         android:title="@string/pref_prime_in_menu"
         app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on"/>
+        app:wear_iconOn="@drawable/settings_on" />
 
     <CheckBoxPreference
         android:defaultValue="true"
@@ -151,7 +147,7 @@
         android:summary="Single temp-target instead of a range."
         android:title="@string/pref_single_target"
         app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on"/>
+        app:wear_iconOn="@drawable/settings_on" />
 
     <CheckBoxPreference
         android:defaultValue="false"
@@ -159,9 +155,7 @@
         android:summary="Percentage correction."
         android:title="@string/pref_wizard_percentage"
         app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on"/>
+        app:wear_iconOn="@drawable/settings_on" />
-
-
 
     <ListPreference
         android:defaultValue="default"
@@ -177,7 +171,7 @@
         android:summary="Use unicode special characters in complications."
         android:title="@string/pref_unicode_in_complications"
         app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on"/>
+        app:wear_iconOn="@drawable/settings_on" />
 
     <info.nightscout.androidaps.interaction.utils.VersionPreference
         android:defaultValue="1"

wear/src/main/res/xml/watch_face_configuration_bigchart.xml

@@ -9,12 +9,13 @@
         android:summary="Dark theme"
         android:title="@string/pref_dark"
         app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on"/>
+        app:wear_iconOn="@drawable/settings_on" />
 
     <CheckBoxPreference
+        android:defaultValue="false"
         android:key="vibrate_Hourly"
         android:title="@string/pref_vibrate_hourly"
-        android:defaultValue="false"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
+
 </PreferenceScreen>

wear/src/main/res/xml/watch_face_configuration_circle.xml

@@ -8,7 +8,7 @@
         android:summary="Dark theme"
         android:title="@string/pref_dark"
         app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on"/>
+        app:wear_iconOn="@drawable/settings_on" />
 
     <CheckBoxPreference
         android:defaultValue="false"
@@ -16,7 +16,7 @@
         android:summary="Big numbers. (Circle WF)"
         android:title="@string/pref_big_numbers"
         app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on"/>
+        app:wear_iconOn="@drawable/settings_on" />
 
     <CheckBoxPreference
         android:defaultValue="false"
@@ -32,7 +32,7 @@
         android:summary="Less eyecandy. (Circle WF)"
         android:title="@string/pref_light_ring_history"
         app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on"/>
+        app:wear_iconOn="@drawable/settings_on" />
 
     <CheckBoxPreference
         android:defaultValue="true"
@@ -40,13 +40,13 @@
         android:summary="Animations. (Circle WF)"
         android:title="@string/pref_animations"
         app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on"/>
+        app:wear_iconOn="@drawable/settings_on" />
-   
 
     <CheckBoxPreference
+        android:defaultValue="false"
         android:key="vibrate_Hourly"
         android:title="@string/pref_vibrate_hourly"
-        android:defaultValue="false"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
+
 </PreferenceScreen>

wear/src/main/res/xml/watch_face_configuration_cockpit.xml

@@ -3,18 +3,18 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <CheckBoxPreference
+        android:defaultValue="false"
         android:key="vibrate_Hourly"
         android:title="@string/pref_vibrate_hourly"
-        android:defaultValue="false"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
 
-    <CheckBoxPreference
+    <ListPreference
-        android:defaultValue="false"
+        android:defaultValue="off"
-        android:key="simplify_ui_charging"
+        android:entries="@array/watchface_simplify_ui_name"
-        android:summary="@string/pref_simplify_ui_charging_sum"
+        android:entryValues="@array/watchface_simplify_ui_values"
-        android:title="@string/pref_simplify_ui_charging"
+        android:key="simplify_ui"
-        app:wear_iconOff="@drawable/settings_off"
+        android:summary="@string/pref_simplify_ui_sum"
-        app:wear_iconOn="@drawable/settings_on" />
+        android:title="@string/pref_simplify_ui" />
 
 </PreferenceScreen>

wear/src/main/res/xml/watch_face_configuration_digitalstyle.xml

@@ -4,59 +4,59 @@
 
 
     <ListPreference
-        android:key="digitalstyle_frameStyle"
-        android:title="@string/digitalstyle_pref_your_style"
         android:defaultValue="full"
         android:entries="@array/digitalstyle_styles_name"
-        android:entryValues="@array/digitalstyle_styles_values"/>
+        android:entryValues="@array/digitalstyle_styles_values"
+        android:key="digitalstyle_frameStyle"
+        android:title="@string/digitalstyle_pref_your_style" />
 
     <ListPreference
-        android:key="digitalstyle_frameColor"
-        android:title="@string/digitalstyle_pref_your_color"
         android:defaultValue="red"
         android:entries="@array/digitalstyle_color_name"
-        android:entryValues="@array/digitalstyle_color_values"/>
+        android:entryValues="@array/digitalstyle_color_values"
+        android:key="digitalstyle_frameColor"
+        android:title="@string/digitalstyle_pref_your_color" />
     <ListPreference
-        android:key="digitalstyle_frameColorSaturation"
-        android:title="@string/digitalstyle_pref_your_color_saturation"
         android:defaultValue="700"
         android:entries="@array/digitalstyle_color_saturation"
-        android:entryValues="@array/digitalstyle_color_saturation"/>
+        android:entryValues="@array/digitalstyle_color_saturation"
+        android:key="digitalstyle_frameColorSaturation"
+        android:title="@string/digitalstyle_pref_your_color_saturation" />
 
     <ListPreference
-        android:key="digitalstyle_frameColorOpacity"
-        android:title="@string/digitalstyle_pref_your_color_opacity"
         android:defaultValue="1"
         android:entries="@array/digitalstyle_color_opacity_name"
-        android:entryValues="@array/digitalstyle_color_opacity_value"/>
+        android:entryValues="@array/digitalstyle_color_opacity_value"
+        android:key="digitalstyle_frameColorOpacity"
+        android:title="@string/digitalstyle_pref_your_color_opacity" />
 
     <CheckBoxPreference
+        android:defaultValue="true"
         android:key="show_date"
         android:title="@string/pref_show_date"
-        android:defaultValue="true"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
 
     <CheckBoxPreference
+        android:defaultValue="false"
         android:key="show_weeknumber"
         android:title="@string/pref_show_weeknumber"
-        android:defaultValue="false"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
 
     <CheckBoxPreference
+        android:defaultValue="false"
         android:key="vibrate_Hourly"
         android:title="@string/pref_vibrate_hourly"
-        android:defaultValue="false"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
 
-    <CheckBoxPreference
+    <ListPreference
-        android:defaultValue="false"
+        android:defaultValue="off"
-        android:key="simplify_ui_charging"
+        android:entries="@array/watchface_simplify_ui_name"
-        android:summary="@string/pref_simplify_ui_charging_sum"
+        android:entryValues="@array/watchface_simplify_ui_values"
-        android:title="@string/pref_simplify_ui_charging"
+        android:key="simplify_ui"
-        app:wear_iconOff="@drawable/settings_off"
+        android:summary="@string/pref_simplify_ui_sum"
-        app:wear_iconOn="@drawable/settings_on" />
+        android:title="@string/pref_simplify_ui" />
 
 </PreferenceScreen>

wear/src/main/res/xml/watch_face_configuration_home.xml

@@ -8,7 +8,7 @@
         android:summary="Dark theme"
         android:title="@string/pref_dark"
         app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on"/>
+        app:wear_iconOn="@drawable/settings_on" />
 
     <CheckBoxPreference
         android:defaultValue="false"
@@ -16,21 +16,21 @@
         android:summary="Status bar divider background matches watchface background"
         android:title="@string/pref_matching_divider"
         app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on"/>
+        app:wear_iconOn="@drawable/settings_on" />
 
     <CheckBoxPreference
+        android:defaultValue="false"
         android:key="vibrate_Hourly"
         android:title="@string/pref_vibrate_hourly"
-        android:defaultValue="false"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
 
-    <CheckBoxPreference
+    <ListPreference
-        android:defaultValue="false"
+        android:defaultValue="off"
-        android:key="simplify_ui_charging"
+        android:entries="@array/watchface_simplify_ui_name"
-        android:summary="@string/pref_simplify_ui_charging_sum"
+        android:entryValues="@array/watchface_simplify_ui_values"
-        android:title="@string/pref_simplify_ui_charging"
+        android:key="simplify_ui"
-        app:wear_iconOff="@drawable/settings_off"
+        android:summary="@string/pref_simplify_ui_sum"
-        app:wear_iconOn="@drawable/settings_on" />
+        android:title="@string/pref_simplify_ui" />
 
 </PreferenceScreen>

wear/src/main/res/xml/watch_face_configuration_home2.xml

@@ -32,12 +32,12 @@
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
 
-    <CheckBoxPreference
+    <ListPreference
-        android:defaultValue="false"
+        android:defaultValue="off"
-        android:key="simplify_ui_charging"
+        android:entries="@array/watchface_simplify_ui_name"
-        android:summary="@string/pref_simplify_ui_charging_sum"
+        android:entryValues="@array/watchface_simplify_ui_values"
-        android:title="@string/pref_simplify_ui_charging"
+        android:key="simplify_ui"
-        app:wear_iconOff="@drawable/settings_off"
+        android:summary="@string/pref_simplify_ui_sum"
-        app:wear_iconOn="@drawable/settings_on" />
+        android:title="@string/pref_simplify_ui" />
 
 </PreferenceScreen>

wear/src/main/res/xml/watch_face_configuration_largehome.xml

@@ -8,7 +8,7 @@
         android:summary="Dark theme"
         android:title="@string/pref_dark"
         app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on"/>
+        app:wear_iconOn="@drawable/settings_on" />
 
     <CheckBoxPreference
         android:defaultValue="false"
@@ -16,21 +16,21 @@
         android:summary="Status bar divider background matches watchface background"
         android:title="@string/pref_matching_divider"
         app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on"/>
+        app:wear_iconOn="@drawable/settings_on" />
 
     <CheckBoxPreference
+        android:defaultValue="false"
         android:key="vibrate_Hourly"
         android:title="@string/pref_vibrate_hourly"
-        android:defaultValue="false"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
 
-    <CheckBoxPreference
+    <ListPreference
-        android:defaultValue="false"
+        android:defaultValue="off"
-        android:key="simplify_ui_charging"
+        android:entries="@array/watchface_simplify_ui_name"
-        android:summary="@string/pref_simplify_ui_charging_sum"
+        android:entryValues="@array/watchface_simplify_ui_values"
-        android:title="@string/pref_simplify_ui_charging"
+        android:key="simplify_ui"
-        app:wear_iconOff="@drawable/settings_off"
+        android:summary="@string/pref_simplify_ui_sum"
-        app:wear_iconOn="@drawable/settings_on" />
+        android:title="@string/pref_simplify_ui" />
 
 </PreferenceScreen>

wear/src/main/res/xml/watch_face_configuration_nochart.xml

@@ -8,13 +8,14 @@
         android:summary="Dark theme"
         android:title="@string/pref_dark"
         app:wear_iconOff="@drawable/settings_off"
-        app:wear_iconOn="@drawable/settings_on"/>
+        app:wear_iconOn="@drawable/settings_on" />
 
 
     <CheckBoxPreference
+        android:defaultValue="false"
         android:key="vibrate_Hourly"
         android:title="@string/pref_vibrate_hourly"
-        android:defaultValue="false"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
+
 </PreferenceScreen>

wear/src/main/res/xml/watch_face_configuration_steampunk.xml

@@ -11,18 +11,18 @@
         android:title="@string/pref_delta_granularity" />
 
     <CheckBoxPreference
+        android:defaultValue="false"
         android:key="vibrate_Hourly"
         android:title="@string/pref_vibrate_hourly"
-        android:defaultValue="false"
         app:wear_iconOff="@drawable/settings_off"
         app:wear_iconOn="@drawable/settings_on" />
 
-    <CheckBoxPreference
+    <ListPreference
-        android:defaultValue="false"
+        android:defaultValue="off"
-        android:key="simplify_ui_charging"
+        android:entries="@array/watchface_simplify_ui_name"
-        android:summary="@string/pref_simplify_ui_charging_sum"
+        android:entryValues="@array/watchface_simplify_ui_values"
-        android:title="@string/pref_simplify_ui_charging"
+        android:key="simplify_ui"
-        app:wear_iconOff="@drawable/settings_off"
+        android:summary="@string/pref_simplify_ui_sum"
-        app:wear_iconOn="@drawable/settings_on" />
+        android:title="@string/pref_simplify_ui" />
 
 </PreferenceScreen>