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

Commit db1acf52 authored by Xavier Ducrohet's avatar Xavier Ducrohet Committed by Android Git Automerger
Browse files

am 1175ef7e: Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread 

* commit '1175ef7e':
  LayoutLib: Adapt the HC layoutlib to GB. do not merge.
parents 86e43034 1175ef7e

tools/layoutlib/bridge/resources/bars/action_bar.xml

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

	<ImageView

			android:layout_height="wrap_content"

			android:layout_width="wrap_content"/>

	<TextView

			android:layout_width="wrap_content"

			android:layout_height="wrap_content"/>

</merge>

tools/layoutlib/bridge/resources/bars/mdpi/ic_sysbar_back_default.png

deleted100644 → 0
−3.81 KiB
Loading image diff...

tools/layoutlib/bridge/resources/bars/mdpi/ic_sysbar_home_default.png

deleted100644 → 0
−3.9 KiB
Loading image diff...

tools/layoutlib/bridge/resources/bars/mdpi/ic_sysbar_recent_default.png

deleted100644 → 0
−3.07 KiB
Loading image diff...

tools/layoutlib/bridge/resources/bars/tablet_system_bar.xml

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

	<ImageView

			android:layout_height="wrap_content"

			android:layout_width="wrap_content"/>

	<ImageView

			android:layout_height="wrap_content"

			android:layout_width="wrap_content"/>

	<ImageView

			android:layout_height="wrap_content"

			android:layout_width="wrap_content"/>

	<TextView

			android:layout_width="wrap_content"

			android:layout_height="wrap_content"

			android:layout_weight="1"/>

	<ImageView

			android:layout_height="wrap_content"

			android:layout_width="wrap_content"/>

	<ImageView

			android:layout_height="wrap_content"

			android:layout_width="wrap_content"

			android:layout_marginLeft="3dip"

			android:layout_marginRight="15dip"/>

</merge>