Skip to content

Commit

Permalink
Use HOLO more consistently.
Browse files Browse the repository at this point in the history
  • Loading branch information
ruiaraujo committed Nov 18, 2013
1 parent 43f4d82 commit 7c254d9
Show file tree
Hide file tree
Showing 8 changed files with 240 additions and 4 deletions.
2 changes: 1 addition & 1 deletion android/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<activity
android:name=".CancelOperationActivity"
android:excludeFromRecents="true"
android:theme="@style/Theme.Sherlock.NoActionBar" />
android:theme="@style/Theme.Sherlock.Dialog" />
<activity
android:name="com.ipaulpro.afilechooser.FileChooserActivity"
android:icon="@drawable/ic_chooser"
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added android/res/drawable-mdpi-v11/ic_notification.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions android/res/values/styles.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<style name="Theme.Sherlock.Dialog" parent="Theme.Sherlock.NoActionBar">
<item name="android:windowIsFloating">true</item>
</style>

</resources>
14 changes: 11 additions & 3 deletions android/src/org/exobel/routerkeygen/WifiScanReceiver.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/
package org.exobel.routerkeygen;

import java.io.IOException;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
Expand All @@ -30,6 +31,7 @@
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources.NotFoundException;
import android.net.wifi.ScanResult;
import android.net.wifi.WifiManager;
import android.os.AsyncTask;
Expand Down Expand Up @@ -114,10 +116,17 @@ protected WiFiNetwork[] doInBackground(Void... params) {
results.remove(j--);
for (ScanResult result : results) {
try {
set.add(new WiFiNetwork(result, new ZipInputStream(context
.getResources().openRawResource(R.raw.magic_info))));
ZipInputStream magicInfo = new ZipInputStream(context
.getResources().openRawResource(R.raw.magic_info));
set.add(new WiFiNetwork(result, magicInfo));
magicInfo.close();
} catch (LinkageError e) {
misbuiltAPK = true;
} catch (NotFoundException e1) {
e1.printStackTrace();
} catch (IOException e1) {
// TODO Auto-generated catch block
e1.printStackTrace();
}
}

Expand All @@ -128,6 +137,5 @@ protected WiFiNetwork[] doInBackground(Void... params) {
networks[i++] = it.next();
return networks;
}

}
}
220 changes: 220 additions & 0 deletions icon/icon_notification.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 7c254d9

Please sign in to comment.