PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"

Browse Source 
This reverts commit fbd5f5fdce.

Change-Id: I769f7a0f509996ccc39fd1c628cad7e5ec1202bf
This commit is contained in:
Tamas Berghammer
2017-01-18 16:20:00 +00:00
parent fbd5f5fdce
commit 5a638a6ad1
195 changed files with 197 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/notification/AppNotificationSettings.java
View File

@@ -29,7 +29,7 @@ import android.service.notification.NotificationListenerService.Ranking;
import android.util.ArrayMap;
import android.util.Log;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.AppHeader;
import com.android.settings.R;

2
src/com/android/settings/notification/ConfigureNotificationSettings.java
View File

@@ -30,7 +30,7 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import android.support.v7.preference.TwoStatePreference;
import android.util.Log;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.RestrictedListPreference.RestrictedItem;

2
src/com/android/settings/notification/NotificationAccessSettings.java
View File

@@ -29,7 +29,7 @@ import android.os.Bundle;
import android.provider.Settings;
import android.service.notification.NotificationListenerService;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.utils.ManagedServiceSettings;
import com.android.settings.utils.ServiceListing;

2
src/com/android/settings/notification/NotificationStation.java
View File

@@ -44,7 +44,7 @@ import android.widget.DateTimeView;
import android.widget.ImageView;
import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.CopyablePreference;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;

2
src/com/android/settings/notification/OtherSoundSettings.java
View File

@@ -34,7 +34,7 @@ import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.telephony.TelephonyManager;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;

2
src/com/android/settings/notification/RedactionInterstitial.java
View File

@@ -32,7 +32,7 @@ import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.RestrictedCheckBox;
import com.android.settings.RestrictedRadioButton;

2
src/com/android/settings/notification/SoundSettings.java
View File

@@ -51,7 +51,7 @@ import android.support.v7.preference.TwoStatePreference;
import android.text.TextUtils;
import android.util.Log;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.RingtonePreference;
import com.android.settings.SettingsPreferenceFragment;

2
src/com/android/settings/notification/ZenAccessSettings.java
View File

@@ -44,7 +44,7 @@ import android.util.ArraySet;
import android.view.View;
import android.widget.Toast;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import java.util.ArrayList;

2
src/com/android/settings/notification/ZenModeAutomationSettings.java
View File

@@ -40,7 +40,7 @@ import android.support.v7.preference.PreferenceViewHolder;
import android.view.View;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.utils.ManagedServiceSettings.Config;
import com.android.settings.utils.ZenServiceListing;

2
src/com/android/settings/notification/ZenModeEventRuleSettings.java
View File

@@ -31,7 +31,7 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceChangeListener;
import android.support.v7.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import java.util.ArrayList;

2
src/com/android/settings/notification/ZenModePrioritySettings.java
View File

@@ -28,7 +28,7 @@ import android.support.v7.preference.PreferenceScreen;
import android.util.Log;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.search.Indexable;

2
src/com/android/settings/notification/ZenModeRuleSettingsBase.java
View File

@@ -40,7 +40,7 @@ import android.widget.Switch;
import android.widget.Toast;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.widget.SwitchBar;

2
src/com/android/settings/notification/ZenModeScheduleRuleSettings.java
View File

@@ -37,7 +37,7 @@ import android.text.format.DateFormat;
import android.util.Log;
import android.widget.TimePicker;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import java.text.SimpleDateFormat;

2
src/com/android/settings/notification/ZenModeSettings.java
View File

@@ -25,7 +25,7 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;

2
src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java
View File

@@ -27,7 +27,7 @@ import android.support.v7.preference.PreferenceScreen;
import android.util.Log;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settings.R;