Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa5696ba authored by Romain Hunault's avatar Romain Hunault
Browse files

Merge branch 'cm-14.1' into eelo-0.1

parents 6fd87f58 27968c44

res/values/integers.xml

+2 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<resources>

    <integer name="battery_ok_percentage">40</integer>

    <integer name="battery_ok_percentage_charging">20</integer>

    <integer name="battery_ok_percentage_discharging">30</integer>

</resources>

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
    <string name="preparing_ota_first_boot">Preparing for first boot</string>

    <string name="dialog_prepare_zip_message">Preliminary update preparation</string>

    <string name="dialog_battery_low_title">Low battery</string>

    <string name="dialog_battery_low_message">The battery level is too low, please charge your device to continue.</string>

    <string name="dialog_battery_low_message_pct">The battery level is too low, you need at least <xliff:g id="percent_discharging">%1$d</xliff:g>%% of the battery to continue, <xliff:g id="percent_charging">%2$d</xliff:g>%% if charging.</string>



    <string name="reboot">Reboot</string>

src/org/lineageos/updater/ExportUpdateService.java

+1 −2
Original line number Diff line number Diff line
@@ -200,7 +200,6 @@ public class ExportUpdateService extends Service { 
    private PendingIntent getStopPendingIntent() {

        final Intent intent = new Intent(this, ExportUpdateService.class);

        intent.setAction(ACTION_STOP_EXPORTING);

        return PendingIntent.getService(this, 0, intent,

                PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT);

        return PendingIntent.getService(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);

    }

}

src/org/lineageos/updater/UpdatesListAdapter.java

+18 −4
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ 
package org.lineageos.updater;



import android.content.Intent;

import android.content.IntentFilter;

import android.content.SharedPreferences;

import android.content.res.Resources;

import android.os.BatteryManager;

import android.preference.PreferenceManager;

import android.support.design.widget.Snackbar;
@@ -424,9 +426,13 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter. 


    private AlertDialog.Builder getInstallDialog(final String downloadId) {

        if (!isBatteryLevelOk()) {

            Resources resources = mActivity.getResources();

            String message = resources.getString(R.string.dialog_battery_low_message_pct,

                    resources.getInteger(R.integer.battery_ok_percentage_discharging),

                    resources.getInteger(R.integer.battery_ok_percentage_charging));

            return new AlertDialog.Builder(mActivity)

                    .setTitle(R.string.dialog_battery_low_title)

                    .setMessage(R.string.dialog_battery_low_message)

                    .setMessage(message)

                    .setPositiveButton(android.R.string.ok, null);

        }

        UpdateInfo update = mUpdaterController.getUpdate(downloadId);
@@ -538,8 +544,16 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter. 
    }



    private boolean isBatteryLevelOk() {

        BatteryManager bm = mActivity.getSystemService(BatteryManager.class);

        int percent = bm.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY);

        return percent >= mActivity.getResources().getInteger(R.integer.battery_ok_percentage);

        Intent intent = mActivity.registerReceiver(null,

                new IntentFilter(Intent.ACTION_BATTERY_CHANGED));

        if (!intent.getBooleanExtra(BatteryManager.EXTRA_PRESENT, false)) {

            return true;

        }

        int percent = Math.round(100.f * intent.getIntExtra(BatteryManager.EXTRA_LEVEL, 100) /

                intent.getIntExtra(BatteryManager.EXTRA_SCALE, 100));

        int required = intent.getBooleanExtra(BatteryManager.EXTRA_PLUGGED, false) ?

                mActivity.getResources().getInteger(R.integer.battery_ok_percentage_charging) :

                mActivity.getResources().getInteger(R.integer.battery_ok_percentage_discharging);

        return percent >= required;

    }

}

src/org/lineageos/updater/controller/UpdaterService.java

+3 −6
Original line number Diff line number Diff line
@@ -436,8 +436,7 @@ public class UpdaterService extends Service { 
        intent.setAction(ACTION_DOWNLOAD_CONTROL);

        intent.putExtra(EXTRA_DOWNLOAD_ID, downloadId);

        intent.putExtra(EXTRA_DOWNLOAD_CONTROL, DOWNLOAD_RESUME);

        return PendingIntent.getService(this, 0, intent,

                PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT);

        return PendingIntent.getService(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);

    }



    private PendingIntent getPausePendingIntent(String downloadId) {
@@ -445,15 +444,13 @@ public class UpdaterService extends Service { 
        intent.setAction(ACTION_DOWNLOAD_CONTROL);

        intent.putExtra(EXTRA_DOWNLOAD_ID, downloadId);

        intent.putExtra(EXTRA_DOWNLOAD_CONTROL, DOWNLOAD_PAUSE);

        return PendingIntent.getService(this, 0, intent,

                PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT);

        return PendingIntent.getService(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);

    }



    private PendingIntent getRebootPendingIntent() {

        final Intent intent = new Intent(this, UpdaterReceiver.class);

        intent.setAction(UpdaterReceiver.ACTION_INSTALL_REBOOT);

        return PendingIntent.getBroadcast(this, 0, intent,

                PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT);

        return PendingIntent.getBroadcast(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);

    }



}