Improve ui of calculator and fix issue in high dpi screens (23a11219) · Commits · e / os / android_packages_apps_ExactCalculator

res/drawable/ic_del.xml

+8 −11

Original line number	Diff line number	Diff line
		@@ -14,16 +14,13 @@
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<vector
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:height="24dp"
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:viewportHeight="24"
		android:viewportWidth="24">
		android:height="24dp"
		android:viewportWidth="24"
		android:viewportHeight="24">
		<path
		android:fillColor="@color/calculator_accent_color"
		android:pathData="M19,15.59L17.59,17L14,13.41L10.41,17L9,15.59L12.59,12L9,8.41
		L10.41,7L14,10.59L17.59,7L19,8.41L15.41,12L19,15.59M22,3A2,2 0 0,1 24,5V19A2,2 0 0,1 22,21
		H7C6.31,21 5.77,20.64 5.41,20.11L0,12L5.41,3.88C5.77,3.35 6.31,3 7,3H22M22,5
		H7L2.28,12L7,19H22V5Z" />
		android:pathData="M22,3H7C6.31,3 5.77,3.35 5.41,3.88L0,12L5.41,20.11C5.77,20.64 6.31,21 7,21H22C23.1,21 24,20.1 24,19V5C24,3.9 23.1,3 22,3ZM22,19H7.07L2.4,12L7.06,5H22V19ZM10.41,17L14,13.41L17.59,17L19,15.59L15.41,12L19,8.41L17.59,7L14,10.59L10.41,7L9,8.41L12.59,12L9,15.59L10.41,17Z"
		android:fillColor="@color/calculator_accent_color"/>
		</vector>

res/layout-land/pad_advanced_3x5.xml

+21 −45

