diff --git a/res/layout/activity_updates.xml b/res/layout/activity_updates.xml index b6c3dc64a6ea2c5539aa698f0b6443eb82bb28ff..3b956f56ab949461d2348de1c79bdf397d902ff3 100644 --- a/res/layout/activity_updates.xml +++ b/res/layout/activity_updates.xml @@ -115,12 +115,31 @@ android:textColor="?android:textColorSecondary" /> - + android:orientation="vertical" + app:layout_behavior="@string/appbar_scrolling_view_behavior"> + + + + + diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml index 8628a36c26a5f5abed1d222212c3b9f94e5922aa..ad3cc423571d014e08f61af31a300d334dc4a647 100644 --- a/res/values-en-rAU/strings.xml +++ b/res/values-en-rAU/strings.xml @@ -70,7 +70,7 @@ %1$s of %2$s %1$s of %2$s (%3$s) Verifying update - No new updates found. To manually check for new updates, use the Refresh button. + You are running the latest /e/OS version. To manually check for updates, use the Refresh button. Download Pause Resume diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml index 2e2611c0e47a960de9384e291bc9aad31644bb2b..84f9102d6f356743d1ac84983305b10c5ce19047 100644 --- a/res/values-en-rCA/strings.xml +++ b/res/values-en-rCA/strings.xml @@ -70,7 +70,7 @@ %1$s of %2$s %1$s of %2$s (%3$s) Verifying update - No new updates found. To manually check for new updates, use the Refresh button. + You are running the latest /e/OS version. To manually check for updates, use the Refresh button. Download Pause Resume diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index ea66ddecff24e0b5194d8d1985050f93b98b4b2d..9e63df1f337aedaf13681ed4bba17cb74d842048 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -70,7 +70,7 @@ %1$s of %2$s %1$s of %2$s (%3$s) Verifying update - No new updates found. To manually check for new updates, use the Refresh button. + You are running the latest /e/OS version. To manually check for updates, use the Refresh button. Download Pause Resume diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index ea66ddecff24e0b5194d8d1985050f93b98b4b2d..9e63df1f337aedaf13681ed4bba17cb74d842048 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -70,7 +70,7 @@ %1$s of %2$s %1$s of %2$s (%3$s) Verifying update - No new updates found. To manually check for new updates, use the Refresh button. + You are running the latest /e/OS version. To manually check for updates, use the Refresh button. Download Pause Resume diff --git a/res/values/strings.xml b/res/values/strings.xml index 4610b39da84fb7da4a87f1f03babdb5501a5c404..ac7427af89909d101a4be23d5e168a2a76a534ca 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -100,7 +100,7 @@ %1$s of %2$s %1$s of %2$s (%3$s) Verifying update - No new updates found. To manually check for new updates, use the Refresh button. + You are running the latest /e/OS version. To manually check for updates, use the Refresh button. Download Pause @@ -173,4 +173,6 @@ /e/OS\n%1$s + + Available updates: diff --git a/src/org/lineageos/updater/UpdatesActivity.java b/src/org/lineageos/updater/UpdatesActivity.java index d99cb09d318cef311026d7d9766b7ecadcbff717..b27afc35571651c3e415d7ccc2407d02ee4949ce 100644 --- a/src/org/lineageos/updater/UpdatesActivity.java +++ b/src/org/lineageos/updater/UpdatesActivity.java @@ -296,10 +296,10 @@ public class UpdatesActivity extends UpdatesListActivity { List sortedUpdates = controller.getUpdates(); if (sortedUpdates.isEmpty()) { findViewById(R.id.no_new_updates_view).setVisibility(View.VISIBLE); - findViewById(R.id.recycler_view).setVisibility(View.GONE); + findViewById(R.id.content).setVisibility(View.GONE); } else { findViewById(R.id.no_new_updates_view).setVisibility(View.GONE); - findViewById(R.id.recycler_view).setVisibility(View.VISIBLE); + findViewById(R.id.content).setVisibility(View.VISIBLE); sortedUpdates.sort((u1, u2) -> Long.compare(u2.getTimestamp(), u1.getTimestamp())); for (UpdateInfo update : sortedUpdates) { updateIds.add(update.getDownloadId()); @@ -455,7 +455,7 @@ public class UpdatesActivity extends UpdatesListActivity { mRefreshIconView.setEnabled(false); } } else { - findViewById(R.id.recycler_view).setVisibility(View.GONE); + findViewById(R.id.content).setVisibility(View.GONE); findViewById(R.id.no_new_updates_view).setVisibility(View.GONE); findViewById(R.id.refresh_progress).setVisibility(View.VISIBLE); } @@ -470,7 +470,7 @@ public class UpdatesActivity extends UpdatesListActivity { } else { findViewById(R.id.refresh_progress).setVisibility(View.GONE); if (mAdapter.getItemCount() > 0) { - findViewById(R.id.recycler_view).setVisibility(View.VISIBLE); + findViewById(R.id.content).setVisibility(View.VISIBLE); } else { findViewById(R.id.no_new_updates_view).setVisibility(View.VISIBLE); }