Skip to content

Commit 0aeb425

Browse files
committed
adjusting design to holo, stability for account setup
1 parent fae4448 commit 0aeb425

File tree

81 files changed

+2436
-1022
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+2436
-1022
lines changed

AndroidManifest.xml

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,24 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="eu.alefzero.owncloud"
2+
<!--
3+
ownCloud Android client application
4+
5+
Copyright (C) 2012 Bartek Przybylski
6+
This program is free software: you can redistribute it and/or modify
7+
it under the terms of the GNU General Public License as published by
8+
the Free Software Foundation, either version 3 of the License, or
9+
(at your option) any later version.
10+
11+
This program is distributed in the hope that it will be useful,
12+
but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
GNU General Public License for more details.
15+
16+
You should have received a copy of the GNU General Public License
17+
along with this program. If not, see <http://www.gnu.org/licenses/>.
18+
-->
19+
<manifest package="eu.alefzero.owncloud"
420
android:versionCode="1"
5-
android:versionName="1.0" >
21+
android:versionName="1.0" xmlns:android="http://schemas.android.com/apk/res/android">
622

723
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
824
<uses-permission android:name="android.permission.USE_CREDENTIALS" />
@@ -15,6 +31,7 @@
1531
<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
1632
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
1733
<uses-permission android:name="android.permission.BROADCAST_STICKY" />
34+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
1835

1936
<uses-sdk
2037
android:minSdkVersion="8"
@@ -27,11 +44,12 @@
2744

2845
<application
2946
android:icon="@drawable/icon"
30-
android:label="@string/app_name" >
47+
android:label="@string/app_name"
48+
android:theme="@style/Theme.ownCloud"
49+
android:uiOptions="splitActionBarWhenNarrow">
3150
<activity
3251
android:name=".ui.activity.FileDisplayActivity"
33-
android:label="@string/app_name"
34-
android:theme="@style/Theme.ownCloud" >
52+
android:label="@string/app_name">
3553
<intent-filter>
3654
<action android:name="android.intent.action.MAIN" />
3755

@@ -69,7 +87,7 @@
6987

7088
<service
7189
android:name=".authenticator.AccountAuthenticatorService"
72-
android:exported="true" >
90+
android:exported="true">
7391
<intent-filter>
7492
<action android:name="android.accounts.AccountAuthenticator" />
7593
</intent-filter>
@@ -102,7 +120,7 @@
102120
<activity
103121
android:name=".ui.activity.AuthenticatorActivity"
104122
android:exported="true"
105-
android:theme="@style/Theme.ownCloud" >
123+
android:theme="@style/Theme.ownCloud.noActionBar" >
106124
</activity>
107125

108126
<service android:name=".FileDownloader" >
@@ -125,7 +143,10 @@
125143
<activity
126144
android:name=".ui.activity.FileDetailActivity"
127145
android:theme="@style/Theme.ownCloud" >
128-
</activity>
146+
</activity>
147+
<activity android:name=".extensions.ExtensionsAvailableActivity"></activity>
148+
<activity android:name=".extensions.ExtensionsListActivity"></activity>
149+
<activity android:name=".ui.activity.AccountSelectActivity" android:uiOptions="none" android:label="@string/prefs_accounts"></activity>
129150
</application>
130151

131152
</manifest>

proguard.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
native <methods>;
1919
}
2020

21-
-keepclasseswithmembernames class * {
21+
-keepclasseswithmembers class * {
2222
public <init>(android.content.Context, android.util.AttributeSet);
2323
}
2424

25-
-keepclasseswithmembernames class * {
25+
-keepclasseswithmembers class * {
2626
public <init>(android.content.Context, android.util.AttributeSet, int);
2727
}
2828

3.06 KB
Loading
3.1 KB
Loading
3.05 KB
Loading
1.29 KB
Loading
3.14 KB
Loading
3.2 KB
Loading
3.12 KB
Loading
1.43 KB
Loading

0 commit comments

Comments
 (0)