Original line number	Diff line number	Diff line
		@@ -21,12 +21,12 @@
		android:id="@+id/pad_advanced"
		style="@style/PadLayoutStyle.Advanced"
		android:background="@color/pad_advanced_background_color"
		app:rowCount="5"
		app:rowCount="4"
		app:columnCount="3">

		<com.android.calculator2.HapticButton
		android:id="@+id/toggle_inv"
		style="@style/PadButtonStyle.Advanced.Text"
		style="@style/PadButtonStyle.Advanced.Text.E"
		android:background="@drawable/pad_button_inverse_background"
		android:contentDescription="@string/desc_inv_off"
		android:text="@string/inv"
		@@ -35,23 +35,15 @@

		<com.android.calculator2.HapticButton
		android:id="@+id/toggle_mode"
		style="@style/PadButtonStyle.Advanced.Text"
		style="@style/PadButtonStyle.Advanced.Text.E"
		android:contentDescription="@string/desc_switch_deg"
		android:text="@string/mode_deg"
		app:layout_row="0"
		app:layout_column="1" />

		<com.android.calculator2.HapticButton
		android:id="@+id/op_pct"
		style="@style/PadButtonStyle.Advanced"
		android:contentDescription="@string/desc_op_pct"
		android:text="@string/op_pct"
		app:layout_row="0"
		app:layout_column="2" />

		<com.android.calculator2.HapticButton
		android:id="@+id/fun_sin"
		style="@style/PadButtonStyle.Advanced"
		style="@style/PadButtonStyle.Advanced.E"
		android:contentDescription="@string/desc_fun_sin"
		android:text="@string/fun_sin"
		app:layout_row="1"
		@@ -59,7 +51,7 @@

		<com.android.calculator2.HapticButton
		android:id="@+id/fun_arcsin"
		style="@style/PadButtonStyle.Advanced"
		style="@style/PadButtonStyle.Advanced.E"
		android:contentDescription="@string/desc_fun_arcsin"
		android:fontFamily="sans-serif-medium"
		android:text="@string/fun_arcsin"
		@@ -69,7 +61,7 @@

		<com.android.calculator2.HapticButton
		android:id="@+id/fun_cos"
		style="@style/PadButtonStyle.Advanced"
		style="@style/PadButtonStyle.Advanced.E"
		android:contentDescription="@string/desc_fun_cos"
		android:text="@string/fun_cos"
		app:layout_row="1"
		@@ -77,7 +69,7 @@

		<com.android.calculator2.HapticButton
		android:id="@+id/fun_arccos"
		style="@style/PadButtonStyle.Advanced"
		style="@style/PadButtonStyle.Advanced.E"
		android:contentDescription="@string/desc_fun_arccos"
		android:fontFamily="sans-serif-medium"
		android:text="@string/fun_arccos"
		@@ -87,7 +79,7 @@

		<com.android.calculator2.HapticButton
		android:id="@+id/fun_tan"
		style="@style/PadButtonStyle.Advanced"
		style="@style/PadButtonStyle.Advanced.E"
		android:contentDescription="@string/desc_fun_tan"
		android:text="@string/fun_tan"
		app:layout_row="1"
		@@ -95,7 +87,7 @@

		<com.android.calculator2.HapticButton
		android:id="@+id/fun_arctan"
		style="@style/PadButtonStyle.Advanced"
		style="@style/PadButtonStyle.Advanced.E"
		android:contentDescription="@string/desc_fun_arctan"
		android:fontFamily="sans-serif-medium"
		android:text="@string/fun_arctan"
		@@ -105,7 +97,7 @@

		<com.android.calculator2.HapticButton
		android:id="@+id/fun_ln"
		style="@style/PadButtonStyle.Advanced"
		style="@style/PadButtonStyle.Advanced.E"
		android:contentDescription="@string/desc_fun_ln"
		android:text="@string/fun_ln"
		app:layout_row="2"
		@@ -113,7 +105,7 @@

		<com.android.calculator2.HapticButton
		android:id="@+id/fun_exp"
		style="@style/PadButtonStyle.Advanced"
		style="@style/PadButtonStyle.Advanced.E"
		android:contentDescription="@string/desc_fun_exp"
		android:fontFamily="sans-serif-medium"
		android:text="@string/fun_exp"
		@@ -123,7 +115,7 @@

		<com.android.calculator2.HapticButton
		android:id="@+id/fun_log"
		style="@style/PadButtonStyle.Advanced"
		style="@style/PadButtonStyle.Advanced.E"
		android:contentDescription="@string/desc_fun_log"
		android:text="@string/fun_log"
		app:layout_row="2"
		@@ -131,7 +123,7 @@

		<com.android.calculator2.HapticButton
		android:id="@+id/fun_10pow"
		style="@style/PadButtonStyle.Advanced"
		style="@style/PadButtonStyle.Advanced.E"
		android:contentDescription="@string/desc_fun_10pow"
		android:fontFamily="sans-serif-medium"
		android:text="@string/fun_10pow"
		@@ -141,7 +133,7 @@

		<com.android.calculator2.HapticButton
		android:id="@+id/op_fact"
		style="@style/PadButtonStyle.Advanced"
		style="@style/PadButtonStyle.Advanced.E"
		android:contentDescription="@string/desc_op_fact"
		android:text="@string/op_fact"
		app:layout_row="2"
		@@ -149,7 +141,7 @@

		<com.android.calculator2.HapticButton
		android:id="@+id/const_pi"
		style="@style/PadButtonStyle.Advanced"
		style="@style/PadButtonStyle.Advanced.E"
		android:contentDescription="@string/desc_const_pi"
		android:text="@string/const_pi"
		app:layout_row="3"
		@@ -157,7 +149,7 @@

		<com.android.calculator2.HapticButton
		android:id="@+id/const_e"
		style="@style/PadButtonStyle.Advanced"
		style="@style/PadButtonStyle.Advanced.E"
		android:contentDescription="@string/desc_const_e"
		android:text="@string/const_e"
		app:layout_row="3"
		@@ -165,44 +157,28 @@

		<com.android.calculator2.HapticButton
		android:id="@+id/op_pow"
		style="@style/PadButtonStyle.Advanced"
		style="@style/PadButtonStyle.Advanced.E"
		android:contentDescription="@string/desc_op_pow"
		android:text="@string/op_pow"
		app:layout_row="3"
		app:layout_column="2" />

		<com.android.calculator2.HapticButton
		android:id="@+id/lparen"
		style="@style/PadButtonStyle.Advanced"
		android:contentDescription="@string/desc_lparen"
		android:text="@string/lparen"
		app:layout_row="4"
		app:layout_column="0" />

		<com.android.calculator2.HapticButton
		android:id="@+id/rparen"
		style="@style/PadButtonStyle.Advanced"
		android:contentDescription="@string/desc_rparen"
		android:text="@string/rparen"
		app:layout_row="4"
		app:layout_column="1" />

		<com.android.calculator2.HapticButton
		android:id="@+id/op_sqrt"
		style="@style/PadButtonStyle.Advanced"
		style="@style/PadButtonStyle.Advanced.E"
		android:contentDescription="@string/desc_op_sqrt"
		android:text="@string/op_sqrt"
		app:layout_row="4"
		app:layout_row="0"
		app:layout_column="2" />

		<com.android.calculator2.HapticButton
		android:id="@+id/op_sqr"
		style="@style/PadButtonStyle.Advanced"
		style="@style/PadButtonStyle.Advanced.E"
		android:contentDescription="@string/desc_op_sqr"
		android:fontFamily="sans-serif-medium"
		android:text="@string/op_sqr"
		android:visibility="gone"
		app:layout_row="4"
		app:layout_row="0"
		app:layout_column="2" />

		</androidx.gridlayout.widget.GridLayout>

res/layout/activity_calculator_land.xml

+1 −2

Original line number	Diff line number	Diff line
		@@ -36,8 +36,7 @@
		android:layout_height="0dip"
		android:layout_weight="1">

		<include layout="@layout/pad_numeric" />
		<include layout="@layout/pad_operator" />
		<include layout="@layout/pad_main" />
		<include layout="@layout/pad_advanced" />

		</LinearLayout>

res/layout/activity_calculator_port.xml

+1 −2

Original line number	Diff line number	Diff line
		@@ -39,8 +39,7 @@
		android:layout_width="match_parent"
		android:layout_height="match_parent">

		<include layout="@layout/pad_numeric" />
		<include layout="@layout/pad_operator" />
		<include layout="@layout/pad_main" />

		</LinearLayout>

res/layout/activity_calculator_tablet_port.xml

+1 −2

Original line number	Diff line number	Diff line
		@@ -35,8 +35,7 @@
		android:layout_height="0dip"
		android:layout_weight="500">

		<include layout="@layout/pad_numeric"/>
		<include layout="@layout/pad_operator" />
		<include layout="@layout/pad_main"/>

		</LinearLayout>