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

Commit 5a195fed authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7779990 from 51f952f4 to tm-release 

Change-Id: Ie22fde42d6ae8b9192a4cfceab3dfc9894d9b288
parents 44f5c082 51f952f4

res/values-te/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ 
    <string name="notification_copy_files_converted_title" msgid="6916768494891833365">"కొన్ని పైల్‌లు మార్చబడ్డాయి"</string>

    <string name="open_external_dialog_request" msgid="8173558471322861268">"<xliff:g id="APPNAME"><b>^1</b></xliff:g>కి <xliff:g id="STORAGE"><i>^3</i></xliff:g>లో <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> డైరెక్టరీ యాక్సెస్‌ను మంజూరు చేయాలా?"</string>

    <string name="open_external_dialog_request_primary_volume" msgid="2240992164087948176">"<xliff:g id="APPNAME"><b>^1</b></xliff:g>కి <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> డైరెక్టరీ యాక్సెస్‌ను మంజూరు చేయాలా?"</string>

    <string name="open_external_dialog_root_request" msgid="6776729293982633">"<xliff:g id="STORAGE"><i>^2</i></xliff:g>లోని ఫోటోలు మరియు వీడియోలతో సహా మీ డేటా యాక్సెస్‌ను <xliff:g id="APPNAME"><b>^1</b></xliff:g>కి మంజూరు చేయాలా?"</string>

    <string name="open_external_dialog_root_request" msgid="6776729293982633">"<xliff:g id="STORAGE"><i>^2</i></xliff:g>లోని ఫోటోలు, వీడియోలతో సహా మీ డేటా యాక్సెస్‌ను <xliff:g id="APPNAME"><b>^1</b></xliff:g>కి మంజూరు చేయాలా?"</string>

    <string name="allow" msgid="1275746941353040309">"అనుమతించు"</string>

    <string name="deny" msgid="5127201668078153379">"తిరస్కరించు"</string>

    <plurals name="elements_selected" formatted="false" msgid="4448165978637163692">
@@ -275,7 +275,7 @@ 
    <string name="directory_blocked_header_subtitle" msgid="2829150911849033408">"మీ గోప్యతను కాపాడుకోవటానికి, మరొక ఫోల్డర్‌ను ఎంచుకోండి"</string>

    <string name="create_new_folder_button" msgid="8859613309559794890">"కొత్త ఫోల్డర్‌ని సృష్టించు"</string>

    <string name="search_bar_hint" msgid="4517366509897977321">"ఈ ఫోన్‌లో వెతకండి"</string>

    <string name="delete_search_history" msgid="2202015025607694515">"శోధన చరిత్ర <xliff:g id="TEXT">%1$s</xliff:g>ను తొలగించండి"</string>

    <string name="delete_search_history" msgid="2202015025607694515">"సెర్చ్ హిస్టరీ <xliff:g id="TEXT">%1$s</xliff:g>‌ను తొలగించండి"</string>

    <string name="personal_tab" msgid="3878576287868528503">"వ్యక్తిగత డైరెక్టరీ"</string>

    <string name="work_tab" msgid="7265359366883747413">"కార్యాలయ డైరెక్టరీ"</string>

    <string name="a11y_work" msgid="7504431382825242153">"ఆఫీసు"</string>

res/values-v31/colors.xml

+2 −3
Original line number Diff line number Diff line
@@ -33,10 +33,9 @@ 
  <color name="profile_tab_selected_color">@*android:color/system_accent1_100

  </color>

  <!-- accent 100 -->

  <color name="profile_tab_default_color">@*android:color/system_neutral1_100

  <color name="profile_tab_default_color">@*android:color/system_neutral1_10

  </color>

  <!-- neutral 100 -->



  <!-- neutral 10 -->

  <color name="fragment_pick_inactive_button_color">

    @*android:color/system_neutral1_100

  </color>

res/values-v31/dimens.xml

+4 −0
Original line number Diff line number Diff line
@@ -18,7 +18,11 @@ 
    <dimen name="action_bar_margin">0dp</dimen>

    <dimen name="button_corner_radius">20dp</dimen>

    <dimen name="tab_selector_indicator_height">0dp</dimen>

    <dimen name="tab_height">36dp</dimen>

    <dimen name="tab_container_height">48dp</dimen>

    <dimen name="profile_tab_padding">20dp</dimen>

    <dimen name="profile_tab_margin_top">16dp</dimen>

    <dimen name="profile_tab_margin_side">4dp</dimen>

    <dimen name="cross_profile_button_corner_radius">30dp</dimen>

    <dimen name="cross_profile_button_stroke_width">1dp</dimen>

    <dimen name="cross_profile_button_message_margin_top">16dp</dimen>

src/com/android/documentsui/ProfileTabs.java

+15 −1
Original line number Diff line number Diff line
@@ -105,6 +105,15 @@ public class ProfileTabs implements ProfileTabsAddons { 
        // Material next changes apply only for version S or greater

        if(VersionUtils.isAtLeastS()) {

            mTabSeparator.setVisibility(View.GONE);

            int tabContainerHeightInDp = (int)mTabsContainer.getContext().getResources().

                getDimension(R.dimen.tab_container_height);

            mTabsContainer.getLayoutParams().height = tabContainerHeightInDp;

            ViewGroup.MarginLayoutParams tabContainerMarginLayoutParams =

                (ViewGroup.MarginLayoutParams) mTabsContainer.getLayoutParams();

            int tabContainerMarginTop = (int)mTabsContainer.getContext().getResources().

                getDimension(R.dimen.profile_tab_margin_top);

            tabContainerMarginLayoutParams.setMargins(0, tabContainerMarginTop, 0, 0);

            mTabsContainer.requestLayout();

            for (int i = 0; i < mTabs.getTabCount(); i++) {



                // Tablayout holds a view that contains the individual tab
@@ -113,7 +122,12 @@ public class ProfileTabs implements ProfileTabsAddons { 
                // Get individual tab to set the style

                ViewGroup.MarginLayoutParams marginLayoutParams =

                        (ViewGroup.MarginLayoutParams) tab.getLayoutParams();

                marginLayoutParams.setMargins(10, 20, 10, 20);

                int tabMarginSide = (int)mTabsContainer.getContext().getResources().

                    getDimension(R.dimen.profile_tab_margin_side);

                marginLayoutParams.setMargins(tabMarginSide, 0, tabMarginSide, 0);

                int tabHeightInDp = (int)mTabsContainer.getContext().getResources().

                    getDimension(R.dimen.tab_height);

                tab.getLayoutParams().height = tabHeightInDp;

                tab.requestLayout();

                tab.setBackgroundResource(R.drawable.tab_border_rounded);

            }