Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58d27eef authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add logging when entity header buttons are clicked" into oc-dr1-dev

parents 9d0d6e4f a74337c6

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -8959,7 +8959,7 @@ 
    <string name="help_url_audio_accessory_not_supported" translatable="false"></string>









    <!-- Title label for new device suggestion, which is displayed in Settings homepage [CHAR LIMIT=100] -->









    <string name="new_device_suggestion_title">What's new and exciting?</string>









    <string name="new_device_suggestion_title">What\'s new and exciting?</string>

















    <!-- Summary label for new device suggestion, which is displayed in Settings homepage [CHAR LIMIT=100] -->









    <string name="new_device_suggestion_summary">Check out the top 5 features</string>

























src/com/android/settings/widget/EntityHeaderController.java



+10
−0






























Original line number
Diff line number
Diff line







@@ -52,6 +52,10 @@ import com.android.settingslib.core.lifecycle.Lifecycle;







import java.lang.annotation.Retention;









import java.lang.annotation.RetentionPolicy;



















import static com.android.internal.logging.nano.MetricsProto.MetricsEvent









        .ACTION_OPEN_APP_NOTIFICATION_SETTING;









import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_OPEN_APP_SETTING;



















public class EntityHeaderController {



















    @IntDef({ActionType.ACTION_NONE,








@@ -310,6 +314,9 @@ public class EntityHeaderController {







                    button.setOnClickListener(new View.OnClickListener() {









                        @Override









                        public void onClick(View v) {









                            FeatureFactory.getFactory(mAppContext).getMetricsFeatureProvider()









                                    .actionWithSource(mAppContext, mMetricsCategory,









                                            ACTION_OPEN_APP_NOTIFICATION_SETTING);









                            mFragment.startActivity(mAppNotifPrefIntent);









                        }









                    });








@@ -327,6 +334,9 @@ public class EntityHeaderController {







                button.setOnClickListener(new View.OnClickListener() {









                    @Override









                    public void onClick(View v) {









                        FeatureFactory.getFactory(mAppContext).getMetricsFeatureProvider()









                                .actionWithSource(mAppContext, mMetricsCategory,









                                        ACTION_OPEN_APP_SETTING);









                        mFragment.startActivity(intent);









                    }









                });
































tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java



+7
−2






























Original line number
Diff line number
Diff line







@@ -32,11 +32,12 @@ import android.view.LayoutInflater;







import android.view.View;









import android.widget.TextView;



















import com.android.internal.logging.nano.MetricsProto;









import com.android.settings.R;









import com.android.settings.testutils.SettingsRobolectricTestRunner;









import com.android.settings.TestConfig;









import com.android.settings.applications.LayoutPreference;









import com.android.settings.testutils.FakeFeatureFactory;









import com.android.settings.testutils.SettingsRobolectricTestRunner;



















import org.junit.Before;









import org.junit.Test;








@@ -70,11 +71,12 @@ public class EntityHeaderControllerTest {







    private LayoutInflater mLayoutInflater;









    private PackageInfo mInfo;









    private EntityHeaderController mController;









    private FakeFeatureFactory mFeatureFactory;



















    @Before









    public void setUp() {









        MockitoAnnotations.initMocks(this);









        FakeFeatureFactory.setupForTest(mContext);









        mFeatureFactory = FakeFeatureFactory.setupForTest(mContext);









        mShadowContext = RuntimeEnvironment.application;









        when(mActivity.getApplicationContext()).thenReturn(mShadowContext);









        when(mContext.getApplicationContext()).thenReturn(mContext);








@@ -154,6 +156,9 @@ public class EntityHeaderControllerTest {







        } catch (Exception e) {









            // Ignore exception because the launching intent is fake.









        }









        verify(mFeatureFactory.metricsFeatureProvider).actionWithSource(mContext,









                MetricsProto.MetricsEvent.VIEW_UNKNOWN,









                MetricsProto.MetricsEvent.ACTION_OPEN_APP_SETTING);









        verify(mFragment).startActivity(any(Intent.class));









    }