Remove asContentBackground

pull/848/head
Alex Baker 5 years ago
parent 9a7b86f14d
commit b0bd5a2b5b

@ -5,7 +5,6 @@ import static org.tasks.preferences.ResourceResolver.getData;
import android.os.Bundle; import android.os.Bundle;
import com.nononsenseapps.filepicker.FilePickerActivity; import com.nononsenseapps.filepicker.FilePickerActivity;
import javax.inject.Inject; import javax.inject.Inject;
import org.tasks.R;
import org.tasks.injection.ActivityModule; import org.tasks.injection.ActivityModule;
import org.tasks.injection.InjectingApplication; import org.tasks.injection.InjectingApplication;
import org.tasks.themes.Theme; import org.tasks.themes.Theme;
@ -23,6 +22,5 @@ public class MyFilePickerActivity extends FilePickerActivity {
theme.applyThemeAndStatusBarColor(this, getDelegate()); theme.applyThemeAndStatusBarColor(this, getDelegate());
setTitle(null); setTitle(null);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
getWindow().getDecorView().setBackgroundColor(getData(this, R.attr.asContentBackground));
} }
} }

@ -9,7 +9,6 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="1px" android:layout_marginBottom="1px"
app:cardBackgroundColor="?attr/asContentBackground"
app:cardCornerRadius="0dp" app:cardCornerRadius="0dp"
app:cardElevation="?attr/card_elevation" app:cardElevation="?attr/card_elevation"
app:cardPreventCornerOverlap="false"> app:cardPreventCornerOverlap="false">

@ -4,7 +4,6 @@
android:id="@+id/root_layout" android:id="@+id/root_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/asContentBackground"
android:orientation="vertical"> android:orientation="vertical">
<include layout="@layout/toolbar"/> <include layout="@layout/toolbar"/>

@ -3,7 +3,6 @@
android:id="@+id/root_layout" android:id="@+id/root_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/asContentBackground"
android:descendantFocusability="beforeDescendants" android:descendantFocusability="beforeDescendants"
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
android:orientation="vertical"> android:orientation="vertical">

@ -2,7 +2,6 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/asContentBackground"
android:orientation="vertical"> android:orientation="vertical">
<include layout="@layout/toolbar"/> <include layout="@layout/toolbar"/>

@ -2,7 +2,6 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/asContentBackground"
android:orientation="vertical"> android:orientation="vertical">
<include layout="@layout/toolbar"/> <include layout="@layout/toolbar"/>

@ -2,7 +2,6 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/asContentBackground"
android:orientation="vertical"> android:orientation="vertical">
<include layout="@layout/toolbar"/> <include layout="@layout/toolbar"/>

@ -3,7 +3,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/asContentBackground"
android:orientation="vertical"> android:orientation="vertical">
<include layout="@layout/toolbar"/> <include layout="@layout/toolbar"/>

@ -7,7 +7,6 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:background="?attr/asContentBackground"
android:orientation="vertical"> android:orientation="vertical">
<include layout="@layout/toolbar"/> <include layout="@layout/toolbar"/>

@ -3,7 +3,6 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical" android:orientation="vertical"
android:background="?attr/asContentBackground"
android:padding="@dimen/keyline_first"> android:padding="@dimen/keyline_first">
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView

@ -2,7 +2,6 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/asContentBackground"
android:orientation="vertical"> android:orientation="vertical">
<include layout="@layout/toolbar"/> <include layout="@layout/toolbar"/>

@ -15,7 +15,6 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="100" android:layout_weight="100"
android:background="?attr/asContentBackground"
android:elevation="0dp" android:elevation="0dp"
android:overScrollMode="never"> android:overScrollMode="never">

@ -7,7 +7,6 @@
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:foreground="?selectableItemBackground" android:foreground="?selectableItemBackground"
app:cardBackgroundColor="?attr/asContentBackground"
app:cardCornerRadius="2dp"> app:cardCornerRadius="2dp">
<TextView <TextView

@ -103,7 +103,7 @@
android:layout_gravity="center_vertical|end" android:layout_gravity="center_vertical|end"
android:textColor="?android:textColorSecondary" android:textColor="?android:textColorSecondary"
android:visibility="gone" android:visibility="gone"
app:chipBackgroundColor="?attr/asContentBackground" app:chipBackgroundColor="?android:attr/colorBackground"
app:chipIcon="@drawable/ic_outline_place_24px" app:chipIcon="@drawable/ic_outline_place_24px"
app:chipIconTint="@color/icon_tint" app:chipIconTint="@color/icon_tint"
app:chipStrokeColor="?android:textColorSecondary" app:chipStrokeColor="?android:textColorSecondary"

@ -3,7 +3,6 @@
android:id="@+id/row" android:id="@+id/row"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/asContentBackground"
android:orientation="vertical"> android:orientation="vertical">
<include layout="@layout/task_adapter_row_body"/> <include layout="@layout/task_adapter_row_body"/>

@ -7,7 +7,6 @@
<!-- theme attributes --> <!-- theme attributes -->
<attr format="color" name="asWindowBackground"/> <attr format="color" name="asWindowBackground"/>
<attr format="color" name="asContentBackground"/>
<attr format="reference" name="overlay_theme"/> <attr format="reference" name="overlay_theme"/>
<attr format="boolean" name="dark_status_bar"/> <attr format="boolean" name="dark_status_bar"/>
<attr format="dimension" name="card_elevation"/> <attr format="dimension" name="card_elevation"/>

@ -9,9 +9,9 @@
<style name="TasksBase" parent="DayNight"> <style name="TasksBase" parent="DayNight">
<item name="android:windowBackground">@null</item> <item name="android:windowBackground">@null</item>
<item name="android:colorBackground">@color/content_background</item>
<item name="windowActionModeOverlay">true</item> <item name="windowActionModeOverlay">true</item>
<item name="asWindowBackground">@color/window_background</item> <item name="asWindowBackground">@color/window_background</item>
<item name="asContentBackground">@color/content_background</item>
<item name="android:spinnerItemStyle">@style/SpinnerNoPadding</item> <item name="android:spinnerItemStyle">@style/SpinnerNoPadding</item>
<item name="dialogTheme">@style/TasksDialog</item> <item name="dialogTheme">@style/TasksDialog</item>
<item name="android:dialogTheme">@style/TasksDialog</item> <item name="android:dialogTheme">@style/TasksDialog</item>
@ -48,12 +48,12 @@
<style name="ThemeBlack" parent="Tasks"> <style name="ThemeBlack" parent="Tasks">
<item name="asWindowBackground">@color/grey_900</item> <item name="asWindowBackground">@color/grey_900</item>
<item name="asContentBackground">@android:color/black</item> <item name="android:colorBackground">@android:color/black</item>
</style> </style>
<style name="Wallpaper" parent="Tasks"> <style name="Wallpaper" parent="Tasks">
<item name="asWindowBackground">@color/black_38</item> <item name="asWindowBackground">@color/black_38</item>
<item name="asContentBackground">@color/black_54</item> <item name="android:colorBackground">@color/black_54</item>
<item name="android:windowShowWallpaper">true</item> <item name="android:windowShowWallpaper">true</item>
<item name="card_elevation">0dp</item> <item name="card_elevation">0dp</item>
</style> </style>

Loading…
Cancel
Save