diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-07-30 22:38:58 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-07-30 22:41:55 +0200 |
| commit | ffa3cefa6741184e159b698ae034ab19a55be9af (patch) | |
| tree | 34478c5cf3414e476f8dc7cc9861226afccdd326 /app/src/main | |
| parent | 8ec2cc8582084bc1072541bfc3012f30707f8c84 (diff) | |
Style: use attrs from appcompat rather than from frameworks
This isn't possible for colorForeground, colorBackground,
textAppearanceMedium, but at least it's useful for some things here.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'app/src/main')
| -rw-r--r-- | app/src/main/res/drawable/list_item_background.xml | 6 | ||||
| -rw-r--r-- | app/src/main/res/layout-sw600dp/main_activity.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/tunnel_editor_fragment.xml | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/src/main/res/drawable/list_item_background.xml b/app/src/main/res/drawable/list_item_background.xml index d62f3237..6a69bcda 100644 --- a/app/src/main/res/drawable/list_item_background.xml +++ b/app/src/main/res/drawable/list_item_background.xml @@ -4,12 +4,12 @@ <item> <selector> <item app:state_multiselected="true" android:state_activated="true"> - <color android:color="?android:attr/colorControlActivated" /> + <color android:color="?attr/colorControlActivated" /> </item> <item app:state_multiselected="false" android:state_activated="true"> - <color android:color="?android:attr/colorControlHighlight" /> + <color android:color="?attr/colorControlHighlight" /> </item> </selector> </item> - <item android:drawable="?android:attr/selectableItemBackground" /> + <item android:drawable="?attr/selectableItemBackground" /> </layer-list> diff --git a/app/src/main/res/layout-sw600dp/main_activity.xml b/app/src/main/res/layout-sw600dp/main_activity.xml index b751c8c1..36f9eaff 100644 --- a/app/src/main/res/layout-sw600dp/main_activity.xml +++ b/app/src/main/res/layout-sw600dp/main_activity.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:baselineAligned="false" - android:divider="?android:attr/dividerHorizontal" + android:divider="?attr/dividerHorizontal" android:orientation="horizontal" android:showDividers="middle" tools:context=".activity.MainActivity"> diff --git a/app/src/main/res/layout/tunnel_editor_fragment.xml b/app/src/main/res/layout/tunnel_editor_fragment.xml index 5a2bfe34..1020e34c 100644 --- a/app/src/main/res/layout/tunnel_editor_fragment.xml +++ b/app/src/main/res/layout/tunnel_editor_fragment.xml @@ -120,7 +120,7 @@ <TextView android:id="@+id/public_key_text" - style="?android:attr/editTextStyle" + style="?attr/editTextStyle" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@+id/public_key_label" |