forked from upstream-mirrors/OpenTracks
Upgraded project to AndroidX.
This commit is contained in:
@@ -17,7 +17,7 @@ limitations under the License.
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_width="match_parent" >
|
||||
<android.support.v4.view.ViewPager
|
||||
<androidx.viewpager.widget.ViewPager
|
||||
android:id="@+id/maker_detail_activity_view_pager"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_width="match_parent" />
|
||||
|
||||
@@ -29,7 +29,7 @@ limitations under the License.
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="0"
|
||||
android:layout_width="0dp" />
|
||||
<android.support.v4.view.ViewPager
|
||||
<androidx.viewpager.widget.ViewPager
|
||||
android:id="@+id/pager"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1"
|
||||
|
||||
@@ -25,5 +25,5 @@ limitations under the License.
|
||||
android:id="@+id/marker_list_search"
|
||||
android:title="@string/menu_search"
|
||||
app:showAsAction="ifRoom|collapseActionView"
|
||||
app:actionViewClass="android.widget.SearchView" />
|
||||
app:actionViewClass="androidx.appcompat.widget.SearchView" />
|
||||
</menu>
|
||||
@@ -20,5 +20,5 @@ limitations under the License.
|
||||
android:id="@+id/search_list_search"
|
||||
android:title="@string/menu_search"
|
||||
app:showAsAction="ifRoom|collapseActionView"
|
||||
app:actionViewClass="android.widget.SearchView" />
|
||||
app:actionViewClass="androidx.appcompat.widget.SearchView" />
|
||||
</menu>
|
||||
@@ -19,8 +19,8 @@ limitations under the License.
|
||||
android:icon="@drawable/ic_menu_search"
|
||||
android:id="@+id/track_list_search"
|
||||
android:title="@string/menu_search"
|
||||
app:actionViewClass="android.widget.SearchView"
|
||||
app:showAsAction="ifRoom|collapseActionView" />
|
||||
app:actionViewClass="androidx.appcompat.widget.SearchView"
|
||||
app:showAsAction="always" />
|
||||
<item
|
||||
android:icon="@drawable/ic_menu_start_gps"
|
||||
android:id="@+id/track_list_start_gps"
|
||||
|
||||
Reference in New Issue
Block a user