android/pipIrrApp.git

			@@ -6,12 +6,10 @@
			android:background="@color/bg_color"
			android:orientation="vertical">

			<com.dayu.pipirrapp.view.TitleBar
			<include
			android:id="@+id/title"
			android:layout_width="match_parent"
			android:layout_height="45dp"
			android:layout_alignParentTop="true"
			app:centerText="修改密码" />
			layout="@layout/top_title" />



			<EditText
			@@ -25,9 +23,12 @@

			<TextView
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:layout_height="40dp"
			android:gravity="bottom"
			android:paddingLeft="20dp"
			android:paddingBottom="3dp"
			android:textColor="@color/grey"

			android:text="密码为6-12位数字或字母"
			/>

			<EditText
			@@ -51,17 +52,14 @@
			<TextView
			android:layout_width="match_parent"
			android:layout_height="@dimen/item_height"
			android:background="@drawable/ic_blue_background"
			android:gravity="center"
			android:layout_marginRight="40dp"
			android:layout_marginLeft="40dp"
			android:layout_marginTop="100dp"
			android:layout_marginRight="40dp"
			android:background="@drawable/ic_blue_background"
			android:gravity="center"
			android:text="修改"
			android:textColor="@color/white"
			android:textSize="@dimen/common_btn_text_size" />





			</LinearLayout>