diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c987ec04a20..755c6e37a0d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -3364,6 +3364,29 @@ android:value="true" /> + + + + + + + + + + + + + + + + Connected devices Apps & notifications + + User & accounts Language: %1$s diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index bfecbbf17d3..451c7e36636 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -168,6 +168,7 @@ public class Settings extends SettingsActivity { public static class ConnectedDeviceDashboardActivity extends SettingsActivity {} public static class AppAndNotificationDashboardActivity extends SettingsActivity {} public static class StorageDashboardActivity extends SettingsActivity {} + public static class UserAndAccountDashboardActivity extends SettingsActivity {} public static class SystemDashboardActivity extends SettingsActivity {} public static class SupportDashboardActivity extends SettingsActivity {} diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 11f8105cbb7..34dd09598fd 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -61,6 +61,7 @@ import com.android.settings.accounts.AccountSettings; import com.android.settings.accounts.AccountSyncSettings; import com.android.settings.accounts.ChooseAccountActivity; import com.android.settings.accounts.ManagedProfileSettings; +import com.android.settings.accounts.UserAndAccountDashboardFragment; import com.android.settings.applications.AppAndNotificationDashboardFragment; import com.android.settings.applications.AdvancedAppSettings; import com.android.settings.applications.DrawOverlayDetails; @@ -279,6 +280,7 @@ public class SettingsActivity extends SettingsDrawerActivity "com.android.settings.Settings.DisplayDashboardAlias", "com.android.settings.Settings.SoundDashboardAlias", "com.android.settings.Settings.SecurityDashboardAlias", + Settings.UserAndAccountDashboardActivity.class.getName(), Settings.SystemDashboardActivity.class.getName(), Settings.SupportDashboardActivity.class.getName(), // Home page > Apps & Notifications @@ -396,6 +398,7 @@ public class SettingsActivity extends SettingsDrawerActivity NetworkDashboardFragment.class.getName(), ConnectedDeviceDashboardFragment.class.getName(), AppAndNotificationDashboardFragment.class.getName(), + UserAndAccountDashboardFragment.class.getName(), }; diff --git a/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java b/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java new file mode 100644 index 00000000000..34d6dc44b77 --- /dev/null +++ b/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2016 The Android Open Source 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.accounts; + +import android.content.Context; + +import com.android.internal.logging.MetricsProto.MetricsEvent; +import com.android.settings.R; +import com.android.settings.core.PreferenceController; +import com.android.settings.dashboard.DashboardFragment; +import com.android.settingslib.drawer.CategoryKey; + +import java.util.List; + +public class UserAndAccountDashboardFragment extends DashboardFragment { + + private static final String TAG = "UserAndAccountDashboard"; + + @Override + public int getMetricsCategory() { + return MetricsEvent.ACCOUNT; + } + + @Override + protected String getCategoryKey() { + return CategoryKey.CATEGORY_ACCOUNT; + } + + @Override + protected String getLogTag() { + return TAG; + } + + @Override + protected int getPreferenceScreenResId() { + return R.xml.account_settings; + } + + @Override + protected List getPreferenceControllers(Context context) { + return null; + } + +} \ No newline at end of file diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java index 37bc4478418..fd125af0fc7 100644 --- a/src/com/android/settings/dashboard/DashboardFragment.java +++ b/src/com/android/settings/dashboard/DashboardFragment.java @@ -344,11 +344,12 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment pref.setIcon(tile.icon.loadDrawable(context)); } final Bundle metadata = tile.metaData; + String clsName = null; if (metadata != null) { - String clsName = metadata.getString(SettingsActivity.META_DATA_KEY_FRAGMENT_CLASS); - if (!TextUtils.isEmpty(clsName)) { - pref.setFragment(clsName); - } + clsName = metadata.getString(SettingsActivity.META_DATA_KEY_FRAGMENT_CLASS); + } + if (!TextUtils.isEmpty(clsName)) { + pref.setFragment(clsName); } else if (tile.intent != null) { final Intent intent = new Intent(tile.intent); pref.setOnPreferenceClickListener(preference -> { diff --git a/tests/robotests/src/com/android/settings/accounts/UserAndAccountDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/UserAndAccountDashboardFragmentTest.java new file mode 100644 index 00000000000..2d266b6c2dd --- /dev/null +++ b/tests/robotests/src/com/android/settings/accounts/UserAndAccountDashboardFragmentTest.java @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2016 The Android Open Source 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.accounts; + +import android.content.Context; + +import com.android.settings.TestConfig; +import com.android.settings.testutils.FakeFeatureFactory; +import com.android.settingslib.drawer.CategoryKey; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Answers; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; + +import static com.google.common.truth.Truth.assertThat; + +@RunWith(RobolectricTestRunner.class) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +public class UserAndAccountDashboardFragmentTest { + + @Mock(answer = Answers.RETURNS_DEEP_STUBS) + private Context mContext; + + private UserAndAccountDashboardFragment mFragment; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + FakeFeatureFactory.setupForTest(mContext); + mFragment = new UserAndAccountDashboardFragment(); + } + + @Test + public void testCategory_isConnectedDevice() { + assertThat(mFragment.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_ACCOUNT); + } + +} diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java index e4222ced169..8fc290e9eb5 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java @@ -16,6 +16,7 @@ package com.android.settings.dashboard; import android.content.Context; +import android.content.Intent; import android.graphics.Bitmap; import android.graphics.drawable.Icon; import android.os.Bundle; @@ -142,6 +143,21 @@ public class DashboardFragmentTest { assertThat(preference.getOrder()).isEqualTo(-tile.priority); } + @Test + public void bindPreference_noFragmentMetadata_shouldBindIntent() { + final Preference preference = new Preference( + ShadowApplication.getInstance().getApplicationContext()); + final Tile tile = new Tile(); + tile.metaData = new Bundle(); + tile.priority = 10; + tile.intent = new Intent(); + mTestFragment.bindPreferenceToTile(mContext, preference, tile, "123"); + + assertThat(preference.getFragment()).isNull(); + assertThat(preference.getIntent()).isNotNull(); + assertThat(preference.getOrder()).isEqualTo(-tile.priority); + } + public static class TestPreferenceController extends PreferenceController { public TestPreferenceController(Context context) {