summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/profiles
diff options
context:
space:
mode:
authorRoman Birg <roman@cyngn.com>2015-03-02 11:25:19 -0800
committerAdnan Begovic <adnan@cyngn.com>2015-10-26 16:11:14 -0700
commitac17085c50c82597e77ceda8c40ca21957ea413e (patch)
treef33811227b211c2492ebbaecf71690f679ce1f57 /src/com/android/settings/profiles
parenta2f286637a3dd4035014af7081722a50050b4cf6 (diff)
downloadpackages_apps_Settings-ac17085c50c82597e77ceda8c40ca21957ea413e.zip
packages_apps_Settings-ac17085c50c82597e77ceda8c40ca21957ea413e.tar.gz
packages_apps_Settings-ac17085c50c82597e77ceda8c40ca21957ea413e.tar.bz2
Settings: don't add inline trigger links to profiles in creation mode
Change-Id: I24c12df7478c18858c6b612dc4ee274792dd5e24 Signed-off-by: Roman Birg <roman@cyngn.com>
Diffstat (limited to 'src/com/android/settings/profiles')
-rw-r--r--src/com/android/settings/profiles/SetupActionsFragment.java18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/com/android/settings/profiles/SetupActionsFragment.java b/src/com/android/settings/profiles/SetupActionsFragment.java
index d33b9ba..1d5e1f9 100644
--- a/src/com/android/settings/profiles/SetupActionsFragment.java
+++ b/src/com/android/settings/profiles/SetupActionsFragment.java
@@ -152,14 +152,16 @@ public class SetupActionsFragment extends SettingsPreferenceFragment
mItems.add(new Header(getString(R.string.profile_name_title)));
mItems.add(new ProfileNameItem(mProfile));
- // triggers
- mItems.add(new Header(getString(R.string.profile_triggers_header)));
- mItems.add(generateTriggerItem(TriggerItem.WIFI));
- if (DeviceUtils.deviceSupportsBluetooth()) {
- mItems.add(generateTriggerItem(TriggerItem.BLUETOOTH));
- }
- if (DeviceUtils.deviceSupportsNfc(getActivity())) {
- mItems.add(generateTriggerItem(TriggerItem.NFC));
+ if (!mNewProfileMode) {
+ // triggers
+ mItems.add(new Header(getString(R.string.profile_triggers_header)));
+ mItems.add(generateTriggerItem(TriggerItem.WIFI));
+ if (DeviceUtils.deviceSupportsBluetooth()) {
+ mItems.add(generateTriggerItem(TriggerItem.BLUETOOTH));
+ }
+ if (DeviceUtils.deviceSupportsNfc(getActivity())) {
+ mItems.add(generateTriggerItem(TriggerItem.NFC));
+ }
}
// connection overrides