diff --git a/res/values/strings.xml b/res/values/strings.xml index 4c5bcc21..3516ad63 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -64,6 +64,8 @@ The update verification failed. Download completed. + This update can\'t be installed on top of the current build. + LineageOS\n%1$s Android %1$s Last checked: %1$s (%2$s) diff --git a/src/org/lineageos/updater/UpdatesActivity.java b/src/org/lineageos/updater/UpdatesActivity.java index 26279daa..de96ad6f 100644 --- a/src/org/lineageos/updater/UpdatesActivity.java +++ b/src/org/lineageos/updater/UpdatesActivity.java @@ -41,6 +41,7 @@ import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.Menu; import android.view.MenuItem; +import android.view.View; import android.widget.TextView; import org.json.JSONException; @@ -75,7 +76,8 @@ public class UpdatesActivity extends AppCompatActivity { setContentView(R.layout.activity_updates); RecyclerView recyclerView = (RecyclerView) findViewById(R.id.recycler_view); - mAdapter = new UpdatesListAdapter(this); + View containerView = findViewById(R.id.main_container); + mAdapter = new UpdatesListAdapter(this, containerView); recyclerView.setAdapter(mAdapter); RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(this); recyclerView.setLayoutManager(layoutManager); diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java index 2e7509a8..5c7f6a88 100644 --- a/src/org/lineageos/updater/UpdatesListAdapter.java +++ b/src/org/lineageos/updater/UpdatesListAdapter.java @@ -17,6 +17,7 @@ package org.lineageos.updater; import android.content.Context; import android.content.DialogInterface; +import android.support.design.widget.Snackbar; import android.support.v7.app.AlertDialog; import android.support.v7.widget.RecyclerView; import android.text.format.DateUtils; @@ -49,6 +50,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter mDownloadIds; private UpdaterControllerInt mUpdaterController; private Context mContext; + private View mContainerView; private enum Action { DOWNLOAD, @@ -86,8 +88,9 @@ public class UpdatesListAdapter extends RecyclerView.Adapter