Compare commits
3 commits
master
...
wallet/tas
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8e9104f6f2 | ||
|
|
3665ad6764 | ||
|
|
aab2b9c412 |
11 changed files with 10 additions and 3 deletions
|
|
@ -372,7 +372,7 @@ module.exports = function(grunt) {
|
|||
|
||||
// Build android
|
||||
grunt.registerTask('start-android', ['build-android-debug', 'exec:run_android']);
|
||||
grunt.registerTask('build-android-debug', ['exec:build_android_debug']);
|
||||
grunt.registerTask('build-android-debug', ['default', 'exec:build_android_debug']);
|
||||
grunt.registerTask('start-android-emulator', ['build-android-debug', 'exec:run_android_emulator']);
|
||||
grunt.registerTask('build-android-release', ['prod', 'exec:build_android_release', 'sign-android']);
|
||||
grunt.registerTask('sign-android', ['exec:sign_android']);
|
||||
|
|
|
|||
|
|
@ -142,6 +142,13 @@
|
|||
<icon src="resources/*PACKAGENAME*/android/icon/drawable-xxhdpi-icon.png" density="xxhdpi" />
|
||||
<icon src="resources/*PACKAGENAME*/android/icon/drawable-xxxhdpi-icon.png" density="xxxhdpi" />
|
||||
|
||||
<resource-file src="resources/bitcoin.com/android/fcm_push_icon/drawable-ldpi/fcm_push_icon.png" target="res/drawable-ldpi/fcm_push_icon.png" />
|
||||
<resource-file src="resources/bitcoin.com/android/fcm_push_icon/drawable-mdpi/fcm_push_icon.png" target="res/drawable-mdpi/fcm_push_icon.png" />
|
||||
<resource-file src="resources/bitcoin.com/android/fcm_push_icon/drawable-hdpi/fcm_push_icon.png" target="res/drawable-hdpi/fcm_push_icon.png" />
|
||||
<resource-file src="resources/bitcoin.com/android/fcm_push_icon/drawable-xhdpi/fcm_push_icon.png" target="res/drawable-xhdpi/fcm_push_icon.png" />
|
||||
<resource-file src="resources/bitcoin.com/android/fcm_push_icon/drawable-xxhdpi/fcm_push_icon.png" target="res/drawable-xxhdpi/fcm_push_icon.png" />
|
||||
<resource-file src="resources/bitcoin.com/android/fcm_push_icon/drawable-xxxhdpi/fcm_push_icon.png" target="res/drawable-xxxhdpi/fcm_push_icon.png" />
|
||||
|
||||
<splash src="resources/*PACKAGENAME*/android/splash/drawable-land-hdpi-screen.png" density="land-hdpi"/>
|
||||
<splash src="resources/*PACKAGENAME*/android/splash/drawable-land-ldpi-screen.png" density="land-ldpi"/>
|
||||
<splash src="resources/*PACKAGENAME*/android/splash/drawable-land-mdpi-screen.png" density="land-mdpi"/>
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@
|
|||
"start": "npm run build:www && ionic serve --nolivereload --nogulp -s --address 0.0.0.0",
|
||||
"start:chrome": "npm run build:www && ionic serve --nolivereload --nogulp -s --address 0.0.0.0 --browser \"google chrome\"",
|
||||
"start:android": "grunt start-android",
|
||||
"start:android-emulator": "grunt start-android",
|
||||
"start:android-emulator": "grunt start-android-emulator",
|
||||
"start:android-log": "grunt start-android && npm run log:android",
|
||||
"start:ios": "grunt start-ios",
|
||||
"start:windows": "npm run build:www && npm run build:windows",
|
||||
|
|
|
|||
BIN
resources/bitcoin.com/android/fcm_push_icon/drawable-hdpi/fcm_push_icon.png
Executable file
BIN
resources/bitcoin.com/android/fcm_push_icon/drawable-hdpi/fcm_push_icon.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 859 B |
BIN
resources/bitcoin.com/android/fcm_push_icon/drawable-ldpi/fcm_push_icon.png
Executable file
BIN
resources/bitcoin.com/android/fcm_push_icon/drawable-ldpi/fcm_push_icon.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
BIN
resources/bitcoin.com/android/fcm_push_icon/drawable-mdpi/fcm_push_icon.png
Executable file
BIN
resources/bitcoin.com/android/fcm_push_icon/drawable-mdpi/fcm_push_icon.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 593 B |
BIN
resources/bitcoin.com/android/fcm_push_icon/drawable-xhdpi/fcm_push_icon.png
Executable file
BIN
resources/bitcoin.com/android/fcm_push_icon/drawable-xhdpi/fcm_push_icon.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
BIN
resources/bitcoin.com/android/fcm_push_icon/drawable-xxhdpi/fcm_push_icon.png
Executable file
BIN
resources/bitcoin.com/android/fcm_push_icon/drawable-xxhdpi/fcm_push_icon.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
BIN
resources/bitcoin.com/android/fcm_push_icon/drawable-xxxhdpi/fcm_push_icon.png
Executable file
BIN
resources/bitcoin.com/android/fcm_push_icon/drawable-xxxhdpi/fcm_push_icon.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 2.3 KiB |
BIN
resources/bitcoin.com/android/icon-1024-fcm.xcf
Normal file
BIN
resources/bitcoin.com/android/icon-1024-fcm.xcf
Normal file
Binary file not shown.
|
|
@ -45,7 +45,7 @@
|
|||
});
|
||||
|
||||
var overlappingTxFraction = overlappingTxsCount / Math.min(cachedTxs.length, PAGE_OVERLAP);
|
||||
console.log('overlappingTxFraction:', overlappingTxFraction);
|
||||
console.log('overlappingTxFraction: ' + overlappingTxFraction);
|
||||
|
||||
if (overlappingTxFraction >= MIN_KNOWN_TX_OVERLAP_FRACTION) { // We are good
|
||||
if (someTransactionsWereNew) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue