Remove all trailing whitespaces in source files
This commit is contained in:
parent
69cc6ee3bb
commit
5af7cac4b7
@ -57,7 +57,7 @@
|
|||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
@ -95,4 +95,3 @@
|
|||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
|
|
@ -40,7 +40,7 @@
|
|||||||
android:layout_marginTop="8sp"
|
android:layout_marginTop="8sp"
|
||||||
android:textSize="13sp"
|
android:textSize="13sp"
|
||||||
android:singleLine="false" />
|
android:singleLine="false" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/permissions"
|
android:id="@+id/permissions"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
@ -48,7 +48,7 @@
|
|||||||
android:layout_marginTop="8sp"
|
android:layout_marginTop="8sp"
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
android:textStyle="bold" />
|
android:textStyle="bold" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/permissions_list"
|
android:id="@+id/permissions_list"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
android:id="@+id/vw1"
|
android:id="@+id/vw1"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/img"
|
android:id="@+id/img"
|
||||||
@ -49,7 +49,7 @@
|
|||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
@ -65,7 +65,7 @@
|
|||||||
<EditTextPreference
|
<EditTextPreference
|
||||||
android:key="proxyHost"
|
android:key="proxyHost"
|
||||||
android:title="@string/proxy_host"
|
android:title="@string/proxy_host"
|
||||||
android:summary="@string/proxy_host_summary"
|
android:summary="@string/proxy_host_summary"
|
||||||
android:dependency="enableProxy" />
|
android:dependency="enableProxy" />
|
||||||
<EditTextPreference
|
<EditTextPreference
|
||||||
android:key="proxyPort"
|
android:key="proxyPort"
|
||||||
|
@ -27,7 +27,7 @@ import android.widget.LinearLayout;
|
|||||||
import org.fdroid.fdroid.views.fragments.PreferenceFragment;
|
import org.fdroid.fdroid.views.fragments.PreferenceFragment;
|
||||||
|
|
||||||
public class PreferencesActivity extends ActionBarActivity {
|
public class PreferencesActivity extends ActionBarActivity {
|
||||||
|
|
||||||
public static final int RESULT_RESTART = 4;
|
public static final int RESULT_RESTART = 4;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -63,7 +63,7 @@ public class App extends ValueObject implements Comparable<App> {
|
|||||||
* you need to change suggestedVercode to an apk which is in the apk table.
|
* you need to change suggestedVercode to an apk which is in the apk table.
|
||||||
*/
|
*/
|
||||||
private String suggestedVersion;
|
private String suggestedVersion;
|
||||||
|
|
||||||
public int suggestedVercode;
|
public int suggestedVercode;
|
||||||
|
|
||||||
public Date added;
|
public Date added;
|
||||||
|
@ -169,6 +169,6 @@ public class InstalledAppCacheUpdater {
|
|||||||
notifyProviders();
|
notifyProviders();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -96,7 +96,7 @@ abstract public class Installer {
|
|||||||
/**
|
/**
|
||||||
* Creates a new Installer for installing/deleting processes starting from
|
* Creates a new Installer for installing/deleting processes starting from
|
||||||
* an Activity
|
* an Activity
|
||||||
*
|
*
|
||||||
* @param activity
|
* @param activity
|
||||||
* @param pm
|
* @param pm
|
||||||
* @param callback
|
* @param callback
|
||||||
|
@ -60,7 +60,7 @@ public class CanUpdateAppsFragment extends AppListFragment {
|
|||||||
@Override
|
@Override
|
||||||
public void onActivityCreated(Bundle savedInstanceState) {
|
public void onActivityCreated(Bundle savedInstanceState) {
|
||||||
super.onActivityCreated(savedInstanceState);
|
super.onActivityCreated(savedInstanceState);
|
||||||
|
|
||||||
mUpdateAllButton.setOnClickListener(new OnClickListener() {
|
mUpdateAllButton.setOnClickListener(new OnClickListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -88,7 +88,7 @@ public class CanUpdateAppsFragment extends AppListFragment {
|
|||||||
* Copied from ListFragment and added Button on top of list. We do not use a
|
* Copied from ListFragment and added Button on top of list. We do not use a
|
||||||
* custom layout here, because this breaks the progress bar functionality of
|
* custom layout here, because this breaks the progress bar functionality of
|
||||||
* ListFragment.
|
* ListFragment.
|
||||||
*
|
*
|
||||||
* @param inflater
|
* @param inflater
|
||||||
* @param container
|
* @param container
|
||||||
* @param savedInstanceState
|
* @param savedInstanceState
|
||||||
|
16
build.gradle
16
build.gradle
@ -70,8 +70,8 @@ project(':support-v4') {
|
|||||||
|
|
||||||
apply plugin: 'maven'
|
apply plugin: 'maven'
|
||||||
|
|
||||||
// The support-v4 library assumes certain things are defined in the
|
// The support-v4 library assumes certain things are defined in the
|
||||||
// root project (which is usually the android-support project, but
|
// root project (which is usually the android-support project, but
|
||||||
// this time it is the F-Droid project.
|
// this time it is the F-Droid project.
|
||||||
rootProject.ext.supportRepoOut = ""
|
rootProject.ext.supportRepoOut = ""
|
||||||
|
|
||||||
@ -81,23 +81,23 @@ project(':support-v4') {
|
|||||||
* Finds a reference to the prefered Android SDK directory.
|
* Finds a reference to the prefered Android SDK directory.
|
||||||
* Ideally we'd use "android.plugin.sdkFolder" to find this, however this is
|
* Ideally we'd use "android.plugin.sdkFolder" to find this, however this is
|
||||||
* only possible if we apply the android application plugin. This is not ideal,
|
* only possible if we apply the android application plugin. This is not ideal,
|
||||||
* because it will add a bunch of tasks to do with building an android app,
|
* because it will add a bunch of tasks to do with building an android app,
|
||||||
* even tnough this build.gradle is not here to build F-Droid, it is here to
|
* even tnough this build.gradle is not here to build F-Droid, it is here to
|
||||||
* apply hacks to play nicely with various upstream projects.
|
* apply hacks to play nicely with various upstream projects.
|
||||||
*
|
*
|
||||||
* Adapted from https://android.googlesource.com/platform/tools/base/+/c8b776289ace4189406b59a9a9c8c9de63271cb0/build-system/gradle/src/main/groovy/com/android/build/gradle/internal/SdkHandler.java
|
* Adapted from https://android.googlesource.com/platform/tools/base/+/c8b776289ace4189406b59a9a9c8c9de63271cb0/build-system/gradle/src/main/groovy/com/android/build/gradle/internal/SdkHandler.java
|
||||||
* Copyright (C) 2014 The Android Open Source Project
|
* Copyright (C) 2014 The Android Open Source Project
|
||||||
* Licensed under the Apache License, Version 2.0
|
* Licensed under the Apache License, Version 2.0
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0i
|
* http://www.apache.org/licenses/LICENSE-2.0i
|
||||||
*/
|
*/
|
||||||
def findSdkPath() {
|
def findSdkPath() {
|
||||||
|
|
||||||
Properties properties = new Properties()
|
Properties properties = new Properties()
|
||||||
File propFile = file("local.properties")
|
File propFile = file("local.properties")
|
||||||
if (propFile.exists()) {
|
if (propFile.exists()) {
|
||||||
propFile.withReader { properties.load(it) }
|
propFile.withReader { properties.load(it) }
|
||||||
}
|
}
|
||||||
|
|
||||||
String sdkDirProp = properties.getProperty("sdk.dir");
|
String sdkDirProp = properties.getProperty("sdk.dir");
|
||||||
if (sdkDirProp != null) {
|
if (sdkDirProp != null) {
|
||||||
return new File(sdkDirProp)
|
return new File(sdkDirProp)
|
||||||
@ -107,7 +107,7 @@ def findSdkPath() {
|
|||||||
if (envVar != null) {
|
if (envVar != null) {
|
||||||
return new File(envVar);
|
return new File(envVar);
|
||||||
}
|
}
|
||||||
|
|
||||||
String property = System.getProperty("android.home");
|
String property = System.getProperty("android.home");
|
||||||
if (property != null) {
|
if (property != null) {
|
||||||
return new File(property);
|
return new File(property);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user