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

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

Merge "USB: add help link config flag from Settings"

parents 7ad5f5a2 8e49d1bb

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -5567,4 +5567,7 @@ 


    <!-- Determines whether SafetyCenter feature is enabled. -->

    <bool name="config_enableSafetyCenter">true</bool>



    <!-- Flag indicating if help links for Settings app should be enabled. -->

    <bool name="config_settingsHelpLinksEnabled">false</bool>

</resources>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2338,6 +2338,7 @@ 
  <java-symbol type="string" name="nas_upgrade_notification_disable_action" />

  <java-symbol type="string" name="nas_upgrade_notification_learn_more_action" />

  <java-symbol type="string" name="nas_upgrade_notification_learn_more_content" />

  <java-symbol type="bool" name="config_settingsHelpLinksEnabled" />



  <!-- ImfTest -->

  <java-symbol type="layout" name="auto_complete_list" />

packages/SystemUI/res/layout/contaminant_dialog.xml

+2 −1
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ 


        <TextView

            android:id="@+id/learnMore"

            style="@style/USBContaminant.UserAction" />

            style="@style/USBContaminant.UserAction"

            android:visibility="gone" />



        <View

            android:layout_width="match_parent"

packages/SystemUI/src/com/android/systemui/usb/UsbContaminantActivity.java

+4 −0
Original line number Diff line number Diff line
@@ -70,6 +70,10 @@ public class UsbContaminantActivity extends Activity implements View.OnClickList 
        mEnableUsb.setText(getString(R.string.usb_disable_contaminant_detection));

        mGotIt.setText(getString(R.string.got_it));

        mLearnMore.setText(getString(R.string.learn_more));

        if (getResources().getBoolean(

                com.android.internal.R.bool.config_settingsHelpLinksEnabled)) {

            mLearnMore.setVisibility(View.VISIBLE);

        }



        mEnableUsb.setOnClickListener(this);

        mGotIt.setOnClickListener(this);