Merge pull request google#831 from cco3/soterlint

Fix lint errors
aaronkim · Sep 20, 2016 · f146ecb · f146ecb
2 parents 2093759 + fc44999
commit f146ecb
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 5 deletions.
diff --git a/android/PhysicalWeb/app/src/main/java/org/physical_web/physicalweb/BluetoothSite.java b/android/PhysicalWeb/app/src/main/java/org/physical_web/physicalweb/BluetoothSite.java
@@ -48,6 +48,8 @@ public class BluetoothSite extends BluetoothGattCallback {
   private static final UUID SERVICE_UUID = UUID.fromString("ae5946d4-e587-4ba8-b6a5-a97cca6affd3");
   private static final UUID CHARACTERISTIC_WEBPAGE_UUID = UUID.fromString(
       "d1a517f0-2499-46ca-9ccc-809bc1c966fa");
+  // This is BluetoothGatt.CONNECTION_PRIORITY_HIGH, from API level 21
+  private static final int CONNECTION_PRIORITY_HIGH = 1;
   private Activity activity;
   private BluetoothGatt mBluetoothGatt;
   private BluetoothGattCharacteristic characteristic;
@@ -145,7 +147,7 @@ public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState
       mBluetoothGatt = gatt;
       html = new StringBuilder("");
       if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
-        gatt.requestConnectionPriority(BluetoothGatt.CONNECTION_PRIORITY_HIGH);
+        gatt.requestConnectionPriority(CONNECTION_PRIORITY_HIGH);
         gatt.requestMtu(505);
       } else {
         gatt.discoverServices();

diff --git a/android/PhysicalWeb/app/src/main/java/org/physical_web/physicalweb/MainActivity.java b/android/PhysicalWeb/app/src/main/java/org/physical_web/physicalweb/MainActivity.java
@@ -16,6 +16,7 @@
 
 package org.physical_web.physicalweb;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.FragmentTransaction;
@@ -210,10 +211,14 @@ private void showDemosFragment() {
     showFragment(new DemosFragment(), DEMOS_FRAGMENT_TAG, true);
   }
 
+  @SuppressLint("CommitTransaction")
   private void showFragment(Fragment newFragment, String fragmentTag, boolean addToBackStack) {
     FragmentTransaction transaction = getFragmentManager().beginTransaction()
-        .setCustomAnimations(R.animator.fade_in_and_slide_up_fragment, R.animator.fade_out_fragment,
-            R.animator.fade_in_activity, R.animator.fade_out_fragment)
+        .setCustomAnimations(
+            R.animator.fade_in_and_slide_up_fragment,
+            R.animator.fade_out_fragment,
+            R.animator.fade_in_activity,
+            R.animator.fade_out_fragment)
         .replace(R.id.main_activity_container, newFragment, fragmentTag);
     if (addToBackStack) {
       transaction.addToBackStack(null);

diff --git a/...d/PhysicalWeb/app/src/main/res/drawable-hdpi/trusted_unresolved_result_icon.png b/...d/PhysicalWeb/app/src/main/res/drawable-hdpi/trusted_unresolved_result_icon.png
diff --git a/...d/PhysicalWeb/app/src/main/res/drawable-mdpi/trusted_unresolved_result_icon.png b/...d/PhysicalWeb/app/src/main/res/drawable-mdpi/trusted_unresolved_result_icon.png
diff --git a/.../PhysicalWeb/app/src/main/res/drawable-xhdpi/trusted_unresolved_result_icon.png b/.../PhysicalWeb/app/src/main/res/drawable-xhdpi/trusted_unresolved_result_icon.png
diff --git a/...PhysicalWeb/app/src/main/res/drawable-xxhdpi/trusted_unresolved_result_icon.png b/...PhysicalWeb/app/src/main/res/drawable-xxhdpi/trusted_unresolved_result_icon.png
diff --git a/...hysicalWeb/app/src/main/res/drawable-xxxhdpi/trusted_unresolved_result_icon.png b/...hysicalWeb/app/src/main/res/drawable-xxxhdpi/trusted_unresolved_result_icon.png
diff --git a/android/PhysicalWeb/app/src/main/res/layout/list_item_demo.xml b/android/PhysicalWeb/app/src/main/res/layout/list_item_demo.xml
@@ -16,13 +16,13 @@
     android:layout_height="wrap_content"
     android:id="@+id/demo_title"
     android:gravity="center"
-    android:textSize="22dp" />
+    android:textSize="22sp" />
 
   <TextView
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:id="@+id/demo_summary"
     android:gravity="start"
-    android:textSize="14dp" />
+    android:textSize="14sp" />
 
 </LinearLayout>