karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Do not use appcompat for android:showAsAction.

Browse Source
This commit is contained in:
Dennis Guse
2019-07-17 22:02:45 +02:00
parent bd58187c4e
commit 33650d3fe6
3 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
myTracks/src/main/res/menu/list_context_menu.xml
+6 -7
View File
@@ -13,32 +13,31 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<menu xmlns:android="http://schemas.android.com/apk/res/android" <menu xmlns:android="http://schemas.android.com/apk/res/android">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:id="@+id/list_context_menu_share" android:id="@+id/list_context_menu_share"
android:icon="@drawable/ic_menu_share" android:icon="@drawable/ic_menu_share"
android:title="@string/menu_share" android:title="@string/menu_share"
android:actionProviderClass="android.widget.ShareActionProvider" android:actionProviderClass="android.widget.ShareActionProvider"
app:showAsAction="ifRoom" /> android:showAsAction="ifRoom" />
<item <item
android:id="@+id/list_context_menu_show_on_map" android:id="@+id/list_context_menu_show_on_map"
android:icon="@drawable/ic_menu_show_on_map" android:icon="@drawable/ic_menu_show_on_map"
android:title="@string/menu_show_on_map" android:title="@string/menu_show_on_map"
app:showAsAction="ifRoom" /> android:showAsAction="ifRoom" />
<item <item
android:id="@+id/list_context_menu_edit" android:id="@+id/list_context_menu_edit"
android:icon="@drawable/ic_menu_edit" android:icon="@drawable/ic_menu_edit"
android:title="@string/menu_edit" android:title="@string/menu_edit"
app:showAsAction="ifRoom" /> android:showAsAction="ifRoom" />
<item <item
android:id="@+id/list_context_menu_delete" android:id="@+id/list_context_menu_delete"
android:icon="@drawable/ic_menu_delete" android:icon="@drawable/ic_menu_delete"
android:title="@string/menu_delete" android:title="@string/menu_delete"
app:showAsAction="ifRoom" /> android:showAsAction="ifRoom" />
<item <item
android:id="@+id/list_context_menu_select_all" android:id="@+id/list_context_menu_select_all"
android:icon="@drawable/ic_menu_select_all" android:icon="@drawable/ic_menu_select_all"
android:title="@string/menu_select_all" android:title="@string/menu_select_all"
app:showAsAction="ifRoom" /> android:showAsAction="ifRoom" />
</menu> </menu>
myTracks/src/main/res/menu/marker_detail.xml
+4 -5
View File
@@ -13,21 +13,20 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<menu xmlns:android="http://schemas.android.com/apk/res/android" <menu xmlns:android="http://schemas.android.com/apk/res/android">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:id="@+id/marker_detail_show_on_map" android:id="@+id/marker_detail_show_on_map"
android:icon="@drawable/ic_menu_show_on_map" android:icon="@drawable/ic_menu_show_on_map"
android:title="@string/menu_show_on_map" android:title="@string/menu_show_on_map"
app:showAsAction="ifRoom" /> android:showAsAction="ifRoom" />
<item <item
android:id="@+id/marker_detail_edit" android:id="@+id/marker_detail_edit"
android:icon="@drawable/ic_menu_edit" android:icon="@drawable/ic_menu_edit"
android:title="@string/menu_edit" android:title="@string/menu_edit"
app:showAsAction="ifRoom" /> android:showAsAction="ifRoom" />
<item <item
android:id="@+id/marker_detail_delete" android:id="@+id/marker_detail_delete"
android:icon="@drawable/ic_menu_delete" android:icon="@drawable/ic_menu_delete"
android:title="@string/menu_delete" android:title="@string/menu_delete"
app:showAsAction="ifRoom" /> android:showAsAction="ifRoom" />
</menu> </menu>
myTracks/src/main/res/menu/marker_list.xml
+3 -4
View File
@@ -13,17 +13,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<menu xmlns:android="http://schemas.android.com/apk/res/android" <menu xmlns:android="http://schemas.android.com/apk/res/android">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:id="@+id/marker_list_insert_marker" android:id="@+id/marker_list_insert_marker"
android:icon="@drawable/ic_menu_insert_marker" android:icon="@drawable/ic_menu_insert_marker"
android:title="@string/menu_insert_marker" android:title="@string/menu_insert_marker"
app:showAsAction="ifRoom" /> android:showAsAction="ifRoom" />
<item <item
android:id="@+id/marker_list_search" android:id="@+id/marker_list_search"
android:icon="@drawable/ic_menu_search" android:icon="@drawable/ic_menu_search"
android:title="@string/menu_search" android:title="@string/menu_search"
android:actionViewClass="android.widget.SearchView" android:actionViewClass="android.widget.SearchView"
app:showAsAction="ifRoom|collapseActionView" /> android:showAsAction="ifRoom|collapseActionView" />
</menu> </menu>