diff --git a/OsmAnd/res/drawable-hdpi/mon_osmo_conn_big.png b/OsmAnd/res/drawable-hdpi/mon_osmo_conn_big.png index ab803bd6df..071dee5e98 100644 Binary files a/OsmAnd/res/drawable-hdpi/mon_osmo_conn_big.png and b/OsmAnd/res/drawable-hdpi/mon_osmo_conn_big.png differ diff --git a/OsmAnd/res/drawable-hdpi/mon_osmo_conn_signal_big.png b/OsmAnd/res/drawable-hdpi/mon_osmo_conn_signal_big.png index 86dff7a709..bce72b4f07 100644 Binary files a/OsmAnd/res/drawable-hdpi/mon_osmo_conn_signal_big.png and b/OsmAnd/res/drawable-hdpi/mon_osmo_conn_signal_big.png differ diff --git a/OsmAnd/res/drawable-hdpi/mon_osmo_conn_signal_small.png b/OsmAnd/res/drawable-hdpi/mon_osmo_conn_signal_small.png index 0a4e057d5f..a6c8f2d9ad 100644 Binary files a/OsmAnd/res/drawable-hdpi/mon_osmo_conn_signal_small.png and b/OsmAnd/res/drawable-hdpi/mon_osmo_conn_signal_small.png differ diff --git a/OsmAnd/res/drawable-hdpi/mon_osmo_conn_small.png b/OsmAnd/res/drawable-hdpi/mon_osmo_conn_small.png index bd037422c4..a479ddb442 100644 Binary files a/OsmAnd/res/drawable-hdpi/mon_osmo_conn_small.png and b/OsmAnd/res/drawable-hdpi/mon_osmo_conn_small.png differ diff --git a/OsmAnd/res/drawable-hdpi/mon_osmo_inactive.png b/OsmAnd/res/drawable-hdpi/mon_osmo_inactive.png new file mode 100644 index 0000000000..b7dbeab3ee Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/mon_osmo_inactive.png differ diff --git a/OsmAnd/res/drawable-hdpi/mon_osmo_signal_inactive.png b/OsmAnd/res/drawable-hdpi/mon_osmo_signal_inactive.png new file mode 100644 index 0000000000..2bdd01855d Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/mon_osmo_signal_inactive.png differ diff --git a/OsmAnd/res/drawable-large/mon_osmo_conn_big.png b/OsmAnd/res/drawable-large/mon_osmo_conn_big.png index ab803bd6df..071dee5e98 100644 Binary files a/OsmAnd/res/drawable-large/mon_osmo_conn_big.png and b/OsmAnd/res/drawable-large/mon_osmo_conn_big.png differ diff --git a/OsmAnd/res/drawable-large/mon_osmo_conn_signal_big.png b/OsmAnd/res/drawable-large/mon_osmo_conn_signal_big.png index 86dff7a709..bce72b4f07 100644 Binary files a/OsmAnd/res/drawable-large/mon_osmo_conn_signal_big.png and b/OsmAnd/res/drawable-large/mon_osmo_conn_signal_big.png differ diff --git a/OsmAnd/res/drawable-large/mon_osmo_conn_signal_small.png b/OsmAnd/res/drawable-large/mon_osmo_conn_signal_small.png index 0a4e057d5f..a6c8f2d9ad 100644 Binary files a/OsmAnd/res/drawable-large/mon_osmo_conn_signal_small.png and b/OsmAnd/res/drawable-large/mon_osmo_conn_signal_small.png differ diff --git a/OsmAnd/res/drawable-large/mon_osmo_conn_small.png b/OsmAnd/res/drawable-large/mon_osmo_conn_small.png index bd037422c4..a479ddb442 100644 Binary files a/OsmAnd/res/drawable-large/mon_osmo_conn_small.png and b/OsmAnd/res/drawable-large/mon_osmo_conn_small.png differ diff --git a/OsmAnd/res/drawable-large/mon_osmo_inactive.png b/OsmAnd/res/drawable-large/mon_osmo_inactive.png new file mode 100644 index 0000000000..b7dbeab3ee Binary files /dev/null and b/OsmAnd/res/drawable-large/mon_osmo_inactive.png differ diff --git a/OsmAnd/res/drawable-large/mon_osmo_signal_inactive.png b/OsmAnd/res/drawable-large/mon_osmo_signal_inactive.png new file mode 100644 index 0000000000..2bdd01855d Binary files /dev/null and b/OsmAnd/res/drawable-large/mon_osmo_signal_inactive.png differ diff --git a/OsmAnd/res/drawable-mdpi/mon_osmo_conn_big.png b/OsmAnd/res/drawable-mdpi/mon_osmo_conn_big.png new file mode 100644 index 0000000000..e322152e97 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/mon_osmo_conn_big.png differ diff --git a/OsmAnd/res/drawable-mdpi/mon_osmo_conn_signal_big.png b/OsmAnd/res/drawable-mdpi/mon_osmo_conn_signal_big.png new file mode 100644 index 0000000000..6445188571 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/mon_osmo_conn_signal_big.png differ diff --git a/OsmAnd/res/drawable-mdpi/mon_osmo_conn_signal_small.png b/OsmAnd/res/drawable-mdpi/mon_osmo_conn_signal_small.png new file mode 100644 index 0000000000..d52cbfe0aa Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/mon_osmo_conn_signal_small.png differ diff --git a/OsmAnd/res/drawable-mdpi/mon_osmo_conn_small.png b/OsmAnd/res/drawable-mdpi/mon_osmo_conn_small.png new file mode 100644 index 0000000000..ede4fc11bc Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/mon_osmo_conn_small.png differ diff --git a/OsmAnd/res/drawable-mdpi/mon_osmo_inactive.png b/OsmAnd/res/drawable-mdpi/mon_osmo_inactive.png new file mode 100644 index 0000000000..44ca1e0876 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/mon_osmo_inactive.png differ diff --git a/OsmAnd/res/drawable-mdpi/mon_osmo_signal_inactive.png b/OsmAnd/res/drawable-mdpi/mon_osmo_signal_inactive.png new file mode 100644 index 0000000000..99b14262ac Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/mon_osmo_signal_inactive.png differ diff --git a/OsmAnd/res/drawable-xhdpi/mon_osmo_conn_big.png b/OsmAnd/res/drawable-xhdpi/mon_osmo_conn_big.png new file mode 100644 index 0000000000..469fbbc676 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/mon_osmo_conn_big.png differ diff --git a/OsmAnd/res/drawable-xhdpi/mon_osmo_conn_signal_big.png b/OsmAnd/res/drawable-xhdpi/mon_osmo_conn_signal_big.png new file mode 100644 index 0000000000..3ca28c5455 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/mon_osmo_conn_signal_big.png differ diff --git a/OsmAnd/res/drawable-xhdpi/mon_osmo_conn_signal_small.png b/OsmAnd/res/drawable-xhdpi/mon_osmo_conn_signal_small.png new file mode 100644 index 0000000000..18b5061352 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/mon_osmo_conn_signal_small.png differ diff --git a/OsmAnd/res/drawable-xhdpi/mon_osmo_conn_small.png b/OsmAnd/res/drawable-xhdpi/mon_osmo_conn_small.png new file mode 100644 index 0000000000..29e539b9db Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/mon_osmo_conn_small.png differ diff --git a/OsmAnd/res/drawable-xhdpi/mon_osmo_inactive.png b/OsmAnd/res/drawable-xhdpi/mon_osmo_inactive.png new file mode 100644 index 0000000000..bd59eb35ba Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/mon_osmo_inactive.png differ diff --git a/OsmAnd/res/drawable-xhdpi/mon_osmo_signal_inactive.png b/OsmAnd/res/drawable-xhdpi/mon_osmo_signal_inactive.png new file mode 100644 index 0000000000..ee63d9021b Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/mon_osmo_signal_inactive.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/mon_osmo_conn_big.png b/OsmAnd/res/drawable-xxhdpi/mon_osmo_conn_big.png new file mode 100644 index 0000000000..e0b81e2388 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/mon_osmo_conn_big.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/mon_osmo_conn_signal_big.png b/OsmAnd/res/drawable-xxhdpi/mon_osmo_conn_signal_big.png new file mode 100644 index 0000000000..e5aa19e5e1 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/mon_osmo_conn_signal_big.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/mon_osmo_conn_signal_small.png b/OsmAnd/res/drawable-xxhdpi/mon_osmo_conn_signal_small.png new file mode 100644 index 0000000000..f173b41fb1 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/mon_osmo_conn_signal_small.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/mon_osmo_conn_small.png b/OsmAnd/res/drawable-xxhdpi/mon_osmo_conn_small.png new file mode 100644 index 0000000000..90f927bb86 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/mon_osmo_conn_small.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/mon_osmo_inactive.png b/OsmAnd/res/drawable-xxhdpi/mon_osmo_inactive.png new file mode 100644 index 0000000000..8b5573bbb8 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/mon_osmo_inactive.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/mon_osmo_signal_inactive.png b/OsmAnd/res/drawable-xxhdpi/mon_osmo_signal_inactive.png new file mode 100644 index 0000000000..6ab0a2f016 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/mon_osmo_signal_inactive.png differ diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java index b6f344a872..98c6c33ec9 100644 --- a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java +++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java @@ -251,11 +251,12 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements final Drawable srcSignalSmall = getResources().getDrawable(R.drawable.mon_osmo_conn_signal_small); final Drawable srcBig = getResources().getDrawable(R.drawable.mon_osmo_conn_big); final Drawable srcSignalBig = getResources().getDrawable(R.drawable.mon_osmo_conn_signal_big); - final Drawable srcinactive = getResources().getDrawable(R.drawable.monitoring_rec_inactive); - Drawable small = srcinactive; - Drawable big = srcinactive; +// final Drawable srcinactive = getResources().getDrawable(R.drawable.mon_osmo_inactive); + final Drawable srcSignalinactive = getResources().getDrawable(R.drawable.mon_osmo_signal_inactive); OsMoService service = osMoPlugin.getService(); OsMoTracker tracker = osMoPlugin.getTracker(); + Drawable small = srcSignalinactive; //tracker.isEnabledTracker() ? srcSignalinactive : srcinactive; + Drawable big = srcSignalinactive;// tracker.isEnabledTracker() ? srcSignalinactive : srcinactive; long last = service.getLastCommandTime(); if (service.isActive()) { small = tracker.isEnabledTracker() ? srcSignalSmall : srcSmall; @@ -654,7 +655,9 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements final EditText et = new EditText(this); et.setVisibility(View.GONE); ll.addView(et); - builder.setView(ll); + ScrollView scrollView = new ScrollView(this); + scrollView.addView(ll); + builder.setView(scrollView); wv.setFocusable(true); wv.setFocusableInTouchMode(true); wv.requestFocus(View.FOCUS_DOWN); diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java index 98656e2212..fca1934fef 100644 --- a/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java +++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java @@ -203,7 +203,8 @@ public class OsMoPlugin extends OsmandPlugin implements MonitoringInfoControlSer final Drawable srcSignalSmall = map.getResources().getDrawable(R.drawable.mon_osmo_conn_signal_small); final Drawable srcBig = map.getResources().getDrawable(R.drawable.mon_osmo_conn_big); final Drawable srcSignalBig = map.getResources().getDrawable(R.drawable.mon_osmo_conn_signal_big); - final Drawable srcinactive = map.getResources().getDrawable(R.drawable.monitoring_rec_inactive); +// final Drawable srcinactive = map.getResources().getDrawable(R.drawable.mon_osmo_inactive); + final Drawable srcSignalinactive = map.getResources().getDrawable(R.drawable.mon_osmo_signal_inactive); final TextInfoWidget osmoControl = new TextInfoWidget(map, 0, paintText, paintSubText) { long lastUpdateTime; private Drawable blinkImg; @@ -227,8 +228,8 @@ public class OsMoPlugin extends OsmandPlugin implements MonitoringInfoControlSer } } } - Drawable small = srcinactive; - Drawable big = srcinactive; + Drawable small = srcSignalinactive; //tracker.isEnabledTracker() ? srcSignalinactive : srcinactive; + Drawable big = srcSignalinactive; // tracker.isEnabledTracker() ? srcSignalinactive : srcinactive; long last = service.getLastCommandTime(); if (service.isActive()) { small = tracker.isEnabledTracker() ? srcSignalSmall : srcSmall;