forked from upstream-mirrors/OpenTracks
Don't use apk/res-auto namespace.
This commit is contained in:
@@ -24,6 +24,6 @@ dependencies {
|
|||||||
implementation project(':myTracksLib')
|
implementation project(':myTracksLib')
|
||||||
|
|
||||||
implementation 'com.google.android.gms:play-services-location:17.0.0'
|
implementation 'com.google.android.gms:play-services-location:17.0.0'
|
||||||
implementation 'com.google.android.gms:play-services:12.0.1'
|
//implementation 'com.google.android.gms:play-services:12.0.1'
|
||||||
implementation 'com.google.android.gms:play-services-auth:17.0.0'
|
//implementation 'com.google.android.gms:play-services-auth:17.0.0'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,31 +13,30 @@ 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:app="http://schemas.android.com/apk/res-auto"
|
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<item
|
<item
|
||||||
android:icon="@drawable/ic_menu_share"
|
android:icon="@drawable/ic_menu_share"
|
||||||
android:id="@+id/list_context_menu_share"
|
android:id="@+id/list_context_menu_share"
|
||||||
android:title="@string/menu_share"
|
android:title="@string/menu_share"
|
||||||
app:showAsAction="ifRoom" />
|
android:showAsAction="ifRoom" />
|
||||||
<item
|
<item
|
||||||
android:icon="@drawable/ic_menu_show_on_map"
|
android:icon="@drawable/ic_menu_show_on_map"
|
||||||
android:id="@+id/list_context_menu_show_on_map"
|
android:id="@+id/list_context_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:icon="@drawable/ic_menu_edit"
|
android:icon="@drawable/ic_menu_edit"
|
||||||
android:id="@+id/list_context_menu_edit"
|
android:id="@+id/list_context_menu_edit"
|
||||||
android:title="@string/menu_edit"
|
android:title="@string/menu_edit"
|
||||||
app:showAsAction="ifRoom" />
|
android:showAsAction="ifRoom" />
|
||||||
<item
|
<item
|
||||||
android:icon="@drawable/ic_menu_delete"
|
android:icon="@drawable/ic_menu_delete"
|
||||||
android:id="@+id/list_context_menu_delete"
|
android:id="@+id/list_context_menu_delete"
|
||||||
android:title="@string/menu_delete"
|
android:title="@string/menu_delete"
|
||||||
app:showAsAction="ifRoom" />
|
android:showAsAction="ifRoom" />
|
||||||
<item
|
<item
|
||||||
android:icon="@drawable/ic_menu_select_all"
|
android:icon="@drawable/ic_menu_select_all"
|
||||||
android:id="@+id/list_context_menu_select_all"
|
android:id="@+id/list_context_menu_select_all"
|
||||||
android:title="@string/menu_select_all"
|
android:title="@string/menu_select_all"
|
||||||
app:showAsAction="ifRoom" />
|
android:showAsAction="ifRoom" />
|
||||||
</menu>
|
</menu>
|
||||||
@@ -13,26 +13,25 @@ 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:app="http://schemas.android.com/apk/res-auto"
|
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<item
|
<item
|
||||||
android:icon="@drawable/ic_menu_show_on_map"
|
|
||||||
android:id="@+id/marker_detail_show_on_map"
|
android:id="@+id/marker_detail_show_on_map"
|
||||||
android:title="@string/menu_show_on_map"
|
android:icon="@drawable/ic_menu_show_on_map"
|
||||||
app:showAsAction="ifRoom" />
|
android:showAsAction="ifRoom"
|
||||||
|
android:title="@string/menu_show_on_map" />
|
||||||
<item
|
<item
|
||||||
android:icon="@drawable/ic_menu_edit"
|
|
||||||
android:id="@+id/marker_detail_edit"
|
android:id="@+id/marker_detail_edit"
|
||||||
android:title="@string/menu_edit"
|
android:icon="@drawable/ic_menu_edit"
|
||||||
app:showAsAction="ifRoom" />
|
android:showAsAction="ifRoom"
|
||||||
|
android:title="@string/menu_edit" />
|
||||||
<item
|
<item
|
||||||
android:icon="@drawable/ic_menu_delete"
|
|
||||||
android:id="@+id/marker_detail_delete"
|
android:id="@+id/marker_detail_delete"
|
||||||
android:title="@string/menu_delete"
|
android:icon="@drawable/ic_menu_delete"
|
||||||
app:showAsAction="ifRoom" />
|
android:showAsAction="ifRoom"
|
||||||
|
android:title="@string/menu_delete" />
|
||||||
<item
|
<item
|
||||||
android:icon="@drawable/ic_menu_view_photo"
|
|
||||||
android:id="@+id/marker_detail_view_photo"
|
android:id="@+id/marker_detail_view_photo"
|
||||||
android:title="@string/menu_view_photo"
|
android:icon="@drawable/ic_menu_view_photo"
|
||||||
app:showAsAction="ifRoom" />
|
android:showAsAction="ifRoom"
|
||||||
|
android:title="@string/menu_view_photo" />
|
||||||
</menu>
|
</menu>
|
||||||
@@ -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:app="http://schemas.android.com/apk/res-auto"
|
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<item
|
<item
|
||||||
android:icon="@drawable/ic_menu_insert_marker"
|
android:icon="@drawable/ic_menu_insert_marker"
|
||||||
android:id="@+id/marker_list_insert_marker"
|
android:id="@+id/marker_list_insert_marker"
|
||||||
app:showAsAction="ifRoom"
|
android:showAsAction="ifRoom"
|
||||||
android:title="@string/menu_insert_marker" />
|
android:title="@string/menu_insert_marker" />
|
||||||
<item
|
<item
|
||||||
android:icon="@drawable/ic_menu_search"
|
android:icon="@drawable/ic_menu_search"
|
||||||
android:id="@+id/marker_list_search"
|
android:id="@+id/marker_list_search"
|
||||||
android:title="@string/menu_search"
|
android:title="@string/menu_search"
|
||||||
app:showAsAction="ifRoom|collapseActionView"
|
android:showAsAction="ifRoom|collapseActionView"
|
||||||
app:actionViewClass="androidx.appcompat.widget.SearchView" />
|
android:actionViewClass="androidx.appcompat.widget.SearchView" />
|
||||||
</menu>
|
</menu>
|
||||||
@@ -13,12 +13,11 @@ 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:app="http://schemas.android.com/apk/res-auto"
|
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<item
|
<item
|
||||||
android:icon="@drawable/ic_menu_search"
|
android:icon="@drawable/ic_menu_search"
|
||||||
android:id="@+id/search_list_search"
|
android:id="@+id/search_list_search"
|
||||||
android:title="@string/menu_search"
|
android:title="@string/menu_search"
|
||||||
app:showAsAction="ifRoom|collapseActionView"
|
android:showAsAction="ifRoom|collapseActionView"
|
||||||
app:actionViewClass="androidx.appcompat.widget.SearchView" />
|
android:actionViewClass="androidx.appcompat.widget.SearchView" />
|
||||||
</menu>
|
</menu>
|
||||||
@@ -13,25 +13,24 @@ 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:app="http://schemas.android.com/apk/res-auto"
|
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<item
|
<item
|
||||||
android:icon="@drawable/ic_menu_insert_marker"
|
android:icon="@drawable/ic_menu_insert_marker"
|
||||||
android:id="@+id/track_detail_insert_marker"
|
android:id="@+id/track_detail_insert_marker"
|
||||||
android:orderInCategory="1"
|
android:orderInCategory="1"
|
||||||
app:showAsAction="ifRoom"
|
android:showAsAction="ifRoom"
|
||||||
android:title="@string/menu_insert_marker" />
|
android:title="@string/menu_insert_marker" />
|
||||||
<item
|
<item
|
||||||
android:icon="@drawable/ic_menu_insert_photo"
|
android:icon="@drawable/ic_menu_insert_photo"
|
||||||
android:id="@+id/track_detail_insert_photo"
|
android:id="@+id/track_detail_insert_photo"
|
||||||
android:orderInCategory="2"
|
android:orderInCategory="2"
|
||||||
app:showAsAction="ifRoom"
|
android:showAsAction="ifRoom"
|
||||||
android:title="@string/menu_insert_photo" />
|
android:title="@string/menu_insert_photo" />
|
||||||
<item
|
<item
|
||||||
android:icon="@drawable/ic_menu_share"
|
android:icon="@drawable/ic_menu_share"
|
||||||
android:id="@+id/track_detail_share"
|
android:id="@+id/track_detail_share"
|
||||||
android:orderInCategory="4"
|
android:orderInCategory="4"
|
||||||
app:showAsAction="ifRoom"
|
android:showAsAction="ifRoom"
|
||||||
android:title="@string/menu_share" />
|
android:title="@string/menu_share" />
|
||||||
<item
|
<item
|
||||||
android:icon="@drawable/ic_menu_markers"
|
android:icon="@drawable/ic_menu_markers"
|
||||||
|
|||||||
@@ -19,13 +19,13 @@ limitations under the License.
|
|||||||
android:icon="@drawable/ic_menu_search"
|
android:icon="@drawable/ic_menu_search"
|
||||||
android:id="@+id/track_list_search"
|
android:id="@+id/track_list_search"
|
||||||
android:title="@string/menu_search"
|
android:title="@string/menu_search"
|
||||||
app:actionViewClass="androidx.appcompat.widget.SearchView"
|
android:actionViewClass="androidx.appcompat.widget.SearchView"
|
||||||
app:showAsAction="always" />
|
android:showAsAction="always" />
|
||||||
<item
|
<item
|
||||||
android:icon="@drawable/ic_menu_start_gps"
|
android:icon="@drawable/ic_menu_start_gps"
|
||||||
android:id="@+id/track_list_start_gps"
|
android:id="@+id/track_list_start_gps"
|
||||||
android:title="@string/menu_start_gps"
|
android:title="@string/menu_start_gps"
|
||||||
app:showAsAction="ifRoom" />
|
android:showAsAction="ifRoom" />
|
||||||
<item
|
<item
|
||||||
android:icon="@drawable/ic_menu_aggregated_statistics"
|
android:icon="@drawable/ic_menu_aggregated_statistics"
|
||||||
android:id="@+id/track_list_aggregated_statistics"
|
android:id="@+id/track_list_aggregated_statistics"
|
||||||
|
|||||||
@@ -17,10 +17,6 @@ limitations under the License.
|
|||||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:key="@string/settings_sensor_root_key"
|
android:key="@string/settings_sensor_root_key"
|
||||||
android:title="@string/settings_sensor" >
|
android:title="@string/settings_sensor" >
|
||||||
<com.google.android.apps.mytracks.settings.MyTracksListPreference
|
|
||||||
android:defaultValue="@string/sensor_type_value_none"
|
|
||||||
android:key="@string/sensor_type_key"
|
|
||||||
android:title="@string/settings_sensor_type" />
|
|
||||||
<PreferenceCategory
|
<PreferenceCategory
|
||||||
android:key="@string/settings_sensor_bluetooth_key"
|
android:key="@string/settings_sensor_bluetooth_key"
|
||||||
android:title="@string/settings_sensor_bluetooth" >
|
android:title="@string/settings_sensor_bluetooth" >
|
||||||
|
|||||||
Reference in New Issue
Block a user