mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 09:39:25 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/owncloud/android into material_buttons

Browse source
This commit is contained in:
Andy Scherzinger 2015-10-22 13:05:06 +02:00
commit 5c1e6e59ba
8 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
owncloud-android-library

@ -1 +1 @@
Subproject commit 5985ba9a9fd9a208b2a09ee7809949874e0c3a97
Subproject commit ecc3415e3e3c13fa8f73fdd51a88c1ab7087b199

5
res/layout-land/account_setup.xml
View file

@ -95,7 +95,6 @@
android:inputType="textUri"
android:drawablePadding="5dp"
android:paddingRight="55dp"
android:textColor="@color/primary"
android:textColorHint="@color/login_text_hint_color"
android:contentDescription="@string/auth_host_address"
>
@ -153,7 +152,6 @@
android:text="@string/oauth2_url_endpoint_auth"
android:singleLine="true"
android:inputType="textUri"
android:textColor="@color/primary"
android:textColorHint="@color/login_text_hint_color"
android:visibility="gone">
</EditText>
@ -167,7 +165,6 @@
android:text="@string/oauth2_url_endpoint_access"
android:singleLine="true"
android:inputType="textUri"
android:textColor="@color/primary"
android:textColorHint="@color/login_text_hint_color"
android:visibility="gone">
<requestFocus />
@ -180,7 +177,6 @@
android:ems="10"
android:hint="@string/auth_username"
android:inputType="textNoSuggestions"
android:textColor="@color/primary"
android:textColorHint="@color/login_text_hint_color"
android:contentDescription="@string/auth_username"
/>
@ -193,7 +189,6 @@
android:hint="@string/auth_password"
android:inputType="textPassword"
android:drawablePadding="5dp"
android:textColor="@color/primary"
android:textColorHint="@color/login_text_hint_color"
/>

5
res/layout/account_setup.xml
View file

@ -82,7 +82,6 @@
android:inputType="textUri"
android:drawablePadding="5dp"
android:paddingRight="55dp"
android:textColor="@color/primary"
android:textColorHint="@color/login_text_hint_color"
android:contentDescription="@string/auth_host_address"
>
@ -136,7 +135,6 @@
android:layout_height="wrap_content"
android:ems="10"
android:enabled="false"
android:textColor="@color/primary"
android:textColorHint="@color/login_text_hint_color"
android:text="@string/oauth2_url_endpoint_auth"
android:singleLine="true"
@ -153,7 +151,6 @@
android:text="@string/oauth2_url_endpoint_access"
android:singleLine="true"
android:inputType="textUri"
android:textColor="@color/primary"
android:textColorHint="@color/login_text_hint_color"
android:visibility="gone"/>
@ -164,7 +161,6 @@
android:ems="10"
android:hint="@string/auth_username"
android:inputType="textNoSuggestions"
android:textColor="@color/primary"
android:textColorHint="@color/login_text_hint_color"
android:contentDescription="@string/auth_username"
/>
@ -177,7 +173,6 @@
android:ems="10"
android:hint="@string/auth_password"
android:inputType="textPassword"
android:textColor="@color/primary"
android:textColorHint="@color/login_text_hint_color"
android:contentDescription="@string/auth_password"
/>

1
res/values-es/strings.xml
View file

@ -71,6 +71,7 @@
<string name="file_list_seconds_ago">hace segundos</string>
<string name="file_list_empty">No hay nada aquí. ¡Suba algo!</string>
<string name="file_list_loading">Cargando...</string>
<string name="file_list_no_app_for_file_type">¡No se encontró una aplicación para el tipo de archivo!</string>
<string name="local_file_list_empty">No hay archivos en esta carpeta.</string>
<string name="filedetails_select_file">Pulsa sobre un archivo para mostrar información adicional.</string>
<string name="filedetails_size">Tamaño:</string>

1
res/values-ru/strings.xml
View file

@ -72,6 +72,7 @@
<string name="file_list_seconds_ago">несколько секунд назад</string>
<string name="file_list_empty">Здесь ничего нет. Загрузите что-нибудь!</string>
<string name="file_list_loading">Загрузка...</string>
<string name="file_list_no_app_for_file_type">Не найдено приложений для этого типа файла.</string>
<string name="local_file_list_empty">В этом каталоге нет файлов.</string>
<string name="filedetails_select_file">Нажмите на файл для отображения дополнительной информации.</string>
<string name="filedetails_size">Размер:</string>

2
res/values/colors.xml
View file

@ -19,7 +19,7 @@
-->
<resources>
<color name="owncloud_blue">#1D2D44</color>
<color name="owncloud_blue">@color/actionbar_start_color</color>
<color name="owncloud_blue_accent">#35537A</color>
<color name="owncloud_blue_bright">#00ddff</color>

3
src/com/owncloud/android/notifications/NotificationBuilderWithProgressBar.java
View file

@ -55,7 +55,8 @@ public class NotificationBuilderWithProgressBar extends NotificationCompat.Build
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
return new NotificationBuilderWithProgressBar(context);
} else {
return new NotificationCompat.Builder(context);
return new NotificationCompat.Builder(context).
setColor(context.getResources().getColor(R.color.primary));
}
}

1
src/com/owncloud/android/syncadapter/FileSyncAdapter.java
View file

@ -526,6 +526,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
private NotificationCompat.Builder createNotificationBuilder() {
NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(getContext());
notificationBuilder.setSmallIcon(R.drawable.notification_icon).setAutoCancel(true);
notificationBuilder.setColor(getContext().getResources().getColor(R.color.primary));
return notificationBuilder;
}