Profiles: Cleanup the code

* Fix code style
* Fix a couple mismerges
* Align strings with cm-12.1

Change-Id: I0795c114014e53101c7d6697bb9a229c003973ab

22 files changed, 75 insertions, 86 deletions

diff --git a/src/com/android/settings/profiles/AppGroupConfig.java b/src/com/android/settings/profiles/AppGroupConfig.java
index 5e25bce..95b36a7 100644
--- a/src/com/android/settings/profiles/AppGroupConfig.java
+++ b/src/com/android/settings/profiles/AppGroupConfig.java
@@ -19,7 +19,6 @@ package com.android.settings.profiles;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.NotificationGroup;
-import cyanogenmod.app.ProfileManager;
 import android.content.DialogInterface;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
@@ -43,6 +42,8 @@ import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 import android.widget.Toast;
 
+import cyanogenmod.app.ProfileManager;
+
 import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
diff --git a/src/com/android/settings/profiles/AppGroupList.java b/src/com/android/settings/profiles/AppGroupList.java
index 968d88c..ba870ca 100644
--- a/src/com/android/settings/profiles/AppGroupList.java
+++ b/src/com/android/settings/profiles/AppGroupList.java
@@ -21,8 +21,6 @@ import java.util.UUID;
 import android.annotation.Nullable;
 import android.app.AlertDialog;
 import android.app.NotificationGroup;
