Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 53f73a97: Merge "Add DatePicker, CalendarView to LayoutLib tests" into lmp-dev

Browse Source 
* commit '53f73a97542c277a519b973060dfa217849b66de':
  Add DatePicker, CalendarView to LayoutLib tests
This commit is contained in:
Deepanshu Gupta
2015-01-05 23:33:10 +00:00
committed by Android Git Automerger
parent e69e4f8b4d 53f73a9754
commit 937db7a39e
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/layoutlib/.idea/codeStyleSettings.xml generated
View File

@@ -67,9 +67,13 @@
</groups> </groups>
</arrangement> </arrangement>
</codeStyleSettings> </codeStyleSettings>
<codeStyleSettings language="XML">
<indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="4" />
</indentOptions>
</codeStyleSettings>
</value> </value>
</option> </option>
<option name="USE_PER_PROJECT_SETTINGS" value="true" /> <option name="USE_PER_PROJECT_SETTINGS" value="true" />
</component> </component>
</project> </project>

6
tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/layout/layout.xml
View File

@@ -8,4 +8,10 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Some text"/> android:text="Some text"/>
<DatePicker
android:layout_width="100dp"
android:layout_height="100dp"/>
<CalendarView
android:layout_width="100dp"
android:layout_height="100dp"/>
</LinearLayout> </LinearLayout>