Skip to content

Make the app runnable with Android 6 devices again #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Make the app runnable with Android 6 devices again #4

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b47350d
Add gradle files and request location permission at app start
timobaehr Jul 29, 2020
c6fe553
Fix import problems
timobaehr Jul 29, 2020
5a7c70a
Add .gitignore file
timobaehr Jul 29, 2020
78a41e8
onStart -> onStartCommand
timobaehr Jul 29, 2020
4f1b498
App now starts and monitors applications
timobaehr Jul 29, 2020
47ba6b2
Add README again and update homepage
timobaehr Jul 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix import problems
  • Loading branch information
@timobaehr
timobaehr committed Jul 29, 2020
commit c6fe5535897bd2f23d74ac0ce67d08ba24b4fc42
3 changes: 3 additions & 0 deletions PowerTutor2/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,16 @@
<action android:name="android.intent.action.MAIN" />
</intent-filter>
</activity>

<receiver android:name=".ui.StartupReceiver">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
<category android:name="android.intent.category.HOME" />
</intent-filter>
</receiver>

<service android:name=".service.UMLoggerService" />

<receiver android:name=".widget.PowerWidget" >
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
Expand Down
10 changes: 0 additions & 10 deletions PowerTutor2/src/main/java/edu/umich/PowerTutor/ui/MiscView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,16 @@
import edu.umich.PowerTutor.util.SystemInfo;

import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.ListActivity;
import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.ServiceConnection;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.graphics.Paint;
import android.os.Bundle;
import android.os.Environment;
import android.os.Handler;
import android.os.IBinder;
import android.os.RemoteException;
import android.os.SystemClock;
import android.preference.PreferenceManager;
import android.util.Log;
import android.view.Gravity;
Expand All @@ -54,14 +47,11 @@
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.ScrollView;
import android.widget.TextView;
import android.widget.ListView;

import java.util.ArrayList;
import java.io.File;

public class MiscView extends Activity {
private static final String TAG = "MiscView";
Expand Down
1 change: 1 addition & 0 deletions PowerTutor2/src/main/java/edu/umich/PowerTutor/ui/PowerPie.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import android.view.MenuItem;
import android.widget.LinearLayout;
import android.widget.TextView;

import edu.umich.PowerTutor.service.ICounterService;
import edu.umich.PowerTutor.service.PowerEstimator;
import edu.umich.PowerTutor.service.UMLoggerService;
Expand Down
3 changes: 0 additions & 3 deletions PowerTutor2/src/main/java/edu/umich/PowerTutor/ui/PowerTop.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

package edu.umich.PowerTutor.ui;

import edu.umich.PowerTutor.R;
import edu.umich.PowerTutor.service.ICounterService;
import edu.umich.PowerTutor.service.PowerEstimator;
import edu.umich.PowerTutor.service.UMLoggerService;
Expand All @@ -33,7 +32,6 @@
import android.app.Dialog;
import android.content.DialogInterface;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
import android.content.SharedPreferences;
Expand All @@ -50,7 +48,6 @@
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ScrollView;
Expand Down
1 change: 1 addition & 0 deletions PowerTutor2/src/main/java/edu/umich/PowerTutor/ui/PowerViewer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import android.widget.LinearLayout;
import android.widget.ScrollView;
import android.widget.TextView;

import edu.umich.PowerTutor.service.ICounterService;
import edu.umich.PowerTutor.service.PowerEstimator;
import edu.umich.PowerTutor.service.UMLoggerService;
Expand Down
16 changes: 1 addition & 15 deletions PowerTutor2/src/main/java/edu/umich/PowerTutor/ui/UMLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,29 +29,20 @@
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.ServiceConnection;
import android.content.SharedPreferences;
import android.content.res.Configuration;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.os.IBinder;
import android.os.RemoteException;
import android.preference.PreferenceManager;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemSelectedListener;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.SeekBar;
import android.widget.SeekBar.OnSeekBarChangeListener;
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;

Expand All @@ -61,11 +52,6 @@
import java.io.BufferedOutputStream;

import java.io.IOException;
import java.io.OutputStreamWriter;
import java.net.DatagramPacket;
import java.net.DatagramSocket;
import java.net.InetAddress;
import java.net.UnknownHostException;

/** The main view activity for PowerTutor*/
public class UMLogger extends Activity {
Expand Down Expand Up @@ -342,7 +328,7 @@ public void onClick(View v) {
private class CounterServiceConnection implements ServiceConnection {
public void onServiceConnected(ComponentName className,
IBinder boundService) {
counterService = ICounterService.Stub.asInterface((IBinder)boundService);
counterService = ICounterService.Stub.asInterface((IBinder) boundService);
serviceStartButton.setText("Stop Profiler");
serviceStartButton.setEnabled(true);
appViewerButton.setEnabled(true);
Expand Down