diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-01-06 22:22:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-06 22:22:53 +0000 |
| commit | 229ce66583a51baabf83fec4d0c42af0d3ecba38 (patch) | |
| tree | fee64718aec708471241d1add51e095586b88faa /tools | |
| parent | b187106c5397072b6ae26061cec847ec9343caee (diff) | |
| parent | 937db7a39ef6f5e88a936f78a729f9578123e60b (diff) | |
| download | frameworks_base-229ce66583a51baabf83fec4d0c42af0d3ecba38.zip frameworks_base-229ce66583a51baabf83fec4d0c42af0d3ecba38.tar.gz frameworks_base-229ce66583a51baabf83fec4d0c42af0d3ecba38.tar.bz2 | |
am 937db7a3: am 53f73a97: Merge "Add DatePicker, CalendarView to LayoutLib tests" into lmp-dev
* commit '937db7a39ef6f5e88a936f78a729f9578123e60b':
Add DatePicker, CalendarView to LayoutLib tests
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/.idea/codeStyleSettings.xml | 8 | ||||
| -rw-r--r-- | tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/layout/layout.xml | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/tools/layoutlib/.idea/codeStyleSettings.xml b/tools/layoutlib/.idea/codeStyleSettings.xml index b324213..a04e440 100644 --- a/tools/layoutlib/.idea/codeStyleSettings.xml +++ b/tools/layoutlib/.idea/codeStyleSettings.xml @@ -67,9 +67,13 @@ </groups> </arrangement> </codeStyleSettings> + <codeStyleSettings language="XML"> + <indentOptions> + <option name="CONTINUATION_INDENT_SIZE" value="4" /> + </indentOptions> + </codeStyleSettings> </value> </option> <option name="USE_PER_PROJECT_SETTINGS" value="true" /> </component> -</project> - +</project>
\ No newline at end of file diff --git a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/layout/layout.xml b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/layout/layout.xml index 2704c07..b8ec5661 100644 --- a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/layout/layout.xml +++ b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/layout/layout.xml @@ -8,4 +8,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Some text"/> + <DatePicker + android:layout_width="100dp" + android:layout_height="100dp"/> + <CalendarView + android:layout_width="100dp" + android:layout_height="100dp"/> </LinearLayout>
\ No newline at end of file |