-
Notifications
You must be signed in to change notification settings - Fork 0
/
radius_setting_and_permission_set_.patch
194 lines (175 loc) · 7.37 KB
/
radius_setting_and_permission_set_.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
Index: app/src/main/java/com/example/pio/MainActivity.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/java/com/example/pio/MainActivity.java (revision 92fd930bf73dc42dda54eaaa38f0cfe7097fc4df)
+++ app/src/main/java/com/example/pio/MainActivity.java (date 1563923348263)
@@ -78,7 +78,7 @@
private static final String FINE_LOCATION = Manifest.permission.ACCESS_FINE_LOCATION;
private static final String COURSE_LOCATION = Manifest.permission.ACCESS_COARSE_LOCATION;
private static final int LOCATION_PERMISSION_REQUEST_CODE = 1234;
- private static final float DEFAULT_ZOOM = 15f;
+ private static final float DEFAULT_ZOOM = 20f;
private static final LatLngBounds LAT_LNG_BOUNDS = new LatLngBounds(
new LatLng(-40, -168), new LatLng(71, 136));
@@ -100,6 +100,8 @@
GeoDataClient geoDataClient;
PlaceDetectionClient placeDetectionClient;
+
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Index: app/src/main/AndroidManifest.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/AndroidManifest.xml (revision 92fd930bf73dc42dda54eaaa38f0cfe7097fc4df)
+++ app/src/main/AndroidManifest.xml (date 1563923348316)
@@ -6,10 +6,15 @@
Google Maps Android API v2, but you must specify either coarse or fine
location permissions for the 'MyLocation' functionality.
-->
- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+
+ <!--<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />-->
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.INTERNET"/>
+<<<<<<< Updated upstream
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+=======
+>>>>>>> Stashed changes
<application
Index: app/build.gradle
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/build.gradle (revision 92fd930bf73dc42dda54eaaa38f0cfe7097fc4df)
+++ app/build.gradle (date 1563923348261)
@@ -5,7 +5,7 @@
buildToolsVersion "29.0.1"
defaultConfig {
applicationId "com.example.pio"
- minSdkVersion 25
+ minSdkVersion 22
targetSdkVersion 29
versionCode 1
versionName "1.0"
Index: app/src/main/res/layout/activity_maps.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/res/layout/activity_maps.xml (revision 92fd930bf73dc42dda54eaaa38f0cfe7097fc4df)
+++ app/src/main/res/layout/activity_maps.xml (date 1563923348264)
@@ -11,13 +11,12 @@
tools:showIn="@layout/app_bar_drawer_main">
-
-<RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent">
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
- <!-- <fragment
+ <!-- <fragment
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/map"
android:name="com.google.android.gms.maps.SupportMapFragment"
@@ -26,59 +25,57 @@
tools:context=".MapsActivity" />-->
- <fragment
- android:id="@+id/map"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:name="com.google.android.gms.maps.SupportMapFragment"
- tools:context=".MainActivity"/>
+ <fragment
+ android:id="@+id/map"
+ android:name="com.google.android.gms.maps.SupportMapFragment"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ tools:context=".MainActivity" />
-
-
- <RelativeLayout
- android:id="@+id/relLayout1"
- android:layout_width="match_parent"
- android:layout_height="50dp"
- android:layout_marginLeft="10dp"
- android:layout_marginTop="10dp"
- android:layout_marginRight="10dp"
- android:background="@drawable/white_border"
- android:elevation="10dp">
+ <RelativeLayout
+ android:id="@+id/relLayout1"
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:layout_marginLeft="10dp"
+ android:layout_marginTop="10dp"
+ android:layout_marginRight="10dp"
+ android:background="@drawable/white_border"
+ android:elevation="10dp">
- <ImageView
- android:id="@+id/ic_magnify"
- android:layout_width="15dp"
- android:layout_height="15dp"
- android:layout_centerVertical="true"
- android:layout_marginLeft="10dp"
- android:src="@drawable/ic_magnify" />
+ <ImageView
+ android:id="@+id/ic_magnify"
+ android:layout_width="15dp"
+ android:layout_height="15dp"
+ android:layout_centerVertical="true"
+ android:layout_marginLeft="10dp"
+ android:src="@drawable/ic_magnify" />
- <AutoCompleteTextView
- android:id="@+id/input_search"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_centerVertical="true"
- android:layout_toRightOf="@+id/ic_magnify"
- android:background="@null"
- android:hint="Enter Address, Or Bus Number"
- android:imeOptions="actionSearch"
- android:textColor="#000"
- android:textSize="15sp" />
+ <AutoCompleteTextView
+ android:id="@+id/input_search"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_centerVertical="true"
+ android:layout_toRightOf="@+id/ic_magnify"
+ android:background="@null"
+ android:hint="Enter Address, Or Bus Number"
+ android:imeOptions="actionSearch"
+ android:textColor="#000"
+ android:textSize="15sp" />z
- </RelativeLayout>
+ </RelativeLayout>
- <ImageView
- android:id="@+id/ic_gps"
- android:layout_width="40dp"
- android:layout_height="40dp"
- android:layout_below="@id/relLayout1"
- android:layout_alignParentRight="true"
- android:layout_marginTop="478dp"
- android:layout_marginRight="2dp"
- android:scaleType="centerCrop"
- android:src="@drawable/ic_gps" />
+ <ImageView
+ android:id="@+id/ic_gps"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/relLayout1"
+ android:layout_alignParentRight="true"
+ android:layout_marginTop="403dp"
+ android:layout_marginRight="17dp"
+ android:scaleType="centerCrop"
+ android:src="@drawable/ic_gps" />
</RelativeLayout>