diff options
| author | Qiwen Zhao <zhao@google.com> | 2014-09-26 17:50:58 -0700 |
|---|---|---|
| committer | Qiwen Zhao <zhao@google.com> | 2014-09-26 17:50:58 -0700 |
| commit | aecae9df1191c61759803cad7f33707d8f52f6f0 (patch) | |
| tree | 886542dee663315d805ea0efb2d54d7c7cf69c28 | |
| parent | dc197f2555efa36b4b621fe0e781b017be19a8e8 (diff) | |
| download | android-21-aecae9df1191c61759803cad7f33707d8f52f6f0.tar.gz | |
Import L SDK from git_lmp-sdk-release build 1471336
http://android-build/builds/git_lmp-sdk-release-linux-sdk_x86-sdk/1471336/sdk-repo-linux-platforms-1471336.zip
http://android-build/builds/git_lmp-sdk-release-linux-sdk_x86-sdk/1471336/android_system.jar
build.prop & source.properties have been modified to make this appear
as API 21
android_system.jar has been submitted as android.jar
107 files changed, 380 insertions, 64 deletions
diff --git a/android.jar b/android.jar Binary files differindex 0a671a9b..a9d58a27 100644 --- a/android.jar +++ b/android.jar @@ -1,15 +1,15 @@ # begin build properties # autogenerated by buildinfo.sh -ro.build.id=LSW88 -ro.build.display.id=sdk_x86-eng 5.0 LSW88 1469178 test-keys -ro.build.version.incremental=1469178 +ro.build.id=LSW88C +ro.build.display.id=sdk_x86-eng 5.0 LSW88C 1471336 test-keys +ro.build.version.incremental=1471336 ro.build.version.sdk=21 ro.build.version.codename=REL ro.build.version.all_codenames=REL ro.build.version.release=5.0 -ro.build.date=Fri Sep 26 13:48:31 UTC 2014 -ro.build.date.utc=1411739311 +ro.build.date=Fri Sep 26 23:29:00 UTC 2014 +ro.build.date.utc=1411774140 ro.build.type=eng ro.build.tags=test-keys ro.product.model=Android SDK built for x86 @@ -27,9 +27,9 @@ ro.wifi.channels= ro.board.platform= # ro.build.product is obsolete; use ro.product.device # Do not try to parse description, fingerprint, or thumbprint -ro.build.description=sdk_x86-eng 5.0 LSW88 1469178 test-keys -ro.build.fingerprint=generic_x86/sdk_x86/generic_x86:5.0/LSW88/1469178:eng/test-keys -ro.build.thumbprint=5.0/LSW88/1469178:eng/test-keys +ro.build.description=sdk_x86-eng 5.0 LSW88C 1471336 test-keys +ro.build.fingerprint=generic_x86/sdk_x86/generic_x86:5.0/LSW88C/1471336:eng/test-keys +ro.build.thumbprint=5.0/LSW88C/1471336:eng/test-keys ro.build.characteristics=default # end build properties # diff --git a/data/fonts/AndroidClock.ttf b/data/fonts/AndroidClock.ttf Binary files differindex 41ff05e9..7a448f87 100644 --- a/data/fonts/AndroidClock.ttf +++ b/data/fonts/AndroidClock.ttf diff --git a/data/fonts/AndroidClock_Highlight.ttf b/data/fonts/AndroidClock_Highlight.ttf Binary files differindex d17603b9..f93e3902 100644 --- a/data/fonts/AndroidClock_Highlight.ttf +++ b/data/fonts/AndroidClock_Highlight.ttf diff --git a/data/fonts/AndroidClock_Solid.ttf b/data/fonts/AndroidClock_Solid.ttf Binary files differindex d17603b9..f93e3902 100644 --- a/data/fonts/AndroidClock_Solid.ttf +++ b/data/fonts/AndroidClock_Solid.ttf diff --git a/data/fonts/CarroisGothicSC-Regular.ttf b/data/fonts/CarroisGothicSC-Regular.ttf Binary files differindex e08a8bd2..40104912 100644 --- a/data/fonts/CarroisGothicSC-Regular.ttf +++ b/data/fonts/CarroisGothicSC-Regular.ttf diff --git a/data/fonts/Clockopia.ttf b/data/fonts/Clockopia.ttf Binary files differindex 2512a0ed..60d08a10 100644 --- a/data/fonts/Clockopia.ttf +++ b/data/fonts/Clockopia.ttf diff --git a/data/fonts/ComingSoon.ttf b/data/fonts/ComingSoon.ttf Binary files differindex 4962e5d4..0439ca03 100644 --- a/data/fonts/ComingSoon.ttf +++ b/data/fonts/ComingSoon.ttf diff --git a/data/fonts/DancingScript-Bold.ttf b/data/fonts/DancingScript-Bold.ttf Binary files differindex a2429355..9af64b22 100644 --- a/data/fonts/DancingScript-Bold.ttf +++ b/data/fonts/DancingScript-Bold.ttf diff --git a/data/fonts/DancingScript-Regular.ttf b/data/fonts/DancingScript-Regular.ttf Binary files differindex cfc0f7c6..382b819e 100644 --- a/data/fonts/DancingScript-Regular.ttf +++ b/data/fonts/DancingScript-Regular.ttf diff --git a/data/fonts/DroidSans-Bold.ttf b/data/fonts/DroidSans-Bold.ttf Binary files differindex 802ca3ae..25a68010 100644 --- a/data/fonts/DroidSans-Bold.ttf +++ b/data/fonts/DroidSans-Bold.ttf diff --git a/data/fonts/DroidSans.ttf b/data/fonts/DroidSans.ttf Binary files differindex c653ef6b..4ce3a802 100644 --- a/data/fonts/DroidSans.ttf +++ b/data/fonts/DroidSans.ttf diff --git a/data/fonts/DroidSansFallback.ttf b/data/fonts/DroidSansFallback.ttf Binary files differindex 76d5a964..59b41c8a 100644 --- a/data/fonts/DroidSansFallback.ttf +++ b/data/fonts/DroidSansFallback.ttf diff --git a/data/fonts/DroidSansMono.ttf b/data/fonts/DroidSansMono.ttf Binary files differindex 82975f15..eff45ea1 100644 --- a/data/fonts/DroidSansMono.ttf +++ b/data/fonts/DroidSansMono.ttf diff --git a/data/fonts/MTLmr3m.ttf b/data/fonts/MTLmr3m.ttf Binary files differindex 15abe5e4..8cd8df69 100644 --- a/data/fonts/MTLmr3m.ttf +++ b/data/fonts/MTLmr3m.ttf diff --git a/data/fonts/NanumGothic.ttf b/data/fonts/NanumGothic.ttf Binary files differindex 459e2856..d18a2b45 100644 --- a/data/fonts/NanumGothic.ttf +++ b/data/fonts/NanumGothic.ttf diff --git a/data/fonts/NotoColorEmoji.ttf b/data/fonts/NotoColorEmoji.ttf Binary files differindex 19d14f53..afa71801 100644 --- a/data/fonts/NotoColorEmoji.ttf +++ b/data/fonts/NotoColorEmoji.ttf diff --git a/data/fonts/NotoNaskh-Bold.ttf b/data/fonts/NotoNaskh-Bold.ttf Binary files differindex 8e91c12d..132b92d7 100644 --- a/data/fonts/NotoNaskh-Bold.ttf +++ b/data/fonts/NotoNaskh-Bold.ttf diff --git a/data/fonts/NotoNaskh-Regular.ttf b/data/fonts/NotoNaskh-Regular.ttf Binary files differindex 5f495259..54e8427c 100644 --- a/data/fonts/NotoNaskh-Regular.ttf +++ b/data/fonts/NotoNaskh-Regular.ttf diff --git a/data/fonts/NotoNaskhUI-Bold.ttf b/data/fonts/NotoNaskhUI-Bold.ttf Binary files differindex 4cfb65e0..862303b4 100644 --- a/data/fonts/NotoNaskhUI-Bold.ttf +++ b/data/fonts/NotoNaskhUI-Bold.ttf diff --git a/data/fonts/NotoNaskhUI-Regular.ttf b/data/fonts/NotoNaskhUI-Regular.ttf Binary files differindex 71b76aed..08997187 100644 --- a/data/fonts/NotoNaskhUI-Regular.ttf +++ b/data/fonts/NotoNaskhUI-Regular.ttf diff --git a/data/fonts/NotoSansArmenian-Bold.ttf b/data/fonts/NotoSansArmenian-Bold.ttf Binary files differindex 872c6213..e7f2e0cd 100644 --- a/data/fonts/NotoSansArmenian-Bold.ttf +++ b/data/fonts/NotoSansArmenian-Bold.ttf diff --git a/data/fonts/NotoSansArmenian-Regular.ttf b/data/fonts/NotoSansArmenian-Regular.ttf Binary files differindex d170f05f..d61c9951 100644 --- a/data/fonts/NotoSansArmenian-Regular.ttf +++ b/data/fonts/NotoSansArmenian-Regular.ttf diff --git a/data/fonts/NotoSansBengali-Bold.ttf b/data/fonts/NotoSansBengali-Bold.ttf Binary files differindex d156e4ba..3d80cf70 100644 --- a/data/fonts/NotoSansBengali-Bold.ttf +++ b/data/fonts/NotoSansBengali-Bold.ttf diff --git a/data/fonts/NotoSansBengali-Regular.ttf b/data/fonts/NotoSansBengali-Regular.ttf Binary files differindex e9ec633d..73a00fd2 100644 --- a/data/fonts/NotoSansBengali-Regular.ttf +++ b/data/fonts/NotoSansBengali-Regular.ttf diff --git a/data/fonts/NotoSansBengaliUI-Bold.ttf b/data/fonts/NotoSansBengaliUI-Bold.ttf Binary files differindex 2bc4a86e..c5c7d7d9 100644 --- a/data/fonts/NotoSansBengaliUI-Bold.ttf +++ b/data/fonts/NotoSansBengaliUI-Bold.ttf diff --git a/data/fonts/NotoSansBengaliUI-Regular.ttf b/data/fonts/NotoSansBengaliUI-Regular.ttf Binary files differindex 34382f3d..5ee425f9 100644 --- a/data/fonts/NotoSansBengaliUI-Regular.ttf +++ b/data/fonts/NotoSansBengaliUI-Regular.ttf diff --git a/data/fonts/NotoSansDevanagari-Bold.ttf b/data/fonts/NotoSansDevanagari-Bold.ttf Binary files differindex 6982b7f6..ecdde024 100644 --- a/data/fonts/NotoSansDevanagari-Bold.ttf +++ b/data/fonts/NotoSansDevanagari-Bold.ttf diff --git a/data/fonts/NotoSansDevanagari-Regular.ttf b/data/fonts/NotoSansDevanagari-Regular.ttf Binary files differindex a167ccb3..12cd5ef7 100644 --- a/data/fonts/NotoSansDevanagari-Regular.ttf +++ b/data/fonts/NotoSansDevanagari-Regular.ttf diff --git a/data/fonts/NotoSansDevanagariUI-Bold.ttf b/data/fonts/NotoSansDevanagariUI-Bold.ttf Binary files differindex 984dab30..e20426ab 100644 --- a/data/fonts/NotoSansDevanagariUI-Bold.ttf +++ b/data/fonts/NotoSansDevanagariUI-Bold.ttf diff --git a/data/fonts/NotoSansDevanagariUI-Regular.ttf b/data/fonts/NotoSansDevanagariUI-Regular.ttf Binary files differindex 848faf8d..61bc479d 100644 --- a/data/fonts/NotoSansDevanagariUI-Regular.ttf +++ b/data/fonts/NotoSansDevanagariUI-Regular.ttf diff --git a/data/fonts/NotoSansEthiopic-Bold.ttf b/data/fonts/NotoSansEthiopic-Bold.ttf Binary files differindex 6181431a..21278657 100644 --- a/data/fonts/NotoSansEthiopic-Bold.ttf +++ b/data/fonts/NotoSansEthiopic-Bold.ttf diff --git a/data/fonts/NotoSansEthiopic-Regular.ttf b/data/fonts/NotoSansEthiopic-Regular.ttf Binary files differindex 4c25c006..5692cd5a 100644 --- a/data/fonts/NotoSansEthiopic-Regular.ttf +++ b/data/fonts/NotoSansEthiopic-Regular.ttf diff --git a/data/fonts/NotoSansGeorgian-Bold.ttf b/data/fonts/NotoSansGeorgian-Bold.ttf Binary files differindex ca904ccd..fd991a11 100644 --- a/data/fonts/NotoSansGeorgian-Bold.ttf +++ b/data/fonts/NotoSansGeorgian-Bold.ttf diff --git a/data/fonts/NotoSansGeorgian-Regular.ttf b/data/fonts/NotoSansGeorgian-Regular.ttf Binary files differindex 0835cbd2..924b3e68 100644 --- a/data/fonts/NotoSansGeorgian-Regular.ttf +++ b/data/fonts/NotoSansGeorgian-Regular.ttf diff --git a/data/fonts/NotoSansHebrew-Bold.ttf b/data/fonts/NotoSansHebrew-Bold.ttf Binary files differindex cb11e4f3..00ce223c 100644 --- a/data/fonts/NotoSansHebrew-Bold.ttf +++ b/data/fonts/NotoSansHebrew-Bold.ttf diff --git a/data/fonts/NotoSansHebrew-Regular.ttf b/data/fonts/NotoSansHebrew-Regular.ttf Binary files differindex 0b01e4a9..182518f8 100644 --- a/data/fonts/NotoSansHebrew-Regular.ttf +++ b/data/fonts/NotoSansHebrew-Regular.ttf diff --git a/data/fonts/NotoSansKannada-Bold.ttf b/data/fonts/NotoSansKannada-Bold.ttf Binary files differindex 11f1e3fe..4639a47e 100644 --- a/data/fonts/NotoSansKannada-Bold.ttf +++ b/data/fonts/NotoSansKannada-Bold.ttf diff --git a/data/fonts/NotoSansKannada-Regular.ttf b/data/fonts/NotoSansKannada-Regular.ttf Binary files differindex 20071bca..628a3c71 100644 --- a/data/fonts/NotoSansKannada-Regular.ttf +++ b/data/fonts/NotoSansKannada-Regular.ttf diff --git a/data/fonts/NotoSansKannadaUI-Bold.ttf b/data/fonts/NotoSansKannadaUI-Bold.ttf Binary files differindex af061d21..df7fffbf 100644 --- a/data/fonts/NotoSansKannadaUI-Bold.ttf +++ b/data/fonts/NotoSansKannadaUI-Bold.ttf diff --git a/data/fonts/NotoSansKannadaUI-Regular.ttf b/data/fonts/NotoSansKannadaUI-Regular.ttf Binary files differindex 0ad62cbd..7a997a2d 100644 --- a/data/fonts/NotoSansKannadaUI-Regular.ttf +++ b/data/fonts/NotoSansKannadaUI-Regular.ttf diff --git a/data/fonts/NotoSansKhmer-Bold.ttf b/data/fonts/NotoSansKhmer-Bold.ttf Binary files differindex bb974bc4..9af1eb7c 100644 --- a/data/fonts/NotoSansKhmer-Bold.ttf +++ b/data/fonts/NotoSansKhmer-Bold.ttf diff --git a/data/fonts/NotoSansKhmer-Regular.ttf b/data/fonts/NotoSansKhmer-Regular.ttf Binary files differindex 78f8e6c3..cb6d032a 100644 --- a/data/fonts/NotoSansKhmer-Regular.ttf +++ b/data/fonts/NotoSansKhmer-Regular.ttf diff --git a/data/fonts/NotoSansKhmerUI-Bold.ttf b/data/fonts/NotoSansKhmerUI-Bold.ttf Binary files differindex 67c09d69..485eab57 100644 --- a/data/fonts/NotoSansKhmerUI-Bold.ttf +++ b/data/fonts/NotoSansKhmerUI-Bold.ttf diff --git a/data/fonts/NotoSansKhmerUI-Regular.ttf b/data/fonts/NotoSansKhmerUI-Regular.ttf Binary files differindex 0295de1f..53302f51 100644 --- a/data/fonts/NotoSansKhmerUI-Regular.ttf +++ b/data/fonts/NotoSansKhmerUI-Regular.ttf diff --git a/data/fonts/NotoSansLao-Bold.ttf b/data/fonts/NotoSansLao-Bold.ttf Binary files differindex 8e819eda..14941509 100644 --- a/data/fonts/NotoSansLao-Bold.ttf +++ b/data/fonts/NotoSansLao-Bold.ttf diff --git a/data/fonts/NotoSansLao-Regular.ttf b/data/fonts/NotoSansLao-Regular.ttf Binary files differindex 2553fee6..23c29926 100644 --- a/data/fonts/NotoSansLao-Regular.ttf +++ b/data/fonts/NotoSansLao-Regular.ttf diff --git a/data/fonts/NotoSansLaoUI-Bold.ttf b/data/fonts/NotoSansLaoUI-Bold.ttf Binary files differindex bd7369ab..3d2b47d7 100644 --- a/data/fonts/NotoSansLaoUI-Bold.ttf +++ b/data/fonts/NotoSansLaoUI-Bold.ttf diff --git a/data/fonts/NotoSansLaoUI-Regular.ttf b/data/fonts/NotoSansLaoUI-Regular.ttf Binary files differindex ee216b89..c42e4cf1 100644 --- a/data/fonts/NotoSansLaoUI-Regular.ttf +++ b/data/fonts/NotoSansLaoUI-Regular.ttf diff --git a/data/fonts/NotoSansMalayalam-Bold.ttf b/data/fonts/NotoSansMalayalam-Bold.ttf Binary files differindex 9cef4f76..456d0d52 100644 --- a/data/fonts/NotoSansMalayalam-Bold.ttf +++ b/data/fonts/NotoSansMalayalam-Bold.ttf diff --git a/data/fonts/NotoSansMalayalam-Regular.ttf b/data/fonts/NotoSansMalayalam-Regular.ttf Binary files differindex 5debf265..2e38f3a5 100644 --- a/data/fonts/NotoSansMalayalam-Regular.ttf +++ b/data/fonts/NotoSansMalayalam-Regular.ttf diff --git a/data/fonts/NotoSansMalayalamUI-Bold.ttf b/data/fonts/NotoSansMalayalamUI-Bold.ttf Binary files differindex 64ce5920..20628d1e 100644 --- a/data/fonts/NotoSansMalayalamUI-Bold.ttf +++ b/data/fonts/NotoSansMalayalamUI-Bold.ttf diff --git a/data/fonts/NotoSansMalayalamUI-Regular.ttf b/data/fonts/NotoSansMalayalamUI-Regular.ttf Binary files differindex ab6aa23c..1a6b28a5 100644 --- a/data/fonts/NotoSansMalayalamUI-Regular.ttf +++ b/data/fonts/NotoSansMalayalamUI-Regular.ttf diff --git a/data/fonts/NotoSansMyanmar-Bold.ttf b/data/fonts/NotoSansMyanmar-Bold.ttf Binary files differindex 46f2c56a..f5406f1d 100644 --- a/data/fonts/NotoSansMyanmar-Bold.ttf +++ b/data/fonts/NotoSansMyanmar-Bold.ttf diff --git a/data/fonts/NotoSansMyanmar-Regular.ttf b/data/fonts/NotoSansMyanmar-Regular.ttf Binary files differindex f1e13763..99a48174 100644 --- a/data/fonts/NotoSansMyanmar-Regular.ttf +++ b/data/fonts/NotoSansMyanmar-Regular.ttf diff --git a/data/fonts/NotoSansMyanmarUI-Bold.ttf b/data/fonts/NotoSansMyanmarUI-Bold.ttf Binary files differindex 281b7bb3..c4baf7cb 100644 --- a/data/fonts/NotoSansMyanmarUI-Bold.ttf +++ b/data/fonts/NotoSansMyanmarUI-Bold.ttf diff --git a/data/fonts/NotoSansMyanmarUI-Regular.ttf b/data/fonts/NotoSansMyanmarUI-Regular.ttf Binary files differindex 012f10b4..a4a2b6b7 100644 --- a/data/fonts/NotoSansMyanmarUI-Regular.ttf +++ b/data/fonts/NotoSansMyanmarUI-Regular.ttf diff --git a/data/fonts/NotoSansSymbols-Regular-Subsetted.ttf b/data/fonts/NotoSansSymbols-Regular-Subsetted.ttf Binary files differindex 6192a973..46ead4b4 100644 --- a/data/fonts/NotoSansSymbols-Regular-Subsetted.ttf +++ b/data/fonts/NotoSansSymbols-Regular-Subsetted.ttf diff --git a/data/fonts/NotoSansTamil-Bold.ttf b/data/fonts/NotoSansTamil-Bold.ttf Binary files differindex 6e8a972c..a4379b9f 100644 --- a/data/fonts/NotoSansTamil-Bold.ttf +++ b/data/fonts/NotoSansTamil-Bold.ttf diff --git a/data/fonts/NotoSansTamil-Regular.ttf b/data/fonts/NotoSansTamil-Regular.ttf Binary files differindex 138c25ad..91437983 100644 --- a/data/fonts/NotoSansTamil-Regular.ttf +++ b/data/fonts/NotoSansTamil-Regular.ttf diff --git a/data/fonts/NotoSansTamilUI-Bold.ttf b/data/fonts/NotoSansTamilUI-Bold.ttf Binary files differindex 40e1bcfa..fcf96609 100644 --- a/data/fonts/NotoSansTamilUI-Bold.ttf +++ b/data/fonts/NotoSansTamilUI-Bold.ttf diff --git a/data/fonts/NotoSansTamilUI-Regular.ttf b/data/fonts/NotoSansTamilUI-Regular.ttf Binary files differindex bdd6a699..38aa5298 100644 --- a/data/fonts/NotoSansTamilUI-Regular.ttf +++ b/data/fonts/NotoSansTamilUI-Regular.ttf diff --git a/data/fonts/NotoSansTelugu-Bold.ttf b/data/fonts/NotoSansTelugu-Bold.ttf Binary files differindex e7f31847..b285942e 100644 --- a/data/fonts/NotoSansTelugu-Bold.ttf +++ b/data/fonts/NotoSansTelugu-Bold.ttf diff --git a/data/fonts/NotoSansTelugu-Regular.ttf b/data/fonts/NotoSansTelugu-Regular.ttf Binary files differindex 3ee15ca1..a72bbc9e 100644 --- a/data/fonts/NotoSansTelugu-Regular.ttf +++ b/data/fonts/NotoSansTelugu-Regular.ttf diff --git a/data/fonts/NotoSansTeluguUI-Bold.ttf b/data/fonts/NotoSansTeluguUI-Bold.ttf Binary files differindex 38d7573c..2b288073 100644 --- a/data/fonts/NotoSansTeluguUI-Bold.ttf +++ b/data/fonts/NotoSansTeluguUI-Bold.ttf diff --git a/data/fonts/NotoSansTeluguUI-Regular.ttf b/data/fonts/NotoSansTeluguUI-Regular.ttf Binary files differindex 88c874e3..ef94a7df 100644 --- a/data/fonts/NotoSansTeluguUI-Regular.ttf +++ b/data/fonts/NotoSansTeluguUI-Regular.ttf diff --git a/data/fonts/NotoSansThai-Bold.ttf b/data/fonts/NotoSansThai-Bold.ttf Binary files differindex 7dd30b95..9cfd7834 100644 --- a/data/fonts/NotoSansThai-Bold.ttf +++ b/data/fonts/NotoSansThai-Bold.ttf diff --git a/data/fonts/NotoSansThai-Regular.ttf b/data/fonts/NotoSansThai-Regular.ttf Binary files differindex 4bb045e1..3b564f6b 100644 --- a/data/fonts/NotoSansThai-Regular.ttf +++ b/data/fonts/NotoSansThai-Regular.ttf diff --git a/data/fonts/NotoSansThaiUI-Bold.ttf b/data/fonts/NotoSansThaiUI-Bold.ttf Binary files differindex 8d4d1d11..fc5eae98 100644 --- a/data/fonts/NotoSansThaiUI-Bold.ttf +++ b/data/fonts/NotoSansThaiUI-Bold.ttf diff --git a/data/fonts/NotoSansThaiUI-Regular.ttf b/data/fonts/NotoSansThaiUI-Regular.ttf Binary files differindex 0bcc82f1..3700ef14 100644 --- a/data/fonts/NotoSansThaiUI-Regular.ttf +++ b/data/fonts/NotoSansThaiUI-Regular.ttf diff --git a/data/fonts/NotoSerif-Bold.ttf b/data/fonts/NotoSerif-Bold.ttf Binary files differindex 8f93f169..fe4442a9 100644 --- a/data/fonts/NotoSerif-Bold.ttf +++ b/data/fonts/NotoSerif-Bold.ttf diff --git a/data/fonts/NotoSerif-BoldItalic.ttf b/data/fonts/NotoSerif-BoldItalic.ttf Binary files differindex 570901d5..330bddca 100644 --- a/data/fonts/NotoSerif-BoldItalic.ttf +++ b/data/fonts/NotoSerif-BoldItalic.ttf diff --git a/data/fonts/NotoSerif-Italic.ttf b/data/fonts/NotoSerif-Italic.ttf Binary files differindex cc6e9a72..1eae3e93 100644 --- a/data/fonts/NotoSerif-Italic.ttf +++ b/data/fonts/NotoSerif-Italic.ttf diff --git a/data/fonts/NotoSerif-Regular.ttf b/data/fonts/NotoSerif-Regular.ttf Binary files differindex 39943477..0b58bea3 100644 --- a/data/fonts/NotoSerif-Regular.ttf +++ b/data/fonts/NotoSerif-Regular.ttf diff --git a/data/fonts/Roboto-Black.ttf b/data/fonts/Roboto-Black.ttf Binary files differindex 04ced5c3..fa778ea2 100644 --- a/data/fonts/Roboto-Black.ttf +++ b/data/fonts/Roboto-Black.ttf diff --git a/data/fonts/Roboto-BlackItalic.ttf b/data/fonts/Roboto-BlackItalic.ttf Binary files differindex 94ce8821..fb7d9fd6 100644 --- a/data/fonts/Roboto-BlackItalic.ttf +++ b/data/fonts/Roboto-BlackItalic.ttf diff --git a/data/fonts/Roboto-Bold.ttf b/data/fonts/Roboto-Bold.ttf Binary files differindex 16cc902f..8818cf8e 100644 --- a/data/fonts/Roboto-Bold.ttf +++ b/data/fonts/Roboto-Bold.ttf diff --git a/data/fonts/Roboto-BoldItalic.ttf b/data/fonts/Roboto-BoldItalic.ttf Binary files differindex 50569fed..8807c771 100644 --- a/data/fonts/Roboto-BoldItalic.ttf +++ b/data/fonts/Roboto-BoldItalic.ttf diff --git a/data/fonts/Roboto-Italic.ttf b/data/fonts/Roboto-Italic.ttf Binary files differindex 842e2492..7ad62365 100644 --- a/data/fonts/Roboto-Italic.ttf +++ b/data/fonts/Roboto-Italic.ttf diff --git a/data/fonts/Roboto-Light.ttf b/data/fonts/Roboto-Light.ttf Binary files differindex 15ec3208..381a04ee 100644 --- a/data/fonts/Roboto-Light.ttf +++ b/data/fonts/Roboto-Light.ttf diff --git a/data/fonts/Roboto-LightItalic.ttf b/data/fonts/Roboto-LightItalic.ttf Binary files differindex 4be45cde..b00989a9 100644 --- a/data/fonts/Roboto-LightItalic.ttf +++ b/data/fonts/Roboto-LightItalic.ttf diff --git a/data/fonts/Roboto-Medium.ttf b/data/fonts/Roboto-Medium.ttf Binary files differindex 2ee66cf2..b19753c3 100644 --- a/data/fonts/Roboto-Medium.ttf +++ b/data/fonts/Roboto-Medium.ttf diff --git a/data/fonts/Roboto-MediumItalic.ttf b/data/fonts/Roboto-MediumItalic.ttf Binary files differindex 7e7f466c..b1afb81a 100644 --- a/data/fonts/Roboto-MediumItalic.ttf +++ b/data/fonts/Roboto-MediumItalic.ttf diff --git a/data/fonts/Roboto-Regular.ttf b/data/fonts/Roboto-Regular.ttf Binary files differindex c4ba9add..541a865d 100644 --- a/data/fonts/Roboto-Regular.ttf +++ b/data/fonts/Roboto-Regular.ttf diff --git a/data/fonts/Roboto-Thin.ttf b/data/fonts/Roboto-Thin.ttf Binary files differindex 0dc57be5..813d48ef 100644 --- a/data/fonts/Roboto-Thin.ttf +++ b/data/fonts/Roboto-Thin.ttf diff --git a/data/fonts/Roboto-ThinItalic.ttf b/data/fonts/Roboto-ThinItalic.ttf Binary files differindex b7ae1d7e..f5c21a66 100644 --- a/data/fonts/Roboto-ThinItalic.ttf +++ b/data/fonts/Roboto-ThinItalic.ttf diff --git a/data/fonts/RobotoCondensed-Bold.ttf b/data/fonts/RobotoCondensed-Bold.ttf Binary files differindex 54eab9db..9e52a9a6 100644 --- a/data/fonts/RobotoCondensed-Bold.ttf +++ b/data/fonts/RobotoCondensed-Bold.ttf diff --git a/data/fonts/RobotoCondensed-BoldItalic.ttf b/data/fonts/RobotoCondensed-BoldItalic.ttf Binary files differindex 96b25091..a1fdd868 100644 --- a/data/fonts/RobotoCondensed-BoldItalic.ttf +++ b/data/fonts/RobotoCondensed-BoldItalic.ttf diff --git a/data/fonts/RobotoCondensed-Italic.ttf b/data/fonts/RobotoCondensed-Italic.ttf Binary files differindex 62042cc3..75268f6f 100644 --- a/data/fonts/RobotoCondensed-Italic.ttf +++ b/data/fonts/RobotoCondensed-Italic.ttf diff --git a/data/fonts/RobotoCondensed-Light.ttf b/data/fonts/RobotoCondensed-Light.ttf Binary files differindex 6388ecae..87764c65 100644 --- a/data/fonts/RobotoCondensed-Light.ttf +++ b/data/fonts/RobotoCondensed-Light.ttf diff --git a/data/fonts/RobotoCondensed-LightItalic.ttf b/data/fonts/RobotoCondensed-LightItalic.ttf Binary files differindex 7cc4b85c..a3844e39 100644 --- a/data/fonts/RobotoCondensed-LightItalic.ttf +++ b/data/fonts/RobotoCondensed-LightItalic.ttf diff --git a/data/fonts/RobotoCondensed-Regular.ttf b/data/fonts/RobotoCondensed-Regular.ttf Binary files differindex e65ac629..2786a705 100644 --- a/data/fonts/RobotoCondensed-Regular.ttf +++ b/data/fonts/RobotoCondensed-Regular.ttf diff --git a/data/layoutlib.jar b/data/layoutlib.jar Binary files differindex e7d5a179..c81cedea 100644 --- a/data/layoutlib.jar +++ b/data/layoutlib.jar diff --git a/data/res/layout-xlarge/breadcrumbs_in_fragment_material.xml b/data/res/layout-xlarge/breadcrumbs_in_fragment_material.xml new file mode 100644 index 00000000..6fb6df56 --- /dev/null +++ b/data/res/layout-xlarge/breadcrumbs_in_fragment_material.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+android:id/breadcrumb_section" + android:orientation="vertical" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:layout_marginStart="@dimen/preference_breadcrumbs_padding_start_material" + android:layout_marginEnd="@dimen/preference_breadcrumbs_padding_end_material" + > + <android.app.FragmentBreadCrumbs + android:id="@android:id/title" + android:layout_height="72dip" + android:layout_width="match_parent" + android:paddingTop="16dip" + android:paddingBottom="8dip" + android:gravity="center_vertical|start" + /> + +</LinearLayout>
\ No newline at end of file diff --git a/data/res/layout/fragment_bread_crumb_item_material.xml b/data/res/layout/fragment_bread_crumb_item_material.xml new file mode 100644 index 00000000..ee4344f2 --- /dev/null +++ b/data/res/layout/fragment_bread_crumb_item_material.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 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. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:orientation="horizontal" + > + <ImageView + android:id="@android:id/left_icon" + android:src="?attr/dividerVertical" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:scaleType="fitXY" + android:layout_marginTop="12dip" + android:layout_marginBottom="12dip" + /> + + <TextView + android:id="@+id/title" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:paddingStart="8dip" + android:paddingEnd="8dip" + android:gravity="center_vertical" + android:textAppearance="?android:attr/textAppearanceMedium" + android:background="?android:attr/selectableItemBackground" + /> +</LinearLayout>
\ No newline at end of file diff --git a/data/res/layout/preference_header_item_material.xml b/data/res/layout/preference_header_item_material.xml new file mode 100644 index 00000000..594189fa --- /dev/null +++ b/data/res/layout/preference_header_item_material.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<!-- Layout of a header item in PreferenceActivity. --> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="48dp" + android:background="?android:attr/activatedBackgroundIndicator" + android:gravity="center_vertical" + android:paddingStart="24dip" + android:paddingEnd="?android:attr/scrollbarSize"> + + <ImageView + android:id="@+id/icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="0dip" + android:layout_marginEnd="8dip" + android:layout_gravity="center" /> + + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="0dip" + android:layout_marginEnd="6dip" + android:layout_marginTop="6dip" + android:layout_marginBottom="6dip" + android:layout_weight="1"> + + <TextView android:id="@+android:id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceMedium" + android:ellipsize="marquee" + android:fadingEdge="horizontal" /> + + <TextView android:id="@+android:id/summary" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@android:id/title" + android:layout_alignStart="@android:id/title" + android:textAppearance="?android:attr/textAppearanceSmall" + android:ellipsize="end" + android:maxLines="2" /> + + </RelativeLayout> + +</LinearLayout> diff --git a/data/res/layout/preference_list_content_material.xml b/data/res/layout/preference_list_content_material.xml new file mode 100644 index 00000000..78567999 --- /dev/null +++ b/data/res/layout/preference_list_content_material.xml @@ -0,0 +1,117 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* //device/apps/common/assets/res/layout/list_content.xml +** +** Copyright 2014, 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. +*/ +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_height="match_parent" + android:layout_width="match_parent"> + + <LinearLayout + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="0px" + android:layout_weight="1"> + + <LinearLayout + style="?attr/preferenceHeaderPanelStyle" + android:id="@+id/headers" + android:orientation="vertical" + android:layout_width="0px" + android:layout_height="match_parent" + android:layout_weight="@integer/preferences_left_pane_weight" + android:background="?attr/windowBackground" + android:elevation="4dip" > + + <ListView android:id="@android:id/list" + style="?attr/preferenceListStyle" + android:layout_width="match_parent" + android:layout_height="0px" + android:layout_weight="1" + android:clipToPadding="false" + android:drawSelectorOnTop="false" + android:cacheColorHint="@color/transparent" + android:listPreferredItemHeight="48dp" + android:scrollbarAlwaysDrawVerticalTrack="true" /> + + <FrameLayout android:id="@+id/list_footer" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="0" /> + + </LinearLayout> + + <LinearLayout + android:id="@+id/prefs_frame" + style="?attr/preferencePanelStyle" + android:layout_width="0px" + android:layout_height="match_parent" + android:layout_weight="@integer/preferences_right_pane_weight" + android:orientation="vertical" + android:visibility="gone" > + + <!-- Breadcrumb inserted here, in certain screen sizes. In others, it will be an + empty layout or just padding, and PreferenceActivity will put the breadcrumbs in + the action bar. --> + <include layout="@layout/breadcrumbs_in_fragment_material" /> + + <android.preference.PreferenceFrameLayout android:id="@+id/prefs" + android:layout_width="match_parent" + android:layout_height="0dip" + android:layout_weight="1" + /> + </LinearLayout> + </LinearLayout> + + <RelativeLayout android:id="@+id/button_bar" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:layout_weight="0" + android:visibility="gone"> + + <Button android:id="@+id/back_button" + android:layout_width="150dip" + android:layout_height="wrap_content" + android:layout_margin="5dip" + android:layout_alignParentStart="true" + android:text="@string/back_button_label" + /> + <LinearLayout + android:orientation="horizontal" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true"> + + <Button android:id="@+id/skip_button" + android:layout_width="150dip" + android:layout_height="wrap_content" + android:layout_margin="5dip" + android:text="@string/skip_button_label" + android:visibility="gone" + /> + + <Button android:id="@+id/next_button" + android:layout_width="150dip" + android:layout_height="wrap_content" + android:layout_margin="5dip" + android:text="@string/next_button_label" + /> + </LinearLayout> + </RelativeLayout> +</LinearLayout> diff --git a/data/res/values/attrs.xml b/data/res/values/attrs.xml index 90217e57..8ea18140 100644 --- a/data/res/values/attrs.xml +++ b/data/res/values/attrs.xml @@ -836,6 +836,8 @@ <!-- Default style for PreferenceScreen. --> <attr name="preferenceScreenStyle" format="reference" /> + <!-- Default style for the PreferenceActivity. --> + <attr name="preferenceActivityStyle" format="reference" /> <!-- Default style for Headers pane in PreferenceActivity. --> <attr name="preferenceFragmentStyle" format="reference" /> <!-- Default style for PreferenceCategory. --> @@ -7265,10 +7267,21 @@ <!-- Base attributes available to PreferenceFragment. --> <declare-styleable name="PreferenceFragment"> - <!-- The layout for the PreferenceFragment. This should rarely need to be changed --> + <!-- The layout for the PreferenceFragment. This should rarely need to be changed. --> <attr name="layout" /> </declare-styleable> + <!-- Base attributes available to PreferenceActivity. --> + <declare-styleable name="PreferenceActivity"> + <!-- The layout for the Preference Activity. This should rarely need to be changed. --> + <attr name="layout" /> + <!-- The layout for the Preference Header. This should rarely need to be changed. --> + <attr name="headerLayout" format="reference" /> + <!-- true if the Icon view will be removed when there is none and thus not showing + the fixed margins. --> + <attr name="headerRemoveIconIfEmpty" format="boolean" /> + </declare-styleable> + <!-- Use <code>tts-engine</code> as the root tag of the XML resource that describes a text to speech engine implemented as a subclass of {@link android.speech.tts.TextToSpeechService}. @@ -7370,6 +7383,8 @@ tags. --> <declare-styleable name="FragmentBreadCrumbs"> <attr name="gravity" /> + <attr name="itemLayout" format="reference" /> + <attr name="itemColor" format="color|reference" /> </declare-styleable> <declare-styleable name="MultiPaneChallengeLayout"> diff --git a/data/res/values/dimens_material.xml b/data/res/values/dimens_material.xml index 9836757b..450658e2 100644 --- a/data/res/values/dimens_material.xml +++ b/data/res/values/dimens_material.xml @@ -14,9 +14,22 @@ limitations under the License. --> <resources> + <!-- Preference activity, vertical padding for the header list --> + <dimen name="preference_screen_header_vertical_padding_material">8dp</dimen> + + <!-- Preference activity side margins --> + <dimen name="preference_screen_side_margin_material">0dp</dimen> + <!-- Preference activity side margins negative--> + <dimen name="preference_screen_side_margin_negative_material">0dp</dimen> <!-- Preference fragment padding, sides --> - <dimen name="preference_fragment_padding_side_material">0dp</dimen> + <dimen name="preference_fragment_padding_side_material">8dp</dimen> + + <!-- Preference breadcrumbs padding, start padding --> + <dimen name="preference_breadcrumbs_padding_start_material">12dp</dimen> + + <!-- Preference breadcrumbs padding, end padding --> + <dimen name="preference_breadcrumbs_padding_end_material">24dp</dimen> <dimen name="preference_screen_header_padding_side_material">0dp</dimen> diff --git a/data/res/values/styles.xml b/data/res/values/styles.xml index c6d0b0b5..ba15e9cc 100644 --- a/data/res/values/styles.xml +++ b/data/res/values/styles.xml @@ -533,6 +533,8 @@ please see styles_device_defaults.xml. <style name="Widget.FragmentBreadCrumbs"> <item name="padding">4dp</item> <item name="animateLayoutChanges">true</item> + <item name="itemLayout">@layout/fragment_bread_crumb_item</item> + <item name="itemColor">@null</item> </style> <style name="Widget.ImageWell"> @@ -954,6 +956,12 @@ please see styles_device_defaults.xml. <item name="paddingEnd">0dp</item> </style> + <style name="PreferenceActivity"> + <item name="layout">@layout/preference_list_content</item> + <item name="headerLayout">@layout/preference_header_item</item> + <item name="headerRemoveIconIfEmpty">false</item> + </style> + <style name="Preference.Information"> <item name="layout">@layout/preference_information</item> <item name="enabled">false</item> diff --git a/data/res/values/styles_material.xml b/data/res/values/styles_material.xml index e6e5cbb8..f9fca00d 100644 --- a/data/res/values/styles_material.xml +++ b/data/res/values/styles_material.xml @@ -42,6 +42,12 @@ please see styles_device_defaults.xml. <item name="paddingEnd">@dimen/preference_fragment_padding_side_material</item> </style> + <style name="PreferenceActivity.Material"> + <item name="layout">@layout/preference_list_content_material</item> + <item name="headerLayout">@layout/preference_header_item_material</item> + <item name="headerRemoveIconIfEmpty">true</item> + </style> + <style name="Preference.Material.Information"> <item name="layout">@layout/preference_information_material</item> <item name="enabled">false</item> @@ -93,6 +99,8 @@ please see styles_device_defaults.xml. <!-- No margins or background by default. Could be different for x-large screens --> <style name="PreferencePanel.Material"> + <item name="layout_marginStart">0dip</item> + <item name="layout_marginEnd">0dip</item> </style> <!-- The attributes are overridden here because the x-large or large resources may have @@ -106,10 +114,10 @@ please see styles_device_defaults.xml. </style> <style name="PreferenceHeaderPanel.Material"> - <item name="layout_marginStart">@dimen/preference_screen_side_margin</item> - <item name="layout_marginEnd">@dimen/preference_screen_side_margin_negative</item> - <item name="paddingTop">@dimen/preference_screen_header_vertical_padding</item> - <item name="paddingBottom">@dimen/preference_screen_header_vertical_padding</item> + <item name="layout_marginStart">@dimen/preference_screen_side_margin_material</item> + <item name="layout_marginEnd">@dimen/preference_screen_side_margin_negative_material</item> + <item name="paddingTop">@dimen/preference_screen_header_vertical_padding_material</item> + <item name="paddingBottom">@dimen/preference_screen_header_vertical_padding_material</item> </style> <style name="PreferenceHeaderList.Material"> @@ -585,6 +593,12 @@ please see styles_device_defaults.xml. </style> <style name="Widget.Material.ExpandableListView.White"/> + + <style name="Widget.Material.FragmentBreadCrumbs" parent="Widget.FragmentBreadCrumbs"> + <item name="itemLayout">@layout/fragment_bread_crumb_item_material</item> + <item name="itemColor">@color/primary_text_default_material_light</item> + </style> + <style name="Widget.Material.Gallery" parent="Widget.Gallery"/> <style name="Widget.Material.GestureOverlayView" parent="Widget.GestureOverlayView"/> @@ -972,6 +986,9 @@ please see styles_device_defaults.xml. <style name="Widget.Material.Light.EditText" parent="Widget.Material.EditText"/> <style name="Widget.Material.Light.ExpandableListView" parent="Widget.Material.ExpandableListView"/> <style name="Widget.Material.Light.ExpandableListView.White" parent="Widget.Material.ExpandableListView.White"/> + <style name="Widget.Material.Light.FragmentBreadCrumbs" parent="Widget.Material.FragmentBreadCrumbs" > + <item name="itemColor">@color/primary_text_default_material_dark</item> + </style> <style name="Widget.Material.Light.Gallery" parent="Widget.Material.Gallery"/> <style name="Widget.Material.Light.GestureOverlayView" parent="Widget.Material.GestureOverlayView"/> <style name="Widget.Material.Light.GridView" parent="Widget.Material.GridView"/> diff --git a/data/res/values/symbols.xml b/data/res/values/symbols.xml index 72f756af..f2b7d7be 100644 --- a/data/res/values/symbols.xml +++ b/data/res/values/symbols.xml @@ -2021,6 +2021,7 @@ <java-symbol type="style" name="TextAppearance.Material.TimePicker.TimeLabel" /> <java-symbol type="attr" name="seekBarPreferenceStyle" /> <java-symbol type="style" name="Theme.DeviceDefault.Resolver" /> + <java-symbol type="attr" name="preferenceActivityStyle" /> <java-symbol type="attr" name="preferenceFragmentStyle" /> <java-symbol type="bool" name="skipHoldBeforeMerge" /> <java-symbol type="bool" name="imsServiceAllowTurnOff" /> diff --git a/data/res/values/themes.xml b/data/res/values/themes.xml index 3a268a32..7a9e1d59 100644 --- a/data/res/values/themes.xml +++ b/data/res/values/themes.xml @@ -317,6 +317,7 @@ please see themes_device_defaults.xml. <!-- Preference styles --> <item name="preferenceScreenStyle">@style/Preference.PreferenceScreen</item> + <item name="preferenceActivityStyle">@style/PreferenceActivity</item> <item name="preferenceFragmentStyle">@style/PreferenceFragment</item> <item name="preferenceCategoryStyle">@style/Preference.Category</item> <item name="preferenceStyle">@style/Preference</item> diff --git a/data/res/values/themes_holo.xml b/data/res/values/themes_holo.xml index 208db977..9c1d0f38 100644 --- a/data/res/values/themes_holo.xml +++ b/data/res/values/themes_holo.xml @@ -308,6 +308,7 @@ please see themes_device_defaults.xml. <!-- Preference styles --> <item name="preferenceScreenStyle">@style/Preference.Holo.PreferenceScreen</item> + <item name="preferenceActivityStyle">@style/PreferenceActivity</item> <item name="preferenceFragmentStyle">@style/PreferenceFragment.Holo</item> <item name="preferenceCategoryStyle">@style/Preference.Holo.Category</item> <item name="preferenceStyle">@style/Preference.Holo</item> @@ -643,6 +644,7 @@ please see themes_device_defaults.xml. <!-- Preference styles --> <item name="preferenceScreenStyle">@style/Preference.Holo.PreferenceScreen</item> + <item name="preferenceActivityStyle">@style/PreferenceActivity</item> <item name="preferenceFragmentStyle">@style/PreferenceFragment.Holo</item> <item name="preferenceCategoryStyle">@style/Preference.Holo.Category</item> <item name="preferenceStyle">@style/Preference.Holo</item> diff --git a/data/res/values/themes_material.xml b/data/res/values/themes_material.xml index 3c2e3020..64201537 100644 --- a/data/res/values/themes_material.xml +++ b/data/res/values/themes_material.xml @@ -275,9 +275,11 @@ please see themes_device_defaults.xml. <item name="popupMenuStyle">@style/Widget.Material.PopupMenu</item> <item name="stackViewStyle">@style/Widget.Material.StackView</item> <item name="activityChooserViewStyle">@style/Widget.Material.ActivityChooserView</item> + <item name="fragmentBreadCrumbsStyle">@style/Widget.Material.FragmentBreadCrumbs</item> <!-- Preference styles --> <item name="preferenceScreenStyle">@style/Preference.Material.PreferenceScreen</item> + <item name="preferenceActivityStyle">@style/PreferenceActivity.Material</item> <item name="preferenceFragmentStyle">@style/PreferenceFragment.Material</item> <item name="preferenceCategoryStyle">@style/Preference.Material.Category</item> <item name="preferenceStyle">@style/Preference.Material</item> @@ -622,9 +624,11 @@ please see themes_device_defaults.xml. <item name="popupMenuStyle">@style/Widget.Material.Light.PopupMenu</item> <item name="stackViewStyle">@style/Widget.Material.Light.StackView</item> <item name="activityChooserViewStyle">@style/Widget.Material.Light.ActivityChooserView</item> + <item name="fragmentBreadCrumbsStyle">@style/Widget.Material.FragmentBreadCrumbs</item> <!-- Preference styles --> <item name="preferenceScreenStyle">@style/Preference.Material.PreferenceScreen</item> + <item name="preferenceActivityStyle">@style/PreferenceActivity.Material</item> <item name="preferenceFragmentStyle">@style/PreferenceFragment.Material</item> <item name="preferenceCategoryStyle">@style/Preference.Material.Category</item> <item name="preferenceStyle">@style/Preference.Material</item> diff --git a/data/widgets.txt b/data/widgets.txt index 61eabbc6..de2d969b 100644 --- a/data/widgets.txt +++ b/data/widgets.txt @@ -1,74 +1,74 @@ -Wandroid.widget.TimePicker android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object -Wandroid.widget.RatingBar android.widget.AbsSeekBar android.widget.ProgressBar android.view.View java.lang.Object -Wandroid.widget.ToggleButton android.widget.CompoundButton android.widget.Button android.widget.TextView android.view.View java.lang.Object -Wandroid.widget.EditText android.widget.TextView android.view.View java.lang.Object -Wandroid.widget.ImageButton android.widget.ImageView android.view.View java.lang.Object +Wandroid.widget.Spinner android.widget.AbsSpinner android.widget.AdapterView android.view.ViewGroup android.view.View java.lang.Object +Wandroid.widget.Space android.view.View java.lang.Object +Wandroid.widget.CheckedTextView android.widget.TextView android.view.View java.lang.Object +Wandroid.widget.Chronometer android.widget.TextView android.view.View java.lang.Object +Wandroid.widget.TextClock android.widget.TextView android.view.View java.lang.Object +Wandroid.widget.QuickContactBadge android.widget.ImageView android.view.View java.lang.Object Wandroid.view.View java.lang.Object +Wandroid.widget.ToggleButton android.widget.CompoundButton android.widget.Button android.widget.TextView android.view.View java.lang.Object +Wandroid.widget.RadioButton android.widget.CompoundButton android.widget.Button android.widget.TextView android.view.View java.lang.Object Wandroid.widget.CheckBox android.widget.CompoundButton android.widget.Button android.widget.TextView android.view.View java.lang.Object -Wandroid.view.ViewStub android.view.View java.lang.Object +Wandroid.widget.TimePicker android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object +Wandroid.widget.MultiAutoCompleteTextView android.widget.AutoCompleteTextView android.widget.EditText android.widget.TextView android.view.View java.lang.Object +Wandroid.widget.VideoView android.view.SurfaceView android.view.View java.lang.Object +Wandroid.widget.DigitalClock android.widget.TextView android.view.View java.lang.Object +Wandroid.widget.Button android.widget.TextView android.view.View java.lang.Object Wandroid.widget.NumberPicker android.widget.LinearLayout android.view.ViewGroup android.view.View java.lang.Object Wandroid.widget.TwoLineListItem android.widget.RelativeLayout android.view.ViewGroup android.view.View java.lang.Object -Wandroid.widget.TextClock android.widget.TextView android.view.View java.lang.Object -Wandroid.widget.RadioButton android.widget.CompoundButton android.widget.Button android.widget.TextView android.view.View java.lang.Object -Wandroid.widget.Spinner android.widget.AbsSpinner android.widget.AdapterView android.view.ViewGroup android.view.View java.lang.Object -Wandroid.widget.Chronometer android.widget.TextView android.view.View java.lang.Object -Wandroid.widget.Gallery android.widget.AbsSpinner android.widget.AdapterView android.view.ViewGroup android.view.View java.lang.Object -Wandroid.widget.DatePicker android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object -Wandroid.view.TextureView android.view.View java.lang.Object -Wandroid.widget.SeekBar android.widget.AbsSeekBar android.widget.ProgressBar android.view.View java.lang.Object -Wandroid.widget.AnalogClock android.view.View java.lang.Object +Wandroid.view.ViewStub android.view.View java.lang.Object Wandroid.gesture.GestureOverlayView android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object -Wandroid.widget.CheckedTextView android.widget.TextView android.view.View java.lang.Object -Wandroid.widget.DigitalClock android.widget.TextView android.view.View java.lang.Object -Wandroid.widget.MultiAutoCompleteTextView android.widget.AutoCompleteTextView android.widget.EditText android.widget.TextView android.view.View java.lang.Object -Wandroid.widget.QuickContactBadge android.widget.ImageView android.view.View java.lang.Object -Wandroid.webkit.WebView android.widget.AbsoluteLayout android.view.ViewGroup android.view.View java.lang.Object -Wandroid.widget.VideoView android.view.SurfaceView android.view.View java.lang.Object -Wandroid.widget.Space android.view.View java.lang.Object -Wandroid.widget.ZoomControls android.widget.LinearLayout android.view.ViewGroup android.view.View java.lang.Object -Wandroid.widget.ZoomButton android.widget.ImageButton android.widget.ImageView android.view.View java.lang.Object Wandroid.widget.AutoCompleteTextView android.widget.EditText android.widget.TextView android.view.View java.lang.Object -Wandroid.widget.TextView android.view.View java.lang.Object +Wandroid.view.TextureView android.view.View java.lang.Object +Wandroid.widget.DatePicker android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object +Wandroid.widget.Gallery android.widget.AbsSpinner android.widget.AdapterView android.view.ViewGroup android.view.View java.lang.Object +Wandroid.widget.ZoomControls android.widget.LinearLayout android.view.ViewGroup android.view.View java.lang.Object Wandroid.widget.Switch android.widget.CompoundButton android.widget.Button android.widget.TextView android.view.View java.lang.Object +Wandroid.widget.SeekBar android.widget.AbsSeekBar android.widget.ProgressBar android.view.View java.lang.Object Wandroid.widget.ImageView android.view.View java.lang.Object +Wandroid.widget.TextView android.view.View java.lang.Object +Wandroid.widget.EditText android.widget.TextView android.view.View java.lang.Object +Wandroid.widget.RatingBar android.widget.AbsSeekBar android.widget.ProgressBar android.view.View java.lang.Object Wandroid.view.SurfaceView android.view.View java.lang.Object -Wandroid.widget.CalendarView android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object +Wandroid.widget.ZoomButton android.widget.ImageButton android.widget.ImageView android.view.View java.lang.Object +Wandroid.widget.AnalogClock android.view.View java.lang.Object Wandroid.widget.ProgressBar android.view.View java.lang.Object -Wandroid.widget.Button android.widget.TextView android.view.View java.lang.Object +Wandroid.webkit.WebView android.widget.AbsoluteLayout android.view.ViewGroup android.view.View java.lang.Object +Wandroid.widget.CalendarView android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object +Wandroid.widget.ImageButton android.widget.ImageView android.view.View java.lang.Object +Pandroid.widget.TableLayout.LayoutParams android.widget.LinearLayout.LayoutParams android.view.ViewGroup.MarginLayoutParams android.view.ViewGroup.LayoutParams java.lang.Object +Pandroid.widget.TableRow.LayoutParams android.widget.LinearLayout.LayoutParams android.view.ViewGroup.MarginLayoutParams android.view.ViewGroup.LayoutParams java.lang.Object Pandroid.widget.GridLayout.LayoutParams android.view.ViewGroup.MarginLayoutParams android.view.ViewGroup.LayoutParams java.lang.Object -Pandroid.widget.AbsoluteLayout.LayoutParams android.view.ViewGroup.LayoutParams java.lang.Object Pandroid.widget.FrameLayout.LayoutParams android.view.ViewGroup.MarginLayoutParams android.view.ViewGroup.LayoutParams java.lang.Object -Pandroid.widget.TableRow.LayoutParams android.widget.LinearLayout.LayoutParams android.view.ViewGroup.MarginLayoutParams android.view.ViewGroup.LayoutParams java.lang.Object -Pandroid.widget.LinearLayout.LayoutParams android.view.ViewGroup.MarginLayoutParams android.view.ViewGroup.LayoutParams java.lang.Object -Pandroid.widget.ActionMenuView.LayoutParams android.widget.LinearLayout.LayoutParams android.view.ViewGroup.MarginLayoutParams android.view.ViewGroup.LayoutParams java.lang.Object Pandroid.widget.RelativeLayout.LayoutParams android.view.ViewGroup.MarginLayoutParams android.view.ViewGroup.LayoutParams java.lang.Object +Pandroid.widget.LinearLayout.LayoutParams android.view.ViewGroup.MarginLayoutParams android.view.ViewGroup.LayoutParams java.lang.Object +Pandroid.widget.AbsoluteLayout.LayoutParams android.view.ViewGroup.LayoutParams java.lang.Object Pandroid.widget.RadioGroup.LayoutParams android.widget.LinearLayout.LayoutParams android.view.ViewGroup.MarginLayoutParams android.view.ViewGroup.LayoutParams java.lang.Object -Pandroid.widget.TableLayout.LayoutParams android.widget.LinearLayout.LayoutParams android.view.ViewGroup.MarginLayoutParams android.view.ViewGroup.LayoutParams java.lang.Object -Landroid.widget.SlidingDrawer android.view.ViewGroup android.view.View java.lang.Object -Landroid.widget.TableLayout android.widget.LinearLayout android.view.ViewGroup android.view.View java.lang.Object -Landroid.widget.LinearLayout android.view.ViewGroup android.view.View java.lang.Object -Landroid.widget.ImageSwitcher android.widget.ViewSwitcher android.widget.ViewAnimator android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object +Pandroid.widget.ActionMenuView.LayoutParams android.widget.LinearLayout.LayoutParams android.view.ViewGroup.MarginLayoutParams android.view.ViewGroup.LayoutParams java.lang.Object +Landroid.widget.MediaController android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object +Landroid.widget.SearchView android.widget.LinearLayout android.view.ViewGroup android.view.View java.lang.Object Landroid.widget.TextSwitcher android.widget.ViewSwitcher android.widget.ViewAnimator android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object -Landroid.widget.ScrollView android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object +Landroid.widget.AdapterViewFlipper android.widget.AdapterViewAnimator android.widget.AdapterView android.view.ViewGroup android.view.View java.lang.Object Landroid.widget.ActionMenuView android.widget.LinearLayout android.view.ViewGroup android.view.View java.lang.Object -Landroid.widget.ListView android.widget.AbsListView android.widget.AdapterView android.view.ViewGroup android.view.View java.lang.Object -Landroid.widget.ViewFlipper android.widget.ViewAnimator android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object -Landroid.widget.TableRow android.widget.LinearLayout android.view.ViewGroup android.view.View java.lang.Object -Landroid.widget.MediaController android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object Landroid.widget.RadioGroup android.widget.LinearLayout android.view.ViewGroup android.view.View java.lang.Object +Landroid.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object Landroid.widget.ViewAnimator android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object -Landroid.widget.Toolbar android.view.ViewGroup android.view.View java.lang.Object Landroid.widget.TabHost android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object -Landroid.widget.RelativeLayout android.view.ViewGroup android.view.View java.lang.Object -Landroid.widget.AdapterViewFlipper android.widget.AdapterViewAnimator android.widget.AdapterView android.view.ViewGroup android.view.View java.lang.Object -Landroid.widget.StackView android.widget.AdapterViewAnimator android.widget.AdapterView android.view.ViewGroup android.view.View java.lang.Object -Landroid.widget.SearchView android.widget.LinearLayout android.view.ViewGroup android.view.View java.lang.Object Landroid.widget.HorizontalScrollView android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object -Landroid.widget.GridLayout android.view.ViewGroup android.view.View java.lang.Object -Landroid.widget.TabWidget android.widget.LinearLayout android.view.ViewGroup android.view.View java.lang.Object -Landroid.widget.AbsoluteLayout android.view.ViewGroup android.view.View java.lang.Object -Landroid.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object +Landroid.widget.Toolbar android.view.ViewGroup android.view.View java.lang.Object +Landroid.widget.LinearLayout android.view.ViewGroup android.view.View java.lang.Object +Landroid.widget.TableLayout android.widget.LinearLayout android.view.ViewGroup android.view.View java.lang.Object +Landroid.widget.ListView android.widget.AbsListView android.widget.AdapterView android.view.ViewGroup android.view.View java.lang.Object +Landroid.widget.SlidingDrawer android.view.ViewGroup android.view.View java.lang.Object Landroid.widget.ExpandableListView android.widget.ListView android.widget.AbsListView android.widget.AdapterView android.view.ViewGroup android.view.View java.lang.Object +Landroid.widget.TabWidget android.widget.LinearLayout android.view.ViewGroup android.view.View java.lang.Object +Landroid.widget.StackView android.widget.AdapterViewAnimator android.widget.AdapterView android.view.ViewGroup android.view.View java.lang.Object Landroid.widget.GridView android.widget.AbsListView android.widget.AdapterView android.view.ViewGroup android.view.View java.lang.Object +Landroid.widget.ScrollView android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object Landroid.widget.ViewSwitcher android.widget.ViewAnimator android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object +Landroid.widget.AbsoluteLayout android.view.ViewGroup android.view.View java.lang.Object Landroid.widget.DialerFilter android.widget.RelativeLayout android.view.ViewGroup android.view.View java.lang.Object +Landroid.widget.TableRow android.widget.LinearLayout android.view.ViewGroup android.view.View java.lang.Object +Landroid.widget.ImageSwitcher android.widget.ViewSwitcher android.widget.ViewAnimator android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object +Landroid.widget.ViewFlipper android.widget.ViewAnimator android.widget.FrameLayout android.view.ViewGroup android.view.View java.lang.Object +Landroid.widget.GridLayout android.view.ViewGroup android.view.View java.lang.Object +Landroid.widget.RelativeLayout android.view.ViewGroup android.view.View java.lang.Object diff --git a/uiautomator.jar b/uiautomator.jar Binary files differindex 696cafb7..f7313541 100644 --- a/uiautomator.jar +++ b/uiautomator.jar |