diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml index 10af0a7b63..2203334f1e 100644 --- a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml +++ b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml @@ -75,12 +75,14 @@ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt index 58bfe45c84..eb4a4ce4a7 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt @@ -44,8 +44,8 @@ class PncActionsView @JvmOverloads constructor( private var mAutoPilotStatusInfo: AutopilotStatusInfo? = null private val bgResources: Int - private val topMargin: Int - private val txtSize: Int + private val topMargin: Float + private val txtSize: Float init { LayoutInflater.from(context).inflate(R.layout.view_pnc_actions, this, true) @@ -54,13 +54,13 @@ class PncActionsView @JvmOverloads constructor( R.styleable.PncActionsView_background_resource, R.drawable.pnc_actions_bg ) - topMargin = a.getResourceId( + topMargin = a.getDimension( R.styleable.PncActionsView_pnc_top_margin, - resources.getDimension(R.dimen.dp_30).toInt() + resources.getDimension(R.dimen.dp_30) ) - txtSize = a.getResourceId( + txtSize = a.getDimension( R.styleable.PncActionsView_pnc_size, - resources.getDimension(R.dimen.dp_34).toInt() + resources.getDimension(R.dimen.dp_34) ) a.recycle() } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml index 4e1a2e3835..4bcc4c4dfd 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml @@ -76,8 +76,8 @@ - - + + \ No newline at end of file