diff --git a/res/layout-large-notouch/update_item_view.xml b/res/layout-large-notouch/update_item_view.xml index b7b7fd8a..c6898f21 100644 --- a/res/layout-large-notouch/update_item_view.xml +++ b/res/layout-large-notouch/update_item_view.xml @@ -49,25 +49,40 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"> - + tools:visibility="visible"> + + + + + - + tools:visibility="visible"> + + + + + LineageOS %1$s LineageOS %1$s - %2$s - %1$s of %2$s%3$s - %1$s of %2$s (%3$s) • %4$s + %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. diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java index 3b75a54f..c06b4e04 100644 --- a/src/org/lineageos/updater/UpdatesListAdapter.java +++ b/src/org/lineageos/updater/UpdatesListAdapter.java @@ -37,6 +37,7 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.CheckBox; import android.widget.ImageButton; +import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; @@ -104,8 +105,10 @@ public class UpdatesListAdapter extends RecyclerView.Adapter 0) { CharSequence etaString = StringGenerator.formatETA(mActivity, eta * 1000); viewHolder.mProgressText.setText(mActivity.getString( - R.string.list_download_progress_eta_new, downloaded, total, etaString, - percentage)); + R.string.list_download_progress_eta_newer, downloaded, total, etaString)); } else { viewHolder.mProgressText.setText(mActivity.getString( - R.string.list_download_progress_new, downloaded, total, percentage)); + R.string.list_download_progress_newer, downloaded, total)); } setButtonAction(viewHolder.mAction, Action.PAUSE, downloadId, true); viewHolder.mProgressBar.setIndeterminate(update.getStatus() == UpdateStatus.STARTING); @@ -196,14 +201,15 @@ public class UpdatesListAdapter extends RecyclerView.Adapter