am ef895ed2: am 5029b7a9: am ebe496ea: Merge "Fixed a crash when loading Bluetooth Settings." into lmp-dev

* commit 'ef895ed21e8b0b3a9b85b1689e0095a4fa9389e6':
  Fixed a crash when loading Bluetooth Settings.
This commit is contained in:
PauloftheWest
2014-09-03 09:12:33 +00:00
committed by Android Git Automerger
3 changed files with 77 additions and 1 deletions

View File

@@ -196,6 +196,29 @@
<item name="android:textColor">?android:attr/colorAccent</item>
</style>
<style name="bt_item">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginTop">8dip</item>
<item name="android:layout_marginStart">16dip</item>
<item name="android:layout_marginEnd">16dip</item>
<item name="android:orientation">vertical</item>
<item name="android:gravity">start</item>
</style>
<style name="bt_item_label">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textSize">14sp</item>
<item name="android:textAlignment">viewStart</item>
</style>
<style name="bt_item_edit_content">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textSize">18sp</item>
</style>
<style name="wifi_item">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>