-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathUpdate_WORKING!.patch
More file actions
178 lines (158 loc) · 6.7 KB
/
Update_WORKING!.patch
File metadata and controls
178 lines (158 loc) · 6.7 KB
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
Index: app/src/main/AndroidManifest.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/AndroidManifest.xml (date 1526886010000)
+++ app/src/main/AndroidManifest.xml (date 1526888589154)
@@ -16,7 +16,8 @@
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
- <activity android:name=".DeviceControlActivity"/>
+ <activity android:name=".DeviceControlActivity"
+ android:theme="@style/appCompat"/>
<service android:name=".BluetoothLeService" android:enabled="true"/>
</application>
Index: app/src/main/res/values/base-strings.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/res/values/base-strings.xml (date 1526886010000)
+++ app/src/main/res/values/base-strings.xml (date 1526625086765)
@@ -16,7 +16,7 @@
-->
<resources>
- <string name="app_name">BLDC Control</string>
+ <string name="app_name">BluetoothLeGatt</string>
<string name="intro_message">
<![CDATA[
Index: app/src/main/java/joshua/barker/com/mobilecomp/DeviceControlActivity.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/java/joshua/barker/com/mobilecomp/DeviceControlActivity.java (date 1526886010000)
+++ app/src/main/java/joshua/barker/com/mobilecomp/DeviceControlActivity.java (date 1526888892419)
@@ -206,8 +206,8 @@
tv_pwm = (TextView) findViewById(R.id.tv_PWM);
- getActionBar().setTitle(mDeviceName);
- getActionBar().setDisplayHomeAsUpEnabled(true);
+ getSupportActionBar().setTitle(mDeviceName);
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
Intent gattServiceIntent = new Intent(this, BluetoothLeService.class);
bindService(gattServiceIntent, mServiceConnection, BIND_AUTO_CREATE);
Index: app/src/main/java/joshua/barker/com/mobilecomp/DeviceScanActivity.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/java/joshua/barker/com/mobilecomp/DeviceScanActivity.java (date 1526886010000)
+++ app/src/main/java/joshua/barker/com/mobilecomp/DeviceScanActivity.java (date 1526887002583)
@@ -37,6 +37,7 @@
import android.widget.Toast;
import java.util.ArrayList;
+import java.util.Objects;
/**
* Activity for scanning and displaying available Bluetooth LE devices.
Index: app/src/main/res/menu/gatt_services.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/res/menu/gatt_services.xml (date 1526886010000)
+++ app/src/main/res/menu/gatt_services.xml (date 1526887545361)
@@ -15,11 +15,6 @@
-->
<menu xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:title="Refresh"
- android:id="@+id/menu_refresh"
- android:checkable="false"
- android:orderInCategory="1"
- app:showAsAction="ifRoom" />
<item android:id="@+id/menu_connect"
android:title="@string/menu_connect"
android:orderInCategory="100"
Index: app/src/main/res/layout/gatt_services_characteristics.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/res/layout/gatt_services_characteristics.xml (date 1526886010000)
+++ app/src/main/res/layout/gatt_services_characteristics.xml (date 1526886138218)
@@ -122,6 +122,8 @@
</LinearLayout>
+
+
<ExpandableListView
android:id="@+id/gatt_services_list"
android:layout_width="match_parent"
@@ -136,6 +138,21 @@
android:gravity="bottom"
android:orientation="vertical">
+ <EditText
+ android:id="@+id/et_test"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="Enter Command:"
+ android:padding="8dp"/>
+
+ <TextView
+ android:id="@+id/data_value"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/et_test"
+ android:layout_centerHorizontal="true"
+ android:hint="Serial Read:"
+ android:textSize="14sp"/>
Index: app/src/main/res/layout/layout_dialog.xml
===================================================================
--- app/src/main/res/layout/layout_dialog.xml (date 1526886010000)
+++ app/src/main/res/layout/layout_dialog.xml (date 1526886010000)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:padding="16dp">
-
- <EditText
- android:id="@+id/et_test"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:hint="Enter Command:"
- android:padding="8dp"/>
-
- <TextView
- android:id="@+id/data_value"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@+id/et_test"
- android:layout_centerHorizontal="true"
- android:hint="Serial Read:"
- android:textSize="14sp"/>
-
-</RelativeLayout>
\ No newline at end of file
Index: app/src/main/res/values/template-styles.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/src/main/res/values/template-styles.xml (date 1526886010000)
+++ app/src/main/res/values/template-styles.xml (date 1526888716098)
@@ -18,13 +18,15 @@
<!-- Activity themes -->
- <style name="Theme.AppCompat.Base" parent="Theme.AppCompat.Light" />
+ <style name="Theme.Base" parent="android:Theme.Light" />
- <style name="Theme.AppCompat.Sample" parent="Theme.AppCompat.Base" />
+ <style name="Theme.Sample" parent="Theme.Base" />
- <style name="AppTheme" parent="Theme.AppCompat.Light" />
+ <style name="AppTheme" parent="Theme.Sample" />
+ <style name="appCompat" parent="Theme.AppCompat.DayNight.DarkActionBar"/>
<!-- Widget styling -->
+
<style name="Widget" />
<style name="Widget.SampleMessage">