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

Commit 5653337b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Change enter phone number layout for Smart forwarding" into main

parents 23f55502 86fc424e

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -676,6 +676,8 @@ 
    <string name="add">Add</string>

    <!-- Button label for remove action [CHAR LIMIT=20] -->

    <string name="remove">Remove</string>

    <!-- Button label for generic process action [CHAR LIMIT=20] -->

    <string name="process">Process</string>









    <!-- Title of the Settings activity shown within the application itself. -->









    <string name="settings_label">Settings</string>

























res/xml/smart_forwarding_mdn_handler.xml



+10
−15






























Original line number
Diff line number
Diff line









<?xml version="1.0" encoding="utf-8"?>



















<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"









                android:layout_width="match_parent"









                android:layout_height="match_parent">



















    <fragment android:id="@+id/fragment_settings"









            android:layout_width="match_parent"









            android:layout_height="match_parent"









            android:layout_above="@+id/cancel"









            android:layout_height="wrap_content"









            android:name="com.android.settings.sim.smartForwarding.MDNHandlerHeaderFragment"









            android:layout_marginBottom="15dp" />



















    <Button android:id="@+id/process"









            android:layout_width="wrap_content"









            android:layout_height="wrap_content"









            android:layout_alignParentBottom="true"









            android:layout_alignParentRight="true"









            android:layout_margin="5dip"









            android:text="process" />



















    <Button android:id="@+id/cancel"









    <include









            layout="@layout/two_buttons_panel"









            android:id="@+id/control_buttons_panel"









            android:layout_width="wrap_content"









            android:layout_height="wrap_content"









            android:layout_alignParentBottom="true"









            android:layout_margin="5dip"









            android:text="cancel" />









            android:layout_height="80dp"









            android:layout_marginLeft="?android:attr/listPreferredItemPaddingStart"









            android:layout_marginRight="?android:attr/listPreferredItemPaddingEnd"









            android:layout_below="@+id/fragment_settings" />



















</RelativeLayout>








 No newline at end of file
























res/xml/smart_forwarding_switch.xml



+3
−1






























Original line number
Diff line number
Diff line









<?xml version="1.0" encoding="utf-8"?>



















<PreferenceScreen









    xmlns:android="http://schemas.android.com/apk/res/android"









    android:key="smart_forwarding_preference"








@@ -5,7 +7,7 @@

















      <SwitchPreferenceCompat









          android:key="smart_forwarding_switch"









          android:title="Smart forwarding"









          android:title="@string/smart_forwarding_title"









          android:summaryOff="@string/smart_forwarding_summary_disabled"









          android:summaryOn="@string/smart_forwarding_summary_enabled"









          android:disableDependentsState="true" />
































src/com/android/settings/sim/smartForwarding/MDNHandlerFragment.java



+4
−2






























Original line number
Diff line number
Diff line







@@ -43,12 +43,14 @@ public class MDNHandlerFragment extends Fragment implements Instrumentable {







        getActivity().getActionBar().setTitle(









                getResources().getString(R.string.smart_forwarding_input_mdn_title));



















        Button processBtn = view.findViewById(R.id.process);









        Button processBtn = view.findViewById(R.id.right_button);









        processBtn.setText(R.string.process);









        processBtn.setOnClickListener((View v)-> {









            pressButtonOnClick();









        });



















        Button cancelBtn = view.findViewById(R.id.cancel);









        Button cancelBtn = view.findViewById(R.id.left_button);









        cancelBtn.setText(R.string.cancel);









        cancelBtn.setOnClickListener((View v)-> {









            switchToMainFragment(true);









        });