Skip to content

Commit a7c052f

Browse files
author
Doug Sigelbaum
committed
Add fully qualified names for variables.
1 parent 835a247 commit a7c052f

File tree

3 files changed

+8
-19
lines changed

3 files changed

+8
-19
lines changed

slices-basic-codelab/step-02/SliceCodelab/app/src/main/java/com/android/example/slicecodelab/MySliceProvider.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
package com.android.example.slicecodelab;
1818

1919

20-
import static com.android.example.slicecodelab.MainActivity.getTemperatureString;
21-
2220
import android.content.ContentResolver;
2321
import android.content.Context;
2422
import android.net.Uri;
@@ -54,7 +52,7 @@ private Slice createTemperatureSlice(Uri sliceUri) {
5452
ListBuilder.RowBuilder temperatureRow = new ListBuilder.RowBuilder(listBuilder);
5553

5654
// Set title
57-
temperatureRow.setTitle(getTemperatureString(context));
55+
temperatureRow.setTitle(MainActivity.getTemperatureString(context));
5856

5957
// TODO: add actions to row; in later step
6058

slices-basic-codelab/step-03/SliceCodelab/app/src/main/java/com/android/example/slicecodelab/MyBroadcastReceiver.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616

1717
package com.android.example.slicecodelab;
1818

19-
import static com.android.example.slicecodelab.MainActivity.sTemperature;
20-
import static com.android.example.slicecodelab.MainActivity.updateTemperature;
21-
2219
import android.content.BroadcastReceiver;
2320
import android.content.Context;
2421
import android.content.Intent;
@@ -33,8 +30,8 @@ public void onReceive(Context context, Intent intent) {
3330
String action = intent.getAction();
3431

3532
if (ACTION_CHANGE_TEMP.equals(action) && intent.getExtras() != null) {
36-
int newValue = intent.getExtras().getInt(EXTRA_TEMP_VALUE, sTemperature);
37-
updateTemperature(context, newValue);
33+
int newValue = intent.getExtras().getInt(EXTRA_TEMP_VALUE, MainActivity.sTemperature);
34+
MainActivity.updateTemperature(context, newValue);
3835
}
3936
}
4037

slices-basic-codelab/step-03/SliceCodelab/app/src/main/java/com/android/example/slicecodelab/MySliceProvider.java

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@
1616

1717
package com.android.example.slicecodelab;
1818

19-
20-
import static com.android.example.slicecodelab.MainActivity.getTemperatureString;
21-
import static com.android.example.slicecodelab.MainActivity.sTemperature;
22-
import static com.android.example.slicecodelab.MyBroadcastReceiver.ACTION_CHANGE_TEMP;
23-
import static com.android.example.slicecodelab.MyBroadcastReceiver.EXTRA_TEMP_VALUE;
24-
2519
import android.app.PendingIntent;
2620
import android.content.ContentResolver;
2721
import android.content.Context;
@@ -56,10 +50,10 @@ public Slice onBindSlice(Uri sliceUri) {
5650

5751
private Slice createTemperatureSlice(Uri sliceUri) {
5852
// Define the actions used in this slice
59-
SliceAction tempUp = new SliceAction(getChangeTempIntent(sTemperature + 1),
53+
SliceAction tempUp = new SliceAction(getChangeTempIntent(MainActivity.sTemperature + 1),
6054
IconCompat.createWithResource(context, R.drawable.ic_temp_up),
6155
"Increase temperature");
62-
SliceAction tempDown = new SliceAction(getChangeTempIntent(sTemperature - 1),
56+
SliceAction tempDown = new SliceAction(getChangeTempIntent(MainActivity.sTemperature - 1),
6357
IconCompat.createWithResource(context, R.drawable.ic_temp_down),
6458
"Decrease temperature");
6559

@@ -70,7 +64,7 @@ private Slice createTemperatureSlice(Uri sliceUri) {
7064
ListBuilder.RowBuilder temperatureRow = new ListBuilder.RowBuilder(listBuilder);
7165

7266
// Set title
73-
temperatureRow.setTitle(getTemperatureString(context));
67+
temperatureRow.setTitle(MainActivity.getTemperatureString(context));
7468

7569
// Add the actions to appear at the end of the row
7670
temperatureRow.addEndItem(tempDown);
@@ -93,9 +87,9 @@ private Slice createTemperatureSlice(Uri sliceUri) {
9387
}
9488

9589
private PendingIntent getChangeTempIntent(int value) {
96-
Intent intent = new Intent(ACTION_CHANGE_TEMP);
90+
Intent intent = new Intent(MyBroadcastReceiver.ACTION_CHANGE_TEMP);
9791
intent.setClass(context, MyBroadcastReceiver.class);
98-
intent.putExtra(EXTRA_TEMP_VALUE, value);
92+
intent.putExtra(MyBroadcastReceiver.EXTRA_TEMP_VALUE, value);
9993
return PendingIntent.getBroadcast(getContext(), sReqCode++, intent,
10094
PendingIntent.FLAG_UPDATE_CURRENT);
10195
}

0 commit comments

Comments
 (0)