LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "fix density sample to state density type rather than screen size" into honeycomb

Browse Source
This commit is contained in:
Scott Main
2011-03-16 12:03:07 -07:00
committed by Android (Google) Code Review
parent b058af052e 882b22d698
commit 62c9b6cb14
11 changed files with 4 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/ApiDemos/res/values-long/strings.xml → samples/ApiDemos/res/values-hdpi/strings.xml
View File

@@ -15,5 +15,5 @@
-->
<resources>
<string name="density_title">Density: Long</string>
<string name="density_title">Density: High</string>
</resources>

19
samples/ApiDemos/res/values-large-notlong/strings.xml
View File

@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2007 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<string name="density_title">Density: Large NotLong</string>
</resources>

19
samples/ApiDemos/res/values-large/strings.xml
View File

@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2007 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<string name="density_title">Density: Large</string>
</resources>

2
samples/ApiDemos/res/values-small/strings.xml → samples/ApiDemos/res/values-ldpi/strings.xml
View File

@@ -15,5 +15,5 @@
-->
<resources>
<string name="density_title">Density: Small</string>
<string name="density_title">Density: Low</string>
</resources>

2
samples/ApiDemos/res/values-normal/strings.xml → samples/ApiDemos/res/values-mdpi/strings.xml
View File

@@ -15,5 +15,5 @@
-->
<resources>
<string name="density_title">Density: Normal</string>
<string name="density_title">Density: Medium</string>
</resources>

19
samples/ApiDemos/res/values-normal-long/strings.xml
View File

@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2007 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<string name="density_title">Density: Normal Long</string>
</resources>

19
samples/ApiDemos/res/values-normal-notlong/strings.xml
View File

@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2007 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<string name="density_title">Density: Normal NotLong</string>
</resources>

19
samples/ApiDemos/res/values-notlong/strings.xml
View File

@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2007 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<string name="density_title">Density: NotLong</string>
</resources>

19
samples/ApiDemos/res/values-small-long/strings.xml
View File

@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2007 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<string name="density_title">Density: Small Long</string>
</resources>

19
samples/ApiDemos/res/values-small-notlong/strings.xml
View File

@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2007 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<string name="density_title">Density: Small NotLong</string>
</resources>

2
samples/ApiDemos/res/values-large-long/strings.xml → samples/ApiDemos/res/values-xhdpi/strings.xml
View File

@@ -15,5 +15,5 @@
-->
<resources>
<string name="density_title">Density: Large Long</string>
<string name="density_title">Density: Extra High</string>
</resources>