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

Commit 03b958ae authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Put accessibility labels for tabs." into rvc-dev am: dd7b1691 am: 23954cdf 

Change-Id: Ia2b5e6fd7efa7546397b2909eae396188cccc412
parents 4a7ec0c0 23954cdf

core/java/com/android/internal/app/ResolverActivity.java

+7 −0
Original line number Diff line number Diff line
@@ -1608,6 +1608,8 @@ public class ResolverActivity extends Activity implements 
    }



    private void resetTabsHeaderStyle(TabWidget tabWidget) {

        String workContentDescription = getString(R.string.resolver_work_tab_accessibility);

        String personalContentDescription = getString(R.string.resolver_personal_tab_accessibility);

        for (int i = 0; i < tabWidget.getChildCount(); i++) {

            View tabView = tabWidget.getChildAt(i);

            TextView title = tabView.findViewById(android.R.id.title);
@@ -1615,6 +1617,11 @@ public class ResolverActivity extends Activity implements 
            title.setTextColor(getAttrColor(this, android.R.attr.textColorTertiary));

            title.setTextSize(TypedValue.COMPLEX_UNIT_PX,

                    getResources().getDimension(R.dimen.resolver_tab_text_size));

            if (title.getText().equals(getString(R.string.resolver_personal_tab))) {

                tabView.setContentDescription(personalContentDescription);

            } else if (title.getText().equals(getString(R.string.resolver_work_tab))) {

                tabView.setContentDescription(workContentDescription);

            }

        }

    }

core/res/res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -5428,6 +5428,11 @@ 
    <!-- Label of a tab on a screen. A user can tap this tab to switch to the 'Work' view (that shows their work content) if they have a work profile on their device. [CHAR LIMIT=NONE] -->

    <string name="resolver_work_tab">Work</string>



    <!-- Accessibility label for the personal tab button. [CHAR LIMIT=NONE] -->

    <string name="resolver_personal_tab_accessibility">Personal view</string>

    <!-- Accessibility label for the work tab button. [CHAR LIMIT=NONE] -->

    <string name="resolver_work_tab_accessibility">Work view</string>



    <!-- Title of a screen. This text lets the user know that their IT admin doesn't allow them to share this specific content with work apps. [CHAR LIMIT=NONE] -->

    <string name="resolver_cant_share_with_work_apps">Can\u2019t share this with work apps</string>

    <!-- Error message. This text is explaining that the user's IT admin doesn't allow this specific content to be shared with apps in the work profile. [CHAR LIMIT=NONE] -->

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -3885,7 +3885,9 @@ 


  <!-- Intent resolver and share sheet -->

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

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

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

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

  <java-symbol type="id" name="stub" />

  <java-symbol type="id" name="resolver_empty_state" />

  <java-symbol type="id" name="resolver_empty_state_icon" />