-import com.android.internal.logging.MetricsLogger;
-import cyanogenmod.app.ProfileManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
@@ -35,10 +33,15 @@ import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
-//import com.android.internal.util.cm.ScreenType;
+
+import cyanogenmod.app.ProfileManager;
+
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
+import org.cyanogenmod.internal.util.ScreenType;
+
 public class AppGroupList extends SettingsPreferenceFragment {
 
     private static final String TAG = "AppGroupSettings";
@@ -69,9 +72,9 @@ public class AppGroupList extends SettingsPreferenceFragment {
         refreshList();
 
         // On tablet devices remove the padding
-        //if (ScreenType.isTablet(getActivity())) {
-        //    getListView().setPadding(0, 0, 0, 0);
-        //}
+        if (ScreenType.isTablet(getActivity())) {
+            getListView().setPadding(0, 0, 0, 0);
+        }
     }
 
     @Override
@@ -156,4 +159,4 @@ public class AppGroupList extends SettingsPreferenceFragment {
         startFragment(this, AppGroupConfig.class.getName(), R.string.profile_appgroup_manage,
                 APP_GROUP_CONFIG, args);
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/profiles/NFCProfileUtils.java b/src/com/android/settings/profiles/NFCProfileUtils.java
index 3c6dcc6..4ce8c80 100644
--- a/src/com/android/settings/profiles/NFCProfileUtils.java
+++ b/src/com/android/settings/profiles/NFCProfileUtils.java
@@ -16,9 +16,6 @@
 
 package com.android.settings.profiles;
 
-import java.io.IOException;
-import java.util.UUID;
-
 import android.content.Context;
 import android.nfc.NdefMessage;
 import android.nfc.NdefRecord;
@@ -30,6 +27,9 @@ import android.util.Log;
 
 import cyanogenmod.app.Profile;
 
+import java.io.IOException;
+import java.util.UUID;
+
 public class NFCProfileUtils {
 
     private static final String TAG = "NFCUtils";
diff --git a/src/com/android/settings/profiles/NFCProfileWriter.java b/src/com/android/settings/profiles/NFCProfileWriter.java
index 8b50ffe..8396307 100644
--- a/src/com/android/settings/profiles/NFCProfileWriter.java
+++ b/src/com/android/settings/profiles/NFCProfileWriter.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.profiles;
 
-import java.util.UUID;
-
 import android.app.Activity;
 import android.app.PendingIntent;
 import android.content.Context;
@@ -34,6 +32,8 @@ import cyanogenmod.app.ProfileManager;
 
 import com.android.settings.R;
 
+import java.util.UUID;
+
 /**
  * Activity to support writing a profile to an NFC tag.
  * The mime type is "cm/profile" and the payload is the raw bytes of the profile's
diff --git a/src/com/android/settings/profiles/ProfileGroupConfig.java b/src/com/android/settings/profiles/ProfileGroupConfig.java
index b70dc8a..7467af5 100644
--- a/src/com/android/settings/profiles/ProfileGroupConfig.java
+++ b/src/com/android/settings/profiles/ProfileGroupConfig.java
@@ -37,38 +37,21 @@ public class ProfileGroupConfig extends SettingsPreferenceFragment implements
         OnPreferenceChangeListener {
 
     private static final CharSequence KEY_SOUNDMODE = "sound_mode";
-
     private static final CharSequence KEY_VIBRATEMODE = "vibrate_mode";
-
     private static final CharSequence KEY_LIGHTSMODE = "lights_mode";
-
     private static final CharSequence KEY_RINGERMODE = "ringer_mode";
-
     private static final CharSequence KEY_SOUNDTONE = "soundtone";
-
     private static final CharSequence KEY_RINGTONE = "ringtone";
 
     Profile mProfile;
-
     ProfileGroup mProfileGroup;
 
-    @Override
-    protected int getMetricsCategory() {
-        return MetricsLogger.DONT_TRACK_ME_BRO;
-    }
-
     private ListPreference mSoundMode;
-
     private ListPreference mRingerMode;
-
     private ListPreference mVibrateMode;
-
     private ListPreference mLightsMode;
-
     private ProfileRingtonePreference mRingTone;
-
     private ProfileRingtonePreference mSoundTone;
-
     private ProfileManager mProfileManager;
 
     @Override
@@ -106,8 +89,12 @@ public class ProfileGroupConfig extends SettingsPreferenceFragment implements
         }
     }
 
-    private void updateState() {
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DONT_TRACK_ME_BRO;
+    }
 
+    private void updateState() {
         mVibrateMode.setValue(mProfileGroup.getVibrateMode().name());
         mSoundMode.setValue(mProfileGroup.getSoundMode().name());
         mRingerMode.setValue(mProfileGroup.getRingerMode().name());
@@ -125,7 +112,6 @@ public class ProfileGroupConfig extends SettingsPreferenceFragment implements
         if (mProfileGroup.getRingerOverride() != null) {
             mRingTone.setRingtone(mProfileGroup.getRingerOverride());
         }
-
     }
 
     @Override
diff --git a/src/com/android/settings/profiles/ProfileRingtonePreference.java b/src/com/android/settings/profiles/ProfileRingtonePreference.java
index bf01e28..91ccbe6 100644
--- a/src/com/android/settings/profiles/ProfileRingtonePreference.java
+++ b/src/com/android/settings/profiles/ProfileRingtonePreference.java
@@ -55,4 +55,4 @@ public class ProfileRingtonePreference extends RingtonePreference {
             return mRingtone;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/profiles/ProfilesSettings.java b/src/com/android/settings/profiles/ProfilesSettings.java
index 16c9018..4bee66d 100644
--- a/src/com/android/settings/profiles/ProfilesSettings.java
+++ b/src/com/android/settings/profiles/ProfilesSettings.java
@@ -17,11 +17,8 @@
 package com.android.settings.profiles;
 
 import android.annotation.Nullable;
-import android.app.ActionBar;
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.Fragment;
-import android.app.FragmentManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -31,9 +28,6 @@ import android.os.Bundle;
 import android.os.UserHandle;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
-import android.provider.Settings;
-import android.support.v4.view.ViewPager;
-import android.support.v13.app.FragmentStatePagerAdapter;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -42,25 +36,19 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
-import android.widget.ImageView;
 import android.widget.ListView;
-import android.widget.Switch;
 import android.widget.TextView;
 
-import com.android.internal.logging.MetricsLogger;
+import cyanogenmod.app.Profile;
+import cyanogenmod.app.ProfileManager;
+import cyanogenmod.providers.CMSettings;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.SubSettings;
 import com.android.settings.cyanogenmod.CMBaseSystemSettingSwitchBar;
 
-import cyanogenmod.app.Profile;
-import cyanogenmod.app.ProfileManager;
-import cyanogenmod.providers.CMSettings;
-
-import org.cyanogenmod.internal.util.ScreenType;
-
 import java.util.UUID;
 
 public class ProfilesSettings extends SettingsPreferenceFragment
@@ -172,11 +160,6 @@ public class ProfilesSettings extends SettingsPreferenceFragment
 
         // check if we are enabled
         updateProfilesEnabledState();
-
-        // If running on a phone, remove padding around tabs
-        if (!ScreenType.isTablet(getActivity())) {
-            mContainer.setPadding(0, 0, 0, 0);
-        }
     }
 
     @Override
@@ -329,5 +312,4 @@ public class ProfilesSettings extends SettingsPreferenceFragment
             ex.printStackTrace();
         }
     }
-
 }
diff --git a/src/com/android/settings/profiles/SetupActionsFragment.java b/src/com/android/settings/profiles/SetupActionsFragment.java
index 599180c..602abf0 100644
--- a/src/com/android/settings/profiles/SetupActionsFragment.java
+++ b/src/com/android/settings/profiles/SetupActionsFragment.java
@@ -16,23 +16,16 @@
 package com.android.settings.profiles;
 
 import android.app.Activity;
-import android.content.pm.PackageManager;
-import com.android.internal.logging.MetricsLogger;
-import cyanogenmod.profiles.AirplaneModeSettings;
 import android.app.AlertDialog;
-import cyanogenmod.profiles.BrightnessSettings;
-import cyanogenmod.profiles.ConnectionSettings;
 import android.app.Dialog;
 import android.app.NotificationGroup;
-import cyanogenmod.profiles.LockSettings;
-import cyanogenmod.profiles.RingModeSettings;
-import cyanogenmod.profiles.StreamSettings;
 import android.app.admin.DevicePolicyManager;
 import android.bluetooth.BluetoothAdapter;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.location.LocationManager;
 import android.media.AudioManager;
 import android.media.RingtoneManager;
@@ -66,7 +59,14 @@ import android.widget.TextView;
 import cyanogenmod.app.Profile;
 import cyanogenmod.app.ProfileGroup;
 import cyanogenmod.app.ProfileManager;
+import cyanogenmod.profiles.AirplaneModeSettings;
+import cyanogenmod.profiles.BrightnessSettings;
+import cyanogenmod.profiles.ConnectionSettings;
+import cyanogenmod.profiles.LockSettings;
+import cyanogenmod.profiles.RingModeSettings;
+import cyanogenmod.profiles.StreamSettings;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SubSettings;
@@ -74,8 +74,8 @@ import com.android.settings.cyanogenmod.DeviceUtils;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.profiles.actions.ItemListAdapter;
 import com.android.settings.profiles.actions.item.AirplaneModeItem;
-import com.android.settings.profiles.actions.item.BrightnessItem;
 import com.android.settings.profiles.actions.item.AppGroupItem;
+import com.android.settings.profiles.actions.item.BrightnessItem;
 import com.android.settings.profiles.actions.item.ConnectionOverrideItem;
 import com.android.settings.profiles.actions.item.DisabledItem;
 import com.android.settings.profiles.actions.item.DozeModeItem;
@@ -133,15 +133,15 @@ public class SetupActionsFragment extends SettingsPreferenceFragment
 
     boolean mNewProfileMode;
 
-    private static final int[] LOCKMODE_MAPPING = new int[]{
+    private static final int[] LOCKMODE_MAPPING = new int[] {
             Profile.LockMode.DEFAULT, Profile.LockMode.INSECURE, Profile.LockMode.DISABLE
     };
-    private static final int[] EXPANDED_DESKTOP_MAPPING = new int[]{
+    private static final int[] EXPANDED_DESKTOP_MAPPING = new int[] {
             Profile.ExpandedDesktopMode.DEFAULT,
             Profile.ExpandedDesktopMode.ENABLE,
             Profile.ExpandedDesktopMode.DISABLE
     };
-    private static final int[] DOZE_MAPPING = new int[]{
+    private static final int[] DOZE_MAPPING = new int[] {
             Profile.DozeMode.DEFAULT,
             Profile.DozeMode.ENABLE,
             Profile.DozeMode.DISABLE
@@ -205,7 +205,7 @@ public class SetupActionsFragment extends SettingsPreferenceFragment
         }
 
         // connection overrides
-        mItems.add(new Header(getString(R.string.profile_connectionoverrides_title)));
+        mItems.add(new Header(getString(R.string.wireless_networks_settings_title)));
         if (DeviceUtils.deviceSupportsBluetooth()) {
             mItems.add(new ConnectionOverrideItem(PROFILE_CONNECTION_BLUETOOTH,
                     mProfile.getSettingsForConnection(PROFILE_CONNECTION_BLUETOOTH)));
@@ -841,6 +841,7 @@ public class SetupActionsFragment extends SettingsPreferenceFragment
                 }
             }
         }
+
         builder.setTitle(ConnectionOverrideItem.getConnectionTitle(setting.getConnectionId()));
         builder.setSingleChoiceItems(connectionNames, defaultIndex,
                 new DialogInterface.OnClickListener() {
diff --git a/src/com/android/settings/profiles/SetupDefaultProfileReceiver.java b/src/com/android/settings/profiles/SetupDefaultProfileReceiver.java
index 8f927bc..fc45cce 100644
--- a/src/com/android/settings/profiles/SetupDefaultProfileReceiver.java
+++ b/src/com/android/settings/profiles/SetupDefaultProfileReceiver.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2015 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.android.settings.profiles;
 
 import android.content.BroadcastReceiver;
diff --git a/src/com/android/settings/profiles/SetupTriggersFragment.java b/src/com/android/settings/profiles/SetupTriggersFragment.java
index 9584a5f..5d74ac5 100644
--- a/src/com/android/settings/profiles/SetupTriggersFragment.java
+++ b/src/com/android/settings/profiles/SetupTriggersFragment.java
@@ -29,10 +29,10 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 
-import com.android.internal.logging.MetricsLogger;
 import cyanogenmod.app.Profile;
 import cyanogenmod.app.ProfileManager;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.SubSettings;
diff --git a/src/com/android/settings/profiles/TriggerPagerAdapter.java b/src/com/android/settings/profiles/TriggerPagerAdapter.java
index cfd7fff..046bf49 100644
--- a/src/com/android/settings/profiles/TriggerPagerAdapter.java
+++ b/src/com/android/settings/profiles/TriggerPagerAdapter.java
@@ -15,7 +15,6 @@
  */
 package com.android.settings.profiles;
 
-
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.FragmentManager;
diff --git a/src/com/android/settings/profiles/actions/ItemListAdapter.java b/src/com/android/settings/profiles/actions/ItemListAdapter.java
index 2b26d99..38a58a4 100644
--- a/src/com/android/settings/profiles/actions/ItemListAdapter.java
+++ b/src/com/android/settings/profiles/actions/ItemListAdapter.java
@@ -20,6 +20,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
+
 import com.android.settings.profiles.actions.item.Item;
 
 import java.util.List;
diff --git a/src/com/android/settings/profiles/actions/item/AirplaneModeItem.java b/src/com/android/settings/profiles/actions/item/AirplaneModeItem.java
index ecacc1b..fbd9620 100644
--- a/src/com/android/settings/profiles/actions/item/AirplaneModeItem.java
+++ b/src/com/android/settings/profiles/actions/item/AirplaneModeItem.java
@@ -15,11 +15,13 @@
  */
 package com.android.settings.profiles.actions.item;
 
-import cyanogenmod.profiles.AirplaneModeSettings;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+
+import cyanogenmod.profiles.AirplaneModeSettings;
+
 import com.android.settings.R;
 import com.android.settings.profiles.actions.ItemListAdapter;
 
diff --git a/src/com/android/settings/profiles/actions/item/BrightnessItem.java b/src/com/android/settings/profiles/actions/item/BrightnessItem.java
index 223abda..49f0ec9 100644
--- a/src/com/android/settings/profiles/actions/item/BrightnessItem.java
+++ b/src/com/android/settings/profiles/actions/item/BrightnessItem.java
@@ -15,12 +15,14 @@
  */
 package com.android.settings.profiles.actions.item;
 
-import cyanogenmod.profiles.BrightnessSettings;
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+
+import cyanogenmod.profiles.BrightnessSettings;
+
 import com.android.settings.R;
 import com.android.settings.profiles.actions.ItemListAdapter;
 
@@ -73,5 +75,4 @@ public class BrightnessItem implements Item {
     public BrightnessSettings getSettings() {
         return mSettings;
     }
-
 }
diff --git a/src/com/android/settings/profiles/actions/item/ConnectionOverrideItem.java b/src/com/android/settings/profiles/actions/item/ConnectionOverrideItem.java
index 3214174..ec7530d 100644
--- a/src/com/android/settings/profiles/actions/item/ConnectionOverrideItem.java
+++ b/src/com/android/settings/profiles/actions/item/ConnectionOverrideItem.java
@@ -15,12 +15,13 @@
  */
 package com.android.settings.profiles.actions.item;
 
-import cyanogenmod.profiles.ConnectionSettings;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import cyanogenmod.profiles.ConnectionSettings;
+
 import com.android.settings.R;
 import com.android.settings.profiles.actions.ItemListAdapter;
 
diff --git a/src/com/android/settings/profiles/actions/item/DisabledItem.java b/src/com/android/settings/profiles/actions/item/DisabledItem.java
index 3b16c28..f6328af 100644
--- a/src/com/android/settings/profiles/actions/item/DisabledItem.java
+++ b/src/com/android/settings/profiles/actions/item/DisabledItem.java
@@ -63,5 +63,4 @@ public class DisabledItem implements Item {
 
         return view;
     }
-
 }
diff --git a/src/com/android/settings/profiles/actions/item/LockModeItem.java b/src/com/android/settings/profiles/actions/item/LockModeItem.java
index e89bcc8..e04cf19 100644
--- a/src/com/android/settings/profiles/actions/item/LockModeItem.java
+++ b/src/com/android/settings/profiles/actions/item/LockModeItem.java
@@ -64,7 +64,7 @@ public class LockModeItem implements Item {
     public static int getSummaryString(Profile profile) {
         switch (profile.getScreenLockMode().getValue()) {
             case Profile.LockMode.DEFAULT:
-                return R.string.profile_lockmode_default_summary;
+                return R.string.profile_action_system; //"leave unchanged"
             case Profile.LockMode.DISABLE:
                 return R.string.profile_lockmode_disabled_summary;
             case Profile.LockMode.INSECURE:
diff --git a/src/com/android/settings/profiles/actions/item/RingModeItem.java b/src/com/android/settings/profiles/actions/item/RingModeItem.java
index f1c57a3..42fdb91 100644
--- a/src/com/android/settings/profiles/actions/item/RingModeItem.java
+++ b/src/com/android/settings/profiles/actions/item/RingModeItem.java
@@ -15,12 +15,13 @@
  */
 package com.android.settings.profiles.actions.item;
 
-import cyanogenmod.profiles.RingModeSettings;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import cyanogenmod.profiles.RingModeSettings;
+
 import com.android.settings.R;
 import com.android.settings.profiles.actions.ItemListAdapter;
 
@@ -76,7 +77,7 @@ public class RingModeItem implements Item {
                 return R.string.ring_mode_mute;
             }
         } else {
-            return R.string.ring_mode_unchanged;
+            return R.string.profile_action_none; //"leave unchanged"
         }
     }
 
diff --git a/src/com/android/settings/profiles/actions/item/VolumeStreamItem.java b/src/com/android/settings/profiles/actions/item/VolumeStreamItem.java
index 23db18d..9bcf2ef 100644
--- a/src/com/android/settings/profiles/actions/item/VolumeStreamItem.java
+++ b/src/com/android/settings/profiles/actions/item/VolumeStreamItem.java
@@ -15,7 +15,6 @@
  */
 package com.android.settings.profiles.actions.item;
 
-import cyanogenmod.profiles.StreamSettings;
 import android.content.Context;
 import android.media.AudioManager;
 import android.view.LayoutInflater;
@@ -23,6 +22,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import cyanogenmod.profiles.StreamSettings;
+
 import com.android.settings.R;
 import com.android.settings.profiles.actions.ItemListAdapter;
 
@@ -68,7 +69,7 @@ public class VolumeStreamItem implements Item {
             desc.setText(context.getResources().getString(R.string.volume_override_summary,
                     denominator, numerator));
         } else {
-            desc.setText(context.getString(R.string.volume_override_summary_no_override));
+            desc.setText(context.getString(R.string.profile_action_none));
         }
 
         return view;
diff --git a/src/com/android/settings/profiles/triggers/AbstractTriggerItem.java b/src/com/android/settings/profiles/triggers/AbstractTriggerItem.java
index 1682e06..432b55a 100644
--- a/src/com/android/settings/profiles/triggers/AbstractTriggerItem.java
+++ b/src/com/android/settings/profiles/triggers/AbstractTriggerItem.java
@@ -17,7 +17,6 @@ package com.android.settings.profiles.triggers;
 
 import cyanogenmod.app.Profile;
 
-
 public class AbstractTriggerItem {
     private int mIcon;
     private String mSummary;
diff --git a/src/com/android/settings/profiles/triggers/BluetoothTriggerFragment.java b/src/com/android/settings/profiles/triggers/BluetoothTriggerFragment.java
index 5f3e3b1..5da8e44 100644
--- a/src/com/android/settings/profiles/triggers/BluetoothTriggerFragment.java
+++ b/src/com/android/settings/profiles/triggers/BluetoothTriggerFragment.java
@@ -45,7 +45,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-
 public class BluetoothTriggerFragment extends ListFragment {
 
     private BluetoothAdapter mBluetoothAdapter;
@@ -207,7 +206,8 @@ public class BluetoothTriggerFragment extends ListFragment {
             for (BluetoothDevice device : pairedDevices) {
                 BluetoothTrigger bt =
                         new BluetoothTrigger(device);
-                int state = mProfile.getTriggerState(Profile.TriggerType.BLUETOOTH, bt.getAddress());
+                int state = mProfile.getTriggerState(
+                        Profile.TriggerType.BLUETOOTH, bt.getAddress());
                 initPreference(bt, state, res, R.drawable.ic_settings_bluetooth);
                 mTriggers.add(bt);
             }
diff --git a/src/com/android/settings/profiles/triggers/NfcTriggerFragment.java b/src/com/android/settings/profiles/triggers/NfcTriggerFragment.java
index 411cc4f..363162d 100644
--- a/src/com/android/settings/profiles/triggers/NfcTriggerFragment.java
+++ b/src/com/android/settings/profiles/triggers/NfcTriggerFragment.java
@@ -39,7 +39,6 @@ import com.android.settings.profiles.NFCProfileTagCallback;
 import com.android.settings.profiles.NFCProfileUtils;
 import com.android.settings.profiles.ProfilesSettings;
 
-
 public class NfcTriggerFragment extends Fragment implements NFCProfileTagCallback {
     Profile mProfile;
 
@@ -123,6 +122,4 @@ public class NfcTriggerFragment extends Fragment implements NFCProfileTagCallbac
                              Bundle savedInstanceState) {
         return inflater.inflate(R.layout.nfc_writer, container, false);
     }
-
-
 }