Skip to content

Commit 630b7fa

Browse files
authored
Merge pull request #209 from ajayyy/background-tint
Revert "Changed background tint to support older devices."
2 parents a485878 + 1033ebc commit 630b7fa

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

app/src/main/res/layout-sw600dp/teleoppage.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@
3232
android:text="Pickup"
3333
android:layout_weight="1"
3434
android:id="@+id/pickupHatch"
35-
app:backgroundTint="#ffff84"
35+
android:backgroundTint="#ffff84"
3636
android:textColor="@color/black"/>
3737
<Button
3838
android:layout_width="match_parent"
3939
android:layout_height="match_parent"
4040
android:text="Failed Pickup"
4141
android:layout_weight="1"
4242
android:id="@+id/failPickupHatch"
43-
app:backgroundTint="#ffff84"
43+
android:backgroundTint="#ffff84"
4444
android:textColor="@color/black"/>
4545
<Button
4646
android:layout_width="match_parent"
@@ -56,7 +56,7 @@
5656
android:text="Failed dropoff"
5757
android:layout_weight="1"
5858
android:id="@+id/dropHatch"
59-
app:backgroundTint="#ffff84"
59+
android:backgroundTint="#ffff84"
6060
android:textColor="@color/black"/>
6161
</LinearLayout>
6262

@@ -103,31 +103,31 @@
103103
android:text="Pickup"
104104
android:layout_weight="1"
105105
android:id="@+id/pickupCargo"
106-
app:backgroundTint="#ffd38e"
106+
android:backgroundTint="#ffd38e"
107107
android:textColor="@color/black"/>
108108
<Button
109109
android:layout_width="match_parent"
110110
android:layout_height="match_parent"
111111
android:text="Failed Pickup"
112112
android:layout_weight="1"
113113
android:id="@+id/failPickupCargo"
114-
app:backgroundTint="#ffd38e"
114+
android:backgroundTint="#ffd38e"
115115
android:textColor="@color/black"/>
116116
<Button
117117
android:layout_width="match_parent"
118118
android:layout_height="match_parent"
119119
android:text="Drop off"
120120
android:layout_weight="1"
121121
android:id="@+id/failDropCargo"
122-
app:backgroundTint="#ffd38e"
122+
android:backgroundTint="#ffd38e"
123123
android:textColor="@color/black"/>
124124
<Button
125125
android:layout_width="match_parent"
126126
android:layout_height="match_parent"
127127
android:text="Failed dropoff"
128128
android:layout_weight="1"
129129
android:id="@+id/dropCargo"
130-
app:backgroundTint="#ffd38e"
130+
android:backgroundTint="#ffd38e"
131131
android:textColor="@color/black"/>
132132
</LinearLayout>
133133
</LinearLayout>

app/src/main/res/layout/teleoppage.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@
3232
android:text="Pickup"
3333
android:layout_weight="1"
3434
android:id="@+id/pickupHatch"
35-
app:backgroundTint="#ffff84"
35+
android:backgroundTint="#ffff84"
3636
android:textColor="@color/black"/>
3737
<Button
3838
android:layout_width="match_parent"
3939
android:layout_height="match_parent"
4040
android:text="Failed Pickup"
4141
android:layout_weight="1"
4242
android:id="@+id/failPickupHatch"
43-
app:backgroundTint="#ffff84"
43+
android:backgroundTint="#ffff84"
4444
android:textColor="@color/black"/>
4545
<Button
4646
android:layout_width="match_parent"
@@ -56,7 +56,7 @@
5656
android:text="Failed dropoff"
5757
android:layout_weight="1"
5858
android:id="@+id/dropHatch"
59-
app:backgroundTint="#ffff84"
59+
android:backgroundTint="#ffff84"
6060
android:textColor="@color/black"/>
6161
</LinearLayout>
6262

@@ -103,31 +103,31 @@
103103
android:text="Pickup"
104104
android:layout_weight="1"
105105
android:id="@+id/pickupCargo"
106-
app:backgroundTint="#ffd38e"
106+
android:backgroundTint="#ffd38e"
107107
android:textColor="@color/black"/>
108108
<Button
109109
android:layout_width="match_parent"
110110
android:layout_height="match_parent"
111111
android:text="Failed Pickup"
112112
android:layout_weight="1"
113113
android:id="@+id/failPickupCargo"
114-
app:backgroundTint="#ffd38e"
114+
android:backgroundTint="#ffd38e"
115115
android:textColor="@color/black"/>
116116
<Button
117117
android:layout_width="match_parent"
118118
android:layout_height="match_parent"
119119
android:text="Drop off"
120120
android:layout_weight="1"
121121
android:id="@+id/failDropCargo"
122-
app:backgroundTint="#ffd38e"
122+
android:backgroundTint="#ffd38e"
123123
android:textColor="@color/black"/>
124124
<Button
125125
android:layout_width="match_parent"
126126
android:layout_height="match_parent"
127127
android:text="Failed dropoff"
128128
android:layout_weight="1"
129129
android:id="@+id/dropCargo"
130-
app:backgroundTint="#ffd38e"
130+
android:backgroundTint="#ffd38e"
131131
android:textColor="@color/black"/>
132132
</LinearLayout>
133133
</LinearLayout>

0 commit comments

Comments
 (0)