diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5f0b377c..4bb5763e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,4 +1,4 @@ - + @@ -15,9 +15,8 @@ - - + diff --git a/apktool.yml b/apktool.yml index de83ff4d..56348aeb 100644 --- a/apktool.yml +++ b/apktool.yml @@ -30,13 +30,53 @@ doNotCompress: - META-INF/androidx.versionedparcelable_versionedparcelable.version - META-INF/androidx.viewpager_viewpager.version - png +- assets/myapp/node_modules/axios/index.js +- assets/myapp/node_modules/better-assert/Makefile +- assets/myapp/node_modules/callsite/Makefile +- assets/myapp/node_modules/engine.io-client/node_modules/debug/node.js +- assets/myapp/node_modules/engine.io/node_modules/debug/node.js +- assets/myapp/node_modules/follow-redirects/http.js +- assets/myapp/node_modules/follow-redirects/https.js +- assets/myapp/node_modules/follow-redirects/node_modules/debug/node.js +- assets/myapp/node_modules/localtunnel/node_modules/debug/node.js +- assets/myapp/node_modules/parseqs/Makefile +- assets/myapp/node_modules/parseuri/Makefile +- assets/myapp/node_modules/resolve/test/dotdot/index.js +- assets/myapp/node_modules/resolve/test/dotdot/abc/index.js +- assets/myapp/node_modules/resolve/test/module_dir/xmodules/aaa/index.js +- assets/myapp/node_modules/resolve/test/module_dir/ymodules/aaa/index.js +- assets/myapp/node_modules/resolve/test/module_dir/zmodules/bbb/main.js +- assets/myapp/node_modules/resolve/test/node_path/x/aaa/index.js +- assets/myapp/node_modules/resolve/test/node_path/x/ccc/index.js +- assets/myapp/node_modules/resolve/test/node_path/y/bbb/index.js +- assets/myapp/node_modules/resolve/test/node_path/y/ccc/index.js +- assets/myapp/node_modules/resolve/test/precedence/aaa.js +- assets/myapp/node_modules/resolve/test/precedence/bbb.js +- assets/myapp/node_modules/resolve/test/precedence/aaa/index.js +- assets/myapp/node_modules/resolve/test/precedence/aaa/main.js +- assets/myapp/node_modules/resolve/test/precedence/bbb/main.js +- assets/myapp/node_modules/resolve/test/resolver/cup.coffee +- assets/myapp/node_modules/resolve/test/resolver/foo.js +- assets/myapp/node_modules/resolve/test/resolver/baz/package.json +- assets/myapp/node_modules/resolve/test/resolver/baz/quux.js +- assets/myapp/node_modules/resolve/test/resolver/dot_main/index.js +- assets/myapp/node_modules/resolve/test/resolver/dot_main/package.json +- assets/myapp/node_modules/resolve/test/resolver/dot_slash_main/index.js +- assets/myapp/node_modules/resolve/test/resolver/dot_slash_main/package.json +- assets/myapp/node_modules/resolve/test/resolver/incorrect_main/package.json +- assets/myapp/node_modules/resolve/test/resolver/quux/foo/index.js +- assets/myapp/node_modules/resolve/test/resolver/same_names/foo.js +- assets/myapp/node_modules/resolve/test/resolver/same_names/foo/index.js +- assets/myapp/node_modules/socket.io-client/node_modules/debug/node.js +- assets/myapp/node_modules/socket.io-parser/node_modules/debug/node.js +- assets/myapp/node_modules/xmlhttprequest-ssl/tests/testdata.txt isFrameworkApk: false packageInfo: forcedPackageId: '127' renameManifestPackage: null sdkInfo: minSdkVersion: '19' - targetSdkVersion: '33' + targetSdkVersion: '30' sharedLibrary: false sparseResources: false unknownFiles: {} @@ -44,7 +84,7 @@ usesFramework: ids: - 1 tag: null -version: 2.6.1 +version: 2.4.1 versionInfo: versionCode: '1' versionName: '1.0' diff --git a/config.json b/config.json index d00f9c29..633f0df1 100644 --- a/config.json +++ b/config.json @@ -1,3 +1,3 @@ { - "version": "2.3.0" + "version": "2.2.0" } \ No newline at end of file diff --git a/lib/arm64-v8a/libc++_shared.so b/lib/arm64-v8a/libc++_shared.so index 28e56e0e..d61523b6 100644 Binary files a/lib/arm64-v8a/libc++_shared.so and b/lib/arm64-v8a/libc++_shared.so differ diff --git a/lib/arm64-v8a/libnative-lib.so b/lib/arm64-v8a/libnative-lib.so index 23041e2a..b3c12aba 100644 Binary files a/lib/arm64-v8a/libnative-lib.so and b/lib/arm64-v8a/libnative-lib.so differ diff --git a/lib/arm64-v8a/libnode.so b/lib/arm64-v8a/libnode.so index afd74251..db4f20b4 100644 Binary files a/lib/arm64-v8a/libnode.so and b/lib/arm64-v8a/libnode.so differ diff --git a/lib/armeabi-v7a/libc++_shared.so b/lib/armeabi-v7a/libc++_shared.so index 0e9858b0..35fee08a 100644 Binary files a/lib/armeabi-v7a/libc++_shared.so and b/lib/armeabi-v7a/libc++_shared.so differ diff --git a/lib/armeabi-v7a/libnative-lib.so b/lib/armeabi-v7a/libnative-lib.so index c157548a..5eeb22b7 100644 Binary files a/lib/armeabi-v7a/libnative-lib.so and b/lib/armeabi-v7a/libnative-lib.so differ diff --git a/lib/armeabi-v7a/libnode.so b/lib/armeabi-v7a/libnode.so index f3341598..69fc607b 100644 Binary files a/lib/armeabi-v7a/libnode.so and b/lib/armeabi-v7a/libnode.so differ diff --git a/lib/x86/libc++_shared.so b/lib/x86/libc++_shared.so index 562d161c..11438614 100644 Binary files a/lib/x86/libc++_shared.so and b/lib/x86/libc++_shared.so differ diff --git a/lib/x86/libnative-lib.so b/lib/x86/libnative-lib.so index 3161c7c3..332260b5 100644 Binary files a/lib/x86/libnative-lib.so and b/lib/x86/libnative-lib.so differ diff --git a/lib/x86/libnode.so b/lib/x86/libnode.so index bdc171c0..fc871730 100644 Binary files a/lib/x86/libnode.so and b/lib/x86/libnode.so differ diff --git a/lib/x86_64/libc++_shared.so b/lib/x86_64/libc++_shared.so index 62d69c44..739341ec 100644 Binary files a/lib/x86_64/libc++_shared.so and b/lib/x86_64/libc++_shared.so differ diff --git a/lib/x86_64/libnative-lib.so b/lib/x86_64/libnative-lib.so index 6815cda6..b7c49866 100644 Binary files a/lib/x86_64/libnative-lib.so and b/lib/x86_64/libnative-lib.so differ diff --git a/lib/x86_64/libnode.so b/lib/x86_64/libnode.so index 3fa86348..c1556a64 100644 Binary files a/lib/x86_64/libnode.so and b/lib/x86_64/libnode.so differ diff --git a/original/AndroidManifest.xml b/original/AndroidManifest.xml index ca122bc9..0c05062b 100644 Binary files a/original/AndroidManifest.xml and b/original/AndroidManifest.xml differ diff --git a/original/META-INF/MANIFEST.MF b/original/META-INF/MANIFEST.MF new file mode 100644 index 00000000..50e19231 --- /dev/null +++ b/original/META-INF/MANIFEST.MF @@ -0,0 +1,4 @@ +Manifest-Version: 1.0 +Built-By: Generated-by-ADT +Created-By: Android Gradle 3.4.0 + diff --git a/original/META-INF/com/android/build/gradle/app-metadata.properties b/original/META-INF/com/android/build/gradle/app-metadata.properties deleted file mode 100644 index 6dd68ca6..00000000 --- a/original/META-INF/com/android/build/gradle/app-metadata.properties +++ /dev/null @@ -1,2 +0,0 @@ -appMetadataVersion=1.1 -androidGradlePluginVersion=7.3.0 diff --git a/res/drawable-hdpi/abc_ab_share_pack_mtrl_alpha.9.png b/res/drawable-hdpi/abc_ab_share_pack_mtrl_alpha.9.png index b07da0cf..86404d5f 100644 Binary files a/res/drawable-hdpi/abc_ab_share_pack_mtrl_alpha.9.png and b/res/drawable-hdpi/abc_ab_share_pack_mtrl_alpha.9.png differ diff --git a/res/drawable-hdpi/abc_btn_switch_to_on_mtrl_00001.9.png b/res/drawable-hdpi/abc_btn_switch_to_on_mtrl_00001.9.png index 88f1767f..bab952a8 100644 Binary files a/res/drawable-hdpi/abc_btn_switch_to_on_mtrl_00001.9.png and b/res/drawable-hdpi/abc_btn_switch_to_on_mtrl_00001.9.png differ diff --git a/res/drawable-hdpi/abc_btn_switch_to_on_mtrl_00012.9.png b/res/drawable-hdpi/abc_btn_switch_to_on_mtrl_00012.9.png index ede060d8..ea0915fd 100644 Binary files a/res/drawable-hdpi/abc_btn_switch_to_on_mtrl_00012.9.png and b/res/drawable-hdpi/abc_btn_switch_to_on_mtrl_00012.9.png differ diff --git a/res/drawable-hdpi/abc_cab_background_top_mtrl_alpha.9.png b/res/drawable-hdpi/abc_cab_background_top_mtrl_alpha.9.png index e51ef280..91e2cbab 100644 Binary files a/res/drawable-hdpi/abc_cab_background_top_mtrl_alpha.9.png and b/res/drawable-hdpi/abc_cab_background_top_mtrl_alpha.9.png differ diff --git a/res/drawable-hdpi/abc_list_divider_mtrl_alpha.9.png b/res/drawable-hdpi/abc_list_divider_mtrl_alpha.9.png index 8281aa0c..b8b83bca 100644 Binary files a/res/drawable-hdpi/abc_list_divider_mtrl_alpha.9.png and b/res/drawable-hdpi/abc_list_divider_mtrl_alpha.9.png differ diff --git a/res/drawable-hdpi/abc_list_focused_holo.9.png b/res/drawable-hdpi/abc_list_focused_holo.9.png index 162f6b28..1ea6c2b3 100644 Binary files a/res/drawable-hdpi/abc_list_focused_holo.9.png and b/res/drawable-hdpi/abc_list_focused_holo.9.png differ diff --git a/res/drawable-hdpi/abc_list_longpressed_holo.9.png b/res/drawable-hdpi/abc_list_longpressed_holo.9.png index 9f3faf3b..6a25bb0f 100644 Binary files a/res/drawable-hdpi/abc_list_longpressed_holo.9.png and b/res/drawable-hdpi/abc_list_longpressed_holo.9.png differ diff --git a/res/drawable-hdpi/abc_list_pressed_holo_dark.9.png b/res/drawable-hdpi/abc_list_pressed_holo_dark.9.png index bb513c85..06a466ef 100644 Binary files a/res/drawable-hdpi/abc_list_pressed_holo_dark.9.png and b/res/drawable-hdpi/abc_list_pressed_holo_dark.9.png differ diff --git a/res/drawable-hdpi/abc_list_pressed_holo_light.9.png b/res/drawable-hdpi/abc_list_pressed_holo_light.9.png index 3dfff36f..c03c03ef 100644 Binary files a/res/drawable-hdpi/abc_list_pressed_holo_light.9.png and b/res/drawable-hdpi/abc_list_pressed_holo_light.9.png differ diff --git a/res/drawable-hdpi/abc_list_selector_disabled_holo_dark.9.png b/res/drawable-hdpi/abc_list_selector_disabled_holo_dark.9.png index 91227632..07ec1d8d 100644 Binary files a/res/drawable-hdpi/abc_list_selector_disabled_holo_dark.9.png and b/res/drawable-hdpi/abc_list_selector_disabled_holo_dark.9.png differ diff --git a/res/drawable-hdpi/abc_list_selector_disabled_holo_light.9.png b/res/drawable-hdpi/abc_list_selector_disabled_holo_light.9.png index 132742f8..8e21a85b 100644 Binary files a/res/drawable-hdpi/abc_list_selector_disabled_holo_light.9.png and b/res/drawable-hdpi/abc_list_selector_disabled_holo_light.9.png differ diff --git a/res/drawable-hdpi/abc_menu_hardkey_panel_mtrl_mult.9.png b/res/drawable-hdpi/abc_menu_hardkey_panel_mtrl_mult.9.png index 1cca93af..81cd1322 100644 Binary files a/res/drawable-hdpi/abc_menu_hardkey_panel_mtrl_mult.9.png and b/res/drawable-hdpi/abc_menu_hardkey_panel_mtrl_mult.9.png differ diff --git a/res/drawable-hdpi/abc_popup_background_mtrl_mult.9.png b/res/drawable-hdpi/abc_popup_background_mtrl_mult.9.png index efa87b95..e9874e72 100644 Binary files a/res/drawable-hdpi/abc_popup_background_mtrl_mult.9.png and b/res/drawable-hdpi/abc_popup_background_mtrl_mult.9.png differ diff --git a/res/drawable-hdpi/abc_scrubber_primary_mtrl_alpha.9.png b/res/drawable-hdpi/abc_scrubber_primary_mtrl_alpha.9.png index 4cfb1a7c..46d2b3da 100644 Binary files a/res/drawable-hdpi/abc_scrubber_primary_mtrl_alpha.9.png and b/res/drawable-hdpi/abc_scrubber_primary_mtrl_alpha.9.png differ diff --git a/res/drawable-hdpi/abc_scrubber_track_mtrl_alpha.9.png b/res/drawable-hdpi/abc_scrubber_track_mtrl_alpha.9.png index 32ddf7a9..62bb3686 100644 Binary files a/res/drawable-hdpi/abc_scrubber_track_mtrl_alpha.9.png and b/res/drawable-hdpi/abc_scrubber_track_mtrl_alpha.9.png differ diff --git a/res/drawable-hdpi/abc_spinner_mtrl_am_alpha.9.png b/res/drawable-hdpi/abc_spinner_mtrl_am_alpha.9.png index 0d730a3f..1a836b20 100644 Binary files a/res/drawable-hdpi/abc_spinner_mtrl_am_alpha.9.png and b/res/drawable-hdpi/abc_spinner_mtrl_am_alpha.9.png differ diff --git a/res/drawable-hdpi/abc_switch_track_mtrl_alpha.9.png b/res/drawable-hdpi/abc_switch_track_mtrl_alpha.9.png index 6ad9b1d2..133133f7 100644 Binary files a/res/drawable-hdpi/abc_switch_track_mtrl_alpha.9.png and b/res/drawable-hdpi/abc_switch_track_mtrl_alpha.9.png differ diff --git a/res/drawable-hdpi/abc_tab_indicator_mtrl_alpha.9.png b/res/drawable-hdpi/abc_tab_indicator_mtrl_alpha.9.png index 21b21357..3d97aa7d 100644 Binary files a/res/drawable-hdpi/abc_tab_indicator_mtrl_alpha.9.png and b/res/drawable-hdpi/abc_tab_indicator_mtrl_alpha.9.png differ diff --git a/res/drawable-hdpi/abc_textfield_activated_mtrl_alpha.9.png b/res/drawable-hdpi/abc_textfield_activated_mtrl_alpha.9.png index 9501e7cd..c9e11b70 100644 Binary files a/res/drawable-hdpi/abc_textfield_activated_mtrl_alpha.9.png and b/res/drawable-hdpi/abc_textfield_activated_mtrl_alpha.9.png differ diff --git a/res/drawable-hdpi/abc_textfield_default_mtrl_alpha.9.png b/res/drawable-hdpi/abc_textfield_default_mtrl_alpha.9.png index 5c542765..9bf968eb 100644 Binary files a/res/drawable-hdpi/abc_textfield_default_mtrl_alpha.9.png and b/res/drawable-hdpi/abc_textfield_default_mtrl_alpha.9.png differ diff --git a/res/drawable-hdpi/abc_textfield_search_activated_mtrl_alpha.9.png b/res/drawable-hdpi/abc_textfield_search_activated_mtrl_alpha.9.png index 70d8d20d..c6853bbe 100644 Binary files a/res/drawable-hdpi/abc_textfield_search_activated_mtrl_alpha.9.png and b/res/drawable-hdpi/abc_textfield_search_activated_mtrl_alpha.9.png differ diff --git a/res/drawable-hdpi/abc_textfield_search_default_mtrl_alpha.9.png b/res/drawable-hdpi/abc_textfield_search_default_mtrl_alpha.9.png index b698c117..f28e0e2c 100644 Binary files a/res/drawable-hdpi/abc_textfield_search_default_mtrl_alpha.9.png and b/res/drawable-hdpi/abc_textfield_search_default_mtrl_alpha.9.png differ diff --git a/res/drawable-hdpi/notification_bg_low_normal.9.png b/res/drawable-hdpi/notification_bg_low_normal.9.png index 5990920c..766620a7 100644 Binary files a/res/drawable-hdpi/notification_bg_low_normal.9.png and b/res/drawable-hdpi/notification_bg_low_normal.9.png differ diff --git a/res/drawable-hdpi/notification_bg_low_pressed.9.png b/res/drawable-hdpi/notification_bg_low_pressed.9.png index 85bdc8d3..cfd771d5 100644 Binary files a/res/drawable-hdpi/notification_bg_low_pressed.9.png and b/res/drawable-hdpi/notification_bg_low_pressed.9.png differ diff --git a/res/drawable-hdpi/notification_bg_normal.9.png b/res/drawable-hdpi/notification_bg_normal.9.png index 99b5c521..b4a987a0 100644 Binary files a/res/drawable-hdpi/notification_bg_normal.9.png and b/res/drawable-hdpi/notification_bg_normal.9.png differ diff --git a/res/drawable-hdpi/notification_bg_normal_pressed.9.png b/res/drawable-hdpi/notification_bg_normal_pressed.9.png index ec3e5be4..e218739a 100644 Binary files a/res/drawable-hdpi/notification_bg_normal_pressed.9.png and b/res/drawable-hdpi/notification_bg_normal_pressed.9.png differ diff --git a/res/drawable-ldrtl-hdpi/abc_spinner_mtrl_am_alpha.9.png b/res/drawable-ldrtl-hdpi/abc_spinner_mtrl_am_alpha.9.png index d6e0b998..340c8553 100644 Binary files a/res/drawable-ldrtl-hdpi/abc_spinner_mtrl_am_alpha.9.png and b/res/drawable-ldrtl-hdpi/abc_spinner_mtrl_am_alpha.9.png differ diff --git a/res/drawable-ldrtl-mdpi/abc_spinner_mtrl_am_alpha.9.png b/res/drawable-ldrtl-mdpi/abc_spinner_mtrl_am_alpha.9.png index 74160c38..d9adfe01 100644 Binary files a/res/drawable-ldrtl-mdpi/abc_spinner_mtrl_am_alpha.9.png and b/res/drawable-ldrtl-mdpi/abc_spinner_mtrl_am_alpha.9.png differ diff --git a/res/drawable-ldrtl-xhdpi/abc_spinner_mtrl_am_alpha.9.png b/res/drawable-ldrtl-xhdpi/abc_spinner_mtrl_am_alpha.9.png index 2d633346..06314466 100644 Binary files a/res/drawable-ldrtl-xhdpi/abc_spinner_mtrl_am_alpha.9.png and b/res/drawable-ldrtl-xhdpi/abc_spinner_mtrl_am_alpha.9.png differ diff --git a/res/drawable-ldrtl-xxhdpi/abc_spinner_mtrl_am_alpha.9.png b/res/drawable-ldrtl-xxhdpi/abc_spinner_mtrl_am_alpha.9.png index bd1029d8..297361e9 100644 Binary files a/res/drawable-ldrtl-xxhdpi/abc_spinner_mtrl_am_alpha.9.png and b/res/drawable-ldrtl-xxhdpi/abc_spinner_mtrl_am_alpha.9.png differ diff --git a/res/drawable-ldrtl-xxxhdpi/abc_spinner_mtrl_am_alpha.9.png b/res/drawable-ldrtl-xxxhdpi/abc_spinner_mtrl_am_alpha.9.png index b1641732..136caef1 100644 Binary files a/res/drawable-ldrtl-xxxhdpi/abc_spinner_mtrl_am_alpha.9.png and b/res/drawable-ldrtl-xxxhdpi/abc_spinner_mtrl_am_alpha.9.png differ diff --git a/res/drawable-mdpi/abc_ab_share_pack_mtrl_alpha.9.png b/res/drawable-mdpi/abc_ab_share_pack_mtrl_alpha.9.png index f31730dc..3c019190 100644 Binary files a/res/drawable-mdpi/abc_ab_share_pack_mtrl_alpha.9.png and b/res/drawable-mdpi/abc_ab_share_pack_mtrl_alpha.9.png differ diff --git a/res/drawable-mdpi/abc_btn_switch_to_on_mtrl_00001.9.png b/res/drawable-mdpi/abc_btn_switch_to_on_mtrl_00001.9.png index d890a62a..7a9be659 100644 Binary files a/res/drawable-mdpi/abc_btn_switch_to_on_mtrl_00001.9.png and b/res/drawable-mdpi/abc_btn_switch_to_on_mtrl_00001.9.png differ diff --git a/res/drawable-mdpi/abc_btn_switch_to_on_mtrl_00012.9.png b/res/drawable-mdpi/abc_btn_switch_to_on_mtrl_00012.9.png index 06204394..2dfa4e82 100644 Binary files a/res/drawable-mdpi/abc_btn_switch_to_on_mtrl_00012.9.png and b/res/drawable-mdpi/abc_btn_switch_to_on_mtrl_00012.9.png differ diff --git a/res/drawable-mdpi/abc_cab_background_top_mtrl_alpha.9.png b/res/drawable-mdpi/abc_cab_background_top_mtrl_alpha.9.png index ae8cccdd..33829270 100644 Binary files a/res/drawable-mdpi/abc_cab_background_top_mtrl_alpha.9.png and b/res/drawable-mdpi/abc_cab_background_top_mtrl_alpha.9.png differ diff --git a/res/drawable-mdpi/abc_list_divider_mtrl_alpha.9.png b/res/drawable-mdpi/abc_list_divider_mtrl_alpha.9.png index 8281aa0c..b8b83bca 100644 Binary files a/res/drawable-mdpi/abc_list_divider_mtrl_alpha.9.png and b/res/drawable-mdpi/abc_list_divider_mtrl_alpha.9.png differ diff --git a/res/drawable-mdpi/abc_list_focused_holo.9.png b/res/drawable-mdpi/abc_list_focused_holo.9.png index d491c57e..0f42462d 100644 Binary files a/res/drawable-mdpi/abc_list_focused_holo.9.png and b/res/drawable-mdpi/abc_list_focused_holo.9.png differ diff --git a/res/drawable-mdpi/abc_list_longpressed_holo.9.png b/res/drawable-mdpi/abc_list_longpressed_holo.9.png index 9548c3e3..152cdc4a 100644 Binary files a/res/drawable-mdpi/abc_list_longpressed_holo.9.png and b/res/drawable-mdpi/abc_list_longpressed_holo.9.png differ diff --git a/res/drawable-mdpi/abc_list_pressed_holo_dark.9.png b/res/drawable-mdpi/abc_list_pressed_holo_dark.9.png index c80f7dc7..f11a2907 100644 Binary files a/res/drawable-mdpi/abc_list_pressed_holo_dark.9.png and b/res/drawable-mdpi/abc_list_pressed_holo_dark.9.png differ diff --git a/res/drawable-mdpi/abc_list_pressed_holo_light.9.png b/res/drawable-mdpi/abc_list_pressed_holo_light.9.png index c861b6bb..f39bbb33 100644 Binary files a/res/drawable-mdpi/abc_list_pressed_holo_light.9.png and b/res/drawable-mdpi/abc_list_pressed_holo_light.9.png differ diff --git a/res/drawable-mdpi/abc_list_selector_disabled_holo_dark.9.png b/res/drawable-mdpi/abc_list_selector_disabled_holo_dark.9.png index 82eac431..fb830589 100644 Binary files a/res/drawable-mdpi/abc_list_selector_disabled_holo_dark.9.png and b/res/drawable-mdpi/abc_list_selector_disabled_holo_dark.9.png differ diff --git a/res/drawable-mdpi/abc_list_selector_disabled_holo_light.9.png b/res/drawable-mdpi/abc_list_selector_disabled_holo_light.9.png index 2d3ef3f0..1f8c23e1 100644 Binary files a/res/drawable-mdpi/abc_list_selector_disabled_holo_light.9.png and b/res/drawable-mdpi/abc_list_selector_disabled_holo_light.9.png differ diff --git a/res/drawable-mdpi/abc_menu_hardkey_panel_mtrl_mult.9.png b/res/drawable-mdpi/abc_menu_hardkey_panel_mtrl_mult.9.png index 4d63d481..12df165c 100644 Binary files a/res/drawable-mdpi/abc_menu_hardkey_panel_mtrl_mult.9.png and b/res/drawable-mdpi/abc_menu_hardkey_panel_mtrl_mult.9.png differ diff --git a/res/drawable-mdpi/abc_popup_background_mtrl_mult.9.png b/res/drawable-mdpi/abc_popup_background_mtrl_mult.9.png index 161b848a..81b83d41 100644 Binary files a/res/drawable-mdpi/abc_popup_background_mtrl_mult.9.png and b/res/drawable-mdpi/abc_popup_background_mtrl_mult.9.png differ diff --git a/res/drawable-mdpi/abc_scrubber_primary_mtrl_alpha.9.png b/res/drawable-mdpi/abc_scrubber_primary_mtrl_alpha.9.png index a4ab0a1e..70ea71e5 100644 Binary files a/res/drawable-mdpi/abc_scrubber_primary_mtrl_alpha.9.png and b/res/drawable-mdpi/abc_scrubber_primary_mtrl_alpha.9.png differ diff --git a/res/drawable-mdpi/abc_scrubber_track_mtrl_alpha.9.png b/res/drawable-mdpi/abc_scrubber_track_mtrl_alpha.9.png index db9e172d..081b19b8 100644 Binary files a/res/drawable-mdpi/abc_scrubber_track_mtrl_alpha.9.png and b/res/drawable-mdpi/abc_scrubber_track_mtrl_alpha.9.png differ diff --git a/res/drawable-mdpi/abc_spinner_mtrl_am_alpha.9.png b/res/drawable-mdpi/abc_spinner_mtrl_am_alpha.9.png index b140e012..caaa9639 100644 Binary files a/res/drawable-mdpi/abc_spinner_mtrl_am_alpha.9.png and b/res/drawable-mdpi/abc_spinner_mtrl_am_alpha.9.png differ diff --git a/res/drawable-mdpi/abc_switch_track_mtrl_alpha.9.png b/res/drawable-mdpi/abc_switch_track_mtrl_alpha.9.png index 00c81fca..83454d89 100644 Binary files a/res/drawable-mdpi/abc_switch_track_mtrl_alpha.9.png and b/res/drawable-mdpi/abc_switch_track_mtrl_alpha.9.png differ diff --git a/res/drawable-mdpi/abc_tab_indicator_mtrl_alpha.9.png b/res/drawable-mdpi/abc_tab_indicator_mtrl_alpha.9.png index b69529cb..9ad0a326 100644 Binary files a/res/drawable-mdpi/abc_tab_indicator_mtrl_alpha.9.png and b/res/drawable-mdpi/abc_tab_indicator_mtrl_alpha.9.png differ diff --git a/res/drawable-mdpi/abc_textfield_activated_mtrl_alpha.9.png b/res/drawable-mdpi/abc_textfield_activated_mtrl_alpha.9.png index 45db6f71..0454946f 100644 Binary files a/res/drawable-mdpi/abc_textfield_activated_mtrl_alpha.9.png and b/res/drawable-mdpi/abc_textfield_activated_mtrl_alpha.9.png differ diff --git a/res/drawable-mdpi/abc_textfield_default_mtrl_alpha.9.png b/res/drawable-mdpi/abc_textfield_default_mtrl_alpha.9.png index 6e4d857e..c92832e3 100644 Binary files a/res/drawable-mdpi/abc_textfield_default_mtrl_alpha.9.png and b/res/drawable-mdpi/abc_textfield_default_mtrl_alpha.9.png differ diff --git a/res/drawable-mdpi/abc_textfield_search_activated_mtrl_alpha.9.png b/res/drawable-mdpi/abc_textfield_search_activated_mtrl_alpha.9.png index 514d00a8..77c2955c 100644 Binary files a/res/drawable-mdpi/abc_textfield_search_activated_mtrl_alpha.9.png and b/res/drawable-mdpi/abc_textfield_search_activated_mtrl_alpha.9.png differ diff --git a/res/drawable-mdpi/abc_textfield_search_default_mtrl_alpha.9.png b/res/drawable-mdpi/abc_textfield_search_default_mtrl_alpha.9.png index 1eeceb5d..847119cb 100644 Binary files a/res/drawable-mdpi/abc_textfield_search_default_mtrl_alpha.9.png and b/res/drawable-mdpi/abc_textfield_search_default_mtrl_alpha.9.png differ diff --git a/res/drawable-mdpi/notification_bg_low_normal.9.png b/res/drawable-mdpi/notification_bg_low_normal.9.png index 8f64c7ad..28b7c422 100644 Binary files a/res/drawable-mdpi/notification_bg_low_normal.9.png and b/res/drawable-mdpi/notification_bg_low_normal.9.png differ diff --git a/res/drawable-mdpi/notification_bg_low_pressed.9.png b/res/drawable-mdpi/notification_bg_low_pressed.9.png index 8f5b241e..b45c6cdc 100644 Binary files a/res/drawable-mdpi/notification_bg_low_pressed.9.png and b/res/drawable-mdpi/notification_bg_low_pressed.9.png differ diff --git a/res/drawable-mdpi/notification_bg_normal.9.png b/res/drawable-mdpi/notification_bg_normal.9.png index 483b3480..ef2b40df 100644 Binary files a/res/drawable-mdpi/notification_bg_normal.9.png and b/res/drawable-mdpi/notification_bg_normal.9.png differ diff --git a/res/drawable-mdpi/notification_bg_normal_pressed.9.png b/res/drawable-mdpi/notification_bg_normal_pressed.9.png index a60fb473..d9157336 100644 Binary files a/res/drawable-mdpi/notification_bg_normal_pressed.9.png and b/res/drawable-mdpi/notification_bg_normal_pressed.9.png differ diff --git a/res/drawable-xhdpi/abc_ab_share_pack_mtrl_alpha.9.png b/res/drawable-xhdpi/abc_ab_share_pack_mtrl_alpha.9.png index 8337ffe7..7b5b579c 100644 Binary files a/res/drawable-xhdpi/abc_ab_share_pack_mtrl_alpha.9.png and b/res/drawable-xhdpi/abc_ab_share_pack_mtrl_alpha.9.png differ diff --git a/res/drawable-xhdpi/abc_btn_switch_to_on_mtrl_00001.9.png b/res/drawable-xhdpi/abc_btn_switch_to_on_mtrl_00001.9.png index ff14a288..efd0c473 100644 Binary files a/res/drawable-xhdpi/abc_btn_switch_to_on_mtrl_00001.9.png and b/res/drawable-xhdpi/abc_btn_switch_to_on_mtrl_00001.9.png differ diff --git a/res/drawable-xhdpi/abc_btn_switch_to_on_mtrl_00012.9.png b/res/drawable-xhdpi/abc_btn_switch_to_on_mtrl_00012.9.png index d02b59df..cc7d8cad 100644 Binary files a/res/drawable-xhdpi/abc_btn_switch_to_on_mtrl_00012.9.png and b/res/drawable-xhdpi/abc_btn_switch_to_on_mtrl_00012.9.png differ diff --git a/res/drawable-xhdpi/abc_cab_background_top_mtrl_alpha.9.png b/res/drawable-xhdpi/abc_cab_background_top_mtrl_alpha.9.png index ed8d3411..247cf4ea 100644 Binary files a/res/drawable-xhdpi/abc_cab_background_top_mtrl_alpha.9.png and b/res/drawable-xhdpi/abc_cab_background_top_mtrl_alpha.9.png differ diff --git a/res/drawable-xhdpi/abc_list_divider_mtrl_alpha.9.png b/res/drawable-xhdpi/abc_list_divider_mtrl_alpha.9.png index 8281aa0c..b8b83bca 100644 Binary files a/res/drawable-xhdpi/abc_list_divider_mtrl_alpha.9.png and b/res/drawable-xhdpi/abc_list_divider_mtrl_alpha.9.png differ diff --git a/res/drawable-xhdpi/abc_list_focused_holo.9.png b/res/drawable-xhdpi/abc_list_focused_holo.9.png index 54864d27..edbb3d6e 100644 Binary files a/res/drawable-xhdpi/abc_list_focused_holo.9.png and b/res/drawable-xhdpi/abc_list_focused_holo.9.png differ diff --git a/res/drawable-xhdpi/abc_list_longpressed_holo.9.png b/res/drawable-xhdpi/abc_list_longpressed_holo.9.png index e9219047..92d96f26 100644 Binary files a/res/drawable-xhdpi/abc_list_longpressed_holo.9.png and b/res/drawable-xhdpi/abc_list_longpressed_holo.9.png differ diff --git a/res/drawable-xhdpi/abc_list_pressed_holo_dark.9.png b/res/drawable-xhdpi/abc_list_pressed_holo_dark.9.png index 32b9d8a3..40efd767 100644 Binary files a/res/drawable-xhdpi/abc_list_pressed_holo_dark.9.png and b/res/drawable-xhdpi/abc_list_pressed_holo_dark.9.png differ diff --git a/res/drawable-xhdpi/abc_list_pressed_holo_light.9.png b/res/drawable-xhdpi/abc_list_pressed_holo_light.9.png index f4340d4f..ad4d322b 100644 Binary files a/res/drawable-xhdpi/abc_list_pressed_holo_light.9.png and b/res/drawable-xhdpi/abc_list_pressed_holo_light.9.png differ diff --git a/res/drawable-xhdpi/abc_list_selector_disabled_holo_dark.9.png b/res/drawable-xhdpi/abc_list_selector_disabled_holo_dark.9.png index c63b3261..180cadf1 100644 Binary files a/res/drawable-xhdpi/abc_list_selector_disabled_holo_dark.9.png and b/res/drawable-xhdpi/abc_list_selector_disabled_holo_dark.9.png differ diff --git a/res/drawable-xhdpi/abc_list_selector_disabled_holo_light.9.png b/res/drawable-xhdpi/abc_list_selector_disabled_holo_light.9.png index c7111e55..de38dd96 100644 Binary files a/res/drawable-xhdpi/abc_list_selector_disabled_holo_light.9.png and b/res/drawable-xhdpi/abc_list_selector_disabled_holo_light.9.png differ diff --git a/res/drawable-xhdpi/abc_menu_hardkey_panel_mtrl_mult.9.png b/res/drawable-xhdpi/abc_menu_hardkey_panel_mtrl_mult.9.png index d74538b4..54182a80 100644 Binary files a/res/drawable-xhdpi/abc_menu_hardkey_panel_mtrl_mult.9.png and b/res/drawable-xhdpi/abc_menu_hardkey_panel_mtrl_mult.9.png differ diff --git a/res/drawable-xhdpi/abc_popup_background_mtrl_mult.9.png b/res/drawable-xhdpi/abc_popup_background_mtrl_mult.9.png index 550dbb5d..50142775 100644 Binary files a/res/drawable-xhdpi/abc_popup_background_mtrl_mult.9.png and b/res/drawable-xhdpi/abc_popup_background_mtrl_mult.9.png differ diff --git a/res/drawable-xhdpi/abc_scrubber_primary_mtrl_alpha.9.png b/res/drawable-xhdpi/abc_scrubber_primary_mtrl_alpha.9.png index 2b4734d2..36c711b7 100644 Binary files a/res/drawable-xhdpi/abc_scrubber_primary_mtrl_alpha.9.png and b/res/drawable-xhdpi/abc_scrubber_primary_mtrl_alpha.9.png differ diff --git a/res/drawable-xhdpi/abc_scrubber_track_mtrl_alpha.9.png b/res/drawable-xhdpi/abc_scrubber_track_mtrl_alpha.9.png index 805cb291..ff6c38e5 100644 Binary files a/res/drawable-xhdpi/abc_scrubber_track_mtrl_alpha.9.png and b/res/drawable-xhdpi/abc_scrubber_track_mtrl_alpha.9.png differ diff --git a/res/drawable-xhdpi/abc_spinner_mtrl_am_alpha.9.png b/res/drawable-xhdpi/abc_spinner_mtrl_am_alpha.9.png index 1912360b..7b987a39 100644 Binary files a/res/drawable-xhdpi/abc_spinner_mtrl_am_alpha.9.png and b/res/drawable-xhdpi/abc_spinner_mtrl_am_alpha.9.png differ diff --git a/res/drawable-xhdpi/abc_switch_track_mtrl_alpha.9.png b/res/drawable-xhdpi/abc_switch_track_mtrl_alpha.9.png index f0752d2b..4b096e7d 100644 Binary files a/res/drawable-xhdpi/abc_switch_track_mtrl_alpha.9.png and b/res/drawable-xhdpi/abc_switch_track_mtrl_alpha.9.png differ diff --git a/res/drawable-xhdpi/abc_tab_indicator_mtrl_alpha.9.png b/res/drawable-xhdpi/abc_tab_indicator_mtrl_alpha.9.png index 5610d8c8..f331c907 100644 Binary files a/res/drawable-xhdpi/abc_tab_indicator_mtrl_alpha.9.png and b/res/drawable-xhdpi/abc_tab_indicator_mtrl_alpha.9.png differ diff --git a/res/drawable-xhdpi/abc_textfield_activated_mtrl_alpha.9.png b/res/drawable-xhdpi/abc_textfield_activated_mtrl_alpha.9.png index 8c617fd7..6f2dca2b 100644 Binary files a/res/drawable-xhdpi/abc_textfield_activated_mtrl_alpha.9.png and b/res/drawable-xhdpi/abc_textfield_activated_mtrl_alpha.9.png differ diff --git a/res/drawable-xhdpi/abc_textfield_default_mtrl_alpha.9.png b/res/drawable-xhdpi/abc_textfield_default_mtrl_alpha.9.png index 240ef7b1..a649566d 100644 Binary files a/res/drawable-xhdpi/abc_textfield_default_mtrl_alpha.9.png and b/res/drawable-xhdpi/abc_textfield_default_mtrl_alpha.9.png differ diff --git a/res/drawable-xhdpi/abc_textfield_search_activated_mtrl_alpha.9.png b/res/drawable-xhdpi/abc_textfield_search_activated_mtrl_alpha.9.png index 1a2546fe..6910d899 100644 Binary files a/res/drawable-xhdpi/abc_textfield_search_activated_mtrl_alpha.9.png and b/res/drawable-xhdpi/abc_textfield_search_activated_mtrl_alpha.9.png differ diff --git a/res/drawable-xhdpi/abc_textfield_search_default_mtrl_alpha.9.png b/res/drawable-xhdpi/abc_textfield_search_default_mtrl_alpha.9.png index 500ec332..4aa41f30 100644 Binary files a/res/drawable-xhdpi/abc_textfield_search_default_mtrl_alpha.9.png and b/res/drawable-xhdpi/abc_textfield_search_default_mtrl_alpha.9.png differ diff --git a/res/drawable-xhdpi/notification_bg_low_normal.9.png b/res/drawable-xhdpi/notification_bg_low_normal.9.png index 6c04a390..a5ba934c 100644 Binary files a/res/drawable-xhdpi/notification_bg_low_normal.9.png and b/res/drawable-xhdpi/notification_bg_low_normal.9.png differ diff --git a/res/drawable-xhdpi/notification_bg_low_pressed.9.png b/res/drawable-xhdpi/notification_bg_low_pressed.9.png index c2f04989..a3205750 100644 Binary files a/res/drawable-xhdpi/notification_bg_low_pressed.9.png and b/res/drawable-xhdpi/notification_bg_low_pressed.9.png differ diff --git a/res/drawable-xhdpi/notification_bg_normal.9.png b/res/drawable-xhdpi/notification_bg_normal.9.png index e53a4421..0f5d16d4 100644 Binary files a/res/drawable-xhdpi/notification_bg_normal.9.png and b/res/drawable-xhdpi/notification_bg_normal.9.png differ diff --git a/res/drawable-xhdpi/notification_bg_normal_pressed.9.png b/res/drawable-xhdpi/notification_bg_normal_pressed.9.png index 148dc09a..1a616464 100644 Binary files a/res/drawable-xhdpi/notification_bg_normal_pressed.9.png and b/res/drawable-xhdpi/notification_bg_normal_pressed.9.png differ diff --git a/res/drawable-xxhdpi/abc_ab_share_pack_mtrl_alpha.9.png b/res/drawable-xxhdpi/abc_ab_share_pack_mtrl_alpha.9.png index d6f87f57..81bc1b26 100644 Binary files a/res/drawable-xxhdpi/abc_ab_share_pack_mtrl_alpha.9.png and b/res/drawable-xxhdpi/abc_ab_share_pack_mtrl_alpha.9.png differ diff --git a/res/drawable-xxhdpi/abc_btn_switch_to_on_mtrl_00001.9.png b/res/drawable-xxhdpi/abc_btn_switch_to_on_mtrl_00001.9.png index d25089eb..1558ff1e 100644 Binary files a/res/drawable-xxhdpi/abc_btn_switch_to_on_mtrl_00001.9.png and b/res/drawable-xxhdpi/abc_btn_switch_to_on_mtrl_00001.9.png differ diff --git a/res/drawable-xxhdpi/abc_btn_switch_to_on_mtrl_00012.9.png b/res/drawable-xxhdpi/abc_btn_switch_to_on_mtrl_00012.9.png index 67b9e89b..412d99f8 100644 Binary files a/res/drawable-xxhdpi/abc_btn_switch_to_on_mtrl_00012.9.png and b/res/drawable-xxhdpi/abc_btn_switch_to_on_mtrl_00012.9.png differ diff --git a/res/drawable-xxhdpi/abc_cab_background_top_mtrl_alpha.9.png b/res/drawable-xxhdpi/abc_cab_background_top_mtrl_alpha.9.png index 1dd64b9a..90aaefb2 100644 Binary files a/res/drawable-xxhdpi/abc_cab_background_top_mtrl_alpha.9.png and b/res/drawable-xxhdpi/abc_cab_background_top_mtrl_alpha.9.png differ diff --git a/res/drawable-xxhdpi/abc_list_divider_mtrl_alpha.9.png b/res/drawable-xxhdpi/abc_list_divider_mtrl_alpha.9.png index 12ceb997..f3142086 100644 Binary files a/res/drawable-xxhdpi/abc_list_divider_mtrl_alpha.9.png and b/res/drawable-xxhdpi/abc_list_divider_mtrl_alpha.9.png differ diff --git a/res/drawable-xxhdpi/abc_list_focused_holo.9.png b/res/drawable-xxhdpi/abc_list_focused_holo.9.png index 09c3fe67..c35fc629 100644 Binary files a/res/drawable-xxhdpi/abc_list_focused_holo.9.png and b/res/drawable-xxhdpi/abc_list_focused_holo.9.png differ diff --git a/res/drawable-xxhdpi/abc_list_longpressed_holo.9.png b/res/drawable-xxhdpi/abc_list_longpressed_holo.9.png index d36ca955..6f782551 100644 Binary files a/res/drawable-xxhdpi/abc_list_longpressed_holo.9.png and b/res/drawable-xxhdpi/abc_list_longpressed_holo.9.png differ diff --git a/res/drawable-xxhdpi/abc_list_pressed_holo_dark.9.png b/res/drawable-xxhdpi/abc_list_pressed_holo_dark.9.png index c0055314..f4ddebd4 100644 Binary files a/res/drawable-xxhdpi/abc_list_pressed_holo_dark.9.png and b/res/drawable-xxhdpi/abc_list_pressed_holo_dark.9.png differ diff --git a/res/drawable-xxhdpi/abc_list_pressed_holo_light.9.png b/res/drawable-xxhdpi/abc_list_pressed_holo_light.9.png index d8c917c7..c446b69d 100644 Binary files a/res/drawable-xxhdpi/abc_list_pressed_holo_light.9.png and b/res/drawable-xxhdpi/abc_list_pressed_holo_light.9.png differ diff --git a/res/drawable-xxhdpi/abc_list_selector_disabled_holo_dark.9.png b/res/drawable-xxhdpi/abc_list_selector_disabled_holo_dark.9.png index ef69f606..f915a3c1 100644 Binary files a/res/drawable-xxhdpi/abc_list_selector_disabled_holo_dark.9.png and b/res/drawable-xxhdpi/abc_list_selector_disabled_holo_dark.9.png differ diff --git a/res/drawable-xxhdpi/abc_list_selector_disabled_holo_light.9.png b/res/drawable-xxhdpi/abc_list_selector_disabled_holo_light.9.png index aed1dcdf..4cedca74 100644 Binary files a/res/drawable-xxhdpi/abc_list_selector_disabled_holo_light.9.png and b/res/drawable-xxhdpi/abc_list_selector_disabled_holo_light.9.png differ diff --git a/res/drawable-xxhdpi/abc_menu_hardkey_panel_mtrl_mult.9.png b/res/drawable-xxhdpi/abc_menu_hardkey_panel_mtrl_mult.9.png index 5e154498..4196da4d 100644 Binary files a/res/drawable-xxhdpi/abc_menu_hardkey_panel_mtrl_mult.9.png and b/res/drawable-xxhdpi/abc_menu_hardkey_panel_mtrl_mult.9.png differ diff --git a/res/drawable-xxhdpi/abc_popup_background_mtrl_mult.9.png b/res/drawable-xxhdpi/abc_popup_background_mtrl_mult.9.png index fb7d715f..59ee12df 100644 Binary files a/res/drawable-xxhdpi/abc_popup_background_mtrl_mult.9.png and b/res/drawable-xxhdpi/abc_popup_background_mtrl_mult.9.png differ diff --git a/res/drawable-xxhdpi/abc_scrubber_primary_mtrl_alpha.9.png b/res/drawable-xxhdpi/abc_scrubber_primary_mtrl_alpha.9.png index 8a273e53..b1589bd2 100644 Binary files a/res/drawable-xxhdpi/abc_scrubber_primary_mtrl_alpha.9.png and b/res/drawable-xxhdpi/abc_scrubber_primary_mtrl_alpha.9.png differ diff --git a/res/drawable-xxhdpi/abc_scrubber_track_mtrl_alpha.9.png b/res/drawable-xxhdpi/abc_scrubber_track_mtrl_alpha.9.png index a7b37394..e70d3796 100644 Binary files a/res/drawable-xxhdpi/abc_scrubber_track_mtrl_alpha.9.png and b/res/drawable-xxhdpi/abc_scrubber_track_mtrl_alpha.9.png differ diff --git a/res/drawable-xxhdpi/abc_spinner_mtrl_am_alpha.9.png b/res/drawable-xxhdpi/abc_spinner_mtrl_am_alpha.9.png index d5ef1cdc..d16d5141 100644 Binary files a/res/drawable-xxhdpi/abc_spinner_mtrl_am_alpha.9.png and b/res/drawable-xxhdpi/abc_spinner_mtrl_am_alpha.9.png differ diff --git a/res/drawable-xxhdpi/abc_switch_track_mtrl_alpha.9.png b/res/drawable-xxhdpi/abc_switch_track_mtrl_alpha.9.png index c74b3fcf..11023dc1 100644 Binary files a/res/drawable-xxhdpi/abc_switch_track_mtrl_alpha.9.png and b/res/drawable-xxhdpi/abc_switch_track_mtrl_alpha.9.png differ diff --git a/res/drawable-xxhdpi/abc_tab_indicator_mtrl_alpha.9.png b/res/drawable-xxhdpi/abc_tab_indicator_mtrl_alpha.9.png index 801122d4..ee9693eb 100644 Binary files a/res/drawable-xxhdpi/abc_tab_indicator_mtrl_alpha.9.png and b/res/drawable-xxhdpi/abc_tab_indicator_mtrl_alpha.9.png differ diff --git a/res/drawable-xxhdpi/abc_textfield_activated_mtrl_alpha.9.png b/res/drawable-xxhdpi/abc_textfield_activated_mtrl_alpha.9.png index 778670ab..00e22a4d 100644 Binary files a/res/drawable-xxhdpi/abc_textfield_activated_mtrl_alpha.9.png and b/res/drawable-xxhdpi/abc_textfield_activated_mtrl_alpha.9.png differ diff --git a/res/drawable-xxhdpi/abc_textfield_default_mtrl_alpha.9.png b/res/drawable-xxhdpi/abc_textfield_default_mtrl_alpha.9.png index 6dd5d4fc..88593535 100644 Binary files a/res/drawable-xxhdpi/abc_textfield_default_mtrl_alpha.9.png and b/res/drawable-xxhdpi/abc_textfield_default_mtrl_alpha.9.png differ diff --git a/res/drawable-xxhdpi/abc_textfield_search_activated_mtrl_alpha.9.png b/res/drawable-xxhdpi/abc_textfield_search_activated_mtrl_alpha.9.png index cd5b00fb..334a63e2 100644 Binary files a/res/drawable-xxhdpi/abc_textfield_search_activated_mtrl_alpha.9.png and b/res/drawable-xxhdpi/abc_textfield_search_activated_mtrl_alpha.9.png differ diff --git a/res/drawable-xxhdpi/abc_textfield_search_default_mtrl_alpha.9.png b/res/drawable-xxhdpi/abc_textfield_search_default_mtrl_alpha.9.png index 5ee867ca..d9e40b0c 100644 Binary files a/res/drawable-xxhdpi/abc_textfield_search_default_mtrl_alpha.9.png and b/res/drawable-xxhdpi/abc_textfield_search_default_mtrl_alpha.9.png differ diff --git a/res/drawable-xxxhdpi/abc_btn_switch_to_on_mtrl_00001.9.png b/res/drawable-xxxhdpi/abc_btn_switch_to_on_mtrl_00001.9.png index d9a304a7..2ef14c69 100644 Binary files a/res/drawable-xxxhdpi/abc_btn_switch_to_on_mtrl_00001.9.png and b/res/drawable-xxxhdpi/abc_btn_switch_to_on_mtrl_00001.9.png differ diff --git a/res/drawable-xxxhdpi/abc_btn_switch_to_on_mtrl_00012.9.png b/res/drawable-xxxhdpi/abc_btn_switch_to_on_mtrl_00012.9.png index c24729f4..c57df44c 100644 Binary files a/res/drawable-xxxhdpi/abc_btn_switch_to_on_mtrl_00012.9.png and b/res/drawable-xxxhdpi/abc_btn_switch_to_on_mtrl_00012.9.png differ diff --git a/res/drawable-xxxhdpi/abc_spinner_mtrl_am_alpha.9.png b/res/drawable-xxxhdpi/abc_spinner_mtrl_am_alpha.9.png index bc39dbd1..aa2c9872 100644 Binary files a/res/drawable-xxxhdpi/abc_spinner_mtrl_am_alpha.9.png and b/res/drawable-xxxhdpi/abc_spinner_mtrl_am_alpha.9.png differ diff --git a/res/drawable-xxxhdpi/abc_switch_track_mtrl_alpha.9.png b/res/drawable-xxxhdpi/abc_switch_track_mtrl_alpha.9.png index 85c81c1d..d2b33930 100644 Binary files a/res/drawable-xxxhdpi/abc_switch_track_mtrl_alpha.9.png and b/res/drawable-xxxhdpi/abc_switch_track_mtrl_alpha.9.png differ diff --git a/res/drawable-xxxhdpi/abc_tab_indicator_mtrl_alpha.9.png b/res/drawable-xxxhdpi/abc_tab_indicator_mtrl_alpha.9.png index 32bc6c78..ad186ceb 100644 Binary files a/res/drawable-xxxhdpi/abc_tab_indicator_mtrl_alpha.9.png and b/res/drawable-xxxhdpi/abc_tab_indicator_mtrl_alpha.9.png differ diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 1368fb7a..e77fd13c 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -43,20 +43,20 @@ - - + + + - - - + + @@ -71,33 +71,33 @@ - - - - + + + + - - - + - + + + + + - - - + @@ -108,8 +108,8 @@ - + @@ -117,23 +117,23 @@ - - - + - + + + + + - - @@ -170,8 +170,8 @@ - + @@ -192,34 +192,34 @@ + + - + - - - + - + - + + + - - @@ -235,67 +235,67 @@ + - + - - - + + + - + - + - - + - + + - - - + + - + @@ -303,8 +303,8 @@ - + @@ -318,12 +318,12 @@ - - - + - + + + @@ -333,33 +333,33 @@ - + - + - - - - - - - - - + + - + + + + + + + + @@ -389,9 +389,9 @@ + - @@ -402,9 +402,9 @@ + - @@ -437,15 +437,15 @@ + - + - @@ -455,14 +455,14 @@ - - + + + - - + @@ -473,29 +473,29 @@ - - + + - + - - - + + - - + - - + + + + @@ -528,16 +528,16 @@ - - + + - + + - @@ -550,22 +550,22 @@ - + - + - - + + + - @@ -574,11 +574,11 @@ - - + + @@ -590,10 +590,10 @@ + - - + @@ -605,9 +605,9 @@ - - + + @@ -635,17 +635,17 @@ - - - + + + - - + + @@ -677,8 +677,8 @@ - + @@ -696,31 +696,31 @@ - - - + - + + + - - - + - + + + - - - + - + + + @@ -739,35 +739,35 @@ - - - + + + - + - - - + - + + + - + - + @@ -776,8 +776,8 @@ - + @@ -785,17 +785,17 @@ + + + + - - - - - + diff --git a/smali/android/arch/core/R.smali b/smali/android/arch/core/R.smali index 2e9581c2..ee75c455 100644 --- a/smali/android/arch/core/R.smali +++ b/smali/android/arch/core/R.smali @@ -1,11 +1,13 @@ .class public final Landroid/arch/core/R; .super Ljava/lang/Object; +.source "R.java" # direct methods .method private constructor ()V .locals 0 + .line 10 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/arch/core/executor/ArchTaskExecutor.smali b/smali/android/arch/core/executor/ArchTaskExecutor.smali index cba89ad8..3f13dab7 100644 --- a/smali/android/arch/core/executor/ArchTaskExecutor.smali +++ b/smali/android/arch/core/executor/ArchTaskExecutor.smali @@ -3,18 +3,38 @@ .source "ArchTaskExecutor.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field private static final sIOThreadExecutor:Ljava/util/concurrent/Executor; + .annotation build Landroid/support/annotation/NonNull; + .end annotation +.end field .field private static volatile sInstance:Landroid/arch/core/executor/ArchTaskExecutor; .field private static final sMainThreadExecutor:Ljava/util/concurrent/Executor; + .annotation build Landroid/support/annotation/NonNull; + .end annotation +.end field # instance fields .field private mDefaultTaskExecutor:Landroid/arch/core/executor/TaskExecutor; + .annotation build Landroid/support/annotation/NonNull; + .end annotation +.end field .field private mDelegate:Landroid/arch/core/executor/TaskExecutor; + .annotation build Landroid/support/annotation/NonNull; + .end annotation +.end field # direct methods @@ -52,6 +72,8 @@ iput-object v0, p0, Landroid/arch/core/executor/ArchTaskExecutor;->mDefaultTaskExecutor:Landroid/arch/core/executor/TaskExecutor; .line 59 + iget-object v0, p0, Landroid/arch/core/executor/ArchTaskExecutor;->mDefaultTaskExecutor:Landroid/arch/core/executor/TaskExecutor; + iput-object v0, p0, Landroid/arch/core/executor/ArchTaskExecutor;->mDelegate:Landroid/arch/core/executor/TaskExecutor; return-void @@ -59,6 +81,8 @@ .method public static getIOThreadExecutor()Ljava/util/concurrent/Executor; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 111 sget-object v0, Landroid/arch/core/executor/ArchTaskExecutor;->sIOThreadExecutor:Ljava/util/concurrent/Executor; @@ -68,6 +92,8 @@ .method public static getInstance()Landroid/arch/core/executor/ArchTaskExecutor; .locals 2 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 69 sget-object v0, Landroid/arch/core/executor/ArchTaskExecutor;->sInstance:Landroid/arch/core/executor/ArchTaskExecutor; @@ -123,6 +149,8 @@ .method public static getMainThreadExecutor()Ljava/util/concurrent/Executor; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 106 sget-object v0, Landroid/arch/core/executor/ArchTaskExecutor;->sMainThreadExecutor:Ljava/util/concurrent/Executor; @@ -169,6 +197,10 @@ .method public setDelegate(Landroid/arch/core/executor/TaskExecutor;)V .locals 0 + .param p1 # Landroid/arch/core/executor/TaskExecutor; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param if-nez p1, :cond_0 diff --git a/smali/android/arch/core/executor/DefaultTaskExecutor.smali b/smali/android/arch/core/executor/DefaultTaskExecutor.smali index 5e92b79a..a1616289 100644 --- a/smali/android/arch/core/executor/DefaultTaskExecutor.smali +++ b/smali/android/arch/core/executor/DefaultTaskExecutor.smali @@ -3,12 +3,23 @@ .source "DefaultTaskExecutor.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # instance fields .field private mDiskIO:Ljava/util/concurrent/ExecutorService; .field private final mLock:Ljava/lang/Object; .field private volatile mMainHandler:Landroid/os/Handler; + .annotation build Landroid/support/annotation/Nullable; + .end annotation +.end field # direct methods diff --git a/smali/android/arch/core/executor/TaskExecutor.smali b/smali/android/arch/core/executor/TaskExecutor.smali index 78d8230e..2d7ff066 100644 --- a/smali/android/arch/core/executor/TaskExecutor.smali +++ b/smali/android/arch/core/executor/TaskExecutor.smali @@ -3,6 +3,14 @@ .source "TaskExecutor.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # direct methods .method public constructor ()V .locals 0 @@ -16,10 +24,18 @@ # virtual methods .method public abstract executeOnDiskIO(Ljava/lang/Runnable;)V + .param p1 # Ljava/lang/Runnable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method .method public executeOnMainThread(Ljava/lang/Runnable;)V .locals 1 + .param p1 # Ljava/lang/Runnable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 54 invoke-virtual {p0}, Landroid/arch/core/executor/TaskExecutor;->isMainThread()Z @@ -45,4 +61,8 @@ .end method .method public abstract postToMainThread(Ljava/lang/Runnable;)V + .param p1 # Ljava/lang/Runnable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method diff --git a/smali/android/arch/core/internal/FastSafeIterableMap.smali b/smali/android/arch/core/internal/FastSafeIterableMap.smali index a0fd8621..15f5a910 100644 --- a/smali/android/arch/core/internal/FastSafeIterableMap.smali +++ b/smali/android/arch/core/internal/FastSafeIterableMap.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(Ljava/lang/Object;Ljava/lang/Object;)V .locals 0 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(TK;TV;)V" @@ -144,6 +158,9 @@ .method public getKey()Ljava/lang/Object; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "()TK;" @@ -158,6 +175,9 @@ .method public getValue()Ljava/lang/Object; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "()TV;" diff --git a/smali/android/arch/core/internal/SafeIterableMap$IteratorWithAdditions.smali b/smali/android/arch/core/internal/SafeIterableMap$IteratorWithAdditions.smali index 3d68a2b8..cf585785 100644 --- a/smali/android/arch/core/internal/SafeIterableMap$IteratorWithAdditions.smali +++ b/smali/android/arch/core/internal/SafeIterableMap$IteratorWithAdditions.smali @@ -187,6 +187,10 @@ .method public supportRemove(Landroid/arch/core/internal/SafeIterableMap$Entry;)V .locals 1 + .param p1 # Landroid/arch/core/internal/SafeIterableMap$Entry; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -205,6 +209,9 @@ iput-object p1, p0, Landroid/arch/core/internal/SafeIterableMap$IteratorWithAdditions;->mCurrent:Landroid/arch/core/internal/SafeIterableMap$Entry; + .line 309 + iget-object p1, p0, Landroid/arch/core/internal/SafeIterableMap$IteratorWithAdditions;->mCurrent:Landroid/arch/core/internal/SafeIterableMap$Entry; + if-nez p1, :cond_0 const/4 p1, 0x1 @@ -214,7 +221,6 @@ :cond_0 const/4 p1, 0x0 - .line 309 :goto_0 iput-boolean p1, p0, Landroid/arch/core/internal/SafeIterableMap$IteratorWithAdditions;->mBeforeStart:Z diff --git a/smali/android/arch/core/internal/SafeIterableMap$ListIterator.smali b/smali/android/arch/core/internal/SafeIterableMap$ListIterator.smali index e034dffa..cbcb5927 100644 --- a/smali/android/arch/core/internal/SafeIterableMap$ListIterator.smali +++ b/smali/android/arch/core/internal/SafeIterableMap$ListIterator.smali @@ -196,6 +196,10 @@ .method public supportRemove(Landroid/arch/core/internal/SafeIterableMap$Entry;)V .locals 1 + .param p1 # Landroid/arch/core/internal/SafeIterableMap$Entry; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", diff --git a/smali/android/arch/core/internal/SafeIterableMap$SupportRemove.smali b/smali/android/arch/core/internal/SafeIterableMap$SupportRemove.smali index 3ea33e64..2d3eb237 100644 --- a/smali/android/arch/core/internal/SafeIterableMap$SupportRemove.smali +++ b/smali/android/arch/core/internal/SafeIterableMap$SupportRemove.smali @@ -27,6 +27,10 @@ # virtual methods .method public abstract supportRemove(Landroid/arch/core/internal/SafeIterableMap$Entry;)V + .param p1 # Landroid/arch/core/internal/SafeIterableMap$Entry; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", diff --git a/smali/android/arch/core/internal/SafeIterableMap.smali b/smali/android/arch/core/internal/SafeIterableMap.smali index 67619fa6..ad16d3c9 100644 --- a/smali/android/arch/core/internal/SafeIterableMap.smali +++ b/smali/android/arch/core/internal/SafeIterableMap.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/arch/core/internal/SafeIterableMap$Entry;, @@ -303,6 +309,9 @@ .method public iterator()Ljava/util/Iterator; .locals 3 + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "()", @@ -384,6 +393,14 @@ .method protected put(Ljava/lang/Object;Ljava/lang/Object;)Landroid/arch/core/internal/SafeIterableMap$Entry; .locals 1 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(TK;TV;)", @@ -413,7 +430,9 @@ iput-object v0, p0, Landroid/arch/core/internal/SafeIterableMap;->mStart:Landroid/arch/core/internal/SafeIterableMap$Entry; .line 78 - iput-object v0, p0, Landroid/arch/core/internal/SafeIterableMap;->mEnd:Landroid/arch/core/internal/SafeIterableMap$Entry; + iget-object p1, p0, Landroid/arch/core/internal/SafeIterableMap;->mStart:Landroid/arch/core/internal/SafeIterableMap$Entry; + + iput-object p1, p0, Landroid/arch/core/internal/SafeIterableMap;->mEnd:Landroid/arch/core/internal/SafeIterableMap$Entry; return-object v0 @@ -422,8 +441,6 @@ iput-object v0, p1, Landroid/arch/core/internal/SafeIterableMap$Entry;->mNext:Landroid/arch/core/internal/SafeIterableMap$Entry; .line 83 - iget-object p1, p0, Landroid/arch/core/internal/SafeIterableMap;->mEnd:Landroid/arch/core/internal/SafeIterableMap$Entry; - iput-object p1, v0, Landroid/arch/core/internal/SafeIterableMap$Entry;->mPrevious:Landroid/arch/core/internal/SafeIterableMap$Entry; .line 84 @@ -434,6 +451,14 @@ .method public putIfAbsent(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .locals 1 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(TK;TV;)TV;" @@ -463,6 +488,10 @@ .method public remove(Ljava/lang/Object;)Ljava/lang/Object; .locals 3 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(TK;)TV;" diff --git a/smali/android/arch/lifecycle/AndroidViewModel.smali b/smali/android/arch/lifecycle/AndroidViewModel.smali index e2cae3ce..eafb93a8 100644 --- a/smali/android/arch/lifecycle/AndroidViewModel.smali +++ b/smali/android/arch/lifecycle/AndroidViewModel.smali @@ -5,11 +5,21 @@ # instance fields .field private mApplication:Landroid/app/Application; + .annotation build Landroid/annotation/SuppressLint; + value = { + "StaticFieldLeak" + } + .end annotation +.end field # direct methods .method public constructor (Landroid/app/Application;)V .locals 0 + .param p1 # Landroid/app/Application; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 33 invoke-direct {p0}, Landroid/arch/lifecycle/ViewModel;->()V @@ -24,6 +34,9 @@ # virtual methods .method public getApplication()Landroid/app/Application; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "mMethod:Ljava/lang/reflect/Method; - const/4 p1, 0x1 - .line 207 - invoke-virtual {p2, p1}, Ljava/lang/reflect/Method;->setAccessible(Z)V + iget-object p1, p0, Landroid/arch/lifecycle/ClassesInfoCache$MethodReference;->mMethod:Ljava/lang/reflect/Method; + + const/4 p2, 0x1 + + invoke-virtual {p1, p2}, Ljava/lang/reflect/Method;->setAccessible(Z)V return-void .end method diff --git a/smali/android/arch/lifecycle/ClassesInfoCache.smali b/smali/android/arch/lifecycle/ClassesInfoCache.smali index 5b2eed0b..4e7cdb0b 100644 --- a/smali/android/arch/lifecycle/ClassesInfoCache.smali +++ b/smali/android/arch/lifecycle/ClassesInfoCache.smali @@ -85,6 +85,10 @@ .method private createInfo(Ljava/lang/Class;[Ljava/lang/reflect/Method;)Landroid/arch/lifecycle/ClassesInfoCache$CallbackInfo; .locals 11 + .param p2 # [Ljava/lang/reflect/Method; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 104 invoke-virtual {p1}, Ljava/lang/Class;->getSuperclass()Ljava/lang/Class; diff --git a/smali/android/arch/lifecycle/CompositeGeneratedAdaptersObserver.smali b/smali/android/arch/lifecycle/CompositeGeneratedAdaptersObserver.smali index eb0cf6db..d655e803 100644 --- a/smali/android/arch/lifecycle/CompositeGeneratedAdaptersObserver.smali +++ b/smali/android/arch/lifecycle/CompositeGeneratedAdaptersObserver.smali @@ -6,6 +6,14 @@ .implements Landroid/arch/lifecycle/GenericLifecycleObserver; +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # instance fields .field private final mGeneratedAdapters:[Landroid/arch/lifecycle/GeneratedAdapter; diff --git a/smali/android/arch/lifecycle/ComputableLiveData$2.smali b/smali/android/arch/lifecycle/ComputableLiveData$2.smali index 6ffd8ed1..bcaaeb45 100644 --- a/smali/android/arch/lifecycle/ComputableLiveData$2.smali +++ b/smali/android/arch/lifecycle/ComputableLiveData$2.smali @@ -37,6 +37,8 @@ # virtual methods .method public run()V .locals 5 + .annotation build Landroid/support/annotation/WorkerThread; + .end annotation .line 94 :cond_0 @@ -46,11 +48,11 @@ move-result-object v0 - const/4 v1, 0x0 + const/4 v1, 0x1 - const/4 v2, 0x1 + const/4 v2, 0x0 - invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z + invoke-virtual {v0, v2, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z move-result v0 @@ -58,7 +60,9 @@ const/4 v0, 0x0 - const/4 v3, 0x0 + move-object v3, v0 + + const/4 v0, 0x0 .line 98 :goto_0 @@ -69,7 +73,7 @@ move-result-object v4 - invoke-virtual {v4, v2, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z + invoke-virtual {v4, v1, v2}, Ljava/util/concurrent/atomic/AtomicBoolean;->compareAndSet(ZZ)Z move-result v4 @@ -80,56 +84,56 @@ invoke-virtual {v0}, Landroid/arch/lifecycle/ComputableLiveData;->compute()Ljava/lang/Object; - move-result-object v0 + move-result-object v3 - const/4 v3, 0x1 + const/4 v0, 0x1 goto :goto_0 :cond_1 - if-eqz v3, :cond_2 + if-eqz v0, :cond_2 .line 103 - iget-object v2, p0, Landroid/arch/lifecycle/ComputableLiveData$2;->this$0:Landroid/arch/lifecycle/ComputableLiveData; + iget-object v1, p0, Landroid/arch/lifecycle/ComputableLiveData$2;->this$0:Landroid/arch/lifecycle/ComputableLiveData; - invoke-static {v2}, Landroid/arch/lifecycle/ComputableLiveData;->access$300(Landroid/arch/lifecycle/ComputableLiveData;)Landroid/arch/lifecycle/LiveData; + invoke-static {v1}, Landroid/arch/lifecycle/ComputableLiveData;->access$300(Landroid/arch/lifecycle/ComputableLiveData;)Landroid/arch/lifecycle/LiveData; - move-result-object v2 + move-result-object v1 - invoke-virtual {v2, v0}, Landroid/arch/lifecycle/LiveData;->postValue(Ljava/lang/Object;)V + invoke-virtual {v1, v3}, Landroid/arch/lifecycle/LiveData;->postValue(Ljava/lang/Object;)V :try_end_0 .catchall {:try_start_0 .. :try_end_0} :catchall_0 .line 107 :cond_2 - iget-object v0, p0, Landroid/arch/lifecycle/ComputableLiveData$2;->this$0:Landroid/arch/lifecycle/ComputableLiveData; + iget-object v1, p0, Landroid/arch/lifecycle/ComputableLiveData$2;->this$0:Landroid/arch/lifecycle/ComputableLiveData; - invoke-static {v0}, Landroid/arch/lifecycle/ComputableLiveData;->access$100(Landroid/arch/lifecycle/ComputableLiveData;)Ljava/util/concurrent/atomic/AtomicBoolean; + invoke-static {v1}, Landroid/arch/lifecycle/ComputableLiveData;->access$100(Landroid/arch/lifecycle/ComputableLiveData;)Ljava/util/concurrent/atomic/AtomicBoolean; - move-result-object v0 - - invoke-virtual {v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V + move-result-object v1 - move v1, v3 + invoke-virtual {v1, v2}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V goto :goto_1 :catchall_0 move-exception v0 - iget-object v2, p0, Landroid/arch/lifecycle/ComputableLiveData$2;->this$0:Landroid/arch/lifecycle/ComputableLiveData; + iget-object v1, p0, Landroid/arch/lifecycle/ComputableLiveData$2;->this$0:Landroid/arch/lifecycle/ComputableLiveData; - invoke-static {v2}, Landroid/arch/lifecycle/ComputableLiveData;->access$100(Landroid/arch/lifecycle/ComputableLiveData;)Ljava/util/concurrent/atomic/AtomicBoolean; + invoke-static {v1}, Landroid/arch/lifecycle/ComputableLiveData;->access$100(Landroid/arch/lifecycle/ComputableLiveData;)Ljava/util/concurrent/atomic/AtomicBoolean; - move-result-object v2 + move-result-object v1 - invoke-virtual {v2, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V + invoke-virtual {v1, v2}, Ljava/util/concurrent/atomic/AtomicBoolean;->set(Z)V throw v0 :cond_3 + const/4 v0, 0x0 + :goto_1 - if-eqz v1, :cond_4 + if-eqz v0, :cond_4 .line 117 iget-object v0, p0, Landroid/arch/lifecycle/ComputableLiveData$2;->this$0:Landroid/arch/lifecycle/ComputableLiveData; diff --git a/smali/android/arch/lifecycle/ComputableLiveData$3.smali b/smali/android/arch/lifecycle/ComputableLiveData$3.smali index 1eabdfeb..710dc63f 100644 --- a/smali/android/arch/lifecycle/ComputableLiveData$3.smali +++ b/smali/android/arch/lifecycle/ComputableLiveData$3.smali @@ -37,6 +37,8 @@ # virtual methods .method public run()V .locals 4 + .annotation build Landroid/support/annotation/MainThread; + .end annotation .line 127 iget-object v0, p0, Landroid/arch/lifecycle/ComputableLiveData$3;->this$0:Landroid/arch/lifecycle/ComputableLiveData; diff --git a/smali/android/arch/lifecycle/ComputableLiveData.smali b/smali/android/arch/lifecycle/ComputableLiveData.smali index f8ced552..f71b3a92 100644 --- a/smali/android/arch/lifecycle/ComputableLiveData.smali +++ b/smali/android/arch/lifecycle/ComputableLiveData.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(Ljava/util/concurrent/Executor;)V .locals 2 + .param p1 # Ljava/util/concurrent/Executor; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 64 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -139,6 +155,9 @@ # virtual methods .method protected abstract compute()Ljava/lang/Object; + .annotation build Landroid/support/annotation/WorkerThread; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "()TT;" @@ -148,6 +167,9 @@ .method public getLiveData()Landroid/arch/lifecycle/LiveData; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "()", diff --git a/smali/android/arch/lifecycle/FullLifecycleObserverAdapter$1.smali b/smali/android/arch/lifecycle/FullLifecycleObserverAdapter$1.smali index 493f337d..d0d69ca2 100644 --- a/smali/android/arch/lifecycle/FullLifecycleObserverAdapter$1.smali +++ b/smali/android/arch/lifecycle/FullLifecycleObserverAdapter$1.smali @@ -34,6 +34,8 @@ sput-object v0, Landroid/arch/lifecycle/FullLifecycleObserverAdapter$1;->$SwitchMap$android$arch$lifecycle$Lifecycle$Event:[I :try_start_0 + sget-object v0, Landroid/arch/lifecycle/FullLifecycleObserverAdapter$1;->$SwitchMap$android$arch$lifecycle$Lifecycle$Event:[I + sget-object v1, Landroid/arch/lifecycle/Lifecycle$Event;->ON_CREATE:Landroid/arch/lifecycle/Lifecycle$Event; invoke-virtual {v1}, Landroid/arch/lifecycle/Lifecycle$Event;->ordinal()I diff --git a/smali/android/arch/lifecycle/GeneratedAdapter.smali b/smali/android/arch/lifecycle/GeneratedAdapter.smali index 3f3c4ae7..1cc557ae 100644 --- a/smali/android/arch/lifecycle/GeneratedAdapter.smali +++ b/smali/android/arch/lifecycle/GeneratedAdapter.smali @@ -3,6 +3,14 @@ .source "GeneratedAdapter.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # virtual methods .method public abstract callMethods(Landroid/arch/lifecycle/LifecycleOwner;Landroid/arch/lifecycle/Lifecycle$Event;ZLandroid/arch/lifecycle/MethodCallsLogger;)V .end method diff --git a/smali/android/arch/lifecycle/GenericLifecycleObserver.smali b/smali/android/arch/lifecycle/GenericLifecycleObserver.smali index 8db19807..bbcc1667 100644 --- a/smali/android/arch/lifecycle/GenericLifecycleObserver.smali +++ b/smali/android/arch/lifecycle/GenericLifecycleObserver.smali @@ -6,6 +6,14 @@ .implements Landroid/arch/lifecycle/LifecycleObserver; +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # virtual methods .method public abstract onStateChanged(Landroid/arch/lifecycle/LifecycleOwner;Landroid/arch/lifecycle/Lifecycle$Event;)V .end method diff --git a/smali/android/arch/lifecycle/Lifecycle$Event.smali b/smali/android/arch/lifecycle/Lifecycle$Event.smali index c2626bf6..a027ca61 100644 --- a/smali/android/arch/lifecycle/Lifecycle$Event.smali +++ b/smali/android/arch/lifecycle/Lifecycle$Event.smali @@ -42,105 +42,119 @@ # direct methods .method static constructor ()V - .locals 15 + .locals 9 .line 119 new-instance v0, Landroid/arch/lifecycle/Lifecycle$Event; - const-string v1, "ON_CREATE" + const/4 v1, 0x0 - const/4 v2, 0x0 + const-string v2, "ON_CREATE" - invoke-direct {v0, v1, v2}, Landroid/arch/lifecycle/Lifecycle$Event;->(Ljava/lang/String;I)V + invoke-direct {v0, v2, v1}, Landroid/arch/lifecycle/Lifecycle$Event;->(Ljava/lang/String;I)V sput-object v0, Landroid/arch/lifecycle/Lifecycle$Event;->ON_CREATE:Landroid/arch/lifecycle/Lifecycle$Event; .line 123 - new-instance v1, Landroid/arch/lifecycle/Lifecycle$Event; + new-instance v0, Landroid/arch/lifecycle/Lifecycle$Event; - const-string v3, "ON_START" + const/4 v2, 0x1 - const/4 v4, 0x1 + const-string v3, "ON_START" - invoke-direct {v1, v3, v4}, Landroid/arch/lifecycle/Lifecycle$Event;->(Ljava/lang/String;I)V + invoke-direct {v0, v3, v2}, Landroid/arch/lifecycle/Lifecycle$Event;->(Ljava/lang/String;I)V - sput-object v1, Landroid/arch/lifecycle/Lifecycle$Event;->ON_START:Landroid/arch/lifecycle/Lifecycle$Event; + sput-object v0, Landroid/arch/lifecycle/Lifecycle$Event;->ON_START:Landroid/arch/lifecycle/Lifecycle$Event; .line 127 - new-instance v3, Landroid/arch/lifecycle/Lifecycle$Event; + new-instance v0, Landroid/arch/lifecycle/Lifecycle$Event; - const-string v5, "ON_RESUME" + const/4 v3, 0x2 - const/4 v6, 0x2 + const-string v4, "ON_RESUME" - invoke-direct {v3, v5, v6}, Landroid/arch/lifecycle/Lifecycle$Event;->(Ljava/lang/String;I)V + invoke-direct {v0, v4, v3}, Landroid/arch/lifecycle/Lifecycle$Event;->(Ljava/lang/String;I)V - sput-object v3, Landroid/arch/lifecycle/Lifecycle$Event;->ON_RESUME:Landroid/arch/lifecycle/Lifecycle$Event; + sput-object v0, Landroid/arch/lifecycle/Lifecycle$Event;->ON_RESUME:Landroid/arch/lifecycle/Lifecycle$Event; .line 131 - new-instance v5, Landroid/arch/lifecycle/Lifecycle$Event; + new-instance v0, Landroid/arch/lifecycle/Lifecycle$Event; - const-string v7, "ON_PAUSE" + const/4 v4, 0x3 - const/4 v8, 0x3 + const-string v5, "ON_PAUSE" - invoke-direct {v5, v7, v8}, Landroid/arch/lifecycle/Lifecycle$Event;->(Ljava/lang/String;I)V + invoke-direct {v0, v5, v4}, Landroid/arch/lifecycle/Lifecycle$Event;->(Ljava/lang/String;I)V - sput-object v5, Landroid/arch/lifecycle/Lifecycle$Event;->ON_PAUSE:Landroid/arch/lifecycle/Lifecycle$Event; + sput-object v0, Landroid/arch/lifecycle/Lifecycle$Event;->ON_PAUSE:Landroid/arch/lifecycle/Lifecycle$Event; .line 135 - new-instance v7, Landroid/arch/lifecycle/Lifecycle$Event; + new-instance v0, Landroid/arch/lifecycle/Lifecycle$Event; - const-string v9, "ON_STOP" + const/4 v5, 0x4 - const/4 v10, 0x4 + const-string v6, "ON_STOP" - invoke-direct {v7, v9, v10}, Landroid/arch/lifecycle/Lifecycle$Event;->(Ljava/lang/String;I)V + invoke-direct {v0, v6, v5}, Landroid/arch/lifecycle/Lifecycle$Event;->(Ljava/lang/String;I)V - sput-object v7, Landroid/arch/lifecycle/Lifecycle$Event;->ON_STOP:Landroid/arch/lifecycle/Lifecycle$Event; + sput-object v0, Landroid/arch/lifecycle/Lifecycle$Event;->ON_STOP:Landroid/arch/lifecycle/Lifecycle$Event; .line 139 - new-instance v9, Landroid/arch/lifecycle/Lifecycle$Event; + new-instance v0, Landroid/arch/lifecycle/Lifecycle$Event; - const-string v11, "ON_DESTROY" + const/4 v6, 0x5 - const/4 v12, 0x5 + const-string v7, "ON_DESTROY" - invoke-direct {v9, v11, v12}, Landroid/arch/lifecycle/Lifecycle$Event;->(Ljava/lang/String;I)V + invoke-direct {v0, v7, v6}, Landroid/arch/lifecycle/Lifecycle$Event;->(Ljava/lang/String;I)V - sput-object v9, Landroid/arch/lifecycle/Lifecycle$Event;->ON_DESTROY:Landroid/arch/lifecycle/Lifecycle$Event; + sput-object v0, Landroid/arch/lifecycle/Lifecycle$Event;->ON_DESTROY:Landroid/arch/lifecycle/Lifecycle$Event; .line 143 - new-instance v11, Landroid/arch/lifecycle/Lifecycle$Event; + new-instance v0, Landroid/arch/lifecycle/Lifecycle$Event; - const-string v13, "ON_ANY" + const/4 v7, 0x6 - const/4 v14, 0x6 + const-string v8, "ON_ANY" - invoke-direct {v11, v13, v14}, Landroid/arch/lifecycle/Lifecycle$Event;->(Ljava/lang/String;I)V + invoke-direct {v0, v8, v7}, Landroid/arch/lifecycle/Lifecycle$Event;->(Ljava/lang/String;I)V - sput-object v11, Landroid/arch/lifecycle/Lifecycle$Event;->ON_ANY:Landroid/arch/lifecycle/Lifecycle$Event; + sput-object v0, Landroid/arch/lifecycle/Lifecycle$Event;->ON_ANY:Landroid/arch/lifecycle/Lifecycle$Event; - const/4 v13, 0x7 + const/4 v0, 0x7 - new-array v13, v13, [Landroid/arch/lifecycle/Lifecycle$Event; + .line 114 + new-array v0, v0, [Landroid/arch/lifecycle/Lifecycle$Event; - aput-object v0, v13, v2 + sget-object v8, Landroid/arch/lifecycle/Lifecycle$Event;->ON_CREATE:Landroid/arch/lifecycle/Lifecycle$Event; - aput-object v1, v13, v4 + aput-object v8, v0, v1 - aput-object v3, v13, v6 + sget-object v1, Landroid/arch/lifecycle/Lifecycle$Event;->ON_START:Landroid/arch/lifecycle/Lifecycle$Event; - aput-object v5, v13, v8 + aput-object v1, v0, v2 - aput-object v7, v13, v10 + sget-object v1, Landroid/arch/lifecycle/Lifecycle$Event;->ON_RESUME:Landroid/arch/lifecycle/Lifecycle$Event; - aput-object v9, v13, v12 + aput-object v1, v0, v3 - aput-object v11, v13, v14 + sget-object v1, Landroid/arch/lifecycle/Lifecycle$Event;->ON_PAUSE:Landroid/arch/lifecycle/Lifecycle$Event; - .line 114 - sput-object v13, Landroid/arch/lifecycle/Lifecycle$Event;->$VALUES:[Landroid/arch/lifecycle/Lifecycle$Event; + aput-object v1, v0, v4 + + sget-object v1, Landroid/arch/lifecycle/Lifecycle$Event;->ON_STOP:Landroid/arch/lifecycle/Lifecycle$Event; + + aput-object v1, v0, v5 + + sget-object v1, Landroid/arch/lifecycle/Lifecycle$Event;->ON_DESTROY:Landroid/arch/lifecycle/Lifecycle$Event; + + aput-object v1, v0, v6 + + sget-object v1, Landroid/arch/lifecycle/Lifecycle$Event;->ON_ANY:Landroid/arch/lifecycle/Lifecycle$Event; + + aput-object v1, v0, v7 + + sput-object v0, Landroid/arch/lifecycle/Lifecycle$Event;->$VALUES:[Landroid/arch/lifecycle/Lifecycle$Event; return-void .end method diff --git a/smali/android/arch/lifecycle/Lifecycle$State.smali b/smali/android/arch/lifecycle/Lifecycle$State.smali index 03fb6887..c61dadb3 100644 --- a/smali/android/arch/lifecycle/Lifecycle$State.smali +++ b/smali/android/arch/lifecycle/Lifecycle$State.smali @@ -38,79 +38,89 @@ # direct methods .method static constructor ()V - .locals 11 + .locals 7 .line 157 new-instance v0, Landroid/arch/lifecycle/Lifecycle$State; - const-string v1, "DESTROYED" + const/4 v1, 0x0 - const/4 v2, 0x0 + const-string v2, "DESTROYED" - invoke-direct {v0, v1, v2}, Landroid/arch/lifecycle/Lifecycle$State;->(Ljava/lang/String;I)V + invoke-direct {v0, v2, v1}, Landroid/arch/lifecycle/Lifecycle$State;->(Ljava/lang/String;I)V sput-object v0, Landroid/arch/lifecycle/Lifecycle$State;->DESTROYED:Landroid/arch/lifecycle/Lifecycle$State; .line 164 - new-instance v1, Landroid/arch/lifecycle/Lifecycle$State; + new-instance v0, Landroid/arch/lifecycle/Lifecycle$State; - const-string v3, "INITIALIZED" + const/4 v2, 0x1 - const/4 v4, 0x1 + const-string v3, "INITIALIZED" - invoke-direct {v1, v3, v4}, Landroid/arch/lifecycle/Lifecycle$State;->(Ljava/lang/String;I)V + invoke-direct {v0, v3, v2}, Landroid/arch/lifecycle/Lifecycle$State;->(Ljava/lang/String;I)V - sput-object v1, Landroid/arch/lifecycle/Lifecycle$State;->INITIALIZED:Landroid/arch/lifecycle/Lifecycle$State; + sput-object v0, Landroid/arch/lifecycle/Lifecycle$State;->INITIALIZED:Landroid/arch/lifecycle/Lifecycle$State; .line 174 - new-instance v3, Landroid/arch/lifecycle/Lifecycle$State; + new-instance v0, Landroid/arch/lifecycle/Lifecycle$State; - const-string v5, "CREATED" + const/4 v3, 0x2 - const/4 v6, 0x2 + const-string v4, "CREATED" - invoke-direct {v3, v5, v6}, Landroid/arch/lifecycle/Lifecycle$State;->(Ljava/lang/String;I)V + invoke-direct {v0, v4, v3}, Landroid/arch/lifecycle/Lifecycle$State;->(Ljava/lang/String;I)V - sput-object v3, Landroid/arch/lifecycle/Lifecycle$State;->CREATED:Landroid/arch/lifecycle/Lifecycle$State; + sput-object v0, Landroid/arch/lifecycle/Lifecycle$State;->CREATED:Landroid/arch/lifecycle/Lifecycle$State; .line 184 - new-instance v5, Landroid/arch/lifecycle/Lifecycle$State; + new-instance v0, Landroid/arch/lifecycle/Lifecycle$State; - const-string v7, "STARTED" + const/4 v4, 0x3 - const/4 v8, 0x3 + const-string v5, "STARTED" - invoke-direct {v5, v7, v8}, Landroid/arch/lifecycle/Lifecycle$State;->(Ljava/lang/String;I)V + invoke-direct {v0, v5, v4}, Landroid/arch/lifecycle/Lifecycle$State;->(Ljava/lang/String;I)V - sput-object v5, Landroid/arch/lifecycle/Lifecycle$State;->STARTED:Landroid/arch/lifecycle/Lifecycle$State; + sput-object v0, Landroid/arch/lifecycle/Lifecycle$State;->STARTED:Landroid/arch/lifecycle/Lifecycle$State; .line 190 - new-instance v7, Landroid/arch/lifecycle/Lifecycle$State; + new-instance v0, Landroid/arch/lifecycle/Lifecycle$State; - const-string v9, "RESUMED" + const/4 v5, 0x4 - const/4 v10, 0x4 + const-string v6, "RESUMED" - invoke-direct {v7, v9, v10}, Landroid/arch/lifecycle/Lifecycle$State;->(Ljava/lang/String;I)V + invoke-direct {v0, v6, v5}, Landroid/arch/lifecycle/Lifecycle$State;->(Ljava/lang/String;I)V - sput-object v7, Landroid/arch/lifecycle/Lifecycle$State;->RESUMED:Landroid/arch/lifecycle/Lifecycle$State; + sput-object v0, Landroid/arch/lifecycle/Lifecycle$State;->RESUMED:Landroid/arch/lifecycle/Lifecycle$State; - const/4 v9, 0x5 + const/4 v0, 0x5 - new-array v9, v9, [Landroid/arch/lifecycle/Lifecycle$State; + .line 150 + new-array v0, v0, [Landroid/arch/lifecycle/Lifecycle$State; - aput-object v0, v9, v2 + sget-object v6, Landroid/arch/lifecycle/Lifecycle$State;->DESTROYED:Landroid/arch/lifecycle/Lifecycle$State; - aput-object v1, v9, v4 + aput-object v6, v0, v1 - aput-object v3, v9, v6 + sget-object v1, Landroid/arch/lifecycle/Lifecycle$State;->INITIALIZED:Landroid/arch/lifecycle/Lifecycle$State; - aput-object v5, v9, v8 + aput-object v1, v0, v2 - aput-object v7, v9, v10 + sget-object v1, Landroid/arch/lifecycle/Lifecycle$State;->CREATED:Landroid/arch/lifecycle/Lifecycle$State; - .line 150 - sput-object v9, Landroid/arch/lifecycle/Lifecycle$State;->$VALUES:[Landroid/arch/lifecycle/Lifecycle$State; + aput-object v1, v0, v3 + + sget-object v1, Landroid/arch/lifecycle/Lifecycle$State;->STARTED:Landroid/arch/lifecycle/Lifecycle$State; + + aput-object v1, v0, v4 + + sget-object v1, Landroid/arch/lifecycle/Lifecycle$State;->RESUMED:Landroid/arch/lifecycle/Lifecycle$State; + + aput-object v1, v0, v5 + + sput-object v0, Landroid/arch/lifecycle/Lifecycle$State;->$VALUES:[Landroid/arch/lifecycle/Lifecycle$State; return-void .end method @@ -163,6 +173,10 @@ # virtual methods .method public isAtLeast(Landroid/arch/lifecycle/Lifecycle$State;)Z .locals 0 + .param p1 # Landroid/arch/lifecycle/Lifecycle$State; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 199 invoke-virtual {p0, p1}, Landroid/arch/lifecycle/Lifecycle$State;->compareTo(Ljava/lang/Enum;)I diff --git a/smali/android/arch/lifecycle/Lifecycle.smali b/smali/android/arch/lifecycle/Lifecycle.smali index 84c3f766..76bb2fcc 100644 --- a/smali/android/arch/lifecycle/Lifecycle.smali +++ b/smali/android/arch/lifecycle/Lifecycle.smali @@ -25,10 +25,27 @@ # virtual methods .method public abstract addObserver(Landroid/arch/lifecycle/LifecycleObserver;)V + .param p1 # Landroid/arch/lifecycle/LifecycleObserver; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/MainThread; + .end annotation .end method .method public abstract getCurrentState()Landroid/arch/lifecycle/Lifecycle$State; + .annotation build Landroid/support/annotation/MainThread; + .end annotation + + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract removeObserver(Landroid/arch/lifecycle/LifecycleObserver;)V + .param p1 # Landroid/arch/lifecycle/LifecycleObserver; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/MainThread; + .end annotation .end method diff --git a/smali/android/arch/lifecycle/LifecycleOwner.smali b/smali/android/arch/lifecycle/LifecycleOwner.smali index 2594abc1..2b5e8056 100644 --- a/smali/android/arch/lifecycle/LifecycleOwner.smali +++ b/smali/android/arch/lifecycle/LifecycleOwner.smali @@ -5,4 +5,6 @@ # virtual methods .method public abstract getLifecycle()Landroid/arch/lifecycle/Lifecycle; + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method diff --git a/smali/android/arch/lifecycle/LifecycleRegistry$1.smali b/smali/android/arch/lifecycle/LifecycleRegistry$1.smali index 098b16ae..a577891a 100644 --- a/smali/android/arch/lifecycle/LifecycleRegistry$1.smali +++ b/smali/android/arch/lifecycle/LifecycleRegistry$1.smali @@ -35,21 +35,23 @@ sput-object v0, Landroid/arch/lifecycle/LifecycleRegistry$1;->$SwitchMap$android$arch$lifecycle$Lifecycle$State:[I - const/4 v1, 0x1 + const/4 v0, 0x1 :try_start_0 + sget-object v1, Landroid/arch/lifecycle/LifecycleRegistry$1;->$SwitchMap$android$arch$lifecycle$Lifecycle$State:[I + sget-object v2, Landroid/arch/lifecycle/Lifecycle$State;->INITIALIZED:Landroid/arch/lifecycle/Lifecycle$State; invoke-virtual {v2}, Landroid/arch/lifecycle/Lifecycle$State;->ordinal()I move-result v2 - aput v1, v0, v2 + aput v0, v1, v2 :try_end_0 .catch Ljava/lang/NoSuchFieldError; {:try_start_0 .. :try_end_0} :catch_0 :catch_0 - const/4 v0, 0x2 + const/4 v1, 0x2 :try_start_1 sget-object v2, Landroid/arch/lifecycle/LifecycleRegistry$1;->$SwitchMap$android$arch$lifecycle$Lifecycle$State:[I @@ -60,7 +62,7 @@ move-result v3 - aput v0, v2, v3 + aput v1, v2, v3 :try_end_1 .catch Ljava/lang/NoSuchFieldError; {:try_start_1 .. :try_end_1} :catch_1 @@ -125,19 +127,21 @@ sput-object v5, Landroid/arch/lifecycle/LifecycleRegistry$1;->$SwitchMap$android$arch$lifecycle$Lifecycle$Event:[I :try_start_5 + sget-object v5, Landroid/arch/lifecycle/LifecycleRegistry$1;->$SwitchMap$android$arch$lifecycle$Lifecycle$Event:[I + sget-object v6, Landroid/arch/lifecycle/Lifecycle$Event;->ON_CREATE:Landroid/arch/lifecycle/Lifecycle$Event; invoke-virtual {v6}, Landroid/arch/lifecycle/Lifecycle$Event;->ordinal()I move-result v6 - aput v1, v5, v6 + aput v0, v5, v6 :try_end_5 .catch Ljava/lang/NoSuchFieldError; {:try_start_5 .. :try_end_5} :catch_5 :catch_5 :try_start_6 - sget-object v1, Landroid/arch/lifecycle/LifecycleRegistry$1;->$SwitchMap$android$arch$lifecycle$Lifecycle$Event:[I + sget-object v0, Landroid/arch/lifecycle/LifecycleRegistry$1;->$SwitchMap$android$arch$lifecycle$Lifecycle$Event:[I sget-object v5, Landroid/arch/lifecycle/Lifecycle$Event;->ON_STOP:Landroid/arch/lifecycle/Lifecycle$Event; @@ -145,7 +149,7 @@ move-result v5 - aput v0, v1, v5 + aput v1, v0, v5 :try_end_6 .catch Ljava/lang/NoSuchFieldError; {:try_start_6 .. :try_end_6} :catch_6 diff --git a/smali/android/arch/lifecycle/LifecycleRegistry.smali b/smali/android/arch/lifecycle/LifecycleRegistry.smali index bf81dbb3..ce741fdf 100644 --- a/smali/android/arch/lifecycle/LifecycleRegistry.smali +++ b/smali/android/arch/lifecycle/LifecycleRegistry.smali @@ -59,6 +59,10 @@ # direct methods .method public constructor (Landroid/arch/lifecycle/LifecycleOwner;)V .locals 1 + .param p1 # Landroid/arch/lifecycle/LifecycleOwner; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 97 invoke-direct {p0}, Landroid/arch/lifecycle/Lifecycle;->()V @@ -574,6 +578,14 @@ .method static min(Landroid/arch/lifecycle/Lifecycle$State;Landroid/arch/lifecycle/Lifecycle$State;)Landroid/arch/lifecycle/Lifecycle$State; .locals 1 + .param p0 # Landroid/arch/lifecycle/Lifecycle$State; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/arch/lifecycle/Lifecycle$State; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param if-eqz p1, :cond_0 @@ -862,6 +874,10 @@ # virtual methods .method public addObserver(Landroid/arch/lifecycle/LifecycleObserver;)V .locals 6 + .param p1 # Landroid/arch/lifecycle/LifecycleObserver; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 161 iget-object v0, p0, Landroid/arch/lifecycle/LifecycleRegistry;->mState:Landroid/arch/lifecycle/Lifecycle$State; @@ -1008,6 +1024,8 @@ .method public getCurrentState()Landroid/arch/lifecycle/Lifecycle$State; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 231 iget-object v0, p0, Landroid/arch/lifecycle/LifecycleRegistry;->mState:Landroid/arch/lifecycle/Lifecycle$State; @@ -1030,6 +1048,10 @@ .method public handleLifecycleEvent(Landroid/arch/lifecycle/Lifecycle$Event;)V .locals 0 + .param p1 # Landroid/arch/lifecycle/Lifecycle$Event; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 122 invoke-static {p1}, Landroid/arch/lifecycle/LifecycleRegistry;->getStateAfter(Landroid/arch/lifecycle/Lifecycle$Event;)Landroid/arch/lifecycle/Lifecycle$State; @@ -1044,6 +1066,12 @@ .method public markState(Landroid/arch/lifecycle/Lifecycle$State;)V .locals 0 + .param p1 # Landroid/arch/lifecycle/Lifecycle$State; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/MainThread; + .end annotation .line 110 invoke-direct {p0, p1}, Landroid/arch/lifecycle/LifecycleRegistry;->moveToState(Landroid/arch/lifecycle/Lifecycle$State;)V @@ -1053,6 +1081,10 @@ .method public removeObserver(Landroid/arch/lifecycle/LifecycleObserver;)V .locals 1 + .param p1 # Landroid/arch/lifecycle/LifecycleObserver; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 215 iget-object v0, p0, Landroid/arch/lifecycle/LifecycleRegistry;->mObserverMap:Landroid/arch/core/internal/FastSafeIterableMap; diff --git a/smali/android/arch/lifecycle/LifecycleRegistryOwner.smali b/smali/android/arch/lifecycle/LifecycleRegistryOwner.smali index ec710ef6..370ec88a 100644 --- a/smali/android/arch/lifecycle/LifecycleRegistryOwner.smali +++ b/smali/android/arch/lifecycle/LifecycleRegistryOwner.smali @@ -13,4 +13,6 @@ # virtual methods .method public abstract getLifecycle()Landroid/arch/lifecycle/LifecycleRegistry; + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method diff --git a/smali/android/arch/lifecycle/Lifecycling.smali b/smali/android/arch/lifecycle/Lifecycling.smali index c20dfca2..9808191f 100644 --- a/smali/android/arch/lifecycle/Lifecycling.smali +++ b/smali/android/arch/lifecycle/Lifecycling.smali @@ -3,6 +3,14 @@ .source "Lifecycling.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field private static final GENERATED_CALLBACK:I = 0x2 @@ -81,6 +89,7 @@ const/4 v0, 0x1 + .line 79 :try_start_0 new-array v0, v0, [Ljava/lang/Object; @@ -88,7 +97,6 @@ aput-object p1, v0, v1 - .line 79 invoke-virtual {p0, v0}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object; move-result-object p0 @@ -134,6 +142,9 @@ .method private static generatedConstructor(Ljava/lang/Class;)Ljava/lang/reflect/Constructor; .locals 4 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -231,6 +242,7 @@ move-result-object v0 + .line 101 new-array v1, v3, [Ljava/lang/Class; const/4 v2, 0x0 @@ -305,6 +317,8 @@ .method static getCallback(Ljava/lang/Object;)Landroid/arch/lifecycle/GenericLifecycleObserver; .locals 4 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 48 instance-of v0, p0, Landroid/arch/lifecycle/FullLifecycleObserver; diff --git a/smali/android/arch/lifecycle/LiveData$LifecycleBoundObserver.smali b/smali/android/arch/lifecycle/LiveData$LifecycleBoundObserver.smali index a81e7896..521cb2f9 100644 --- a/smali/android/arch/lifecycle/LiveData$LifecycleBoundObserver.smali +++ b/smali/android/arch/lifecycle/LiveData$LifecycleBoundObserver.smali @@ -27,6 +27,9 @@ # instance fields .field final mOwner:Landroid/arch/lifecycle/LifecycleOwner; + .annotation build Landroid/support/annotation/NonNull; + .end annotation +.end field .field final synthetic this$0:Landroid/arch/lifecycle/LiveData; @@ -34,6 +37,10 @@ # direct methods .method constructor (Landroid/arch/lifecycle/LiveData;Landroid/arch/lifecycle/LifecycleOwner;Landroid/arch/lifecycle/Observer;)V .locals 0 + .param p1 # Landroid/arch/lifecycle/LiveData; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", diff --git a/smali/android/arch/lifecycle/LiveData.smali b/smali/android/arch/lifecycle/LiveData.smali index c5bda676..95f50caa 100644 --- a/smali/android/arch/lifecycle/LiveData.smali +++ b/smali/android/arch/lifecycle/LiveData.smali @@ -288,6 +288,10 @@ .method private dispatchingValue(Landroid/arch/lifecycle/LiveData$ObserverWrapper;)V .locals 3 + .param p1 # Landroid/arch/lifecycle/LiveData$ObserverWrapper; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -380,6 +384,9 @@ # virtual methods .method public getValue()Ljava/lang/Object; .locals 2 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "()TT;" @@ -455,6 +462,17 @@ .method public observe(Landroid/arch/lifecycle/LifecycleOwner;Landroid/arch/lifecycle/Observer;)V .locals 2 + .param p1 # Landroid/arch/lifecycle/LifecycleOwner; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/arch/lifecycle/Observer; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/MainThread; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -534,6 +552,13 @@ .method public observeForever(Landroid/arch/lifecycle/Observer;)V .locals 2 + .param p1 # Landroid/arch/lifecycle/Observer; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/MainThread; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -669,6 +694,13 @@ .method public removeObserver(Landroid/arch/lifecycle/Observer;)V .locals 1 + .param p1 # Landroid/arch/lifecycle/Observer; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/MainThread; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -709,6 +741,12 @@ .method public removeObservers(Landroid/arch/lifecycle/LifecycleOwner;)V .locals 3 + .param p1 # Landroid/arch/lifecycle/LifecycleOwner; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/MainThread; + .end annotation const-string v0, "removeObservers" @@ -766,6 +804,9 @@ .method protected setValue(Ljava/lang/Object;)V .locals 1 + .annotation build Landroid/support/annotation/MainThread; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(TT;)V" diff --git a/smali/android/arch/lifecycle/MediatorLiveData$Source.smali b/smali/android/arch/lifecycle/MediatorLiveData$Source.smali index 97b30d44..87c34ae8 100644 --- a/smali/android/arch/lifecycle/MediatorLiveData$Source.smali +++ b/smali/android/arch/lifecycle/MediatorLiveData$Source.smali @@ -84,6 +84,10 @@ # virtual methods .method public onChanged(Ljava/lang/Object;)V .locals 2 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(TV;)V" diff --git a/smali/android/arch/lifecycle/MediatorLiveData.smali b/smali/android/arch/lifecycle/MediatorLiveData.smali index 3f5ce6f3..6ea80049 100644 --- a/smali/android/arch/lifecycle/MediatorLiveData.smali +++ b/smali/android/arch/lifecycle/MediatorLiveData.smali @@ -56,6 +56,17 @@ # virtual methods .method public addSource(Landroid/arch/lifecycle/LiveData;Landroid/arch/lifecycle/Observer;)V .locals 2 + .param p1 # Landroid/arch/lifecycle/LiveData; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/arch/lifecycle/Observer; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/MainThread; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "mSources:Landroid/arch/core/internal/SafeIterableMap; @@ -162,6 +175,8 @@ .method protected onInactive()V .locals 2 + .annotation build Landroid/support/annotation/CallSuper; + .end annotation .line 125 iget-object v0, p0, Landroid/arch/lifecycle/MediatorLiveData;->mSources:Landroid/arch/core/internal/SafeIterableMap; @@ -200,6 +215,13 @@ .method public removeSource(Landroid/arch/lifecycle/LiveData;)V .locals 1 + .param p1 # Landroid/arch/lifecycle/LiveData; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/MainThread; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # instance fields .field private mCalledMethods:Ljava/util/Map; .annotation system Ldalvik/annotation/Signature; @@ -37,6 +45,11 @@ # virtual methods .method public approveCall(Ljava/lang/String;I)Z .locals 4 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 36 iget-object v0, p0, Landroid/arch/lifecycle/MethodCallsLogger;->mCalledMethods:Ljava/util/Map; diff --git a/smali/android/arch/lifecycle/Observer.smali b/smali/android/arch/lifecycle/Observer.smali index 0dde2a56..e282c819 100644 --- a/smali/android/arch/lifecycle/Observer.smali +++ b/smali/android/arch/lifecycle/Observer.smali @@ -16,6 +16,10 @@ # virtual methods .method public abstract onChanged(Ljava/lang/Object;)V + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(TT;)V" diff --git a/smali/android/arch/lifecycle/R.smali b/smali/android/arch/lifecycle/R.smali index 6f2c1d62..efee881e 100644 --- a/smali/android/arch/lifecycle/R.smali +++ b/smali/android/arch/lifecycle/R.smali @@ -1,11 +1,13 @@ .class public final Landroid/arch/lifecycle/R; .super Ljava/lang/Object; +.source "R.java" # direct methods .method private constructor ()V .locals 0 + .line 10 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/arch/lifecycle/ReflectiveGenericLifecycleObserver.smali b/smali/android/arch/lifecycle/ReflectiveGenericLifecycleObserver.smali index 85d3526b..236ed276 100644 --- a/smali/android/arch/lifecycle/ReflectiveGenericLifecycleObserver.smali +++ b/smali/android/arch/lifecycle/ReflectiveGenericLifecycleObserver.smali @@ -23,13 +23,15 @@ iput-object p1, p0, Landroid/arch/lifecycle/ReflectiveGenericLifecycleObserver;->mWrapped:Ljava/lang/Object; .line 31 - sget-object v0, Landroid/arch/lifecycle/ClassesInfoCache;->sInstance:Landroid/arch/lifecycle/ClassesInfoCache; + sget-object p1, Landroid/arch/lifecycle/ClassesInfoCache;->sInstance:Landroid/arch/lifecycle/ClassesInfoCache; - invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class; + iget-object v0, p0, Landroid/arch/lifecycle/ReflectiveGenericLifecycleObserver;->mWrapped:Ljava/lang/Object; - move-result-object p1 + invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class; + + move-result-object v0 - invoke-virtual {v0, p1}, Landroid/arch/lifecycle/ClassesInfoCache;->getInfo(Ljava/lang/Class;)Landroid/arch/lifecycle/ClassesInfoCache$CallbackInfo; + invoke-virtual {p1, v0}, Landroid/arch/lifecycle/ClassesInfoCache;->getInfo(Ljava/lang/Class;)Landroid/arch/lifecycle/ClassesInfoCache$CallbackInfo; move-result-object p1 diff --git a/smali/android/arch/lifecycle/ReportFragment.smali b/smali/android/arch/lifecycle/ReportFragment.smali index fd6c1474..f70bf74f 100644 --- a/smali/android/arch/lifecycle/ReportFragment.smali +++ b/smali/android/arch/lifecycle/ReportFragment.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/arch/lifecycle/ReportFragment$ActivityInitializationListener; diff --git a/smali/android/arch/lifecycle/SingleGeneratedAdapterObserver.smali b/smali/android/arch/lifecycle/SingleGeneratedAdapterObserver.smali index 6512e70d..699267e2 100644 --- a/smali/android/arch/lifecycle/SingleGeneratedAdapterObserver.smali +++ b/smali/android/arch/lifecycle/SingleGeneratedAdapterObserver.smali @@ -6,6 +6,14 @@ .implements Landroid/arch/lifecycle/GenericLifecycleObserver; +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # instance fields .field private final mGeneratedAdapter:Landroid/arch/lifecycle/GeneratedAdapter; @@ -35,14 +43,14 @@ const/4 v2, 0x0 - invoke-interface {v0, p1, p2, v1, v2}, Landroid/arch/lifecycle/GeneratedAdapter;->callMethods(Landroid/arch/lifecycle/LifecycleOwner;Landroid/arch/lifecycle/Lifecycle$Event;ZLandroid/arch/lifecycle/MethodCallsLogger;)V + invoke-interface {v0, p1, p2, v2, v1}, Landroid/arch/lifecycle/GeneratedAdapter;->callMethods(Landroid/arch/lifecycle/LifecycleOwner;Landroid/arch/lifecycle/Lifecycle$Event;ZLandroid/arch/lifecycle/MethodCallsLogger;)V .line 36 iget-object v0, p0, Landroid/arch/lifecycle/SingleGeneratedAdapterObserver;->mGeneratedAdapter:Landroid/arch/lifecycle/GeneratedAdapter; - const/4 v1, 0x1 + const/4 v2, 0x1 - invoke-interface {v0, p1, p2, v1, v2}, Landroid/arch/lifecycle/GeneratedAdapter;->callMethods(Landroid/arch/lifecycle/LifecycleOwner;Landroid/arch/lifecycle/Lifecycle$Event;ZLandroid/arch/lifecycle/MethodCallsLogger;)V + invoke-interface {v0, p1, p2, v2, v1}, Landroid/arch/lifecycle/GeneratedAdapter;->callMethods(Landroid/arch/lifecycle/LifecycleOwner;Landroid/arch/lifecycle/Lifecycle$Event;ZLandroid/arch/lifecycle/MethodCallsLogger;)V return-void .end method diff --git a/smali/android/arch/lifecycle/Transformations$1.smali b/smali/android/arch/lifecycle/Transformations$1.smali index 3884c823..ab862d07 100644 --- a/smali/android/arch/lifecycle/Transformations$1.smali +++ b/smali/android/arch/lifecycle/Transformations$1.smali @@ -49,6 +49,10 @@ # virtual methods .method public onChanged(Ljava/lang/Object;)V .locals 2 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(TX;)V" diff --git a/smali/android/arch/lifecycle/Transformations$2$1.smali b/smali/android/arch/lifecycle/Transformations$2$1.smali index 8bae4889..095cdcd6 100644 --- a/smali/android/arch/lifecycle/Transformations$2$1.smali +++ b/smali/android/arch/lifecycle/Transformations$2$1.smali @@ -45,6 +45,10 @@ # virtual methods .method public onChanged(Ljava/lang/Object;)V .locals 1 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(TY;)V" diff --git a/smali/android/arch/lifecycle/Transformations$2.smali b/smali/android/arch/lifecycle/Transformations$2.smali index 3ac1f300..d2a4170f 100644 --- a/smali/android/arch/lifecycle/Transformations$2.smali +++ b/smali/android/arch/lifecycle/Transformations$2.smali @@ -58,6 +58,10 @@ # virtual methods .method public onChanged(Ljava/lang/Object;)V .locals 2 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(TX;)V" @@ -92,6 +96,9 @@ :cond_1 iput-object p1, p0, Landroid/arch/lifecycle/Transformations$2;->mSource:Landroid/arch/lifecycle/LiveData; + .line 141 + iget-object p1, p0, Landroid/arch/lifecycle/Transformations$2;->mSource:Landroid/arch/lifecycle/LiveData; + if-eqz p1, :cond_2 .line 142 diff --git a/smali/android/arch/lifecycle/Transformations.smali b/smali/android/arch/lifecycle/Transformations.smali index 6003d267..abdf8cdc 100644 --- a/smali/android/arch/lifecycle/Transformations.smali +++ b/smali/android/arch/lifecycle/Transformations.smali @@ -15,6 +15,17 @@ .method public static map(Landroid/arch/lifecycle/LiveData;Landroid/arch/core/util/Function;)Landroid/arch/lifecycle/LiveData; .locals 2 + .param p0 # Landroid/arch/lifecycle/LiveData; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/arch/core/util/Function; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/MainThread; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(Landroid/app/Application;)V .locals 0 + .param p1 # Landroid/app/Application; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 189 invoke-direct {p0}, Landroid/arch/lifecycle/ViewModelProvider$NewInstanceFactory;->()V @@ -37,6 +41,12 @@ .method public static getInstance(Landroid/app/Application;)Landroid/arch/lifecycle/ViewModelProvider$AndroidViewModelFactory; .locals 1 + .param p0 # Landroid/app/Application; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 176 sget-object v0, Landroid/arch/lifecycle/ViewModelProvider$AndroidViewModelFactory;->sInstance:Landroid/arch/lifecycle/ViewModelProvider$AndroidViewModelFactory; @@ -61,6 +71,13 @@ # virtual methods .method public create(Ljava/lang/Class;)Landroid/arch/lifecycle/ViewModel; .locals 5 + .param p1 # Ljava/lang/Class; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(Landroid/arch/lifecycle/ViewModelStore;Landroid/arch/lifecycle/ViewModelProvider$Factory;)V .locals 0 + .param p1 # Landroid/arch/lifecycle/ViewModelStore; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/arch/lifecycle/ViewModelProvider$Factory; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 77 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -41,6 +49,14 @@ .method public constructor (Landroid/arch/lifecycle/ViewModelStoreOwner;Landroid/arch/lifecycle/ViewModelProvider$Factory;)V .locals 0 + .param p1 # Landroid/arch/lifecycle/ViewModelStoreOwner; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/arch/lifecycle/ViewModelProvider$Factory; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 66 invoke-interface {p1}, Landroid/arch/lifecycle/ViewModelStoreOwner;->getViewModelStore()Landroid/arch/lifecycle/ViewModelStore; @@ -56,6 +72,16 @@ # virtual methods .method public get(Ljava/lang/Class;)Landroid/arch/lifecycle/ViewModel; .locals 3 + .param p1 # Ljava/lang/Class; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/MainThread; + .end annotation + + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "()V .locals 0 + .line 10 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/arch/lifecycle/livedata/core/R.smali b/smali/android/arch/lifecycle/livedata/core/R.smali index 4203a9cb..6e7a2df5 100644 --- a/smali/android/arch/lifecycle/livedata/core/R.smali +++ b/smali/android/arch/lifecycle/livedata/core/R.smali @@ -1,11 +1,13 @@ .class public final Landroid/arch/lifecycle/livedata/core/R; .super Ljava/lang/Object; +.source "R.java" # direct methods .method private constructor ()V .locals 0 + .line 10 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/arch/lifecycle/viewmodel/R.smali b/smali/android/arch/lifecycle/viewmodel/R.smali index 3d8754ae..373849fa 100644 --- a/smali/android/arch/lifecycle/viewmodel/R.smali +++ b/smali/android/arch/lifecycle/viewmodel/R.smali @@ -1,11 +1,13 @@ .class public final Landroid/arch/lifecycle/viewmodel/R; .super Ljava/lang/Object; +.source "R.java" # direct methods .method private constructor ()V .locals 0 + .line 10 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/annotation/Px.smali b/smali/android/support/annotation/Px.smali index 07c19aa6..2321e17c 100644 --- a/smali/android/support/annotation/Px.smali +++ b/smali/android/support/annotation/Px.smali @@ -7,6 +7,10 @@ # annotations +.annotation build Landroid/support/annotation/Dimension; + unit = 0x1 +.end annotation + .annotation runtime Ljava/lang/annotation/Documented; .end annotation diff --git a/smali/android/support/annotation/RequiresApi.smali b/smali/android/support/annotation/RequiresApi.smali index f1c8fdae..4e162b5b 100644 --- a/smali/android/support/annotation/RequiresApi.smali +++ b/smali/android/support/annotation/RequiresApi.smali @@ -31,7 +31,13 @@ # virtual methods .method public abstract api()I + .annotation build Landroid/support/annotation/IntRange; + from = 0x1L + .end annotation .end method .method public abstract value()I + .annotation build Landroid/support/annotation/IntRange; + from = 0x1L + .end annotation .end method diff --git a/smali/android/support/annotation/RestrictTo$Scope.smali b/smali/android/support/annotation/RestrictTo$Scope.smali index efa41838..9e866c63 100644 --- a/smali/android/support/annotation/RestrictTo$Scope.smali +++ b/smali/android/support/annotation/RestrictTo$Scope.smali @@ -41,79 +41,89 @@ # direct methods .method static constructor ()V - .locals 11 + .locals 7 .line 63 new-instance v0, Landroid/support/annotation/RestrictTo$Scope; - const-string v1, "LIBRARY" + const/4 v1, 0x0 - const/4 v2, 0x0 + const-string v2, "LIBRARY" - invoke-direct {v0, v1, v2}, Landroid/support/annotation/RestrictTo$Scope;->(Ljava/lang/String;I)V + invoke-direct {v0, v2, v1}, Landroid/support/annotation/RestrictTo$Scope;->(Ljava/lang/String;I)V sput-object v0, Landroid/support/annotation/RestrictTo$Scope;->LIBRARY:Landroid/support/annotation/RestrictTo$Scope; .line 69 - new-instance v1, Landroid/support/annotation/RestrictTo$Scope; + new-instance v0, Landroid/support/annotation/RestrictTo$Scope; - const-string v3, "LIBRARY_GROUP" + const/4 v2, 0x1 - const/4 v4, 0x1 + const-string v3, "LIBRARY_GROUP" - invoke-direct {v1, v3, v4}, Landroid/support/annotation/RestrictTo$Scope;->(Ljava/lang/String;I)V + invoke-direct {v0, v3, v2}, Landroid/support/annotation/RestrictTo$Scope;->(Ljava/lang/String;I)V - sput-object v1, Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + sput-object v0, Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; .line 77 - new-instance v3, Landroid/support/annotation/RestrictTo$Scope; + new-instance v0, Landroid/support/annotation/RestrictTo$Scope; - const-string v5, "GROUP_ID" + const/4 v3, 0x2 - const/4 v6, 0x2 + const-string v4, "GROUP_ID" - invoke-direct {v3, v5, v6}, Landroid/support/annotation/RestrictTo$Scope;->(Ljava/lang/String;I)V + invoke-direct {v0, v4, v3}, Landroid/support/annotation/RestrictTo$Scope;->(Ljava/lang/String;I)V - sput-object v3, Landroid/support/annotation/RestrictTo$Scope;->GROUP_ID:Landroid/support/annotation/RestrictTo$Scope; + sput-object v0, Landroid/support/annotation/RestrictTo$Scope;->GROUP_ID:Landroid/support/annotation/RestrictTo$Scope; .line 83 - new-instance v5, Landroid/support/annotation/RestrictTo$Scope; + new-instance v0, Landroid/support/annotation/RestrictTo$Scope; - const-string v7, "TESTS" + const/4 v4, 0x3 - const/4 v8, 0x3 + const-string v5, "TESTS" - invoke-direct {v5, v7, v8}, Landroid/support/annotation/RestrictTo$Scope;->(Ljava/lang/String;I)V + invoke-direct {v0, v5, v4}, Landroid/support/annotation/RestrictTo$Scope;->(Ljava/lang/String;I)V - sput-object v5, Landroid/support/annotation/RestrictTo$Scope;->TESTS:Landroid/support/annotation/RestrictTo$Scope; + sput-object v0, Landroid/support/annotation/RestrictTo$Scope;->TESTS:Landroid/support/annotation/RestrictTo$Scope; .line 91 - new-instance v7, Landroid/support/annotation/RestrictTo$Scope; + new-instance v0, Landroid/support/annotation/RestrictTo$Scope; - const-string v9, "SUBCLASSES" + const/4 v5, 0x4 - const/4 v10, 0x4 + const-string v6, "SUBCLASSES" - invoke-direct {v7, v9, v10}, Landroid/support/annotation/RestrictTo$Scope;->(Ljava/lang/String;I)V + invoke-direct {v0, v6, v5}, Landroid/support/annotation/RestrictTo$Scope;->(Ljava/lang/String;I)V - sput-object v7, Landroid/support/annotation/RestrictTo$Scope;->SUBCLASSES:Landroid/support/annotation/RestrictTo$Scope; + sput-object v0, Landroid/support/annotation/RestrictTo$Scope;->SUBCLASSES:Landroid/support/annotation/RestrictTo$Scope; - const/4 v9, 0x5 + const/4 v0, 0x5 - new-array v9, v9, [Landroid/support/annotation/RestrictTo$Scope; + .line 58 + new-array v0, v0, [Landroid/support/annotation/RestrictTo$Scope; - aput-object v0, v9, v2 + sget-object v6, Landroid/support/annotation/RestrictTo$Scope;->LIBRARY:Landroid/support/annotation/RestrictTo$Scope; - aput-object v1, v9, v4 + aput-object v6, v0, v1 - aput-object v3, v9, v6 + sget-object v1, Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; - aput-object v5, v9, v8 + aput-object v1, v0, v2 - aput-object v7, v9, v10 + sget-object v1, Landroid/support/annotation/RestrictTo$Scope;->GROUP_ID:Landroid/support/annotation/RestrictTo$Scope; - .line 58 - sput-object v9, Landroid/support/annotation/RestrictTo$Scope;->$VALUES:[Landroid/support/annotation/RestrictTo$Scope; + aput-object v1, v0, v3 + + sget-object v1, Landroid/support/annotation/RestrictTo$Scope;->TESTS:Landroid/support/annotation/RestrictTo$Scope; + + aput-object v1, v0, v4 + + sget-object v1, Landroid/support/annotation/RestrictTo$Scope;->SUBCLASSES:Landroid/support/annotation/RestrictTo$Scope; + + aput-object v1, v0, v5 + + sput-object v0, Landroid/support/annotation/RestrictTo$Scope;->$VALUES:[Landroid/support/annotation/RestrictTo$Scope; return-void .end method diff --git a/smali/android/support/asynclayoutinflater/R$attr.smali b/smali/android/support/asynclayoutinflater/R$attr.smali index 30e0ea2d..2b73e56a 100644 --- a/smali/android/support/asynclayoutinflater/R$attr.smali +++ b/smali/android/support/asynclayoutinflater/R$attr.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/asynclayoutinflater/R$attr; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -43,6 +44,7 @@ .method private constructor ()V .locals 0 + .line 13 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/asynclayoutinflater/R$color.smali b/smali/android/support/asynclayoutinflater/R$color.smali index f72dcce6..4afe3ce6 100644 --- a/smali/android/support/asynclayoutinflater/R$color.smali +++ b/smali/android/support/asynclayoutinflater/R$color.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/asynclayoutinflater/R$color; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -27,6 +28,7 @@ .method private constructor ()V .locals 0 + .line 29 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/asynclayoutinflater/R$dimen.smali b/smali/android/support/asynclayoutinflater/R$dimen.smali index 0e074839..83d39f01 100644 --- a/smali/android/support/asynclayoutinflater/R$dimen.smali +++ b/smali/android/support/asynclayoutinflater/R$dimen.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/asynclayoutinflater/R$dimen; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -63,6 +64,7 @@ .method private constructor ()V .locals 0 + .line 37 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/asynclayoutinflater/R$drawable.smali b/smali/android/support/asynclayoutinflater/R$drawable.smali index ffd7fe33..357cf614 100644 --- a/smali/android/support/asynclayoutinflater/R$drawable.smali +++ b/smali/android/support/asynclayoutinflater/R$drawable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/asynclayoutinflater/R$drawable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -43,6 +44,7 @@ .method private constructor ()V .locals 0 + .line 63 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/asynclayoutinflater/R$id.smali b/smali/android/support/asynclayoutinflater/R$id.smali index b21e6d85..688c47ca 100644 --- a/smali/android/support/asynclayoutinflater/R$id.smali +++ b/smali/android/support/asynclayoutinflater/R$id.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/asynclayoutinflater/R$id; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -75,6 +76,7 @@ .method private constructor ()V .locals 0 + .line 79 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/asynclayoutinflater/R$integer.smali b/smali/android/support/asynclayoutinflater/R$integer.smali index 275d919b..fcf6e348 100644 --- a/smali/android/support/asynclayoutinflater/R$integer.smali +++ b/smali/android/support/asynclayoutinflater/R$integer.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/asynclayoutinflater/R$integer; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -21,6 +22,7 @@ .method private constructor ()V .locals 0 + .line 111 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/asynclayoutinflater/R$layout.smali b/smali/android/support/asynclayoutinflater/R$layout.smali index 4deef0da..52a804ec 100644 --- a/smali/android/support/asynclayoutinflater/R$layout.smali +++ b/smali/android/support/asynclayoutinflater/R$layout.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/asynclayoutinflater/R$layout; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -31,6 +32,7 @@ .method private constructor ()V .locals 0 + .line 116 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/asynclayoutinflater/R$string.smali b/smali/android/support/asynclayoutinflater/R$string.smali index 486edd82..860fcd7b 100644 --- a/smali/android/support/asynclayoutinflater/R$string.smali +++ b/smali/android/support/asynclayoutinflater/R$string.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/asynclayoutinflater/R$string; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -21,6 +22,7 @@ .method private constructor ()V .locals 0 + .line 126 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/asynclayoutinflater/R$style.smali b/smali/android/support/asynclayoutinflater/R$style.smali index e54a6399..5236f662 100644 --- a/smali/android/support/asynclayoutinflater/R$style.smali +++ b/smali/android/support/asynclayoutinflater/R$style.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/asynclayoutinflater/R$style; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -33,6 +34,7 @@ .method private constructor ()V .locals 0 + .line 131 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/asynclayoutinflater/R$styleable.smali b/smali/android/support/asynclayoutinflater/R$styleable.smali index 3405438e..e4d5cf04 100644 --- a/smali/android/support/asynclayoutinflater/R$styleable.smali +++ b/smali/android/support/asynclayoutinflater/R$styleable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/asynclayoutinflater/R$styleable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -92,11 +93,12 @@ # direct methods -.method public static constructor ()V +.method static constructor ()V .locals 1 const/4 v0, 0x3 + .line 144 new-array v0, v0, [I fill-array-data v0, :array_0 @@ -105,6 +107,7 @@ const/4 v0, 0x6 + .line 148 new-array v0, v0, [I fill-array-data v0, :array_1 @@ -113,6 +116,7 @@ const/16 v0, 0xa + .line 155 new-array v0, v0, [I fill-array-data v0, :array_2 @@ -121,6 +125,7 @@ const/16 v0, 0xc + .line 166 new-array v0, v0, [I fill-array-data v0, :array_3 @@ -129,6 +134,7 @@ const/4 v0, 0x2 + .line 179 new-array v0, v0, [I fill-array-data v0, :array_4 @@ -196,6 +202,7 @@ .method private constructor ()V .locals 0 + .line 142 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/asynclayoutinflater/R.smali b/smali/android/support/asynclayoutinflater/R.smali index 9d90baf1..b96a07c3 100644 --- a/smali/android/support/asynclayoutinflater/R.smali +++ b/smali/android/support/asynclayoutinflater/R.smali @@ -1,20 +1,21 @@ .class public final Landroid/support/asynclayoutinflater/R; .super Ljava/lang/Object; +.source "R.java" # annotations .annotation system Ldalvik/annotation/MemberClasses; value = { - Landroid/support/asynclayoutinflater/R$attr;, - Landroid/support/asynclayoutinflater/R$color;, - Landroid/support/asynclayoutinflater/R$dimen;, - Landroid/support/asynclayoutinflater/R$drawable;, - Landroid/support/asynclayoutinflater/R$id;, - Landroid/support/asynclayoutinflater/R$integer;, - Landroid/support/asynclayoutinflater/R$layout;, - Landroid/support/asynclayoutinflater/R$string;, + Landroid/support/asynclayoutinflater/R$styleable;, Landroid/support/asynclayoutinflater/R$style;, - Landroid/support/asynclayoutinflater/R$styleable; + Landroid/support/asynclayoutinflater/R$string;, + Landroid/support/asynclayoutinflater/R$layout;, + Landroid/support/asynclayoutinflater/R$integer;, + Landroid/support/asynclayoutinflater/R$id;, + Landroid/support/asynclayoutinflater/R$drawable;, + Landroid/support/asynclayoutinflater/R$dimen;, + Landroid/support/asynclayoutinflater/R$color;, + Landroid/support/asynclayoutinflater/R$attr; } .end annotation @@ -23,6 +24,7 @@ .method private constructor ()V .locals 0 + .line 10 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/compat/R$attr.smali b/smali/android/support/compat/R$attr.smali index 903af459..e632c253 100644 --- a/smali/android/support/compat/R$attr.smali +++ b/smali/android/support/compat/R$attr.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/compat/R$attr; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -43,6 +44,7 @@ .method private constructor ()V .locals 0 + .line 13 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/compat/R$color.smali b/smali/android/support/compat/R$color.smali index 2dae15ca..74b8c558 100644 --- a/smali/android/support/compat/R$color.smali +++ b/smali/android/support/compat/R$color.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/compat/R$color; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -27,6 +28,7 @@ .method private constructor ()V .locals 0 + .line 29 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/compat/R$dimen.smali b/smali/android/support/compat/R$dimen.smali index 550cc691..4cd783a0 100644 --- a/smali/android/support/compat/R$dimen.smali +++ b/smali/android/support/compat/R$dimen.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/compat/R$dimen; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -63,6 +64,7 @@ .method private constructor ()V .locals 0 + .line 37 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/compat/R$drawable.smali b/smali/android/support/compat/R$drawable.smali index 27b4ce99..e759ee11 100644 --- a/smali/android/support/compat/R$drawable.smali +++ b/smali/android/support/compat/R$drawable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/compat/R$drawable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -43,6 +44,7 @@ .method private constructor ()V .locals 0 + .line 63 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/compat/R$id.smali b/smali/android/support/compat/R$id.smali index c0450198..e259cf4d 100644 --- a/smali/android/support/compat/R$id.smali +++ b/smali/android/support/compat/R$id.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/compat/R$id; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -75,6 +76,7 @@ .method private constructor ()V .locals 0 + .line 79 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/compat/R$integer.smali b/smali/android/support/compat/R$integer.smali index b7ed1b99..c066d3b9 100644 --- a/smali/android/support/compat/R$integer.smali +++ b/smali/android/support/compat/R$integer.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/compat/R$integer; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -21,6 +22,7 @@ .method private constructor ()V .locals 0 + .line 111 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/compat/R$layout.smali b/smali/android/support/compat/R$layout.smali index 983d47c1..6a969a43 100644 --- a/smali/android/support/compat/R$layout.smali +++ b/smali/android/support/compat/R$layout.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/compat/R$layout; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -31,6 +32,7 @@ .method private constructor ()V .locals 0 + .line 116 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/compat/R$string.smali b/smali/android/support/compat/R$string.smali index c3eeb0c1..c86e1222 100644 --- a/smali/android/support/compat/R$string.smali +++ b/smali/android/support/compat/R$string.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/compat/R$string; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -21,6 +22,7 @@ .method private constructor ()V .locals 0 + .line 126 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/compat/R$style.smali b/smali/android/support/compat/R$style.smali index 2f5a7391..aa7ad5c6 100644 --- a/smali/android/support/compat/R$style.smali +++ b/smali/android/support/compat/R$style.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/compat/R$style; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -33,6 +34,7 @@ .method private constructor ()V .locals 0 + .line 131 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/compat/R$styleable.smali b/smali/android/support/compat/R$styleable.smali index 56e6f3d6..b70696cd 100644 --- a/smali/android/support/compat/R$styleable.smali +++ b/smali/android/support/compat/R$styleable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/compat/R$styleable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -92,11 +93,12 @@ # direct methods -.method public static constructor ()V +.method static constructor ()V .locals 1 const/4 v0, 0x3 + .line 144 new-array v0, v0, [I fill-array-data v0, :array_0 @@ -105,6 +107,7 @@ const/4 v0, 0x6 + .line 148 new-array v0, v0, [I fill-array-data v0, :array_1 @@ -113,6 +116,7 @@ const/16 v0, 0xa + .line 155 new-array v0, v0, [I fill-array-data v0, :array_2 @@ -121,6 +125,7 @@ const/16 v0, 0xc + .line 166 new-array v0, v0, [I fill-array-data v0, :array_3 @@ -129,6 +134,7 @@ const/4 v0, 0x2 + .line 179 new-array v0, v0, [I fill-array-data v0, :array_4 @@ -196,6 +202,7 @@ .method private constructor ()V .locals 0 + .line 142 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/compat/R.smali b/smali/android/support/compat/R.smali index daf410ee..3bc03adc 100644 --- a/smali/android/support/compat/R.smali +++ b/smali/android/support/compat/R.smali @@ -1,20 +1,21 @@ .class public final Landroid/support/compat/R; .super Ljava/lang/Object; +.source "R.java" # annotations .annotation system Ldalvik/annotation/MemberClasses; value = { - Landroid/support/compat/R$attr;, - Landroid/support/compat/R$color;, - Landroid/support/compat/R$dimen;, - Landroid/support/compat/R$drawable;, - Landroid/support/compat/R$id;, - Landroid/support/compat/R$integer;, - Landroid/support/compat/R$layout;, - Landroid/support/compat/R$string;, + Landroid/support/compat/R$styleable;, Landroid/support/compat/R$style;, - Landroid/support/compat/R$styleable; + Landroid/support/compat/R$string;, + Landroid/support/compat/R$layout;, + Landroid/support/compat/R$integer;, + Landroid/support/compat/R$id;, + Landroid/support/compat/R$drawable;, + Landroid/support/compat/R$dimen;, + Landroid/support/compat/R$color;, + Landroid/support/compat/R$attr; } .end annotation @@ -23,6 +24,7 @@ .method private constructor ()V .locals 0 + .line 10 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/constraint/ConstraintAttribute$1.smali b/smali/android/support/constraint/ConstraintAttribute$1.smali index 882ee48e..bcc1a8c0 100644 --- a/smali/android/support/constraint/ConstraintAttribute$1.smali +++ b/smali/android/support/constraint/ConstraintAttribute$1.smali @@ -34,6 +34,8 @@ sput-object v0, Landroid/support/constraint/ConstraintAttribute$1;->$SwitchMap$android$support$constraint$ConstraintAttribute$AttributeType:[I :try_start_0 + sget-object v0, Landroid/support/constraint/ConstraintAttribute$1;->$SwitchMap$android$support$constraint$ConstraintAttribute$AttributeType:[I + sget-object v1, Landroid/support/constraint/ConstraintAttribute$AttributeType;->COLOR_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; invoke-virtual {v1}, Landroid/support/constraint/ConstraintAttribute$AttributeType;->ordinal()I diff --git a/smali/android/support/constraint/ConstraintAttribute$AttributeType.smali b/smali/android/support/constraint/ConstraintAttribute$AttributeType.smali index 9717ea8f..376fa247 100644 --- a/smali/android/support/constraint/ConstraintAttribute$AttributeType.smali +++ b/smali/android/support/constraint/ConstraintAttribute$AttributeType.smali @@ -42,105 +42,119 @@ # direct methods .method static constructor ()V - .locals 15 + .locals 9 .line 52 new-instance v0, Landroid/support/constraint/ConstraintAttribute$AttributeType; - const-string v1, "INT_TYPE" + const/4 v1, 0x0 - const/4 v2, 0x0 + const-string v2, "INT_TYPE" - invoke-direct {v0, v1, v2}, Landroid/support/constraint/ConstraintAttribute$AttributeType;->(Ljava/lang/String;I)V + invoke-direct {v0, v2, v1}, Landroid/support/constraint/ConstraintAttribute$AttributeType;->(Ljava/lang/String;I)V sput-object v0, Landroid/support/constraint/ConstraintAttribute$AttributeType;->INT_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; .line 53 - new-instance v1, Landroid/support/constraint/ConstraintAttribute$AttributeType; + new-instance v0, Landroid/support/constraint/ConstraintAttribute$AttributeType; - const-string v3, "FLOAT_TYPE" + const/4 v2, 0x1 - const/4 v4, 0x1 + const-string v3, "FLOAT_TYPE" - invoke-direct {v1, v3, v4}, Landroid/support/constraint/ConstraintAttribute$AttributeType;->(Ljava/lang/String;I)V + invoke-direct {v0, v3, v2}, Landroid/support/constraint/ConstraintAttribute$AttributeType;->(Ljava/lang/String;I)V - sput-object v1, Landroid/support/constraint/ConstraintAttribute$AttributeType;->FLOAT_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; + sput-object v0, Landroid/support/constraint/ConstraintAttribute$AttributeType;->FLOAT_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; .line 54 - new-instance v3, Landroid/support/constraint/ConstraintAttribute$AttributeType; + new-instance v0, Landroid/support/constraint/ConstraintAttribute$AttributeType; - const-string v5, "COLOR_TYPE" + const/4 v3, 0x2 - const/4 v6, 0x2 + const-string v4, "COLOR_TYPE" - invoke-direct {v3, v5, v6}, Landroid/support/constraint/ConstraintAttribute$AttributeType;->(Ljava/lang/String;I)V + invoke-direct {v0, v4, v3}, Landroid/support/constraint/ConstraintAttribute$AttributeType;->(Ljava/lang/String;I)V - sput-object v3, Landroid/support/constraint/ConstraintAttribute$AttributeType;->COLOR_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; + sput-object v0, Landroid/support/constraint/ConstraintAttribute$AttributeType;->COLOR_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; .line 55 - new-instance v5, Landroid/support/constraint/ConstraintAttribute$AttributeType; + new-instance v0, Landroid/support/constraint/ConstraintAttribute$AttributeType; - const-string v7, "COLOR_DRAWABLE_TYPE" + const/4 v4, 0x3 - const/4 v8, 0x3 + const-string v5, "COLOR_DRAWABLE_TYPE" - invoke-direct {v5, v7, v8}, Landroid/support/constraint/ConstraintAttribute$AttributeType;->(Ljava/lang/String;I)V + invoke-direct {v0, v5, v4}, Landroid/support/constraint/ConstraintAttribute$AttributeType;->(Ljava/lang/String;I)V - sput-object v5, Landroid/support/constraint/ConstraintAttribute$AttributeType;->COLOR_DRAWABLE_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; + sput-object v0, Landroid/support/constraint/ConstraintAttribute$AttributeType;->COLOR_DRAWABLE_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; .line 56 - new-instance v7, Landroid/support/constraint/ConstraintAttribute$AttributeType; + new-instance v0, Landroid/support/constraint/ConstraintAttribute$AttributeType; - const-string v9, "STRING_TYPE" + const/4 v5, 0x4 - const/4 v10, 0x4 + const-string v6, "STRING_TYPE" - invoke-direct {v7, v9, v10}, Landroid/support/constraint/ConstraintAttribute$AttributeType;->(Ljava/lang/String;I)V + invoke-direct {v0, v6, v5}, Landroid/support/constraint/ConstraintAttribute$AttributeType;->(Ljava/lang/String;I)V - sput-object v7, Landroid/support/constraint/ConstraintAttribute$AttributeType;->STRING_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; + sput-object v0, Landroid/support/constraint/ConstraintAttribute$AttributeType;->STRING_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; .line 57 - new-instance v9, Landroid/support/constraint/ConstraintAttribute$AttributeType; + new-instance v0, Landroid/support/constraint/ConstraintAttribute$AttributeType; - const-string v11, "BOOLEAN_TYPE" + const/4 v6, 0x5 - const/4 v12, 0x5 + const-string v7, "BOOLEAN_TYPE" - invoke-direct {v9, v11, v12}, Landroid/support/constraint/ConstraintAttribute$AttributeType;->(Ljava/lang/String;I)V + invoke-direct {v0, v7, v6}, Landroid/support/constraint/ConstraintAttribute$AttributeType;->(Ljava/lang/String;I)V - sput-object v9, Landroid/support/constraint/ConstraintAttribute$AttributeType;->BOOLEAN_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; + sput-object v0, Landroid/support/constraint/ConstraintAttribute$AttributeType;->BOOLEAN_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; .line 58 - new-instance v11, Landroid/support/constraint/ConstraintAttribute$AttributeType; + new-instance v0, Landroid/support/constraint/ConstraintAttribute$AttributeType; - const-string v13, "DIMENSION_TYPE" + const/4 v7, 0x6 - const/4 v14, 0x6 + const-string v8, "DIMENSION_TYPE" - invoke-direct {v11, v13, v14}, Landroid/support/constraint/ConstraintAttribute$AttributeType;->(Ljava/lang/String;I)V + invoke-direct {v0, v8, v7}, Landroid/support/constraint/ConstraintAttribute$AttributeType;->(Ljava/lang/String;I)V - sput-object v11, Landroid/support/constraint/ConstraintAttribute$AttributeType;->DIMENSION_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; + sput-object v0, Landroid/support/constraint/ConstraintAttribute$AttributeType;->DIMENSION_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; - const/4 v13, 0x7 + const/4 v0, 0x7 - new-array v13, v13, [Landroid/support/constraint/ConstraintAttribute$AttributeType; + .line 51 + new-array v0, v0, [Landroid/support/constraint/ConstraintAttribute$AttributeType; - aput-object v0, v13, v2 + sget-object v8, Landroid/support/constraint/ConstraintAttribute$AttributeType;->INT_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; - aput-object v1, v13, v4 + aput-object v8, v0, v1 - aput-object v3, v13, v6 + sget-object v1, Landroid/support/constraint/ConstraintAttribute$AttributeType;->FLOAT_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; - aput-object v5, v13, v8 + aput-object v1, v0, v2 - aput-object v7, v13, v10 + sget-object v1, Landroid/support/constraint/ConstraintAttribute$AttributeType;->COLOR_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; - aput-object v9, v13, v12 + aput-object v1, v0, v3 - aput-object v11, v13, v14 + sget-object v1, Landroid/support/constraint/ConstraintAttribute$AttributeType;->COLOR_DRAWABLE_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; - .line 51 - sput-object v13, Landroid/support/constraint/ConstraintAttribute$AttributeType;->$VALUES:[Landroid/support/constraint/ConstraintAttribute$AttributeType; + aput-object v1, v0, v4 + + sget-object v1, Landroid/support/constraint/ConstraintAttribute$AttributeType;->STRING_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; + + aput-object v1, v0, v5 + + sget-object v1, Landroid/support/constraint/ConstraintAttribute$AttributeType;->BOOLEAN_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; + + aput-object v1, v0, v6 + + sget-object v1, Landroid/support/constraint/ConstraintAttribute$AttributeType;->DIMENSION_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; + + aput-object v1, v0, v7 + + sput-object v0, Landroid/support/constraint/ConstraintAttribute$AttributeType;->$VALUES:[Landroid/support/constraint/ConstraintAttribute$AttributeType; return-void .end method diff --git a/smali/android/support/constraint/ConstraintAttribute.smali b/smali/android/support/constraint/ConstraintAttribute.smali index 247efa1d..b867817d 100644 --- a/smali/android/support/constraint/ConstraintAttribute.smali +++ b/smali/android/support/constraint/ConstraintAttribute.smali @@ -223,9 +223,9 @@ move-result-object v5 + .line 262 new-array v6, v6, [Ljava/lang/Object; - .line 262 invoke-virtual {v5, p1, v6}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; move-result-object v5 @@ -310,13 +310,15 @@ move-object v4, v3 - const/4 v5, 0x0 + move-object v5, v4 + + const/4 v1, 0x0 :goto_0 - if-ge v5, v0, :cond_9 + if-ge v1, v0, :cond_9 .line 406 - invoke-virtual {p1, v5}, Landroid/content/res/TypedArray;->getIndex(I)I + invoke-virtual {p1, v1}, Landroid/content/res/TypedArray;->getIndex(I)I move-result v6 @@ -330,12 +332,12 @@ .line 408 invoke-virtual {p1, v6}, Landroid/content/res/TypedArray;->getString(I)Ljava/lang/String; - move-result-object v1 + move-result-object v3 - if-eqz v1, :cond_8 + if-eqz v3, :cond_8 .line 409 - invoke-virtual {v1}, Ljava/lang/String;->length()I + invoke-virtual {v3}, Ljava/lang/String;->length()I move-result v6 @@ -346,7 +348,7 @@ invoke-direct {v6}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v1, v2}, Ljava/lang/String;->charAt(I)C + invoke-virtual {v3, v2}, Ljava/lang/String;->charAt(I)C move-result v7 @@ -356,15 +358,15 @@ invoke-virtual {v6, v7}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder; - invoke-virtual {v1, v8}, Ljava/lang/String;->substring(I)Ljava/lang/String; + invoke-virtual {v3, v8}, Ljava/lang/String;->substring(I)Ljava/lang/String; - move-result-object v1 + move-result-object v3 - invoke-virtual {v6, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v6, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v1 + move-result-object v3 goto/16 :goto_2 @@ -377,14 +379,14 @@ .line 413 invoke-virtual {p1, v6, v2}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z - move-result v3 + move-result v4 - invoke-static {v3}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean; + invoke-static {v4}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean; - move-result-object v3 + move-result-object v4 .line 414 - sget-object v4, Landroid/support/constraint/ConstraintAttribute$AttributeType;->BOOLEAN_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; + sget-object v5, Landroid/support/constraint/ConstraintAttribute$AttributeType;->BOOLEAN_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; goto/16 :goto_2 @@ -395,23 +397,23 @@ if-ne v6, v7, :cond_2 .line 416 - sget-object v3, Landroid/support/constraint/ConstraintAttribute$AttributeType;->COLOR_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; + sget-object v4, Landroid/support/constraint/ConstraintAttribute$AttributeType;->COLOR_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; .line 417 invoke-virtual {p1, v6, v2}, Landroid/content/res/TypedArray;->getColor(II)I - move-result v4 + move-result v5 - invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - move-result-object v4 + move-result-object v5 :goto_1 - move-object v10, v4 + move-object v10, v5 - move-object v4, v3 + move-object v5, v4 - move-object v3, v10 + move-object v4, v10 goto :goto_2 @@ -422,16 +424,16 @@ if-ne v6, v7, :cond_3 .line 419 - sget-object v3, Landroid/support/constraint/ConstraintAttribute$AttributeType;->COLOR_DRAWABLE_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; + sget-object v4, Landroid/support/constraint/ConstraintAttribute$AttributeType;->COLOR_DRAWABLE_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; .line 420 invoke-virtual {p1, v6, v2}, Landroid/content/res/TypedArray;->getColor(II)I - move-result v4 + move-result v5 - invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - move-result-object v4 + move-result-object v5 goto :goto_1 @@ -444,12 +446,12 @@ if-ne v6, v7, :cond_4 .line 422 - sget-object v3, Landroid/support/constraint/ConstraintAttribute$AttributeType;->DIMENSION_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; + sget-object v4, Landroid/support/constraint/ConstraintAttribute$AttributeType;->DIMENSION_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; .line 425 invoke-virtual {p1, v6, v9}, Landroid/content/res/TypedArray;->getDimension(IF)F - move-result v4 + move-result v5 .line 426 invoke-virtual {p0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources; @@ -461,13 +463,13 @@ move-result-object v6 .line 423 - invoke-static {v8, v4, v6}, Landroid/util/TypedValue;->applyDimension(IFLandroid/util/DisplayMetrics;)F + invoke-static {v8, v5, v6}, Landroid/util/TypedValue;->applyDimension(IFLandroid/util/DisplayMetrics;)F - move-result v4 + move-result v5 - invoke-static {v4}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float; + invoke-static {v5}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float; - move-result-object v4 + move-result-object v5 goto :goto_1 @@ -478,16 +480,16 @@ if-ne v6, v7, :cond_5 .line 428 - sget-object v3, Landroid/support/constraint/ConstraintAttribute$AttributeType;->DIMENSION_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; + sget-object v4, Landroid/support/constraint/ConstraintAttribute$AttributeType;->DIMENSION_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; .line 429 invoke-virtual {p1, v6, v9}, Landroid/content/res/TypedArray;->getDimension(IF)F - move-result v4 + move-result v5 - invoke-static {v4}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float; + invoke-static {v5}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float; - move-result-object v4 + move-result-object v5 goto :goto_1 @@ -498,18 +500,18 @@ if-ne v6, v7, :cond_6 .line 431 - sget-object v3, Landroid/support/constraint/ConstraintAttribute$AttributeType;->FLOAT_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; + sget-object v4, Landroid/support/constraint/ConstraintAttribute$AttributeType;->FLOAT_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; - const/high16 v4, 0x7fc00000 # Float.NaN + const/high16 v5, 0x7fc00000 # Float.NaN .line 432 - invoke-virtual {p1, v6, v4}, Landroid/content/res/TypedArray;->getFloat(IF)F + invoke-virtual {p1, v6, v5}, Landroid/content/res/TypedArray;->getFloat(IF)F - move-result v4 + move-result v5 - invoke-static {v4}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float; + invoke-static {v5}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float; - move-result-object v4 + move-result-object v5 goto :goto_1 @@ -520,18 +522,18 @@ if-ne v6, v7, :cond_7 .line 434 - sget-object v3, Landroid/support/constraint/ConstraintAttribute$AttributeType;->INT_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; + sget-object v4, Landroid/support/constraint/ConstraintAttribute$AttributeType;->INT_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; - const/4 v4, -0x1 + const/4 v5, -0x1 .line 435 - invoke-virtual {p1, v6, v4}, Landroid/content/res/TypedArray;->getInteger(II)I + invoke-virtual {p1, v6, v5}, Landroid/content/res/TypedArray;->getInteger(II)I - move-result v4 + move-result v5 - invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - move-result-object v4 + move-result-object v5 goto :goto_1 @@ -542,32 +544,32 @@ if-ne v6, v7, :cond_8 .line 437 - sget-object v3, Landroid/support/constraint/ConstraintAttribute$AttributeType;->STRING_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; + sget-object v4, Landroid/support/constraint/ConstraintAttribute$AttributeType;->STRING_TYPE:Landroid/support/constraint/ConstraintAttribute$AttributeType; .line 438 invoke-virtual {p1, v6}, Landroid/content/res/TypedArray;->getString(I)Ljava/lang/String; - move-result-object v4 + move-result-object v5 goto :goto_1 :cond_8 :goto_2 - add-int/lit8 v5, v5, 0x1 + add-int/lit8 v1, v1, 0x1 goto/16 :goto_0 :cond_9 - if-eqz v1, :cond_a - if-eqz v3, :cond_a + if-eqz v4, :cond_a + .line 442 new-instance p0, Landroid/support/constraint/ConstraintAttribute; - invoke-direct {p0, v1, v4, v3}, Landroid/support/constraint/ConstraintAttribute;->(Ljava/lang/String;Landroid/support/constraint/ConstraintAttribute$AttributeType;Ljava/lang/Object;)V + invoke-direct {p0, v3, v5, v4}, Landroid/support/constraint/ConstraintAttribute;->(Ljava/lang/String;Landroid/support/constraint/ConstraintAttribute$AttributeType;Ljava/lang/Object;)V - invoke-virtual {p2, v1, p0}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + invoke-virtual {p2, v3, p0}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 444 :cond_a @@ -664,10 +666,10 @@ goto :goto_0 + .line 312 :pswitch_0 new-array v8, v10, [Ljava/lang/Class; - .line 312 sget-object v11, Ljava/lang/Float;->TYPE:Ljava/lang/Class; aput-object v11, v8, v9 @@ -676,9 +678,9 @@ move-result-object v8 + .line 313 new-array v10, v10, [Ljava/lang/Object; - .line 313 iget v6, v6, Landroid/support/constraint/ConstraintAttribute;->mFloatValue:F invoke-static {v6}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float; @@ -691,10 +693,10 @@ goto :goto_0 + .line 308 :pswitch_1 new-array v8, v10, [Ljava/lang/Class; - .line 308 sget-object v11, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class; aput-object v11, v8, v9 @@ -703,9 +705,9 @@ move-result-object v8 + .line 309 new-array v10, v10, [Ljava/lang/Object; - .line 309 iget-boolean v6, v6, Landroid/support/constraint/ConstraintAttribute;->mBooleanValue:Z invoke-static {v6}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean; @@ -718,10 +720,10 @@ goto :goto_0 + .line 304 :pswitch_2 new-array v8, v10, [Ljava/lang/Class; - .line 304 const-class v11, Ljava/lang/CharSequence; aput-object v11, v8, v9 @@ -730,9 +732,9 @@ move-result-object v8 + .line 305 new-array v10, v10, [Ljava/lang/Object; - .line 305 iget-object v6, v6, Landroid/support/constraint/ConstraintAttribute;->mStringValue:Ljava/lang/String; aput-object v6, v10, v9 @@ -741,10 +743,10 @@ goto :goto_0 + .line 290 :pswitch_3 new-array v8, v10, [Ljava/lang/Class; - .line 290 sget-object v11, Ljava/lang/Float;->TYPE:Ljava/lang/Class; aput-object v11, v8, v9 @@ -753,9 +755,9 @@ move-result-object v8 + .line 291 new-array v10, v10, [Ljava/lang/Object; - .line 291 iget v6, v6, Landroid/support/constraint/ConstraintAttribute;->mFloatValue:F invoke-static {v6}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float; @@ -768,10 +770,10 @@ goto/16 :goto_0 + .line 286 :pswitch_4 new-array v8, v10, [Ljava/lang/Class; - .line 286 sget-object v11, Ljava/lang/Integer;->TYPE:Ljava/lang/Class; aput-object v11, v8, v9 @@ -780,9 +782,9 @@ move-result-object v8 + .line 287 new-array v10, v10, [Ljava/lang/Object; - .line 287 iget v6, v6, Landroid/support/constraint/ConstraintAttribute;->mIntegerValue:I invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -795,10 +797,10 @@ goto/16 :goto_0 + .line 294 :pswitch_5 new-array v8, v10, [Ljava/lang/Class; - .line 294 const-class v11, Landroid/graphics/drawable/Drawable; aput-object v11, v8, v9 @@ -817,19 +819,19 @@ invoke-virtual {v11, v6}, Landroid/graphics/drawable/ColorDrawable;->setColor(I)V + .line 297 new-array v6, v10, [Ljava/lang/Object; aput-object v11, v6, v9 - .line 297 invoke-virtual {v8, p0, v6}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; goto/16 :goto_0 + .line 300 :pswitch_6 new-array v8, v10, [Ljava/lang/Class; - .line 300 sget-object v11, Ljava/lang/Integer;->TYPE:Ljava/lang/Class; aput-object v11, v8, v9 @@ -838,9 +840,9 @@ move-result-object v8 + .line 301 new-array v10, v10, [Ljava/lang/Object; - .line 301 iget v6, v6, Landroid/support/constraint/ConstraintAttribute;->mColorValue:I invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -1520,10 +1522,10 @@ goto/16 :goto_1 + .line 383 :pswitch_0 new-array v7, v13, [Ljava/lang/Class; - .line 383 sget-object v8, Ljava/lang/Float;->TYPE:Ljava/lang/Class; aput-object v8, v7, v14 @@ -1532,9 +1534,9 @@ move-result-object v0 + .line 384 new-array v7, v13, [Ljava/lang/Object; - .line 384 aget v8, p2, v14 invoke-static {v8}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float; @@ -1547,10 +1549,10 @@ goto/16 :goto_1 + .line 379 :pswitch_1 new-array v7, v13, [Ljava/lang/Class; - .line 379 sget-object v8, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class; aput-object v8, v7, v14 @@ -1559,9 +1561,9 @@ move-result-object v0 + .line 380 new-array v7, v13, [Ljava/lang/Object; - .line 380 aget v8, p2, v14 const/high16 v9, 0x3f000000 # 0.5f @@ -1610,10 +1612,10 @@ throw v0 + .line 351 :pswitch_3 new-array v7, v13, [Ljava/lang/Class; - .line 351 sget-object v8, Ljava/lang/Float;->TYPE:Ljava/lang/Class; aput-object v8, v7, v14 @@ -1622,9 +1624,9 @@ move-result-object v0 + .line 352 new-array v7, v13, [Ljava/lang/Object; - .line 352 aget v8, p2, v14 invoke-static {v8}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float; @@ -1637,10 +1639,10 @@ goto/16 :goto_1 + .line 347 :pswitch_4 new-array v7, v13, [Ljava/lang/Class; - .line 347 sget-object v8, Ljava/lang/Integer;->TYPE:Ljava/lang/Class; aput-object v8, v7, v14 @@ -1649,9 +1651,9 @@ move-result-object v0 + .line 348 new-array v7, v13, [Ljava/lang/Object; - .line 348 aget v8, p2, v14 float-to-int v8, v8 @@ -1666,10 +1668,10 @@ goto/16 :goto_1 + .line 355 :pswitch_5 new-array v7, v13, [Ljava/lang/Class; - .line 355 const-class v15, Landroid/graphics/drawable/Drawable; aput-object v15, v7, v14 @@ -1770,13 +1772,13 @@ const/4 v7, 0x1 + .line 363 new-array v7, v7, [Ljava/lang/Object; const/4 v9, 0x0 aput-object v8, v7, v9 - .line 363 invoke-virtual {v0, v2, v7}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; goto/16 :goto_1 @@ -1784,9 +1786,9 @@ :pswitch_6 const/4 v7, 0x1 + .line 367 new-array v13, v7, [Ljava/lang/Class; - .line 367 sget-object v7, Ljava/lang/Integer;->TYPE:Ljava/lang/Class; const/4 v14, 0x0 @@ -1883,9 +1885,9 @@ const/4 v8, 0x1 + .line 373 new-array v8, v8, [Ljava/lang/Object; - .line 373 invoke-static {v7}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; move-result-object v7 @@ -2186,6 +2188,9 @@ iput v0, p0, Landroid/support/constraint/ConstraintAttribute;->mColorValue:I + .line 165 + iget v0, p0, Landroid/support/constraint/ConstraintAttribute;->mColorValue:I + const v1, 0xffffff and-int/2addr v0, v1 @@ -2194,7 +2199,6 @@ const/4 v2, 0x3 - .line 165 aget p1, p1, v2 mul-float p1, p1, v1 diff --git a/smali/android/support/constraint/ConstraintHelper.smali b/smali/android/support/constraint/ConstraintHelper.smali index 6ba7ab72..71ef5c3a 100644 --- a/smali/android/support/constraint/ConstraintHelper.smali +++ b/smali/android/support/constraint/ConstraintHelper.smali @@ -39,9 +39,9 @@ const/16 v0, 0x20 + .line 48 new-array v0, v0, [I - .line 48 iput-object v0, p0, Landroid/support/constraint/ConstraintHelper;->mIds:[I const/4 v0, 0x0 @@ -78,9 +78,9 @@ const/16 v0, 0x20 + .line 48 new-array v0, v0, [I - .line 48 iput-object v0, p0, Landroid/support/constraint/ConstraintHelper;->mIds:[I const/4 v0, 0x0 @@ -117,9 +117,9 @@ const/16 p3, 0x20 + .line 48 new-array p3, p3, [I - .line 48 iput-object p3, p0, Landroid/support/constraint/ConstraintHelper;->mIds:[I const/4 p3, 0x0 @@ -373,7 +373,7 @@ if-nez p1, :cond_0 - goto :goto_2 + goto :goto_1 .line 322 :cond_0 @@ -426,13 +426,8 @@ :try_end_0 .catch Landroid/content/res/Resources$NotFoundException; {:try_start_0 .. :try_end_0} :catch_0 - goto :goto_1 - - :catch_0 - nop - .line 336 - :goto_1 + :catch_0 invoke-virtual {p2, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v5 @@ -452,7 +447,7 @@ goto :goto_0 :cond_3 - :goto_2 + :goto_1 return v0 .end method @@ -540,13 +535,8 @@ :try_end_0 .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0 - goto :goto_1 - :catch_0 - nop - :cond_3 - :goto_1 if-nez v3, :cond_4 .line 303 @@ -853,6 +843,8 @@ iput-object v2, p0, Landroid/support/constraint/ConstraintHelper;->mReferenceIds:Ljava/lang/String; .line 107 + iget-object v2, p0, Landroid/support/constraint/ConstraintHelper;->mReferenceIds:Ljava/lang/String; + invoke-virtual {p0, v2}, Landroid/support/constraint/ConstraintHelper;->setIds(Ljava/lang/String;)V :cond_0 diff --git a/smali/android/support/constraint/ConstraintLayout$1.smali b/smali/android/support/constraint/ConstraintLayout$1.smali index 7d49efcb..84fc2857 100644 --- a/smali/android/support/constraint/ConstraintLayout$1.smali +++ b/smali/android/support/constraint/ConstraintLayout$1.smali @@ -34,6 +34,8 @@ sput-object v0, Landroid/support/constraint/ConstraintLayout$1;->$SwitchMap$android$support$constraint$solver$widgets$ConstraintWidget$DimensionBehaviour:[I :try_start_0 + sget-object v0, Landroid/support/constraint/ConstraintLayout$1;->$SwitchMap$android$support$constraint$solver$widgets$ConstraintWidget$DimensionBehaviour:[I + sget-object v1, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->FIXED:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; invoke-virtual {v1}, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->ordinal()I diff --git a/smali/android/support/constraint/ConstraintLayout$LayoutParams$Table.smali b/smali/android/support/constraint/ConstraintLayout$LayoutParams$Table.smali index f7cb1aac..03d805ff 100644 --- a/smali/android/support/constraint/ConstraintLayout$LayoutParams$Table.smali +++ b/smali/android/support/constraint/ConstraintLayout$LayoutParams$Table.smali @@ -134,6 +134,8 @@ sput-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; .line 2624 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintLeft_toLeftOf:I const/16 v2, 0x8 @@ -141,6 +143,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2625 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintLeft_toRightOf:I const/16 v2, 0x9 @@ -148,6 +152,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2626 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintRight_toLeftOf:I const/16 v2, 0xa @@ -155,6 +161,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2627 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintRight_toRightOf:I const/16 v2, 0xb @@ -162,6 +170,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2628 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintTop_toTopOf:I const/16 v2, 0xc @@ -169,6 +179,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2629 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintTop_toBottomOf:I const/16 v2, 0xd @@ -176,6 +188,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2630 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintBottom_toTopOf:I const/16 v2, 0xe @@ -183,6 +197,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2631 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintBottom_toBottomOf:I const/16 v2, 0xf @@ -190,6 +206,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2632 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintBaseline_toBaselineOf:I const/16 v2, 0x10 @@ -197,6 +215,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2633 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintCircle:I const/4 v2, 0x2 @@ -204,6 +224,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2634 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintCircleRadius:I const/4 v2, 0x3 @@ -211,6 +233,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2635 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintCircleAngle:I const/4 v2, 0x4 @@ -218,6 +242,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2636 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_editor_absoluteX:I const/16 v2, 0x31 @@ -225,6 +251,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2637 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_editor_absoluteY:I const/16 v2, 0x32 @@ -232,6 +260,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2638 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintGuide_begin:I const/4 v2, 0x5 @@ -239,6 +269,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2639 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintGuide_end:I const/4 v2, 0x6 @@ -246,6 +278,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2640 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintGuide_percent:I const/4 v2, 0x7 @@ -253,6 +287,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2641 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_android_orientation:I const/4 v2, 0x1 @@ -260,6 +296,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2642 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintStart_toEndOf:I const/16 v2, 0x11 @@ -267,6 +305,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2643 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintStart_toStartOf:I const/16 v2, 0x12 @@ -274,6 +314,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2644 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintEnd_toStartOf:I const/16 v2, 0x13 @@ -281,6 +323,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2645 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintEnd_toEndOf:I const/16 v2, 0x14 @@ -288,6 +332,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2646 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_goneMarginLeft:I const/16 v2, 0x15 @@ -295,6 +341,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2647 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_goneMarginTop:I const/16 v2, 0x16 @@ -302,6 +350,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2648 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_goneMarginRight:I const/16 v2, 0x17 @@ -309,6 +359,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2649 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_goneMarginBottom:I const/16 v2, 0x18 @@ -316,6 +368,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2650 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_goneMarginStart:I const/16 v2, 0x19 @@ -323,6 +377,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2651 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_goneMarginEnd:I const/16 v2, 0x1a @@ -330,6 +386,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2652 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintHorizontal_bias:I const/16 v2, 0x1d @@ -337,6 +395,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2653 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintVertical_bias:I const/16 v2, 0x1e @@ -344,6 +404,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2654 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintDimensionRatio:I const/16 v2, 0x2c @@ -351,6 +413,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2655 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintHorizontal_weight:I const/16 v2, 0x2d @@ -358,6 +422,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2656 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintVertical_weight:I const/16 v2, 0x2e @@ -365,6 +431,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2657 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintHorizontal_chainStyle:I const/16 v2, 0x2f @@ -372,6 +440,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2658 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintVertical_chainStyle:I const/16 v2, 0x30 @@ -379,6 +449,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2659 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constrainedWidth:I const/16 v2, 0x1b @@ -386,6 +458,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2660 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constrainedHeight:I const/16 v2, 0x1c @@ -393,6 +467,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2661 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintWidth_default:I const/16 v2, 0x1f @@ -400,6 +476,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2662 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintHeight_default:I const/16 v2, 0x20 @@ -407,6 +485,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2663 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintWidth_min:I const/16 v2, 0x21 @@ -414,6 +494,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2664 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintWidth_max:I const/16 v2, 0x22 @@ -421,6 +503,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2665 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintWidth_percent:I const/16 v2, 0x23 @@ -428,6 +512,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2666 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintHeight_min:I const/16 v2, 0x24 @@ -435,6 +521,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2667 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintHeight_max:I const/16 v2, 0x25 @@ -442,6 +530,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2668 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintHeight_percent:I const/16 v2, 0x26 @@ -449,6 +539,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2669 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintLeft_creator:I const/16 v2, 0x27 @@ -456,6 +548,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2670 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintTop_creator:I const/16 v2, 0x28 @@ -463,6 +557,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2671 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintRight_creator:I const/16 v2, 0x29 @@ -470,6 +566,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2672 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintBottom_creator:I const/16 v2, 0x2a @@ -477,6 +575,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2673 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintBaseline_creator:I const/16 v2, 0x2b @@ -484,6 +584,8 @@ invoke-virtual {v0, v1, v2}, Landroid/util/SparseIntArray;->append(II)V .line 2674 + sget-object v0, Landroid/support/constraint/ConstraintLayout$LayoutParams$Table;->map:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout_layout_constraintTag:I const/16 v2, 0x33 diff --git a/smali/android/support/constraint/ConstraintLayout$LayoutParams.smali b/smali/android/support/constraint/ConstraintLayout$LayoutParams.smali index 7e8b41c5..f31eead0 100644 --- a/smali/android/support/constraint/ConstraintLayout$LayoutParams.smali +++ b/smali/android/support/constraint/ConstraintLayout$LayoutParams.smali @@ -671,12 +671,11 @@ packed-switch v5, :pswitch_data_0 - packed-switch v5, :pswitch_data_1 - + :pswitch_0 goto/16 :goto_3 .line 3004 - :pswitch_0 + :pswitch_1 invoke-virtual {p1, v4}, Landroid/content/res/TypedArray;->getString(I)Ljava/lang/String; move-result-object v4 @@ -686,7 +685,7 @@ goto/16 :goto_3 .line 2776 - :pswitch_1 + :pswitch_2 iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->editorAbsoluteY:I invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getDimensionPixelOffset(II)I @@ -698,7 +697,7 @@ goto/16 :goto_3 .line 2772 - :pswitch_2 + :pswitch_3 iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->editorAbsoluteX:I invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getDimensionPixelOffset(II)I @@ -710,7 +709,7 @@ goto/16 :goto_3 .line 2922 - :pswitch_3 + :pswitch_4 invoke-virtual {p1, v4, v2}, Landroid/content/res/TypedArray;->getInt(II)I move-result v4 @@ -720,7 +719,7 @@ goto/16 :goto_3 .line 2918 - :pswitch_4 + :pswitch_5 invoke-virtual {p1, v4, v2}, Landroid/content/res/TypedArray;->getInt(II)I move-result v4 @@ -730,7 +729,7 @@ goto/16 :goto_3 .line 2914 - :pswitch_5 + :pswitch_6 iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->verticalWeight:F invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getFloat(IF)F @@ -742,7 +741,7 @@ goto/16 :goto_3 .line 2910 - :pswitch_6 + :pswitch_7 iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->horizontalWeight:F invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getFloat(IF)F @@ -754,21 +753,24 @@ goto/16 :goto_3 .line 2860 - :pswitch_7 + :pswitch_8 invoke-virtual {p1, v4}, Landroid/content/res/TypedArray;->getString(I)Ljava/lang/String; move-result-object v4 iput-object v4, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->dimensionRatio:Ljava/lang/String; - const/high16 v5, 0x7fc00000 # Float.NaN + const/high16 v4, 0x7fc00000 # Float.NaN .line 2861 - iput v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->dimensionRatioValue:F + iput v4, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->dimensionRatioValue:F .line 2862 iput v0, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->dimensionRatioSide:I + .line 2863 + iget-object v4, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->dimensionRatio:Ljava/lang/String; + if-eqz v4, :cond_5 .line 2864 @@ -956,7 +958,7 @@ goto/16 :goto_3 .line 2999 - :pswitch_8 + :pswitch_9 iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->matchConstraintPercentHeight:F invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getFloat(IF)F @@ -975,7 +977,7 @@ goto/16 :goto_3 .line 2989 - :pswitch_9 + :pswitch_a :try_start_2 iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->matchConstraintMaxHeight:I @@ -1007,7 +1009,7 @@ goto/16 :goto_3 .line 2978 - :pswitch_a + :pswitch_b :try_start_3 iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->matchConstraintMinHeight:I @@ -1039,7 +1041,7 @@ goto/16 :goto_3 .line 2972 - :pswitch_b + :pswitch_c iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->matchConstraintPercentWidth:F invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getFloat(IF)F @@ -1058,7 +1060,7 @@ goto/16 :goto_3 .line 2962 - :pswitch_c + :pswitch_d :try_start_4 iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->matchConstraintMaxWidth:I @@ -1090,7 +1092,7 @@ goto/16 :goto_3 .line 2951 - :pswitch_d + :pswitch_e :try_start_5 iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->matchConstraintMinWidth:I @@ -1122,13 +1124,16 @@ goto/16 :goto_3 .line 2942 - :pswitch_e + :pswitch_f invoke-virtual {p1, v4, v2}, Landroid/content/res/TypedArray;->getInt(II)I move-result v4 iput v4, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->matchConstraintDefaultHeight:I + .line 2943 + iget v4, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->matchConstraintDefaultHeight:I + if-ne v4, v6, :cond_5 const-string v4, "layout_constraintHeight_default=\"wrap\" is deprecated.\nUse layout_height=\"WRAP_CONTENT\" and layout_constrainedHeight=\"true\" instead." @@ -1139,13 +1144,16 @@ goto/16 :goto_3 .line 2934 - :pswitch_f + :pswitch_10 invoke-virtual {p1, v4, v2}, Landroid/content/res/TypedArray;->getInt(II)I move-result v4 iput v4, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->matchConstraintDefaultWidth:I + .line 2935 + iget v4, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->matchConstraintDefaultWidth:I + if-ne v4, v6, :cond_5 const-string v4, "layout_constraintWidth_default=\"wrap\" is deprecated.\nUse layout_width=\"WRAP_CONTENT\" and layout_constrainedWidth=\"true\" instead." @@ -1156,7 +1164,7 @@ goto/16 :goto_3 .line 2856 - :pswitch_10 + :pswitch_11 iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->verticalBias:F invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getFloat(IF)F @@ -1168,7 +1176,7 @@ goto/16 :goto_3 .line 2852 - :pswitch_11 + :pswitch_12 iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->horizontalBias:F invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getFloat(IF)F @@ -1180,7 +1188,7 @@ goto/16 :goto_3 .line 2930 - :pswitch_12 + :pswitch_13 iget-boolean v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->constrainedHeight:Z invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z @@ -1192,7 +1200,7 @@ goto/16 :goto_3 .line 2926 - :pswitch_13 + :pswitch_14 iget-boolean v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->constrainedWidth:Z invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z @@ -1204,7 +1212,7 @@ goto/16 :goto_3 .line 2848 - :pswitch_14 + :pswitch_15 iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->goneEndMargin:I invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getDimensionPixelSize(II)I @@ -1216,7 +1224,7 @@ goto/16 :goto_3 .line 2844 - :pswitch_15 + :pswitch_16 iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->goneStartMargin:I invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getDimensionPixelSize(II)I @@ -1228,7 +1236,7 @@ goto/16 :goto_3 .line 2840 - :pswitch_16 + :pswitch_17 iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->goneBottomMargin:I invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getDimensionPixelSize(II)I @@ -1240,7 +1248,7 @@ goto/16 :goto_3 .line 2836 - :pswitch_17 + :pswitch_18 iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->goneRightMargin:I invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getDimensionPixelSize(II)I @@ -1252,7 +1260,7 @@ goto/16 :goto_3 .line 2832 - :pswitch_18 + :pswitch_19 iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->goneTopMargin:I invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getDimensionPixelSize(II)I @@ -1264,7 +1272,7 @@ goto/16 :goto_3 .line 2828 - :pswitch_19 + :pswitch_1a iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->goneLeftMargin:I invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getDimensionPixelSize(II)I @@ -1276,7 +1284,7 @@ goto/16 :goto_3 .line 2821 - :pswitch_1a + :pswitch_1b iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->endToEnd:I invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getResourceId(II)I @@ -1285,6 +1293,9 @@ iput v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->endToEnd:I + .line 2822 + iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->endToEnd:I + if-ne v5, v0, :cond_5 .line 2823 @@ -1297,7 +1308,7 @@ goto/16 :goto_3 .line 2814 - :pswitch_1b + :pswitch_1c iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->endToStart:I invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getResourceId(II)I @@ -1306,6 +1317,9 @@ iput v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->endToStart:I + .line 2815 + iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->endToStart:I + if-ne v5, v0, :cond_5 .line 2816 @@ -1318,7 +1332,7 @@ goto/16 :goto_3 .line 2807 - :pswitch_1c + :pswitch_1d iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->startToStart:I invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getResourceId(II)I @@ -1327,6 +1341,9 @@ iput v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->startToStart:I + .line 2808 + iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->startToStart:I + if-ne v5, v0, :cond_5 .line 2809 @@ -1339,7 +1356,7 @@ goto/16 :goto_3 .line 2800 - :pswitch_1d + :pswitch_1e iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->startToEnd:I invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getResourceId(II)I @@ -1348,6 +1365,9 @@ iput v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->startToEnd:I + .line 2801 + iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->startToEnd:I + if-ne v5, v0, :cond_5 .line 2802 @@ -1360,7 +1380,7 @@ goto/16 :goto_3 .line 2747 - :pswitch_1e + :pswitch_1f iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->baselineToBaseline:I invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getResourceId(II)I @@ -1369,6 +1389,9 @@ iput v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->baselineToBaseline:I + .line 2748 + iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->baselineToBaseline:I + if-ne v5, v0, :cond_5 .line 2749 @@ -1381,7 +1404,7 @@ goto/16 :goto_3 .line 2740 - :pswitch_1f + :pswitch_20 iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->bottomToBottom:I invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getResourceId(II)I @@ -1390,6 +1413,9 @@ iput v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->bottomToBottom:I + .line 2741 + iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->bottomToBottom:I + if-ne v5, v0, :cond_5 .line 2742 @@ -1402,7 +1428,7 @@ goto/16 :goto_3 .line 2733 - :pswitch_20 + :pswitch_21 iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->bottomToTop:I invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getResourceId(II)I @@ -1411,6 +1437,9 @@ iput v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->bottomToTop:I + .line 2734 + iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->bottomToTop:I + if-ne v5, v0, :cond_5 .line 2735 @@ -1423,7 +1452,7 @@ goto/16 :goto_3 .line 2726 - :pswitch_21 + :pswitch_22 iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->topToBottom:I invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getResourceId(II)I @@ -1432,6 +1461,9 @@ iput v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->topToBottom:I + .line 2727 + iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->topToBottom:I + if-ne v5, v0, :cond_5 .line 2728 @@ -1444,7 +1476,7 @@ goto/16 :goto_3 .line 2719 - :pswitch_22 + :pswitch_23 iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->topToTop:I invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getResourceId(II)I @@ -1453,6 +1485,9 @@ iput v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->topToTop:I + .line 2720 + iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->topToTop:I + if-ne v5, v0, :cond_5 .line 2721 @@ -1465,7 +1500,7 @@ goto/16 :goto_3 .line 2712 - :pswitch_23 + :pswitch_24 iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->rightToRight:I invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getResourceId(II)I @@ -1474,6 +1509,9 @@ iput v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->rightToRight:I + .line 2713 + iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->rightToRight:I + if-ne v5, v0, :cond_5 .line 2714 @@ -1486,7 +1524,7 @@ goto/16 :goto_3 .line 2705 - :pswitch_24 + :pswitch_25 iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->rightToLeft:I invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getResourceId(II)I @@ -1495,6 +1533,9 @@ iput v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->rightToLeft:I + .line 2706 + iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->rightToLeft:I + if-ne v5, v0, :cond_5 .line 2707 @@ -1507,7 +1548,7 @@ goto/16 :goto_3 .line 2698 - :pswitch_25 + :pswitch_26 iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->leftToRight:I invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getResourceId(II)I @@ -1516,6 +1557,9 @@ iput v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->leftToRight:I + .line 2699 + iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->leftToRight:I + if-ne v5, v0, :cond_5 .line 2700 @@ -1528,7 +1572,7 @@ goto :goto_3 .line 2691 - :pswitch_26 + :pswitch_27 iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->leftToLeft:I invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getResourceId(II)I @@ -1537,6 +1581,9 @@ iput v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->leftToLeft:I + .line 2692 + iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->leftToLeft:I + if-ne v5, v0, :cond_5 .line 2693 @@ -1549,7 +1596,7 @@ goto :goto_3 .line 2790 - :pswitch_27 + :pswitch_28 iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->guidePercent:F invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getFloat(IF)F @@ -1561,7 +1608,7 @@ goto :goto_3 .line 2785 - :pswitch_28 + :pswitch_29 iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->guideEnd:I invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getDimensionPixelOffset(II)I @@ -1573,7 +1620,7 @@ goto :goto_3 .line 2780 - :pswitch_29 + :pswitch_2a iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->guideBegin:I invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getDimensionPixelOffset(II)I @@ -1585,7 +1632,7 @@ goto :goto_3 .line 2765 - :pswitch_2a + :pswitch_2b iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->circleAngle:F invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getFloat(IF)F @@ -1598,6 +1645,9 @@ iput v4, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->circleAngle:F + .line 2766 + iget v4, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->circleAngle:F + cmpg-float v7, v4, v3 if-gez v7, :cond_5 @@ -1612,7 +1662,7 @@ goto :goto_3 .line 2761 - :pswitch_2b + :pswitch_2c iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->circleRadius:I invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getDimensionPixelSize(II)I @@ -1624,7 +1674,7 @@ goto :goto_3 .line 2754 - :pswitch_2c + :pswitch_2d iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->circleConstraint:I invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getResourceId(II)I @@ -1633,6 +1683,9 @@ iput v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->circleConstraint:I + .line 2755 + iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->circleConstraint:I + if-ne v5, v0, :cond_5 .line 2756 @@ -1645,7 +1698,7 @@ goto :goto_3 .line 2795 - :pswitch_2d + :pswitch_2e iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->orientation:I invoke-virtual {p1, v4, v5}, Landroid/content/res/TypedArray;->getInt(II)I @@ -1657,6 +1710,7 @@ :catch_4 :cond_5 :goto_3 + :pswitch_2f add-int/lit8 v1, v1, 0x1 goto/16 :goto_0 @@ -1670,8 +1724,12 @@ return-void + nop + :pswitch_data_0 - .packed-switch 0x1 + .packed-switch 0x0 + :pswitch_2f + :pswitch_2e :pswitch_2d :pswitch_2c :pswitch_2b @@ -1709,11 +1767,12 @@ :pswitch_b :pswitch_a :pswitch_9 + :pswitch_2f + :pswitch_2f + :pswitch_2f + :pswitch_2f + :pswitch_0 :pswitch_8 - .end packed-switch - - :pswitch_data_1 - .packed-switch 0x2c :pswitch_7 :pswitch_6 :pswitch_5 @@ -1721,7 +1780,6 @@ :pswitch_3 :pswitch_2 :pswitch_1 - :pswitch_0 .end packed-switch .end method @@ -2503,7 +2561,10 @@ .end method .method public resolveLayoutDirection(I)V - .locals 9 + .locals 6 + .annotation build Landroid/annotation/TargetApi; + value = 0x11 + .end annotation .line 3093 iget v0, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->leftMargin:I @@ -2554,6 +2615,12 @@ .line 3106 iput v2, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->resolvedLeftToRight:I + .line 3108 + iput v2, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->resolveGoneLeftMargin:I + + .line 3109 + iput v2, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->resolveGoneRightMargin:I + .line 3110 iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->goneLeftMargin:I @@ -2570,19 +2637,19 @@ iput v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->resolvedHorizontalBias:F .line 3114 - iget v6, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->guideBegin:I + iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->guideBegin:I - iput v6, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->resolvedGuideBegin:I + iput v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->resolvedGuideBegin:I .line 3115 - iget v7, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->guideEnd:I + iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->guideEnd:I - iput v7, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->resolvedGuideEnd:I + iput v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->resolvedGuideEnd:I .line 3116 - iget v8, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->guidePercent:F + iget v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->guidePercent:F - iput v8, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->resolvedGuidePercent:F + iput v5, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->resolvedGuidePercent:F if-eqz p1, :cond_a @@ -2656,9 +2723,11 @@ if-eqz v3, :cond_7 - sub-float v3, p1, v5 - .line 3143 + iget v3, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->horizontalBias:F + + sub-float v3, p1, v3 + iput v3, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->resolvedHorizontalBias:F .line 3147 @@ -2671,13 +2740,16 @@ if-ne v3, v4, :cond_10 - const/high16 v3, -0x40800000 # -1.0f + .line 3148 + iget v3, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->guidePercent:F - cmpl-float v4, v8, v3 + const/high16 v4, -0x40800000 # -1.0f - if-eqz v4, :cond_8 + cmpl-float v5, v3, v4 - sub-float/2addr p1, v8 + if-eqz v5, :cond_8 + + sub-float/2addr p1, v3 .line 3149 iput p1, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->resolvedGuidePercent:F @@ -2690,31 +2762,37 @@ goto :goto_3 + .line 3152 :cond_8 - if-eq v6, v2, :cond_9 + iget p1, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->guideBegin:I + + if-eq p1, v2, :cond_9 .line 3153 - iput v6, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->resolvedGuideEnd:I + iput p1, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->resolvedGuideEnd:I .line 3154 iput v2, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->resolvedGuideBegin:I .line 3155 - iput v3, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->resolvedGuidePercent:F + iput v4, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->resolvedGuidePercent:F goto :goto_3 + .line 3156 :cond_9 - if-eq v7, v2, :cond_10 + iget p1, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->guideEnd:I + + if-eq p1, v2, :cond_10 .line 3157 - iput v7, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->resolvedGuideBegin:I + iput p1, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->resolvedGuideBegin:I .line 3158 iput v2, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->resolvedGuideEnd:I .line 3159 - iput v3, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->resolvedGuidePercent:F + iput v4, p0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->resolvedGuidePercent:F goto :goto_3 diff --git a/smali/android/support/constraint/ConstraintLayout$Measurer.smali b/smali/android/support/constraint/ConstraintLayout$Measurer.smali index 08450ca9..81e63c96 100644 --- a/smali/android/support/constraint/ConstraintLayout$Measurer.smali +++ b/smali/android/support/constraint/ConstraintLayout$Measurer.smali @@ -211,6 +211,11 @@ .method public final measure(Landroid/support/constraint/solver/widgets/ConstraintWidget;Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;)V .locals 19 + .annotation build Landroid/annotation/SuppressLint; + value = { + "WrongCall" + } + .end annotation move-object/from16 v0, p0 @@ -916,9 +921,9 @@ :cond_20 const/4 v0, 0x0 - const/4 v3, 0x0 + const/4 v3, -0x1 - const/4 v4, -0x1 + const/4 v5, 0x0 const/4 v15, 0x0 @@ -1140,7 +1145,7 @@ float-to-int v0, v4 - move v8, v0 + move v5, v0 goto :goto_17 @@ -1163,37 +1168,39 @@ move v9, v0 :cond_2a + move v5, v8 + :goto_17 - if-ne v11, v8, :cond_2c + if-ne v11, v5, :cond_2c if-eq v12, v9, :cond_2b goto :goto_19 :cond_2b - move v0, v8 - - move v3, v9 + move v0, v9 :goto_18 - const/4 v4, -0x1 + const/4 v3, -0x1 goto :goto_1b :cond_2c :goto_19 - const/high16 v0, 0x40000000 # 2.0f + if-eq v11, v5, :cond_2d - if-eq v11, v8, :cond_2d + const/high16 v0, 0x40000000 # 2.0f .line 846 - invoke-static {v8, v0}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I + invoke-static {v5, v0}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I move-result v6 goto :goto_1a :cond_2d + const/high16 v0, 0x40000000 # 2.0f + move/from16 v6, v17 :goto_1a @@ -1214,70 +1221,65 @@ .line 853 invoke-virtual {v10}, Landroid/view/View;->getMeasuredWidth()I - move-result v0 + move-result v5 .line 854 invoke-virtual {v10}, Landroid/view/View;->getMeasuredHeight()I - move-result v3 + move-result v0 .line 855 invoke-virtual {v10}, Landroid/view/View;->getBaseline()I - move-result v4 + move-result v3 - move v15, v4 + move v15, v3 goto :goto_18 :goto_1b - if-eq v15, v4, :cond_2f + if-eq v15, v3, :cond_2f - const/4 v4, 0x1 + const/4 v3, 0x1 goto :goto_1c :cond_2f - const/4 v4, 0x0 + const/4 v3, 0x0 .line 866 :goto_1c - iget v5, v2, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->horizontalDimension:I + iget v4, v2, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->horizontalDimension:I - if-ne v0, v5, :cond_31 + if-ne v5, v4, :cond_31 - iget v5, v2, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->verticalDimension:I + iget v4, v2, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->verticalDimension:I - if-eq v3, v5, :cond_30 + if-eq v0, v4, :cond_30 goto :goto_1d :cond_30 - const/4 v5, 0x0 + const/4 v4, 0x0 goto :goto_1e :cond_31 :goto_1d - const/4 v5, 0x1 + const/4 v4, 0x1 :goto_1e - iput-boolean v5, v2, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->measuredNeedsSolverPass:Z + iput-boolean v4, v2, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->measuredNeedsSolverPass:Z .line 868 - iget-boolean v5, v14, Landroid/support/constraint/ConstraintLayout$LayoutParams;->needsBaseline:Z - - if-eqz v5, :cond_32 + iget-boolean v4, v14, Landroid/support/constraint/ConstraintLayout$LayoutParams;->needsBaseline:Z - const/4 v9, 0x1 + if-eqz v4, :cond_32 - goto :goto_1f + const/4 v3, 0x1 :cond_32 - move v9, v4 - - :goto_1f - if-eqz v9, :cond_33 + if-eqz v3, :cond_33 const/4 v4, -0x1 @@ -1297,13 +1299,13 @@ .line 874 :cond_33 - iput v0, v2, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->measuredWidth:I + iput v5, v2, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->measuredWidth:I .line 875 - iput v3, v2, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->measuredHeight:I + iput v0, v2, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->measuredHeight:I .line 876 - iput-boolean v9, v2, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->measuredHasBaseline:Z + iput-boolean v3, v2, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->measuredHasBaseline:Z .line 877 iput v15, v2, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->measuredBaseline:I diff --git a/smali/android/support/constraint/ConstraintLayout.smali b/smali/android/support/constraint/ConstraintLayout.smali index e56d6121..bfc2b065 100644 --- a/smali/android/support/constraint/ConstraintLayout.smali +++ b/smali/android/support/constraint/ConstraintLayout.smali @@ -116,6 +116,10 @@ # direct methods .method public constructor (Landroid/content/Context;)V .locals 3 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 563 invoke-direct {p0, p1}, Landroid/view/ViewGroup;->(Landroid/content/Context;)V @@ -235,6 +239,14 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V .locals 2 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 568 invoke-direct {p0, p1, p2}, Landroid/view/ViewGroup;->(Landroid/content/Context;Landroid/util/AttributeSet;)V @@ -354,6 +366,14 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;I)V .locals 2 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 573 invoke-direct {p0, p1, p2, p3}, Landroid/view/ViewGroup;->(Landroid/content/Context;Landroid/util/AttributeSet;I)V @@ -473,6 +493,17 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;II)V .locals 2 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/annotation/TargetApi; + value = 0x15 + .end annotation .line 579 invoke-direct {p0, p1, p2, p3, p4}, Landroid/view/ViewGroup;->(Landroid/content/Context;Landroid/util/AttributeSet;II)V @@ -927,6 +958,8 @@ iput-object v3, p0, Landroid/support/constraint/ConstraintLayout;->mConstraintSet:Landroid/support/constraint/ConstraintSet; .line 968 + iget-object v3, p0, Landroid/support/constraint/ConstraintLayout;->mConstraintSet:Landroid/support/constraint/ConstraintSet; + invoke-virtual {p0}, Landroid/support/constraint/ConstraintLayout;->getContext()Landroid/content/Context; move-result-object v4 @@ -1652,11 +1685,11 @@ move v6, v3 - move v3, v2 - goto :goto_2 :cond_a + move v2, v3 + move v15, v13 move v13, v4 @@ -1669,9 +1702,9 @@ move/from16 v5, v18 .line 1344 - iget v2, v8, Landroid/support/constraint/ConstraintLayout$LayoutParams;->circleConstraint:I + iget v3, v8, Landroid/support/constraint/ConstraintLayout$LayoutParams;->circleConstraint:I - if-eq v2, v12, :cond_b + if-eq v3, v12, :cond_b .line 1345 iget v1, v8, Landroid/support/constraint/ConstraintLayout$LayoutParams;->circleConstraint:I @@ -1734,10 +1767,10 @@ :cond_d move/from16 v17, v5 - if-eq v3, v12, :cond_e + if-eq v2, v12, :cond_e .line 1359 - invoke-virtual {v9, v3}, Landroid/util/SparseArray;->get(I)Ljava/lang/Object; + invoke-virtual {v9, v2}, Landroid/util/SparseArray;->get(I)Ljava/lang/Object; move-result-object v1 @@ -3103,9 +3136,9 @@ if-ne v0, p1, :cond_0 - iget v1, p0, Landroid/support/constraint/ConstraintLayout;->mOnMeasureHeightMeasureSpec:I + iget v0, p0, Landroid/support/constraint/ConstraintLayout;->mOnMeasureHeightMeasureSpec:I - if-ne v1, p2, :cond_0 + if-ne v0, p2, :cond_0 .line 1650 iget-object v0, p0, Landroid/support/constraint/ConstraintLayout;->mLayoutWidget:Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer; @@ -3144,7 +3177,10 @@ return-void + .line 1654 :cond_0 + iget v0, p0, Landroid/support/constraint/ConstraintLayout;->mOnMeasureWidthMeasureSpec:I + if-ne v0, p1, :cond_1 .line 1655 diff --git a/smali/android/support/constraint/ConstraintLayoutStates$State.smali b/smali/android/support/constraint/ConstraintLayoutStates$State.smali index e2d807be..e16b2521 100644 --- a/smali/android/support/constraint/ConstraintLayoutStates$State.smali +++ b/smali/android/support/constraint/ConstraintLayoutStates$State.smali @@ -146,6 +146,8 @@ iput-object v2, p0, Landroid/support/constraint/ConstraintLayoutStates$State;->mConstraintSet:Landroid/support/constraint/ConstraintSet; .line 160 + iget-object v2, p0, Landroid/support/constraint/ConstraintLayoutStates$State;->mConstraintSet:Landroid/support/constraint/ConstraintSet; + iget v3, p0, Landroid/support/constraint/ConstraintLayoutStates$State;->mConstraintID:I invoke-virtual {v2, p1, v3}, Landroid/support/constraint/ConstraintSet;->clone(Landroid/content/Context;I)V diff --git a/smali/android/support/constraint/ConstraintLayoutStates$Variant.smali b/smali/android/support/constraint/ConstraintLayoutStates$Variant.smali index 657e9c27..8a8a272a 100644 --- a/smali/android/support/constraint/ConstraintLayoutStates$Variant.smali +++ b/smali/android/support/constraint/ConstraintLayoutStates$Variant.smali @@ -134,6 +134,8 @@ iput-object v2, p0, Landroid/support/constraint/ConstraintLayoutStates$Variant;->mConstraintSet:Landroid/support/constraint/ConstraintSet; .line 213 + iget-object v2, p0, Landroid/support/constraint/ConstraintLayoutStates$Variant;->mConstraintSet:Landroid/support/constraint/ConstraintSet; + iget v3, p0, Landroid/support/constraint/ConstraintLayoutStates$Variant;->mConstraintID:I invoke-virtual {v2, p1, v3}, Landroid/support/constraint/ConstraintSet;->clone(Landroid/content/Context;I)V diff --git a/smali/android/support/constraint/ConstraintLayoutStates.smali b/smali/android/support/constraint/ConstraintLayoutStates.smali index 2362ce4f..b66d280e 100644 --- a/smali/android/support/constraint/ConstraintLayoutStates.smali +++ b/smali/android/support/constraint/ConstraintLayoutStates.smali @@ -121,9 +121,11 @@ if-eqz v1, :cond_5 - const/4 v3, 0x2 + const/4 v3, 0x3 - if-eq v1, v3, :cond_0 + const/4 v4, 0x2 + + if-eq v1, v4, :cond_0 goto/16 :goto_2 @@ -133,95 +135,93 @@ move-result-object v1 - const/4 v4, -0x1 + const/4 v5, -0x1 .line 301 invoke-virtual {v1}, Ljava/lang/String;->hashCode()I - move-result v5 - - const/4 v6, 0x4 + move-result v6 - const/4 v7, 0x3 + const/4 v7, 0x4 - sparse-switch v5, :sswitch_data_0 + sparse-switch v6, :sswitch_data_0 goto :goto_1 :sswitch_0 - const-string v5, "Variant" + const-string v6, "Variant" - invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v1, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z - move-result v5 + move-result v6 - if-eqz v5, :cond_1 + if-eqz v6, :cond_1 - const/4 v4, 0x3 + const/4 v5, 0x3 goto :goto_1 :sswitch_1 - const-string v5, "layoutDescription" + const-string v6, "layoutDescription" - invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v1, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z - move-result v5 + move-result v6 - if-eqz v5, :cond_1 + if-eqz v6, :cond_1 - const/4 v4, 0x0 + const/4 v5, 0x0 goto :goto_1 :sswitch_2 - const-string v5, "StateSet" + const-string v6, "StateSet" - invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v1, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z - move-result v5 + move-result v6 - if-eqz v5, :cond_1 + if-eqz v6, :cond_1 - const/4 v4, 0x1 + const/4 v5, 0x1 goto :goto_1 :sswitch_3 - const-string v5, "State" + const-string v6, "State" - invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v1, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z - move-result v5 + move-result v6 - if-eqz v5, :cond_1 + if-eqz v6, :cond_1 - const/4 v4, 0x2 + const/4 v5, 0x2 goto :goto_1 :sswitch_4 - const-string v5, "ConstraintSet" + const-string v6, "ConstraintSet" - invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v1, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z - move-result v5 + move-result v6 - if-eqz v5, :cond_1 + if-eqz v6, :cond_1 - const/4 v4, 0x4 + const/4 v5, 0x4 :cond_1 :goto_1 - if-eqz v4, :cond_6 + if-eqz v5, :cond_6 - if-eq v4, v2, :cond_6 + if-eq v5, v2, :cond_6 - if-eq v4, v3, :cond_4 + if-eq v5, v4, :cond_4 - if-eq v4, v7, :cond_3 + if-eq v5, v3, :cond_3 - if-eq v4, v6, :cond_2 + if-eq v5, v7, :cond_2 const-string v2, "ConstraintLayoutStates" @@ -699,7 +699,9 @@ .line 109 iget-object v0, p0, Landroid/support/constraint/ConstraintLayoutStates;->mStateList:Landroid/util/SparseArray; - invoke-virtual {v0, p1}, Landroid/util/SparseArray;->get(I)Ljava/lang/Object; + iget v2, p0, Landroid/support/constraint/ConstraintLayoutStates;->mCurrentStateId:I + + invoke-virtual {v0, v2}, Landroid/util/SparseArray;->get(I)Ljava/lang/Object; move-result-object v0 diff --git a/smali/android/support/constraint/ConstraintProperties.smali b/smali/android/support/constraint/ConstraintProperties.smali index caf283d8..7e545bbd 100644 --- a/smali/android/support/constraint/ConstraintProperties.smali +++ b/smali/android/support/constraint/ConstraintProperties.smali @@ -136,7 +136,7 @@ # virtual methods .method public addToHorizontalChain(II)Landroid/support/constraint/ConstraintProperties; - .locals 5 + .locals 4 const/4 v0, 0x2 @@ -181,9 +181,7 @@ check-cast v2, Landroid/view/ViewGroup; - move-object v4, v2 - - check-cast v4, Landroid/view/ViewGroup; + check-cast v2, Landroid/view/ViewGroup; invoke-virtual {v2, p1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View; @@ -215,9 +213,7 @@ check-cast p1, Landroid/view/ViewGroup; - move-object v2, p1 - - check-cast v2, Landroid/view/ViewGroup; + check-cast p1, Landroid/view/ViewGroup; invoke-virtual {p1, p2}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View; @@ -242,7 +238,7 @@ .end method .method public addToHorizontalChainRTL(II)Landroid/support/constraint/ConstraintProperties; - .locals 5 + .locals 4 const/4 v0, 0x7 @@ -287,9 +283,7 @@ check-cast v2, Landroid/view/ViewGroup; - move-object v4, v2 - - check-cast v4, Landroid/view/ViewGroup; + check-cast v2, Landroid/view/ViewGroup; invoke-virtual {v2, p1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View; @@ -321,9 +315,7 @@ check-cast p1, Landroid/view/ViewGroup; - move-object v2, p1 - - check-cast v2, Landroid/view/ViewGroup; + check-cast p1, Landroid/view/ViewGroup; invoke-virtual {p1, p2}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View; @@ -348,7 +340,7 @@ .end method .method public addToVerticalChain(II)Landroid/support/constraint/ConstraintProperties; - .locals 5 + .locals 4 const/4 v0, 0x4 @@ -393,9 +385,7 @@ check-cast v2, Landroid/view/ViewGroup; - move-object v4, v2 - - check-cast v4, Landroid/view/ViewGroup; + check-cast v2, Landroid/view/ViewGroup; invoke-virtual {v2, p1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View; @@ -427,9 +417,7 @@ check-cast p1, Landroid/view/ViewGroup; - move-object v2, p1 - - check-cast v2, Landroid/view/ViewGroup; + check-cast p1, Landroid/view/ViewGroup; invoke-virtual {p1, p2}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View; @@ -871,8 +859,6 @@ iput p2, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->endToEnd:I .line 993 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v9, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->endToStart:I goto :goto_0 @@ -886,8 +872,6 @@ iput p2, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->endToStart:I .line 996 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v9, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->endToEnd:I .line 1000 @@ -938,8 +922,6 @@ iput p2, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->startToStart:I .line 979 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v9, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->startToEnd:I goto :goto_1 @@ -953,8 +935,6 @@ iput p2, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->startToEnd:I .line 982 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v9, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->startToStart:I .line 986 @@ -1007,23 +987,15 @@ iput p2, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->baselineToBaseline:I .line 968 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v9, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->bottomToBottom:I .line 969 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v9, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->bottomToTop:I .line 970 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v9, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->topToTop:I .line 971 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v9, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->topToBottom:I goto/16 :goto_6 @@ -1063,13 +1035,9 @@ iput p2, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->bottomToBottom:I .line 952 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v9, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->bottomToTop:I .line 953 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v9, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->baselineToBaseline:I goto :goto_2 @@ -1083,13 +1051,9 @@ iput p2, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->bottomToTop:I .line 957 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v9, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->bottomToBottom:I .line 958 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v9, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->baselineToBaseline:I .line 963 @@ -1135,13 +1099,9 @@ iput p2, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->topToTop:I .line 937 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v9, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->topToBottom:I .line 938 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v9, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->baselineToBaseline:I goto :goto_3 @@ -1155,13 +1115,9 @@ iput p2, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->topToBottom:I .line 941 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v9, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->topToTop:I .line 942 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v9, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->baselineToBaseline:I .line 947 @@ -1207,8 +1163,6 @@ iput p2, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->rightToLeft:I .line 923 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v9, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->rightToRight:I goto :goto_4 @@ -1222,8 +1176,6 @@ iput p2, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->rightToRight:I .line 927 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v9, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->rightToLeft:I .line 932 @@ -1269,8 +1221,6 @@ iput p2, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->leftToLeft:I .line 910 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v9, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->leftToRight:I goto :goto_5 @@ -1284,8 +1234,6 @@ iput p2, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->leftToRight:I .line 913 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v9, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->leftToLeft:I .line 918 @@ -1688,13 +1636,9 @@ iput v0, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->endToStart:I .line 289 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v0, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->endToEnd:I .line 290 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - invoke-virtual {p1, v0}, Landroid/support/constraint/ConstraintLayout$LayoutParams;->setMarginEnd(I)V .line 291 @@ -1711,13 +1655,9 @@ iput v0, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->startToEnd:I .line 283 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v0, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->startToStart:I .line 284 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - invoke-virtual {p1, v0}, Landroid/support/constraint/ConstraintLayout$LayoutParams;->setMarginStart(I)V .line 285 @@ -1742,18 +1682,12 @@ iput v0, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->bottomToTop:I .line 274 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v0, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->bottomToBottom:I .line 275 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v0, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->bottomMargin:I .line 276 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v0, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->goneBottomMargin:I goto :goto_0 @@ -1765,18 +1699,12 @@ iput v0, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->topToBottom:I .line 268 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v0, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->topToTop:I .line 269 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v0, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->topMargin:I .line 270 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v0, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->goneTopMargin:I goto :goto_0 @@ -1788,18 +1716,12 @@ iput v0, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->rightToRight:I .line 262 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v0, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->rightToLeft:I .line 263 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v0, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->rightMargin:I .line 264 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v0, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->goneRightMargin:I goto :goto_0 @@ -1811,18 +1733,12 @@ iput v0, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->leftToRight:I .line 256 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v0, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->leftToLeft:I .line 257 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v0, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->leftMargin:I .line 258 - iget-object p1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - iput v0, p1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->goneLeftMargin:I :goto_0 @@ -1877,6 +1793,9 @@ iget v2, v2, Landroid/support/constraint/ConstraintLayout$LayoutParams;->endToStart:I + .line 870 + iget-object v5, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; + const/4 v5, 0x7 const/4 v6, 0x6 @@ -1895,9 +1814,7 @@ check-cast v7, Landroid/view/ViewGroup; - move-object v8, v7 - - check-cast v8, Landroid/view/ViewGroup; + check-cast v7, Landroid/view/ViewGroup; invoke-virtual {v7, v1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View; @@ -1917,9 +1834,7 @@ check-cast v7, Landroid/view/ViewGroup; - move-object v9, v7 - - check-cast v9, Landroid/view/ViewGroup; + check-cast v7, Landroid/view/ViewGroup; invoke-virtual {v7, v2}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View; @@ -1945,14 +1860,19 @@ goto :goto_0 + .line 880 :cond_2 + iget-object v1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; + if-ne v0, v4, :cond_3 if-eq v2, v4, :cond_5 .line 881 :cond_3 - iget v0, v7, Landroid/support/constraint/ConstraintLayout$LayoutParams;->rightToRight:I + iget-object v0, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; + + iget v0, v0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->rightToRight:I iget-object v1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; @@ -1999,9 +1919,7 @@ check-cast v2, Landroid/view/ViewGroup; - move-object v5, v2 - - check-cast v5, Landroid/view/ViewGroup; + check-cast v2, Landroid/view/ViewGroup; invoke-virtual {v2, v0}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View; @@ -2021,9 +1939,7 @@ check-cast v2, Landroid/view/ViewGroup; - move-object v6, v2 - - check-cast v6, Landroid/view/ViewGroup; + check-cast v2, Landroid/view/ViewGroup; invoke-virtual {v2, v1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View; @@ -2037,30 +1953,35 @@ .line 851 iget-object v2, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - const/4 v7, 0x1 + const/4 v2, 0x1 - const/4 v8, 0x2 + const/4 v7, 0x2 if-eq v0, v4, :cond_7 if-eq v1, v4, :cond_7 .line 853 - invoke-virtual {v5, v8, v1, v7, v3}, Landroid/support/constraint/ConstraintProperties;->connect(IIII)Landroid/support/constraint/ConstraintProperties; + invoke-virtual {v5, v7, v1, v2, v3}, Landroid/support/constraint/ConstraintProperties;->connect(IIII)Landroid/support/constraint/ConstraintProperties; .line 854 - invoke-virtual {v6, v7, v0, v8, v3}, Landroid/support/constraint/ConstraintProperties;->connect(IIII)Landroid/support/constraint/ConstraintProperties; + invoke-virtual {v6, v2, v0, v7, v3}, Landroid/support/constraint/ConstraintProperties;->connect(IIII)Landroid/support/constraint/ConstraintProperties; goto :goto_2 + .line 855 :cond_7 + iget-object v8, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; + if-ne v0, v4, :cond_8 if-eq v1, v4, :cond_a .line 856 :cond_8 - iget v0, v2, Landroid/support/constraint/ConstraintLayout$LayoutParams;->rightToRight:I + iget-object v0, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; + + iget v0, v0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->rightToRight:I iget-object v1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; @@ -2069,7 +1990,7 @@ .line 858 iget v0, v1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->rightToRight:I - invoke-virtual {v5, v8, v0, v8, v3}, Landroid/support/constraint/ConstraintProperties;->connect(IIII)Landroid/support/constraint/ConstraintProperties; + invoke-virtual {v5, v7, v0, v7, v3}, Landroid/support/constraint/ConstraintProperties;->connect(IIII)Landroid/support/constraint/ConstraintProperties; goto :goto_2 @@ -2084,15 +2005,15 @@ .line 861 iget v0, v1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->leftToLeft:I - invoke-virtual {v6, v7, v0, v7, v3}, Landroid/support/constraint/ConstraintProperties;->connect(IIII)Landroid/support/constraint/ConstraintProperties; + invoke-virtual {v6, v2, v0, v2, v3}, Landroid/support/constraint/ConstraintProperties;->connect(IIII)Landroid/support/constraint/ConstraintProperties; .line 864 :cond_a :goto_2 - invoke-virtual {p0, v7}, Landroid/support/constraint/ConstraintProperties;->removeConstraints(I)Landroid/support/constraint/ConstraintProperties; + invoke-virtual {p0, v2}, Landroid/support/constraint/ConstraintProperties;->removeConstraints(I)Landroid/support/constraint/ConstraintProperties; .line 865 - invoke-virtual {p0, v8}, Landroid/support/constraint/ConstraintProperties;->removeConstraints(I)Landroid/support/constraint/ConstraintProperties; + invoke-virtual {p0, v7}, Landroid/support/constraint/ConstraintProperties;->removeConstraints(I)Landroid/support/constraint/ConstraintProperties; :goto_3 return-object p0 @@ -2111,6 +2032,9 @@ iget v1, v1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->bottomToTop:I + .line 810 + iget-object v2, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; + const/4 v2, 0x4 const/4 v3, 0x3 @@ -2131,9 +2055,7 @@ check-cast v5, Landroid/view/ViewGroup; - move-object v6, v5 - - check-cast v6, Landroid/view/ViewGroup; + check-cast v5, Landroid/view/ViewGroup; invoke-virtual {v5, v0}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View; @@ -2153,9 +2075,7 @@ check-cast v5, Landroid/view/ViewGroup; - move-object v7, v5 - - check-cast v7, Landroid/view/ViewGroup; + check-cast v5, Landroid/view/ViewGroup; invoke-virtual {v5, v1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View; @@ -2169,28 +2089,33 @@ .line 815 iget-object v5, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; - const/4 v8, 0x0 + const/4 v5, 0x0 if-eq v0, v4, :cond_1 if-eq v1, v4, :cond_1 .line 817 - invoke-virtual {v6, v2, v1, v3, v8}, Landroid/support/constraint/ConstraintProperties;->connect(IIII)Landroid/support/constraint/ConstraintProperties; + invoke-virtual {v6, v2, v1, v3, v5}, Landroid/support/constraint/ConstraintProperties;->connect(IIII)Landroid/support/constraint/ConstraintProperties; .line 818 - invoke-virtual {v7, v3, v0, v2, v8}, Landroid/support/constraint/ConstraintProperties;->connect(IIII)Landroid/support/constraint/ConstraintProperties; + invoke-virtual {v7, v3, v0, v2, v5}, Landroid/support/constraint/ConstraintProperties;->connect(IIII)Landroid/support/constraint/ConstraintProperties; goto :goto_0 + .line 819 :cond_1 + iget-object v8, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; + if-ne v0, v4, :cond_2 if-eq v1, v4, :cond_4 .line 820 :cond_2 - iget v0, v5, Landroid/support/constraint/ConstraintLayout$LayoutParams;->bottomToBottom:I + iget-object v0, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; + + iget v0, v0, Landroid/support/constraint/ConstraintLayout$LayoutParams;->bottomToBottom:I iget-object v1, p0, Landroid/support/constraint/ConstraintProperties;->mParams:Landroid/support/constraint/ConstraintLayout$LayoutParams; @@ -2199,7 +2124,7 @@ .line 822 iget v0, v1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->bottomToBottom:I - invoke-virtual {v6, v2, v0, v2, v8}, Landroid/support/constraint/ConstraintProperties;->connect(IIII)Landroid/support/constraint/ConstraintProperties; + invoke-virtual {v6, v2, v0, v2, v5}, Landroid/support/constraint/ConstraintProperties;->connect(IIII)Landroid/support/constraint/ConstraintProperties; goto :goto_0 @@ -2214,7 +2139,7 @@ .line 825 iget v0, v1, Landroid/support/constraint/ConstraintLayout$LayoutParams;->topToTop:I - invoke-virtual {v7, v3, v0, v3, v8}, Landroid/support/constraint/ConstraintProperties;->connect(IIII)Landroid/support/constraint/ConstraintProperties; + invoke-virtual {v7, v3, v0, v3, v5}, Landroid/support/constraint/ConstraintProperties;->connect(IIII)Landroid/support/constraint/ConstraintProperties; .line 830 :cond_4 diff --git a/smali/android/support/constraint/ConstraintSet$Constraint.smali b/smali/android/support/constraint/ConstraintSet$Constraint.smali index b4841869..f2cc3af9 100644 --- a/smali/android/support/constraint/ConstraintSet$Constraint.smali +++ b/smali/android/support/constraint/ConstraintSet$Constraint.smali @@ -666,8 +666,6 @@ check-cast p1, Landroid/support/constraint/Barrier; .line 1312 - iget-object p2, p0, Landroid/support/constraint/ConstraintSet$Constraint;->layout:Landroid/support/constraint/ConstraintSet$Layout; - invoke-virtual {p1}, Landroid/support/constraint/Barrier;->getType()I move-result p3 diff --git a/smali/android/support/constraint/ConstraintSet$Layout.smali b/smali/android/support/constraint/ConstraintSet$Layout.smali index 47d12545..d24d7df7 100644 --- a/smali/android/support/constraint/ConstraintSet$Layout.smali +++ b/smali/android/support/constraint/ConstraintSet$Layout.smali @@ -260,6 +260,8 @@ sput-object v0, Landroid/support/constraint/ConstraintSet$Layout;->mapToConstant:Landroid/util/SparseIntArray; .line 709 + sget-object v0, Landroid/support/constraint/ConstraintSet$Layout;->mapToConstant:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->Layout_layout_constraintLeft_toLeftOf:I const/16 v2, 0x18 @@ -1323,7 +1325,7 @@ if-eqz v4, :cond_0 - goto :goto_2 + goto :goto_1 .line 990 :cond_0 @@ -1383,19 +1385,16 @@ if-nez v2, :cond_1 - goto :goto_1 - - :cond_1 - move-object v4, v2 + move-object v2, v4 .line 999 - :goto_1 - invoke-virtual {p2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + :cond_1 + invoke-virtual {p2, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; .line 1000 invoke-virtual {p2, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - goto :goto_2 + goto :goto_1 .line 1002 :cond_2 @@ -1434,7 +1433,7 @@ :try_end_1 .catch Ljava/lang/IllegalAccessException; {:try_start_1 .. :try_end_1} :catch_0 - goto :goto_2 + goto :goto_1 :catch_0 move-exception v2 @@ -1443,7 +1442,7 @@ invoke-virtual {v2}, Ljava/lang/IllegalAccessException;->printStackTrace()V :cond_3 - :goto_2 + :goto_1 add-int/lit8 v1, v1, 0x1 goto :goto_0 diff --git a/smali/android/support/constraint/ConstraintSet$Motion.smali b/smali/android/support/constraint/ConstraintSet$Motion.smali index e67e234f..9d80da21 100644 --- a/smali/android/support/constraint/ConstraintSet$Motion.smali +++ b/smali/android/support/constraint/ConstraintSet$Motion.smali @@ -58,6 +58,8 @@ sput-object v0, Landroid/support/constraint/ConstraintSet$Motion;->mapToConstant:Landroid/util/SparseIntArray; .line 1207 + sget-object v0, Landroid/support/constraint/ConstraintSet$Motion;->mapToConstant:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->Motion_motionPathRotate:I const/4 v2, 0x1 diff --git a/smali/android/support/constraint/ConstraintSet$Transform.smali b/smali/android/support/constraint/ConstraintSet$Transform.smali index 4c8274c3..acabf57d 100644 --- a/smali/android/support/constraint/ConstraintSet$Transform.smali +++ b/smali/android/support/constraint/ConstraintSet$Transform.smali @@ -80,6 +80,8 @@ sput-object v0, Landroid/support/constraint/ConstraintSet$Transform;->mapToConstant:Landroid/util/SparseIntArray; .line 1071 + sget-object v0, Landroid/support/constraint/ConstraintSet$Transform;->mapToConstant:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->Transform_android_rotation:I const/4 v2, 0x1 diff --git a/smali/android/support/constraint/ConstraintSet.smali b/smali/android/support/constraint/ConstraintSet.smali index 6d2c14a1..71ae038e 100644 --- a/smali/android/support/constraint/ConstraintSet.smali +++ b/smali/android/support/constraint/ConstraintSet.smali @@ -277,9 +277,9 @@ const/4 v0, 0x3 + .line 220 new-array v1, v0, [I - .line 220 fill-array-data v1, :array_0 sput-object v1, Landroid/support/constraint/ConstraintSet;->VISIBILITY_FLAGS:[I @@ -292,6 +292,8 @@ sput-object v1, Landroid/support/constraint/ConstraintSet;->mapToConstant:Landroid/util/SparseIntArray; .line 311 + sget-object v1, Landroid/support/constraint/ConstraintSet;->mapToConstant:Landroid/util/SparseIntArray; + sget v2, Landroid/support/constraint/R$styleable;->Constraint_layout_constraintLeft_toLeftOf:I const/16 v3, 0x19 @@ -1269,8 +1271,6 @@ goto :goto_1 :catch_0 - nop - const/4 v6, 0x0 :goto_1 @@ -1460,11 +1460,13 @@ if-ge v10, v0, :cond_4 .line 1984 + aget v0, v7, v10 + + .line 1985 aget v1, v7, v10 add-int/lit8 v11, v10, -0x1 - .line 1985 aget v3, v7, v11 const/4 v5, -0x1 @@ -1536,13 +1538,9 @@ invoke-direct {v0, v1}, Ljava/lang/IllegalArgumentException;->(Ljava/lang/String;)V - goto :goto_3 - - :goto_2 throw v0 - :goto_3 - goto :goto_2 + return-void .end method .method private fillFromAttributeList(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/constraint/ConstraintSet$Constraint; @@ -1699,13 +1697,13 @@ move-result v3 - const-string v5, " " + const/high16 v5, 0x3f800000 # 1.0f - const/high16 v6, 0x3f800000 # 1.0f + const/16 v6, 0x15 - const/16 v7, 0x15 + const/16 v7, 0x11 - const/16 v8, 0x11 + const-string v8, " " const-string v9, "ConstraintSet" @@ -1727,7 +1725,7 @@ invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v3, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v3, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; sget-object v4, Landroid/support/constraint/ConstraintSet;->mapToConstant:Landroid/util/SparseIntArray; @@ -1763,7 +1761,7 @@ invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v3, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v3, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; sget-object v4, Landroid/support/constraint/ConstraintSet;->mapToConstant:Landroid/util/SparseIntArray; @@ -1946,7 +1944,7 @@ :pswitch_c iget-object v3, p2, Landroid/support/constraint/ConstraintSet$Constraint;->layout:Landroid/support/constraint/ConstraintSet$Layout; - invoke-virtual {p3, v2, v6}, Landroid/content/res/TypedArray;->getFloat(IF)F + invoke-virtual {p3, v2, v5}, Landroid/content/res/TypedArray;->getFloat(IF)F move-result v2 @@ -1958,7 +1956,7 @@ :pswitch_d iget-object v3, p2, Landroid/support/constraint/ConstraintSet$Constraint;->layout:Landroid/support/constraint/ConstraintSet$Layout; - invoke-virtual {p3, v2, v6}, Landroid/content/res/TypedArray;->getFloat(IF)F + invoke-virtual {p3, v2, v5}, Landroid/content/res/TypedArray;->getFloat(IF)F move-result v2 @@ -2230,7 +2228,7 @@ :pswitch_1d sget v3, Landroid/os/Build$VERSION;->SDK_INT:I - if-lt v3, v7, :cond_2 + if-lt v3, v6, :cond_2 .line 3666 iget-object v3, p2, Landroid/support/constraint/ConstraintSet$Constraint;->transform:Landroid/support/constraint/ConstraintSet$Transform; @@ -2379,7 +2377,7 @@ :pswitch_26 sget v3, Landroid/os/Build$VERSION;->SDK_INT:I - if-lt v3, v7, :cond_2 + if-lt v3, v6, :cond_2 .line 3633 iget-object v3, p2, Landroid/support/constraint/ConstraintSet$Constraint;->transform:Landroid/support/constraint/ConstraintSet$Transform; @@ -2593,7 +2591,7 @@ :pswitch_33 sget v3, Landroid/os/Build$VERSION;->SDK_INT:I - if-lt v3, v8, :cond_2 + if-lt v3, v7, :cond_2 .line 3577 iget-object v3, p2, Landroid/support/constraint/ConstraintSet$Constraint;->layout:Landroid/support/constraint/ConstraintSet$Layout; @@ -2979,7 +2977,7 @@ :pswitch_4a sget v3, Landroid/os/Build$VERSION;->SDK_INT:I - if-lt v3, v8, :cond_2 + if-lt v3, v7, :cond_2 .line 3582 iget-object v3, p2, Landroid/support/constraint/ConstraintSet$Constraint;->layout:Landroid/support/constraint/ConstraintSet$Layout; @@ -3305,7 +3303,10 @@ goto :goto_1 + .line 3216 :cond_0 + aget-char v4, p0, v1 + const/16 v5, 0x22 if-ne v4, v5, :cond_1 @@ -7340,13 +7341,15 @@ if-ge v10, v0, :cond_4 .line 1919 + aget v0, v7, v10 + + .line 1920 aget v1, v7, v10 const/4 v2, 0x3 add-int/lit8 v11, v10, -0x1 - .line 1920 aget v3, v7, v11 const/4 v4, 0x4 @@ -7416,13 +7419,9 @@ invoke-direct {v0, v1}, Ljava/lang/IllegalArgumentException;->(Ljava/lang/String;)V - goto :goto_3 - - :goto_2 throw v0 - :goto_3 - goto :goto_2 + return-void .end method .method public varargs dump(Landroid/support/constraint/motion/MotionScene;[I)V @@ -7440,7 +7439,7 @@ const/4 v2, 0x0 - if-eqz v1, :cond_0 + if-eqz v1, :cond_1 .line 3845 new-instance v0, Ljava/util/HashSet; @@ -7453,7 +7452,7 @@ const/4 v3, 0x0 :goto_0 - if-ge v3, v1, :cond_1 + if-ge v3, v1, :cond_0 aget v4, p2, v3 @@ -7468,23 +7467,26 @@ goto :goto_0 - .line 3850 :cond_0 + move-object p2, v0 + + goto :goto_1 + + .line 3850 + :cond_1 new-instance p2, Ljava/util/HashSet; invoke-direct {p2, v0}, Ljava/util/HashSet;->(Ljava/util/Collection;)V - move-object v0, p2 - .line 3852 - :cond_1 - sget-object p2, Ljava/lang/System;->out:Ljava/io/PrintStream; + :goto_1 + sget-object v0, Ljava/lang/System;->out:Ljava/io/PrintStream; new-instance v1, Ljava/lang/StringBuilder; invoke-direct {v1}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v0}, Ljava/util/HashSet;->size()I + invoke-virtual {p2}, Ljava/util/HashSet;->size()I move-result v3 @@ -7498,28 +7500,28 @@ move-result-object v1 - invoke-virtual {p2, v1}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V + invoke-virtual {v0, v1}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V .line 3853 - new-instance p2, Ljava/lang/StringBuilder; + new-instance v0, Ljava/lang/StringBuilder; - invoke-direct {p2}, Ljava/lang/StringBuilder;->()V + invoke-direct {v0}, Ljava/lang/StringBuilder;->()V + .line 3855 new-array v1, v2, [Ljava/lang/Integer; - .line 3855 - invoke-virtual {v0, v1}, Ljava/util/HashSet;->toArray([Ljava/lang/Object;)[Ljava/lang/Object; + invoke-virtual {p2, v1}, Ljava/util/HashSet;->toArray([Ljava/lang/Object;)[Ljava/lang/Object; - move-result-object v0 + move-result-object p2 - check-cast v0, [Ljava/lang/Integer; + check-cast p2, [Ljava/lang/Integer; - array-length v1, v0 + array-length v1, p2 - :goto_1 + :goto_2 if-ge v2, v1, :cond_2 - aget-object v3, v0, v2 + aget-object v3, p2, v2 .line 3856 iget-object v4, p0, Landroid/support/constraint/ConstraintSet;->mConstraints:Ljava/util/HashMap; @@ -7533,35 +7535,35 @@ const-string v5, "append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; .line 3861 iget-object v3, v4, Landroid/support/constraint/ConstraintSet$Constraint;->layout:Landroid/support/constraint/ConstraintSet$Layout; - invoke-virtual {v3, p1, p2}, Landroid/support/constraint/ConstraintSet$Layout;->dump(Landroid/support/constraint/motion/MotionScene;Ljava/lang/StringBuilder;)V + invoke-virtual {v3, p1, v0}, Landroid/support/constraint/ConstraintSet$Layout;->dump(Landroid/support/constraint/motion/MotionScene;Ljava/lang/StringBuilder;)V const-string v3, "/>\n" .line 3862 - invoke-virtual {p2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; add-int/lit8 v2, v2, 0x1 - goto :goto_1 + goto :goto_2 .line 3864 :cond_2 sget-object p1, Ljava/lang/System;->out:Ljava/io/PrintStream; - invoke-virtual {p2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; move-result-object p2 @@ -7656,7 +7658,7 @@ .end method .method public getKnownIds()[I - .locals 5 + .locals 4 .line 3799 iget-object v0, p0, Landroid/support/constraint/ConstraintSet;->mConstraints:Ljava/util/HashMap; @@ -7678,26 +7680,29 @@ .line 3800 array-length v2, v0 - new-array v3, v2, [I + new-array v2, v2, [I + .line 3801 :goto_0 - if-ge v1, v2, :cond_0 + array-length v3, v2 + + if-ge v1, v3, :cond_0 .line 3802 - aget-object v4, v0, v1 + aget-object v3, v0, v1 - invoke-virtual {v4}, Ljava/lang/Integer;->intValue()I + invoke-virtual {v3}, Ljava/lang/Integer;->intValue()I - move-result v4 + move-result v3 - aput v4, v3, v1 + aput v3, v2, v1 add-int/lit8 v1, v1, 0x1 goto :goto_0 :cond_0 - return-object v3 + return-object v2 .end method .method public getParameters(I)Landroid/support/constraint/ConstraintSet$Constraint; @@ -7728,6 +7733,7 @@ const/4 p1, 0x0 + .line 3104 new-array p1, p1, [I return-object p1 @@ -7835,6 +7841,8 @@ if-eq v0, v2, :cond_0 + const/4 v1, 0x3 + goto :goto_1 .line 3290 @@ -7947,7 +7955,7 @@ if-eq v0, v5, :cond_0 - goto/16 :goto_4 + goto/16 :goto_3 .line 3388 :cond_0 @@ -7988,7 +7996,7 @@ move-object v2, v1 - goto/16 :goto_4 + goto/16 :goto_3 .line 3330 :cond_2 @@ -8014,7 +8022,7 @@ if-eqz v0, :cond_3 - const/4 v5, 0x0 + const/4 v0, 0x0 goto :goto_2 @@ -8027,7 +8035,7 @@ if-eqz v0, :cond_3 - const/4 v5, 0x7 + const/4 v0, 0x7 goto :goto_2 @@ -8040,7 +8048,7 @@ if-eqz v0, :cond_3 - const/4 v5, 0x2 + const/4 v0, 0x2 goto :goto_2 @@ -8053,7 +8061,7 @@ if-eqz v0, :cond_3 - const/4 v5, 0x1 + const/4 v0, 0x1 goto :goto_2 @@ -8066,7 +8074,7 @@ if-eqz v0, :cond_3 - const/4 v5, 0x4 + const/4 v0, 0x4 goto :goto_2 @@ -8079,6 +8087,8 @@ if-eqz v0, :cond_3 + const/4 v0, 0x3 + goto :goto_2 :sswitch_6 @@ -8090,7 +8100,7 @@ if-eqz v0, :cond_3 - const/4 v5, 0x6 + const/4 v0, 0x6 goto :goto_2 @@ -8106,20 +8116,20 @@ if-eqz v0, :cond_3 - const/4 v5, 0x5 + const/4 v0, 0x5 goto :goto_2 :cond_3 :goto_1 - const/4 v5, -0x1 + const/4 v0, -0x1 :goto_2 - const-string v0, "XML parser error must be within a Constraint " + const-string v4, "XML parser error must be within a Constraint " - packed-switch v5, :pswitch_data_0 + packed-switch v0, :pswitch_data_0 - goto/16 :goto_4 + goto/16 :goto_3 :pswitch_0 if-eqz v2, :cond_4 @@ -8130,25 +8140,25 @@ invoke-static {p1, p2, v0}, Landroid/support/constraint/ConstraintAttribute;->parse(Landroid/content/Context;Lorg/xmlpull/v1/XmlPullParser;Ljava/util/HashMap;)V - goto/16 :goto_4 + goto/16 :goto_3 .line 3373 :cond_4 new-instance p1, Ljava/lang/RuntimeException; - new-instance v1, Ljava/lang/StringBuilder; + new-instance v0, Ljava/lang/StringBuilder; - invoke-direct {v1}, Ljava/lang/StringBuilder;->()V + invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; invoke-interface {p2}, Lorg/xmlpull/v1/XmlPullParser;->getLineNumber()I move-result p2 - invoke-virtual {v1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; + invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; - invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; move-result-object p2 @@ -8168,25 +8178,25 @@ invoke-virtual {v0, p1, v3}, Landroid/support/constraint/ConstraintSet$Motion;->fillFromAttributeList(Landroid/content/Context;Landroid/util/AttributeSet;)V - goto/16 :goto_4 + goto/16 :goto_3 .line 3367 :cond_5 new-instance p1, Ljava/lang/RuntimeException; - new-instance v1, Ljava/lang/StringBuilder; + new-instance v0, Ljava/lang/StringBuilder; - invoke-direct {v1}, Ljava/lang/StringBuilder;->()V + invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; invoke-interface {p2}, Lorg/xmlpull/v1/XmlPullParser;->getLineNumber()I move-result p2 - invoke-virtual {v1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; + invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; - invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; move-result-object p2 @@ -8206,25 +8216,25 @@ invoke-virtual {v0, p1, v3}, Landroid/support/constraint/ConstraintSet$Layout;->fillFromAttributeList(Landroid/content/Context;Landroid/util/AttributeSet;)V - goto/16 :goto_4 + goto/16 :goto_3 .line 3361 :cond_6 new-instance p1, Ljava/lang/RuntimeException; - new-instance v1, Ljava/lang/StringBuilder; + new-instance v0, Ljava/lang/StringBuilder; - invoke-direct {v1}, Ljava/lang/StringBuilder;->()V + invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; invoke-interface {p2}, Lorg/xmlpull/v1/XmlPullParser;->getLineNumber()I move-result p2 - invoke-virtual {v1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; + invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; - invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; move-result-object p2 @@ -8244,25 +8254,25 @@ invoke-virtual {v0, p1, v3}, Landroid/support/constraint/ConstraintSet$Transform;->fillFromAttributeList(Landroid/content/Context;Landroid/util/AttributeSet;)V - goto :goto_4 + goto :goto_3 .line 3355 :cond_7 new-instance p1, Ljava/lang/RuntimeException; - new-instance v1, Ljava/lang/StringBuilder; + new-instance v0, Ljava/lang/StringBuilder; - invoke-direct {v1}, Ljava/lang/StringBuilder;->()V + invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; invoke-interface {p2}, Lorg/xmlpull/v1/XmlPullParser;->getLineNumber()I move-result p2 - invoke-virtual {v1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; + invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; - invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; move-result-object p2 @@ -8282,25 +8292,25 @@ invoke-virtual {v0, p1, v3}, Landroid/support/constraint/ConstraintSet$PropertySet;->fillFromAttributeList(Landroid/content/Context;Landroid/util/AttributeSet;)V - goto :goto_4 + goto :goto_3 .line 3349 :cond_8 new-instance p1, Ljava/lang/RuntimeException; - new-instance v1, Ljava/lang/StringBuilder; + new-instance v0, Ljava/lang/StringBuilder; - invoke-direct {v1}, Ljava/lang/StringBuilder;->()V + invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; invoke-interface {p2}, Lorg/xmlpull/v1/XmlPullParser;->getLineNumber()I move-result p2 - invoke-virtual {v1, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; + invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; - invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; move-result-object p2 @@ -8316,12 +8326,12 @@ invoke-direct {p0, p1, v0}, Landroid/support/constraint/ConstraintSet;->fillFromAttributeList(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/constraint/ConstraintSet$Constraint; - move-result-object v0 + move-result-object v2 .line 3345 - iget-object v2, v0, Landroid/support/constraint/ConstraintSet$Constraint;->layout:Landroid/support/constraint/ConstraintSet$Layout; + iget-object v0, v2, Landroid/support/constraint/ConstraintSet$Constraint;->layout:Landroid/support/constraint/ConstraintSet$Layout; - iput v3, v2, Landroid/support/constraint/ConstraintSet$Layout;->mHelperType:I + iput v3, v0, Landroid/support/constraint/ConstraintSet$Layout;->mHelperType:I goto :goto_3 @@ -8333,17 +8343,17 @@ invoke-direct {p0, p1, v0}, Landroid/support/constraint/ConstraintSet;->fillFromAttributeList(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/constraint/ConstraintSet$Constraint; - move-result-object v0 + move-result-object v2 .line 3340 - iget-object v2, v0, Landroid/support/constraint/ConstraintSet$Constraint;->layout:Landroid/support/constraint/ConstraintSet$Layout; + iget-object v0, v2, Landroid/support/constraint/ConstraintSet$Constraint;->layout:Landroid/support/constraint/ConstraintSet$Layout; - iput-boolean v3, v2, Landroid/support/constraint/ConstraintSet$Layout;->mIsGuideline:Z + iput-boolean v3, v0, Landroid/support/constraint/ConstraintSet$Layout;->mIsGuideline:Z .line 3341 - iget-object v2, v0, Landroid/support/constraint/ConstraintSet$Constraint;->layout:Landroid/support/constraint/ConstraintSet$Layout; + iget-object v0, v2, Landroid/support/constraint/ConstraintSet$Constraint;->layout:Landroid/support/constraint/ConstraintSet$Layout; - iput-boolean v3, v2, Landroid/support/constraint/ConstraintSet$Layout;->mApply:Z + iput-boolean v3, v0, Landroid/support/constraint/ConstraintSet$Layout;->mApply:Z goto :goto_3 @@ -8355,12 +8365,9 @@ invoke-direct {p0, p1, v0}, Landroid/support/constraint/ConstraintSet;->fillFromAttributeList(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/constraint/ConstraintSet$Constraint; - move-result-object v0 - - :goto_3 - move-object v2, v0 + move-result-object v2 - goto :goto_4 + goto :goto_3 .line 3326 :cond_9 @@ -8368,7 +8375,7 @@ .line 3323 :cond_a - :goto_4 + :goto_3 invoke-interface {p2}, Lorg/xmlpull/v1/XmlPullParser;->next()I move-result v0 @@ -8384,7 +8391,7 @@ .line 3404 invoke-virtual {p1}, Ljava/io/IOException;->printStackTrace()V - goto :goto_5 + goto :goto_4 :catch_1 move-exception p1 @@ -8393,7 +8400,7 @@ invoke-virtual {p1}, Lorg/xmlpull/v1/XmlPullParserException;->printStackTrace()V :cond_b - :goto_5 + :goto_4 return-void nop diff --git a/smali/android/support/constraint/Placeholder.smali b/smali/android/support/constraint/Placeholder.smali index a22edd7b..64f0e20f 100644 --- a/smali/android/support/constraint/Placeholder.smali +++ b/smali/android/support/constraint/Placeholder.smali @@ -560,6 +560,9 @@ iput-object p1, p0, Landroid/support/constraint/Placeholder;->mContent:Landroid/view/View; + .line 154 + iget-object p1, p0, Landroid/support/constraint/Placeholder;->mContent:Landroid/view/View; + if-eqz p1, :cond_1 .line 156 diff --git a/smali/android/support/constraint/R$anim.smali b/smali/android/support/constraint/R$anim.smali index 37405437..607ac682 100644 --- a/smali/android/support/constraint/R$anim.smali +++ b/smali/android/support/constraint/R$anim.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/constraint/R$anim; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -43,6 +44,7 @@ .method private constructor ()V .locals 0 + .line 13 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/constraint/R$attr.smali b/smali/android/support/constraint/R$attr.smali index 5cdb2176..7ed62416 100644 --- a/smali/android/support/constraint/R$attr.smali +++ b/smali/android/support/constraint/R$attr.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/constraint/R$attr; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -933,6 +934,7 @@ .method private constructor ()V .locals 0 + .line 29 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/constraint/R$bool.smali b/smali/android/support/constraint/R$bool.smali index 92b3e56c..193767b5 100644 --- a/smali/android/support/constraint/R$bool.smali +++ b/smali/android/support/constraint/R$bool.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/constraint/R$bool; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -25,6 +26,7 @@ .method private constructor ()V .locals 0 + .line 490 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/constraint/R$color.smali b/smali/android/support/constraint/R$color.smali index 9a2d32a0..01ec26bf 100644 --- a/smali/android/support/constraint/R$color.smali +++ b/smali/android/support/constraint/R$color.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/constraint/R$color; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -187,6 +188,7 @@ .method private constructor ()V .locals 0 + .line 497 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/constraint/R$dimen.smali b/smali/android/support/constraint/R$dimen.smali index f4a713a8..cfb7c178 100644 --- a/smali/android/support/constraint/R$dimen.smali +++ b/smali/android/support/constraint/R$dimen.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/constraint/R$dimen; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -247,6 +248,7 @@ .method private constructor ()V .locals 0 + .line 585 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/constraint/R$drawable.smali b/smali/android/support/constraint/R$drawable.smali index 5890bea8..b2493902 100644 --- a/smali/android/support/constraint/R$drawable.smali +++ b/smali/android/support/constraint/R$drawable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/constraint/R$drawable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -215,6 +216,7 @@ .method private constructor ()V .locals 0 + .line 703 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/constraint/R$id.smali b/smali/android/support/constraint/R$id.smali index 32208434..c4432ee7 100644 --- a/smali/android/support/constraint/R$id.smali +++ b/smali/android/support/constraint/R$id.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/constraint/R$id; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -361,6 +362,7 @@ .method private constructor ()V .locals 0 + .line 805 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/constraint/R$integer.smali b/smali/android/support/constraint/R$integer.smali index 75422ef1..c6babfec 100644 --- a/smali/android/support/constraint/R$integer.smali +++ b/smali/android/support/constraint/R$integer.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/constraint/R$integer; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -29,6 +30,7 @@ .method private constructor ()V .locals 0 + .line 980 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/constraint/R$layout.smali b/smali/android/support/constraint/R$layout.smali index da1c337f..1b0411a1 100644 --- a/smali/android/support/constraint/R$layout.smali +++ b/smali/android/support/constraint/R$layout.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/constraint/R$layout; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -95,6 +96,7 @@ .method private constructor ()V .locals 0 + .line 989 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/constraint/R$string.smali b/smali/android/support/constraint/R$string.smali index 5227282a..fb625fa2 100644 --- a/smali/android/support/constraint/R$string.smali +++ b/smali/android/support/constraint/R$string.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/constraint/R$string; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -101,6 +102,7 @@ .method private constructor ()V .locals 0 + .line 1031 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/constraint/R$style.smali b/smali/android/support/constraint/R$style.smali index f680adb8..d3a0aefb 100644 --- a/smali/android/support/constraint/R$style.smali +++ b/smali/android/support/constraint/R$style.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/constraint/R$style; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -711,6 +712,7 @@ .method private constructor ()V .locals 0 + .line 1076 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/constraint/R$styleable.smali b/smali/android/support/constraint/R$styleable.smali index 486b008b..fdb38b87 100644 --- a/smali/android/support/constraint/R$styleable.smali +++ b/smali/android/support/constraint/R$styleable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/constraint/R$styleable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -2086,11 +2087,12 @@ # direct methods -.method public static constructor ()V +.method static constructor ()V .locals 13 const/16 v0, 0x1d + .line 1428 new-array v1, v0, [I fill-array-data v1, :array_0 @@ -2099,35 +2101,39 @@ const/4 v1, 0x1 + .line 1458 new-array v2, v1, [I - const v3, 0x10100b3 + const/4 v3, 0x0 - const/4 v4, 0x0 + const v4, 0x10100b3 - aput v3, v2, v4 + aput v4, v2, v3 sput-object v2, Landroid/support/constraint/R$styleable;->ActionBarLayout:[I + .line 1460 new-array v2, v1, [I - const v3, 0x101013f + const v4, 0x101013f - aput v3, v2, v4 + aput v4, v2, v3 sput-object v2, Landroid/support/constraint/R$styleable;->ActionMenuItemView:[I const/4 v2, 0x6 - new-array v3, v2, [I + .line 1462 + new-array v4, v2, [I - fill-array-data v3, :array_1 + fill-array-data v4, :array_1 - sput-object v3, Landroid/support/constraint/R$styleable;->ActionMode:[I + sput-object v4, Landroid/support/constraint/R$styleable;->ActionMode:[I - const/4 v3, 0x2 + const/4 v4, 0x2 - new-array v5, v3, [I + .line 1469 + new-array v5, v4, [I fill-array-data v5, :array_2 @@ -2135,19 +2141,22 @@ const/16 v5, 0x8 + .line 1472 new-array v6, v5, [I fill-array-data v6, :array_3 sput-object v6, Landroid/support/constraint/R$styleable;->AlertDialog:[I + .line 1481 new-array v6, v2, [I fill-array-data v6, :array_4 sput-object v6, Landroid/support/constraint/R$styleable;->AnimatedStateListDrawableCompat:[I - new-array v6, v3, [I + .line 1488 + new-array v6, v4, [I fill-array-data v6, :array_5 @@ -2155,18 +2164,21 @@ const/4 v6, 0x4 + .line 1491 new-array v7, v6, [I fill-array-data v7, :array_6 sput-object v7, Landroid/support/constraint/R$styleable;->AnimatedStateListDrawableTransition:[I + .line 1496 new-array v7, v6, [I fill-array-data v7, :array_7 sput-object v7, Landroid/support/constraint/R$styleable;->AppCompatImageView:[I + .line 1501 new-array v7, v6, [I fill-array-data v7, :array_8 @@ -2175,6 +2187,7 @@ const/4 v7, 0x7 + .line 1506 new-array v8, v7, [I fill-array-data v8, :array_9 @@ -2183,6 +2196,7 @@ const/16 v8, 0xb + .line 1514 new-array v9, v8, [I fill-array-data v9, :array_a @@ -2191,28 +2205,32 @@ const/16 v9, 0x79 + .line 1526 new-array v9, v9, [I fill-array-data v9, :array_b sput-object v9, Landroid/support/constraint/R$styleable;->AppCompatTheme:[I + .line 1648 new-array v9, v1, [I const v10, 0x7f020026 - aput v10, v9, v4 + aput v10, v9, v3 sput-object v9, Landroid/support/constraint/R$styleable;->ButtonBarLayout:[I const/4 v9, 0x3 + .line 1650 new-array v10, v9, [I fill-array-data v10, :array_c sput-object v10, Landroid/support/constraint/R$styleable;->ColorStateListItem:[I + .line 1654 new-array v10, v9, [I fill-array-data v10, :array_d @@ -2221,6 +2239,7 @@ const/16 v10, 0x6d + .line 1658 new-array v10, v10, [I fill-array-data v10, :array_e @@ -2229,13 +2248,15 @@ const/16 v10, 0x5a + .line 1768 new-array v10, v10, [I fill-array-data v10, :array_f sput-object v10, Landroid/support/constraint/R$styleable;->ConstraintLayout_Layout:[I - new-array v10, v3, [I + .line 1859 + new-array v10, v4, [I fill-array-data v10, :array_10 @@ -2243,18 +2264,21 @@ const/16 v10, 0x6f + .line 1862 new-array v10, v10, [I fill-array-data v10, :array_11 sput-object v10, Landroid/support/constraint/R$styleable;->ConstraintSet:[I - new-array v10, v3, [I + .line 1974 + new-array v10, v4, [I fill-array-data v10, :array_12 sput-object v10, Landroid/support/constraint/R$styleable;->CoordinatorLayout:[I + .line 1977 new-array v7, v7, [I fill-array-data v7, :array_13 @@ -2263,18 +2287,21 @@ const/16 v7, 0x9 + .line 1985 new-array v10, v7, [I fill-array-data v10, :array_14 sput-object v10, Landroid/support/constraint/R$styleable;->CustomAttribute:[I + .line 1995 new-array v5, v5, [I fill-array-data v5, :array_15 sput-object v5, Landroid/support/constraint/R$styleable;->DrawerArrowToggle:[I + .line 2004 new-array v5, v2, [I fill-array-data v5, :array_16 @@ -2283,6 +2310,7 @@ const/16 v5, 0xa + .line 2011 new-array v10, v5, [I fill-array-data v10, :array_17 @@ -2291,18 +2319,21 @@ const/16 v10, 0xc + .line 2022 new-array v11, v10, [I fill-array-data v11, :array_18 sput-object v11, Landroid/support/constraint/R$styleable;->GradientColor:[I - new-array v11, v3, [I + .line 2035 + new-array v11, v4, [I fill-array-data v11, :array_19 sput-object v11, Landroid/support/constraint/R$styleable;->GradientColorItem:[I + .line 2038 new-array v11, v7, [I fill-array-data v11, :array_1a @@ -2311,6 +2342,7 @@ const/16 v11, 0x12 + .line 2048 new-array v11, v11, [I fill-array-data v11, :array_1b @@ -2319,24 +2351,28 @@ const/16 v11, 0x14 + .line 2067 new-array v12, v11, [I fill-array-data v12, :array_1c sput-object v12, Landroid/support/constraint/R$styleable;->KeyCycle:[I + .line 2088 new-array v12, v10, [I fill-array-data v12, :array_1d sput-object v12, Landroid/support/constraint/R$styleable;->KeyPosition:[I + .line 2101 new-array v11, v11, [I fill-array-data v11, :array_1e sput-object v11, Landroid/support/constraint/R$styleable;->KeyTimeCycle:[I + .line 2122 new-array v5, v5, [I fill-array-data v5, :array_1f @@ -2345,30 +2381,35 @@ const/16 v5, 0x43 + .line 2133 new-array v5, v5, [I fill-array-data v5, :array_20 sput-object v5, Landroid/support/constraint/R$styleable;->Layout:[I + .line 2201 new-array v5, v7, [I fill-array-data v5, :array_21 sput-object v5, Landroid/support/constraint/R$styleable;->LinearLayoutCompat:[I + .line 2211 new-array v5, v6, [I fill-array-data v5, :array_22 sput-object v5, Landroid/support/constraint/R$styleable;->LinearLayoutCompat_Layout:[I - new-array v5, v3, [I + .line 2216 + new-array v5, v4, [I fill-array-data v5, :array_23 sput-object v5, Landroid/support/constraint/R$styleable;->ListPopupWindow:[I + .line 2219 new-array v5, v2, [I fill-array-data v5, :array_24 @@ -2377,89 +2418,103 @@ const/16 v5, 0x17 + .line 2226 new-array v5, v5, [I fill-array-data v5, :array_25 sput-object v5, Landroid/support/constraint/R$styleable;->MenuItem:[I + .line 2250 new-array v5, v7, [I fill-array-data v5, :array_26 sput-object v5, Landroid/support/constraint/R$styleable;->MenuView:[I + .line 2260 new-array v5, v2, [I fill-array-data v5, :array_27 sput-object v5, Landroid/support/constraint/R$styleable;->MockView:[I + .line 2267 new-array v5, v2, [I fill-array-data v5, :array_28 sput-object v5, Landroid/support/constraint/R$styleable;->Motion:[I - new-array v5, v3, [I + .line 2274 + new-array v5, v4, [I fill-array-data v5, :array_29 sput-object v5, Landroid/support/constraint/R$styleable;->MotionHelper:[I + .line 2277 new-array v5, v2, [I fill-array-data v5, :array_2a sput-object v5, Landroid/support/constraint/R$styleable;->MotionLayout:[I - new-array v5, v3, [I + .line 2284 + new-array v5, v4, [I fill-array-data v5, :array_2b sput-object v5, Landroid/support/constraint/R$styleable;->MotionScene:[I + .line 2287 new-array v5, v9, [I fill-array-data v5, :array_2c sput-object v5, Landroid/support/constraint/R$styleable;->MotionTelltales:[I - new-array v5, v3, [I + .line 2291 + new-array v5, v4, [I fill-array-data v5, :array_2d sput-object v5, Landroid/support/constraint/R$styleable;->OnClick:[I + .line 2294 new-array v5, v10, [I fill-array-data v5, :array_2e sput-object v5, Landroid/support/constraint/R$styleable;->OnSwipe:[I + .line 2307 new-array v5, v9, [I fill-array-data v5, :array_2f sput-object v5, Landroid/support/constraint/R$styleable;->PopupWindow:[I + .line 2311 new-array v5, v1, [I const v6, 0x7f020173 - aput v6, v5, v4 + aput v6, v5, v3 sput-object v5, Landroid/support/constraint/R$styleable;->PopupWindowBackgroundState:[I const/4 v5, 0x5 + .line 2313 new-array v6, v5, [I fill-array-data v6, :array_30 sput-object v6, Landroid/support/constraint/R$styleable;->PropertySet:[I - new-array v6, v3, [I + .line 2319 + new-array v6, v4, [I fill-array-data v6, :array_31 @@ -2467,48 +2522,55 @@ const/16 v6, 0x11 + .line 2322 new-array v6, v6, [I fill-array-data v6, :array_32 sput-object v6, Landroid/support/constraint/R$styleable;->SearchView:[I + .line 2340 new-array v6, v5, [I fill-array-data v6, :array_33 sput-object v6, Landroid/support/constraint/R$styleable;->Spinner:[I - new-array v3, v3, [I + .line 2346 + new-array v4, v4, [I - fill-array-data v3, :array_34 + fill-array-data v4, :array_34 - sput-object v3, Landroid/support/constraint/R$styleable;->State:[I + sput-object v4, Landroid/support/constraint/R$styleable;->State:[I + .line 2349 new-array v2, v2, [I fill-array-data v2, :array_35 sput-object v2, Landroid/support/constraint/R$styleable;->StateListDrawable:[I + .line 2356 new-array v2, v1, [I - const v3, 0x1010199 + const v4, 0x1010199 - aput v3, v2, v4 + aput v4, v2, v3 sput-object v2, Landroid/support/constraint/R$styleable;->StateListDrawableItem:[I + .line 2358 new-array v1, v1, [I const v2, 0x7f020081 - aput v2, v1, v4 + aput v2, v1, v3 sput-object v1, Landroid/support/constraint/R$styleable;->StateSet:[I const/16 v1, 0xe + .line 2360 new-array v1, v1, [I fill-array-data v1, :array_36 @@ -2517,48 +2579,56 @@ const/16 v1, 0xd + .line 2375 new-array v1, v1, [I fill-array-data v1, :array_37 sput-object v1, Landroid/support/constraint/R$styleable;->TextAppearance:[I + .line 2389 new-array v0, v0, [I fill-array-data v0, :array_38 sput-object v0, Landroid/support/constraint/R$styleable;->Toolbar:[I + .line 2419 new-array v0, v8, [I fill-array-data v0, :array_39 sput-object v0, Landroid/support/constraint/R$styleable;->Transform:[I + .line 2431 new-array v0, v8, [I fill-array-data v0, :array_3a sput-object v0, Landroid/support/constraint/R$styleable;->Transition:[I + .line 2443 new-array v0, v5, [I fill-array-data v0, :array_3b sput-object v0, Landroid/support/constraint/R$styleable;->Variant:[I + .line 2449 new-array v0, v5, [I fill-array-data v0, :array_3c sput-object v0, Landroid/support/constraint/R$styleable;->View:[I + .line 2455 new-array v0, v9, [I fill-array-data v0, :array_3d sput-object v0, Landroid/support/constraint/R$styleable;->ViewBackgroundHelper:[I + .line 2459 new-array v0, v9, [I fill-array-data v0, :array_3e @@ -3783,6 +3853,7 @@ .method private constructor ()V .locals 0 + .line 1426 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/constraint/R.smali b/smali/android/support/constraint/R.smali index 3565ba65..b331dbe0 100644 --- a/smali/android/support/constraint/R.smali +++ b/smali/android/support/constraint/R.smali @@ -1,22 +1,23 @@ .class public final Landroid/support/constraint/R; .super Ljava/lang/Object; +.source "R.java" # annotations .annotation system Ldalvik/annotation/MemberClasses; value = { - Landroid/support/constraint/R$anim;, - Landroid/support/constraint/R$attr;, - Landroid/support/constraint/R$bool;, - Landroid/support/constraint/R$color;, - Landroid/support/constraint/R$dimen;, - Landroid/support/constraint/R$drawable;, - Landroid/support/constraint/R$id;, - Landroid/support/constraint/R$integer;, - Landroid/support/constraint/R$layout;, - Landroid/support/constraint/R$string;, + Landroid/support/constraint/R$styleable;, Landroid/support/constraint/R$style;, - Landroid/support/constraint/R$styleable; + Landroid/support/constraint/R$string;, + Landroid/support/constraint/R$layout;, + Landroid/support/constraint/R$integer;, + Landroid/support/constraint/R$id;, + Landroid/support/constraint/R$drawable;, + Landroid/support/constraint/R$dimen;, + Landroid/support/constraint/R$color;, + Landroid/support/constraint/R$bool;, + Landroid/support/constraint/R$attr;, + Landroid/support/constraint/R$anim; } .end annotation @@ -25,6 +26,7 @@ .method private constructor ()V .locals 0 + .line 10 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/constraint/helper/Flow.smali b/smali/android/support/constraint/helper/Flow.smali index 3b4e5811..1ef7c18c 100644 --- a/smali/android/support/constraint/helper/Flow.smali +++ b/smali/android/support/constraint/helper/Flow.smali @@ -636,6 +636,11 @@ .method protected onMeasure(II)V .locals 1 + .annotation build Landroid/annotation/SuppressLint; + value = { + "WrongCall" + } + .end annotation .line 150 iget-object v0, p0, Landroid/support/constraint/helper/Flow;->mFlow:Landroid/support/constraint/solver/widgets/Flow; diff --git a/smali/android/support/constraint/motion/DesignTool.smali b/smali/android/support/constraint/motion/DesignTool.smali index 1f760b76..5c4222d8 100644 --- a/smali/android/support/constraint/motion/DesignTool.smali +++ b/smali/android/support/constraint/motion/DesignTool.smali @@ -53,7 +53,7 @@ # direct methods .method static constructor ()V - .locals 16 + .locals 14 .line 86 new-instance v0, Ljava/util/HashMap; @@ -63,224 +63,292 @@ sput-object v0, Landroid/support/constraint/motion/DesignTool;->allAttributes:Ljava/util/HashMap; .line 87 - new-instance v1, Ljava/util/HashMap; - - invoke-direct {v1}, Ljava/util/HashMap;->()V + new-instance v0, Ljava/util/HashMap; - sput-object v1, Landroid/support/constraint/motion/DesignTool;->allMargins:Ljava/util/HashMap; + invoke-direct {v0}, Ljava/util/HashMap;->()V - const/4 v2, 0x4 + sput-object v0, Landroid/support/constraint/motion/DesignTool;->allMargins:Ljava/util/HashMap; .line 90 - invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + sget-object v0, Landroid/support/constraint/motion/DesignTool;->allAttributes:Ljava/util/HashMap; - move-result-object v2 + const/4 v1, 0x4 - invoke-static {v2, v2}, Landroid/util/Pair;->create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair; + invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + + move-result-object v1 - move-result-object v3 + invoke-static {v1, v1}, Landroid/util/Pair;->create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair; - const-string v4, "layout_constraintBottom_toBottomOf" + move-result-object v2 - invoke-virtual {v0, v3, v4}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + const-string v3, "layout_constraintBottom_toBottomOf" - const/4 v3, 0x3 + invoke-virtual {v0, v2, v3}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 91 - invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + sget-object v0, Landroid/support/constraint/motion/DesignTool;->allAttributes:Ljava/util/HashMap; - move-result-object v3 + const/4 v2, 0x3 - invoke-static {v2, v3}, Landroid/util/Pair;->create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair; + invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + + move-result-object v2 - move-result-object v5 + invoke-static {v1, v2}, Landroid/util/Pair;->create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair; + + move-result-object v4 - const-string v6, "layout_constraintBottom_toTopOf" + const-string v5, "layout_constraintBottom_toTopOf" - invoke-virtual {v0, v5, v6}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + invoke-virtual {v0, v4, v5}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 92 - invoke-static {v3, v2}, Landroid/util/Pair;->create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair; + sget-object v0, Landroid/support/constraint/motion/DesignTool;->allAttributes:Ljava/util/HashMap; - move-result-object v2 + invoke-static {v2, v1}, Landroid/util/Pair;->create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair; + + move-result-object v1 - const-string v5, "layout_constraintTop_toBottomOf" + const-string v4, "layout_constraintTop_toBottomOf" - invoke-virtual {v0, v2, v5}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + invoke-virtual {v0, v1, v4}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 93 - invoke-static {v3, v3}, Landroid/util/Pair;->create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair; + sget-object v0, Landroid/support/constraint/motion/DesignTool;->allAttributes:Ljava/util/HashMap; - move-result-object v2 + invoke-static {v2, v2}, Landroid/util/Pair;->create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair; - const-string v3, "layout_constraintTop_toTopOf" + move-result-object v1 - invoke-virtual {v0, v2, v3}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + const-string v2, "layout_constraintTop_toTopOf" - const/4 v2, 0x6 + invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 94 - invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + sget-object v0, Landroid/support/constraint/motion/DesignTool;->allAttributes:Ljava/util/HashMap; - move-result-object v2 + const/4 v1, 0x6 - invoke-static {v2, v2}, Landroid/util/Pair;->create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair; + invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - move-result-object v7 + move-result-object v1 + + invoke-static {v1, v1}, Landroid/util/Pair;->create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair; - const-string v8, "layout_constraintStart_toStartOf" + move-result-object v6 - invoke-virtual {v0, v7, v8}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + const-string v7, "layout_constraintStart_toStartOf" - const/4 v7, 0x7 + invoke-virtual {v0, v6, v7}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 95 - invoke-static {v7}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + sget-object v0, Landroid/support/constraint/motion/DesignTool;->allAttributes:Ljava/util/HashMap; + + const/4 v6, 0x7 + + invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - move-result-object v7 + move-result-object v6 - invoke-static {v2, v7}, Landroid/util/Pair;->create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair; + invoke-static {v1, v6}, Landroid/util/Pair;->create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair; - move-result-object v9 + move-result-object v8 - const-string v10, "layout_constraintStart_toEndOf" + const-string v9, "layout_constraintStart_toEndOf" - invoke-virtual {v0, v9, v10}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + invoke-virtual {v0, v8, v9}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 96 - invoke-static {v7, v2}, Landroid/util/Pair;->create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair; + sget-object v0, Landroid/support/constraint/motion/DesignTool;->allAttributes:Ljava/util/HashMap; - move-result-object v2 + invoke-static {v6, v1}, Landroid/util/Pair;->create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair; - const-string v9, "layout_constraintEnd_toStartOf" + move-result-object v1 + + const-string v8, "layout_constraintEnd_toStartOf" - invoke-virtual {v0, v2, v9}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + invoke-virtual {v0, v1, v8}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 97 - invoke-static {v7, v7}, Landroid/util/Pair;->create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair; + sget-object v0, Landroid/support/constraint/motion/DesignTool;->allAttributes:Ljava/util/HashMap; - move-result-object v2 + invoke-static {v6, v6}, Landroid/util/Pair;->create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair; - const-string v7, "layout_constraintEnd_toEndOf" + move-result-object v1 - invoke-virtual {v0, v2, v7}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + const-string v6, "layout_constraintEnd_toEndOf" - const/4 v2, 0x1 + invoke-virtual {v0, v1, v6}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 98 - invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + sget-object v0, Landroid/support/constraint/motion/DesignTool;->allAttributes:Ljava/util/HashMap; - move-result-object v2 + const/4 v1, 0x1 - invoke-static {v2, v2}, Landroid/util/Pair;->create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair; + invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - move-result-object v11 + move-result-object v1 + + invoke-static {v1, v1}, Landroid/util/Pair;->create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair; - const-string v12, "layout_constraintLeft_toLeftOf" + move-result-object v10 - invoke-virtual {v0, v11, v12}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + const-string v11, "layout_constraintLeft_toLeftOf" - const/4 v11, 0x2 + invoke-virtual {v0, v10, v11}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 99 - invoke-static {v11}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + sget-object v0, Landroid/support/constraint/motion/DesignTool;->allAttributes:Ljava/util/HashMap; - move-result-object v11 + const/4 v10, 0x2 - invoke-static {v2, v11}, Landroid/util/Pair;->create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair; + invoke-static {v10}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - move-result-object v13 + move-result-object v10 - const-string v14, "layout_constraintLeft_toRightOf" + invoke-static {v1, v10}, Landroid/util/Pair;->create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair; - invoke-virtual {v0, v13, v14}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + move-result-object v12 + + const-string v13, "layout_constraintLeft_toRightOf" + + invoke-virtual {v0, v12, v13}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 100 - invoke-static {v11, v11}, Landroid/util/Pair;->create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair; + sget-object v0, Landroid/support/constraint/motion/DesignTool;->allAttributes:Ljava/util/HashMap; - move-result-object v13 + invoke-static {v10, v10}, Landroid/util/Pair;->create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair; - const-string v15, "layout_constraintRight_toRightOf" + move-result-object v12 - invoke-virtual {v0, v13, v15}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + const-string v13, "layout_constraintRight_toRightOf" + + invoke-virtual {v0, v12, v13}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 101 - invoke-static {v11, v2}, Landroid/util/Pair;->create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair; + sget-object v0, Landroid/support/constraint/motion/DesignTool;->allAttributes:Ljava/util/HashMap; - move-result-object v2 + invoke-static {v10, v1}, Landroid/util/Pair;->create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair; - const-string v11, "layout_constraintRight_toLeftOf" + move-result-object v1 - invoke-virtual {v0, v2, v11}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + const-string v10, "layout_constraintRight_toLeftOf" - const/4 v2, 0x5 + invoke-virtual {v0, v1, v10}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 102 - invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + sget-object v0, Landroid/support/constraint/motion/DesignTool;->allAttributes:Ljava/util/HashMap; - move-result-object v2 + const/4 v1, 0x5 - invoke-static {v2, v2}, Landroid/util/Pair;->create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair; + invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - move-result-object v2 + move-result-object v1 + + const/4 v10, 0x5 - const-string v13, "layout_constraintBaseline_toBaselineOf" + invoke-static {v10}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - invoke-virtual {v0, v2, v13}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + move-result-object v10 - const-string v0, "layout_marginBottom" + invoke-static {v1, v10}, Landroid/util/Pair;->create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/util/Pair; + + move-result-object v1 + + const-string v10, "layout_constraintBaseline_toBaselineOf" + + invoke-virtual {v0, v1, v10}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 104 - invoke-virtual {v1, v4, v0}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + sget-object v0, Landroid/support/constraint/motion/DesignTool;->allMargins:Ljava/util/HashMap; + + const-string v1, "layout_marginBottom" + + invoke-virtual {v0, v3, v1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 105 - invoke-virtual {v1, v6, v0}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + sget-object v0, Landroid/support/constraint/motion/DesignTool;->allMargins:Ljava/util/HashMap; - const-string v0, "layout_marginTop" + const-string v1, "layout_marginBottom" + + invoke-virtual {v0, v5, v1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 106 - invoke-virtual {v1, v5, v0}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + sget-object v0, Landroid/support/constraint/motion/DesignTool;->allMargins:Ljava/util/HashMap; + + const-string v1, "layout_marginTop" + + invoke-virtual {v0, v4, v1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 107 - invoke-virtual {v1, v3, v0}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + sget-object v0, Landroid/support/constraint/motion/DesignTool;->allMargins:Ljava/util/HashMap; - const-string v0, "layout_marginStart" + const-string v1, "layout_marginTop" + + invoke-virtual {v0, v2, v1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 108 - invoke-virtual {v1, v8, v0}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + sget-object v0, Landroid/support/constraint/motion/DesignTool;->allMargins:Ljava/util/HashMap; + + const-string v1, "layout_marginStart" + + invoke-virtual {v0, v7, v1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 109 - invoke-virtual {v1, v10, v0}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + sget-object v0, Landroid/support/constraint/motion/DesignTool;->allMargins:Ljava/util/HashMap; - const-string v0, "layout_marginEnd" + const-string v1, "layout_marginStart" + + invoke-virtual {v0, v9, v1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 110 - invoke-virtual {v1, v9, v0}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + sget-object v0, Landroid/support/constraint/motion/DesignTool;->allMargins:Ljava/util/HashMap; + + const-string v1, "layout_marginEnd" - const-string v0, "layout_marginEnd" + invoke-virtual {v0, v8, v1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 111 - invoke-virtual {v1, v7, v0}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + sget-object v0, Landroid/support/constraint/motion/DesignTool;->allMargins:Ljava/util/HashMap; + + const-string v1, "layout_marginEnd" - const-string v0, "layout_marginLeft" + invoke-virtual {v0, v6, v1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 112 - invoke-virtual {v1, v12, v0}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + sget-object v0, Landroid/support/constraint/motion/DesignTool;->allMargins:Ljava/util/HashMap; - const-string v0, "layout_marginLeft" + const-string v1, "layout_marginLeft" + + invoke-virtual {v0, v11, v1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 113 - invoke-virtual {v1, v14, v0}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + sget-object v0, Landroid/support/constraint/motion/DesignTool;->allMargins:Ljava/util/HashMap; + + const-string v1, "layout_constraintLeft_toRightOf" + + const-string v2, "layout_marginLeft" - const-string v0, "layout_marginRight" + invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 114 - invoke-virtual {v1, v15, v0}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + sget-object v0, Landroid/support/constraint/motion/DesignTool;->allMargins:Ljava/util/HashMap; - const-string v0, "layout_marginRight" + const-string v1, "layout_constraintRight_toRightOf" + + const-string v2, "layout_marginRight" + + invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 115 - invoke-virtual {v1, v11, v0}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + sget-object v0, Landroid/support/constraint/motion/DesignTool;->allMargins:Ljava/util/HashMap; + + const-string v1, "layout_constraintRight_toLeftOf" + + const-string v2, "layout_marginRight" + + invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; return-void .end method @@ -1695,16 +1763,12 @@ iput p2, p1, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F - .line 479 - iget-object p1, p0, Landroid/support/constraint/motion/DesignTool;->mMotionLayout:Landroid/support/constraint/motion/MotionLayout; - const/4 p2, 0x0 + .line 479 iput p2, p1, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F .line 480 - iget-object p1, p0, Landroid/support/constraint/motion/DesignTool;->mMotionLayout:Landroid/support/constraint/motion/MotionLayout; - invoke-virtual {p1}, Landroid/support/constraint/motion/MotionLayout;->rebuildScene()V .line 481 diff --git a/smali/android/support/constraint/motion/KeyAttributes$Loader.smali b/smali/android/support/constraint/motion/KeyAttributes$Loader.smali index 8ab06e6f..7ba11687 100644 --- a/smali/android/support/constraint/motion/KeyAttributes$Loader.smali +++ b/smali/android/support/constraint/motion/KeyAttributes$Loader.smali @@ -66,6 +66,8 @@ sput-object v0, Landroid/support/constraint/motion/KeyAttributes$Loader;->mAttrMap:Landroid/util/SparseIntArray; .line 355 + sget-object v0, Landroid/support/constraint/motion/KeyAttributes$Loader;->mAttrMap:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->KeyAttribute_android_alpha:I const/4 v2, 0x1 diff --git a/smali/android/support/constraint/motion/KeyAttributes.smali b/smali/android/support/constraint/motion/KeyAttributes.smali index 21e52e87..592f8140 100644 --- a/smali/android/support/constraint/motion/KeyAttributes.smali +++ b/smali/android/support/constraint/motion/KeyAttributes.smali @@ -439,7 +439,7 @@ move-result v1 - if-eqz v1, :cond_10 + if-eqz v1, :cond_3 invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object; @@ -490,22 +490,17 @@ goto :goto_0 - .line 198 :cond_1 - invoke-virtual {v1}, Ljava/lang/String;->hashCode()I - const/4 v3, -0x1 + .line 198 invoke-virtual {v1}, Ljava/lang/String;->hashCode()I move-result v5 sparse-switch v5, :sswitch_data_0 - :goto_1 - const/4 v4, -0x1 - - goto/16 :goto_2 + goto/16 :goto_1 :sswitch_0 const-string v4, "alpha" @@ -514,28 +509,20 @@ move-result v4 - if-nez v4, :cond_2 - - goto :goto_1 + if-eqz v4, :cond_2 - :cond_2 - const/16 v4, 0xd + const/4 v4, 0x0 goto/16 :goto_2 :sswitch_1 - const-string v4, "transitionPathRotate" - - invoke-virtual {v1, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + const-string v5, "transitionPathRotate" - move-result v4 - - if-nez v4, :cond_3 + invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z - goto :goto_1 + move-result v5 - :cond_3 - const/16 v4, 0xc + if-eqz v5, :cond_2 goto/16 :goto_2 @@ -546,12 +533,9 @@ move-result v4 - if-nez v4, :cond_4 + if-eqz v4, :cond_2 - goto :goto_1 - - :cond_4 - const/16 v4, 0xb + const/4 v4, 0x1 goto/16 :goto_2 @@ -562,12 +546,9 @@ move-result v4 - if-nez v4, :cond_5 - - goto :goto_1 + if-eqz v4, :cond_2 - :cond_5 - const/16 v4, 0xa + const/4 v4, 0x2 goto/16 :goto_2 @@ -578,14 +559,11 @@ move-result v4 - if-nez v4, :cond_6 + if-eqz v4, :cond_2 - goto :goto_1 - - :cond_6 - const/16 v4, 0x9 + const/4 v4, 0x6 - goto/16 :goto_2 + goto :goto_2 :sswitch_5 const-string v4, "transformPivotX" @@ -594,25 +572,24 @@ move-result v4 - if-nez v4, :cond_7 - - goto :goto_1 + if-eqz v4, :cond_2 - :cond_7 - const/16 v4, 0x8 + const/4 v4, 0x5 goto :goto_2 :sswitch_6 - const-string v5, "scaleY" + const-string v4, "scaleY" - invoke-virtual {v1, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v1, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z - move-result v5 + move-result v4 - if-nez v5, :cond_f + if-eqz v4, :cond_2 - goto :goto_1 + const/16 v4, 0x9 + + goto :goto_2 :sswitch_7 const-string v4, "scaleX" @@ -621,12 +598,9 @@ move-result v4 - if-nez v4, :cond_8 - - goto :goto_1 + if-eqz v4, :cond_2 - :cond_8 - const/4 v4, 0x6 + const/16 v4, 0x8 goto :goto_2 @@ -637,12 +611,9 @@ move-result v4 - if-nez v4, :cond_9 + if-eqz v4, :cond_2 - goto :goto_1 - - :cond_9 - const/4 v4, 0x5 + const/16 v4, 0xd goto :goto_2 @@ -653,12 +624,9 @@ move-result v4 - if-nez v4, :cond_a - - goto :goto_1 + if-eqz v4, :cond_2 - :cond_a - const/4 v4, 0x4 + const/16 v4, 0xc goto :goto_2 @@ -669,12 +637,9 @@ move-result v4 - if-nez v4, :cond_b + if-eqz v4, :cond_2 - goto/16 :goto_1 - - :cond_b - const/4 v4, 0x3 + const/16 v4, 0xb goto :goto_2 @@ -685,12 +650,9 @@ move-result v4 - if-nez v4, :cond_c - - goto/16 :goto_1 + if-eqz v4, :cond_2 - :cond_c - const/4 v4, 0x2 + const/16 v4, 0xa goto :goto_2 @@ -701,12 +663,9 @@ move-result v4 - if-nez v4, :cond_d + if-eqz v4, :cond_2 - goto/16 :goto_1 - - :cond_d - const/4 v4, 0x1 + const/4 v4, 0x4 goto :goto_2 @@ -717,14 +676,16 @@ move-result v4 - if-nez v4, :cond_e + if-eqz v4, :cond_2 - goto/16 :goto_1 + const/4 v4, 0x3 - :cond_e - const/4 v4, 0x0 + goto :goto_2 + + :cond_2 + :goto_1 + const/4 v4, -0x1 - :cond_f :goto_2 packed-switch v4, :pswitch_data_0 @@ -753,9 +714,9 @@ goto/16 :goto_0 - .line 200 + .line 265 :pswitch_0 - iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mAlpha:F + iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mProgress:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z @@ -763,18 +724,18 @@ if-nez v1, :cond_0 - .line 201 + .line 266 iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mFramePosition:I - iget v3, p0, Landroid/support/constraint/motion/KeyAttributes;->mAlpha:F + iget v3, p0, Landroid/support/constraint/motion/KeyAttributes;->mProgress:F invoke-virtual {v2, v1, v3}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 235 + .line 260 :pswitch_1 - iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mTransitionPathRotate:F + iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mTranslationZ:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z @@ -782,18 +743,18 @@ if-nez v1, :cond_0 - .line 236 + .line 261 iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mFramePosition:I - iget v3, p0, Landroid/support/constraint/motion/KeyAttributes;->mTransitionPathRotate:F + iget v3, p0, Landroid/support/constraint/motion/KeyAttributes;->mTranslationZ:F invoke-virtual {v2, v1, v3}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 205 + .line 255 :pswitch_2 - iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mElevation:F + iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mTranslationY:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z @@ -801,18 +762,18 @@ if-nez v1, :cond_0 - .line 206 + .line 256 iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mFramePosition:I - iget v3, p0, Landroid/support/constraint/motion/KeyAttributes;->mElevation:F + iget v3, p0, Landroid/support/constraint/motion/KeyAttributes;->mTranslationY:F invoke-virtual {v2, v1, v3}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 210 + .line 250 :pswitch_3 - iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mRotation:F + iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mTranslationX:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z @@ -820,18 +781,18 @@ if-nez v1, :cond_0 - .line 211 + .line 251 iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mFramePosition:I - iget v3, p0, Landroid/support/constraint/motion/KeyAttributes;->mRotation:F + iget v3, p0, Landroid/support/constraint/motion/KeyAttributes;->mTranslationX:F invoke-virtual {v2, v1, v3}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 230 + .line 245 :pswitch_4 - iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mRotationY:F + iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mScaleY:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z @@ -839,18 +800,18 @@ if-nez v1, :cond_0 - .line 231 + .line 246 iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mFramePosition:I - iget v3, p0, Landroid/support/constraint/motion/KeyAttributes;->mPivotY:F + iget v3, p0, Landroid/support/constraint/motion/KeyAttributes;->mScaleY:F invoke-virtual {v2, v1, v3}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 225 + .line 240 :pswitch_5 - iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mRotationX:F + iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mScaleX:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z @@ -858,18 +819,18 @@ if-nez v1, :cond_0 - .line 226 + .line 241 iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mFramePosition:I - iget v3, p0, Landroid/support/constraint/motion/KeyAttributes;->mPivotX:F + iget v3, p0, Landroid/support/constraint/motion/KeyAttributes;->mScaleX:F invoke-virtual {v2, v1, v3}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 245 + .line 235 :pswitch_6 - iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mScaleY:F + iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mTransitionPathRotate:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z @@ -877,18 +838,18 @@ if-nez v1, :cond_0 - .line 246 + .line 236 iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mFramePosition:I - iget v3, p0, Landroid/support/constraint/motion/KeyAttributes;->mScaleY:F + iget v3, p0, Landroid/support/constraint/motion/KeyAttributes;->mTransitionPathRotate:F invoke-virtual {v2, v1, v3}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 240 + .line 230 :pswitch_7 - iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mScaleX:F + iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mRotationY:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z @@ -896,18 +857,18 @@ if-nez v1, :cond_0 - .line 241 + .line 231 iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mFramePosition:I - iget v3, p0, Landroid/support/constraint/motion/KeyAttributes;->mScaleX:F + iget v3, p0, Landroid/support/constraint/motion/KeyAttributes;->mPivotY:F invoke-virtual {v2, v1, v3}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 265 + .line 225 :pswitch_8 - iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mProgress:F + iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mRotationX:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z @@ -915,18 +876,18 @@ if-nez v1, :cond_0 - .line 266 + .line 226 iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mFramePosition:I - iget v3, p0, Landroid/support/constraint/motion/KeyAttributes;->mProgress:F + iget v3, p0, Landroid/support/constraint/motion/KeyAttributes;->mPivotX:F invoke-virtual {v2, v1, v3}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 260 + .line 220 :pswitch_9 - iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mTranslationZ:F + iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mRotationY:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z @@ -934,18 +895,18 @@ if-nez v1, :cond_0 - .line 261 + .line 221 iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mFramePosition:I - iget v3, p0, Landroid/support/constraint/motion/KeyAttributes;->mTranslationZ:F + iget v3, p0, Landroid/support/constraint/motion/KeyAttributes;->mRotationY:F invoke-virtual {v2, v1, v3}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 255 + .line 215 :pswitch_a - iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mTranslationY:F + iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mRotationX:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z @@ -953,18 +914,18 @@ if-nez v1, :cond_0 - .line 256 + .line 216 iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mFramePosition:I - iget v3, p0, Landroid/support/constraint/motion/KeyAttributes;->mTranslationY:F + iget v3, p0, Landroid/support/constraint/motion/KeyAttributes;->mRotationX:F invoke-virtual {v2, v1, v3}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 250 + .line 210 :pswitch_b - iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mTranslationX:F + iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mRotation:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z @@ -972,18 +933,18 @@ if-nez v1, :cond_0 - .line 251 + .line 211 iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mFramePosition:I - iget v3, p0, Landroid/support/constraint/motion/KeyAttributes;->mTranslationX:F + iget v3, p0, Landroid/support/constraint/motion/KeyAttributes;->mRotation:F invoke-virtual {v2, v1, v3}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 220 + .line 205 :pswitch_c - iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mRotationY:F + iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mElevation:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z @@ -991,18 +952,18 @@ if-nez v1, :cond_0 - .line 221 + .line 206 iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mFramePosition:I - iget v3, p0, Landroid/support/constraint/motion/KeyAttributes;->mRotationY:F + iget v3, p0, Landroid/support/constraint/motion/KeyAttributes;->mElevation:F invoke-virtual {v2, v1, v3}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 215 + .line 200 :pswitch_d - iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mRotationX:F + iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mAlpha:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z @@ -1010,16 +971,16 @@ if-nez v1, :cond_0 - .line 216 + .line 201 iget v1, p0, Landroid/support/constraint/motion/KeyAttributes;->mFramePosition:I - iget v3, p0, Landroid/support/constraint/motion/KeyAttributes;->mRotationX:F + iget v3, p0, Landroid/support/constraint/motion/KeyAttributes;->mAlpha:F invoke-virtual {v2, v1, v3}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - :cond_10 + :cond_3 return-void :sswitch_data_0 @@ -1740,17 +1701,13 @@ .end method .method public setValue(Ljava/lang/String;Ljava/lang/Object;)V - .locals 2 + .locals 1 .line 277 invoke-virtual {p1}, Ljava/lang/String;->hashCode()I - invoke-virtual {p1}, Ljava/lang/String;->hashCode()I - move-result v0 - const/4 v1, -0x1 - sparse-switch v0, :sswitch_data_0 goto/16 :goto_0 @@ -1762,14 +1719,11 @@ move-result p1 - if-nez p1, :cond_0 + if-eqz p1, :cond_0 - goto/16 :goto_0 - - :cond_0 - const/16 v1, 0x10 + const/16 p1, 0xc - goto/16 :goto_0 + goto/16 :goto_1 :sswitch_1 const-string v0, "mTranslationZ" @@ -1778,14 +1732,11 @@ move-result p1 - if-nez p1, :cond_1 - - goto/16 :goto_0 + if-eqz p1, :cond_0 - :cond_1 - const/16 v1, 0xf + const/16 p1, 0x10 - goto/16 :goto_0 + goto/16 :goto_1 :sswitch_2 const-string v0, "curveFit" @@ -1794,14 +1745,11 @@ move-result p1 - if-nez p1, :cond_2 - - goto/16 :goto_0 + if-eqz p1, :cond_0 - :cond_2 - const/16 v1, 0xe + const/4 p1, 0x1 - goto/16 :goto_0 + goto/16 :goto_1 :sswitch_3 const-string v0, "alpha" @@ -1810,14 +1758,11 @@ move-result p1 - if-nez p1, :cond_3 + if-eqz p1, :cond_0 - goto/16 :goto_0 + const/4 p1, 0x0 - :cond_3 - const/16 v1, 0xd - - goto/16 :goto_0 + goto/16 :goto_1 :sswitch_4 const-string v0, "transitionPathRotate" @@ -1826,14 +1771,11 @@ move-result p1 - if-nez p1, :cond_4 - - goto/16 :goto_0 + if-eqz p1, :cond_0 - :cond_4 - const/16 v1, 0xc + const/16 p1, 0xd - goto/16 :goto_0 + goto/16 :goto_1 :sswitch_5 const-string v0, "elevation" @@ -1842,14 +1784,11 @@ move-result p1 - if-nez p1, :cond_5 + if-eqz p1, :cond_0 - goto/16 :goto_0 + const/4 p1, 0x2 - :cond_5 - const/16 v1, 0xb - - goto/16 :goto_0 + goto/16 :goto_1 :sswitch_6 const-string v0, "rotation" @@ -1858,14 +1797,11 @@ move-result p1 - if-nez p1, :cond_6 - - goto/16 :goto_0 + if-eqz p1, :cond_0 - :cond_6 - const/16 v1, 0xa + const/4 p1, 0x4 - goto/16 :goto_0 + goto/16 :goto_1 :sswitch_7 const-string v0, "scaleY" @@ -1874,14 +1810,11 @@ move-result p1 - if-nez p1, :cond_7 + if-eqz p1, :cond_0 - goto/16 :goto_0 - - :cond_7 - const/16 v1, 0x9 + const/16 p1, 0xa - goto/16 :goto_0 + goto :goto_1 :sswitch_8 const-string v0, "scaleX" @@ -1890,14 +1823,11 @@ move-result p1 - if-nez p1, :cond_8 + if-eqz p1, :cond_0 - goto/16 :goto_0 + const/16 p1, 0x9 - :cond_8 - const/16 v1, 0x8 - - goto/16 :goto_0 + goto :goto_1 :sswitch_9 const-string v0, "pivotY" @@ -1906,14 +1836,11 @@ move-result p1 - if-nez p1, :cond_9 + if-eqz p1, :cond_0 - goto :goto_0 - - :cond_9 - const/4 v1, 0x7 + const/16 p1, 0x8 - goto :goto_0 + goto :goto_1 :sswitch_a const-string v0, "pivotX" @@ -1922,14 +1849,11 @@ move-result p1 - if-nez p1, :cond_a + if-eqz p1, :cond_0 - goto :goto_0 + const/4 p1, 0x7 - :cond_a - const/4 v1, 0x6 - - goto :goto_0 + goto :goto_1 :sswitch_b const-string v0, "translationY" @@ -1938,14 +1862,11 @@ move-result p1 - if-nez p1, :cond_b + if-eqz p1, :cond_0 - goto :goto_0 - - :cond_b - const/4 v1, 0x5 + const/16 p1, 0xf - goto :goto_0 + goto :goto_1 :sswitch_c const-string v0, "translationX" @@ -1954,14 +1875,11 @@ move-result p1 - if-nez p1, :cond_c - - goto :goto_0 + if-eqz p1, :cond_0 - :cond_c - const/4 v1, 0x4 + const/16 p1, 0xe - goto :goto_0 + goto :goto_1 :sswitch_d const-string v0, "rotationY" @@ -1970,14 +1888,11 @@ move-result p1 - if-nez p1, :cond_d + if-eqz p1, :cond_0 - goto :goto_0 - - :cond_d - const/4 v1, 0x3 + const/4 p1, 0x6 - goto :goto_0 + goto :goto_1 :sswitch_e const-string v0, "rotationX" @@ -1986,14 +1901,11 @@ move-result p1 - if-nez p1, :cond_e - - goto :goto_0 + if-eqz p1, :cond_0 - :cond_e - const/4 v1, 0x2 + const/4 p1, 0x5 - goto :goto_0 + goto :goto_1 :sswitch_f const-string v0, "transitionEasing" @@ -2002,14 +1914,11 @@ move-result p1 - if-nez p1, :cond_f - - goto :goto_0 + if-eqz p1, :cond_0 - :cond_f - const/4 v1, 0x1 + const/16 p1, 0xb - goto :goto_0 + goto :goto_1 :sswitch_10 const-string v0, "motionProgress" @@ -2018,187 +1927,190 @@ move-result p1 - if-nez p1, :cond_10 + if-eqz p1, :cond_0 - goto :goto_0 + const/4 p1, 0x3 - :cond_10 - const/4 v1, 0x0 + goto :goto_1 + :cond_0 :goto_0 - packed-switch v1, :pswitch_data_0 + const/4 p1, -0x1 - goto/16 :goto_1 + :goto_1 + packed-switch p1, :pswitch_data_0 - .line 315 + goto/16 :goto_2 + + .line 327 :pswitch_0 - invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyAttributes;->toBoolean(Ljava/lang/Object;)Z + invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyAttributes;->toFloat(Ljava/lang/Object;)F move-result p1 - iput-boolean p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mVisibility:Z + iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mTranslationZ:F - goto/16 :goto_1 + goto/16 :goto_2 - .line 327 + .line 324 :pswitch_1 invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyAttributes;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mTranslationZ:F + iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mTranslationY:F - goto/16 :goto_1 + goto/16 :goto_2 - .line 282 + .line 321 :pswitch_2 - invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyAttributes;->toInt(Ljava/lang/Object;)I + invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyAttributes;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mCurveFit:I + iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mTranslationX:F - goto :goto_1 + goto :goto_2 - .line 279 + .line 318 :pswitch_3 invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyAttributes;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mAlpha:F + iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mTransitionPathRotate:F - goto :goto_1 + goto :goto_2 - .line 318 + .line 315 :pswitch_4 - invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyAttributes;->toFloat(Ljava/lang/Object;)F + invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyAttributes;->toBoolean(Ljava/lang/Object;)Z move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mTransitionPathRotate:F + iput-boolean p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mVisibility:Z - goto :goto_1 + goto :goto_2 - .line 285 + .line 312 :pswitch_5 - invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyAttributes;->toFloat(Ljava/lang/Object;)F + invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String; - move-result p1 + move-result-object p1 - iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mElevation:F + iput-object p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mTransitionEasing:Ljava/lang/String; - goto :goto_1 + goto :goto_2 - .line 291 + .line 309 :pswitch_6 invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyAttributes;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mRotation:F + iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mScaleY:F - goto :goto_1 + goto :goto_2 - .line 309 + .line 306 :pswitch_7 invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyAttributes;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mScaleY:F + iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mScaleX:F - goto :goto_1 + goto :goto_2 - .line 306 + .line 303 :pswitch_8 invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyAttributes;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mScaleX:F + iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mPivotY:F - goto :goto_1 + goto :goto_2 - .line 303 + .line 300 :pswitch_9 invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyAttributes;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mPivotY:F + iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mPivotX:F - goto :goto_1 + goto :goto_2 - .line 300 + .line 297 :pswitch_a invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyAttributes;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mPivotX:F + iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mRotationY:F - goto :goto_1 + goto :goto_2 - .line 324 + .line 294 :pswitch_b invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyAttributes;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mTranslationY:F + iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mRotationX:F - goto :goto_1 + goto :goto_2 - .line 321 + .line 291 :pswitch_c invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyAttributes;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mTranslationX:F + iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mRotation:F - goto :goto_1 + goto :goto_2 - .line 297 + .line 288 :pswitch_d invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyAttributes;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mRotationY:F + iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mProgress:F - goto :goto_1 + goto :goto_2 - .line 294 + .line 285 :pswitch_e invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyAttributes;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mRotationX:F + iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mElevation:F - goto :goto_1 + goto :goto_2 - .line 312 + .line 282 :pswitch_f - invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String; + invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyAttributes;->toInt(Ljava/lang/Object;)I - move-result-object p1 + move-result p1 - iput-object p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mTransitionEasing:Ljava/lang/String; + iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mCurveFit:I - goto :goto_1 + goto :goto_2 - .line 288 + .line 279 :pswitch_10 invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyAttributes;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mProgress:F + iput p1, p0, Landroid/support/constraint/motion/KeyAttributes;->mAlpha:F - :goto_1 + :goto_2 return-void :sswitch_data_0 diff --git a/smali/android/support/constraint/motion/KeyCycle$Loader.smali b/smali/android/support/constraint/motion/KeyCycle$Loader.smali index 76ed49d5..5af4114c 100644 --- a/smali/android/support/constraint/motion/KeyCycle$Loader.smali +++ b/smali/android/support/constraint/motion/KeyCycle$Loader.smali @@ -70,6 +70,8 @@ sput-object v0, Landroid/support/constraint/motion/KeyCycle$Loader;->mAttrMap:Landroid/util/SparseIntArray; .line 238 + sget-object v0, Landroid/support/constraint/motion/KeyCycle$Loader;->mAttrMap:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->KeyCycle_motionTarget:I const/4 v2, 0x1 diff --git a/smali/android/support/constraint/motion/KeyCycle.smali b/smali/android/support/constraint/motion/KeyCycle.smali index 7fc0a3c8..a294657e 100644 --- a/smali/android/support/constraint/motion/KeyCycle.smali +++ b/smali/android/support/constraint/motion/KeyCycle.smali @@ -645,11 +645,11 @@ move-result-object v0 - const-string v1, "KeyCycle" + const/4 v1, 0x2 - const/4 v2, 0x2 + const-string v2, "KeyCycle" - invoke-static {v1, v0, v2}, Landroid/support/constraint/motion/Debug;->logStack(Ljava/lang/String;Ljava/lang/String;I)V + invoke-static {v2, v0, v1}, Landroid/support/constraint/motion/Debug;->logStack(Ljava/lang/String;Ljava/lang/String;I)V .line 166 invoke-virtual {p1}, Ljava/util/HashMap;->keySet()Ljava/util/Set; @@ -665,7 +665,7 @@ move-result v3 - if-eqz v3, :cond_d + if-eqz v3, :cond_1 invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object; @@ -680,11 +680,9 @@ check-cast v4, Landroid/support/constraint/motion/SplineSet; - .line 168 - invoke-virtual {v3}, Ljava/lang/String;->hashCode()I - const/4 v5, -0x1 + .line 168 invoke-virtual {v3}, Ljava/lang/String;->hashCode()I move-result v6 @@ -700,12 +698,9 @@ move-result v6 - if-nez v6, :cond_0 - - goto/16 :goto_1 + if-eqz v6, :cond_0 - :cond_0 - const/16 v5, 0xc + const/16 v5, 0xb goto/16 :goto_1 @@ -716,12 +711,9 @@ move-result v6 - if-nez v6, :cond_1 + if-eqz v6, :cond_0 - goto/16 :goto_1 - - :cond_1 - const/16 v5, 0xb + const/4 v5, 0x0 goto/16 :goto_1 @@ -732,12 +724,9 @@ move-result v6 - if-nez v6, :cond_2 - - goto/16 :goto_1 + if-eqz v6, :cond_0 - :cond_2 - const/16 v5, 0xa + const/4 v5, 0x5 goto/16 :goto_1 @@ -748,14 +737,11 @@ move-result v6 - if-nez v6, :cond_3 + if-eqz v6, :cond_0 - goto/16 :goto_1 - - :cond_3 - const/16 v5, 0x9 + const/4 v5, 0x1 - goto/16 :goto_1 + goto :goto_1 :sswitch_4 const-string v6, "rotation" @@ -764,14 +750,11 @@ move-result v6 - if-nez v6, :cond_4 - - goto/16 :goto_1 + if-eqz v6, :cond_0 - :cond_4 - const/16 v5, 0x8 + const/4 v5, 0x2 - goto/16 :goto_1 + goto :goto_1 :sswitch_5 const-string v6, "scaleY" @@ -780,11 +763,8 @@ move-result v6 - if-nez v6, :cond_5 - - goto :goto_1 + if-eqz v6, :cond_0 - :cond_5 const/4 v5, 0x7 goto :goto_1 @@ -796,11 +776,8 @@ move-result v6 - if-nez v6, :cond_6 - - goto :goto_1 + if-eqz v6, :cond_0 - :cond_6 const/4 v5, 0x6 goto :goto_1 @@ -812,12 +789,9 @@ move-result v6 - if-nez v6, :cond_7 - - goto :goto_1 + if-eqz v6, :cond_0 - :cond_7 - const/4 v5, 0x5 + const/16 v5, 0xc goto :goto_1 @@ -828,12 +802,9 @@ move-result v6 - if-nez v6, :cond_8 + if-eqz v6, :cond_0 - goto :goto_1 - - :cond_8 - const/4 v5, 0x4 + const/16 v5, 0xa goto :goto_1 @@ -844,12 +815,9 @@ move-result v6 - if-nez v6, :cond_9 - - goto :goto_1 + if-eqz v6, :cond_0 - :cond_9 - const/4 v5, 0x3 + const/16 v5, 0x9 goto :goto_1 @@ -860,12 +828,9 @@ move-result v6 - if-nez v6, :cond_a + if-eqz v6, :cond_0 - goto :goto_1 - - :cond_a - const/4 v5, 0x2 + const/16 v5, 0x8 goto :goto_1 @@ -876,12 +841,9 @@ move-result v6 - if-nez v6, :cond_b - - goto :goto_1 + if-eqz v6, :cond_0 - :cond_b - const/4 v5, 0x1 + const/4 v5, 0x4 goto :goto_1 @@ -892,13 +854,11 @@ move-result v6 - if-nez v6, :cond_c + if-eqz v6, :cond_0 - goto :goto_1 - - :cond_c - const/4 v5, 0x0 + const/4 v5, 0x3 + :cond_0 :goto_1 packed-switch v5, :pswitch_data_0 @@ -917,55 +877,55 @@ move-result-object v3 - invoke-static {v1, v3}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I + invoke-static {v2, v3}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I goto/16 :goto_0 - .line 203 + .line 206 :pswitch_0 iget v3, p0, Landroid/support/constraint/motion/KeyCycle;->mFramePosition:I - iget v5, p0, Landroid/support/constraint/motion/KeyCycle;->mWaveOffset:F + iget v5, p0, Landroid/support/constraint/motion/KeyCycle;->mProgress:F invoke-virtual {v4, v3, v5}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 170 + .line 203 :pswitch_1 iget v3, p0, Landroid/support/constraint/motion/KeyCycle;->mFramePosition:I - iget v5, p0, Landroid/support/constraint/motion/KeyCycle;->mAlpha:F + iget v5, p0, Landroid/support/constraint/motion/KeyCycle;->mWaveOffset:F invoke-virtual {v4, v3, v5}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 185 + .line 200 :pswitch_2 iget v3, p0, Landroid/support/constraint/motion/KeyCycle;->mFramePosition:I - iget v5, p0, Landroid/support/constraint/motion/KeyCycle;->mTransitionPathRotate:F + iget v5, p0, Landroid/support/constraint/motion/KeyCycle;->mTranslationZ:F invoke-virtual {v4, v3, v5}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 173 + .line 197 :pswitch_3 iget v3, p0, Landroid/support/constraint/motion/KeyCycle;->mFramePosition:I - iget v5, p0, Landroid/support/constraint/motion/KeyCycle;->mElevation:F + iget v5, p0, Landroid/support/constraint/motion/KeyCycle;->mTranslationY:F invoke-virtual {v4, v3, v5}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 176 + .line 194 :pswitch_4 iget v3, p0, Landroid/support/constraint/motion/KeyCycle;->mFramePosition:I - iget v5, p0, Landroid/support/constraint/motion/KeyCycle;->mRotation:F + iget v5, p0, Landroid/support/constraint/motion/KeyCycle;->mTranslationX:F invoke-virtual {v4, v3, v5}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V @@ -991,71 +951,69 @@ goto/16 :goto_0 - .line 206 + .line 185 :pswitch_7 iget v3, p0, Landroid/support/constraint/motion/KeyCycle;->mFramePosition:I - iget v5, p0, Landroid/support/constraint/motion/KeyCycle;->mProgress:F + iget v5, p0, Landroid/support/constraint/motion/KeyCycle;->mTransitionPathRotate:F invoke-virtual {v4, v3, v5}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 200 + .line 182 :pswitch_8 iget v3, p0, Landroid/support/constraint/motion/KeyCycle;->mFramePosition:I - iget v5, p0, Landroid/support/constraint/motion/KeyCycle;->mTranslationZ:F + iget v5, p0, Landroid/support/constraint/motion/KeyCycle;->mRotationY:F invoke-virtual {v4, v3, v5}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 197 + .line 179 :pswitch_9 iget v3, p0, Landroid/support/constraint/motion/KeyCycle;->mFramePosition:I - iget v5, p0, Landroid/support/constraint/motion/KeyCycle;->mTranslationY:F + iget v5, p0, Landroid/support/constraint/motion/KeyCycle;->mRotationX:F invoke-virtual {v4, v3, v5}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 194 + .line 176 :pswitch_a iget v3, p0, Landroid/support/constraint/motion/KeyCycle;->mFramePosition:I - iget v5, p0, Landroid/support/constraint/motion/KeyCycle;->mTranslationX:F + iget v5, p0, Landroid/support/constraint/motion/KeyCycle;->mRotation:F invoke-virtual {v4, v3, v5}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 182 + .line 173 :pswitch_b iget v3, p0, Landroid/support/constraint/motion/KeyCycle;->mFramePosition:I - iget v5, p0, Landroid/support/constraint/motion/KeyCycle;->mRotationY:F + iget v5, p0, Landroid/support/constraint/motion/KeyCycle;->mElevation:F invoke-virtual {v4, v3, v5}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 179 + .line 170 :pswitch_c iget v3, p0, Landroid/support/constraint/motion/KeyCycle;->mFramePosition:I - iget v5, p0, Landroid/support/constraint/motion/KeyCycle;->mRotationX:F + iget v5, p0, Landroid/support/constraint/motion/KeyCycle;->mAlpha:F invoke-virtual {v4, v3, v5}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - :cond_d + :cond_1 return-void - nop - :sswitch_data_0 .sparse-switch -0x4a771f66 -> :sswitch_c @@ -1329,12 +1287,8 @@ .line 130 invoke-virtual {p1}, Ljava/lang/String;->hashCode()I - invoke-virtual {p1}, Ljava/lang/String;->hashCode()I - move-result v0 - const/4 v1, -0x1 - sparse-switch v0, :sswitch_data_0 goto/16 :goto_0 @@ -1346,14 +1300,11 @@ move-result v0 - if-nez v0, :cond_0 + if-eqz v0, :cond_0 - goto/16 :goto_0 - - :cond_0 - const/16 v1, 0xc + const/16 v0, 0xb - goto/16 :goto_0 + goto/16 :goto_1 :sswitch_1 const-string v0, "alpha" @@ -1362,14 +1313,11 @@ move-result v0 - if-nez v0, :cond_1 - - goto/16 :goto_0 + if-eqz v0, :cond_0 - :cond_1 - const/16 v1, 0xb + const/4 v0, 0x0 - goto/16 :goto_0 + goto/16 :goto_1 :sswitch_2 const-string v0, "transitionPathRotate" @@ -1378,14 +1326,11 @@ move-result v0 - if-nez v0, :cond_2 + if-eqz v0, :cond_0 - goto/16 :goto_0 - - :cond_2 - const/16 v1, 0xa + const/4 v0, 0x5 - goto/16 :goto_0 + goto/16 :goto_1 :sswitch_3 const-string v0, "elevation" @@ -1394,14 +1339,11 @@ move-result v0 - if-nez v0, :cond_3 - - goto/16 :goto_0 + if-eqz v0, :cond_0 - :cond_3 - const/16 v1, 0x9 + const/4 v0, 0x1 - goto/16 :goto_0 + goto :goto_1 :sswitch_4 const-string v0, "rotation" @@ -1410,14 +1352,11 @@ move-result v0 - if-nez v0, :cond_4 + if-eqz v0, :cond_0 - goto/16 :goto_0 + const/4 v0, 0x2 - :cond_4 - const/16 v1, 0x8 - - goto/16 :goto_0 + goto :goto_1 :sswitch_5 const-string v0, "scaleY" @@ -1426,14 +1365,11 @@ move-result v0 - if-nez v0, :cond_5 - - goto :goto_0 + if-eqz v0, :cond_0 - :cond_5 - const/4 v1, 0x7 + const/4 v0, 0x7 - goto :goto_0 + goto :goto_1 :sswitch_6 const-string v0, "scaleX" @@ -1442,14 +1378,11 @@ move-result v0 - if-nez v0, :cond_6 + if-eqz v0, :cond_0 - goto :goto_0 + const/4 v0, 0x6 - :cond_6 - const/4 v1, 0x6 - - goto :goto_0 + goto :goto_1 :sswitch_7 const-string v0, "progress" @@ -1458,14 +1391,11 @@ move-result v0 - if-nez v0, :cond_7 - - goto :goto_0 + if-eqz v0, :cond_0 - :cond_7 - const/4 v1, 0x5 + const/16 v0, 0xc - goto :goto_0 + goto :goto_1 :sswitch_8 const-string v0, "translationZ" @@ -1474,14 +1404,11 @@ move-result v0 - if-nez v0, :cond_8 - - goto :goto_0 + if-eqz v0, :cond_0 - :cond_8 - const/4 v1, 0x4 + const/16 v0, 0xa - goto :goto_0 + goto :goto_1 :sswitch_9 const-string v0, "translationY" @@ -1490,14 +1417,11 @@ move-result v0 - if-nez v0, :cond_9 + if-eqz v0, :cond_0 - goto :goto_0 - - :cond_9 - const/4 v1, 0x3 + const/16 v0, 0x9 - goto :goto_0 + goto :goto_1 :sswitch_a const-string v0, "translationX" @@ -1506,14 +1430,11 @@ move-result v0 - if-nez v0, :cond_a - - goto :goto_0 + if-eqz v0, :cond_0 - :cond_a - const/4 v1, 0x2 + const/16 v0, 0x8 - goto :goto_0 + goto :goto_1 :sswitch_b const-string v0, "rotationY" @@ -1522,14 +1443,11 @@ move-result v0 - if-nez v0, :cond_b + if-eqz v0, :cond_0 - goto :goto_0 - - :cond_b - const/4 v1, 0x1 + const/4 v0, 0x4 - goto :goto_0 + goto :goto_1 :sswitch_c const-string v0, "rotationX" @@ -1538,15 +1456,18 @@ move-result v0 - if-nez v0, :cond_c + if-eqz v0, :cond_0 - goto :goto_0 + const/4 v0, 0x3 - :cond_c - const/4 v1, 0x0 + goto :goto_1 + :cond_0 :goto_0 - packed-switch v1, :pswitch_data_0 + const/4 v0, -0x1 + + :goto_1 + packed-switch v0, :pswitch_data_0 .line 158 new-instance v0, Ljava/lang/StringBuilder; @@ -1571,33 +1492,33 @@ return p1 - .line 154 + .line 156 :pswitch_0 - iget p1, p0, Landroid/support/constraint/motion/KeyCycle;->mWaveOffset:F + iget p1, p0, Landroid/support/constraint/motion/KeyCycle;->mProgress:F return p1 - .line 132 + .line 154 :pswitch_1 - iget p1, p0, Landroid/support/constraint/motion/KeyCycle;->mAlpha:F + iget p1, p0, Landroid/support/constraint/motion/KeyCycle;->mWaveOffset:F return p1 - .line 142 + .line 152 :pswitch_2 - iget p1, p0, Landroid/support/constraint/motion/KeyCycle;->mTransitionPathRotate:F + iget p1, p0, Landroid/support/constraint/motion/KeyCycle;->mTranslationZ:F return p1 - .line 134 + .line 150 :pswitch_3 - iget p1, p0, Landroid/support/constraint/motion/KeyCycle;->mElevation:F + iget p1, p0, Landroid/support/constraint/motion/KeyCycle;->mTranslationY:F return p1 - .line 136 + .line 148 :pswitch_4 - iget p1, p0, Landroid/support/constraint/motion/KeyCycle;->mRotation:F + iget p1, p0, Landroid/support/constraint/motion/KeyCycle;->mTranslationX:F return p1 @@ -1613,39 +1534,39 @@ return p1 - .line 156 + .line 142 :pswitch_7 - iget p1, p0, Landroid/support/constraint/motion/KeyCycle;->mProgress:F + iget p1, p0, Landroid/support/constraint/motion/KeyCycle;->mTransitionPathRotate:F return p1 - .line 152 + .line 140 :pswitch_8 - iget p1, p0, Landroid/support/constraint/motion/KeyCycle;->mTranslationZ:F + iget p1, p0, Landroid/support/constraint/motion/KeyCycle;->mRotationY:F return p1 - .line 150 + .line 138 :pswitch_9 - iget p1, p0, Landroid/support/constraint/motion/KeyCycle;->mTranslationY:F + iget p1, p0, Landroid/support/constraint/motion/KeyCycle;->mRotationX:F return p1 - .line 148 + .line 136 :pswitch_a - iget p1, p0, Landroid/support/constraint/motion/KeyCycle;->mTranslationX:F + iget p1, p0, Landroid/support/constraint/motion/KeyCycle;->mRotation:F return p1 - .line 140 + .line 134 :pswitch_b - iget p1, p0, Landroid/support/constraint/motion/KeyCycle;->mRotationY:F + iget p1, p0, Landroid/support/constraint/motion/KeyCycle;->mElevation:F return p1 - .line 138 + .line 132 :pswitch_c - iget p1, p0, Landroid/support/constraint/motion/KeyCycle;->mRotationX:F + iget p1, p0, Landroid/support/constraint/motion/KeyCycle;->mAlpha:F return p1 @@ -1703,17 +1624,13 @@ .end method .method public setValue(Ljava/lang/String;Ljava/lang/Object;)V - .locals 2 + .locals 1 .line 353 invoke-virtual {p1}, Ljava/lang/String;->hashCode()I - invoke-virtual {p1}, Ljava/lang/String;->hashCode()I - move-result v0 - const/4 v1, -0x1 - sparse-switch v0, :sswitch_data_0 goto/16 :goto_0 @@ -1725,14 +1642,11 @@ move-result p1 - if-nez p1, :cond_0 + if-eqz p1, :cond_0 - goto/16 :goto_0 + const/16 p1, 0xd - :cond_0 - const/16 v1, 0xf - - goto/16 :goto_0 + goto/16 :goto_1 :sswitch_1 const-string v0, "curveFit" @@ -1741,14 +1655,11 @@ move-result p1 - if-nez p1, :cond_1 + if-eqz p1, :cond_0 - goto/16 :goto_0 - - :cond_1 - const/16 v1, 0xe + const/4 p1, 0x1 - goto/16 :goto_0 + goto/16 :goto_1 :sswitch_2 const-string v0, "wavePeriod" @@ -1757,14 +1668,11 @@ move-result p1 - if-nez p1, :cond_2 - - goto/16 :goto_0 + if-eqz p1, :cond_0 - :cond_2 - const/16 v1, 0xd + const/16 p1, 0xe - goto/16 :goto_0 + goto/16 :goto_1 :sswitch_3 const-string v0, "waveOffset" @@ -1773,14 +1681,11 @@ move-result p1 - if-nez p1, :cond_3 + if-eqz p1, :cond_0 - goto/16 :goto_0 - - :cond_3 - const/16 v1, 0xc + const/16 p1, 0xf - goto/16 :goto_0 + goto/16 :goto_1 :sswitch_4 const-string v0, "alpha" @@ -1789,14 +1694,11 @@ move-result p1 - if-nez p1, :cond_4 - - goto/16 :goto_0 + if-eqz p1, :cond_0 - :cond_4 - const/16 v1, 0xb + const/4 p1, 0x0 - goto/16 :goto_0 + goto/16 :goto_1 :sswitch_5 const-string v0, "transitionPathRotate" @@ -1805,14 +1707,11 @@ move-result p1 - if-nez p1, :cond_5 - - goto/16 :goto_0 + if-eqz p1, :cond_0 - :cond_5 - const/16 v1, 0xa + const/16 p1, 0xa - goto/16 :goto_0 + goto/16 :goto_1 :sswitch_6 const-string v0, "elevation" @@ -1821,14 +1720,11 @@ move-result p1 - if-nez p1, :cond_6 + if-eqz p1, :cond_0 - goto/16 :goto_0 + const/4 p1, 0x2 - :cond_6 - const/16 v1, 0x9 - - goto/16 :goto_0 + goto :goto_1 :sswitch_7 const-string v0, "rotation" @@ -1837,14 +1733,11 @@ move-result p1 - if-nez p1, :cond_7 - - goto/16 :goto_0 + if-eqz p1, :cond_0 - :cond_7 - const/16 v1, 0x8 + const/4 p1, 0x4 - goto/16 :goto_0 + goto :goto_1 :sswitch_8 const-string v0, "scaleY" @@ -1853,14 +1746,11 @@ move-result p1 - if-nez p1, :cond_8 + if-eqz p1, :cond_0 - goto :goto_0 + const/16 p1, 0x8 - :cond_8 - const/4 v1, 0x7 - - goto :goto_0 + goto :goto_1 :sswitch_9 const-string v0, "scaleX" @@ -1869,14 +1759,11 @@ move-result p1 - if-nez p1, :cond_9 - - goto :goto_0 + if-eqz p1, :cond_0 - :cond_9 - const/4 v1, 0x6 + const/4 p1, 0x7 - goto :goto_0 + goto :goto_1 :sswitch_a const-string v0, "progress" @@ -1885,14 +1772,11 @@ move-result p1 - if-nez p1, :cond_a + if-eqz p1, :cond_0 - goto :goto_0 - - :cond_a - const/4 v1, 0x5 + const/4 p1, 0x3 - goto :goto_0 + goto :goto_1 :sswitch_b const-string v0, "translationY" @@ -1901,14 +1785,11 @@ move-result p1 - if-nez p1, :cond_b + if-eqz p1, :cond_0 - goto :goto_0 + const/16 p1, 0xc - :cond_b - const/4 v1, 0x4 - - goto :goto_0 + goto :goto_1 :sswitch_c const-string v0, "translationX" @@ -1917,14 +1798,11 @@ move-result p1 - if-nez p1, :cond_c + if-eqz p1, :cond_0 - goto :goto_0 - - :cond_c - const/4 v1, 0x3 + const/16 p1, 0xb - goto :goto_0 + goto :goto_1 :sswitch_d const-string v0, "rotationY" @@ -1933,14 +1811,11 @@ move-result p1 - if-nez p1, :cond_d - - goto :goto_0 + if-eqz p1, :cond_0 - :cond_d - const/4 v1, 0x2 + const/4 p1, 0x6 - goto :goto_0 + goto :goto_1 :sswitch_e const-string v0, "rotationX" @@ -1949,14 +1824,11 @@ move-result p1 - if-nez p1, :cond_e + if-eqz p1, :cond_0 - goto :goto_0 + const/4 p1, 0x5 - :cond_e - const/4 v1, 0x1 - - goto :goto_0 + goto :goto_1 :sswitch_f const-string v0, "transitionEasing" @@ -1965,67 +1837,70 @@ move-result p1 - if-nez p1, :cond_f + if-eqz p1, :cond_0 - goto :goto_0 + const/16 p1, 0x9 - :cond_f - const/4 v1, 0x0 + goto :goto_1 + :cond_0 :goto_0 - packed-switch v1, :pswitch_data_0 + const/4 p1, -0x1 - goto/16 :goto_1 + :goto_1 + packed-switch p1, :pswitch_data_0 - .line 394 + goto/16 :goto_2 + + .line 400 :pswitch_0 invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyCycle;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyCycle;->mTranslationZ:F + iput p1, p0, Landroid/support/constraint/motion/KeyCycle;->mWaveOffset:F - goto/16 :goto_1 + goto/16 :goto_2 - .line 358 + .line 397 :pswitch_1 - invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyCycle;->toInt(Ljava/lang/Object;)I + invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyCycle;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyCycle;->mCurveFit:I + iput p1, p0, Landroid/support/constraint/motion/KeyCycle;->mWavePeriod:F - goto :goto_1 + goto :goto_2 - .line 397 + .line 394 :pswitch_2 invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyCycle;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyCycle;->mWavePeriod:F + iput p1, p0, Landroid/support/constraint/motion/KeyCycle;->mTranslationZ:F - goto :goto_1 + goto :goto_2 - .line 400 + .line 391 :pswitch_3 invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyCycle;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyCycle;->mWaveOffset:F + iput p1, p0, Landroid/support/constraint/motion/KeyCycle;->mTranslationY:F - goto :goto_1 + goto :goto_2 - .line 355 + .line 388 :pswitch_4 invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyCycle;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyCycle;->mAlpha:F + iput p1, p0, Landroid/support/constraint/motion/KeyCycle;->mTranslationX:F - goto :goto_1 + goto :goto_2 .line 385 :pswitch_5 @@ -2035,107 +1910,107 @@ iput p1, p0, Landroid/support/constraint/motion/KeyCycle;->mTransitionPathRotate:F - goto :goto_1 + goto :goto_2 - .line 361 + .line 382 :pswitch_6 - invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyCycle;->toFloat(Ljava/lang/Object;)F + invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String; - move-result p1 + move-result-object p1 - iput p1, p0, Landroid/support/constraint/motion/KeyCycle;->mElevation:F + iput-object p1, p0, Landroid/support/constraint/motion/KeyCycle;->mTransitionEasing:Ljava/lang/String; - goto :goto_1 + goto :goto_2 - .line 367 + .line 379 :pswitch_7 invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyCycle;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyCycle;->mRotation:F + iput p1, p0, Landroid/support/constraint/motion/KeyCycle;->mScaleY:F - goto :goto_1 + goto :goto_2 - .line 379 + .line 376 :pswitch_8 invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyCycle;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyCycle;->mScaleY:F + iput p1, p0, Landroid/support/constraint/motion/KeyCycle;->mScaleX:F - goto :goto_1 + goto :goto_2 - .line 376 + .line 373 :pswitch_9 invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyCycle;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyCycle;->mScaleX:F + iput p1, p0, Landroid/support/constraint/motion/KeyCycle;->mRotationY:F - goto :goto_1 + goto :goto_2 - .line 364 + .line 370 :pswitch_a invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyCycle;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyCycle;->mProgress:F + iput p1, p0, Landroid/support/constraint/motion/KeyCycle;->mRotationX:F - goto :goto_1 + goto :goto_2 - .line 391 + .line 367 :pswitch_b invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyCycle;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyCycle;->mTranslationY:F + iput p1, p0, Landroid/support/constraint/motion/KeyCycle;->mRotation:F - goto :goto_1 + goto :goto_2 - .line 388 + .line 364 :pswitch_c invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyCycle;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyCycle;->mTranslationX:F + iput p1, p0, Landroid/support/constraint/motion/KeyCycle;->mProgress:F - goto :goto_1 + goto :goto_2 - .line 373 + .line 361 :pswitch_d invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyCycle;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyCycle;->mRotationY:F + iput p1, p0, Landroid/support/constraint/motion/KeyCycle;->mElevation:F - goto :goto_1 + goto :goto_2 - .line 370 + .line 358 :pswitch_e - invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyCycle;->toFloat(Ljava/lang/Object;)F + invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyCycle;->toInt(Ljava/lang/Object;)I move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyCycle;->mRotationX:F + iput p1, p0, Landroid/support/constraint/motion/KeyCycle;->mCurveFit:I - goto :goto_1 + goto :goto_2 - .line 382 + .line 355 :pswitch_f - invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String; + invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyCycle;->toFloat(Ljava/lang/Object;)F - move-result-object p1 + move-result p1 - iput-object p1, p0, Landroid/support/constraint/motion/KeyCycle;->mTransitionEasing:Ljava/lang/String; + iput p1, p0, Landroid/support/constraint/motion/KeyCycle;->mAlpha:F - :goto_1 + :goto_2 return-void :sswitch_data_0 diff --git a/smali/android/support/constraint/motion/KeyCycleOscillator$CustomSet.smali b/smali/android/support/constraint/motion/KeyCycleOscillator$CustomSet.smali index 8d97930e..84f61e9b 100644 --- a/smali/android/support/constraint/motion/KeyCycleOscillator$CustomSet.smali +++ b/smali/android/support/constraint/motion/KeyCycleOscillator$CustomSet.smali @@ -27,9 +27,9 @@ const/4 v0, 0x1 + .line 283 new-array v0, v0, [F - .line 283 iput-object v0, p0, Landroid/support/constraint/motion/KeyCycleOscillator$CustomSet;->value:[F return-void diff --git a/smali/android/support/constraint/motion/KeyCycleOscillator$CycleOscillator.smali b/smali/android/support/constraint/motion/KeyCycleOscillator$CycleOscillator.smali index a2315292..b1252bd6 100644 --- a/smali/android/support/constraint/motion/KeyCycleOscillator$CycleOscillator.smali +++ b/smali/android/support/constraint/motion/KeyCycleOscillator$CycleOscillator.smali @@ -391,109 +391,107 @@ const/4 v0, 0x2 - new-array v1, v0, [I + filled-new-array {p1, v0}, [I - const/4 v2, 0x1 - - aput v0, v1, v2 - - const/4 v0, 0x0 - - aput p1, v1, v0 + move-result-object p1 - sget-object p1, Ljava/lang/Double;->TYPE:Ljava/lang/Class; + const-class v0, D - invoke-static {p1, v1}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;[I)Ljava/lang/Object; + invoke-static {v0, p1}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;[I)Ljava/lang/Object; move-result-object p1 check-cast p1, [[D .line 495 - iget-object v1, p0, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator;->mValues:[F + iget-object v0, p0, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator;->mValues:[F - array-length v3, v1 + array-length v1, v0 - add-int/2addr v3, v2 + const/4 v2, 0x1 - new-array v3, v3, [D + add-int/2addr v1, v2 - iput-object v3, p0, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator;->mSplineValueCache:[D + new-array v1, v1, [D + + iput-object v1, p0, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator;->mSplineValueCache:[D .line 496 - array-length v1, v1 + array-length v0, v0 - add-int/2addr v1, v2 + add-int/2addr v0, v2 - new-array v1, v1, [D + new-array v0, v0, [D - iput-object v1, p0, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator;->mSplineSlopeCache:[D + iput-object v0, p0, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator;->mSplineSlopeCache:[D .line 497 - iget-object v1, p0, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator;->mPosition:[D + iget-object v0, p0, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator;->mPosition:[D + + const/4 v1, 0x0 - aget-wide v3, v1, v0 + aget-wide v3, v0, v1 const-wide/16 v5, 0x0 - cmpl-double v1, v3, v5 + cmpl-double v0, v3, v5 - if-lez v1, :cond_0 + if-lez v0, :cond_0 .line 498 - iget-object v1, p0, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator;->mOscillator:Landroid/support/constraint/motion/utils/Oscillator; + iget-object v0, p0, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator;->mOscillator:Landroid/support/constraint/motion/utils/Oscillator; iget-object v3, p0, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator;->mPeriod:[F - aget v3, v3, v0 + aget v3, v3, v1 - invoke-virtual {v1, v5, v6, v3}, Landroid/support/constraint/motion/utils/Oscillator;->addPoint(DF)V + invoke-virtual {v0, v5, v6, v3}, Landroid/support/constraint/motion/utils/Oscillator;->addPoint(DF)V .line 500 :cond_0 - iget-object v1, p0, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator;->mPosition:[D + iget-object v0, p0, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator;->mPosition:[D - array-length v3, v1 + array-length v3, v0 sub-int/2addr v3, v2 .line 501 - aget-wide v4, v1, v3 + aget-wide v4, v0, v3 const-wide/high16 v6, 0x3ff0000000000000L # 1.0 - cmpg-double v1, v4, v6 + cmpg-double v0, v4, v6 - if-gez v1, :cond_1 + if-gez v0, :cond_1 .line 502 - iget-object v1, p0, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator;->mOscillator:Landroid/support/constraint/motion/utils/Oscillator; + iget-object v0, p0, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator;->mOscillator:Landroid/support/constraint/motion/utils/Oscillator; iget-object v4, p0, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator;->mPeriod:[F aget v3, v4, v3 - invoke-virtual {v1, v6, v7, v3}, Landroid/support/constraint/motion/utils/Oscillator;->addPoint(DF)V + invoke-virtual {v0, v6, v7, v3}, Landroid/support/constraint/motion/utils/Oscillator;->addPoint(DF)V :cond_1 - const/4 v1, 0x0 + const/4 v0, 0x0 .line 504 :goto_0 array-length v3, p1 - if-ge v1, v3, :cond_3 + if-ge v0, v3, :cond_3 .line 505 - aget-object v3, p1, v1 + aget-object v3, p1, v0 iget-object v4, p0, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator;->mOffset:[F - aget v4, v4, v1 + aget v4, v4, v0 float-to-double v4, v4 - aput-wide v4, v3, v0 + aput-wide v4, v3, v1 const/4 v3, 0x0 @@ -524,33 +522,33 @@ iget-object v4, p0, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator;->mPosition:[D - aget-wide v5, v4, v1 + aget-wide v5, v4, v0 iget-object v4, p0, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator;->mPeriod:[F - aget v4, v4, v1 + aget v4, v4, v0 invoke-virtual {v3, v5, v6, v4}, Landroid/support/constraint/motion/utils/Oscillator;->addPoint(DF)V - add-int/lit8 v1, v1, 0x1 + add-int/lit8 v0, v0, 0x1 goto :goto_0 .line 512 :cond_3 - iget-object v1, p0, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator;->mOscillator:Landroid/support/constraint/motion/utils/Oscillator; + iget-object v0, p0, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator;->mOscillator:Landroid/support/constraint/motion/utils/Oscillator; - invoke-virtual {v1}, Landroid/support/constraint/motion/utils/Oscillator;->normalize()V + invoke-virtual {v0}, Landroid/support/constraint/motion/utils/Oscillator;->normalize()V .line 513 - iget-object v1, p0, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator;->mPosition:[D + iget-object v0, p0, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator;->mPosition:[D - array-length v3, v1 + array-length v3, v0 if-le v3, v2, :cond_4 .line 514 - invoke-static {v0, v1, p1}, Landroid/support/constraint/motion/utils/CurveFit;->get(I[D[[D)Landroid/support/constraint/motion/utils/CurveFit; + invoke-static {v1, v0, p1}, Landroid/support/constraint/motion/utils/CurveFit;->get(I[D[[D)Landroid/support/constraint/motion/utils/CurveFit; move-result-object p1 diff --git a/smali/android/support/constraint/motion/KeyCycleOscillator$ProgressSet.smali b/smali/android/support/constraint/motion/KeyCycleOscillator$ProgressSet.smali index 6c80efbb..fb7fd8a8 100644 --- a/smali/android/support/constraint/motion/KeyCycleOscillator$ProgressSet.smali +++ b/smali/android/support/constraint/motion/KeyCycleOscillator$ProgressSet.smali @@ -102,10 +102,10 @@ :goto_0 if-eqz v2, :cond_2 + .line 311 :try_start_1 new-array v4, v4, [Ljava/lang/Object; - .line 311 invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyCycleOscillator$ProgressSet;->get(F)F move-result p2 diff --git a/smali/android/support/constraint/motion/KeyCycleOscillator.smali b/smali/android/support/constraint/motion/KeyCycleOscillator.smali index 781e04f5..4ddbf100 100644 --- a/smali/android/support/constraint/motion/KeyCycleOscillator.smali +++ b/smali/android/support/constraint/motion/KeyCycleOscillator.smali @@ -99,12 +99,10 @@ return-object p0 - .line 100 :cond_0 - invoke-virtual {p0}, Ljava/lang/String;->hashCode()I - const/4 v0, -0x1 + .line 100 invoke-virtual {p0}, Ljava/lang/String;->hashCode()I move-result v1 @@ -120,12 +118,9 @@ move-result p0 - if-nez p0, :cond_1 - - goto/16 :goto_0 + if-eqz p0, :cond_1 - :cond_1 - const/16 v0, 0xd + const/16 v0, 0x8 goto/16 :goto_0 @@ -136,12 +131,9 @@ move-result p0 - if-nez p0, :cond_2 + if-eqz p0, :cond_1 - goto/16 :goto_0 - - :cond_2 - const/16 v0, 0xc + const/4 v0, 0x0 goto/16 :goto_0 @@ -152,12 +144,9 @@ move-result p0 - if-nez p0, :cond_3 - - goto/16 :goto_0 + if-eqz p0, :cond_1 - :cond_3 - const/16 v0, 0xb + const/4 v0, 0x5 goto/16 :goto_0 @@ -168,12 +157,9 @@ move-result p0 - if-nez p0, :cond_4 - - goto/16 :goto_0 + if-eqz p0, :cond_1 - :cond_4 - const/16 v0, 0xa + const/4 v0, 0x1 goto/16 :goto_0 @@ -184,14 +170,11 @@ move-result p0 - if-nez p0, :cond_5 + if-eqz p0, :cond_1 - goto/16 :goto_0 - - :cond_5 - const/16 v0, 0x9 + const/4 v0, 0x2 - goto/16 :goto_0 + goto :goto_0 :sswitch_5 const-string v1, "waveVariesBy" @@ -200,14 +183,11 @@ move-result p0 - if-nez p0, :cond_6 - - goto/16 :goto_0 + if-eqz p0, :cond_1 - :cond_6 - const/16 v0, 0x8 + const/16 v0, 0x9 - goto/16 :goto_0 + goto :goto_0 :sswitch_6 const-string v1, "scaleY" @@ -216,11 +196,8 @@ move-result p0 - if-nez p0, :cond_7 + if-eqz p0, :cond_1 - goto :goto_0 - - :cond_7 const/4 v0, 0x7 goto :goto_0 @@ -232,11 +209,8 @@ move-result p0 - if-nez p0, :cond_8 - - goto :goto_0 + if-eqz p0, :cond_1 - :cond_8 const/4 v0, 0x6 goto :goto_0 @@ -248,12 +222,9 @@ move-result p0 - if-nez p0, :cond_9 + if-eqz p0, :cond_1 - goto :goto_0 - - :cond_9 - const/4 v0, 0x5 + const/16 v0, 0xd goto :goto_0 @@ -264,12 +235,9 @@ move-result p0 - if-nez p0, :cond_a + if-eqz p0, :cond_1 - goto :goto_0 - - :cond_a - const/4 v0, 0x4 + const/16 v0, 0xc goto :goto_0 @@ -280,12 +248,9 @@ move-result p0 - if-nez p0, :cond_b - - goto :goto_0 + if-eqz p0, :cond_1 - :cond_b - const/4 v0, 0x3 + const/16 v0, 0xb goto :goto_0 @@ -296,12 +261,9 @@ move-result p0 - if-nez p0, :cond_c - - goto :goto_0 + if-eqz p0, :cond_1 - :cond_c - const/4 v0, 0x2 + const/16 v0, 0xa goto :goto_0 @@ -312,12 +274,9 @@ move-result p0 - if-nez p0, :cond_d - - goto :goto_0 + if-eqz p0, :cond_1 - :cond_d - const/4 v0, 0x1 + const/4 v0, 0x4 goto :goto_0 @@ -328,13 +287,11 @@ move-result p0 - if-nez p0, :cond_e + if-eqz p0, :cond_1 - goto :goto_0 - - :cond_e - const/4 v0, 0x0 + const/4 v0, 0x3 + :cond_1 :goto_0 packed-switch v0, :pswitch_data_0 @@ -342,47 +299,47 @@ return-object p0 - .line 118 + .line 128 :pswitch_0 - new-instance p0, Landroid/support/constraint/motion/KeyCycleOscillator$AlphaSet; + new-instance p0, Landroid/support/constraint/motion/KeyCycleOscillator$ProgressSet; - invoke-direct {p0}, Landroid/support/constraint/motion/KeyCycleOscillator$AlphaSet;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/KeyCycleOscillator$ProgressSet;->()V return-object p0 - .line 102 + .line 126 :pswitch_1 - new-instance p0, Landroid/support/constraint/motion/KeyCycleOscillator$AlphaSet; + new-instance p0, Landroid/support/constraint/motion/KeyCycleOscillator$TranslationZset; - invoke-direct {p0}, Landroid/support/constraint/motion/KeyCycleOscillator$AlphaSet;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/KeyCycleOscillator$TranslationZset;->()V return-object p0 - .line 112 + .line 124 :pswitch_2 - new-instance p0, Landroid/support/constraint/motion/KeyCycleOscillator$PathRotateSet; + new-instance p0, Landroid/support/constraint/motion/KeyCycleOscillator$TranslationYset; - invoke-direct {p0}, Landroid/support/constraint/motion/KeyCycleOscillator$PathRotateSet;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/KeyCycleOscillator$TranslationYset;->()V return-object p0 - .line 104 + .line 122 :pswitch_3 - new-instance p0, Landroid/support/constraint/motion/KeyCycleOscillator$ElevationSet; + new-instance p0, Landroid/support/constraint/motion/KeyCycleOscillator$TranslationXset; - invoke-direct {p0}, Landroid/support/constraint/motion/KeyCycleOscillator$ElevationSet;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/KeyCycleOscillator$TranslationXset;->()V return-object p0 - .line 106 + .line 120 :pswitch_4 - new-instance p0, Landroid/support/constraint/motion/KeyCycleOscillator$RotationSet; + new-instance p0, Landroid/support/constraint/motion/KeyCycleOscillator$AlphaSet; - invoke-direct {p0}, Landroid/support/constraint/motion/KeyCycleOscillator$RotationSet;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/KeyCycleOscillator$AlphaSet;->()V return-object p0 - .line 120 + .line 118 :pswitch_5 new-instance p0, Landroid/support/constraint/motion/KeyCycleOscillator$AlphaSet; @@ -406,56 +363,54 @@ return-object p0 - .line 128 + .line 112 :pswitch_8 - new-instance p0, Landroid/support/constraint/motion/KeyCycleOscillator$ProgressSet; + new-instance p0, Landroid/support/constraint/motion/KeyCycleOscillator$PathRotateSet; - invoke-direct {p0}, Landroid/support/constraint/motion/KeyCycleOscillator$ProgressSet;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/KeyCycleOscillator$PathRotateSet;->()V return-object p0 - .line 126 + .line 110 :pswitch_9 - new-instance p0, Landroid/support/constraint/motion/KeyCycleOscillator$TranslationZset; + new-instance p0, Landroid/support/constraint/motion/KeyCycleOscillator$RotationYset; - invoke-direct {p0}, Landroid/support/constraint/motion/KeyCycleOscillator$TranslationZset;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/KeyCycleOscillator$RotationYset;->()V return-object p0 - .line 124 + .line 108 :pswitch_a - new-instance p0, Landroid/support/constraint/motion/KeyCycleOscillator$TranslationYset; + new-instance p0, Landroid/support/constraint/motion/KeyCycleOscillator$RotationXset; - invoke-direct {p0}, Landroid/support/constraint/motion/KeyCycleOscillator$TranslationYset;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/KeyCycleOscillator$RotationXset;->()V return-object p0 - .line 122 + .line 106 :pswitch_b - new-instance p0, Landroid/support/constraint/motion/KeyCycleOscillator$TranslationXset; + new-instance p0, Landroid/support/constraint/motion/KeyCycleOscillator$RotationSet; - invoke-direct {p0}, Landroid/support/constraint/motion/KeyCycleOscillator$TranslationXset;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/KeyCycleOscillator$RotationSet;->()V return-object p0 - .line 110 + .line 104 :pswitch_c - new-instance p0, Landroid/support/constraint/motion/KeyCycleOscillator$RotationYset; + new-instance p0, Landroid/support/constraint/motion/KeyCycleOscillator$ElevationSet; - invoke-direct {p0}, Landroid/support/constraint/motion/KeyCycleOscillator$RotationYset;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/KeyCycleOscillator$ElevationSet;->()V return-object p0 - .line 108 + .line 102 :pswitch_d - new-instance p0, Landroid/support/constraint/motion/KeyCycleOscillator$RotationXset; + new-instance p0, Landroid/support/constraint/motion/KeyCycleOscillator$AlphaSet; - invoke-direct {p0}, Landroid/support/constraint/motion/KeyCycleOscillator$RotationXset;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/KeyCycleOscillator$AlphaSet;->()V return-object p0 - nop - :sswitch_data_0 .sparse-switch -0x4a771f66 -> :sswitch_d @@ -603,6 +558,9 @@ .method public setup(F)V .locals 12 + .annotation build Landroid/annotation/TargetApi; + value = 0x13 + .end annotation .line 173 iget-object v0, p0, Landroid/support/constraint/motion/KeyCycleOscillator;->mWavePoints:Ljava/util/ArrayList; @@ -630,35 +588,29 @@ const/4 v2, 0x2 - new-array v3, v2, [I - - const/4 v4, 0x1 - - aput v2, v3, v4 - - const/4 v2, 0x0 + .line 184 + filled-new-array {v0, v2}, [I - aput v0, v3, v2 + move-result-object v2 - .line 184 - sget-object v5, Ljava/lang/Double;->TYPE:Ljava/lang/Class; + const-class v3, D - invoke-static {v5, v3}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;[I)Ljava/lang/Object; + invoke-static {v3, v2}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;[I)Ljava/lang/Object; - move-result-object v3 + move-result-object v2 - check-cast v3, [[D + check-cast v2, [[D .line 185 - new-instance v5, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator; + new-instance v3, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator; - iget v6, p0, Landroid/support/constraint/motion/KeyCycleOscillator;->mWaveShape:I + iget v4, p0, Landroid/support/constraint/motion/KeyCycleOscillator;->mWaveShape:I - iget v7, p0, Landroid/support/constraint/motion/KeyCycleOscillator;->mVariesBy:I + iget v5, p0, Landroid/support/constraint/motion/KeyCycleOscillator;->mVariesBy:I - invoke-direct {v5, v6, v7, v0}, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator;->(III)V + invoke-direct {v3, v4, v5, v0}, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator;->(III)V - iput-object v5, p0, Landroid/support/constraint/motion/KeyCycleOscillator;->mCycleOscillator:Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator; + iput-object v3, p0, Landroid/support/constraint/motion/KeyCycleOscillator;->mCycleOscillator:Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator; .line 187 iget-object v0, p0, Landroid/support/constraint/motion/KeyCycleOscillator;->mWavePoints:Ljava/util/ArrayList; @@ -667,70 +619,74 @@ move-result-object v0 - const/4 v11, 0x0 + const/4 v3, 0x0 + + const/4 v10, 0x0 :goto_0 invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z - move-result v5 + move-result v4 - if-eqz v5, :cond_1 + if-eqz v4, :cond_1 invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object; - move-result-object v5 + move-result-object v4 - check-cast v5, Landroid/support/constraint/motion/KeyCycleOscillator$WavePoint; + check-cast v4, Landroid/support/constraint/motion/KeyCycleOscillator$WavePoint; .line 188 - iget v6, v5, Landroid/support/constraint/motion/KeyCycleOscillator$WavePoint;->mPeriod:F + iget v5, v4, Landroid/support/constraint/motion/KeyCycleOscillator$WavePoint;->mPeriod:F - float-to-double v6, v6 + float-to-double v5, v5 - const-wide v8, 0x3f847ae147ae147bL # 0.01 + const-wide v7, 0x3f847ae147ae147bL # 0.01 - invoke-static {v6, v7}, Ljava/lang/Double;->isNaN(D)Z + invoke-static {v5, v6}, Ljava/lang/Double;->isNaN(D)Z - mul-double v6, v6, v8 + mul-double v5, v5, v7 - aput-wide v6, v1, v11 + aput-wide v5, v1, v10 .line 189 - aget-object v6, v3, v11 + aget-object v5, v2, v10 - iget v7, v5, Landroid/support/constraint/motion/KeyCycleOscillator$WavePoint;->mValue:F + iget v6, v4, Landroid/support/constraint/motion/KeyCycleOscillator$WavePoint;->mValue:F - float-to-double v7, v7 + float-to-double v6, v6 - aput-wide v7, v6, v2 + aput-wide v6, v5, v3 .line 190 - aget-object v6, v3, v11 + aget-object v5, v2, v10 - iget v7, v5, Landroid/support/constraint/motion/KeyCycleOscillator$WavePoint;->mOffset:F + iget v6, v4, Landroid/support/constraint/motion/KeyCycleOscillator$WavePoint;->mOffset:F + + float-to-double v6, v6 - float-to-double v7, v7 + const/4 v11, 0x1 - aput-wide v7, v6, v4 + aput-wide v6, v5, v11 .line 191 - iget-object v6, p0, Landroid/support/constraint/motion/KeyCycleOscillator;->mCycleOscillator:Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator; + iget-object v5, p0, Landroid/support/constraint/motion/KeyCycleOscillator;->mCycleOscillator:Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator; - iget v7, v5, Landroid/support/constraint/motion/KeyCycleOscillator$WavePoint;->mPosition:I + iget v6, v4, Landroid/support/constraint/motion/KeyCycleOscillator$WavePoint;->mPosition:I - iget v8, v5, Landroid/support/constraint/motion/KeyCycleOscillator$WavePoint;->mPeriod:F + iget v7, v4, Landroid/support/constraint/motion/KeyCycleOscillator$WavePoint;->mPeriod:F - iget v9, v5, Landroid/support/constraint/motion/KeyCycleOscillator$WavePoint;->mOffset:F + iget v8, v4, Landroid/support/constraint/motion/KeyCycleOscillator$WavePoint;->mOffset:F - iget v10, v5, Landroid/support/constraint/motion/KeyCycleOscillator$WavePoint;->mValue:F + iget v9, v4, Landroid/support/constraint/motion/KeyCycleOscillator$WavePoint;->mValue:F - move-object v5, v6 + move-object v4, v5 - move v6, v11 + move v5, v10 - invoke-virtual/range {v5 .. v10}, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator;->setPoint(IIFFF)V + invoke-virtual/range {v4 .. v9}, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator;->setPoint(IIFFF)V - add-int/2addr v11, v4 + add-int/2addr v10, v11 goto :goto_0 @@ -741,7 +697,7 @@ invoke-virtual {v0, p1}, Landroid/support/constraint/motion/KeyCycleOscillator$CycleOscillator;->setup(F)V .line 195 - invoke-static {v2, v1, v3}, Landroid/support/constraint/motion/utils/CurveFit;->get(I[D[[D)Landroid/support/constraint/motion/utils/CurveFit; + invoke-static {v3, v1, v2}, Landroid/support/constraint/motion/utils/CurveFit;->get(I[D[[D)Landroid/support/constraint/motion/utils/CurveFit; move-result-object p1 diff --git a/smali/android/support/constraint/motion/KeyFrames.smali b/smali/android/support/constraint/motion/KeyFrames.smali index be505aef..c9dfe5fd 100644 --- a/smali/android/support/constraint/motion/KeyFrames.smali +++ b/smali/android/support/constraint/motion/KeyFrames.smali @@ -47,10 +47,12 @@ sput-object v0, Landroid/support/constraint/motion/KeyFrames;->sKeyMakers:Ljava/util/HashMap; + .line 49 :try_start_0 + sget-object v0, Landroid/support/constraint/motion/KeyFrames;->sKeyMakers:Ljava/util/HashMap; + const-string v1, "KeyAttribute" - .line 49 const-class v2, Landroid/support/constraint/motion/KeyAttributes; const/4 v3, 0x0 @@ -167,6 +169,8 @@ if-eq v1, v2, :cond_4 + if-eqz v1, :cond_3 + const/4 v2, 0x2 if-eq v1, v2, :cond_1 @@ -175,7 +179,7 @@ if-eq v1, v2, :cond_0 - goto :goto_3 + goto :goto_2 :cond_0 const-string v1, "KeyFrameSet" @@ -250,22 +254,24 @@ .catch Lorg/xmlpull/v1/XmlPullParserException; {:try_start_2 .. :try_end_2} :catch_3 .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_2 + move-object v0, v1 + goto :goto_2 :catch_0 move-exception v0 - goto :goto_1 - - :catch_1 - move-exception v1 - move-object v4, v1 move-object v1, v0 move-object v0, v4 + goto :goto_1 + + :catch_1 + move-exception v1 + :goto_1 :try_start_3 const-string v2, "KeyFrames" @@ -273,12 +279,9 @@ const-string v3, "unable to create " .line 86 - invoke-static {v2, v3, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I + invoke-static {v2, v3, v1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I - :goto_2 - move-object v0, v1 - - goto :goto_3 + goto :goto_2 :cond_2 const-string v2, "CustomAttribute" @@ -304,7 +307,7 @@ .line 73 :cond_3 - :goto_3 + :goto_2 invoke-interface {p2}, Lorg/xmlpull/v1/XmlPullParser;->next()I move-result v1 @@ -320,7 +323,7 @@ .line 106 invoke-virtual {p1}, Ljava/io/IOException;->printStackTrace()V - goto :goto_4 + goto :goto_3 :catch_3 move-exception p1 @@ -329,7 +332,7 @@ invoke-virtual {p1}, Lorg/xmlpull/v1/XmlPullParserException;->printStackTrace()V :cond_4 - :goto_4 + :goto_3 return-void .end method @@ -405,7 +408,7 @@ # virtual methods .method public addFrames(Landroid/support/constraint/motion/MotionController;)V - .locals 4 + .locals 3 .line 111 iget-object v0, p0, Landroid/support/constraint/motion/KeyFrames;->mFramesMap:Ljava/util/HashMap; @@ -473,9 +476,7 @@ check-cast v2, Landroid/support/constraint/ConstraintLayout$LayoutParams; - move-object v3, v2 - - check-cast v3, Landroid/support/constraint/ConstraintLayout$LayoutParams; + check-cast v2, Landroid/support/constraint/ConstraintLayout$LayoutParams; iget-object v2, v2, Landroid/support/constraint/ConstraintLayout$LayoutParams;->constraintTag:Ljava/lang/String; diff --git a/smali/android/support/constraint/motion/KeyPosition$Loader.smali b/smali/android/support/constraint/motion/KeyPosition$Loader.smali index 0dd130ac..83cfd02d 100644 --- a/smali/android/support/constraint/motion/KeyPosition$Loader.smali +++ b/smali/android/support/constraint/motion/KeyPosition$Loader.smali @@ -54,6 +54,8 @@ sput-object v0, Landroid/support/constraint/motion/KeyPosition$Loader;->mAttrMap:Landroid/util/SparseIntArray; .line 262 + sget-object v0, Landroid/support/constraint/motion/KeyPosition$Loader;->mAttrMap:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->KeyPosition_motionTarget:I const/4 v2, 0x1 diff --git a/smali/android/support/constraint/motion/KeyPosition.smali b/smali/android/support/constraint/motion/KeyPosition.smali index f07e2b86..873b84f5 100644 --- a/smali/android/support/constraint/motion/KeyPosition.smali +++ b/smali/android/support/constraint/motion/KeyPosition.smali @@ -542,7 +542,9 @@ if-eqz v3, :cond_1 .line 220 - invoke-virtual {v4, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + aget-object p5, p5, v2 + + invoke-virtual {v4, p5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result p5 @@ -708,6 +710,8 @@ if-eqz v0, :cond_1 .line 173 + aget-object v0, p5, v8 + invoke-virtual {v1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v0 @@ -786,7 +790,9 @@ if-eqz v0, :cond_1 .line 197 - invoke-virtual {v1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + aget-object p6, p6, p3 + + invoke-virtual {v1, p6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result p6 @@ -853,17 +859,13 @@ .end method .method public setValue(Ljava/lang/String;Ljava/lang/Object;)V - .locals 2 + .locals 1 .line 346 invoke-virtual {p1}, Ljava/lang/String;->hashCode()I - invoke-virtual {p1}, Ljava/lang/String;->hashCode()I - move-result v0 - const/4 v1, -0x1 - sparse-switch v0, :sswitch_data_0 goto :goto_0 @@ -875,14 +877,11 @@ move-result p1 - if-nez p1, :cond_0 + if-eqz p1, :cond_0 - goto :goto_0 + const/4 p1, 0x6 - :cond_0 - const/4 v1, 0x6 - - goto :goto_0 + goto :goto_1 :sswitch_1 const-string v0, "percentX" @@ -891,14 +890,11 @@ move-result p1 - if-nez p1, :cond_1 - - goto :goto_0 + if-eqz p1, :cond_0 - :cond_1 - const/4 v1, 0x5 + const/4 p1, 0x5 - goto :goto_0 + goto :goto_1 :sswitch_2 const-string v0, "sizePercent" @@ -907,14 +903,11 @@ move-result p1 - if-nez p1, :cond_2 + if-eqz p1, :cond_0 - goto :goto_0 + const/4 p1, 0x4 - :cond_2 - const/4 v1, 0x4 - - goto :goto_0 + goto :goto_1 :sswitch_3 const-string v0, "drawPath" @@ -923,14 +916,11 @@ move-result p1 - if-nez p1, :cond_3 - - goto :goto_0 + if-eqz p1, :cond_0 - :cond_3 - const/4 v1, 0x3 + const/4 p1, 0x1 - goto :goto_0 + goto :goto_1 :sswitch_4 const-string v0, "percentHeight" @@ -939,14 +929,11 @@ move-result p1 - if-nez p1, :cond_4 + if-eqz p1, :cond_0 - goto :goto_0 - - :cond_4 - const/4 v1, 0x2 + const/4 p1, 0x3 - goto :goto_0 + goto :goto_1 :sswitch_5 const-string v0, "percentWidth" @@ -955,14 +942,11 @@ move-result p1 - if-nez p1, :cond_5 + if-eqz p1, :cond_0 - goto :goto_0 - - :cond_5 - const/4 v1, 0x1 + const/4 p1, 0x2 - goto :goto_0 + goto :goto_1 :sswitch_6 const-string v0, "transitionEasing" @@ -971,17 +955,20 @@ move-result p1 - if-nez p1, :cond_6 + if-eqz p1, :cond_0 - goto :goto_0 + const/4 p1, 0x0 - :cond_6 - const/4 v1, 0x0 + goto :goto_1 + :cond_0 :goto_0 - packed-switch v1, :pswitch_data_0 + const/4 p1, -0x1 - goto :goto_1 + :goto_1 + packed-switch p1, :pswitch_data_0 + + goto :goto_2 .line 366 :pswitch_0 @@ -991,7 +978,7 @@ iput p1, p0, Landroid/support/constraint/motion/KeyPosition;->mPercentY:F - goto :goto_1 + goto :goto_2 .line 363 :pswitch_1 @@ -1001,7 +988,7 @@ iput p1, p0, Landroid/support/constraint/motion/KeyPosition;->mPercentX:F - goto :goto_1 + goto :goto_2 .line 360 :pswitch_2 @@ -1013,37 +1000,37 @@ iput p1, p0, Landroid/support/constraint/motion/KeyPosition;->mPercentHeight:F - goto :goto_1 + goto :goto_2 - .line 351 + .line 357 :pswitch_3 - invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyPosition;->toInt(Ljava/lang/Object;)I + invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyPosition;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyPosition;->mDrawPath:I + iput p1, p0, Landroid/support/constraint/motion/KeyPosition;->mPercentHeight:F - goto :goto_1 + goto :goto_2 - .line 357 + .line 354 :pswitch_4 invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyPosition;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyPosition;->mPercentHeight:F + iput p1, p0, Landroid/support/constraint/motion/KeyPosition;->mPercentWidth:F - goto :goto_1 + goto :goto_2 - .line 354 + .line 351 :pswitch_5 - invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyPosition;->toFloat(Ljava/lang/Object;)F + invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyPosition;->toInt(Ljava/lang/Object;)I move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyPosition;->mPercentWidth:F + iput p1, p0, Landroid/support/constraint/motion/KeyPosition;->mDrawPath:I - goto :goto_1 + goto :goto_2 .line 348 :pswitch_6 @@ -1053,11 +1040,9 @@ iput-object p1, p0, Landroid/support/constraint/motion/KeyPosition;->mTransitionEasing:Ljava/lang/String; - :goto_1 + :goto_2 return-void - nop - :sswitch_data_0 .sparse-switch -0x6c0d7d20 -> :sswitch_6 diff --git a/smali/android/support/constraint/motion/KeyTimeCycle$Loader.smali b/smali/android/support/constraint/motion/KeyTimeCycle$Loader.smali index fd36ad2b..404145fa 100644 --- a/smali/android/support/constraint/motion/KeyTimeCycle$Loader.smali +++ b/smali/android/support/constraint/motion/KeyTimeCycle$Loader.smali @@ -68,6 +68,8 @@ sput-object v0, Landroid/support/constraint/motion/KeyTimeCycle$Loader;->mAttrMap:Landroid/util/SparseIntArray; .line 324 + sget-object v0, Landroid/support/constraint/motion/KeyTimeCycle$Loader;->mAttrMap:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->KeyTimeCycle_android_alpha:I const/4 v2, 0x1 diff --git a/smali/android/support/constraint/motion/KeyTimeCycle.smali b/smali/android/support/constraint/motion/KeyTimeCycle.smali index 32781975..d51fd5e9 100644 --- a/smali/android/support/constraint/motion/KeyTimeCycle.smali +++ b/smali/android/support/constraint/motion/KeyTimeCycle.smali @@ -459,7 +459,7 @@ move-result v1 - if-eqz v1, :cond_e + if-eqz v1, :cond_3 invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object; @@ -522,22 +522,17 @@ goto :goto_0 - .line 186 :cond_1 - invoke-virtual {v1}, Ljava/lang/String;->hashCode()I - const/4 v2, -0x1 + .line 186 invoke-virtual {v1}, Ljava/lang/String;->hashCode()I move-result v5 sparse-switch v5, :sswitch_data_0 - :goto_1 - const/4 v4, -0x1 - - goto/16 :goto_2 + goto/16 :goto_1 :sswitch_0 const-string v4, "alpha" @@ -546,12 +541,9 @@ move-result v4 - if-nez v4, :cond_2 - - goto :goto_1 + if-eqz v4, :cond_2 - :cond_2 - const/16 v4, 0xb + const/4 v4, 0x0 goto/16 :goto_2 @@ -562,12 +554,9 @@ move-result v4 - if-nez v4, :cond_3 - - goto :goto_1 + if-eqz v4, :cond_2 - :cond_3 - const/16 v4, 0xa + const/4 v4, 0x5 goto/16 :goto_2 @@ -578,14 +567,11 @@ move-result v4 - if-nez v4, :cond_4 - - goto :goto_1 + if-eqz v4, :cond_2 - :cond_4 - const/16 v4, 0x9 + const/4 v4, 0x1 - goto/16 :goto_2 + goto :goto_2 :sswitch_3 const-string v4, "rotation" @@ -594,12 +580,9 @@ move-result v4 - if-nez v4, :cond_5 + if-eqz v4, :cond_2 - goto :goto_1 - - :cond_5 - const/16 v4, 0x8 + const/4 v4, 0x2 goto :goto_2 @@ -610,9 +593,9 @@ move-result v5 - if-nez v5, :cond_d + if-eqz v5, :cond_2 - goto :goto_1 + goto :goto_2 :sswitch_5 const-string v4, "scaleX" @@ -621,11 +604,8 @@ move-result v4 - if-nez v4, :cond_6 + if-eqz v4, :cond_2 - goto :goto_1 - - :cond_6 const/4 v4, 0x6 goto :goto_2 @@ -637,12 +617,9 @@ move-result v4 - if-nez v4, :cond_7 + if-eqz v4, :cond_2 - goto :goto_1 - - :cond_7 - const/4 v4, 0x5 + const/16 v4, 0xb goto :goto_2 @@ -653,12 +630,9 @@ move-result v4 - if-nez v4, :cond_8 + if-eqz v4, :cond_2 - goto :goto_1 - - :cond_8 - const/4 v4, 0x4 + const/16 v4, 0xa goto :goto_2 @@ -669,12 +643,9 @@ move-result v4 - if-nez v4, :cond_9 + if-eqz v4, :cond_2 - goto :goto_1 - - :cond_9 - const/4 v4, 0x3 + const/16 v4, 0x9 goto :goto_2 @@ -685,12 +656,9 @@ move-result v4 - if-nez v4, :cond_a + if-eqz v4, :cond_2 - goto :goto_1 - - :cond_a - const/4 v4, 0x2 + const/16 v4, 0x8 goto :goto_2 @@ -701,12 +669,9 @@ move-result v4 - if-nez v4, :cond_b + if-eqz v4, :cond_2 - goto :goto_1 - - :cond_b - const/4 v4, 0x1 + const/4 v4, 0x4 goto :goto_2 @@ -717,14 +682,16 @@ move-result v4 - if-nez v4, :cond_c + if-eqz v4, :cond_2 - goto/16 :goto_1 + const/4 v4, 0x3 - :cond_c - const/4 v4, 0x0 + goto :goto_2 + + :cond_2 + :goto_1 + const/4 v4, -0x1 - :cond_d :goto_2 packed-switch v4, :pswitch_data_0 @@ -753,9 +720,9 @@ goto/16 :goto_0 - .line 188 + .line 243 :pswitch_0 - iget v1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mAlpha:F + iget v1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mProgress:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z @@ -763,10 +730,10 @@ if-nez v1, :cond_0 - .line 189 + .line 244 iget v4, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mFramePosition:I - iget v5, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mAlpha:F + iget v5, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mProgress:F iget v6, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mWavePeriod:F @@ -778,9 +745,9 @@ goto/16 :goto_0 - .line 213 + .line 238 :pswitch_1 - iget v1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mTransitionPathRotate:F + iget v1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mTranslationZ:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z @@ -788,10 +755,10 @@ if-nez v1, :cond_0 - .line 214 + .line 239 iget v4, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mFramePosition:I - iget v5, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mTransitionPathRotate:F + iget v5, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mTranslationZ:F iget v6, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mWavePeriod:F @@ -803,9 +770,9 @@ goto/16 :goto_0 - .line 193 + .line 233 :pswitch_2 - iget v1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mElevation:F + iget v1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mTranslationY:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z @@ -813,10 +780,10 @@ if-nez v1, :cond_0 - .line 194 + .line 234 iget v4, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mFramePosition:I - iget v5, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mElevation:F + iget v5, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mTranslationY:F iget v6, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mWavePeriod:F @@ -828,9 +795,9 @@ goto/16 :goto_0 - .line 198 + .line 228 :pswitch_3 - iget v1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mRotation:F + iget v1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mTranslationX:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z @@ -838,10 +805,10 @@ if-nez v1, :cond_0 - .line 199 + .line 229 iget v4, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mFramePosition:I - iget v5, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mRotation:F + iget v5, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mTranslationX:F iget v6, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mWavePeriod:F @@ -903,9 +870,9 @@ goto/16 :goto_0 - .line 243 + .line 213 :pswitch_6 - iget v1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mProgress:F + iget v1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mTransitionPathRotate:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z @@ -913,10 +880,10 @@ if-nez v1, :cond_0 - .line 244 + .line 214 iget v4, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mFramePosition:I - iget v5, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mProgress:F + iget v5, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mTransitionPathRotate:F iget v6, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mWavePeriod:F @@ -928,9 +895,9 @@ goto/16 :goto_0 - .line 238 + .line 208 :pswitch_7 - iget v1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mTranslationZ:F + iget v1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mRotationY:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z @@ -938,10 +905,10 @@ if-nez v1, :cond_0 - .line 239 + .line 209 iget v4, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mFramePosition:I - iget v5, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mTranslationZ:F + iget v5, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mRotationY:F iget v6, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mWavePeriod:F @@ -953,9 +920,9 @@ goto/16 :goto_0 - .line 233 + .line 203 :pswitch_8 - iget v1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mTranslationY:F + iget v1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mRotationX:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z @@ -963,10 +930,10 @@ if-nez v1, :cond_0 - .line 234 + .line 204 iget v4, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mFramePosition:I - iget v5, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mTranslationY:F + iget v5, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mRotationX:F iget v6, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mWavePeriod:F @@ -978,9 +945,9 @@ goto/16 :goto_0 - .line 228 + .line 198 :pswitch_9 - iget v1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mTranslationX:F + iget v1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mRotation:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z @@ -988,10 +955,10 @@ if-nez v1, :cond_0 - .line 229 + .line 199 iget v4, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mFramePosition:I - iget v5, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mTranslationX:F + iget v5, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mRotation:F iget v6, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mWavePeriod:F @@ -1003,9 +970,9 @@ goto/16 :goto_0 - .line 208 + .line 193 :pswitch_a - iget v1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mRotationY:F + iget v1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mElevation:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z @@ -1013,10 +980,10 @@ if-nez v1, :cond_0 - .line 209 + .line 194 iget v4, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mFramePosition:I - iget v5, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mRotationY:F + iget v5, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mElevation:F iget v6, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mWavePeriod:F @@ -1028,9 +995,9 @@ goto/16 :goto_0 - .line 203 + .line 188 :pswitch_b - iget v1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mRotationX:F + iget v1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mAlpha:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z @@ -1038,10 +1005,10 @@ if-nez v1, :cond_0 - .line 204 + .line 189 iget v4, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mFramePosition:I - iget v5, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mRotationX:F + iget v5, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mAlpha:F iget v6, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mWavePeriod:F @@ -1053,9 +1020,11 @@ goto/16 :goto_0 - :cond_e + :cond_3 return-void + nop + :sswitch_data_0 .sparse-switch -0x4a771f66 -> :sswitch_b @@ -1711,17 +1680,13 @@ .end method .method public setValue(Ljava/lang/String;Ljava/lang/Object;)V - .locals 2 + .locals 1 .line 255 invoke-virtual {p1}, Ljava/lang/String;->hashCode()I - invoke-virtual {p1}, Ljava/lang/String;->hashCode()I - move-result v0 - const/4 v1, -0x1 - sparse-switch v0, :sswitch_data_0 goto/16 :goto_0 @@ -1733,14 +1698,11 @@ move-result p1 - if-nez p1, :cond_0 + if-eqz p1, :cond_0 - goto/16 :goto_0 + const/16 p1, 0xd - :cond_0 - const/16 v1, 0xd - - goto/16 :goto_0 + goto/16 :goto_1 :sswitch_1 const-string v0, "curveFit" @@ -1749,14 +1711,11 @@ move-result p1 - if-nez p1, :cond_1 - - goto/16 :goto_0 + if-eqz p1, :cond_0 - :cond_1 - const/16 v1, 0xc + const/4 p1, 0x1 - goto/16 :goto_0 + goto/16 :goto_1 :sswitch_2 const-string v0, "alpha" @@ -1765,14 +1724,11 @@ move-result p1 - if-nez p1, :cond_2 - - goto/16 :goto_0 + if-eqz p1, :cond_0 - :cond_2 - const/16 v1, 0xb + const/4 p1, 0x0 - goto/16 :goto_0 + goto/16 :goto_1 :sswitch_3 const-string v0, "transitionPathRotate" @@ -1781,14 +1737,11 @@ move-result p1 - if-nez p1, :cond_3 - - goto/16 :goto_0 + if-eqz p1, :cond_0 - :cond_3 - const/16 v1, 0xa + const/16 p1, 0xa - goto/16 :goto_0 + goto/16 :goto_1 :sswitch_4 const-string v0, "elevation" @@ -1797,14 +1750,11 @@ move-result p1 - if-nez p1, :cond_4 - - goto/16 :goto_0 + if-eqz p1, :cond_0 - :cond_4 - const/16 v1, 0x9 + const/4 p1, 0x2 - goto/16 :goto_0 + goto :goto_1 :sswitch_5 const-string v0, "rotation" @@ -1813,14 +1763,11 @@ move-result p1 - if-nez p1, :cond_5 - - goto/16 :goto_0 + if-eqz p1, :cond_0 - :cond_5 - const/16 v1, 0x8 + const/4 p1, 0x4 - goto/16 :goto_0 + goto :goto_1 :sswitch_6 const-string v0, "scaleY" @@ -1829,14 +1776,11 @@ move-result p1 - if-nez p1, :cond_6 - - goto :goto_0 + if-eqz p1, :cond_0 - :cond_6 - const/4 v1, 0x7 + const/16 p1, 0x8 - goto :goto_0 + goto :goto_1 :sswitch_7 const-string v0, "scaleX" @@ -1845,14 +1789,11 @@ move-result p1 - if-nez p1, :cond_7 - - goto :goto_0 + if-eqz p1, :cond_0 - :cond_7 - const/4 v1, 0x6 + const/4 p1, 0x7 - goto :goto_0 + goto :goto_1 :sswitch_8 const-string v0, "progress" @@ -1861,14 +1802,11 @@ move-result p1 - if-nez p1, :cond_8 - - goto :goto_0 + if-eqz p1, :cond_0 - :cond_8 - const/4 v1, 0x5 + const/4 p1, 0x3 - goto :goto_0 + goto :goto_1 :sswitch_9 const-string v0, "translationY" @@ -1877,14 +1815,11 @@ move-result p1 - if-nez p1, :cond_9 - - goto :goto_0 + if-eqz p1, :cond_0 - :cond_9 - const/4 v1, 0x4 + const/16 p1, 0xc - goto :goto_0 + goto :goto_1 :sswitch_a const-string v0, "translationX" @@ -1893,14 +1828,11 @@ move-result p1 - if-nez p1, :cond_a - - goto :goto_0 + if-eqz p1, :cond_0 - :cond_a - const/4 v1, 0x3 + const/16 p1, 0xb - goto :goto_0 + goto :goto_1 :sswitch_b const-string v0, "rotationY" @@ -1909,14 +1841,11 @@ move-result p1 - if-nez p1, :cond_b - - goto :goto_0 + if-eqz p1, :cond_0 - :cond_b - const/4 v1, 0x2 + const/4 p1, 0x6 - goto :goto_0 + goto :goto_1 :sswitch_c const-string v0, "rotationX" @@ -1925,14 +1854,11 @@ move-result p1 - if-nez p1, :cond_c - - goto :goto_0 + if-eqz p1, :cond_0 - :cond_c - const/4 v1, 0x1 + const/4 p1, 0x5 - goto :goto_0 + goto :goto_1 :sswitch_d const-string v0, "transitionEasing" @@ -1941,17 +1867,20 @@ move-result p1 - if-nez p1, :cond_d + if-eqz p1, :cond_0 - goto :goto_0 + const/16 p1, 0x9 - :cond_d - const/4 v1, 0x0 + goto :goto_1 + :cond_0 :goto_0 - packed-switch v1, :pswitch_data_0 + const/4 p1, -0x1 - goto :goto_1 + :goto_1 + packed-switch p1, :pswitch_data_0 + + goto :goto_2 .line 296 :pswitch_0 @@ -1961,27 +1890,27 @@ iput p1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mTranslationZ:F - goto :goto_1 + goto :goto_2 - .line 260 + .line 293 :pswitch_1 - invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyTimeCycle;->toInt(Ljava/lang/Object;)I + invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyTimeCycle;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mCurveFit:I + iput p1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mTranslationY:F - goto :goto_1 + goto :goto_2 - .line 257 + .line 290 :pswitch_2 invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyTimeCycle;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mAlpha:F + iput p1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mTranslationX:F - goto :goto_1 + goto :goto_2 .line 287 :pswitch_3 @@ -1991,107 +1920,107 @@ iput p1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mTransitionPathRotate:F - goto :goto_1 + goto :goto_2 - .line 263 + .line 284 :pswitch_4 - invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyTimeCycle;->toFloat(Ljava/lang/Object;)F + invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String; - move-result p1 + move-result-object p1 - iput p1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mElevation:F + iput-object p1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mTransitionEasing:Ljava/lang/String; - goto :goto_1 + goto :goto_2 - .line 269 + .line 281 :pswitch_5 invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyTimeCycle;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mRotation:F + iput p1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mScaleY:F - goto :goto_1 + goto :goto_2 - .line 281 + .line 278 :pswitch_6 invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyTimeCycle;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mScaleY:F + iput p1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mScaleX:F - goto :goto_1 + goto :goto_2 - .line 278 + .line 275 :pswitch_7 invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyTimeCycle;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mScaleX:F + iput p1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mRotationY:F - goto :goto_1 + goto :goto_2 - .line 266 + .line 272 :pswitch_8 invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyTimeCycle;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mProgress:F + iput p1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mRotationX:F - goto :goto_1 + goto :goto_2 - .line 293 + .line 269 :pswitch_9 invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyTimeCycle;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mTranslationY:F + iput p1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mRotation:F - goto :goto_1 + goto :goto_2 - .line 290 + .line 266 :pswitch_a invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyTimeCycle;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mTranslationX:F + iput p1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mProgress:F - goto :goto_1 + goto :goto_2 - .line 275 + .line 263 :pswitch_b invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyTimeCycle;->toFloat(Ljava/lang/Object;)F move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mRotationY:F + iput p1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mElevation:F - goto :goto_1 + goto :goto_2 - .line 272 + .line 260 :pswitch_c - invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyTimeCycle;->toFloat(Ljava/lang/Object;)F + invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyTimeCycle;->toInt(Ljava/lang/Object;)I move-result p1 - iput p1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mRotationX:F + iput p1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mCurveFit:I - goto :goto_1 + goto :goto_2 - .line 284 + .line 257 :pswitch_d - invoke-virtual {p2}, Ljava/lang/Object;->toString()Ljava/lang/String; + invoke-virtual {p0, p2}, Landroid/support/constraint/motion/KeyTimeCycle;->toFloat(Ljava/lang/Object;)F - move-result-object p1 + move-result p1 - iput-object p1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mTransitionEasing:Ljava/lang/String; + iput p1, p0, Landroid/support/constraint/motion/KeyTimeCycle;->mAlpha:F - :goto_1 + :goto_2 return-void :sswitch_data_0 diff --git a/smali/android/support/constraint/motion/KeyTrigger$Loader.smali b/smali/android/support/constraint/motion/KeyTrigger$Loader.smali index aef7b405..32604218 100644 --- a/smali/android/support/constraint/motion/KeyTrigger$Loader.smali +++ b/smali/android/support/constraint/motion/KeyTrigger$Loader.smali @@ -50,6 +50,8 @@ sput-object v0, Landroid/support/constraint/motion/KeyTrigger$Loader;->mAttrMap:Landroid/util/SparseIntArray; .line 265 + sget-object v0, Landroid/support/constraint/motion/KeyTrigger$Loader;->mAttrMap:Landroid/util/SparseIntArray; + sget v1, Landroid/support/constraint/R$styleable;->KeyTrigger_framePosition:I const/16 v2, 0x8 diff --git a/smali/android/support/constraint/motion/KeyTrigger.smali b/smali/android/support/constraint/motion/KeyTrigger.smali index 23927205..fbfd05ea 100644 --- a/smali/android/support/constraint/motion/KeyTrigger.smali +++ b/smali/android/support/constraint/motion/KeyTrigger.smali @@ -435,7 +435,7 @@ const/4 v1, 0x0 - goto/16 :goto_8 + goto :goto_4 .line 136 :cond_3 @@ -473,6 +473,11 @@ :goto_3 iput-boolean v2, p0, Landroid/support/constraint/motion/KeyTrigger;->mFirePositiveReset:Z + const/4 v2, 0x0 + + :goto_4 + move v4, v1 + goto/16 :goto_7 .line 150 @@ -504,7 +509,7 @@ const/4 v0, 0x1 - goto :goto_4 + goto :goto_5 .line 160 :cond_7 @@ -529,7 +534,7 @@ const/4 v0, 0x0 .line 166 - :goto_4 + :goto_5 iget-boolean v4, p0, Landroid/support/constraint/motion/KeyTrigger;->mFireNegativeReset:Z if-eqz v4, :cond_9 @@ -559,7 +564,7 @@ const/4 v4, 0x1 - goto :goto_5 + goto :goto_6 .line 174 :cond_9 @@ -584,10 +589,10 @@ const/4 v4, 0x0 .line 179 - :goto_5 + :goto_6 iget-boolean v5, p0, Landroid/support/constraint/motion/KeyTrigger;->mFirePositiveReset:Z - if-eqz v5, :cond_c + if-eqz v5, :cond_b .line 180 iget v5, p0, Landroid/support/constraint/motion/KeyTrigger;->mFireThreshold:F @@ -603,27 +608,19 @@ cmpg-float v5, v7, v1 - if-gez v5, :cond_b + if-gez v5, :cond_c cmpl-float v1, v6, v1 - if-lez v1, :cond_b + if-lez v1, :cond_c .line 184 iput-boolean v3, p0, Landroid/support/constraint/motion/KeyTrigger;->mFirePositiveReset:Z - goto :goto_6 - - :cond_b - const/4 v2, 0x0 - - :goto_6 - move v1, v4 - - goto :goto_8 + goto :goto_7 .line 187 - :cond_c + :cond_b iget v1, p0, Landroid/support/constraint/motion/KeyTrigger;->mFireThreshold:F sub-float v1, p1, v1 @@ -636,50 +633,47 @@ cmpl-float v1, v1, v5 - if-lez v1, :cond_d + if-lez v1, :cond_c .line 188 iput-boolean v2, p0, Landroid/support/constraint/motion/KeyTrigger;->mFirePositiveReset:Z - :cond_d - move v1, v4 - - :goto_7 + :cond_c const/4 v2, 0x0 .line 192 - :goto_8 + :goto_7 iput p1, p0, Landroid/support/constraint/motion/KeyTrigger;->mFireLastPos:F - if-nez v1, :cond_e + if-nez v4, :cond_d - if-nez v0, :cond_e + if-nez v0, :cond_d - if-eqz v2, :cond_f + if-eqz v2, :cond_e .line 195 - :cond_e + :cond_d invoke-virtual {p2}, Landroid/view/View;->getParent()Landroid/view/ViewParent; - move-result-object v4 + move-result-object v1 - check-cast v4, Landroid/support/constraint/motion/MotionLayout; + check-cast v1, Landroid/support/constraint/motion/MotionLayout; iget v5, p0, Landroid/support/constraint/motion/KeyTrigger;->mTriggerID:I - invoke-virtual {v4, v5, v2, p1}, Landroid/support/constraint/motion/MotionLayout;->fireTrigger(IZF)V + invoke-virtual {v1, v5, v2, p1}, Landroid/support/constraint/motion/MotionLayout;->fireTrigger(IZF)V .line 197 - :cond_f + :cond_e iget p1, p0, Landroid/support/constraint/motion/KeyTrigger;->mTriggerReceiver:I - sget v4, Landroid/support/constraint/motion/KeyTrigger;->UNSET:I + sget v1, Landroid/support/constraint/motion/KeyTrigger;->UNSET:I - if-ne p1, v4, :cond_10 + if-ne p1, v1, :cond_f - goto :goto_9 + goto :goto_8 - :cond_10 + :cond_f invoke-virtual {p2}, Landroid/view/View;->getParent()Landroid/view/ViewParent; move-result-object p1 @@ -692,10 +686,10 @@ move-result-object p2 - :goto_9 + :goto_8 const-string p1, "Could not find method \"" - const-string v4, "Exception in call \"" + const-string v1, "Exception in call \"" const-string v5, " " @@ -703,51 +697,51 @@ const-string v7, "KeyTrigger" - if-eqz v1, :cond_12 + if-eqz v4, :cond_11 .line 199 - iget-object v1, p0, Landroid/support/constraint/motion/KeyTrigger;->mNegativeCross:Ljava/lang/String; + iget-object v4, p0, Landroid/support/constraint/motion/KeyTrigger;->mNegativeCross:Ljava/lang/String; - if-eqz v1, :cond_12 + if-eqz v4, :cond_11 .line 200 - iget-object v1, p0, Landroid/support/constraint/motion/KeyTrigger;->mFireNegativeCross:Ljava/lang/reflect/Method; + iget-object v4, p0, Landroid/support/constraint/motion/KeyTrigger;->mFireNegativeCross:Ljava/lang/reflect/Method; - if-nez v1, :cond_11 + if-nez v4, :cond_10 .line 202 :try_start_0 invoke-virtual {p2}, Ljava/lang/Object;->getClass()Ljava/lang/Class; - move-result-object v1 + move-result-object v4 iget-object v8, p0, Landroid/support/constraint/motion/KeyTrigger;->mNegativeCross:Ljava/lang/String; new-array v9, v3, [Ljava/lang/Class; - invoke-virtual {v1, v8, v9}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method; + invoke-virtual {v4, v8, v9}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method; - move-result-object v1 + move-result-object v4 - iput-object v1, p0, Landroid/support/constraint/motion/KeyTrigger;->mFireNegativeCross:Ljava/lang/reflect/Method; + iput-object v4, p0, Landroid/support/constraint/motion/KeyTrigger;->mFireNegativeCross:Ljava/lang/reflect/Method; :try_end_0 .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0 - goto :goto_a + goto :goto_9 .line 204 :catch_0 - new-instance v1, Ljava/lang/StringBuilder; + new-instance v4, Ljava/lang/StringBuilder; - invoke-direct {v1}, Ljava/lang/StringBuilder;->()V + invoke-direct {v4}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v4, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; iget-object v8, p0, Landroid/support/constraint/motion/KeyTrigger;->mNegativeCross:Ljava/lang/String; - invoke-virtual {v1, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v4, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v4, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; .line 205 invoke-virtual {p2}, Ljava/lang/Object;->getClass()Ljava/lang/Class; @@ -758,50 +752,50 @@ move-result-object v8 - invoke-virtual {v1, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v4, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; invoke-static {p2}, Landroid/support/constraint/motion/Debug;->getName(Landroid/view/View;)Ljava/lang/String; move-result-object v8 - invoke-virtual {v1, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v4, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v1 + move-result-object v4 .line 204 - invoke-static {v7, v1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I + invoke-static {v7, v4}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I .line 209 - :cond_11 - :goto_a + :cond_10 + :goto_9 :try_start_1 - iget-object v1, p0, Landroid/support/constraint/motion/KeyTrigger;->mFireNegativeCross:Ljava/lang/reflect/Method; + iget-object v4, p0, Landroid/support/constraint/motion/KeyTrigger;->mFireNegativeCross:Ljava/lang/reflect/Method; new-array v8, v3, [Ljava/lang/Object; - invoke-virtual {v1, p2, v8}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; + invoke-virtual {v4, p2, v8}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; :try_end_1 .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_1 - goto :goto_b + goto :goto_a .line 211 :catch_1 - new-instance v1, Ljava/lang/StringBuilder; + new-instance v4, Ljava/lang/StringBuilder; - invoke-direct {v1}, Ljava/lang/StringBuilder;->()V + invoke-direct {v4}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v1, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v4, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; iget-object v8, p0, Landroid/support/constraint/motion/KeyTrigger;->mNegativeCross:Ljava/lang/String; - invoke-virtual {v1, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v4, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v4, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; .line 212 invoke-virtual {p2}, Ljava/lang/Object;->getClass()Ljava/lang/Class; @@ -812,164 +806,164 @@ move-result-object v8 - invoke-virtual {v1, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v4, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; invoke-static {p2}, Landroid/support/constraint/motion/Debug;->getName(Landroid/view/View;)Ljava/lang/String; move-result-object v8 - invoke-virtual {v1, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v4, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v1 + move-result-object v4 .line 211 - invoke-static {v7, v1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I + invoke-static {v7, v4}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I - :cond_12 - :goto_b - if-eqz v2, :cond_14 + :cond_11 + :goto_a + if-eqz v2, :cond_13 .line 215 - iget-object v1, p0, Landroid/support/constraint/motion/KeyTrigger;->mPositiveCross:Ljava/lang/String; + iget-object v2, p0, Landroid/support/constraint/motion/KeyTrigger;->mPositiveCross:Ljava/lang/String; - if-eqz v1, :cond_14 + if-eqz v2, :cond_13 .line 216 - iget-object v1, p0, Landroid/support/constraint/motion/KeyTrigger;->mFirePositiveCross:Ljava/lang/reflect/Method; + iget-object v2, p0, Landroid/support/constraint/motion/KeyTrigger;->mFirePositiveCross:Ljava/lang/reflect/Method; - if-nez v1, :cond_13 + if-nez v2, :cond_12 .line 218 :try_start_2 invoke-virtual {p2}, Ljava/lang/Object;->getClass()Ljava/lang/Class; - move-result-object v1 + move-result-object v2 - iget-object v2, p0, Landroid/support/constraint/motion/KeyTrigger;->mPositiveCross:Ljava/lang/String; + iget-object v4, p0, Landroid/support/constraint/motion/KeyTrigger;->mPositiveCross:Ljava/lang/String; new-array v8, v3, [Ljava/lang/Class; - invoke-virtual {v1, v2, v8}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method; + invoke-virtual {v2, v4, v8}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method; - move-result-object v1 + move-result-object v2 - iput-object v1, p0, Landroid/support/constraint/motion/KeyTrigger;->mFirePositiveCross:Ljava/lang/reflect/Method; + iput-object v2, p0, Landroid/support/constraint/motion/KeyTrigger;->mFirePositiveCross:Ljava/lang/reflect/Method; :try_end_2 .catch Ljava/lang/NoSuchMethodException; {:try_start_2 .. :try_end_2} :catch_2 - goto :goto_c + goto :goto_b .line 220 :catch_2 - new-instance v1, Ljava/lang/StringBuilder; + new-instance v2, Ljava/lang/StringBuilder; - invoke-direct {v1}, Ljava/lang/StringBuilder;->()V + invoke-direct {v2}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - iget-object v2, p0, Landroid/support/constraint/motion/KeyTrigger;->mPositiveCross:Ljava/lang/String; + iget-object v4, p0, Landroid/support/constraint/motion/KeyTrigger;->mPositiveCross:Ljava/lang/String; - invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v2, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; .line 221 invoke-virtual {p2}, Ljava/lang/Object;->getClass()Ljava/lang/Class; - move-result-object v2 + move-result-object v4 - invoke-virtual {v2}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String; + invoke-virtual {v4}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String; - move-result-object v2 + move-result-object v4 - invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v2, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; invoke-static {p2}, Landroid/support/constraint/motion/Debug;->getName(Landroid/view/View;)Ljava/lang/String; - move-result-object v2 + move-result-object v4 - invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v1 + move-result-object v2 .line 220 - invoke-static {v7, v1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I + invoke-static {v7, v2}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I .line 225 - :cond_13 - :goto_c + :cond_12 + :goto_b :try_start_3 - iget-object v1, p0, Landroid/support/constraint/motion/KeyTrigger;->mFirePositiveCross:Ljava/lang/reflect/Method; + iget-object v2, p0, Landroid/support/constraint/motion/KeyTrigger;->mFirePositiveCross:Ljava/lang/reflect/Method; - new-array v2, v3, [Ljava/lang/Object; + new-array v4, v3, [Ljava/lang/Object; - invoke-virtual {v1, p2, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; + invoke-virtual {v2, p2, v4}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; :try_end_3 .catch Ljava/lang/Exception; {:try_start_3 .. :try_end_3} :catch_3 - goto :goto_d + goto :goto_c .line 227 :catch_3 - new-instance v1, Ljava/lang/StringBuilder; + new-instance v2, Ljava/lang/StringBuilder; - invoke-direct {v1}, Ljava/lang/StringBuilder;->()V + invoke-direct {v2}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v1, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - iget-object v2, p0, Landroid/support/constraint/motion/KeyTrigger;->mPositiveCross:Ljava/lang/String; + iget-object v4, p0, Landroid/support/constraint/motion/KeyTrigger;->mPositiveCross:Ljava/lang/String; - invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v2, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; .line 228 invoke-virtual {p2}, Ljava/lang/Object;->getClass()Ljava/lang/Class; - move-result-object v2 + move-result-object v4 - invoke-virtual {v2}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String; + invoke-virtual {v4}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String; - move-result-object v2 + move-result-object v4 - invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v2, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; invoke-static {p2}, Landroid/support/constraint/motion/Debug;->getName(Landroid/view/View;)Ljava/lang/String; - move-result-object v2 + move-result-object v4 - invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v1 + move-result-object v2 .line 227 - invoke-static {v7, v1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I + invoke-static {v7, v2}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I - :cond_14 - :goto_d - if-eqz v0, :cond_16 + :cond_13 + :goto_c + if-eqz v0, :cond_15 .line 231 iget-object v0, p0, Landroid/support/constraint/motion/KeyTrigger;->mCross:Ljava/lang/String; - if-eqz v0, :cond_16 + if-eqz v0, :cond_15 .line 232 iget-object v0, p0, Landroid/support/constraint/motion/KeyTrigger;->mFireCross:Ljava/lang/reflect/Method; - if-nez v0, :cond_15 + if-nez v0, :cond_14 .line 234 :try_start_4 @@ -977,11 +971,11 @@ move-result-object v0 - iget-object v1, p0, Landroid/support/constraint/motion/KeyTrigger;->mCross:Ljava/lang/String; + iget-object v2, p0, Landroid/support/constraint/motion/KeyTrigger;->mCross:Ljava/lang/String; - new-array v2, v3, [Ljava/lang/Class; + new-array v4, v3, [Ljava/lang/Class; - invoke-virtual {v0, v1, v2}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method; + invoke-virtual {v0, v2, v4}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method; move-result-object v0 @@ -989,7 +983,7 @@ :try_end_4 .catch Ljava/lang/NoSuchMethodException; {:try_start_4 .. :try_end_4} :catch_4 - goto :goto_e + goto :goto_d .line 236 :catch_4 @@ -1032,8 +1026,8 @@ invoke-static {v7, p1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I .line 241 - :cond_15 - :goto_e + :cond_14 + :goto_d :try_start_5 iget-object p1, p0, Landroid/support/constraint/motion/KeyTrigger;->mFireCross:Ljava/lang/reflect/Method; @@ -1043,7 +1037,7 @@ :try_end_5 .catch Ljava/lang/Exception; {:try_start_5 .. :try_end_5} :catch_5 - goto :goto_f + goto :goto_e .line 243 :catch_5 @@ -1051,7 +1045,7 @@ invoke-direct {p1}, Ljava/lang/StringBuilder;->()V - invoke-virtual {p1, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {p1, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; iget-object v0, p0, Landroid/support/constraint/motion/KeyTrigger;->mCross:Ljava/lang/String; @@ -1085,8 +1079,8 @@ .line 243 invoke-static {v7, p1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I - :cond_16 - :goto_f + :cond_15 + :goto_e return-void .end method diff --git a/smali/android/support/constraint/motion/MotionConstrainedPoint.smali b/smali/android/support/constraint/motion/MotionConstrainedPoint.smali index 081bb938..fe9a7fb3 100644 --- a/smali/android/support/constraint/motion/MotionConstrainedPoint.smali +++ b/smali/android/support/constraint/motion/MotionConstrainedPoint.smali @@ -199,14 +199,14 @@ const/16 v0, 0x12 + .line 150 new-array v1, v0, [D - .line 150 iput-object v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->mTempValue:[D + .line 151 new-array v0, v0, [D - .line 151 iput-object v0, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->mTempDelta:[D return-void @@ -306,7 +306,7 @@ move-result v1 - if-eqz v1, :cond_1f + if-eqz v1, :cond_12 invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object; @@ -321,11 +321,9 @@ check-cast v2, Landroid/support/constraint/motion/SplineSet; - .line 259 - invoke-virtual {v1}, Ljava/lang/String;->hashCode()I - const/4 v3, -0x1 + .line 259 invoke-virtual {v1}, Ljava/lang/String;->hashCode()I move-result v4 @@ -343,12 +341,9 @@ move-result v4 - if-nez v4, :cond_0 - - goto/16 :goto_1 + if-eqz v4, :cond_0 - :cond_0 - const/16 v3, 0xd + const/4 v3, 0x0 goto/16 :goto_1 @@ -359,12 +354,9 @@ move-result v4 - if-nez v4, :cond_1 - - goto/16 :goto_1 + if-eqz v4, :cond_0 - :cond_1 - const/16 v3, 0xc + const/4 v3, 0x7 goto/16 :goto_1 @@ -375,12 +367,9 @@ move-result v4 - if-nez v4, :cond_2 + if-eqz v4, :cond_0 - goto/16 :goto_1 - - :cond_2 - const/16 v3, 0xb + const/4 v3, 0x1 goto/16 :goto_1 @@ -391,12 +380,9 @@ move-result v4 - if-nez v4, :cond_3 - - goto/16 :goto_1 + if-eqz v4, :cond_0 - :cond_3 - const/16 v3, 0xa + const/4 v3, 0x2 goto/16 :goto_1 @@ -407,14 +393,11 @@ move-result v4 - if-nez v4, :cond_4 + if-eqz v4, :cond_0 - goto/16 :goto_1 - - :cond_4 - const/16 v3, 0x9 + const/4 v3, 0x6 - goto/16 :goto_1 + goto :goto_1 :sswitch_5 const-string v4, "transformPivotX" @@ -423,14 +406,11 @@ move-result v4 - if-nez v4, :cond_5 - - goto/16 :goto_1 + if-eqz v4, :cond_0 - :cond_5 - const/16 v3, 0x8 + const/4 v3, 0x5 - goto/16 :goto_1 + goto :goto_1 :sswitch_6 const-string v4, "scaleY" @@ -439,12 +419,9 @@ move-result v4 - if-nez v4, :cond_6 - - goto :goto_1 + if-eqz v4, :cond_0 - :cond_6 - const/4 v3, 0x7 + const/16 v3, 0xa goto :goto_1 @@ -455,12 +432,9 @@ move-result v4 - if-nez v4, :cond_7 - - goto :goto_1 + if-eqz v4, :cond_0 - :cond_7 - const/4 v3, 0x6 + const/16 v3, 0x9 goto :goto_1 @@ -471,12 +445,9 @@ move-result v4 - if-nez v4, :cond_8 + if-eqz v4, :cond_0 - goto :goto_1 - - :cond_8 - const/4 v3, 0x5 + const/16 v3, 0x8 goto :goto_1 @@ -487,12 +458,9 @@ move-result v4 - if-nez v4, :cond_9 - - goto :goto_1 + if-eqz v4, :cond_0 - :cond_9 - const/4 v3, 0x4 + const/16 v3, 0xd goto :goto_1 @@ -503,12 +471,9 @@ move-result v4 - if-nez v4, :cond_a + if-eqz v4, :cond_0 - goto :goto_1 - - :cond_a - const/4 v3, 0x3 + const/16 v3, 0xc goto :goto_1 @@ -519,12 +484,9 @@ move-result v4 - if-nez v4, :cond_b - - goto :goto_1 + if-eqz v4, :cond_0 - :cond_b - const/4 v3, 0x2 + const/16 v3, 0xb goto :goto_1 @@ -535,12 +497,9 @@ move-result v4 - if-nez v4, :cond_c - - goto :goto_1 + if-eqz v4, :cond_0 - :cond_c - const/4 v3, 0x1 + const/4 v3, 0x4 goto :goto_1 @@ -551,13 +510,11 @@ move-result v4 - if-nez v4, :cond_d + if-eqz v4, :cond_0 - goto :goto_1 - - :cond_d - const/4 v3, 0x0 + const/4 v3, 0x3 + :cond_0 :goto_1 const/high16 v4, 0x3f800000 # 1.0f @@ -574,7 +531,7 @@ const-string v4, "MotionPaths" - if-eqz v3, :cond_10 + if-eqz v3, :cond_11 const-string v3, "," @@ -592,7 +549,7 @@ move-result v5 - if-eqz v5, :cond_f + if-eqz v5, :cond_10 .line 306 iget-object v5, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->attributes:Ljava/util/LinkedHashMap; @@ -606,7 +563,7 @@ .line 307 instance-of v5, v2, Landroid/support/constraint/motion/SplineSet$CustomSet; - if-eqz v5, :cond_e + if-eqz v5, :cond_f .line 308 check-cast v2, Landroid/support/constraint/motion/SplineSet$CustomSet; @@ -615,366 +572,364 @@ goto/16 :goto_0 - .line 310 - :cond_e - new-instance v5, Ljava/lang/StringBuilder; - - invoke-direct {v5}, Ljava/lang/StringBuilder;->()V - - invoke-virtual {v5, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - const-string v1, " splineSet not a CustomSet frame = " - - invoke-virtual {v5, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - invoke-virtual {v5, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; - - const-string v1, ", value" - - invoke-virtual {v5, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - .line 311 - invoke-virtual {v3}, Landroid/support/constraint/ConstraintAttribute;->getValueToInterpolate()F - - move-result v1 - - invoke-virtual {v5, v1}, Ljava/lang/StringBuilder;->append(F)Ljava/lang/StringBuilder; - - invoke-virtual {v5, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - - invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - - move-result-object v1 - - .line 310 - invoke-static {v4, v1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I - - goto/16 :goto_0 - - .line 317 - :cond_f - new-instance v1, Ljava/lang/StringBuilder; - - invoke-direct {v1}, Ljava/lang/StringBuilder;->()V - - const-string v2, "UNKNOWN customName " - - invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - - move-result-object v1 - - invoke-static {v4, v1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I - - goto/16 :goto_0 - - .line 320 - :cond_10 - new-instance v2, Ljava/lang/StringBuilder; - - invoke-direct {v2}, Ljava/lang/StringBuilder;->()V - - const-string v3, "UNKNOWN spline " - - invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - - move-result-object v1 - - invoke-static {v4, v1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I - - goto/16 :goto_0 - - .line 261 + .line 300 :pswitch_0 - iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->alpha:F + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->translationZ:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z move-result v1 - if-eqz v1, :cond_11 + if-eqz v1, :cond_1 goto :goto_2 - :cond_11 - iget v4, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->alpha:F + :cond_1 + iget v6, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->translationZ:F :goto_2 - invoke-virtual {v2, p2, v4}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V + invoke-virtual {v2, p2, v6}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 282 + .line 297 :pswitch_1 - iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->mPathRotate:F + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->translationY:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z move-result v1 - if-eqz v1, :cond_12 + if-eqz v1, :cond_2 goto :goto_3 - :cond_12 - iget v6, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->mPathRotate:F + :cond_2 + iget v6, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->translationY:F :goto_3 invoke-virtual {v2, p2, v6}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 264 + .line 294 :pswitch_2 - iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->elevation:F + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->translationX:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z move-result v1 - if-eqz v1, :cond_13 + if-eqz v1, :cond_3 goto :goto_4 - :cond_13 - iget v6, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->elevation:F + :cond_3 + iget v6, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->translationX:F :goto_4 invoke-virtual {v2, p2, v6}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 267 + .line 291 :pswitch_3 - iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->rotation:F + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->scaleY:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z move-result v1 - if-eqz v1, :cond_14 + if-eqz v1, :cond_4 goto :goto_5 - :cond_14 - iget v6, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->rotation:F + :cond_4 + iget v4, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->scaleY:F :goto_5 - invoke-virtual {v2, p2, v6}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V + invoke-virtual {v2, p2, v4}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 279 + .line 288 :pswitch_4 - iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->mPivotY:F + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->scaleX:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z move-result v1 - if-eqz v1, :cond_15 + if-eqz v1, :cond_5 goto :goto_6 - :cond_15 - iget v6, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->mPivotY:F + :cond_5 + iget v4, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->scaleX:F :goto_6 - invoke-virtual {v2, p2, v6}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V + invoke-virtual {v2, p2, v4}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 276 + .line 285 :pswitch_5 - iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->mPivotX:F + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->mProgress:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z move-result v1 - if-eqz v1, :cond_16 + if-eqz v1, :cond_6 goto :goto_7 - :cond_16 - iget v6, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->mPivotX:F + :cond_6 + iget v6, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->mProgress:F :goto_7 invoke-virtual {v2, p2, v6}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 291 + .line 282 :pswitch_6 - iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->scaleY:F + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->mPathRotate:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z move-result v1 - if-eqz v1, :cond_17 + if-eqz v1, :cond_7 goto :goto_8 - :cond_17 - iget v4, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->scaleY:F + :cond_7 + iget v6, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->mPathRotate:F :goto_8 - invoke-virtual {v2, p2, v4}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V + invoke-virtual {v2, p2, v6}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 288 + .line 279 :pswitch_7 - iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->scaleX:F + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->mPivotY:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z move-result v1 - if-eqz v1, :cond_18 + if-eqz v1, :cond_8 goto :goto_9 - :cond_18 - iget v4, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->scaleX:F + :cond_8 + iget v6, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->mPivotY:F :goto_9 - invoke-virtual {v2, p2, v4}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V + invoke-virtual {v2, p2, v6}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 285 + .line 276 :pswitch_8 - iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->mProgress:F + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->mPivotX:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z move-result v1 - if-eqz v1, :cond_19 + if-eqz v1, :cond_9 goto :goto_a - :cond_19 - iget v6, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->mProgress:F + :cond_9 + iget v6, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->mPivotX:F :goto_a invoke-virtual {v2, p2, v6}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 300 + .line 273 :pswitch_9 - iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->translationZ:F + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->rotationY:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z move-result v1 - if-eqz v1, :cond_1a + if-eqz v1, :cond_a goto :goto_b - :cond_1a - iget v6, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->translationZ:F + :cond_a + iget v6, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->rotationY:F :goto_b invoke-virtual {v2, p2, v6}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 297 + .line 270 :pswitch_a - iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->translationY:F + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->rotationX:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z move-result v1 - if-eqz v1, :cond_1b + if-eqz v1, :cond_b goto :goto_c - :cond_1b - iget v6, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->translationY:F + :cond_b + iget v6, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->rotationX:F :goto_c invoke-virtual {v2, p2, v6}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 294 + .line 267 :pswitch_b - iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->translationX:F + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->rotation:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z move-result v1 - if-eqz v1, :cond_1c + if-eqz v1, :cond_c goto :goto_d - :cond_1c - iget v6, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->translationX:F + :cond_c + iget v6, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->rotation:F :goto_d invoke-virtual {v2, p2, v6}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 273 + .line 264 :pswitch_c - iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->rotationY:F + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->elevation:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z move-result v1 - if-eqz v1, :cond_1d + if-eqz v1, :cond_d goto :goto_e - :cond_1d - iget v6, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->rotationY:F + :cond_d + iget v6, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->elevation:F :goto_e invoke-virtual {v2, p2, v6}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - .line 270 + .line 261 :pswitch_d - iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->rotationX:F + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->alpha:F invoke-static {v1}, Ljava/lang/Float;->isNaN(F)Z move-result v1 - if-eqz v1, :cond_1e + if-eqz v1, :cond_e goto :goto_f - :cond_1e - iget v6, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->rotationX:F + :cond_e + iget v4, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->alpha:F :goto_f - invoke-virtual {v2, p2, v6}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V + invoke-virtual {v2, p2, v4}, Landroid/support/constraint/motion/SplineSet;->setPoint(IF)V goto/16 :goto_0 - :cond_1f - return-void + .line 310 + :cond_f + new-instance v5, Ljava/lang/StringBuilder; + + invoke-direct {v5}, Ljava/lang/StringBuilder;->()V + + invoke-virtual {v5, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + const-string v1, " splineSet not a CustomSet frame = " + + invoke-virtual {v5, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v5, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; + + const-string v1, ", value" + + invoke-virtual {v5, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - nop + .line 311 + invoke-virtual {v3}, Landroid/support/constraint/ConstraintAttribute;->getValueToInterpolate()F + + move-result v1 + + invoke-virtual {v5, v1}, Ljava/lang/StringBuilder;->append(F)Ljava/lang/StringBuilder; + + invoke-virtual {v5, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + + invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + + move-result-object v1 + + .line 310 + invoke-static {v4, v1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I + + goto/16 :goto_0 + + .line 317 + :cond_10 + new-instance v1, Ljava/lang/StringBuilder; + + invoke-direct {v1}, Ljava/lang/StringBuilder;->()V + + const-string v2, "UNKNOWN customName " + + invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + + move-result-object v1 + + invoke-static {v4, v1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I + + goto/16 :goto_0 + + .line 320 + :cond_11 + new-instance v2, Ljava/lang/StringBuilder; + + invoke-direct {v2}, Ljava/lang/StringBuilder;->()V + + const-string v3, "UNKNOWN spline " + + invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + + move-result-object v1 + + invoke-static {v4, v1}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I + + goto/16 :goto_0 + + :cond_12 + return-void :sswitch_data_0 .sparse-switch @@ -1759,147 +1714,151 @@ .end method .method fillStandard([D[I)V - .locals 8 + .locals 6 const/16 v0, 0x12 - new-array v1, v0, [F - .line 154 - iget v2, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->position:F + new-array v0, v0, [F - const/4 v3, 0x0 + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->position:F - aput v2, v1, v3 + const/4 v2, 0x0 - iget v2, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->x:F + aput v1, v0, v2 - const/4 v4, 0x1 + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->x:F - aput v2, v1, v4 + const/4 v3, 0x1 - iget v2, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->y:F + aput v1, v0, v3 - const/4 v4, 0x2 + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->y:F - aput v2, v1, v4 + const/4 v3, 0x2 - iget v2, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->width:F + aput v1, v0, v3 - const/4 v4, 0x3 + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->width:F - aput v2, v1, v4 + const/4 v3, 0x3 - iget v2, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->height:F + aput v1, v0, v3 - const/4 v4, 0x4 + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->height:F - aput v2, v1, v4 + const/4 v3, 0x4 - iget v2, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->alpha:F + aput v1, v0, v3 - const/4 v4, 0x5 + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->alpha:F - aput v2, v1, v4 + const/4 v3, 0x5 - iget v2, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->elevation:F + aput v1, v0, v3 - const/4 v4, 0x6 + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->elevation:F - aput v2, v1, v4 + const/4 v3, 0x6 + + aput v1, v0, v3 - iget v2, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->rotation:F + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->rotation:F - const/4 v4, 0x7 + const/4 v3, 0x7 - aput v2, v1, v4 + aput v1, v0, v3 - iget v2, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->rotationX:F + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->rotationX:F - const/16 v4, 0x8 + const/16 v3, 0x8 - aput v2, v1, v4 + aput v1, v0, v3 - iget v2, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->rotationY:F + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->rotationY:F - const/16 v4, 0x9 + const/16 v3, 0x9 - aput v2, v1, v4 + aput v1, v0, v3 - iget v2, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->scaleX:F + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->scaleX:F - const/16 v4, 0xa + const/16 v3, 0xa - aput v2, v1, v4 + aput v1, v0, v3 - iget v2, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->scaleY:F + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->scaleY:F - const/16 v4, 0xb + const/16 v3, 0xb - aput v2, v1, v4 + aput v1, v0, v3 - iget v2, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->mPivotX:F + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->mPivotX:F - const/16 v4, 0xc + const/16 v3, 0xc - aput v2, v1, v4 + aput v1, v0, v3 - iget v2, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->mPivotY:F + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->mPivotY:F - const/16 v4, 0xd + const/16 v3, 0xd - aput v2, v1, v4 + aput v1, v0, v3 - iget v2, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->translationX:F + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->translationX:F - const/16 v4, 0xe + const/16 v3, 0xe - aput v2, v1, v4 + aput v1, v0, v3 - iget v2, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->translationY:F + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->translationY:F - const/16 v4, 0xf + const/16 v3, 0xf - aput v2, v1, v4 + aput v1, v0, v3 - iget v2, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->translationZ:F + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->translationZ:F - const/16 v4, 0x10 + const/16 v3, 0x10 - aput v2, v1, v4 + aput v1, v0, v3 - iget v2, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->mPathRotate:F + iget v1, p0, Landroid/support/constraint/motion/MotionConstrainedPoint;->mPathRotate:F - const/16 v4, 0x11 + const/16 v3, 0x11 - aput v2, v1, v4 + aput v1, v0, v3 - const/4 v2, 0x0 + const/4 v1, 0x0 .line 157 :goto_0 - array-length v4, p2 + array-length v3, p2 - if-ge v3, v4, :cond_1 + if-ge v2, v3, :cond_1 .line 158 - aget v4, p2, v3 + aget v3, p2, v2 + + array-length v4, v0 - if-ge v4, v0, :cond_0 + if-ge v3, v4, :cond_0 - add-int/lit8 v5, v2, 0x1 + add-int/lit8 v3, v1, 0x1 .line 159 - aget v4, v1, v4 + aget v4, p2, v2 + + aget v4, v0, v4 - float-to-double v6, v4 + float-to-double v4, v4 - aput-wide v6, p1, v2 + aput-wide v4, p1, v1 - move v2, v5 + move v1, v3 :cond_0 - add-int/lit8 v3, v3, 0x1 + add-int/lit8 v2, v2, 0x1 goto :goto_0 diff --git a/smali/android/support/constraint/motion/MotionController.smali b/smali/android/support/constraint/motion/MotionController.smali index ba935b34..a9c930d2 100644 --- a/smali/android/support/constraint/motion/MotionController.smali +++ b/smali/android/support/constraint/motion/MotionController.smali @@ -200,9 +200,11 @@ .line 89 iput v0, p0, Landroid/support/constraint/motion/MotionController;->MAX_DIMENSION:I + .line 90 + iget v0, p0, Landroid/support/constraint/motion/MotionController;->MAX_DIMENSION:I + new-array v0, v0, [F - .line 90 iput-object v0, p0, Landroid/support/constraint/motion/MotionController;->mValuesBuff:[F .line 91 @@ -214,9 +216,9 @@ const/4 v0, 0x1 + .line 92 new-array v0, v0, [F - .line 92 iput-object v0, p0, Landroid/support/constraint/motion/MotionController;->mVelocity:[F .line 94 @@ -238,7 +240,7 @@ .end method .method private getAdjustedPosition(F[F)F - .locals 11 + .locals 10 const/4 v0, 0x0 @@ -257,35 +259,41 @@ :cond_0 iget v3, p0, Landroid/support/constraint/motion/MotionController;->mStaggerScale:F - float-to-double v4, v3 + float-to-double v3, v3 - const-wide/high16 v6, 0x3ff0000000000000L # 1.0 + const-wide/high16 v5, 0x3ff0000000000000L # 1.0 - cmpl-double v8, v4, v6 + cmpl-double v7, v3, v5 - if-eqz v8, :cond_2 + if-eqz v7, :cond_2 .line 879 - iget v4, p0, Landroid/support/constraint/motion/MotionController;->mStaggerOffset:F + iget v3, p0, Landroid/support/constraint/motion/MotionController;->mStaggerOffset:F - cmpg-float v5, p1, v4 + cmpg-float v3, p1, v3 - if-gez v5, :cond_1 + if-gez v3, :cond_1 const/4 p1, 0x0 + .line 882 :cond_1 - cmpl-float v5, p1, v4 + iget v3, p0, Landroid/support/constraint/motion/MotionController;->mStaggerOffset:F + + cmpl-float v4, p1, v3 - if-lez v5, :cond_2 + if-lez v4, :cond_2 - float-to-double v8, p1 + float-to-double v7, p1 - cmpg-double v5, v8, v6 + cmpg-double v4, v7, v5 - if-gez v5, :cond_2 + if-gez v4, :cond_2 - sub-float/2addr p1, v4 + sub-float/2addr p1, v3 + + .line 884 + iget v3, p0, Landroid/support/constraint/motion/MotionController;->mStaggerScale:F mul-float p1, p1, v3 @@ -337,11 +345,11 @@ .line 897 iget v3, v6, Landroid/support/constraint/motion/MotionPaths;->time:F - move v10, v3 + move v9, v3 move-object v3, v0 - move v0, v10 + move v0, v9 goto :goto_1 @@ -415,6 +423,7 @@ const/4 v1, 0x2 + .line 268 new-array v1, v1, [F const/16 v2, 0x63 @@ -429,16 +438,18 @@ move-wide v8, v4 - const/4 v10, 0x0 + move-wide v10, v8 - const/4 v11, 0x0 + const/4 v4, 0x0 + + const/4 v5, 0x0 :goto_0 const/16 v12, 0x64 - if-ge v10, v12, :cond_6 + if-ge v4, v12, :cond_6 - int-to-float v12, v10 + int-to-float v12, v4 mul-float v12, v12, v2 @@ -572,54 +583,56 @@ const/4 v3, 0x1 - if-lez v10, :cond_5 + if-lez v4, :cond_5 - float-to-double v11, v11 + float-to-double v12, v5 - aget v7, v1, v3 + .line 306 + aget v5, v1, v3 - float-to-double v13, v7 + float-to-double v14, v5 - .line 306 - invoke-static {v13, v14}, Ljava/lang/Double;->isNaN(D)Z + invoke-static {v14, v15}, Ljava/lang/Double;->isNaN(D)Z - sub-double/2addr v8, v13 + sub-double/2addr v10, v14 - aget v7, v1, v6 + aget v5, v1, v6 - float-to-double v13, v7 + float-to-double v14, v5 - invoke-static {v13, v14}, Ljava/lang/Double;->isNaN(D)Z + invoke-static {v14, v15}, Ljava/lang/Double;->isNaN(D)Z - sub-double/2addr v4, v13 + sub-double/2addr v8, v14 - invoke-static {v8, v9, v4, v5}, Ljava/lang/Math;->hypot(DD)D + invoke-static {v10, v11, v8, v9}, Ljava/lang/Math;->hypot(DD)D - move-result-wide v4 + move-result-wide v7 - invoke-static {v11, v12}, Ljava/lang/Double;->isNaN(D)Z + invoke-static {v12, v13}, Ljava/lang/Double;->isNaN(D)Z - add-double/2addr v11, v4 + add-double/2addr v12, v7 - double-to-float v11, v11 + double-to-float v5, v12 + .line 308 :cond_5 - aget v4, v1, v6 + aget v7, v1, v6 - float-to-double v4, v4 + float-to-double v8, v7 + .line 309 aget v3, v1, v3 - float-to-double v8, v3 + float-to-double v10, v3 - add-int/lit8 v10, v10, 0x1 + add-int/lit8 v4, v4, 0x1 const/high16 v3, 0x3f800000 # 1.0f goto/16 :goto_0 :cond_6 - return v11 + return v5 .end method .method private insertKey(Landroid/support/constraint/motion/MotionPaths;)V @@ -840,33 +853,39 @@ const/4 v6, 0x0 - cmpl-float v7, v5, v1 + cmpl-float v5, v5, v1 - if-eqz v7, :cond_5 + if-eqz v5, :cond_5 .line 220 - iget v7, p0, Landroid/support/constraint/motion/MotionController;->mStaggerOffset:F + iget v5, p0, Landroid/support/constraint/motion/MotionController;->mStaggerOffset:F - cmpg-float v8, v4, v7 + cmpg-float v5, v4, v5 - if-gez v8, :cond_4 + if-gez v5, :cond_4 const/4 v4, 0x0 + .line 223 :cond_4 - cmpl-float v8, v4, v7 + iget v5, p0, Landroid/support/constraint/motion/MotionController;->mStaggerOffset:F + + cmpl-float v7, v4, v5 - if-lez v8, :cond_5 + if-lez v7, :cond_5 + + float-to-double v7, v4 - float-to-double v8, v4 + const-wide/high16 v9, 0x3ff0000000000000L # 1.0 - const-wide/high16 v10, 0x3ff0000000000000L # 1.0 + cmpg-double v11, v7, v9 - cmpg-double v12, v8, v10 + if-gez v11, :cond_5 - if-gez v12, :cond_5 + sub-float/2addr v4, v5 - sub-float/2addr v4, v7 + .line 225 + iget v5, p0, Landroid/support/constraint/motion/MotionController;->mStaggerScale:F mul-float v4, v4, v5 @@ -1210,7 +1229,7 @@ .end method .method buildPath([FI)V - .locals 20 + .locals 19 move-object/from16 v0, p0 @@ -1301,7 +1320,7 @@ const/4 v10, 0x0 :goto_4 - if-ge v10, v2, :cond_11 + if-ge v10, v2, :cond_10 int-to-float v11, v10 @@ -1310,271 +1329,267 @@ .line 143 iget v12, v0, Landroid/support/constraint/motion/MotionController;->mStaggerScale:F - cmpl-float v14, v12, v4 + const/4 v13, 0x0 - if-eqz v14, :cond_5 + cmpl-float v12, v12, v4 + + if-eqz v12, :cond_5 .line 144 - iget v14, v0, Landroid/support/constraint/motion/MotionController;->mStaggerOffset:F + iget v12, v0, Landroid/support/constraint/motion/MotionController;->mStaggerOffset:F - cmpg-float v15, v11, v14 + cmpg-float v12, v11, v12 - if-gez v15, :cond_4 + if-gez v12, :cond_4 const/4 v11, 0x0 + .line 147 :cond_4 - cmpl-float v15, v11, v14 + iget v12, v0, Landroid/support/constraint/motion/MotionController;->mStaggerOffset:F - if-lez v15, :cond_5 + cmpl-float v14, v11, v12 - move-object/from16 v16, v5 + if-lez v14, :cond_5 - float-to-double v4, v11 + float-to-double v14, v11 - const-wide/high16 v17, 0x3ff0000000000000L # 1.0 + const-wide/high16 v16, 0x3ff0000000000000L # 1.0 - cmpg-double v19, v4, v17 + cmpg-double v18, v14, v16 - if-gez v19, :cond_6 + if-gez v18, :cond_5 - sub-float/2addr v11, v14 + sub-float/2addr v11, v12 - mul-float v11, v11, v12 + .line 149 + iget v12, v0, Landroid/support/constraint/motion/MotionController;->mStaggerScale:F - goto :goto_5 + mul-float v11, v11, v12 :cond_5 - move-object/from16 v16, v5 - - :cond_6 - :goto_5 - float-to-double v4, v11 + float-to-double v14, v11 .line 154 iget-object v12, v0, Landroid/support/constraint/motion/MotionController;->mStartMotionPath:Landroid/support/constraint/motion/MotionPaths; iget-object v12, v12, Landroid/support/constraint/motion/MotionPaths;->mKeyFrameEasing:Landroid/support/constraint/motion/utils/Easing; - const/high16 v14, 0x7fc00000 # Float.NaN + const/high16 v16, 0x7fc00000 # Float.NaN .line 157 - iget-object v13, v0, Landroid/support/constraint/motion/MotionController;->mMotionPaths:Ljava/util/ArrayList; + iget-object v4, v0, Landroid/support/constraint/motion/MotionController;->mMotionPaths:Ljava/util/ArrayList; - invoke-virtual {v13}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator; + invoke-virtual {v4}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator; - move-result-object v13 - - const/16 v17, 0x0 + move-result-object v4 - :cond_7 - :goto_6 - invoke-interface {v13}, Ljava/util/Iterator;->hasNext()Z + :goto_5 + invoke-interface {v4}, Ljava/util/Iterator;->hasNext()Z move-result v18 - if-eqz v18, :cond_9 + if-eqz v18, :cond_8 - invoke-interface {v13}, Ljava/util/Iterator;->next()Ljava/lang/Object; + invoke-interface {v4}, Ljava/util/Iterator;->next()Ljava/lang/Object; move-result-object v18 - move-object/from16 v15, v18 + move-object/from16 v9, v18 - check-cast v15, Landroid/support/constraint/motion/MotionPaths; + check-cast v9, Landroid/support/constraint/motion/MotionPaths; .line 158 - iget-object v9, v15, Landroid/support/constraint/motion/MotionPaths;->mKeyFrameEasing:Landroid/support/constraint/motion/utils/Easing; + iget-object v2, v9, Landroid/support/constraint/motion/MotionPaths;->mKeyFrameEasing:Landroid/support/constraint/motion/utils/Easing; - if-eqz v9, :cond_7 + if-eqz v2, :cond_7 .line 159 - iget v9, v15, Landroid/support/constraint/motion/MotionPaths;->time:F + iget v2, v9, Landroid/support/constraint/motion/MotionPaths;->time:F - cmpg-float v9, v9, v11 + cmpg-float v2, v2, v11 - if-gez v9, :cond_8 + if-gez v2, :cond_6 .line 160 - iget-object v9, v15, Landroid/support/constraint/motion/MotionPaths;->mKeyFrameEasing:Landroid/support/constraint/motion/utils/Easing; + iget-object v2, v9, Landroid/support/constraint/motion/MotionPaths;->mKeyFrameEasing:Landroid/support/constraint/motion/utils/Easing; .line 161 - iget v12, v15, Landroid/support/constraint/motion/MotionPaths;->time:F + iget v9, v9, Landroid/support/constraint/motion/MotionPaths;->time:F - move/from16 v17, v12 + move-object v12, v2 - move-object v12, v9 + move v13, v9 goto :goto_6 .line 163 - :cond_8 - invoke-static {v14}, Ljava/lang/Float;->isNaN(F)Z + :cond_6 + invoke-static/range {v16 .. v16}, Ljava/lang/Float;->isNaN(F)Z - move-result v9 + move-result v2 - if-eqz v9, :cond_7 + if-eqz v2, :cond_7 .line 164 - iget v9, v15, Landroid/support/constraint/motion/MotionPaths;->time:F + iget v2, v9, Landroid/support/constraint/motion/MotionPaths;->time:F - move v14, v9 + move/from16 v16, v2 - goto :goto_6 + :cond_7 + :goto_6 + move/from16 v2, p2 - :cond_9 - if-eqz v12, :cond_b + goto :goto_5 + + :cond_8 + if-eqz v12, :cond_a .line 171 - invoke-static {v14}, Ljava/lang/Float;->isNaN(F)Z + invoke-static/range {v16 .. v16}, Ljava/lang/Float;->isNaN(F)Z - move-result v4 + move-result v2 - if-eqz v4, :cond_a + if-eqz v2, :cond_9 - const/high16 v14, 0x3f800000 # 1.0f + const/high16 v16, 0x3f800000 # 1.0f - :cond_a - sub-float v4, v11, v17 + :cond_9 + sub-float v2, v11, v13 - sub-float v14, v14, v17 + sub-float v16, v16, v13 - div-float/2addr v4, v14 + div-float v2, v2, v16 - float-to-double v4, v4 + float-to-double v14, v2 .line 175 - invoke-virtual {v12, v4, v5}, Landroid/support/constraint/motion/utils/Easing;->get(D)D + invoke-virtual {v12, v14, v15}, Landroid/support/constraint/motion/utils/Easing;->get(D)D - move-result-wide v4 + move-result-wide v14 - double-to-float v4, v4 + double-to-float v2, v14 - mul-float v4, v4, v14 + mul-float v2, v2, v16 - add-float v4, v4, v17 + add-float/2addr v2, v13 - float-to-double v4, v4 + float-to-double v14, v2 .line 180 - :cond_b - iget-object v9, v0, Landroid/support/constraint/motion/MotionController;->mSpline:[Landroid/support/constraint/motion/utils/CurveFit; + :cond_a + iget-object v2, v0, Landroid/support/constraint/motion/MotionController;->mSpline:[Landroid/support/constraint/motion/utils/CurveFit; - const/4 v12, 0x0 + const/4 v4, 0x0 - aget-object v9, v9, v12 + aget-object v2, v2, v4 - iget-object v13, v0, Landroid/support/constraint/motion/MotionController;->mInterpolateData:[D + iget-object v9, v0, Landroid/support/constraint/motion/MotionController;->mInterpolateData:[D - invoke-virtual {v9, v4, v5, v13}, Landroid/support/constraint/motion/utils/CurveFit;->getPos(D[D)V + invoke-virtual {v2, v14, v15, v9}, Landroid/support/constraint/motion/utils/CurveFit;->getPos(D[D)V .line 181 - iget-object v9, v0, Landroid/support/constraint/motion/MotionController;->mArcSpline:Landroid/support/constraint/motion/utils/CurveFit; + iget-object v2, v0, Landroid/support/constraint/motion/MotionController;->mArcSpline:Landroid/support/constraint/motion/utils/CurveFit; - if-eqz v9, :cond_c + if-eqz v2, :cond_b .line 182 - iget-object v13, v0, Landroid/support/constraint/motion/MotionController;->mInterpolateData:[D + iget-object v9, v0, Landroid/support/constraint/motion/MotionController;->mInterpolateData:[D - array-length v14, v13 + array-length v12, v9 - if-lez v14, :cond_c + if-lez v12, :cond_b .line 183 - invoke-virtual {v9, v4, v5, v13}, Landroid/support/constraint/motion/utils/CurveFit;->getPos(D[D)V + invoke-virtual {v2, v14, v15, v9}, Landroid/support/constraint/motion/utils/CurveFit;->getPos(D[D)V .line 186 - :cond_c - iget-object v4, v0, Landroid/support/constraint/motion/MotionController;->mStartMotionPath:Landroid/support/constraint/motion/MotionPaths; + :cond_b + iget-object v2, v0, Landroid/support/constraint/motion/MotionController;->mStartMotionPath:Landroid/support/constraint/motion/MotionPaths; - iget-object v5, v0, Landroid/support/constraint/motion/MotionController;->mInterpolateVariables:[I + iget-object v9, v0, Landroid/support/constraint/motion/MotionController;->mInterpolateVariables:[I - iget-object v9, v0, Landroid/support/constraint/motion/MotionController;->mInterpolateData:[D + iget-object v12, v0, Landroid/support/constraint/motion/MotionController;->mInterpolateData:[D mul-int/lit8 v13, v10, 0x2 - invoke-virtual {v4, v5, v9, v1, v13}, Landroid/support/constraint/motion/MotionPaths;->getCenter([I[D[FI)V + invoke-virtual {v2, v9, v12, v1, v13}, Landroid/support/constraint/motion/MotionPaths;->getCenter([I[D[FI)V - if-eqz v6, :cond_d + if-eqz v6, :cond_c .line 189 - aget v4, v1, v13 + aget v2, v1, v13 invoke-virtual {v6, v11}, Landroid/support/constraint/motion/KeyCycleOscillator;->get(F)F - move-result v5 + move-result v9 - add-float/2addr v4, v5 + add-float/2addr v2, v9 - aput v4, v1, v13 + aput v2, v1, v13 goto :goto_7 - :cond_d - if-eqz v16, :cond_e + :cond_c + if-eqz v5, :cond_d .line 191 - aget v4, v1, v13 - - move-object/from16 v5, v16 + aget v2, v1, v13 invoke-virtual {v5, v11}, Landroid/support/constraint/motion/SplineSet;->get(F)F move-result v9 - add-float/2addr v4, v9 + add-float/2addr v2, v9 - aput v4, v1, v13 + aput v2, v1, v13 - goto :goto_8 - - :cond_e + :cond_d :goto_7 - move-object/from16 v5, v16 - - :goto_8 - if-eqz v7, :cond_f + if-eqz v7, :cond_e add-int/lit8 v13, v13, 0x1 .line 194 - aget v4, v1, v13 + aget v2, v1, v13 invoke-virtual {v7, v11}, Landroid/support/constraint/motion/KeyCycleOscillator;->get(F)F move-result v9 - add-float/2addr v4, v9 + add-float/2addr v2, v9 - aput v4, v1, v13 + aput v2, v1, v13 - goto :goto_9 + goto :goto_8 - :cond_f - if-eqz v8, :cond_10 + :cond_e + if-eqz v8, :cond_f add-int/lit8 v13, v13, 0x1 .line 196 - aget v4, v1, v13 + aget v2, v1, v13 invoke-virtual {v8, v11}, Landroid/support/constraint/motion/SplineSet;->get(F)F move-result v9 - add-float/2addr v4, v9 + add-float/2addr v2, v9 - aput v4, v1, v13 + aput v2, v1, v13 - :cond_10 - :goto_9 + :cond_f + :goto_8 add-int/lit8 v10, v10, 0x1 + move/from16 v2, p2 + const/high16 v4, 0x3f800000 # 1.0f goto/16 :goto_4 - :cond_11 + :cond_10 return-void .end method @@ -2019,6 +2034,7 @@ const/4 v0, 0x2 + .line 1237 new-array v0, v0, [F .line 1239 @@ -2109,9 +2125,9 @@ add-int/2addr v6, v7 + .line 1252 aget v8, v0, v2 - .line 1252 invoke-static {v8}, Ljava/lang/Float;->floatToIntBits(F)I move-result v8 @@ -2120,9 +2136,9 @@ add-int/2addr v6, v7 + .line 1253 aget v8, v0, v7 - .line 1253 invoke-static {v8}, Ljava/lang/Float;->floatToIntBits(F)I move-result v8 @@ -2167,16 +2183,16 @@ aput v5, p2, v6 :cond_1 - add-int/2addr v6, v7 + add-int/lit8 v5, v6, 0x1 - sub-int v5, v6, v4 + sub-int v6, v5, v4 .line 1262 - aput v5, p2, v4 + aput v6, p2, v4 add-int/lit8 v3, v3, 0x1 - move v4, v6 + move v4, v5 goto :goto_0 @@ -3101,7 +3117,7 @@ .end method .method interpolate(Landroid/view/View;FJLandroid/support/constraint/motion/KeyCache;)Z - .locals 22 + .locals 20 move-object/from16 v0, p0 @@ -3165,9 +3181,9 @@ move-result-object v7 - move-object v8, v1 + move-object v9, v1 - const/4 v9, 0x0 + const/4 v8, 0x0 :goto_1 invoke-interface {v7}, Ljava/util/Iterator;->hasNext()Z @@ -3188,9 +3204,9 @@ if-eqz v2, :cond_1 .line 944 - move-object v8, v1 + move-object v9, v1 - check-cast v8, Landroid/support/constraint/motion/TimeCycleSplineSet$PathRotate; + check-cast v9, Landroid/support/constraint/motion/TimeCycleSplineSet$PathRotate; goto :goto_1 @@ -3208,17 +3224,17 @@ move-result v1 - or-int/2addr v9, v1 + or-int/2addr v8, v1 goto :goto_1 :cond_2 - move v14, v9 + move v14, v8 goto :goto_2 :cond_3 - move-object v8, v1 + move-object v9, v1 const/4 v14, 0x0 @@ -3233,11 +3249,11 @@ .line 954 aget-object v1, v1, v13 - float-to-double v9, v12 + float-to-double v7, v12 iget-object v2, v0, Landroid/support/constraint/motion/MotionController;->mInterpolateData:[D - invoke-virtual {v1, v9, v10, v2}, Landroid/support/constraint/motion/utils/CurveFit;->getPos(D[D)V + invoke-virtual {v1, v7, v8, v2}, Landroid/support/constraint/motion/utils/CurveFit;->getPos(D[D)V .line 955 iget-object v1, v0, Landroid/support/constraint/motion/MotionController;->mSpline:[Landroid/support/constraint/motion/utils/CurveFit; @@ -3246,7 +3262,7 @@ iget-object v2, v0, Landroid/support/constraint/motion/MotionController;->mInterpolateVelocity:[D - invoke-virtual {v1, v9, v10, v2}, Landroid/support/constraint/motion/utils/CurveFit;->getSlope(D[D)V + invoke-virtual {v1, v7, v8, v2}, Landroid/support/constraint/motion/utils/CurveFit;->getSlope(D[D)V .line 956 iget-object v1, v0, Landroid/support/constraint/motion/MotionController;->mArcSpline:Landroid/support/constraint/motion/utils/CurveFit; @@ -3261,14 +3277,14 @@ if-lez v3, :cond_4 .line 958 - invoke-virtual {v1, v9, v10, v2}, Landroid/support/constraint/motion/utils/CurveFit;->getPos(D[D)V + invoke-virtual {v1, v7, v8, v2}, Landroid/support/constraint/motion/utils/CurveFit;->getPos(D[D)V .line 959 iget-object v1, v0, Landroid/support/constraint/motion/MotionController;->mArcSpline:Landroid/support/constraint/motion/utils/CurveFit; iget-object v2, v0, Landroid/support/constraint/motion/MotionController;->mInterpolateVelocity:[D - invoke-virtual {v1, v9, v10, v2}, Landroid/support/constraint/motion/utils/CurveFit;->getSlope(D[D)V + invoke-virtual {v1, v7, v8, v2}, Landroid/support/constraint/motion/utils/CurveFit;->getSlope(D[D)V .line 962 :cond_4 @@ -3298,17 +3314,16 @@ invoke-interface {v1}, Ljava/util/Collection;->iterator()Ljava/util/Iterator; - move-result-object v16 + move-result-object v10 - :cond_5 :goto_3 - invoke-interface/range {v16 .. v16}, Ljava/util/Iterator;->hasNext()Z + invoke-interface {v10}, Ljava/util/Iterator;->hasNext()Z move-result v1 if-eqz v1, :cond_6 - invoke-interface/range {v16 .. v16}, Ljava/util/Iterator;->next()Ljava/lang/Object; + invoke-interface {v10}, Ljava/util/Iterator;->next()Ljava/lang/Object; move-result-object v1 @@ -3326,27 +3341,41 @@ aget-wide v4, v2, v13 - aget-wide v6, v2, v15 + aget-wide v16, v2, v15 move-object/from16 v2, p1 move v3, v12 + move-wide/from16 v18, v7 + + move-wide/from16 v6, v16 + invoke-virtual/range {v1 .. v7}, Landroid/support/constraint/motion/SplineSet$PathRotate;->setPathRotate(Landroid/view/View;FDD)V + goto :goto_4 + + :cond_5 + move-wide/from16 v18, v7 + + :goto_4 + move-wide/from16 v7, v18 + goto :goto_3 :cond_6 - if-eqz v8, :cond_7 + move-wide/from16 v18, v7 + + if-eqz v9, :cond_7 .line 972 iget-object v1, v0, Landroid/support/constraint/motion/MotionController;->mInterpolateVelocity:[D - aget-wide v16, v1, v13 + aget-wide v7, v1, v13 - aget-wide v18, v1, v15 + aget-wide v16, v1, v15 - move-object v1, v8 + move-object v1, v9 move-object/from16 v2, p1 @@ -3356,11 +3385,7 @@ move-wide/from16 v5, p3 - move-wide/from16 v7, v16 - - move-wide/from16 v20, v9 - - move-wide/from16 v9, v18 + move-wide/from16 v9, v16 invoke-virtual/range {v1 .. v10}, Landroid/support/constraint/motion/TimeCycleSplineSet$PathRotate;->setPathRotate(Landroid/view/View;Landroid/support/constraint/motion/KeyCache;FJDD)Z @@ -3370,12 +3395,7 @@ move v14, v1 - goto :goto_4 - :cond_7 - move-wide/from16 v20, v9 - - :goto_4 const/4 v1, 0x1 .line 976 @@ -3392,7 +3412,7 @@ .line 978 iget-object v3, v0, Landroid/support/constraint/motion/MotionController;->mValuesBuff:[F - move-wide/from16 v4, v20 + move-wide/from16 v4, v18 invoke-virtual {v2, v4, v5, v3}, Landroid/support/constraint/motion/utils/CurveFit;->getPos(D[F)V @@ -3858,13 +3878,9 @@ iput v1, v0, Landroid/support/constraint/motion/MotionPaths;->time:F .line 858 - iget-object v0, p0, Landroid/support/constraint/motion/MotionController;->mEndMotionPath:Landroid/support/constraint/motion/MotionPaths; - iput v1, v0, Landroid/support/constraint/motion/MotionPaths;->position:F .line 859 - iget-object v0, p0, Landroid/support/constraint/motion/MotionController;->mEndMotionPath:Landroid/support/constraint/motion/MotionPaths; - invoke-direct {p0, v0}, Landroid/support/constraint/motion/MotionController;->readView(Landroid/support/constraint/motion/MotionPaths;)V .line 860 @@ -3937,13 +3953,9 @@ iput v1, v0, Landroid/support/constraint/motion/MotionPaths;->time:F .line 840 - iget-object v0, p0, Landroid/support/constraint/motion/MotionController;->mStartMotionPath:Landroid/support/constraint/motion/MotionPaths; - iput v1, v0, Landroid/support/constraint/motion/MotionPaths;->position:F .line 841 - iget-object v0, p0, Landroid/support/constraint/motion/MotionController;->mStartMotionPath:Landroid/support/constraint/motion/MotionPaths; - invoke-virtual {p1}, Landroid/view/View;->getX()F move-result v1 @@ -3985,13 +3997,9 @@ iput v1, v0, Landroid/support/constraint/motion/MotionPaths;->time:F .line 847 - iget-object v0, p0, Landroid/support/constraint/motion/MotionController;->mStartMotionPath:Landroid/support/constraint/motion/MotionPaths; - iput v1, v0, Landroid/support/constraint/motion/MotionPaths;->position:F .line 848 - iget-object v0, p0, Landroid/support/constraint/motion/MotionController;->mStartMotionPath:Landroid/support/constraint/motion/MotionPaths; - invoke-direct {p0, v0}, Landroid/support/constraint/motion/MotionController;->readView(Landroid/support/constraint/motion/MotionPaths;)V .line 849 @@ -4267,9 +4275,9 @@ if-eqz v7, :cond_9 + .line 528 new-array v8, v5, [Landroid/support/constraint/motion/KeyTrigger; - .line 528 invoke-virtual {v7, v8}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object; move-result-object v7 @@ -4792,145 +4800,147 @@ add-int/2addr v1, v4 - new-array v6, v1, [Landroid/support/constraint/motion/MotionPaths; + new-array v1, v1, [Landroid/support/constraint/motion/MotionPaths; .line 657 - iget-object v7, v0, Landroid/support/constraint/motion/MotionController;->mStartMotionPath:Landroid/support/constraint/motion/MotionPaths; - - aput-object v7, v6, v5 + iget-object v6, v0, Landroid/support/constraint/motion/MotionController;->mStartMotionPath:Landroid/support/constraint/motion/MotionPaths; - add-int/lit8 v7, v1, -0x1 + aput-object v6, v1, v5 .line 658 - iget-object v8, v0, Landroid/support/constraint/motion/MotionController;->mEndMotionPath:Landroid/support/constraint/motion/MotionPaths; + array-length v6, v1 + + sub-int/2addr v6, v10 - aput-object v8, v6, v7 + iget-object v7, v0, Landroid/support/constraint/motion/MotionController;->mEndMotionPath:Landroid/support/constraint/motion/MotionPaths; + + aput-object v7, v1, v6 .line 659 - iget-object v7, v0, Landroid/support/constraint/motion/MotionController;->mMotionPaths:Ljava/util/ArrayList; + iget-object v6, v0, Landroid/support/constraint/motion/MotionController;->mMotionPaths:Ljava/util/ArrayList; - invoke-virtual {v7}, Ljava/util/ArrayList;->size()I + invoke-virtual {v6}, Ljava/util/ArrayList;->size()I - move-result v7 + move-result v6 - if-lez v7, :cond_20 + if-lez v6, :cond_20 - iget v7, v0, Landroid/support/constraint/motion/MotionController;->mCurveFitType:I + iget v6, v0, Landroid/support/constraint/motion/MotionController;->mCurveFitType:I - const/4 v8, -0x1 + const/4 v7, -0x1 - if-ne v7, v8, :cond_20 + if-ne v6, v7, :cond_20 .line 660 iput v5, v0, Landroid/support/constraint/motion/MotionController;->mCurveFitType:I .line 662 :cond_20 - iget-object v7, v0, Landroid/support/constraint/motion/MotionController;->mMotionPaths:Ljava/util/ArrayList; + iget-object v6, v0, Landroid/support/constraint/motion/MotionController;->mMotionPaths:Ljava/util/ArrayList; - invoke-virtual {v7}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator; + invoke-virtual {v6}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator; - move-result-object v7 + move-result-object v6 - const/4 v8, 0x1 + const/4 v7, 0x1 :goto_d - invoke-interface {v7}, Ljava/util/Iterator;->hasNext()Z + invoke-interface {v6}, Ljava/util/Iterator;->hasNext()Z - move-result v11 + move-result v8 - if-eqz v11, :cond_21 + if-eqz v8, :cond_21 - invoke-interface {v7}, Ljava/util/Iterator;->next()Ljava/lang/Object; + invoke-interface {v6}, Ljava/util/Iterator;->next()Ljava/lang/Object; - move-result-object v11 + move-result-object v8 - check-cast v11, Landroid/support/constraint/motion/MotionPaths; + check-cast v8, Landroid/support/constraint/motion/MotionPaths; - add-int/lit8 v12, v8, 0x1 + add-int/lit8 v11, v7, 0x1 .line 663 - aput-object v11, v6, v8 + aput-object v8, v1, v7 - move v8, v12 + move v7, v11 goto :goto_d :cond_21 - const/16 v7, 0x12 + const/16 v6, 0x12 .line 668 - new-instance v8, Ljava/util/HashSet; + new-instance v7, Ljava/util/HashSet; - invoke-direct {v8}, Ljava/util/HashSet;->()V + invoke-direct {v7}, Ljava/util/HashSet;->()V .line 669 - iget-object v11, v0, Landroid/support/constraint/motion/MotionController;->mEndMotionPath:Landroid/support/constraint/motion/MotionPaths; + iget-object v8, v0, Landroid/support/constraint/motion/MotionController;->mEndMotionPath:Landroid/support/constraint/motion/MotionPaths; - iget-object v11, v11, Landroid/support/constraint/motion/MotionPaths;->attributes:Ljava/util/LinkedHashMap; + iget-object v8, v8, Landroid/support/constraint/motion/MotionPaths;->attributes:Ljava/util/LinkedHashMap; - invoke-virtual {v11}, Ljava/util/LinkedHashMap;->keySet()Ljava/util/Set; + invoke-virtual {v8}, Ljava/util/LinkedHashMap;->keySet()Ljava/util/Set; - move-result-object v11 + move-result-object v8 - invoke-interface {v11}, Ljava/util/Set;->iterator()Ljava/util/Iterator; + invoke-interface {v8}, Ljava/util/Set;->iterator()Ljava/util/Iterator; - move-result-object v11 + move-result-object v8 :cond_22 :goto_e - invoke-interface {v11}, Ljava/util/Iterator;->hasNext()Z + invoke-interface {v8}, Ljava/util/Iterator;->hasNext()Z - move-result v12 + move-result v11 - if-eqz v12, :cond_23 + if-eqz v11, :cond_23 - invoke-interface {v11}, Ljava/util/Iterator;->next()Ljava/lang/Object; + invoke-interface {v8}, Ljava/util/Iterator;->next()Ljava/lang/Object; - move-result-object v12 + move-result-object v11 - check-cast v12, Ljava/lang/String; + check-cast v11, Ljava/lang/String; .line 670 - iget-object v13, v0, Landroid/support/constraint/motion/MotionController;->mStartMotionPath:Landroid/support/constraint/motion/MotionPaths; + iget-object v12, v0, Landroid/support/constraint/motion/MotionController;->mStartMotionPath:Landroid/support/constraint/motion/MotionPaths; - iget-object v13, v13, Landroid/support/constraint/motion/MotionPaths;->attributes:Ljava/util/LinkedHashMap; + iget-object v12, v12, Landroid/support/constraint/motion/MotionPaths;->attributes:Ljava/util/LinkedHashMap; - invoke-virtual {v13, v12}, Ljava/util/LinkedHashMap;->containsKey(Ljava/lang/Object;)Z + invoke-virtual {v12, v11}, Ljava/util/LinkedHashMap;->containsKey(Ljava/lang/Object;)Z - move-result v13 + move-result v12 - if-eqz v13, :cond_22 + if-eqz v12, :cond_22 .line 671 - new-instance v13, Ljava/lang/StringBuilder; + new-instance v12, Ljava/lang/StringBuilder; - invoke-direct {v13}, Ljava/lang/StringBuilder;->()V + invoke-direct {v12}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v13, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v12, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v13, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v12, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v13}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v12}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v13 + move-result-object v12 - invoke-virtual {v2, v13}, Ljava/util/HashSet;->contains(Ljava/lang/Object;)Z + invoke-virtual {v2, v12}, Ljava/util/HashSet;->contains(Ljava/lang/Object;)Z - move-result v13 + move-result v12 - if-nez v13, :cond_22 + if-nez v12, :cond_22 .line 672 - invoke-virtual {v8, v12}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z + invoke-virtual {v7, v11}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z goto :goto_e + .line 676 :cond_23 new-array v2, v5, [Ljava/lang/String; - .line 676 - invoke-virtual {v8, v2}, Ljava/util/HashSet;->toArray([Ljava/lang/Object;)[Ljava/lang/Object; + invoke-virtual {v7, v2}, Ljava/util/HashSet;->toArray([Ljava/lang/Object;)[Ljava/lang/Object; move-result-object v2 @@ -4939,6 +4949,8 @@ iput-object v2, v0, Landroid/support/constraint/motion/MotionController;->mAttributeNames:[Ljava/lang/String; .line 680 + iget-object v2, v0, Landroid/support/constraint/motion/MotionController;->mAttributeNames:[Ljava/lang/String; + array-length v2, v2 new-array v2, v2, [I @@ -4949,63 +4961,66 @@ .line 681 :goto_f - iget-object v8, v0, Landroid/support/constraint/motion/MotionController;->mAttributeNames:[Ljava/lang/String; + iget-object v7, v0, Landroid/support/constraint/motion/MotionController;->mAttributeNames:[Ljava/lang/String; - array-length v9, v8 + array-length v8, v7 - if-ge v2, v9, :cond_26 + if-ge v2, v8, :cond_26 .line 682 - aget-object v8, v8, v2 + aget-object v7, v7, v2 .line 683 - iget-object v9, v0, Landroid/support/constraint/motion/MotionController;->mAttributeInterpCount:[I + iget-object v8, v0, Landroid/support/constraint/motion/MotionController;->mAttributeInterpCount:[I - aput v5, v9, v2 + aput v5, v8, v2 - const/4 v9, 0x0 + const/4 v8, 0x0 + .line 684 :goto_10 - if-ge v9, v1, :cond_25 + array-length v9, v1 + + if-ge v8, v9, :cond_25 .line 685 - aget-object v11, v6, v9 + aget-object v9, v1, v8 - iget-object v11, v11, Landroid/support/constraint/motion/MotionPaths;->attributes:Ljava/util/LinkedHashMap; + iget-object v9, v9, Landroid/support/constraint/motion/MotionPaths;->attributes:Ljava/util/LinkedHashMap; - invoke-virtual {v11, v8}, Ljava/util/LinkedHashMap;->containsKey(Ljava/lang/Object;)Z + invoke-virtual {v9, v7}, Ljava/util/LinkedHashMap;->containsKey(Ljava/lang/Object;)Z - move-result v11 + move-result v9 - if-eqz v11, :cond_24 + if-eqz v9, :cond_24 .line 686 - iget-object v11, v0, Landroid/support/constraint/motion/MotionController;->mAttributeInterpCount:[I + iget-object v9, v0, Landroid/support/constraint/motion/MotionController;->mAttributeInterpCount:[I - aget v12, v11, v2 + aget v11, v9, v2 - aget-object v9, v6, v9 + aget-object v8, v1, v8 - iget-object v9, v9, Landroid/support/constraint/motion/MotionPaths;->attributes:Ljava/util/LinkedHashMap; + iget-object v8, v8, Landroid/support/constraint/motion/MotionPaths;->attributes:Ljava/util/LinkedHashMap; - invoke-virtual {v9, v8}, Ljava/util/LinkedHashMap;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-virtual {v8, v7}, Ljava/util/LinkedHashMap;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v8 + move-result-object v7 - check-cast v8, Landroid/support/constraint/ConstraintAttribute; + check-cast v7, Landroid/support/constraint/ConstraintAttribute; - invoke-virtual {v8}, Landroid/support/constraint/ConstraintAttribute;->noOfInterpValues()I + invoke-virtual {v7}, Landroid/support/constraint/ConstraintAttribute;->noOfInterpValues()I - move-result v8 + move-result v7 - add-int/2addr v12, v8 + add-int/2addr v11, v7 - aput v12, v11, v2 + aput v11, v9, v2 goto :goto_11 :cond_24 - add-int/lit8 v9, v9, 0x1 + add-int/lit8 v8, v8, 0x1 goto :goto_10 @@ -5017,13 +5032,13 @@ .line 691 :cond_26 - aget-object v2, v6, v5 + aget-object v2, v1, v5 iget v2, v2, Landroid/support/constraint/motion/MotionPaths;->mPathMotionArc:I - sget v8, Landroid/support/constraint/motion/Key;->UNSET:I + sget v7, Landroid/support/constraint/motion/Key;->UNSET:I - if-eq v2, v8, :cond_27 + if-eq v2, v7, :cond_27 const/4 v2, 0x1 @@ -5034,48 +5049,54 @@ .line 692 :goto_12 - iget-object v8, v0, Landroid/support/constraint/motion/MotionController;->mAttributeNames:[Ljava/lang/String; + iget-object v7, v0, Landroid/support/constraint/motion/MotionController;->mAttributeNames:[Ljava/lang/String; - array-length v8, v8 + array-length v7, v7 - add-int/2addr v7, v8 + add-int/2addr v6, v7 - new-array v8, v7, [Z + new-array v6, v6, [Z - const/4 v9, 0x1 + const/4 v7, 0x1 + .line 693 :goto_13 - if-ge v9, v1, :cond_28 + array-length v8, v1 + + if-ge v7, v8, :cond_28 .line 694 - aget-object v11, v6, v9 + aget-object v8, v1, v7 - add-int/lit8 v12, v9, -0x1 + add-int/lit8 v9, v7, -0x1 - aget-object v12, v6, v12 + aget-object v9, v1, v9 - iget-object v13, v0, Landroid/support/constraint/motion/MotionController;->mAttributeNames:[Ljava/lang/String; + iget-object v11, v0, Landroid/support/constraint/motion/MotionController;->mAttributeNames:[Ljava/lang/String; - invoke-virtual {v11, v12, v8, v13, v2}, Landroid/support/constraint/motion/MotionPaths;->different(Landroid/support/constraint/motion/MotionPaths;[Z[Ljava/lang/String;Z)V + invoke-virtual {v8, v9, v6, v11, v2}, Landroid/support/constraint/motion/MotionPaths;->different(Landroid/support/constraint/motion/MotionPaths;[Z[Ljava/lang/String;Z)V - add-int/lit8 v9, v9, 0x1 + add-int/lit8 v7, v7, 0x1 goto :goto_13 :cond_28 const/4 v2, 0x1 - const/4 v9, 0x0 + const/4 v7, 0x0 + .line 698 :goto_14 - if-ge v2, v7, :cond_2a + array-length v8, v6 + + if-ge v2, v8, :cond_2a .line 699 - aget-boolean v11, v8, v2 + aget-boolean v8, v6, v2 - if-eqz v11, :cond_29 + if-eqz v8, :cond_29 - add-int/lit8 v9, v9, 0x1 + add-int/lit8 v7, v7, 0x1 :cond_29 add-int/lit8 v2, v2, 0x1 @@ -5084,16 +5105,18 @@ .line 704 :cond_2a - new-array v2, v9, [I + new-array v2, v7, [I iput-object v2, v0, Landroid/support/constraint/motion/MotionController;->mInterpolateVariables:[I .line 705 - array-length v9, v2 + iget-object v2, v0, Landroid/support/constraint/motion/MotionController;->mInterpolateVariables:[I - new-array v9, v9, [D + array-length v7, v2 - iput-object v9, v0, Landroid/support/constraint/motion/MotionController;->mInterpolateData:[D + new-array v7, v7, [D + + iput-object v7, v0, Landroid/support/constraint/motion/MotionController;->mInterpolateData:[D .line 706 array-length v2, v2 @@ -5104,24 +5127,27 @@ const/4 v2, 0x1 - const/4 v9, 0x0 + const/4 v7, 0x0 + .line 709 :goto_15 - if-ge v2, v7, :cond_2c + array-length v8, v6 + + if-ge v2, v8, :cond_2c .line 710 - aget-boolean v11, v8, v2 + aget-boolean v8, v6, v2 - if-eqz v11, :cond_2b + if-eqz v8, :cond_2b .line 711 - iget-object v11, v0, Landroid/support/constraint/motion/MotionController;->mInterpolateVariables:[I + iget-object v8, v0, Landroid/support/constraint/motion/MotionController;->mInterpolateVariables:[I - add-int/lit8 v12, v9, 0x1 + add-int/lit8 v9, v7, 0x1 - aput v2, v11, v9 + aput v2, v8, v7 - move v9, v12 + move v7, v9 :cond_2b add-int/lit8 v2, v2, 0x1 @@ -5130,264 +5156,275 @@ .line 714 :cond_2c - iget-object v2, v0, Landroid/support/constraint/motion/MotionController;->mInterpolateVariables:[I + array-length v2, v1 - array-length v2, v2 + iget-object v6, v0, Landroid/support/constraint/motion/MotionController;->mInterpolateVariables:[I - new-array v7, v4, [I + array-length v6, v6 - aput v2, v7, v10 + filled-new-array {v2, v6}, [I - aput v1, v7, v5 + move-result-object v2 - sget-object v2, Ljava/lang/Double;->TYPE:Ljava/lang/Class; + const-class v6, D - invoke-static {v2, v7}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;[I)Ljava/lang/Object; + invoke-static {v6, v2}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;[I)Ljava/lang/Object; move-result-object v2 check-cast v2, [[D .line 715 - new-array v7, v1, [D + array-length v6, v1 - const/4 v8, 0x0 + new-array v6, v6, [D + const/4 v7, 0x0 + + .line 717 :goto_16 - if-ge v8, v1, :cond_2d + array-length v8, v1 + + if-ge v7, v8, :cond_2d .line 718 - aget-object v9, v6, v8 + aget-object v8, v1, v7 - aget-object v11, v2, v8 + aget-object v9, v2, v7 - iget-object v12, v0, Landroid/support/constraint/motion/MotionController;->mInterpolateVariables:[I + iget-object v11, v0, Landroid/support/constraint/motion/MotionController;->mInterpolateVariables:[I - invoke-virtual {v9, v11, v12}, Landroid/support/constraint/motion/MotionPaths;->fillStandard([D[I)V + invoke-virtual {v8, v9, v11}, Landroid/support/constraint/motion/MotionPaths;->fillStandard([D[I)V .line 719 - aget-object v9, v6, v8 + aget-object v8, v1, v7 - iget v9, v9, Landroid/support/constraint/motion/MotionPaths;->time:F + iget v8, v8, Landroid/support/constraint/motion/MotionPaths;->time:F - float-to-double v11, v9 + float-to-double v8, v8 - aput-wide v11, v7, v8 + aput-wide v8, v6, v7 - add-int/lit8 v8, v8, 0x1 + add-int/lit8 v7, v7, 0x1 goto :goto_16 :cond_2d - const/4 v8, 0x0 + const/4 v7, 0x0 .line 722 :goto_17 - iget-object v9, v0, Landroid/support/constraint/motion/MotionController;->mInterpolateVariables:[I + iget-object v8, v0, Landroid/support/constraint/motion/MotionController;->mInterpolateVariables:[I - array-length v11, v9 + array-length v9, v8 - if-ge v8, v11, :cond_2f + if-ge v7, v9, :cond_2f .line 723 - aget v9, v9, v8 + aget v8, v8, v7 .line 724 - sget-object v11, Landroid/support/constraint/motion/MotionPaths;->names:[Ljava/lang/String; + sget-object v9, Landroid/support/constraint/motion/MotionPaths;->names:[Ljava/lang/String; - array-length v11, v11 + array-length v9, v9 - if-ge v9, v11, :cond_2e + if-ge v8, v9, :cond_2e .line 725 - new-instance v9, Ljava/lang/StringBuilder; + new-instance v8, Ljava/lang/StringBuilder; - invoke-direct {v9}, Ljava/lang/StringBuilder;->()V + invoke-direct {v8}, Ljava/lang/StringBuilder;->()V - sget-object v11, Landroid/support/constraint/motion/MotionPaths;->names:[Ljava/lang/String; + sget-object v9, Landroid/support/constraint/motion/MotionPaths;->names:[Ljava/lang/String; - iget-object v12, v0, Landroid/support/constraint/motion/MotionController;->mInterpolateVariables:[I + iget-object v11, v0, Landroid/support/constraint/motion/MotionController;->mInterpolateVariables:[I - aget v12, v12, v8 + aget v11, v11, v7 - aget-object v11, v11, v12 + aget-object v9, v9, v11 - invoke-virtual {v9, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v8, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v11, " [" + const-string v9, " [" - invoke-virtual {v9, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v8, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v9}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v8}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v9 + move-result-object v8 - const/4 v11, 0x0 + move-object v9, v8 + const/4 v8, 0x0 + + .line 726 :goto_18 - if-ge v11, v1, :cond_2e + array-length v11, v1 + + if-ge v8, v11, :cond_2e .line 727 - new-instance v12, Ljava/lang/StringBuilder; + new-instance v11, Ljava/lang/StringBuilder; - invoke-direct {v12}, Ljava/lang/StringBuilder;->()V + invoke-direct {v11}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v12, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v11, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - aget-object v9, v2, v11 + aget-object v9, v2, v8 - aget-wide v13, v9, v8 + aget-wide v12, v9, v7 - invoke-virtual {v12, v13, v14}, Ljava/lang/StringBuilder;->append(D)Ljava/lang/StringBuilder; + invoke-virtual {v11, v12, v13}, Ljava/lang/StringBuilder;->append(D)Ljava/lang/StringBuilder; - invoke-virtual {v12}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v11}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; move-result-object v9 - add-int/lit8 v11, v11, 0x1 + add-int/lit8 v8, v8, 0x1 goto :goto_18 :cond_2e - add-int/lit8 v8, v8, 0x1 + add-int/lit8 v7, v7, 0x1 goto :goto_17 .line 731 :cond_2f - iget-object v8, v0, Landroid/support/constraint/motion/MotionController;->mAttributeNames:[Ljava/lang/String; + iget-object v7, v0, Landroid/support/constraint/motion/MotionController;->mAttributeNames:[Ljava/lang/String; - array-length v8, v8 + array-length v7, v7 - add-int/2addr v8, v10 + add-int/2addr v7, v10 - new-array v8, v8, [Landroid/support/constraint/motion/utils/CurveFit; + new-array v7, v7, [Landroid/support/constraint/motion/utils/CurveFit; - iput-object v8, v0, Landroid/support/constraint/motion/MotionController;->mSpline:[Landroid/support/constraint/motion/utils/CurveFit; + iput-object v7, v0, Landroid/support/constraint/motion/MotionController;->mSpline:[Landroid/support/constraint/motion/utils/CurveFit; - const/4 v8, 0x0 + const/4 v7, 0x0 .line 733 :goto_19 - iget-object v9, v0, Landroid/support/constraint/motion/MotionController;->mAttributeNames:[Ljava/lang/String; + iget-object v8, v0, Landroid/support/constraint/motion/MotionController;->mAttributeNames:[Ljava/lang/String; - array-length v11, v9 + array-length v9, v8 - if-ge v8, v11, :cond_33 + if-ge v7, v9, :cond_33 - const/4 v11, 0x0 + const/4 v9, 0x0 .line 735 - move-object v12, v11 + move-object v11, v9 - check-cast v12, [[D + check-cast v11, [[D .line 737 - aget-object v9, v9, v8 + aget-object v8, v8, v7 - move-object v13, v11 + move-object v12, v9 - move-object v15, v13 + move-object v14, v11 - const/4 v12, 0x0 + const/4 v11, 0x0 - const/4 v14, 0x0 + const/4 v13, 0x0 + .line 739 :goto_1a - if-ge v12, v1, :cond_32 + array-length v15, v1 + + if-ge v11, v15, :cond_32 .line 740 - aget-object v11, v6, v12 + aget-object v15, v1, v11 - invoke-virtual {v11, v9}, Landroid/support/constraint/motion/MotionPaths;->hasCustomData(Ljava/lang/String;)Z + invoke-virtual {v15, v8}, Landroid/support/constraint/motion/MotionPaths;->hasCustomData(Ljava/lang/String;)Z - move-result v11 + move-result v15 - if-eqz v11, :cond_31 + if-eqz v15, :cond_31 - if-nez v15, :cond_30 + if-nez v14, :cond_30 .line 742 - new-array v11, v1, [D + array-length v12, v1 - .line 743 - aget-object v13, v6, v12 + new-array v12, v12, [D - invoke-virtual {v13, v9}, Landroid/support/constraint/motion/MotionPaths;->getCustomDataCount(Ljava/lang/String;)I - - move-result v13 + .line 743 + array-length v14, v1 - new-array v15, v4, [I + aget-object v15, v1, v11 - aput v13, v15, v10 + invoke-virtual {v15, v8}, Landroid/support/constraint/motion/MotionPaths;->getCustomDataCount(Ljava/lang/String;)I - aput v1, v15, v5 + move-result v15 - sget-object v13, Ljava/lang/Double;->TYPE:Ljava/lang/Class; + filled-new-array {v14, v15}, [I - invoke-static {v13, v15}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;[I)Ljava/lang/Object; + move-result-object v14 - move-result-object v13 + const-class v15, D - check-cast v13, [[D + invoke-static {v15, v14}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;[I)Ljava/lang/Object; - move-object v15, v13 + move-result-object v14 - move-object v13, v11 + check-cast v14, [[D .line 745 :cond_30 - aget-object v11, v6, v12 + aget-object v15, v1, v11 - iget v11, v11, Landroid/support/constraint/motion/MotionPaths;->time:F + iget v15, v15, Landroid/support/constraint/motion/MotionPaths;->time:F - float-to-double v10, v11 + float-to-double v9, v15 - aput-wide v10, v13, v14 + aput-wide v9, v12, v13 .line 746 - aget-object v10, v6, v12 + aget-object v9, v1, v11 - aget-object v11, v15, v14 + aget-object v10, v14, v13 - invoke-virtual {v10, v9, v11, v5}, Landroid/support/constraint/motion/MotionPaths;->getCustomData(Ljava/lang/String;[DI)I + invoke-virtual {v9, v8, v10, v5}, Landroid/support/constraint/motion/MotionPaths;->getCustomData(Ljava/lang/String;[DI)I - add-int/lit8 v14, v14, 0x1 + add-int/lit8 v13, v13, 0x1 :cond_31 - add-int/lit8 v12, v12, 0x1 + add-int/lit8 v11, v11, 0x1 - const/4 v10, 0x1 + const/4 v9, 0x0 - const/4 v11, 0x0 + const/4 v10, 0x1 goto :goto_1a .line 750 :cond_32 - invoke-static {v13, v14}, Ljava/util/Arrays;->copyOf([DI)[D + invoke-static {v12, v13}, Ljava/util/Arrays;->copyOf([DI)[D - move-result-object v9 + move-result-object v8 .line 751 - invoke-static {v15, v14}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object; + invoke-static {v14, v13}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object; - move-result-object v10 + move-result-object v9 - check-cast v10, [[D + check-cast v9, [[D .line 752 - iget-object v11, v0, Landroid/support/constraint/motion/MotionController;->mSpline:[Landroid/support/constraint/motion/utils/CurveFit; + iget-object v10, v0, Landroid/support/constraint/motion/MotionController;->mSpline:[Landroid/support/constraint/motion/utils/CurveFit; - add-int/lit8 v8, v8, 0x1 + add-int/lit8 v7, v7, 0x1 - iget v12, v0, Landroid/support/constraint/motion/MotionController;->mCurveFitType:I + iget v11, v0, Landroid/support/constraint/motion/MotionController;->mCurveFitType:I - invoke-static {v12, v9, v10}, Landroid/support/constraint/motion/utils/CurveFit;->get(I[D[[D)Landroid/support/constraint/motion/utils/CurveFit; + invoke-static {v11, v8, v9}, Landroid/support/constraint/motion/utils/CurveFit;->get(I[D[[D)Landroid/support/constraint/motion/utils/CurveFit; - move-result-object v9 + move-result-object v8 - aput-object v9, v11, v8 + aput-object v8, v10, v7 const/4 v10, 0x1 @@ -5395,43 +5432,42 @@ .line 755 :cond_33 - iget-object v8, v0, Landroid/support/constraint/motion/MotionController;->mSpline:[Landroid/support/constraint/motion/utils/CurveFit; + iget-object v7, v0, Landroid/support/constraint/motion/MotionController;->mSpline:[Landroid/support/constraint/motion/utils/CurveFit; - iget v9, v0, Landroid/support/constraint/motion/MotionController;->mCurveFitType:I + iget v8, v0, Landroid/support/constraint/motion/MotionController;->mCurveFitType:I - invoke-static {v9, v7, v2}, Landroid/support/constraint/motion/utils/CurveFit;->get(I[D[[D)Landroid/support/constraint/motion/utils/CurveFit; + invoke-static {v8, v6, v2}, Landroid/support/constraint/motion/utils/CurveFit;->get(I[D[[D)Landroid/support/constraint/motion/utils/CurveFit; move-result-object v2 - aput-object v2, v8, v5 + aput-object v2, v7, v5 .line 757 - aget-object v2, v6, v5 + aget-object v2, v1, v5 iget v2, v2, Landroid/support/constraint/motion/MotionPaths;->mPathMotionArc:I - sget v7, Landroid/support/constraint/motion/Key;->UNSET:I + sget v6, Landroid/support/constraint/motion/Key;->UNSET:I - if-eq v2, v7, :cond_35 + if-eq v2, v6, :cond_35 + + .line 758 + array-length v2, v1 .line 759 - new-array v2, v1, [I + new-array v6, v2, [I .line 760 - new-array v7, v1, [D - - new-array v8, v4, [I + new-array v7, v2, [D - const/4 v9, 0x1 - - aput v4, v8, v9 + .line 761 + filled-new-array {v2, v4}, [I - aput v1, v8, v5 + move-result-object v4 - .line 761 - sget-object v4, Ljava/lang/Double;->TYPE:Ljava/lang/Class; + const-class v8, D - invoke-static {v4, v8}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;[I)Ljava/lang/Object; + invoke-static {v8, v4}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;[I)Ljava/lang/Object; move-result-object v4 @@ -5440,17 +5476,17 @@ const/4 v8, 0x0 :goto_1b - if-ge v8, v1, :cond_34 + if-ge v8, v2, :cond_34 .line 763 - aget-object v9, v6, v8 + aget-object v9, v1, v8 iget v9, v9, Landroid/support/constraint/motion/MotionPaths;->mPathMotionArc:I - aput v9, v2, v8 + aput v9, v6, v8 .line 764 - aget-object v9, v6, v8 + aget-object v9, v1, v8 iget v9, v9, Landroid/support/constraint/motion/MotionPaths;->time:F @@ -5461,7 +5497,7 @@ .line 765 aget-object v9, v4, v8 - aget-object v10, v6, v8 + aget-object v10, v1, v8 iget v10, v10, Landroid/support/constraint/motion/MotionPaths;->x:F @@ -5472,7 +5508,7 @@ .line 766 aget-object v9, v4, v8 - aget-object v10, v6, v8 + aget-object v10, v1, v8 iget v10, v10, Landroid/support/constraint/motion/MotionPaths;->y:F @@ -5488,7 +5524,7 @@ .line 769 :cond_34 - invoke-static {v2, v7, v4}, Landroid/support/constraint/motion/utils/CurveFit;->getArc([I[D[[D)Landroid/support/constraint/motion/utils/CurveFit; + invoke-static {v6, v7, v4}, Landroid/support/constraint/motion/utils/CurveFit;->getArc([I[D[[D)Landroid/support/constraint/motion/utils/CurveFit; move-result-object v1 diff --git a/smali/android/support/constraint/motion/MotionLayout$2.smali b/smali/android/support/constraint/motion/MotionLayout$2.smali index a624331c..aa8b7316 100644 --- a/smali/android/support/constraint/motion/MotionLayout$2.smali +++ b/smali/android/support/constraint/motion/MotionLayout$2.smali @@ -34,6 +34,8 @@ sput-object v0, Landroid/support/constraint/motion/MotionLayout$2;->$SwitchMap$android$support$constraint$motion$MotionLayout$TransitionState:[I :try_start_0 + sget-object v0, Landroid/support/constraint/motion/MotionLayout$2;->$SwitchMap$android$support$constraint$motion$MotionLayout$TransitionState:[I + sget-object v1, Landroid/support/constraint/motion/MotionLayout$TransitionState;->UNDEFINED:Landroid/support/constraint/motion/MotionLayout$TransitionState; invoke-virtual {v1}, Landroid/support/constraint/motion/MotionLayout$TransitionState;->ordinal()I diff --git a/smali/android/support/constraint/motion/MotionLayout$DecelerateInterpolator.smali b/smali/android/support/constraint/motion/MotionLayout$DecelerateInterpolator.smali index 4e754660..cd19e6e9 100644 --- a/smali/android/support/constraint/motion/MotionLayout$DecelerateInterpolator.smali +++ b/smali/android/support/constraint/motion/MotionLayout$DecelerateInterpolator.smali @@ -62,7 +62,7 @@ .end method .method public getInterpolation(F)F - .locals 4 + .locals 5 .line 1688 iget v0, p0, Landroid/support/constraint/motion/MotionLayout$DecelerateInterpolator;->initalV:F @@ -88,36 +88,35 @@ .line 1692 :cond_0 - iget-object v3, p0, Landroid/support/constraint/motion/MotionLayout$DecelerateInterpolator;->this$0:Landroid/support/constraint/motion/MotionLayout; - - mul-float v2, v2, p1 + iget-object v0, p0, Landroid/support/constraint/motion/MotionLayout$DecelerateInterpolator;->this$0:Landroid/support/constraint/motion/MotionLayout; - sub-float/2addr v0, v2 + iget v2, p0, Landroid/support/constraint/motion/MotionLayout$DecelerateInterpolator;->initalV:F - iput v0, v3, Landroid/support/constraint/motion/MotionLayout;->mLastVelocity:F + iget v3, p0, Landroid/support/constraint/motion/MotionLayout$DecelerateInterpolator;->maxA:F - .line 1693 - iget v0, p0, Landroid/support/constraint/motion/MotionLayout$DecelerateInterpolator;->initalV:F + mul-float v4, v3, p1 - mul-float v0, v0, p1 + sub-float v4, v2, v4 - iget v2, p0, Landroid/support/constraint/motion/MotionLayout$DecelerateInterpolator;->maxA:F + iput v4, v0, Landroid/support/constraint/motion/MotionLayout;->mLastVelocity:F mul-float v2, v2, p1 - mul-float v2, v2, p1 + mul-float v3, v3, p1 - div-float/2addr v2, v1 + mul-float v3, v3, p1 - sub-float/2addr v0, v2 + div-float/2addr v3, v1 + + sub-float/2addr v2, v3 .line 1694 iget p1, p0, Landroid/support/constraint/motion/MotionLayout$DecelerateInterpolator;->currentP:F :goto_0 - add-float/2addr v0, p1 + add-float/2addr v2, p1 - return v0 + return v2 :cond_1 neg-float v2, v0 @@ -137,28 +136,27 @@ .line 1700 :cond_2 - iget-object v2, p0, Landroid/support/constraint/motion/MotionLayout$DecelerateInterpolator;->this$0:Landroid/support/constraint/motion/MotionLayout; - - mul-float v3, v3, p1 + iget-object v0, p0, Landroid/support/constraint/motion/MotionLayout$DecelerateInterpolator;->this$0:Landroid/support/constraint/motion/MotionLayout; - add-float/2addr v0, v3 + iget v2, p0, Landroid/support/constraint/motion/MotionLayout$DecelerateInterpolator;->initalV:F - iput v0, v2, Landroid/support/constraint/motion/MotionLayout;->mLastVelocity:F + iget v3, p0, Landroid/support/constraint/motion/MotionLayout$DecelerateInterpolator;->maxA:F - .line 1701 - iget v0, p0, Landroid/support/constraint/motion/MotionLayout$DecelerateInterpolator;->initalV:F + mul-float v4, v3, p1 - mul-float v0, v0, p1 + add-float/2addr v4, v2 - iget v2, p0, Landroid/support/constraint/motion/MotionLayout$DecelerateInterpolator;->maxA:F + iput v4, v0, Landroid/support/constraint/motion/MotionLayout;->mLastVelocity:F mul-float v2, v2, p1 - mul-float v2, v2, p1 + mul-float v3, v3, p1 + + mul-float v3, v3, p1 - div-float/2addr v2, v1 + div-float/2addr v3, v1 - add-float/2addr v0, v2 + add-float/2addr v2, v3 .line 1702 iget p1, p0, Landroid/support/constraint/motion/MotionLayout$DecelerateInterpolator;->currentP:F diff --git a/smali/android/support/constraint/motion/MotionLayout$DevModeDraw.smali b/smali/android/support/constraint/motion/MotionLayout$DevModeDraw.smali index e58b968b..09d178ae 100644 --- a/smali/android/support/constraint/motion/MotionLayout$DevModeDraw.smali +++ b/smali/android/support/constraint/motion/MotionLayout$DevModeDraw.smali @@ -121,6 +121,8 @@ iput-object v4, p0, Landroid/support/constraint/motion/MotionLayout$DevModeDraw;->mPaint:Landroid/graphics/Paint; .line 2550 + iget-object v4, p0, Landroid/support/constraint/motion/MotionLayout$DevModeDraw;->mPaint:Landroid/graphics/Paint; + invoke-virtual {v4, v3}, Landroid/graphics/Paint;->setAntiAlias(Z)V .line 2551 @@ -150,6 +152,8 @@ iput-object v0, p0, Landroid/support/constraint/motion/MotionLayout$DevModeDraw;->mPaintKeyframes:Landroid/graphics/Paint; .line 2556 + iget-object v0, p0, Landroid/support/constraint/motion/MotionLayout$DevModeDraw;->mPaintKeyframes:Landroid/graphics/Paint; + invoke-virtual {v0, v3}, Landroid/graphics/Paint;->setAntiAlias(Z)V .line 2557 @@ -177,6 +181,8 @@ iput-object v0, p0, Landroid/support/constraint/motion/MotionLayout$DevModeDraw;->mPaintGraph:Landroid/graphics/Paint; .line 2562 + iget-object v0, p0, Landroid/support/constraint/motion/MotionLayout$DevModeDraw;->mPaintGraph:Landroid/graphics/Paint; + invoke-virtual {v0, v3}, Landroid/graphics/Paint;->setAntiAlias(Z)V .line 2563 @@ -204,6 +210,8 @@ iput-object v0, p0, Landroid/support/constraint/motion/MotionLayout$DevModeDraw;->mTextPaint:Landroid/graphics/Paint; .line 2568 + iget-object v0, p0, Landroid/support/constraint/motion/MotionLayout$DevModeDraw;->mTextPaint:Landroid/graphics/Paint; + invoke-virtual {v0, v3}, Landroid/graphics/Paint;->setAntiAlias(Z)V .line 2569 @@ -236,9 +244,9 @@ const/16 p1, 0x8 + .line 2571 new-array p1, p1, [F - .line 2571 iput-object p1, p0, Landroid/support/constraint/motion/MotionLayout$DevModeDraw;->mRectangle:[F .line 2572 @@ -249,6 +257,8 @@ iput-object p1, p0, Landroid/support/constraint/motion/MotionLayout$DevModeDraw;->mFillPaint:Landroid/graphics/Paint; .line 2573 + iget-object p1, p0, Landroid/support/constraint/motion/MotionLayout$DevModeDraw;->mFillPaint:Landroid/graphics/Paint; + invoke-virtual {p1, v3}, Landroid/graphics/Paint;->setAntiAlias(Z)V .line 2574 @@ -267,22 +277,24 @@ iput-object p1, p0, Landroid/support/constraint/motion/MotionLayout$DevModeDraw;->mDashPathEffect:Landroid/graphics/DashPathEffect; .line 2575 - iget-object v0, p0, Landroid/support/constraint/motion/MotionLayout$DevModeDraw;->mPaintGraph:Landroid/graphics/Paint; + iget-object p1, p0, Landroid/support/constraint/motion/MotionLayout$DevModeDraw;->mPaintGraph:Landroid/graphics/Paint; - invoke-virtual {v0, p1}, Landroid/graphics/Paint;->setPathEffect(Landroid/graphics/PathEffect;)Landroid/graphics/PathEffect; + iget-object v0, p0, Landroid/support/constraint/motion/MotionLayout$DevModeDraw;->mDashPathEffect:Landroid/graphics/DashPathEffect; + + invoke-virtual {p1, v0}, Landroid/graphics/Paint;->setPathEffect(Landroid/graphics/PathEffect;)Landroid/graphics/PathEffect; const/16 p1, 0x64 + .line 2576 new-array p1, p1, [F - .line 2576 iput-object p1, p0, Landroid/support/constraint/motion/MotionLayout$DevModeDraw;->mKeyFramePoints:[F const/16 p1, 0x32 + .line 2577 new-array p1, p1, [I - .line 2577 iput-object p1, p0, Landroid/support/constraint/motion/MotionLayout$DevModeDraw;->mPathMode:[I .line 2579 @@ -363,7 +375,12 @@ const/4 v1, 0x1 + .line 2737 :cond_0 + iget-object v3, p0, Landroid/support/constraint/motion/MotionLayout$DevModeDraw;->mPathMode:[I + + aget v3, v3, v0 + const/4 v5, 0x2 if-ne v3, v5, :cond_1 @@ -1398,9 +1415,9 @@ .line 2687 iget-object v0, v6, Landroid/support/constraint/motion/MotionLayout$DevModeDraw;->mPathMode:[I - aget v0, v0, v1 + aget v2, v0, v1 - if-ne v0, v13, :cond_3 + if-ne v2, v13, :cond_3 sub-float v0, v5, v16 @@ -1419,8 +1436,11 @@ goto :goto_3 + .line 2689 :cond_3 - if-ne v0, v15, :cond_4 + aget v2, v0, v1 + + if-ne v2, v15, :cond_4 sub-float v0, v5, v16 @@ -1431,7 +1451,10 @@ goto :goto_2 + .line 2691 :cond_4 + aget v0, v0, v1 + if-ne v0, v3, :cond_2 sub-float v2, v5, v16 diff --git a/smali/android/support/constraint/motion/MotionLayout$Model.smali b/smali/android/support/constraint/motion/MotionLayout$Model.smali index 4e3d4b16..e832b2c0 100644 --- a/smali/android/support/constraint/motion/MotionLayout$Model.smali +++ b/smali/android/support/constraint/motion/MotionLayout$Model.smali @@ -1913,13 +1913,9 @@ iput v0, v2, Landroid/support/constraint/motion/MotionLayout;->mWidthMeasureMode:I .line 2197 - iget-object v2, p0, Landroid/support/constraint/motion/MotionLayout$Model;->this$0:Landroid/support/constraint/motion/MotionLayout; - iput v1, v2, Landroid/support/constraint/motion/MotionLayout;->mHeightMeasureMode:I .line 2198 - iget-object v2, p0, Landroid/support/constraint/motion/MotionLayout$Model;->this$0:Landroid/support/constraint/motion/MotionLayout; - invoke-virtual {v2}, Landroid/support/constraint/motion/MotionLayout;->getOptimizationLevel()I move-result v2 @@ -2018,14 +2014,10 @@ iput v0, v3, Landroid/support/constraint/motion/MotionLayout;->mWidthMeasureMode:I .line 2223 - iget-object v0, p0, Landroid/support/constraint/motion/MotionLayout$Model;->this$0:Landroid/support/constraint/motion/MotionLayout; - - iput v1, v0, Landroid/support/constraint/motion/MotionLayout;->mHeightMeasureMode:I + iput v1, v3, Landroid/support/constraint/motion/MotionLayout;->mHeightMeasureMode:I .line 2224 - iget-object v0, p0, Landroid/support/constraint/motion/MotionLayout$Model;->this$0:Landroid/support/constraint/motion/MotionLayout; - - iget v0, v0, Landroid/support/constraint/motion/MotionLayout;->mCurrentState:I + iget v0, v3, Landroid/support/constraint/motion/MotionLayout;->mCurrentState:I iget-object v1, p0, Landroid/support/constraint/motion/MotionLayout$Model;->this$0:Landroid/support/constraint/motion/MotionLayout; diff --git a/smali/android/support/constraint/motion/MotionLayout$StateCache.smali b/smali/android/support/constraint/motion/MotionLayout$StateCache.smali index be5b19b9..aa4e2148 100644 --- a/smali/android/support/constraint/motion/MotionLayout$StateCache.smali +++ b/smali/android/support/constraint/motion/MotionLayout$StateCache.smali @@ -94,11 +94,14 @@ if-ne v0, v1, :cond_0 - iget v2, p0, Landroid/support/constraint/motion/MotionLayout$StateCache;->endState:I + iget v0, p0, Landroid/support/constraint/motion/MotionLayout$StateCache;->endState:I - if-eq v2, v1, :cond_3 + if-eq v0, v1, :cond_3 + .line 1354 :cond_0 + iget v0, p0, Landroid/support/constraint/motion/MotionLayout$StateCache;->startState:I + if-ne v0, v1, :cond_1 .line 1355 diff --git a/smali/android/support/constraint/motion/MotionLayout$TransitionState.smali b/smali/android/support/constraint/motion/MotionLayout$TransitionState.smali index a32a997d..db34cb8b 100644 --- a/smali/android/support/constraint/motion/MotionLayout$TransitionState.smali +++ b/smali/android/support/constraint/motion/MotionLayout$TransitionState.smali @@ -36,66 +36,74 @@ # direct methods .method static constructor ()V - .locals 9 + .locals 6 .line 953 new-instance v0, Landroid/support/constraint/motion/MotionLayout$TransitionState; - const-string v1, "UNDEFINED" + const/4 v1, 0x0 - const/4 v2, 0x0 + const-string v2, "UNDEFINED" - invoke-direct {v0, v1, v2}, Landroid/support/constraint/motion/MotionLayout$TransitionState;->(Ljava/lang/String;I)V + invoke-direct {v0, v2, v1}, Landroid/support/constraint/motion/MotionLayout$TransitionState;->(Ljava/lang/String;I)V sput-object v0, Landroid/support/constraint/motion/MotionLayout$TransitionState;->UNDEFINED:Landroid/support/constraint/motion/MotionLayout$TransitionState; .line 954 - new-instance v1, Landroid/support/constraint/motion/MotionLayout$TransitionState; + new-instance v0, Landroid/support/constraint/motion/MotionLayout$TransitionState; - const-string v3, "SETUP" + const/4 v2, 0x1 - const/4 v4, 0x1 + const-string v3, "SETUP" - invoke-direct {v1, v3, v4}, Landroid/support/constraint/motion/MotionLayout$TransitionState;->(Ljava/lang/String;I)V + invoke-direct {v0, v3, v2}, Landroid/support/constraint/motion/MotionLayout$TransitionState;->(Ljava/lang/String;I)V - sput-object v1, Landroid/support/constraint/motion/MotionLayout$TransitionState;->SETUP:Landroid/support/constraint/motion/MotionLayout$TransitionState; + sput-object v0, Landroid/support/constraint/motion/MotionLayout$TransitionState;->SETUP:Landroid/support/constraint/motion/MotionLayout$TransitionState; .line 955 - new-instance v3, Landroid/support/constraint/motion/MotionLayout$TransitionState; + new-instance v0, Landroid/support/constraint/motion/MotionLayout$TransitionState; - const-string v5, "MOVING" + const/4 v3, 0x2 - const/4 v6, 0x2 + const-string v4, "MOVING" - invoke-direct {v3, v5, v6}, Landroid/support/constraint/motion/MotionLayout$TransitionState;->(Ljava/lang/String;I)V + invoke-direct {v0, v4, v3}, Landroid/support/constraint/motion/MotionLayout$TransitionState;->(Ljava/lang/String;I)V - sput-object v3, Landroid/support/constraint/motion/MotionLayout$TransitionState;->MOVING:Landroid/support/constraint/motion/MotionLayout$TransitionState; + sput-object v0, Landroid/support/constraint/motion/MotionLayout$TransitionState;->MOVING:Landroid/support/constraint/motion/MotionLayout$TransitionState; .line 956 - new-instance v5, Landroid/support/constraint/motion/MotionLayout$TransitionState; + new-instance v0, Landroid/support/constraint/motion/MotionLayout$TransitionState; - const-string v7, "FINISHED" + const/4 v4, 0x3 - const/4 v8, 0x3 + const-string v5, "FINISHED" - invoke-direct {v5, v7, v8}, Landroid/support/constraint/motion/MotionLayout$TransitionState;->(Ljava/lang/String;I)V + invoke-direct {v0, v5, v4}, Landroid/support/constraint/motion/MotionLayout$TransitionState;->(Ljava/lang/String;I)V - sput-object v5, Landroid/support/constraint/motion/MotionLayout$TransitionState;->FINISHED:Landroid/support/constraint/motion/MotionLayout$TransitionState; + sput-object v0, Landroid/support/constraint/motion/MotionLayout$TransitionState;->FINISHED:Landroid/support/constraint/motion/MotionLayout$TransitionState; - const/4 v7, 0x4 + const/4 v0, 0x4 - new-array v7, v7, [Landroid/support/constraint/motion/MotionLayout$TransitionState; + .line 952 + new-array v0, v0, [Landroid/support/constraint/motion/MotionLayout$TransitionState; - aput-object v0, v7, v2 + sget-object v5, Landroid/support/constraint/motion/MotionLayout$TransitionState;->UNDEFINED:Landroid/support/constraint/motion/MotionLayout$TransitionState; - aput-object v1, v7, v4 + aput-object v5, v0, v1 - aput-object v3, v7, v6 + sget-object v1, Landroid/support/constraint/motion/MotionLayout$TransitionState;->SETUP:Landroid/support/constraint/motion/MotionLayout$TransitionState; - aput-object v5, v7, v8 + aput-object v1, v0, v2 - .line 952 - sput-object v7, Landroid/support/constraint/motion/MotionLayout$TransitionState;->$VALUES:[Landroid/support/constraint/motion/MotionLayout$TransitionState; + sget-object v1, Landroid/support/constraint/motion/MotionLayout$TransitionState;->MOVING:Landroid/support/constraint/motion/MotionLayout$TransitionState; + + aput-object v1, v0, v3 + + sget-object v1, Landroid/support/constraint/motion/MotionLayout$TransitionState;->FINISHED:Landroid/support/constraint/motion/MotionLayout$TransitionState; + + aput-object v1, v0, v4 + + sput-object v0, Landroid/support/constraint/motion/MotionLayout$TransitionState;->$VALUES:[Landroid/support/constraint/motion/MotionLayout$TransitionState; return-void .end method diff --git a/smali/android/support/constraint/motion/MotionLayout.smali b/smali/android/support/constraint/motion/MotionLayout.smali index 8eaea3d4..d7e5ad88 100644 --- a/smali/android/support/constraint/motion/MotionLayout.smali +++ b/smali/android/support/constraint/motion/MotionLayout.smali @@ -235,6 +235,10 @@ # direct methods .method public constructor (Landroid/content/Context;)V .locals 4 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 963 invoke-direct {p0, p1}, Landroid/support/constraint/ConstraintLayout;->(Landroid/content/Context;)V @@ -413,6 +417,14 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V .locals 4 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 968 invoke-direct {p0, p1, p2}, Landroid/support/constraint/ConstraintLayout;->(Landroid/content/Context;Landroid/util/AttributeSet;)V @@ -591,6 +603,14 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;I)V .locals 3 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 973 invoke-direct {p0, p1, p2, p3}, Landroid/support/constraint/ConstraintLayout;->(Landroid/content/Context;Landroid/util/AttributeSet;I)V @@ -1652,7 +1672,7 @@ .end method .method private evaluateLayout()V - .locals 14 + .locals 13 .line 2935 iget v0, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F @@ -1673,147 +1693,150 @@ .line 2939 iget-object v3, p0, Landroid/support/constraint/motion/MotionLayout;->mInterpolator:Landroid/view/animation/Interpolator; - instance-of v4, v3, Landroid/support/constraint/motion/utils/StopLogic; + instance-of v3, v3, Landroid/support/constraint/motion/utils/StopLogic; - const v5, 0x3089705f # 1.0E-9f + const v4, 0x3089705f # 1.0E-9f - const/4 v6, 0x0 + const/4 v5, 0x0 - if-nez v4, :cond_0 + if-nez v3, :cond_0 .line 2940 - iget-wide v7, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastTime:J + iget-wide v6, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastTime:J - sub-long v7, v1, v7 + sub-long v6, v1, v6 - long-to-float v4, v7 + long-to-float v3, v6 - mul-float v4, v4, v0 + mul-float v3, v3, v0 - mul-float v4, v4, v5 + mul-float v3, v3, v4 - iget v7, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionDuration:F + iget v6, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionDuration:F - div-float/2addr v4, v7 + div-float/2addr v3, v6 goto :goto_0 :cond_0 - const/4 v4, 0x0 + const/4 v3, 0x0 .line 2942 :goto_0 - iget v7, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F + iget v6, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F - add-float/2addr v7, v4 + add-float/2addr v6, v3 .line 2945 - iget-boolean v4, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionInstantly:Z + iget-boolean v3, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionInstantly:Z - if-eqz v4, :cond_1 + if-eqz v3, :cond_1 .line 2946 - iget v7, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F + iget v6, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F :cond_1 - const/4 v4, 0x0 + const/4 v3, 0x0 - cmpl-float v8, v0, v6 + cmpl-float v7, v0, v5 - if-lez v8, :cond_2 + if-lez v7, :cond_2 .line 2949 - iget v8, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F + iget v7, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F - cmpl-float v8, v7, v8 + cmpl-float v7, v6, v7 - if-gez v8, :cond_3 + if-gez v7, :cond_3 :cond_2 - cmpg-float v8, v0, v6 + cmpg-float v7, v0, v5 - if-gtz v8, :cond_4 + if-gtz v7, :cond_4 - iget v8, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F + iget v7, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F - cmpg-float v8, v7, v8 + cmpg-float v7, v6, v7 - if-gtz v8, :cond_4 + if-gtz v7, :cond_4 .line 2951 :cond_3 - iget v7, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F + iget v6, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F - const/4 v8, 0x1 + const/4 v7, 0x1 goto :goto_1 :cond_4 - const/4 v8, 0x0 + const/4 v7, 0x0 + .line 2954 :goto_1 - if-eqz v3, :cond_6 + iget-object v8, p0, Landroid/support/constraint/motion/MotionLayout;->mInterpolator:Landroid/view/animation/Interpolator; - if-nez v8, :cond_6 + if-eqz v8, :cond_6 + + if-nez v7, :cond_6 .line 2955 - iget-boolean v8, p0, Landroid/support/constraint/motion/MotionLayout;->mTemporalInterpolator:Z + iget-boolean v7, p0, Landroid/support/constraint/motion/MotionLayout;->mTemporalInterpolator:Z - if-eqz v8, :cond_5 + if-eqz v7, :cond_5 .line 2956 - iget-wide v7, p0, Landroid/support/constraint/motion/MotionLayout;->mAnimationStartTime:J + iget-wide v6, p0, Landroid/support/constraint/motion/MotionLayout;->mAnimationStartTime:J - sub-long/2addr v1, v7 + sub-long/2addr v1, v6 long-to-float v1, v1 - mul-float v1, v1, v5 + mul-float v1, v1, v4 .line 2957 - invoke-interface {v3, v1}, Landroid/view/animation/Interpolator;->getInterpolation(F)F + invoke-interface {v8, v1}, Landroid/view/animation/Interpolator;->getInterpolation(F)F - move-result v7 + move-result v6 goto :goto_2 .line 2959 :cond_5 - invoke-interface {v3, v7}, Landroid/view/animation/Interpolator;->getInterpolation(F)F + invoke-interface {v8, v6}, Landroid/view/animation/Interpolator;->getInterpolation(F)F - move-result v7 + move-result v6 :cond_6 :goto_2 - cmpl-float v1, v0, v6 + cmpl-float v1, v0, v5 if-lez v1, :cond_7 .line 2962 iget v1, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F - cmpl-float v1, v7, v1 + cmpl-float v1, v6, v1 if-gez v1, :cond_8 :cond_7 - cmpg-float v0, v0, v6 + cmpg-float v0, v0, v5 if-gtz v0, :cond_9 iget v0, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F - cmpg-float v0, v7, v0 + cmpg-float v0, v6, v0 if-gtz v0, :cond_9 .line 2964 :cond_8 - iget v7, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F + iget v6, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F .line 2966 :cond_9 - iput v7, p0, Landroid/support/constraint/motion/MotionLayout;->mPostInterpolationPosition:F + iput v6, p0, Landroid/support/constraint/motion/MotionLayout;->mPostInterpolationPosition:F .line 2967 invoke-virtual {p0}, Landroid/support/constraint/motion/MotionLayout;->getChildCount()I @@ -1826,37 +1849,37 @@ move-result-wide v1 :goto_3 - if-ge v4, v0, :cond_b + if-ge v3, v0, :cond_b .line 2970 - invoke-virtual {p0, v4}, Landroid/support/constraint/motion/MotionLayout;->getChildAt(I)Landroid/view/View; + invoke-virtual {p0, v3}, Landroid/support/constraint/motion/MotionLayout;->getChildAt(I)Landroid/view/View; - move-result-object v9 + move-result-object v8 .line 2971 - iget-object v3, p0, Landroid/support/constraint/motion/MotionLayout;->mFrameArrayList:Ljava/util/HashMap; + iget-object v4, p0, Landroid/support/constraint/motion/MotionLayout;->mFrameArrayList:Ljava/util/HashMap; - invoke-virtual {v3, v9}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-virtual {v4, v8}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v3 + move-result-object v4 - move-object v8, v3 + move-object v7, v4 - check-cast v8, Landroid/support/constraint/motion/MotionController; + check-cast v7, Landroid/support/constraint/motion/MotionController; - if-eqz v8, :cond_a + if-eqz v7, :cond_a .line 2973 - iget-object v13, p0, Landroid/support/constraint/motion/MotionLayout;->mKeyCache:Landroid/support/constraint/motion/KeyCache; + iget-object v12, p0, Landroid/support/constraint/motion/MotionLayout;->mKeyCache:Landroid/support/constraint/motion/KeyCache; - move v10, v7 + move v9, v6 - move-wide v11, v1 + move-wide v10, v1 - invoke-virtual/range {v8 .. v13}, Landroid/support/constraint/motion/MotionController;->interpolate(Landroid/view/View;FJLandroid/support/constraint/motion/KeyCache;)Z + invoke-virtual/range {v7 .. v12}, Landroid/support/constraint/motion/MotionController;->interpolate(Landroid/view/View;FJLandroid/support/constraint/motion/KeyCache;)Z :cond_a - add-int/lit8 v4, v4, 0x1 + add-int/lit8 v3, v3, 0x1 goto :goto_3 @@ -3067,7 +3090,7 @@ .end method .method animateTo(F)V - .locals 4 + .locals 3 .line 1719 iget-object v0, p0, Landroid/support/constraint/motion/MotionLayout;->mScene:Landroid/support/constraint/motion/MotionScene; @@ -3078,50 +3101,52 @@ .line 1723 :cond_0 - iget v1, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F + iget v0, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F - iget v2, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionPosition:F + iget v1, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionPosition:F - cmpl-float v1, v1, v2 + cmpl-float v0, v0, v1 - if-eqz v1, :cond_1 + if-eqz v0, :cond_1 - iget-boolean v1, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionInstantly:Z + iget-boolean v0, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionInstantly:Z - if-eqz v1, :cond_1 + if-eqz v0, :cond_1 .line 1726 - iput v2, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F + iput v1, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F .line 1729 :cond_1 - iget v1, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F + iget v0, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F - cmpl-float v2, v1, p1 + cmpl-float v1, v0, p1 - if-nez v2, :cond_2 + if-nez v1, :cond_2 return-void :cond_2 - const/4 v2, 0x0 + const/4 v1, 0x0 .line 1732 - iput-boolean v2, p0, Landroid/support/constraint/motion/MotionLayout;->mTemporalInterpolator:Z + iput-boolean v1, p0, Landroid/support/constraint/motion/MotionLayout;->mTemporalInterpolator:Z .line 1734 iput p1, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F .line 1735 - invoke-virtual {v0}, Landroid/support/constraint/motion/MotionScene;->getDuration()I + iget-object p1, p0, Landroid/support/constraint/motion/MotionLayout;->mScene:Landroid/support/constraint/motion/MotionScene; + + invoke-virtual {p1}, Landroid/support/constraint/motion/MotionScene;->getDuration()I move-result p1 int-to-float p1, p1 - const/high16 v0, 0x447a0000 # 1000.0f + const/high16 v2, 0x447a0000 # 1000.0f - div-float/2addr p1, v0 + div-float/2addr p1, v2 iput p1, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionDuration:F @@ -3140,14 +3165,14 @@ iput-object p1, p0, Landroid/support/constraint/motion/MotionLayout;->mInterpolator:Landroid/view/animation/Interpolator; .line 1738 - iput-boolean v2, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionInstantly:Z + iput-boolean v1, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionInstantly:Z .line 1739 invoke-virtual {p0}, Landroid/support/constraint/motion/MotionLayout;->getNanoTime()J - move-result-wide v2 + move-result-wide v1 - iput-wide v2, p0, Landroid/support/constraint/motion/MotionLayout;->mAnimationStartTime:J + iput-wide v1, p0, Landroid/support/constraint/motion/MotionLayout;->mAnimationStartTime:J const/4 p1, 0x1 @@ -3155,10 +3180,10 @@ iput-boolean p1, p0, Landroid/support/constraint/motion/MotionLayout;->mInTransition:Z .line 1741 - iput v1, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionPosition:F + iput v0, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionPosition:F .line 1745 - iput v1, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F + iput v0, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F .line 1746 invoke-virtual {p0}, Landroid/support/constraint/motion/MotionLayout;->invalidate()V @@ -3571,255 +3596,267 @@ if-lez v5, :cond_1 - cmpg-float v5, v1, v3 + cmpg-float v1, v1, v3 - if-gez v5, :cond_1 + if-gez v1, :cond_1 .line 2987 iput v2, v0, Landroid/support/constraint/motion/MotionLayout;->mCurrentState:I .line 2991 :cond_1 - iget-boolean v5, v0, Landroid/support/constraint/motion/MotionLayout;->mKeepAnimating:Z + iget-boolean v1, v0, Landroid/support/constraint/motion/MotionLayout;->mKeepAnimating:Z - const/4 v6, 0x1 + const/4 v5, 0x1 - const/4 v7, 0x0 + const/4 v6, 0x0 - if-nez v5, :cond_2 + if-nez v1, :cond_2 - iget-boolean v5, v0, Landroid/support/constraint/motion/MotionLayout;->mInTransition:Z + iget-boolean v1, v0, Landroid/support/constraint/motion/MotionLayout;->mInTransition:Z - if-eqz v5, :cond_24 + if-eqz v1, :cond_24 if-nez p1, :cond_2 - iget v5, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F + iget v1, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F - cmpl-float v5, v5, v1 + iget v7, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F - if-eqz v5, :cond_24 + cmpl-float v1, v1, v7 + + if-eqz v1, :cond_24 .line 2992 :cond_2 - iget v5, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F + iget v1, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F + + iget v7, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F - sub-float/2addr v5, v1 + sub-float/2addr v1, v7 - invoke-static {v5}, Ljava/lang/Math;->signum(F)F + invoke-static {v1}, Ljava/lang/Math;->signum(F)F move-result v1 .line 2993 invoke-virtual/range {p0 .. p0}, Landroid/support/constraint/motion/MotionLayout;->getNanoTime()J - move-result-wide v8 + move-result-wide v7 .line 2996 - iget-object v5, v0, Landroid/support/constraint/motion/MotionLayout;->mInterpolator:Landroid/view/animation/Interpolator; + iget-object v9, v0, Landroid/support/constraint/motion/MotionLayout;->mInterpolator:Landroid/view/animation/Interpolator; - instance-of v10, v5, Landroid/support/constraint/motion/MotionInterpolator; + instance-of v9, v9, Landroid/support/constraint/motion/MotionInterpolator; - const v11, 0x3089705f # 1.0E-9f + const v10, 0x3089705f # 1.0E-9f - if-nez v10, :cond_3 + if-nez v9, :cond_3 .line 2997 - iget-wide v12, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastTime:J + iget-wide v11, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastTime:J - sub-long v12, v8, v12 + sub-long v11, v7, v11 - long-to-float v10, v12 + long-to-float v9, v11 - mul-float v10, v10, v1 + mul-float v9, v9, v1 - mul-float v10, v10, v11 + mul-float v9, v9, v10 - iget v12, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionDuration:F + iget v11, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionDuration:F - div-float/2addr v10, v12 + div-float/2addr v9, v11 .line 2998 - iput v10, v0, Landroid/support/constraint/motion/MotionLayout;->mLastVelocity:F + iput v9, v0, Landroid/support/constraint/motion/MotionLayout;->mLastVelocity:F goto :goto_0 :cond_3 - const/4 v10, 0x0 + const/4 v9, 0x0 .line 3000 :goto_0 - iget v12, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F + iget v11, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F - add-float/2addr v12, v10 + add-float/2addr v11, v9 .line 3003 - iget-boolean v13, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionInstantly:Z + iget-boolean v12, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionInstantly:Z - if-eqz v13, :cond_4 + if-eqz v12, :cond_4 .line 3004 - iget v12, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F + iget v11, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F :cond_4 - cmpl-float v13, v1, v4 + cmpl-float v12, v1, v4 - if-lez v13, :cond_5 + if-lez v12, :cond_5 .line 3007 - iget v13, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F + iget v12, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F - cmpl-float v13, v12, v13 + cmpl-float v12, v11, v12 - if-gez v13, :cond_6 + if-gez v12, :cond_6 :cond_5 - cmpg-float v13, v1, v4 + cmpg-float v12, v1, v4 - if-gtz v13, :cond_7 + if-gtz v12, :cond_7 - iget v13, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F + iget v12, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F - cmpg-float v13, v12, v13 + cmpg-float v12, v11, v12 - if-gtz v13, :cond_7 + if-gtz v12, :cond_7 .line 3009 :cond_6 - iget v12, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F + iget v11, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F .line 3010 - iput-boolean v7, v0, Landroid/support/constraint/motion/MotionLayout;->mInTransition:Z + iput-boolean v6, v0, Landroid/support/constraint/motion/MotionLayout;->mInTransition:Z - const/4 v13, 0x1 + const/4 v12, 0x1 goto :goto_1 :cond_7 - const/4 v13, 0x0 + const/4 v12, 0x0 .line 3016 :goto_1 - iput v12, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F + iput v11, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F .line 3017 - iput v12, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionPosition:F + iput v11, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionPosition:F .line 3018 - iput-wide v8, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastTime:J + iput-wide v7, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastTime:J + + .line 3020 + iget-object v13, v0, Landroid/support/constraint/motion/MotionLayout;->mInterpolator:Landroid/view/animation/Interpolator; const v14, 0x3727c5ac # 1.0E-5f - if-eqz v5, :cond_d + if-eqz v13, :cond_d - if-nez v13, :cond_d + if-nez v12, :cond_d .line 3021 - iget-boolean v13, v0, Landroid/support/constraint/motion/MotionLayout;->mTemporalInterpolator:Z + iget-boolean v12, v0, Landroid/support/constraint/motion/MotionLayout;->mTemporalInterpolator:Z - if-eqz v13, :cond_a + if-eqz v12, :cond_b .line 3022 - iget-wide v12, v0, Landroid/support/constraint/motion/MotionLayout;->mAnimationStartTime:J + iget-wide v11, v0, Landroid/support/constraint/motion/MotionLayout;->mAnimationStartTime:J - sub-long v12, v8, v12 + sub-long v11, v7, v11 - long-to-float v10, v12 + long-to-float v9, v11 - mul-float v10, v10, v11 + mul-float v9, v9, v10 .line 3023 - invoke-interface {v5, v10}, Landroid/view/animation/Interpolator;->getInterpolation(F)F + invoke-interface {v13, v9}, Landroid/view/animation/Interpolator;->getInterpolation(F)F - move-result v5 + move-result v9 .line 3027 - iput v5, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F + iput v9, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F .line 3029 - iput-wide v8, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastTime:J + iput-wide v7, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastTime:J .line 3030 - iget-object v8, v0, Landroid/support/constraint/motion/MotionLayout;->mInterpolator:Landroid/view/animation/Interpolator; + iget-object v7, v0, Landroid/support/constraint/motion/MotionLayout;->mInterpolator:Landroid/view/animation/Interpolator; - instance-of v9, v8, Landroid/support/constraint/motion/MotionInterpolator; + instance-of v8, v7, Landroid/support/constraint/motion/MotionInterpolator; - if-eqz v9, :cond_c + if-eqz v8, :cond_a .line 3031 - check-cast v8, Landroid/support/constraint/motion/MotionInterpolator; + check-cast v7, Landroid/support/constraint/motion/MotionInterpolator; - invoke-virtual {v8}, Landroid/support/constraint/motion/MotionInterpolator;->getVelocity()F + invoke-virtual {v7}, Landroid/support/constraint/motion/MotionInterpolator;->getVelocity()F - move-result v8 + move-result v7 .line 3032 - iput v8, v0, Landroid/support/constraint/motion/MotionLayout;->mLastVelocity:F + iput v7, v0, Landroid/support/constraint/motion/MotionLayout;->mLastVelocity:F .line 3033 - invoke-static {v8}, Ljava/lang/Math;->abs(F)F + invoke-static {v7}, Ljava/lang/Math;->abs(F)F - move-result v9 + move-result v8 iget v10, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionDuration:F - mul-float v9, v9, v10 + mul-float v8, v8, v10 - cmpg-float v9, v9, v14 + cmpg-float v8, v8, v14 - if-gtz v9, :cond_8 + if-gtz v8, :cond_8 .line 3034 - iput-boolean v7, v0, Landroid/support/constraint/motion/MotionLayout;->mInTransition:Z + iput-boolean v6, v0, Landroid/support/constraint/motion/MotionLayout;->mInTransition:Z :cond_8 - cmpl-float v9, v8, v4 + cmpl-float v8, v7, v4 - if-lez v9, :cond_9 + if-lez v8, :cond_9 - cmpl-float v9, v5, v3 + cmpl-float v8, v9, v3 - if-ltz v9, :cond_9 + if-ltz v8, :cond_9 .line 3037 iput v3, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F .line 3038 - iput-boolean v7, v0, Landroid/support/constraint/motion/MotionLayout;->mInTransition:Z + iput-boolean v6, v0, Landroid/support/constraint/motion/MotionLayout;->mInTransition:Z - const/high16 v5, 0x3f800000 # 1.0f + const/high16 v9, 0x3f800000 # 1.0f :cond_9 - cmpg-float v8, v8, v4 + cmpg-float v7, v7, v4 - if-gez v8, :cond_c + if-gez v7, :cond_a - cmpg-float v8, v5, v4 + cmpg-float v7, v9, v4 - if-gtz v8, :cond_c + if-gtz v7, :cond_a .line 3041 iput v4, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F .line 3042 - iput-boolean v7, v0, Landroid/support/constraint/motion/MotionLayout;->mInTransition:Z + iput-boolean v6, v0, Landroid/support/constraint/motion/MotionLayout;->mInTransition:Z - const/4 v12, 0x0 + const/4 v11, 0x0 goto :goto_3 - .line 3049 :cond_a - invoke-interface {v5, v12}, Landroid/view/animation/Interpolator;->getInterpolation(F)F + move v11, v9 - move-result v5 + goto :goto_3 + + .line 3049 + :cond_b + invoke-interface {v13, v11}, Landroid/view/animation/Interpolator;->getInterpolation(F)F + + move-result v7 .line 3050 iget-object v8, v0, Landroid/support/constraint/motion/MotionLayout;->mInterpolator:Landroid/view/animation/Interpolator; - instance-of v9, v8, Landroid/support/constraint/motion/MotionInterpolator; + instance-of v10, v8, Landroid/support/constraint/motion/MotionInterpolator; - if-eqz v9, :cond_b + if-eqz v10, :cond_c .line 3051 check-cast v8, Landroid/support/constraint/motion/MotionInterpolator; @@ -3832,101 +3869,100 @@ goto :goto_2 - :cond_b - add-float/2addr v12, v10 + :cond_c + add-float/2addr v11, v9 .line 3053 - invoke-interface {v8, v12}, Landroid/view/animation/Interpolator;->getInterpolation(F)F + invoke-interface {v8, v11}, Landroid/view/animation/Interpolator;->getInterpolation(F)F move-result v8 - sub-float/2addr v8, v5 + sub-float/2addr v8, v7 mul-float v8, v8, v1 - div-float/2addr v8, v10 + div-float/2addr v8, v9 .line 3054 iput v8, v0, Landroid/support/constraint/motion/MotionLayout;->mLastVelocity:F - :cond_c :goto_2 - move v12, v5 + move v11, v7 .line 3059 :cond_d :goto_3 - iget v5, v0, Landroid/support/constraint/motion/MotionLayout;->mLastVelocity:F + iget v7, v0, Landroid/support/constraint/motion/MotionLayout;->mLastVelocity:F - invoke-static {v5}, Ljava/lang/Math;->abs(F)F + invoke-static {v7}, Ljava/lang/Math;->abs(F)F - move-result v5 + move-result v7 - cmpl-float v5, v5, v14 + cmpl-float v7, v7, v14 - if-lez v5, :cond_e + if-lez v7, :cond_e .line 3060 - sget-object v5, Landroid/support/constraint/motion/MotionLayout$TransitionState;->MOVING:Landroid/support/constraint/motion/MotionLayout$TransitionState; + sget-object v7, Landroid/support/constraint/motion/MotionLayout$TransitionState;->MOVING:Landroid/support/constraint/motion/MotionLayout$TransitionState; - invoke-virtual {v0, v5}, Landroid/support/constraint/motion/MotionLayout;->setState(Landroid/support/constraint/motion/MotionLayout$TransitionState;)V + invoke-virtual {v0, v7}, Landroid/support/constraint/motion/MotionLayout;->setState(Landroid/support/constraint/motion/MotionLayout$TransitionState;)V :cond_e - cmpl-float v5, v1, v4 + cmpl-float v7, v1, v4 - if-lez v5, :cond_f + if-lez v7, :cond_f .line 3063 - iget v5, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F + iget v7, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F - cmpl-float v5, v12, v5 + cmpl-float v7, v11, v7 - if-gez v5, :cond_10 + if-gez v7, :cond_10 :cond_f - cmpg-float v5, v1, v4 + cmpg-float v7, v1, v4 - if-gtz v5, :cond_11 + if-gtz v7, :cond_11 - iget v5, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F + iget v7, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F - cmpg-float v5, v12, v5 + cmpg-float v7, v11, v7 - if-gtz v5, :cond_11 + if-gtz v7, :cond_11 .line 3065 :cond_10 - iget v12, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F + iget v11, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F .line 3066 - iput-boolean v7, v0, Landroid/support/constraint/motion/MotionLayout;->mInTransition:Z + iput-boolean v6, v0, Landroid/support/constraint/motion/MotionLayout;->mInTransition:Z :cond_11 - cmpl-float v5, v12, v3 + cmpl-float v7, v11, v3 - if-gez v5, :cond_12 + if-gez v7, :cond_12 - cmpg-float v5, v12, v4 + cmpg-float v7, v11, v4 - if-gtz v5, :cond_13 + if-gtz v7, :cond_13 .line 3070 :cond_12 - iput-boolean v7, v0, Landroid/support/constraint/motion/MotionLayout;->mInTransition:Z + iput-boolean v6, v0, Landroid/support/constraint/motion/MotionLayout;->mInTransition:Z .line 3071 - sget-object v5, Landroid/support/constraint/motion/MotionLayout$TransitionState;->FINISHED:Landroid/support/constraint/motion/MotionLayout$TransitionState; + sget-object v7, Landroid/support/constraint/motion/MotionLayout$TransitionState;->FINISHED:Landroid/support/constraint/motion/MotionLayout$TransitionState; - invoke-virtual {v0, v5}, Landroid/support/constraint/motion/MotionLayout;->setState(Landroid/support/constraint/motion/MotionLayout$TransitionState;)V + invoke-virtual {v0, v7}, Landroid/support/constraint/motion/MotionLayout;->setState(Landroid/support/constraint/motion/MotionLayout$TransitionState;)V .line 3074 :cond_13 invoke-virtual/range {p0 .. p0}, Landroid/support/constraint/motion/MotionLayout;->getChildCount()I - move-result v5 + move-result v7 .line 3075 - iput-boolean v7, v0, Landroid/support/constraint/motion/MotionLayout;->mKeepAnimating:Z + iput-boolean v6, v0, Landroid/support/constraint/motion/MotionLayout;->mKeepAnimating:Z .line 3076 invoke-virtual/range {p0 .. p0}, Landroid/support/constraint/motion/MotionLayout;->getNanoTime()J @@ -3934,49 +3970,49 @@ move-result-wide v8 .line 3080 - iput v12, v0, Landroid/support/constraint/motion/MotionLayout;->mPostInterpolationPosition:F + iput v11, v0, Landroid/support/constraint/motion/MotionLayout;->mPostInterpolationPosition:F const/4 v10, 0x0 :goto_4 - if-ge v10, v5, :cond_15 + if-ge v10, v7, :cond_15 .line 3082 invoke-virtual {v0, v10}, Landroid/support/constraint/motion/MotionLayout;->getChildAt(I)Landroid/view/View; - move-result-object v14 + move-result-object v13 .line 3083 - iget-object v11, v0, Landroid/support/constraint/motion/MotionLayout;->mFrameArrayList:Ljava/util/HashMap; - - invoke-virtual {v11, v14}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object; + iget-object v12, v0, Landroid/support/constraint/motion/MotionLayout;->mFrameArrayList:Ljava/util/HashMap; - move-result-object v11 + invoke-virtual {v12, v13}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-object v13, v11 + move-result-object v12 - check-cast v13, Landroid/support/constraint/motion/MotionController; + check-cast v12, Landroid/support/constraint/motion/MotionController; - if-eqz v13, :cond_14 + if-eqz v12, :cond_14 .line 3085 - iget-boolean v11, v0, Landroid/support/constraint/motion/MotionLayout;->mKeepAnimating:Z + iget-boolean v15, v0, Landroid/support/constraint/motion/MotionLayout;->mKeepAnimating:Z + + iget-object v14, v0, Landroid/support/constraint/motion/MotionLayout;->mKeyCache:Landroid/support/constraint/motion/KeyCache; - iget-object v15, v0, Landroid/support/constraint/motion/MotionLayout;->mKeyCache:Landroid/support/constraint/motion/KeyCache; + move-object/from16 v17, v14 - move-object/from16 v18, v15 + move v14, v11 - move v15, v12 + move/from16 v18, v15 - move-wide/from16 v16, v8 + move-wide v15, v8 - invoke-virtual/range {v13 .. v18}, Landroid/support/constraint/motion/MotionController;->interpolate(Landroid/view/View;FJLandroid/support/constraint/motion/KeyCache;)Z + invoke-virtual/range {v12 .. v17}, Landroid/support/constraint/motion/MotionController;->interpolate(Landroid/view/View;FJLandroid/support/constraint/motion/KeyCache;)Z - move-result v13 + move-result v12 - or-int/2addr v11, v13 + or-int v12, v18, v12 - iput-boolean v11, v0, Landroid/support/constraint/motion/MotionLayout;->mKeepAnimating:Z + iput-boolean v12, v0, Landroid/support/constraint/motion/MotionLayout;->mKeepAnimating:Z :cond_14 add-int/lit8 v10, v10, 0x1 @@ -3984,35 +4020,35 @@ goto :goto_4 :cond_15 - cmpl-float v5, v1, v4 + cmpl-float v7, v1, v4 - if-lez v5, :cond_16 + if-lez v7, :cond_16 .line 3093 - iget v5, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F + iget v7, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F - cmpl-float v5, v12, v5 + cmpl-float v7, v11, v7 - if-gez v5, :cond_17 + if-gez v7, :cond_17 :cond_16 - cmpg-float v5, v1, v4 + cmpg-float v7, v1, v4 - if-gtz v5, :cond_18 + if-gtz v7, :cond_18 - iget v5, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F + iget v7, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F - cmpg-float v5, v12, v5 + cmpg-float v7, v11, v7 - if-gtz v5, :cond_18 + if-gtz v7, :cond_18 :cond_17 - const/4 v5, 0x1 + const/4 v7, 0x1 goto :goto_5 :cond_18 - const/4 v5, 0x0 + const/4 v7, 0x0 .line 3095 :goto_5 @@ -4024,7 +4060,7 @@ if-nez v8, :cond_19 - if-eqz v5, :cond_19 + if-eqz v7, :cond_19 .line 3096 sget-object v8, Landroid/support/constraint/motion/MotionLayout$TransitionState;->FINISHED:Landroid/support/constraint/motion/MotionLayout$TransitionState; @@ -4044,33 +4080,33 @@ :cond_1a iget-boolean v8, v0, Landroid/support/constraint/motion/MotionLayout;->mKeepAnimating:Z - xor-int/2addr v5, v6 + xor-int/2addr v7, v5 - or-int/2addr v5, v8 + or-int/2addr v7, v8 - iput-boolean v5, v0, Landroid/support/constraint/motion/MotionLayout;->mKeepAnimating:Z + iput-boolean v7, v0, Landroid/support/constraint/motion/MotionLayout;->mKeepAnimating:Z - cmpg-float v5, v12, v4 + cmpg-float v7, v11, v4 - if-gtz v5, :cond_1b + if-gtz v7, :cond_1b .line 3105 - iget v5, v0, Landroid/support/constraint/motion/MotionLayout;->mBeginState:I + iget v7, v0, Landroid/support/constraint/motion/MotionLayout;->mBeginState:I - if-eq v5, v2, :cond_1b + if-eq v7, v2, :cond_1b .line 3109 iget v2, v0, Landroid/support/constraint/motion/MotionLayout;->mCurrentState:I - if-eq v2, v5, :cond_1b + if-eq v2, v7, :cond_1b .line 3111 - iput v5, v0, Landroid/support/constraint/motion/MotionLayout;->mCurrentState:I + iput v7, v0, Landroid/support/constraint/motion/MotionLayout;->mCurrentState:I .line 3112 iget-object v2, v0, Landroid/support/constraint/motion/MotionLayout;->mScene:Landroid/support/constraint/motion/MotionScene; - invoke-virtual {v2, v5}, Landroid/support/constraint/motion/MotionScene;->getConstraintSet(I)Landroid/support/constraint/ConstraintSet; + invoke-virtual {v2, v7}, Landroid/support/constraint/motion/MotionScene;->getConstraintSet(I)Landroid/support/constraint/ConstraintSet; move-result-object v2 @@ -4082,31 +4118,31 @@ invoke-virtual {v0, v2}, Landroid/support/constraint/motion/MotionLayout;->setState(Landroid/support/constraint/motion/MotionLayout$TransitionState;)V - const/4 v7, 0x1 + const/4 v6, 0x1 :cond_1b - float-to-double v8, v12 + float-to-double v7, v11 - const-wide/high16 v10, 0x3ff0000000000000L # 1.0 + const-wide/high16 v9, 0x3ff0000000000000L # 1.0 - cmpl-double v2, v8, v10 + cmpl-double v2, v7, v9 if-ltz v2, :cond_1c .line 3122 iget v2, v0, Landroid/support/constraint/motion/MotionLayout;->mCurrentState:I - iget v5, v0, Landroid/support/constraint/motion/MotionLayout;->mEndState:I + iget v7, v0, Landroid/support/constraint/motion/MotionLayout;->mEndState:I - if-eq v2, v5, :cond_1c + if-eq v2, v7, :cond_1c .line 3124 - iput v5, v0, Landroid/support/constraint/motion/MotionLayout;->mCurrentState:I + iput v7, v0, Landroid/support/constraint/motion/MotionLayout;->mCurrentState:I .line 3125 iget-object v2, v0, Landroid/support/constraint/motion/MotionLayout;->mScene:Landroid/support/constraint/motion/MotionScene; - invoke-virtual {v2, v5}, Landroid/support/constraint/motion/MotionScene;->getConstraintSet(I)Landroid/support/constraint/ConstraintSet; + invoke-virtual {v2, v7}, Landroid/support/constraint/motion/MotionScene;->getConstraintSet(I)Landroid/support/constraint/ConstraintSet; move-result-object v2 @@ -4118,7 +4154,7 @@ invoke-virtual {v0, v2}, Landroid/support/constraint/motion/MotionLayout;->setState(Landroid/support/constraint/motion/MotionLayout$TransitionState;)V - const/4 v7, 0x1 + const/4 v6, 0x1 .line 3131 :cond_1c @@ -4137,7 +4173,7 @@ if-lez v2, :cond_1e - cmpl-float v2, v12, v3 + cmpl-float v2, v11, v3 if-eqz v2, :cond_1f @@ -4146,7 +4182,7 @@ if-gez v2, :cond_21 - cmpl-float v2, v12, v4 + cmpl-float v2, v11, v4 if-nez v2, :cond_21 @@ -4178,7 +4214,7 @@ if-lez v2, :cond_22 - cmpl-float v2, v12, v3 + cmpl-float v2, v11, v3 if-eqz v2, :cond_23 @@ -4187,7 +4223,7 @@ if-gez v1, :cond_24 - cmpl-float v1, v12, v4 + cmpl-float v1, v11, v4 if-nez v1, :cond_24 @@ -4210,19 +4246,15 @@ if-eq v1, v2, :cond_25 - goto :goto_8 - - :cond_25 - move v6, v7 + const/4 v6, 0x1 .line 3145 - :goto_8 - iput v2, v0, Landroid/support/constraint/motion/MotionLayout;->mCurrentState:I + :cond_25 + iget v1, v0, Landroid/support/constraint/motion/MotionLayout;->mEndState:I - :goto_9 - move v7, v6 + iput v1, v0, Landroid/support/constraint/motion/MotionLayout;->mCurrentState:I - goto :goto_b + goto :goto_8 :cond_26 cmpg-float v1, v1, v4 @@ -4236,27 +4268,24 @@ if-eq v1, v2, :cond_27 - goto :goto_a - - :cond_27 - move v6, v7 + const/4 v6, 0x1 .line 3150 - :goto_a - iput v2, v0, Landroid/support/constraint/motion/MotionLayout;->mCurrentState:I + :cond_27 + iget v1, v0, Landroid/support/constraint/motion/MotionLayout;->mBeginState:I - goto :goto_9 + iput v1, v0, Landroid/support/constraint/motion/MotionLayout;->mCurrentState:I .line 3153 :cond_28 - :goto_b + :goto_8 iget-boolean v1, v0, Landroid/support/constraint/motion/MotionLayout;->mNeedsFireTransitionCompleted:Z - or-int/2addr v1, v7 + or-int/2addr v1, v6 iput-boolean v1, v0, Landroid/support/constraint/motion/MotionLayout;->mNeedsFireTransitionCompleted:Z - if-eqz v7, :cond_29 + if-eqz v6, :cond_29 .line 3155 iget-boolean v1, v0, Landroid/support/constraint/motion/MotionLayout;->mInLayout:Z @@ -4433,6 +4462,18 @@ move-result p1 + .line 3561 + iget p3, p0, Landroid/support/constraint/motion/MotionLayout;->lastPos:F + + sub-float p3, p2, p3 + + .line 3562 + iget p4, p0, Landroid/support/constraint/motion/MotionLayout;->lastY:F + + const/4 p4, 0x0 + + cmpl-float p3, p3, p4 + .line 3568 iput p2, p0, Landroid/support/constraint/motion/MotionLayout;->lastPos:F @@ -4777,86 +4818,91 @@ .end method .method public getViewVelocity(Landroid/view/View;FF[FI)V - .locals 8 + .locals 11 + + move-object v0, p0 + + move-object v8, p4 + + move/from16 v9, p5 .line 1942 - iget v0, p0, Landroid/support/constraint/motion/MotionLayout;->mLastVelocity:F + iget v1, v0, Landroid/support/constraint/motion/MotionLayout;->mLastVelocity:F .line 1943 - iget v1, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F + iget v2, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F .line 1944 - iget-object v2, p0, Landroid/support/constraint/motion/MotionLayout;->mInterpolator:Landroid/view/animation/Interpolator; + iget-object v3, v0, Landroid/support/constraint/motion/MotionLayout;->mInterpolator:Landroid/view/animation/Interpolator; - if-eqz v2, :cond_0 + if-eqz v3, :cond_0 - const v0, 0x3727c5ac # 1.0E-5f + const v1, 0x3727c5ac # 1.0E-5f .line 1946 - iget v2, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F + iget v3, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F - sub-float/2addr v2, v1 + sub-float/2addr v3, v2 - invoke-static {v2}, Ljava/lang/Math;->signum(F)F + invoke-static {v3}, Ljava/lang/Math;->signum(F)F - move-result v1 + move-result v2 .line 1947 - iget-object v2, p0, Landroid/support/constraint/motion/MotionLayout;->mInterpolator:Landroid/view/animation/Interpolator; + iget-object v3, v0, Landroid/support/constraint/motion/MotionLayout;->mInterpolator:Landroid/view/animation/Interpolator; - iget v3, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F + iget v4, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F - add-float/2addr v3, v0 + add-float/2addr v4, v1 - invoke-interface {v2, v3}, Landroid/view/animation/Interpolator;->getInterpolation(F)F + invoke-interface {v3, v4}, Landroid/view/animation/Interpolator;->getInterpolation(F)F - move-result v2 + move-result v3 .line 1948 - iget-object v3, p0, Landroid/support/constraint/motion/MotionLayout;->mInterpolator:Landroid/view/animation/Interpolator; + iget-object v4, v0, Landroid/support/constraint/motion/MotionLayout;->mInterpolator:Landroid/view/animation/Interpolator; - iget v4, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F + iget v5, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F - invoke-interface {v3, v4}, Landroid/view/animation/Interpolator;->getInterpolation(F)F + invoke-interface {v4, v5}, Landroid/view/animation/Interpolator;->getInterpolation(F)F - move-result v3 + move-result v4 - sub-float/2addr v2, v3 + sub-float/2addr v3, v4 - div-float/2addr v2, v0 + div-float/2addr v3, v1 - mul-float v1, v1, v2 + mul-float v2, v2, v3 .line 1951 - iget v0, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionDuration:F + iget v1, v0, Landroid/support/constraint/motion/MotionLayout;->mTransitionDuration:F - div-float v0, v1, v0 + div-float v1, v2, v1 - move v2, v3 - - goto :goto_0 - - :cond_0 - move v2, v1 + move v2, v4 .line 1954 - :goto_0 - iget-object v1, p0, Landroid/support/constraint/motion/MotionLayout;->mInterpolator:Landroid/view/animation/Interpolator; + :cond_0 + iget-object v3, v0, Landroid/support/constraint/motion/MotionLayout;->mInterpolator:Landroid/view/animation/Interpolator; - instance-of v3, v1, Landroid/support/constraint/motion/MotionInterpolator; + instance-of v4, v3, Landroid/support/constraint/motion/MotionInterpolator; - if-eqz v3, :cond_1 + if-eqz v4, :cond_1 .line 1955 - check-cast v1, Landroid/support/constraint/motion/MotionInterpolator; + check-cast v3, Landroid/support/constraint/motion/MotionInterpolator; - invoke-virtual {v1}, Landroid/support/constraint/motion/MotionInterpolator;->getVelocity()F + invoke-virtual {v3}, Landroid/support/constraint/motion/MotionInterpolator;->getVelocity()F - move-result v0 + move-result v1 - .line 1958 :cond_1 - iget-object v1, p0, Landroid/support/constraint/motion/MotionLayout;->mFrameArrayList:Ljava/util/HashMap; + move v10, v1 + + .line 1958 + iget-object v1, v0, Landroid/support/constraint/motion/MotionLayout;->mFrameArrayList:Ljava/util/HashMap; + + move-object v3, p1 invoke-virtual {v1, p1}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object; @@ -4864,18 +4910,22 @@ check-cast v1, Landroid/support/constraint/motion/MotionController; - and-int/lit8 v3, p5, 0x1 + and-int/lit8 v4, v9, 0x1 - if-nez v3, :cond_2 + if-nez v4, :cond_2 .line 1961 invoke-virtual {p1}, Landroid/view/View;->getWidth()I - move-result v3 + move-result v4 invoke-virtual {p1}, Landroid/view/View;->getHeight()I - move-result v4 + move-result v5 + + move v3, v4 + + move v4, v5 move v5, p2 @@ -4886,34 +4936,38 @@ .line 1960 invoke-virtual/range {v1 .. v7}, Landroid/support/constraint/motion/MotionController;->getPostLayoutDvDp(FIIFF[F)V - goto :goto_1 + goto :goto_0 - .line 1964 :cond_2 + move v3, p2 + + move v4, p3 + + .line 1964 invoke-virtual {v1, v2, p2, p3, p4}, Landroid/support/constraint/motion/MotionController;->getDpDt(FFF[F)V - :goto_1 - const/4 p1, 0x2 + :goto_0 + const/4 v1, 0x2 - if-ge p5, p1, :cond_3 + if-ge v9, v1, :cond_3 - const/4 p1, 0x0 + const/4 v1, 0x0 .line 1967 - aget p2, p4, p1 + aget v2, v8, v1 - mul-float p2, p2, v0 + mul-float v2, v2, v10 - aput p2, p4, p1 + aput v2, v8, v1 - const/4 p1, 0x1 + const/4 v1, 0x1 .line 1968 - aget p2, p4, p1 + aget v2, v8, v1 - mul-float p2, p2, v0 + mul-float v2, v2, v10 - aput p2, p4, p1 + aput v2, v8, v1 :cond_3 return-void @@ -5860,15 +5914,17 @@ .line 2472 iget v4, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F - cmpg-float v5, v4, v3 + cmpg-float v4, v4, v3 - if-gtz v5, :cond_5 + if-gtz v4, :cond_5 - cmpg-float v5, p5, v3 + cmpg-float v4, p5, v3 - if-ltz v5, :cond_6 + if-ltz v4, :cond_6 :cond_5 + iget v4, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F + cmpl-float v2, v4, v2 if-ltz v2, :cond_8 @@ -6779,6 +6835,8 @@ iput-object p1, p0, Landroid/support/constraint/motion/MotionLayout;->mScene:Landroid/support/constraint/motion/MotionScene; .line 3261 + iget-object p1, p0, Landroid/support/constraint/motion/MotionLayout;->mScene:Landroid/support/constraint/motion/MotionScene; + invoke-virtual {p0}, Landroid/support/constraint/motion/MotionLayout;->isRtl()Z move-result v0 @@ -6950,6 +7008,9 @@ move-result-object p1 + .line 1168 + iget v0, p0, Landroid/support/constraint/motion/MotionLayout;->mCurrentState:I + .line 1169 invoke-virtual {p1}, Landroid/support/constraint/motion/MotionScene$Transition;->getStartConstraintSetId()I @@ -7304,9 +7365,13 @@ iput v0, p0, Landroid/support/constraint/motion/MotionLayout;->mEndState:I .line 1234 - iget-object v1, p0, Landroid/support/constraint/motion/MotionLayout;->mScene:Landroid/support/constraint/motion/MotionScene; + iget-object p1, p0, Landroid/support/constraint/motion/MotionLayout;->mScene:Landroid/support/constraint/motion/MotionScene; + + iget v0, p0, Landroid/support/constraint/motion/MotionLayout;->mBeginState:I - invoke-virtual {v1, p1, v0}, Landroid/support/constraint/motion/MotionScene;->setTransition(II)V + iget v1, p0, Landroid/support/constraint/motion/MotionLayout;->mEndState:I + + invoke-virtual {p1, v0, v1}, Landroid/support/constraint/motion/MotionScene;->setTransition(II)V .line 1240 iget-object p1, p0, Landroid/support/constraint/motion/MotionLayout;->mModel:Landroid/support/constraint/motion/MotionLayout$Model; @@ -7479,7 +7544,7 @@ .end method .method public touchAnimateTo(IFF)V - .locals 10 + .locals 9 .line 1597 iget-object v0, p0, Landroid/support/constraint/motion/MotionLayout;->mScene:Landroid/support/constraint/motion/MotionScene; @@ -7522,9 +7587,9 @@ const/high16 v2, 0x447a0000 # 1000.0f - div-float v7, v1, v2 + div-float/2addr v1, v2 - iput v7, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionDuration:F + iput v1, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionDuration:F .line 1608 iput p2, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionGoalPosition:F @@ -7542,6 +7607,10 @@ if-eq p1, v2, :cond_5 + const/4 v0, 0x3 + + if-eq p1, v0, :cond_8 + const/4 v0, 0x4 if-eq p1, v0, :cond_4 @@ -7671,29 +7740,31 @@ .line 1620 :cond_7 :goto_0 - iget-object v3, p0, Landroid/support/constraint/motion/MotionLayout;->mStopLogic:Landroid/support/constraint/motion/utils/StopLogic; + iget-object v0, p0, Landroid/support/constraint/motion/MotionLayout;->mStopLogic:Landroid/support/constraint/motion/utils/StopLogic; - iget v4, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F + iget v1, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionLastPosition:F + + iget v4, p0, Landroid/support/constraint/motion/MotionLayout;->mTransitionDuration:F iget-object p1, p0, Landroid/support/constraint/motion/MotionLayout;->mScene:Landroid/support/constraint/motion/MotionScene; .line 1621 invoke-virtual {p1}, Landroid/support/constraint/motion/MotionScene;->getMaxAcceleration()F - move-result v8 + move-result v5 iget-object p1, p0, Landroid/support/constraint/motion/MotionLayout;->mScene:Landroid/support/constraint/motion/MotionScene; invoke-virtual {p1}, Landroid/support/constraint/motion/MotionScene;->getMaxVelocity()F - move-result v9 + move-result v6 - move v5, p2 + move v2, p2 - move v6, p3 + move v3, p3 .line 1620 - invoke-virtual/range {v3 .. v9}, Landroid/support/constraint/motion/utils/StopLogic;->config(FFFFFF)V + invoke-virtual/range {v0 .. v6}, Landroid/support/constraint/motion/utils/StopLogic;->config(FFFFFF)V .line 1623 iget p1, p0, Landroid/support/constraint/motion/MotionLayout;->mCurrentState:I @@ -7709,6 +7780,7 @@ iput-object p1, p0, Landroid/support/constraint/motion/MotionLayout;->mInterpolator:Landroid/view/animation/Interpolator; + :cond_8 :goto_1 const/4 p1, 0x0 @@ -7932,11 +8004,13 @@ iput v1, p0, Landroid/support/constraint/motion/MotionLayout;->mBeginState:I .line 1869 - iget-object v3, p0, Landroid/support/constraint/motion/MotionLayout;->mScene:Landroid/support/constraint/motion/MotionScene; + iget-object v1, p0, Landroid/support/constraint/motion/MotionLayout;->mScene:Landroid/support/constraint/motion/MotionScene; + + iget v3, p0, Landroid/support/constraint/motion/MotionLayout;->mBeginState:I iget v4, p0, Landroid/support/constraint/motion/MotionLayout;->mEndState:I - invoke-virtual {v3, v1, v4}, Landroid/support/constraint/motion/MotionScene;->setTransition(II)V + invoke-virtual {v1, v3, v4}, Landroid/support/constraint/motion/MotionScene;->setTransition(II)V .line 1871 iget-object v1, p0, Landroid/support/constraint/motion/MotionLayout;->mScene:Landroid/support/constraint/motion/MotionScene; @@ -8073,15 +8147,19 @@ const v4, -0x800001 - const/4 v5, 0x0 + const/4 p3, 0x0 + + const v4, 0x7f7fffff # Float.MAX_VALUE + + const v5, -0x800001 :goto_2 - if-ge v5, v1, :cond_7 + if-ge p3, v1, :cond_7 .line 1900 iget-object v6, p0, Landroid/support/constraint/motion/MotionLayout;->mFrameArrayList:Ljava/util/HashMap; - invoke-virtual {p0, v5}, Landroid/support/constraint/motion/MotionLayout;->getChildAt(I)Landroid/view/View; + invoke-virtual {p0, p3}, Landroid/support/constraint/motion/MotionLayout;->getChildAt(I)Landroid/view/View; move-result-object v7 @@ -8104,16 +8182,16 @@ add-float/2addr v6, v7 .line 1903 - invoke-static {p3, v6}, Ljava/lang/Math;->min(FF)F + invoke-static {v4, v6}, Ljava/lang/Math;->min(FF)F - move-result p3 + move-result v4 .line 1904 - invoke-static {v4, v6}, Ljava/lang/Math;->max(FF)F + invoke-static {v5, v6}, Ljava/lang/Math;->max(FF)F - move-result v4 + move-result v5 - add-int/lit8 v5, v5, 0x1 + add-int/lit8 p3, p3, 0x1 goto :goto_2 @@ -8122,25 +8200,25 @@ if-ge p2, v1, :cond_8 .line 1908 - iget-object v5, p0, Landroid/support/constraint/motion/MotionLayout;->mFrameArrayList:Ljava/util/HashMap; + iget-object p3, p0, Landroid/support/constraint/motion/MotionLayout;->mFrameArrayList:Ljava/util/HashMap; invoke-virtual {p0, p2}, Landroid/support/constraint/motion/MotionLayout;->getChildAt(I)Landroid/view/View; move-result-object v6 - invoke-virtual {v5, v6}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-virtual {p3, v6}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v5 + move-result-object p3 - check-cast v5, Landroid/support/constraint/motion/MotionController; + check-cast p3, Landroid/support/constraint/motion/MotionController; .line 1909 - invoke-virtual {v5}, Landroid/support/constraint/motion/MotionController;->getFinalX()F + invoke-virtual {p3}, Landroid/support/constraint/motion/MotionController;->getFinalX()F move-result v6 .line 1910 - invoke-virtual {v5}, Landroid/support/constraint/motion/MotionController;->getFinalY()F + invoke-virtual {p3}, Landroid/support/constraint/motion/MotionController;->getFinalY()F move-result v7 @@ -8149,22 +8227,22 @@ div-float v8, v2, v8 .line 1911 - iput v8, v5, Landroid/support/constraint/motion/MotionController;->mStaggerScale:F + iput v8, p3, Landroid/support/constraint/motion/MotionController;->mStaggerScale:F add-float/2addr v6, v7 - sub-float/2addr v6, p3 + sub-float/2addr v6, v4 mul-float v6, v6, p1 - sub-float v7, v4, p3 + sub-float v7, v5, v4 div-float/2addr v6, v7 sub-float v6, p1, v6 .line 1912 - iput v6, v5, Landroid/support/constraint/motion/MotionController;->mStaggerOffset:F + iput v6, p3, Landroid/support/constraint/motion/MotionController;->mStaggerOffset:F add-int/lit8 p2, p2, 0x1 diff --git a/smali/android/support/constraint/motion/MotionPaths.smali b/smali/android/support/constraint/motion/MotionPaths.smali index 5ba7cec8..ee776e6a 100644 --- a/smali/android/support/constraint/motion/MotionPaths.smali +++ b/smali/android/support/constraint/motion/MotionPaths.smali @@ -148,14 +148,14 @@ const/16 v0, 0x12 + .line 308 new-array v1, v0, [D - .line 308 iput-object v1, p0, Landroid/support/constraint/motion/MotionPaths;->mTempValue:[D + .line 309 new-array v0, v0, [D - .line 309 iput-object v0, p0, Landroid/support/constraint/motion/MotionPaths;->mTempDelta:[D return-void @@ -197,14 +197,14 @@ const/16 v0, 0x12 + .line 308 new-array v1, v0, [D - .line 308 iput-object v1, p0, Landroid/support/constraint/motion/MotionPaths;->mTempValue:[D + .line 309 new-array v0, v0, [D - .line 309 iput-object v0, p0, Landroid/support/constraint/motion/MotionPaths;->mTempDelta:[D .line 125 @@ -439,6 +439,10 @@ .method public compareTo(Landroid/support/constraint/motion/MotionPaths;)I .locals 1 + .param p1 # Landroid/support/constraint/motion/MotionPaths; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 676 iget v0, p0, Landroid/support/constraint/motion/MotionPaths;->position:F @@ -454,6 +458,10 @@ .method public bridge synthetic compareTo(Ljava/lang/Object;)I .locals 0 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 38 check-cast p1, Landroid/support/constraint/motion/MotionPaths; @@ -561,75 +569,79 @@ .end method .method fillStandard([D[I)V - .locals 8 + .locals 6 const/4 v0, 0x6 - new-array v1, v0, [F - .line 634 - iget v2, p0, Landroid/support/constraint/motion/MotionPaths;->position:F + new-array v0, v0, [F - const/4 v3, 0x0 + iget v1, p0, Landroid/support/constraint/motion/MotionPaths;->position:F - aput v2, v1, v3 + const/4 v2, 0x0 - iget v2, p0, Landroid/support/constraint/motion/MotionPaths;->x:F + aput v1, v0, v2 - const/4 v4, 0x1 + iget v1, p0, Landroid/support/constraint/motion/MotionPaths;->x:F - aput v2, v1, v4 + const/4 v3, 0x1 - iget v2, p0, Landroid/support/constraint/motion/MotionPaths;->y:F + aput v1, v0, v3 - const/4 v4, 0x2 + iget v1, p0, Landroid/support/constraint/motion/MotionPaths;->y:F - aput v2, v1, v4 + const/4 v3, 0x2 - iget v2, p0, Landroid/support/constraint/motion/MotionPaths;->width:F + aput v1, v0, v3 - const/4 v4, 0x3 + iget v1, p0, Landroid/support/constraint/motion/MotionPaths;->width:F - aput v2, v1, v4 + const/4 v3, 0x3 - iget v2, p0, Landroid/support/constraint/motion/MotionPaths;->height:F + aput v1, v0, v3 - const/4 v4, 0x4 + iget v1, p0, Landroid/support/constraint/motion/MotionPaths;->height:F - aput v2, v1, v4 + const/4 v3, 0x4 - iget v2, p0, Landroid/support/constraint/motion/MotionPaths;->mPathRotate:F + aput v1, v0, v3 - const/4 v4, 0x5 + iget v1, p0, Landroid/support/constraint/motion/MotionPaths;->mPathRotate:F - aput v2, v1, v4 + const/4 v3, 0x5 - const/4 v2, 0x0 + aput v1, v0, v3 + + const/4 v1, 0x0 .line 636 :goto_0 - array-length v4, p2 + array-length v3, p2 - if-ge v3, v4, :cond_1 + if-ge v2, v3, :cond_1 .line 637 - aget v4, p2, v3 + aget v3, p2, v2 + + array-length v4, v0 - if-ge v4, v0, :cond_0 + if-ge v3, v4, :cond_0 - add-int/lit8 v5, v2, 0x1 + add-int/lit8 v3, v1, 0x1 .line 638 - aget v4, v1, v4 + aget v4, p2, v2 - float-to-double v6, v4 + aget v4, v0, v4 - aput-wide v6, p1, v2 + float-to-double v4, v4 - move v2, v5 + aput-wide v4, p1, v1 + + move v1, v3 :cond_0 - add-int/lit8 v3, v3, 0x1 + add-int/lit8 v2, v2, 0x1 goto :goto_0 @@ -638,7 +650,13 @@ .end method .method getBounds([I[D[FI)V - .locals 6 + .locals 7 + + .line 281 + iget v0, p0, Landroid/support/constraint/motion/MotionPaths;->x:F + + .line 282 + iget v0, p0, Landroid/support/constraint/motion/MotionPaths;->y:F .line 283 iget v0, p0, Landroid/support/constraint/motion/MotionPaths;->width:F @@ -652,23 +670,31 @@ :goto_0 array-length v3, p1 - if-ge v2, v3, :cond_2 + const/4 v4, 0x1 + + if-ge v2, v3, :cond_3 .line 287 - aget-wide v3, p2, v2 + aget-wide v5, p2, v2 - double-to-float v3, v3 + double-to-float v3, v5 .line 289 - aget v4, p1, v2 + aget v5, p1, v2 - const/4 v5, 0x3 + if-eq v5, v4, :cond_2 - if-eq v4, v5, :cond_1 + const/4 v4, 0x2 - const/4 v5, 0x4 + if-eq v5, v4, :cond_2 + + const/4 v4, 0x3 - if-eq v4, v5, :cond_0 + if-eq v5, v4, :cond_1 + + const/4 v4, 0x4 + + if-eq v5, v4, :cond_0 goto :goto_1 @@ -680,16 +706,17 @@ :cond_1 move v0, v3 + :cond_2 :goto_1 add-int/lit8 v2, v2, 0x1 goto :goto_0 .line 304 - :cond_2 + :cond_3 aput v0, p3, p4 - add-int/lit8 p4, p4, 0x1 + add-int/2addr p4, v4 .line 305 aput v1, p3, p4 @@ -905,7 +932,7 @@ :goto_0 array-length v5, p1 - if-ge v4, v5, :cond_4 + if-ge v4, v5, :cond_5 .line 451 aget-wide v5, p2, v4 @@ -915,6 +942,8 @@ .line 453 aget v6, p1, v4 + if-eqz v6, :cond_4 + const/4 v7, 0x1 if-eq v6, v7, :cond_3 @@ -951,12 +980,13 @@ :cond_3 move v0, v5 + :cond_4 :goto_1 add-int/lit8 v4, v4, 0x1 goto :goto_0 - :cond_4 + :cond_5 add-float/2addr v2, v0 add-float/2addr v3, v1 @@ -966,9 +996,13 @@ .line 486 invoke-static {p1}, Ljava/lang/Float;->isNaN(F)Z + move-result p2 + .line 489 invoke-static {p1}, Ljava/lang/Float;->isNaN(F)Z + move-result p1 + const/4 p1, 0x0 add-float p2, v0, p1 @@ -1574,25 +1608,31 @@ iput v3, v0, Landroid/support/constraint/motion/MotionPaths;->x:F .line 215 - iget v5, v8, Landroid/support/constraint/motion/MotionPaths;->y:F + iget v3, v8, Landroid/support/constraint/motion/MotionPaths;->y:F - add-float/2addr v5, v4 + add-float/2addr v3, v4 - sub-float/2addr v5, v6 + sub-float/2addr v3, v6 - float-to-int v4, v5 + float-to-int v3, v3 - int-to-float v4, v4 + int-to-float v3, v3 - add-float/2addr v3, v1 + iput v3, v0, Landroid/support/constraint/motion/MotionPaths;->y:F .line 216 - iput v3, v0, Landroid/support/constraint/motion/MotionPaths;->x:F + iget v3, v0, Landroid/support/constraint/motion/MotionPaths;->x:F - add-float/2addr v4, v2 + add-float/2addr v3, v1 + + iput v3, v0, Landroid/support/constraint/motion/MotionPaths;->x:F .line 217 - iput v4, v0, Landroid/support/constraint/motion/MotionPaths;->y:F + iget v1, v0, Landroid/support/constraint/motion/MotionPaths;->y:F + + add-float/2addr v1, v2 + + iput v1, v0, Landroid/support/constraint/motion/MotionPaths;->y:F .line 219 iget-object v1, v7, Landroid/support/constraint/motion/KeyPosition;->mTransitionEasing:Ljava/lang/String; @@ -1913,7 +1953,7 @@ const/4 v9, 0x1 - if-ge v3, v8, :cond_4 + if-ge v3, v8, :cond_5 .line 573 aget-wide v10, p5, v3 @@ -1926,6 +1966,8 @@ .line 578 aget v10, v0, v3 + if-eqz v10, :cond_4 + if-eq v10, v9, :cond_3 const/4 v9, 0x2 @@ -1960,12 +2002,13 @@ :cond_3 move v4, v8 + :cond_4 :goto_1 add-int/lit8 v3, v3, 0x1 goto :goto_0 - :cond_4 + :cond_5 mul-float v0, v2, v5 const/high16 v3, 0x40000000 # 2.0f @@ -2106,6 +2149,8 @@ .line 337 iget-object v10, v0, Landroid/support/constraint/motion/MotionPaths;->mTempDelta:[D + aget v11, v2, v9 + aget-wide v12, p4, v9 aput-wide v12, v10, v11 @@ -2115,17 +2160,27 @@ goto :goto_0 :cond_1 - const/4 v10, 0x0 + const/high16 v2, 0x7fc00000 # Float.NaN - const/high16 v11, 0x7fc00000 # Float.NaN + move v12, v3 - const/4 v12, 0x0 + move v13, v4 - const/4 v13, 0x0 + move v14, v5 - const/4 v14, 0x0 + move v15, v6 + + const/4 v3, 0x0 - const/4 v15, 0x0 + const/high16 v4, 0x7fc00000 # Float.NaN + + const/4 v5, 0x0 + + const/4 v6, 0x0 + + const/4 v10, 0x0 + + const/4 v11, 0x0 .line 340 :goto_1 @@ -2133,10 +2188,10 @@ array-length v9, v7 - if-ge v10, v9, :cond_b + if-ge v3, v9, :cond_c .line 341 - aget-wide v17, v7, v10 + aget-wide v17, v7, v3 invoke-static/range {v17 .. v18}, Ljava/lang/Double;->isNaN(D)Z @@ -2144,277 +2199,265 @@ const-wide/16 v17, 0x0 - if-eqz v7, :cond_3 + if-eqz v7, :cond_2 - if-eqz p5, :cond_2 + if-eqz p5, :cond_b - aget-wide v19, p5, v10 + aget-wide v19, p5, v3 cmpl-double v7, v19, v17 - if-nez v7, :cond_3 - - :cond_2 - move/from16 p4, v3 - - const/4 v7, 0x1 + if-nez v7, :cond_2 goto :goto_3 - :cond_3 - if-eqz p5, :cond_4 + :cond_2 + if-eqz p5, :cond_3 .line 344 - aget-wide v17, p5, v10 + aget-wide v17, p5, v3 .line 345 - :cond_4 + :cond_3 iget-object v7, v0, Landroid/support/constraint/motion/MotionPaths;->mTempValue:[D - aget-wide v19, v7, v10 + aget-wide v19, v7, v3 invoke-static/range {v19 .. v20}, Ljava/lang/Double;->isNaN(D)Z move-result v7 - if-eqz v7, :cond_5 + if-eqz v7, :cond_4 goto :goto_2 - :cond_5 + :cond_4 iget-object v7, v0, Landroid/support/constraint/motion/MotionPaths;->mTempValue:[D - aget-wide v19, v7, v10 + aget-wide v19, v7, v3 add-double v17, v19, v17 :goto_2 - move/from16 p4, v3 + move-wide/from16 v8, v17 - move-wide/from16 v2, v17 - - double-to-float v2, v2 + double-to-float v8, v8 .line 346 - iget-object v3, v0, Landroid/support/constraint/motion/MotionPaths;->mTempDelta:[D + iget-object v9, v0, Landroid/support/constraint/motion/MotionPaths;->mTempDelta:[D - aget-wide v8, v3, v10 + move/from16 v17, v8 - double-to-float v3, v8 + aget-wide v7, v9, v3 - const/4 v7, 0x1 + double-to-float v7, v7 - if-eq v10, v7, :cond_a + if-eqz v3, :cond_a - const/4 v8, 0x2 + const/4 v8, 0x1 - if-eq v10, v8, :cond_9 + if-eq v3, v8, :cond_9 - const/4 v8, 0x3 + const/4 v9, 0x2 - if-eq v10, v8, :cond_8 + if-eq v3, v9, :cond_8 - const/4 v8, 0x4 + const/4 v9, 0x3 - if-eq v10, v8, :cond_7 + if-eq v3, v9, :cond_7 - const/4 v3, 0x5 + const/4 v9, 0x4 - if-eq v10, v3, :cond_6 + if-eq v3, v9, :cond_6 - :goto_3 - move/from16 v3, p4 + const/4 v7, 0x5 - goto :goto_4 + if-eq v3, v7, :cond_5 + + goto :goto_3 + + :cond_5 + move/from16 v4, v17 + + goto :goto_3 :cond_6 - move/from16 v3, p4 + move v11, v7 - move v11, v2 + move/from16 v15, v17 - goto :goto_4 + goto :goto_3 :cond_7 - move v6, v2 + move v6, v7 - move v15, v3 + move/from16 v14, v17 goto :goto_3 :cond_8 - move v5, v2 + move v10, v7 - move v13, v3 + move/from16 v13, v17 goto :goto_3 :cond_9 - move v4, v2 + move v5, v7 - move v14, v3 + move/from16 v12, v17 goto :goto_3 :cond_a - move v12, v3 - - move v3, v2 - - :goto_4 - add-int/lit8 v10, v10, 0x1 - const/4 v8, 0x1 - goto :goto_1 - :cond_b - move/from16 p4, v3 + :goto_3 + add-int/lit8 v3, v3, 0x1 - const/4 v7, 0x1 + goto :goto_1 .line 377 - invoke-static {v11}, Ljava/lang/Float;->isNaN(F)Z - - move-result v2 + :cond_c + invoke-static {v4}, Ljava/lang/Float;->isNaN(F)Z - if-eqz v2, :cond_c + move-result v3 - const/high16 v2, 0x7fc00000 # Float.NaN + if-eqz v3, :cond_d .line 378 invoke-static {v2}, Ljava/lang/Float;->isNaN(F)Z move-result v3 - if-nez v3, :cond_e + if-nez v3, :cond_f .line 379 invoke-virtual {v1, v2}, Landroid/view/View;->setRotation(F)V - goto :goto_5 - - :cond_c - const/high16 v2, 0x7fc00000 # Float.NaN + goto :goto_4 .line 382 + :cond_d invoke-static {v2}, Ljava/lang/Float;->isNaN(F)Z move-result v3 - if-eqz v3, :cond_d + if-eqz v3, :cond_e const/4 v2, 0x0 - :cond_d + :cond_e const/high16 v3, 0x40000000 # 2.0f - div-float/2addr v13, v3 + div-float/2addr v6, v3 - add-float/2addr v12, v13 + add-float/2addr v5, v6 - div-float/2addr v15, v3 + div-float/2addr v11, v3 - add-float/2addr v14, v15 + add-float/2addr v10, v11 float-to-double v2, v2 - float-to-double v8, v11 + float-to-double v6, v4 - float-to-double v10, v14 + float-to-double v9, v10 - float-to-double v12, v12 + float-to-double v4, v5 .line 391 - invoke-static {v10, v11, v12, v13}, Ljava/lang/Math;->atan2(DD)D + invoke-static {v9, v10, v4, v5}, Ljava/lang/Math;->atan2(DD)D - move-result-wide v10 + move-result-wide v4 - invoke-static {v10, v11}, Ljava/lang/Math;->toDegrees(D)D + invoke-static {v4, v5}, Ljava/lang/Math;->toDegrees(D)D - move-result-wide v10 + move-result-wide v4 - invoke-static {v8, v9}, Ljava/lang/Double;->isNaN(D)Z + invoke-static {v6, v7}, Ljava/lang/Double;->isNaN(D)Z - add-double/2addr v8, v10 + add-double/2addr v6, v4 invoke-static {v2, v3}, Ljava/lang/Double;->isNaN(D)Z - add-double/2addr v2, v8 + add-double/2addr v2, v6 double-to-float v2, v2 .line 392 invoke-virtual {v1, v2}, Landroid/view/View;->setRotation(F)V - :cond_e - :goto_5 + :cond_f + :goto_4 const/high16 v2, 0x3f000000 # 0.5f - add-float v3, p4, v2 + add-float/2addr v12, v2 - float-to-int v8, v3 + float-to-int v3, v12 - add-float/2addr v4, v2 + add-float/2addr v13, v2 - float-to-int v2, v4 + float-to-int v2, v13 - add-float/2addr v3, v5 + add-float/2addr v12, v14 - float-to-int v3, v3 + float-to-int v4, v12 - add-float/2addr v4, v6 + add-float/2addr v13, v15 - float-to-int v4, v4 + float-to-int v5, v13 - sub-int v5, v3, v8 + sub-int v6, v4, v3 - sub-int v6, v4, v2 + sub-int v7, v5, v2 .line 414 invoke-virtual/range {p1 .. p1}, Landroid/view/View;->getMeasuredWidth()I move-result v9 - if-ne v5, v9, :cond_10 + if-ne v6, v9, :cond_11 invoke-virtual/range {p1 .. p1}, Landroid/view/View;->getMeasuredHeight()I move-result v9 - if-eq v6, v9, :cond_f + if-eq v7, v9, :cond_10 - goto :goto_6 + goto :goto_5 - :cond_f + :cond_10 const/16 v16, 0x0 - goto :goto_7 + goto :goto_6 - :cond_10 - :goto_6 + :cond_11 + :goto_5 const/16 v16, 0x1 - :goto_7 - if-eqz v16, :cond_11 + :goto_6 + if-eqz v16, :cond_12 - const/high16 v7, 0x40000000 # 2.0f + const/high16 v8, 0x40000000 # 2.0f .line 417 - invoke-static {v5, v7}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I + invoke-static {v6, v8}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I - move-result v5 + move-result v6 .line 418 - invoke-static {v6, v7}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I + invoke-static {v7, v8}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I - move-result v6 + move-result v7 .line 420 - invoke-virtual {v1, v5, v6}, Landroid/view/View;->measure(II)V + invoke-virtual {v1, v6, v7}, Landroid/view/View;->measure(II)V .line 423 - :cond_11 - invoke-virtual {v1, v8, v2, v3, v4}, Landroid/view/View;->layout(IIII)V + :cond_12 + invoke-virtual {v1, v3, v2, v4, v5}, Landroid/view/View;->layout(IIII)V return-void .end method diff --git a/smali/android/support/constraint/motion/MotionScene$Transition$TransitionOnClick.smali b/smali/android/support/constraint/motion/MotionScene$Transition$TransitionOnClick.smali index 58ce00a4..4e0ed747 100644 --- a/smali/android/support/constraint/motion/MotionScene$Transition$TransitionOnClick.smali +++ b/smali/android/support/constraint/motion/MotionScene$Transition$TransitionOnClick.smali @@ -130,7 +130,7 @@ # virtual methods .method public addOnClickListeners(Landroid/support/constraint/motion/MotionLayout;ILandroid/support/constraint/motion/MotionScene$Transition;)V - .locals 6 + .locals 5 .line 664 iget v0, p0, Landroid/support/constraint/motion/MotionScene$Transition$TransitionOnClick;->mTargetId:I @@ -194,43 +194,49 @@ :cond_2 iget v1, p0, Landroid/support/constraint/motion/MotionScene$Transition$TransitionOnClick;->mMode:I - and-int/lit8 v2, v1, 0x1 + const/4 v2, 0x1 - const/4 v3, 0x0 + and-int/2addr v1, v2 - const/4 v4, 0x1 + const/4 v3, 0x0 - if-eqz v2, :cond_3 + if-eqz v1, :cond_3 if-ne p2, v0, :cond_3 - const/4 v2, 0x1 + const/4 v1, 0x1 goto :goto_1 :cond_3 - const/4 v2, 0x0 + const/4 v1, 0x0 + .line 677 :goto_1 - and-int/lit16 v5, v1, 0x100 + iget v4, p0, Landroid/support/constraint/motion/MotionScene$Transition$TransitionOnClick;->mMode:I - if-eqz v5, :cond_4 + and-int/lit16 v4, v4, 0x100 + + if-eqz v4, :cond_4 if-ne p2, v0, :cond_4 - const/4 v5, 0x1 + const/4 v4, 0x1 goto :goto_2 :cond_4 - const/4 v5, 0x0 + const/4 v4, 0x0 :goto_2 - or-int/2addr v2, v5 + or-int/2addr v1, v4 + + .line 678 + iget v4, p0, Landroid/support/constraint/motion/MotionScene$Transition$TransitionOnClick;->mMode:I - and-int/lit8 v5, v1, 0x1 + and-int/2addr v4, v2 - if-eqz v5, :cond_5 + if-eqz v4, :cond_5 if-ne p2, v0, :cond_5 @@ -242,23 +248,29 @@ const/4 v0, 0x0 :goto_3 - or-int/2addr v0, v2 + or-int/2addr v0, v1 - and-int/lit8 v2, v1, 0x10 + .line 679 + iget v1, p0, Landroid/support/constraint/motion/MotionScene$Transition$TransitionOnClick;->mMode:I + + and-int/lit8 v1, v1, 0x10 - if-eqz v2, :cond_6 + if-eqz v1, :cond_6 if-ne p2, p3, :cond_6 - const/4 v2, 0x1 + const/4 v1, 0x1 goto :goto_4 :cond_6 - const/4 v2, 0x0 + const/4 v1, 0x0 :goto_4 - or-int/2addr v0, v2 + or-int/2addr v0, v1 + + .line 680 + iget v1, p0, Landroid/support/constraint/motion/MotionScene$Transition$TransitionOnClick;->mMode:I and-int/lit16 v1, v1, 0x1000 @@ -266,10 +278,13 @@ if-ne p2, p3, :cond_7 - const/4 v3, 0x1 + goto :goto_5 :cond_7 - or-int p2, v0, v3 + const/4 v2, 0x0 + + :goto_5 + or-int p2, v0, v2 if-eqz p2, :cond_8 @@ -452,46 +467,49 @@ if-nez v2, :cond_4 - and-int/lit16 v2, v1, 0x100 + and-int/lit16 v1, v1, 0x100 - if-eqz v2, :cond_3 + if-eqz v1, :cond_3 goto :goto_0 :cond_3 - const/4 v2, 0x0 + const/4 v1, 0x0 goto :goto_1 :cond_4 :goto_0 - const/4 v2, 0x1 + const/4 v1, 0x1 + .line 733 :goto_1 - and-int/lit8 v5, v1, 0x10 + iget v2, p0, Landroid/support/constraint/motion/MotionScene$Transition$TransitionOnClick;->mMode:I + + and-int/lit8 v5, v2, 0x10 if-nez v5, :cond_6 - and-int/lit16 v1, v1, 0x1000 + and-int/lit16 v2, v2, 0x1000 - if-eqz v1, :cond_5 + if-eqz v2, :cond_5 goto :goto_2 :cond_5 - const/4 v1, 0x0 + const/4 v2, 0x0 goto :goto_3 :cond_6 :goto_2 - const/4 v1, 0x1 + const/4 v2, 0x1 :goto_3 - if-eqz v2, :cond_7 - if-eqz v1, :cond_7 + if-eqz v2, :cond_7 + const/4 v5, 0x1 goto :goto_4 @@ -500,7 +518,7 @@ const/4 v5, 0x0 :goto_4 - if-eqz v5, :cond_a + if-eqz v5, :cond_b .line 736 iget-object v5, p0, Landroid/support/constraint/motion/MotionScene$Transition$TransitionOnClick;->mTransition:Landroid/support/constraint/motion/MotionScene$Transition; @@ -528,7 +546,7 @@ move-result v6 - if-eq v5, v6, :cond_b + if-eq v5, v6, :cond_a invoke-virtual {p1}, Landroid/support/constraint/motion/MotionLayout;->getProgress()F @@ -543,25 +561,24 @@ goto :goto_5 :cond_9 - move v3, v2 - - const/4 v1, 0x0 + const/4 v2, 0x0 - goto :goto_5 + goto :goto_6 :cond_a - move v3, v2 + :goto_5 + const/4 v1, 0x0 .line 745 :cond_b - :goto_5 + :goto_6 invoke-virtual {p0, v0, p1}, Landroid/support/constraint/motion/MotionScene$Transition$TransitionOnClick;->isTransitionViable(Landroid/support/constraint/motion/MotionScene$Transition;Landroid/support/constraint/motion/MotionLayout;)Z move-result v0 if-eqz v0, :cond_f - if-eqz v3, :cond_c + if-eqz v1, :cond_c .line 746 iget v0, p0, Landroid/support/constraint/motion/MotionScene$Transition$TransitionOnClick;->mMode:I @@ -578,10 +595,10 @@ .line 748 invoke-virtual {p1}, Landroid/support/constraint/motion/MotionLayout;->transitionToEnd()V - goto :goto_6 + goto :goto_7 :cond_c - if-eqz v1, :cond_d + if-eqz v2, :cond_d .line 749 iget v0, p0, Landroid/support/constraint/motion/MotionScene$Transition$TransitionOnClick;->mMode:I @@ -598,10 +615,10 @@ .line 751 invoke-virtual {p1}, Landroid/support/constraint/motion/MotionLayout;->transitionToStart()V - goto :goto_6 + goto :goto_7 :cond_d - if-eqz v3, :cond_e + if-eqz v1, :cond_e .line 752 iget v0, p0, Landroid/support/constraint/motion/MotionScene$Transition$TransitionOnClick;->mMode:I @@ -620,10 +637,10 @@ .line 754 invoke-virtual {p1, v0}, Landroid/support/constraint/motion/MotionLayout;->setProgress(F)V - goto :goto_6 + goto :goto_7 :cond_e - if-eqz v1, :cond_f + if-eqz v2, :cond_f .line 755 iget v0, p0, Landroid/support/constraint/motion/MotionScene$Transition$TransitionOnClick;->mMode:I @@ -643,7 +660,7 @@ invoke-virtual {p1, v0}, Landroid/support/constraint/motion/MotionLayout;->setProgress(F)V :cond_f - :goto_6 + :goto_7 return-void .end method diff --git a/smali/android/support/constraint/motion/MotionScene$Transition.smali b/smali/android/support/constraint/motion/MotionScene$Transition.smali index bb20d5a5..03489e6f 100644 --- a/smali/android/support/constraint/motion/MotionScene$Transition.smali +++ b/smali/android/support/constraint/motion/MotionScene$Transition.smali @@ -748,6 +748,9 @@ iput v3, p0, Landroid/support/constraint/motion/MotionScene$Transition;->mDefaultInterpolatorID:I + .line 841 + iget v3, p0, Landroid/support/constraint/motion/MotionScene$Transition;->mDefaultInterpolatorID:I + if-eq v3, v4, :cond_d .line 842 @@ -770,9 +773,11 @@ iput-object v3, p0, Landroid/support/constraint/motion/MotionScene$Transition;->mDefaultInterpolatorString:Ljava/lang/String; + .line 846 + iget-object v3, p0, Landroid/support/constraint/motion/MotionScene$Transition;->mDefaultInterpolatorString:Ljava/lang/String; + const-string v6, "/" - .line 846 invoke-virtual {v3, v6}, Ljava/lang/String;->indexOf(Ljava/lang/String;)I move-result v3 diff --git a/smali/android/support/constraint/motion/MotionScene.smali b/smali/android/support/constraint/motion/MotionScene.smali index 7eb3a360..b7f7c8c1 100644 --- a/smali/android/support/constraint/motion/MotionScene.smali +++ b/smali/android/support/constraint/motion/MotionScene.smali @@ -509,13 +509,9 @@ invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;->(Ljava/lang/String;)V - goto :goto_2 - - :goto_1 throw p1 - :goto_2 - goto :goto_1 + return-void .end method .method private getRealID(I)I @@ -612,7 +608,7 @@ .end method .method private load(Landroid/content/Context;I)V - .locals 8 + .locals 9 .line 906 invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources; @@ -639,9 +635,11 @@ if-eqz v2, :cond_7 - const/4 v4, 0x2 + const/4 v4, 0x3 + + const/4 v5, 0x2 - if-eq v2, v4, :cond_0 + if-eq v2, v5, :cond_0 goto/16 :goto_5 @@ -652,43 +650,43 @@ move-result-object v2 .line 921 - iget-boolean v5, p0, Landroid/support/constraint/motion/MotionScene;->DEBUG_DESKTOP:Z + iget-boolean v6, p0, Landroid/support/constraint/motion/MotionScene;->DEBUG_DESKTOP:Z - if-eqz v5, :cond_1 + if-eqz v6, :cond_1 .line 922 - sget-object v5, Ljava/lang/System;->out:Ljava/io/PrintStream; + sget-object v6, Ljava/lang/System;->out:Ljava/io/PrintStream; - new-instance v6, Ljava/lang/StringBuilder; + new-instance v7, Ljava/lang/StringBuilder; - invoke-direct {v6}, Ljava/lang/StringBuilder;->()V + invoke-direct {v7}, Ljava/lang/StringBuilder;->()V - const-string v7, "parsing = " + const-string v8, "parsing = " - invoke-virtual {v6, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v7, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v6, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v7, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v6 + move-result-object v7 - invoke-virtual {v5, v6}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V + invoke-virtual {v6, v7}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V .line 927 :cond_1 invoke-virtual {v2}, Ljava/lang/String;->hashCode()I - move-result v5 + move-result v6 :try_end_0 .catch Lorg/xmlpull/v1/XmlPullParserException; {:try_start_0 .. :try_end_0} :catch_1 .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0 - const/4 v6, -0x1 + const/4 v7, -0x1 - const-string v7, "MotionScene" + const-string v8, "MotionScene" - sparse-switch v5, :sswitch_data_0 + sparse-switch v6, :sswitch_data_0 goto :goto_1 @@ -707,7 +705,7 @@ goto :goto_2 :sswitch_1 - invoke-virtual {v2, v7}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v2, v8}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v3 @@ -868,7 +866,7 @@ move-result-object v2 - invoke-static {v7, v2}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I + invoke-static {v8, v2}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I .line 954 :cond_3 @@ -907,7 +905,13 @@ iput-object v2, p0, Landroid/support/constraint/motion/MotionScene;->mCurrentTransition:Landroid/support/constraint/motion/MotionScene$Transition; .line 935 - invoke-static {v2}, Landroid/support/constraint/motion/MotionScene$Transition;->access$200(Landroid/support/constraint/motion/MotionScene$Transition;)Landroid/support/constraint/motion/TouchResponse; + iget-object v1, p0, Landroid/support/constraint/motion/MotionScene;->mCurrentTransition:Landroid/support/constraint/motion/MotionScene$Transition; + + if-eqz v1, :cond_4 + + iget-object v1, p0, Landroid/support/constraint/motion/MotionScene;->mCurrentTransition:Landroid/support/constraint/motion/MotionScene$Transition; + + invoke-static {v1}, Landroid/support/constraint/motion/MotionScene$Transition;->access$200(Landroid/support/constraint/motion/MotionScene$Transition;)Landroid/support/constraint/motion/TouchResponse; move-result-object v1 @@ -937,7 +941,7 @@ move-result v1 - if-ne v1, v6, :cond_5 + if-ne v1, v7, :cond_5 .line 941 iput-object v2, p0, Landroid/support/constraint/motion/MotionScene;->mDefaultTransition:Landroid/support/constraint/motion/MotionScene$Transition; @@ -983,7 +987,7 @@ move-result-object v2 - invoke-static {v7, v2}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I + invoke-static {v8, v2}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I goto :goto_5 @@ -1020,6 +1024,8 @@ :goto_6 return-void + nop + :sswitch_data_0 .sparse-switch -0x50764adb -> :sswitch_6 @@ -1044,7 +1050,7 @@ .end method .method private parseConstraintSet(Landroid/content/Context;Lorg/xmlpull/v1/XmlPullParser;)V - .locals 11 + .locals 13 .line 1024 new-instance v0, Landroid/support/constraint/ConstraintSet; @@ -1063,134 +1069,167 @@ const/4 v3, -0x1 - const/4 v4, -0x1 + const/4 v4, 0x0 const/4 v5, -0x1 + const/4 v6, -0x1 + :goto_0 - if-ge v1, v2, :cond_3 + const/4 v7, 0x1 + + if-ge v4, v2, :cond_6 .line 1030 - invoke-interface {p2, v1}, Lorg/xmlpull/v1/XmlPullParser;->getAttributeName(I)Ljava/lang/String; + invoke-interface {p2, v4}, Lorg/xmlpull/v1/XmlPullParser;->getAttributeName(I)Ljava/lang/String; - move-result-object v6 + move-result-object v8 .line 1031 - invoke-interface {p2, v1}, Lorg/xmlpull/v1/XmlPullParser;->getAttributeValue(I)Ljava/lang/String; + invoke-interface {p2, v4}, Lorg/xmlpull/v1/XmlPullParser;->getAttributeValue(I)Ljava/lang/String; - move-result-object v7 + move-result-object v9 .line 1032 - iget-boolean v8, p0, Landroid/support/constraint/motion/MotionScene;->DEBUG_DESKTOP:Z + iget-boolean v10, p0, Landroid/support/constraint/motion/MotionScene;->DEBUG_DESKTOP:Z - if-eqz v8, :cond_0 + if-eqz v10, :cond_0 .line 1033 - sget-object v8, Ljava/lang/System;->out:Ljava/io/PrintStream; + sget-object v10, Ljava/lang/System;->out:Ljava/io/PrintStream; - new-instance v9, Ljava/lang/StringBuilder; + new-instance v11, Ljava/lang/StringBuilder; - invoke-direct {v9}, Ljava/lang/StringBuilder;->()V + invoke-direct {v11}, Ljava/lang/StringBuilder;->()V - const-string v10, "id string = " + const-string v12, "id string = " - invoke-virtual {v9, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v11, v12}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v9, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v11, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v9}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v11}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v9 + move-result-object v11 - invoke-virtual {v8, v9}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V + invoke-virtual {v10, v11}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V .line 1035 :cond_0 - invoke-virtual {v6}, Ljava/lang/String;->hashCode()I + invoke-virtual {v8}, Ljava/lang/String;->hashCode()I - const-string v8, "deriveConstraintsFrom" + move-result v10 - invoke-virtual {v6, v8}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + const v11, -0x59328327 - move-result v8 + if-eq v10, v11, :cond_2 - if-nez v8, :cond_2 + const/16 v11, 0xd1b - const-string v8, "id" + if-eq v10, v11, :cond_1 - invoke-virtual {v6, v8}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + goto :goto_1 - move-result v6 + :cond_1 + const-string v10, "id" - if-nez v6, :cond_1 + invoke-virtual {v8, v10}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z - goto :goto_1 + move-result v8 - .line 1037 - :cond_1 - invoke-direct {p0, p1, v7}, Landroid/support/constraint/motion/MotionScene;->getId(Landroid/content/Context;Ljava/lang/String;)I + if-eqz v8, :cond_3 - move-result v4 + const/4 v8, 0x0 - .line 1038 - iget-object v6, p0, Landroid/support/constraint/motion/MotionScene;->mConstraintSetIdMap:Ljava/util/HashMap; + goto :goto_2 - invoke-static {v7}, Landroid/support/constraint/motion/MotionScene;->stripID(Ljava/lang/String;)Ljava/lang/String; + :cond_2 + const-string v10, "deriveConstraintsFrom" - move-result-object v7 + invoke-virtual {v8, v10}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z - invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + move-result v8 - move-result-object v8 + if-eqz v8, :cond_3 - invoke-virtual {v6, v7, v8}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + const/4 v8, 0x1 - goto :goto_1 + goto :goto_2 + + :cond_3 + :goto_1 + const/4 v8, -0x1 + + :goto_2 + if-eqz v8, :cond_5 + + if-eq v8, v7, :cond_4 + + goto :goto_3 .line 1041 - :cond_2 - invoke-direct {p0, p1, v7}, Landroid/support/constraint/motion/MotionScene;->getId(Landroid/content/Context;Ljava/lang/String;)I + :cond_4 + invoke-direct {p0, p1, v9}, Landroid/support/constraint/motion/MotionScene;->getId(Landroid/content/Context;Ljava/lang/String;)I + + move-result v6 + + goto :goto_3 + + .line 1037 + :cond_5 + invoke-direct {p0, p1, v9}, Landroid/support/constraint/motion/MotionScene;->getId(Landroid/content/Context;Ljava/lang/String;)I move-result v5 - :goto_1 - add-int/lit8 v1, v1, 0x1 + .line 1038 + iget-object v7, p0, Landroid/support/constraint/motion/MotionScene;->mConstraintSetIdMap:Ljava/util/HashMap; + + invoke-static {v9}, Landroid/support/constraint/motion/MotionScene;->stripID(Ljava/lang/String;)Ljava/lang/String; + + move-result-object v8 + + invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + + move-result-object v9 + + invoke-virtual {v7, v8, v9}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + + :goto_3 + add-int/lit8 v4, v4, 0x1 goto :goto_0 - :cond_3 - if-eq v4, v3, :cond_6 + :cond_6 + if-eq v5, v3, :cond_9 .line 1046 iget-object v1, p0, Landroid/support/constraint/motion/MotionScene;->mMotionLayout:Landroid/support/constraint/motion/MotionLayout; iget v1, v1, Landroid/support/constraint/motion/MotionLayout;->mDebugPath:I - if-eqz v1, :cond_4 - - const/4 v1, 0x1 + if-eqz v1, :cond_7 .line 1047 - invoke-virtual {v0, v1}, Landroid/support/constraint/ConstraintSet;->setValidateOnParse(Z)V + invoke-virtual {v0, v7}, Landroid/support/constraint/ConstraintSet;->setValidateOnParse(Z)V .line 1049 - :cond_4 + :cond_7 invoke-virtual {v0, p1, p2}, Landroid/support/constraint/ConstraintSet;->load(Landroid/content/Context;Lorg/xmlpull/v1/XmlPullParser;)V - if-eq v5, v3, :cond_5 + if-eq v6, v3, :cond_8 .line 1051 iget-object p1, p0, Landroid/support/constraint/motion/MotionScene;->mDeriveMap:Landroid/util/SparseIntArray; - invoke-virtual {p1, v4, v5}, Landroid/util/SparseIntArray;->put(II)V + invoke-virtual {p1, v5, v6}, Landroid/util/SparseIntArray;->put(II)V .line 1053 - :cond_5 + :cond_8 iget-object p1, p0, Landroid/support/constraint/motion/MotionScene;->mConstraintSetMap:Landroid/util/SparseArray; - invoke-virtual {p1, v4, v0}, Landroid/util/SparseArray;->put(ILjava/lang/Object;)V + invoke-virtual {p1, v5, v0}, Landroid/util/SparseArray;->put(ILjava/lang/Object;)V - :cond_6 + :cond_9 return-void .end method @@ -2416,7 +2455,7 @@ .end method .method public getConstraintSetIds()[I - .locals 4 + .locals 3 .line 340 iget-object v0, p0, Landroid/support/constraint/motion/MotionScene;->mConstraintSetMap:Landroid/util/SparseArray; @@ -2425,28 +2464,31 @@ move-result v0 - new-array v1, v0, [I + new-array v0, v0, [I - const/4 v2, 0x0 + const/4 v1, 0x0 + .line 341 :goto_0 - if-ge v2, v0, :cond_0 + array-length v2, v0 + + if-ge v1, v2, :cond_0 .line 342 - iget-object v3, p0, Landroid/support/constraint/motion/MotionScene;->mConstraintSetMap:Landroid/util/SparseArray; + iget-object v2, p0, Landroid/support/constraint/motion/MotionScene;->mConstraintSetMap:Landroid/util/SparseArray; - invoke-virtual {v3, v2}, Landroid/util/SparseArray;->keyAt(I)I + invoke-virtual {v2, v1}, Landroid/util/SparseArray;->keyAt(I)I - move-result v3 + move-result v2 - aput v3, v1, v2 + aput v2, v0, v1 - add-int/lit8 v2, v2, 0x1 + add-int/lit8 v1, v1, 0x1 goto :goto_0 :cond_0 - return-object v1 + return-object v0 .end method .method public getDefinedTransitions()Ljava/util/ArrayList; @@ -2519,38 +2561,14 @@ move-result v0 - const/4 v1, -0x2 - - if-eq v0, v1, :cond_6 - - const/4 v1, -0x1 - - if-eq v0, v1, :cond_5 - - if-eqz v0, :cond_4 - - const/4 v1, 0x1 - - if-eq v0, v1, :cond_3 - - const/4 v1, 0x2 - - if-eq v0, v1, :cond_2 - - const/4 v1, 0x4 - - if-eq v0, v1, :cond_1 - - const/4 v1, 0x5 + const/4 v1, 0x0 - if-eq v0, v1, :cond_0 + packed-switch v0, :pswitch_data_0 - const/4 v0, 0x0 - - return-object v0 + return-object v1 .line 1418 - :cond_0 + :pswitch_0 new-instance v0, Landroid/view/animation/BounceInterpolator; invoke-direct {v0}, Landroid/view/animation/BounceInterpolator;->()V @@ -2558,15 +2576,18 @@ return-object v0 .line 1416 - :cond_1 + :pswitch_1 new-instance v0, Landroid/view/animation/AnticipateInterpolator; invoke-direct {v0}, Landroid/view/animation/AnticipateInterpolator;->()V return-object v0 + :pswitch_2 + return-object v1 + .line 1412 - :cond_2 + :pswitch_3 new-instance v0, Landroid/view/animation/DecelerateInterpolator; invoke-direct {v0}, Landroid/view/animation/DecelerateInterpolator;->()V @@ -2574,7 +2595,7 @@ return-object v0 .line 1410 - :cond_3 + :pswitch_4 new-instance v0, Landroid/view/animation/AccelerateInterpolator; invoke-direct {v0}, Landroid/view/animation/AccelerateInterpolator;->()V @@ -2582,7 +2603,7 @@ return-object v0 .line 1408 - :cond_4 + :pswitch_5 new-instance v0, Landroid/view/animation/AccelerateDecelerateInterpolator; invoke-direct {v0}, Landroid/view/animation/AccelerateDecelerateInterpolator;->()V @@ -2590,7 +2611,7 @@ return-object v0 .line 1397 - :cond_5 + :pswitch_6 iget-object v0, p0, Landroid/support/constraint/motion/MotionScene;->mCurrentTransition:Landroid/support/constraint/motion/MotionScene$Transition; invoke-static {v0}, Landroid/support/constraint/motion/MotionScene$Transition;->access$1500(Landroid/support/constraint/motion/MotionScene$Transition;)Ljava/lang/String; @@ -2609,7 +2630,7 @@ return-object v1 .line 1405 - :cond_6 + :pswitch_7 iget-object v0, p0, Landroid/support/constraint/motion/MotionScene;->mMotionLayout:Landroid/support/constraint/motion/MotionLayout; invoke-virtual {v0}, Landroid/support/constraint/motion/MotionLayout;->getContext()Landroid/content/Context; @@ -2629,6 +2650,20 @@ move-result-object v0 return-object v0 + + nop + + :pswitch_data_0 + .packed-switch -0x2 + :pswitch_7 + :pswitch_6 + :pswitch_5 + :pswitch_4 + :pswitch_3 + :pswitch_2 + :pswitch_1 + :pswitch_0 + .end packed-switch .end method .method getKeyFrame(Landroid/content/Context;III)Landroid/support/constraint/motion/Key; @@ -3863,7 +3898,7 @@ .end method .method public setKeyframe(Landroid/view/View;ILjava/lang/String;Ljava/lang/Object;)V - .locals 3 + .locals 4 .line 1196 iget-object v0, p0, Landroid/support/constraint/motion/MotionScene;->mCurrentTransition:Landroid/support/constraint/motion/MotionScene$Transition; @@ -3928,16 +3963,27 @@ if-ne v2, p2, :cond_2 + const/4 v2, 0x0 + if-eqz p4, :cond_3 .line 1214 - move-object v2, p4 + move-object v3, p4 + + check-cast v3, Ljava/lang/Float; - check-cast v2, Ljava/lang/Float; + invoke-virtual {v3}, Ljava/lang/Float;->floatValue()F - invoke-virtual {v2}, Ljava/lang/Float;->floatValue()F + move-result v3 + + goto :goto_1 :cond_3 + const/4 v3, 0x0 + + :goto_1 + cmpl-float v2, v3, v2 + const-string v2, "app:PerpendicularPath_percent" .line 1226 @@ -4075,10 +4121,12 @@ :cond_5 iput-object v4, p0, Landroid/support/constraint/motion/MotionScene;->mCurrentTransition:Landroid/support/constraint/motion/MotionScene$Transition; - if-eqz v4, :cond_6 - .line 127 - invoke-static {v4}, Landroid/support/constraint/motion/MotionScene$Transition;->access$200(Landroid/support/constraint/motion/MotionScene$Transition;)Landroid/support/constraint/motion/TouchResponse; + iget-object p1, p0, Landroid/support/constraint/motion/MotionScene;->mCurrentTransition:Landroid/support/constraint/motion/MotionScene$Transition; + + if-eqz p1, :cond_6 + + invoke-static {p1}, Landroid/support/constraint/motion/MotionScene$Transition;->access$200(Landroid/support/constraint/motion/MotionScene$Transition;)Landroid/support/constraint/motion/TouchResponse; move-result-object p1 @@ -4166,9 +4214,11 @@ .line 213 iput-object p1, p0, Landroid/support/constraint/motion/MotionScene;->mCurrentTransition:Landroid/support/constraint/motion/MotionScene$Transition; + .line 214 + iget-object p1, p0, Landroid/support/constraint/motion/MotionScene;->mCurrentTransition:Landroid/support/constraint/motion/MotionScene$Transition; + if-eqz p1, :cond_0 - .line 214 invoke-static {p1}, Landroid/support/constraint/motion/MotionScene$Transition;->access$200(Landroid/support/constraint/motion/MotionScene$Transition;)Landroid/support/constraint/motion/TouchResponse; move-result-object p1 diff --git a/smali/android/support/constraint/motion/SplineSet$CustomSet.smali b/smali/android/support/constraint/motion/SplineSet$CustomSet.smali index ee8cd322..b2de023b 100644 --- a/smali/android/support/constraint/motion/SplineSet$CustomSet.smali +++ b/smali/android/support/constraint/motion/SplineSet$CustomSet.smali @@ -154,20 +154,14 @@ iput-object v4, p0, Landroid/support/constraint/motion/SplineSet$CustomSet;->mTempValues:[F - const/4 v4, 0x2 - - new-array v4, v4, [I - - const/4 v5, 0x1 - - aput v1, v4, v5 + .line 269 + filled-new-array {v0, v1}, [I - aput v0, v4, v2 + move-result-object v1 - .line 269 - sget-object v1, Ljava/lang/Double;->TYPE:Ljava/lang/Class; + const-class v4, D - invoke-static {v1, v4}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;[I)Ljava/lang/Object; + invoke-static {v4, v1}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;[I)Ljava/lang/Object; move-result-object v1 diff --git a/smali/android/support/constraint/motion/SplineSet$ProgressSet.smali b/smali/android/support/constraint/motion/SplineSet$ProgressSet.smali index b668fa2d..1d146dfd 100644 --- a/smali/android/support/constraint/motion/SplineSet$ProgressSet.smali +++ b/smali/android/support/constraint/motion/SplineSet$ProgressSet.smali @@ -102,10 +102,10 @@ :goto_0 if-eqz v2, :cond_2 + .line 320 :try_start_1 new-array v4, v4, [Ljava/lang/Object; - .line 320 invoke-virtual {p0, p2}, Landroid/support/constraint/motion/SplineSet$ProgressSet;->get(F)F move-result p2 diff --git a/smali/android/support/constraint/motion/SplineSet.smali b/smali/android/support/constraint/motion/SplineSet.smali index 48fc045b..1b605208 100644 --- a/smali/android/support/constraint/motion/SplineSet.smali +++ b/smali/android/support/constraint/motion/SplineSet.smali @@ -51,14 +51,14 @@ const/16 v0, 0xa + .line 40 new-array v1, v0, [I - .line 40 iput-object v1, p0, Landroid/support/constraint/motion/SplineSet;->mTimePoints:[I + .line 41 new-array v0, v0, [F - .line 41 iput-object v0, p0, Landroid/support/constraint/motion/SplineSet;->mValues:[F return-void @@ -86,17 +86,13 @@ .end method .method static makeSpline(Ljava/lang/String;)Landroid/support/constraint/motion/SplineSet; - .locals 2 + .locals 1 .line 79 invoke-virtual {p0}, Ljava/lang/String;->hashCode()I - invoke-virtual {p0}, Ljava/lang/String;->hashCode()I - move-result v0 - const/4 v1, -0x1 - sparse-switch v0, :sswitch_data_0 goto/16 :goto_0 @@ -108,14 +104,11 @@ move-result p0 - if-nez p0, :cond_0 - - goto/16 :goto_0 + if-eqz p0, :cond_0 - :cond_0 - const/16 v1, 0xf + const/16 p0, 0xa - goto/16 :goto_0 + goto/16 :goto_1 :sswitch_1 const-string v0, "alpha" @@ -124,14 +117,11 @@ move-result p0 - if-nez p0, :cond_1 + if-eqz p0, :cond_0 - goto/16 :goto_0 + const/4 p0, 0x0 - :cond_1 - const/16 v1, 0xe - - goto/16 :goto_0 + goto/16 :goto_1 :sswitch_2 const-string v0, "transitionPathRotate" @@ -140,14 +130,11 @@ move-result p0 - if-nez p0, :cond_2 + if-eqz p0, :cond_0 - goto/16 :goto_0 + const/4 p0, 0x7 - :cond_2 - const/16 v1, 0xd - - goto/16 :goto_0 + goto/16 :goto_1 :sswitch_3 const-string v0, "elevation" @@ -156,14 +143,11 @@ move-result p0 - if-nez p0, :cond_3 + if-eqz p0, :cond_0 - goto/16 :goto_0 - - :cond_3 - const/16 v1, 0xc + const/4 p0, 0x1 - goto/16 :goto_0 + goto/16 :goto_1 :sswitch_4 const-string v0, "rotation" @@ -172,14 +156,11 @@ move-result p0 - if-nez p0, :cond_4 + if-eqz p0, :cond_0 - goto/16 :goto_0 + const/4 p0, 0x2 - :cond_4 - const/16 v1, 0xb - - goto/16 :goto_0 + goto/16 :goto_1 :sswitch_5 const-string v0, "transformPivotY" @@ -188,14 +169,11 @@ move-result p0 - if-nez p0, :cond_5 + if-eqz p0, :cond_0 - goto/16 :goto_0 + const/4 p0, 0x6 - :cond_5 - const/16 v1, 0xa - - goto/16 :goto_0 + goto/16 :goto_1 :sswitch_6 const-string v0, "transformPivotX" @@ -204,14 +182,11 @@ move-result p0 - if-nez p0, :cond_6 + if-eqz p0, :cond_0 - goto/16 :goto_0 - - :cond_6 - const/16 v1, 0x9 + const/4 p0, 0x5 - goto/16 :goto_0 + goto/16 :goto_1 :sswitch_7 const-string v0, "waveVariesBy" @@ -220,14 +195,11 @@ move-result p0 - if-nez p0, :cond_7 + if-eqz p0, :cond_0 - goto/16 :goto_0 - - :cond_7 - const/16 v1, 0x8 + const/16 p0, 0xb - goto/16 :goto_0 + goto :goto_1 :sswitch_8 const-string v0, "scaleY" @@ -236,14 +208,11 @@ move-result p0 - if-nez p0, :cond_8 - - goto :goto_0 + if-eqz p0, :cond_0 - :cond_8 - const/4 v1, 0x7 + const/16 p0, 0x9 - goto :goto_0 + goto :goto_1 :sswitch_9 const-string v0, "scaleX" @@ -252,14 +221,11 @@ move-result p0 - if-nez p0, :cond_9 + if-eqz p0, :cond_0 - goto :goto_0 - - :cond_9 - const/4 v1, 0x6 + const/16 p0, 0x8 - goto :goto_0 + goto :goto_1 :sswitch_a const-string v0, "progress" @@ -268,14 +234,11 @@ move-result p0 - if-nez p0, :cond_a - - goto :goto_0 + if-eqz p0, :cond_0 - :cond_a - const/4 v1, 0x5 + const/16 p0, 0xf - goto :goto_0 + goto :goto_1 :sswitch_b const-string v0, "translationZ" @@ -284,14 +247,11 @@ move-result p0 - if-nez p0, :cond_b + if-eqz p0, :cond_0 - goto :goto_0 + const/16 p0, 0xe - :cond_b - const/4 v1, 0x4 - - goto :goto_0 + goto :goto_1 :sswitch_c const-string v0, "translationY" @@ -300,14 +260,11 @@ move-result p0 - if-nez p0, :cond_c - - goto :goto_0 + if-eqz p0, :cond_0 - :cond_c - const/4 v1, 0x3 + const/16 p0, 0xd - goto :goto_0 + goto :goto_1 :sswitch_d const-string v0, "translationX" @@ -316,14 +273,11 @@ move-result p0 - if-nez p0, :cond_d + if-eqz p0, :cond_0 - goto :goto_0 + const/16 p0, 0xc - :cond_d - const/4 v1, 0x2 - - goto :goto_0 + goto :goto_1 :sswitch_e const-string v0, "rotationY" @@ -332,14 +286,11 @@ move-result p0 - if-nez p0, :cond_e - - goto :goto_0 + if-eqz p0, :cond_0 - :cond_e - const/4 v1, 0x1 + const/4 p0, 0x4 - goto :goto_0 + goto :goto_1 :sswitch_f const-string v0, "rotationX" @@ -348,150 +299,151 @@ move-result p0 - if-nez p0, :cond_f + if-eqz p0, :cond_0 - goto :goto_0 + const/4 p0, 0x3 - :cond_f - const/4 v1, 0x0 + goto :goto_1 + :cond_0 :goto_0 - packed-switch v1, :pswitch_data_0 + const/4 p0, -0x1 + + :goto_1 + packed-switch p0, :pswitch_data_0 const/4 p0, 0x0 return-object p0 - .line 101 + .line 111 :pswitch_0 - new-instance p0, Landroid/support/constraint/motion/SplineSet$AlphaSet; + new-instance p0, Landroid/support/constraint/motion/SplineSet$ProgressSet; - invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$AlphaSet;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$ProgressSet;->()V return-object p0 - .line 81 + .line 109 :pswitch_1 - new-instance p0, Landroid/support/constraint/motion/SplineSet$AlphaSet; + new-instance p0, Landroid/support/constraint/motion/SplineSet$TranslationZset; - invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$AlphaSet;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$TranslationZset;->()V return-object p0 - .line 95 + .line 107 :pswitch_2 - new-instance p0, Landroid/support/constraint/motion/SplineSet$PathRotate; + new-instance p0, Landroid/support/constraint/motion/SplineSet$TranslationYset; - invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$PathRotate;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$TranslationYset;->()V return-object p0 - .line 83 + .line 105 :pswitch_3 - new-instance p0, Landroid/support/constraint/motion/SplineSet$ElevationSet; + new-instance p0, Landroid/support/constraint/motion/SplineSet$TranslationXset; - invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$ElevationSet;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$TranslationXset;->()V return-object p0 - .line 85 + .line 103 :pswitch_4 - new-instance p0, Landroid/support/constraint/motion/SplineSet$RotationSet; + new-instance p0, Landroid/support/constraint/motion/SplineSet$AlphaSet; - invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$RotationSet;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$AlphaSet;->()V return-object p0 - .line 93 + .line 101 :pswitch_5 - new-instance p0, Landroid/support/constraint/motion/SplineSet$PivotYset; + new-instance p0, Landroid/support/constraint/motion/SplineSet$AlphaSet; - invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$PivotYset;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$AlphaSet;->()V return-object p0 - .line 91 + .line 99 :pswitch_6 - new-instance p0, Landroid/support/constraint/motion/SplineSet$PivotXset; + new-instance p0, Landroid/support/constraint/motion/SplineSet$ScaleYset; - invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$PivotXset;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$ScaleYset;->()V return-object p0 - .line 103 + .line 97 :pswitch_7 - new-instance p0, Landroid/support/constraint/motion/SplineSet$AlphaSet; + new-instance p0, Landroid/support/constraint/motion/SplineSet$ScaleXset; - invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$AlphaSet;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$ScaleXset;->()V return-object p0 - .line 99 + .line 95 :pswitch_8 - new-instance p0, Landroid/support/constraint/motion/SplineSet$ScaleYset; + new-instance p0, Landroid/support/constraint/motion/SplineSet$PathRotate; - invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$ScaleYset;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$PathRotate;->()V return-object p0 - .line 97 + .line 93 :pswitch_9 - new-instance p0, Landroid/support/constraint/motion/SplineSet$ScaleXset; + new-instance p0, Landroid/support/constraint/motion/SplineSet$PivotYset; - invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$ScaleXset;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$PivotYset;->()V return-object p0 - .line 111 + .line 91 :pswitch_a - new-instance p0, Landroid/support/constraint/motion/SplineSet$ProgressSet; + new-instance p0, Landroid/support/constraint/motion/SplineSet$PivotXset; - invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$ProgressSet;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$PivotXset;->()V return-object p0 - .line 109 + .line 89 :pswitch_b - new-instance p0, Landroid/support/constraint/motion/SplineSet$TranslationZset; + new-instance p0, Landroid/support/constraint/motion/SplineSet$RotationYset; - invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$TranslationZset;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$RotationYset;->()V return-object p0 - .line 107 + .line 87 :pswitch_c - new-instance p0, Landroid/support/constraint/motion/SplineSet$TranslationYset; + new-instance p0, Landroid/support/constraint/motion/SplineSet$RotationXset; - invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$TranslationYset;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$RotationXset;->()V return-object p0 - .line 105 + .line 85 :pswitch_d - new-instance p0, Landroid/support/constraint/motion/SplineSet$TranslationXset; + new-instance p0, Landroid/support/constraint/motion/SplineSet$RotationSet; - invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$TranslationXset;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$RotationSet;->()V return-object p0 - .line 89 + .line 83 :pswitch_e - new-instance p0, Landroid/support/constraint/motion/SplineSet$RotationYset; + new-instance p0, Landroid/support/constraint/motion/SplineSet$ElevationSet; - invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$RotationYset;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$ElevationSet;->()V return-object p0 - .line 87 + .line 81 :pswitch_f - new-instance p0, Landroid/support/constraint/motion/SplineSet$RotationXset; + new-instance p0, Landroid/support/constraint/motion/SplineSet$AlphaSet; - invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$RotationXset;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/SplineSet$AlphaSet;->()V return-object p0 - nop - :sswitch_data_0 .sparse-switch -0x4a771f66 -> :sswitch_f @@ -709,18 +661,14 @@ :cond_2 new-array v0, v1, [D - const/4 v2, 0x2 - - new-array v2, v2, [I - - aput v3, v2, v3 + .line 145 + filled-new-array {v1, v3}, [I - aput v1, v2, v4 + move-result-object v1 - .line 145 - sget-object v1, Ljava/lang/Double;->TYPE:Ljava/lang/Class; + const-class v2, D - invoke-static {v1, v2}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;[I)Ljava/lang/Object; + invoke-static {v2, v1}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;[I)Ljava/lang/Object; move-result-object v1 diff --git a/smali/android/support/constraint/motion/TimeCycleSplineSet$CustomSet.smali b/smali/android/support/constraint/motion/TimeCycleSplineSet$CustomSet.smali index 58691e76..a13726aa 100644 --- a/smali/android/support/constraint/motion/TimeCycleSplineSet$CustomSet.smali +++ b/smali/android/support/constraint/motion/TimeCycleSplineSet$CustomSet.smali @@ -342,7 +342,7 @@ .end method .method public setup(I)V - .locals 14 + .locals 13 .line 328 iget-object v0, p0, Landroid/support/constraint/motion/TimeCycleSplineSet$CustomSet;->mConstraintAttributeList:Landroid/util/SparseArray; @@ -381,20 +381,14 @@ iput-object v5, p0, Landroid/support/constraint/motion/TimeCycleSplineSet$CustomSet;->mCache:[F - const/4 v5, 0x2 - - new-array v5, v5, [I - - const/4 v6, 0x1 - - aput v4, v5, v6 + .line 333 + filled-new-array {v0, v4}, [I - aput v0, v5, v2 + move-result-object v4 - .line 333 - sget-object v4, Ljava/lang/Double;->TYPE:Ljava/lang/Class; + const-class v5, D - invoke-static {v4, v5}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;[I)Ljava/lang/Object; + invoke-static {v5, v4}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;[I)Ljava/lang/Object; move-result-object v4 @@ -406,87 +400,91 @@ if-ge v5, v0, :cond_1 .line 335 - iget-object v7, p0, Landroid/support/constraint/motion/TimeCycleSplineSet$CustomSet;->mConstraintAttributeList:Landroid/util/SparseArray; + iget-object v6, p0, Landroid/support/constraint/motion/TimeCycleSplineSet$CustomSet;->mConstraintAttributeList:Landroid/util/SparseArray; - invoke-virtual {v7, v5}, Landroid/util/SparseArray;->keyAt(I)I + invoke-virtual {v6, v5}, Landroid/util/SparseArray;->keyAt(I)I - move-result v7 + move-result v6 .line 336 - iget-object v8, p0, Landroid/support/constraint/motion/TimeCycleSplineSet$CustomSet;->mConstraintAttributeList:Landroid/util/SparseArray; + iget-object v7, p0, Landroid/support/constraint/motion/TimeCycleSplineSet$CustomSet;->mConstraintAttributeList:Landroid/util/SparseArray; - invoke-virtual {v8, v5}, Landroid/util/SparseArray;->valueAt(I)Ljava/lang/Object; + invoke-virtual {v7, v5}, Landroid/util/SparseArray;->valueAt(I)Ljava/lang/Object; - move-result-object v8 + move-result-object v7 - check-cast v8, Landroid/support/constraint/ConstraintAttribute; + check-cast v7, Landroid/support/constraint/ConstraintAttribute; .line 337 - iget-object v9, p0, Landroid/support/constraint/motion/TimeCycleSplineSet$CustomSet;->mWaveProperties:Landroid/util/SparseArray; + iget-object v8, p0, Landroid/support/constraint/motion/TimeCycleSplineSet$CustomSet;->mWaveProperties:Landroid/util/SparseArray; - invoke-virtual {v9, v5}, Landroid/util/SparseArray;->valueAt(I)Ljava/lang/Object; + invoke-virtual {v8, v5}, Landroid/util/SparseArray;->valueAt(I)Ljava/lang/Object; - move-result-object v9 + move-result-object v8 - check-cast v9, [F + check-cast v8, [F - int-to-double v10, v7 + int-to-double v9, v6 - const-wide v12, 0x3f847ae147ae147bL # 0.01 + const-wide v11, 0x3f847ae147ae147bL # 0.01 .line 338 - invoke-static {v10, v11}, Ljava/lang/Double;->isNaN(D)Z + invoke-static {v9, v10}, Ljava/lang/Double;->isNaN(D)Z - mul-double v10, v10, v12 + mul-double v9, v9, v11 - aput-wide v10, v3, v5 + aput-wide v9, v3, v5 .line 339 - iget-object v7, p0, Landroid/support/constraint/motion/TimeCycleSplineSet$CustomSet;->mTempValues:[F + iget-object v6, p0, Landroid/support/constraint/motion/TimeCycleSplineSet$CustomSet;->mTempValues:[F - invoke-virtual {v8, v7}, Landroid/support/constraint/ConstraintAttribute;->getValuesToInterpolate([F)V + invoke-virtual {v7, v6}, Landroid/support/constraint/ConstraintAttribute;->getValuesToInterpolate([F)V - const/4 v7, 0x0 + const/4 v6, 0x0 .line 340 :goto_1 - iget-object v8, p0, Landroid/support/constraint/motion/TimeCycleSplineSet$CustomSet;->mTempValues:[F + iget-object v7, p0, Landroid/support/constraint/motion/TimeCycleSplineSet$CustomSet;->mTempValues:[F - array-length v10, v8 + array-length v9, v7 - if-ge v7, v10, :cond_0 + if-ge v6, v9, :cond_0 .line 341 - aget-object v10, v4, v5 + aget-object v9, v4, v5 - aget v8, v8, v7 + aget v7, v7, v6 - float-to-double v11, v8 + float-to-double v10, v7 - aput-wide v11, v10, v7 + aput-wide v10, v9, v6 - add-int/lit8 v7, v7, 0x1 + add-int/lit8 v6, v6, 0x1 goto :goto_1 .line 343 :cond_0 - aget-object v7, v4, v5 + aget-object v6, v4, v5 - aget v8, v9, v2 + aget v7, v8, v2 - float-to-double v10, v8 + float-to-double v9, v7 - aput-wide v10, v7, v1 - - add-int/lit8 v8, v1, 0x1 + aput-wide v9, v6, v1 .line 344 - aget v9, v9, v6 + aget-object v6, v4, v5 + + const/4 v7, 0x1 + + add-int/lit8 v9, v1, 0x1 + + aget v7, v8, v7 - float-to-double v9, v9 + float-to-double v7, v7 - aput-wide v9, v7, v8 + aput-wide v7, v6, v9 add-int/lit8 v5, v5, 0x1 diff --git a/smali/android/support/constraint/motion/TimeCycleSplineSet$ProgressSet.smali b/smali/android/support/constraint/motion/TimeCycleSplineSet$ProgressSet.smali index 01e7b98c..3994c99e 100644 --- a/smali/android/support/constraint/motion/TimeCycleSplineSet$ProgressSet.smali +++ b/smali/android/support/constraint/motion/TimeCycleSplineSet$ProgressSet.smali @@ -120,6 +120,7 @@ if-eqz v11, :cond_2 + .line 408 :try_start_1 new-array v12, v2, [Ljava/lang/Object; @@ -133,7 +134,6 @@ move-object/from16 v6, p5 - .line 408 invoke-virtual/range {v1 .. v6}, Landroid/support/constraint/motion/TimeCycleSplineSet$ProgressSet;->get(FJLandroid/view/View;Landroid/support/constraint/motion/KeyCache;)F move-result v1 diff --git a/smali/android/support/constraint/motion/TimeCycleSplineSet.smali b/smali/android/support/constraint/motion/TimeCycleSplineSet.smali index 63fc23a8..ffa89a57 100644 --- a/smali/android/support/constraint/motion/TimeCycleSplineSet.smali +++ b/smali/android/support/constraint/motion/TimeCycleSplineSet.smali @@ -66,7 +66,7 @@ .end method .method public constructor ()V - .locals 3 + .locals 4 .line 36 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -78,21 +78,21 @@ const/16 v1, 0xa - new-array v1, v1, [I - .line 40 - iput-object v1, p0, Landroid/support/constraint/motion/TimeCycleSplineSet;->mTimePoints:[I + new-array v2, v1, [I - const/4 v1, 0x2 + iput-object v2, p0, Landroid/support/constraint/motion/TimeCycleSplineSet;->mTimePoints:[I - new-array v1, v1, [I + const/4 v2, 0x3 .line 41 - fill-array-data v1, :array_0 + filled-new-array {v1, v2}, [I - sget-object v2, Ljava/lang/Float;->TYPE:Ljava/lang/Class; + move-result-object v1 - invoke-static {v2, v1}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;[I)Ljava/lang/Object; + const-class v3, F + + invoke-static {v3, v1}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;[I)Ljava/lang/Object; move-result-object v1 @@ -100,11 +100,9 @@ iput-object v1, p0, Landroid/support/constraint/motion/TimeCycleSplineSet;->mValues:[[F - const/4 v1, 0x3 - - new-array v1, v1, [F - .line 44 + new-array v1, v2, [F + iput-object v1, p0, Landroid/support/constraint/motion/TimeCycleSplineSet;->mCache:[F .line 49 @@ -116,12 +114,6 @@ iput v0, p0, Landroid/support/constraint/motion/TimeCycleSplineSet;->last_cycle:F return-void - - :array_0 - .array-data 4 - 0xa - 0x3 - .end array-data .end method .method static makeCustomSpline(Ljava/lang/String;Landroid/util/SparseArray;)Landroid/support/constraint/motion/TimeCycleSplineSet; @@ -146,17 +138,13 @@ .end method .method static makeSpline(Ljava/lang/String;J)Landroid/support/constraint/motion/TimeCycleSplineSet; - .locals 2 + .locals 1 .line 130 invoke-virtual {p0}, Ljava/lang/String;->hashCode()I - invoke-virtual {p0}, Ljava/lang/String;->hashCode()I - move-result v0 - const/4 v1, -0x1 - sparse-switch v0, :sswitch_data_0 goto/16 :goto_0 @@ -168,14 +156,11 @@ move-result p0 - if-nez p0, :cond_0 + if-eqz p0, :cond_0 - goto/16 :goto_0 - - :cond_0 - const/16 v1, 0xb + const/4 p0, 0x0 - goto/16 :goto_0 + goto/16 :goto_1 :sswitch_1 const-string v0, "transitionPathRotate" @@ -184,14 +169,11 @@ move-result p0 - if-nez p0, :cond_1 - - goto/16 :goto_0 + if-eqz p0, :cond_0 - :cond_1 - const/16 v1, 0xa + const/4 p0, 0x5 - goto/16 :goto_0 + goto/16 :goto_1 :sswitch_2 const-string v0, "elevation" @@ -200,14 +182,11 @@ move-result p0 - if-nez p0, :cond_2 - - goto/16 :goto_0 + if-eqz p0, :cond_0 - :cond_2 - const/16 v1, 0x9 + const/4 p0, 0x1 - goto/16 :goto_0 + goto :goto_1 :sswitch_3 const-string v0, "rotation" @@ -216,14 +195,11 @@ move-result p0 - if-nez p0, :cond_3 + if-eqz p0, :cond_0 - goto/16 :goto_0 - - :cond_3 - const/16 v1, 0x8 + const/4 p0, 0x2 - goto/16 :goto_0 + goto :goto_1 :sswitch_4 const-string v0, "scaleY" @@ -232,14 +208,11 @@ move-result p0 - if-nez p0, :cond_4 - - goto :goto_0 + if-eqz p0, :cond_0 - :cond_4 - const/4 v1, 0x7 + const/4 p0, 0x7 - goto :goto_0 + goto :goto_1 :sswitch_5 const-string v0, "scaleX" @@ -248,14 +221,11 @@ move-result p0 - if-nez p0, :cond_5 - - goto :goto_0 + if-eqz p0, :cond_0 - :cond_5 - const/4 v1, 0x6 + const/4 p0, 0x6 - goto :goto_0 + goto :goto_1 :sswitch_6 const-string v0, "progress" @@ -264,14 +234,11 @@ move-result p0 - if-nez p0, :cond_6 + if-eqz p0, :cond_0 - goto :goto_0 - - :cond_6 - const/4 v1, 0x5 + const/16 p0, 0xb - goto :goto_0 + goto :goto_1 :sswitch_7 const-string v0, "translationZ" @@ -280,14 +247,11 @@ move-result p0 - if-nez p0, :cond_7 - - goto :goto_0 + if-eqz p0, :cond_0 - :cond_7 - const/4 v1, 0x4 + const/16 p0, 0xa - goto :goto_0 + goto :goto_1 :sswitch_8 const-string v0, "translationY" @@ -296,14 +260,11 @@ move-result p0 - if-nez p0, :cond_8 - - goto :goto_0 + if-eqz p0, :cond_0 - :cond_8 - const/4 v1, 0x3 + const/16 p0, 0x9 - goto :goto_0 + goto :goto_1 :sswitch_9 const-string v0, "translationX" @@ -312,14 +273,11 @@ move-result p0 - if-nez p0, :cond_9 + if-eqz p0, :cond_0 - goto :goto_0 - - :cond_9 - const/4 v1, 0x2 + const/16 p0, 0x8 - goto :goto_0 + goto :goto_1 :sswitch_a const-string v0, "rotationY" @@ -328,14 +286,11 @@ move-result p0 - if-nez p0, :cond_a - - goto :goto_0 + if-eqz p0, :cond_0 - :cond_a - const/4 v1, 0x1 + const/4 p0, 0x4 - goto :goto_0 + goto :goto_1 :sswitch_b const-string v0, "rotationX" @@ -344,51 +299,54 @@ move-result p0 - if-nez p0, :cond_b + if-eqz p0, :cond_0 - goto :goto_0 + const/4 p0, 0x3 - :cond_b - const/4 v1, 0x0 + goto :goto_1 + :cond_0 :goto_0 - packed-switch v1, :pswitch_data_0 + const/4 p0, -0x1 + + :goto_1 + packed-switch p0, :pswitch_data_0 const/4 p0, 0x0 return-object p0 - .line 132 + .line 165 :pswitch_0 - new-instance p0, Landroid/support/constraint/motion/TimeCycleSplineSet$AlphaSet; + new-instance p0, Landroid/support/constraint/motion/TimeCycleSplineSet$ProgressSet; - invoke-direct {p0}, Landroid/support/constraint/motion/TimeCycleSplineSet$AlphaSet;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/TimeCycleSplineSet$ProgressSet;->()V - goto :goto_1 + goto :goto_2 - .line 147 + .line 162 :pswitch_1 - new-instance p0, Landroid/support/constraint/motion/TimeCycleSplineSet$PathRotate; + new-instance p0, Landroid/support/constraint/motion/TimeCycleSplineSet$TranslationZset; - invoke-direct {p0}, Landroid/support/constraint/motion/TimeCycleSplineSet$PathRotate;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/TimeCycleSplineSet$TranslationZset;->()V - goto :goto_1 + goto :goto_2 - .line 135 + .line 159 :pswitch_2 - new-instance p0, Landroid/support/constraint/motion/TimeCycleSplineSet$ElevationSet; + new-instance p0, Landroid/support/constraint/motion/TimeCycleSplineSet$TranslationYset; - invoke-direct {p0}, Landroid/support/constraint/motion/TimeCycleSplineSet$ElevationSet;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/TimeCycleSplineSet$TranslationYset;->()V - goto :goto_1 + goto :goto_2 - .line 138 + .line 156 :pswitch_3 - new-instance p0, Landroid/support/constraint/motion/TimeCycleSplineSet$RotationSet; + new-instance p0, Landroid/support/constraint/motion/TimeCycleSplineSet$TranslationXset; - invoke-direct {p0}, Landroid/support/constraint/motion/TimeCycleSplineSet$RotationSet;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/TimeCycleSplineSet$TranslationXset;->()V - goto :goto_1 + goto :goto_2 .line 153 :pswitch_4 @@ -396,7 +354,7 @@ invoke-direct {p0}, Landroid/support/constraint/motion/TimeCycleSplineSet$ScaleYset;->()V - goto :goto_1 + goto :goto_2 .line 150 :pswitch_5 @@ -404,56 +362,56 @@ invoke-direct {p0}, Landroid/support/constraint/motion/TimeCycleSplineSet$ScaleXset;->()V - goto :goto_1 + goto :goto_2 - .line 165 + .line 147 :pswitch_6 - new-instance p0, Landroid/support/constraint/motion/TimeCycleSplineSet$ProgressSet; + new-instance p0, Landroid/support/constraint/motion/TimeCycleSplineSet$PathRotate; - invoke-direct {p0}, Landroid/support/constraint/motion/TimeCycleSplineSet$ProgressSet;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/TimeCycleSplineSet$PathRotate;->()V - goto :goto_1 + goto :goto_2 - .line 162 + .line 144 :pswitch_7 - new-instance p0, Landroid/support/constraint/motion/TimeCycleSplineSet$TranslationZset; + new-instance p0, Landroid/support/constraint/motion/TimeCycleSplineSet$RotationYset; - invoke-direct {p0}, Landroid/support/constraint/motion/TimeCycleSplineSet$TranslationZset;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/TimeCycleSplineSet$RotationYset;->()V - goto :goto_1 + goto :goto_2 - .line 159 + .line 141 :pswitch_8 - new-instance p0, Landroid/support/constraint/motion/TimeCycleSplineSet$TranslationYset; + new-instance p0, Landroid/support/constraint/motion/TimeCycleSplineSet$RotationXset; - invoke-direct {p0}, Landroid/support/constraint/motion/TimeCycleSplineSet$TranslationYset;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/TimeCycleSplineSet$RotationXset;->()V - goto :goto_1 + goto :goto_2 - .line 156 + .line 138 :pswitch_9 - new-instance p0, Landroid/support/constraint/motion/TimeCycleSplineSet$TranslationXset; + new-instance p0, Landroid/support/constraint/motion/TimeCycleSplineSet$RotationSet; - invoke-direct {p0}, Landroid/support/constraint/motion/TimeCycleSplineSet$TranslationXset;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/TimeCycleSplineSet$RotationSet;->()V - goto :goto_1 + goto :goto_2 - .line 144 + .line 135 :pswitch_a - new-instance p0, Landroid/support/constraint/motion/TimeCycleSplineSet$RotationYset; + new-instance p0, Landroid/support/constraint/motion/TimeCycleSplineSet$ElevationSet; - invoke-direct {p0}, Landroid/support/constraint/motion/TimeCycleSplineSet$RotationYset;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/TimeCycleSplineSet$ElevationSet;->()V - goto :goto_1 + goto :goto_2 - .line 141 + .line 132 :pswitch_b - new-instance p0, Landroid/support/constraint/motion/TimeCycleSplineSet$RotationXset; + new-instance p0, Landroid/support/constraint/motion/TimeCycleSplineSet$AlphaSet; - invoke-direct {p0}, Landroid/support/constraint/motion/TimeCycleSplineSet$RotationXset;->()V + invoke-direct {p0}, Landroid/support/constraint/motion/TimeCycleSplineSet$AlphaSet;->()V .line 170 - :goto_1 + :goto_2 invoke-virtual {p0, p1, p2}, Landroid/support/constraint/motion/TimeCycleSplineSet;->setStartTime(J)V return-object p0 @@ -677,6 +635,8 @@ iput v5, v0, Landroid/support/constraint/motion/TimeCycleSplineSet;->last_cycle:F .line 78 + iget v5, v0, Landroid/support/constraint/motion/TimeCycleSplineSet;->last_cycle:F + invoke-static {v5}, Ljava/lang/Float;->isNaN(F)Z move-result v5 @@ -724,9 +684,11 @@ iput v8, v0, Landroid/support/constraint/motion/TimeCycleSplineSet;->last_cycle:F .line 84 - iget-object v9, v0, Landroid/support/constraint/motion/TimeCycleSplineSet;->mType:Ljava/lang/String; + iget-object v8, v0, Landroid/support/constraint/motion/TimeCycleSplineSet;->mType:Ljava/lang/String; + + iget v9, v0, Landroid/support/constraint/motion/TimeCycleSplineSet;->last_cycle:F - invoke-virtual {v4, v3, v9, v10, v8}, Landroid/support/constraint/motion/KeyCache;->setFloatValue(Ljava/lang/Object;Ljava/lang/String;IF)V + invoke-virtual {v4, v3, v8, v10, v9}, Landroid/support/constraint/motion/KeyCache;->setFloatValue(Ljava/lang/Object;Ljava/lang/String;IF)V .line 85 iput-wide v1, v0, Landroid/support/constraint/motion/TimeCycleSplineSet;->last_time:J @@ -758,21 +720,18 @@ cmpl-float v1, v1, v3 - if-nez v1, :cond_3 + if-nez v1, :cond_2 cmpl-float v1, v7, v3 - if-eqz v1, :cond_2 - - goto :goto_0 + if-eqz v1, :cond_3 :cond_2 - const/4 v6, 0x0 + const/4 v10, 0x1 .line 90 :cond_3 - :goto_0 - iput-boolean v6, v0, Landroid/support/constraint/motion/TimeCycleSplineSet;->mContinue:Z + iput-boolean v10, v0, Landroid/support/constraint/motion/TimeCycleSplineSet;->mContinue:Z return v2 .end method @@ -787,7 +746,7 @@ .end method .method public setPoint(IFFIF)V - .locals 2 + .locals 3 .line 179 iget-object v0, p0, Landroid/support/constraint/motion/TimeCycleSplineSet;->mTimePoints:[I @@ -799,21 +758,25 @@ .line 180 iget-object p1, p0, Landroid/support/constraint/motion/TimeCycleSplineSet;->mValues:[[F - aget-object p1, p1, v1 + aget-object v0, p1, v1 - const/4 v0, 0x0 - - aput p2, p1, v0 + const/4 v2, 0x0 - const/4 p2, 0x1 + aput p2, v0, v2 .line 181 - aput p3, p1, p2 + aget-object p2, p1, v1 - const/4 p3, 0x2 + const/4 v0, 0x1 + + aput p3, p2, v0 .line 182 - aput p5, p1, p3 + aget-object p1, p1, v1 + + const/4 p2, 0x2 + + aput p5, p1, p2 .line 183 iget p1, p0, Landroid/support/constraint/motion/TimeCycleSplineSet;->mWaveShape:I @@ -827,7 +790,7 @@ .line 184 iget p1, p0, Landroid/support/constraint/motion/TimeCycleSplineSet;->count:I - add-int/2addr p1, p2 + add-int/2addr p1, v0 iput p1, p0, Landroid/support/constraint/motion/TimeCycleSplineSet;->count:I @@ -939,18 +902,14 @@ const/4 v2, 0x3 - const/4 v5, 0x2 - - new-array v6, v5, [I + .line 203 + filled-new-array {v1, v2}, [I - aput v2, v6, v3 + move-result-object v1 - aput v1, v6, v4 + const-class v2, D - .line 203 - sget-object v1, Ljava/lang/Double;->TYPE:Ljava/lang/Class; - - invoke-static {v1, v6}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;[I)Ljava/lang/Object; + invoke-static {v2, v1}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;[I)Ljava/lang/Object; move-result-object v1 @@ -958,73 +917,83 @@ const/4 v2, 0x0 - const/4 v6, 0x0 + const/4 v5, 0x0 .line 206 :goto_1 - iget v7, p0, Landroid/support/constraint/motion/TimeCycleSplineSet;->count:I + iget v6, p0, Landroid/support/constraint/motion/TimeCycleSplineSet;->count:I - if-ge v2, v7, :cond_5 + if-ge v2, v6, :cond_5 if-lez v2, :cond_4 .line 207 - iget-object v7, p0, Landroid/support/constraint/motion/TimeCycleSplineSet;->mTimePoints:[I + iget-object v6, p0, Landroid/support/constraint/motion/TimeCycleSplineSet;->mTimePoints:[I - aget v8, v7, v2 + aget v7, v6, v2 - add-int/lit8 v9, v2, -0x1 + add-int/lit8 v8, v2, -0x1 - aget v7, v7, v9 + aget v6, v6, v8 - if-ne v8, v7, :cond_4 + if-ne v7, v6, :cond_4 goto :goto_2 .line 210 :cond_4 - iget-object v7, p0, Landroid/support/constraint/motion/TimeCycleSplineSet;->mTimePoints:[I + iget-object v6, p0, Landroid/support/constraint/motion/TimeCycleSplineSet;->mTimePoints:[I - aget v7, v7, v2 + aget v6, v6, v2 - int-to-double v7, v7 + int-to-double v6, v6 - const-wide v9, 0x3f847ae147ae147bL # 0.01 + const-wide v8, 0x3f847ae147ae147bL # 0.01 - invoke-static {v7, v8}, Ljava/lang/Double;->isNaN(D)Z + invoke-static {v6, v7}, Ljava/lang/Double;->isNaN(D)Z - mul-double v7, v7, v9 + mul-double v6, v6, v8 - aput-wide v7, v0, v6 + aput-wide v6, v0, v5 .line 211 - aget-object v7, v1, v6 + aget-object v6, v1, v5 - iget-object v8, p0, Landroid/support/constraint/motion/TimeCycleSplineSet;->mValues:[[F + iget-object v7, p0, Landroid/support/constraint/motion/TimeCycleSplineSet;->mValues:[[F - aget-object v8, v8, v2 + aget-object v8, v7, v2 - aget v9, v8, v4 + aget v8, v8, v4 - float-to-double v9, v9 + float-to-double v8, v8 - aput-wide v9, v7, v4 + aput-wide v8, v6, v4 .line 212 - aget v9, v8, v3 + aget-object v6, v1, v5 - float-to-double v9, v9 + aget-object v8, v7, v2 + + aget v8, v8, v3 + + float-to-double v8, v8 - aput-wide v9, v7, v3 + aput-wide v8, v6, v3 .line 213 - aget v8, v8, v5 + aget-object v6, v1, v5 - float-to-double v8, v8 + aget-object v7, v7, v2 + + const/4 v8, 0x2 + + aget v7, v7, v8 + + float-to-double v9, v7 - aput-wide v8, v7, v5 + aput-wide v9, v6, v8 - add-int/lit8 v6, v6, 0x1 + add-int/lit8 v5, v5, 0x1 :goto_2 add-int/lit8 v2, v2, 0x1 diff --git a/smali/android/support/constraint/motion/TouchResponse.smali b/smali/android/support/constraint/motion/TouchResponse.smali index 77a349f3..c602acdb 100644 --- a/smali/android/support/constraint/motion/TouchResponse.smali +++ b/smali/android/support/constraint/motion/TouchResponse.smali @@ -93,13 +93,13 @@ const/4 v0, 0x7 + .line 59 new-array v0, v0, [[F const/4 v1, 0x2 new-array v2, v1, [F - .line 59 fill-array-data v2, :array_0 const/4 v3, 0x0 @@ -154,11 +154,11 @@ sput-object v0, Landroid/support/constraint/motion/TouchResponse;->TOUCH_SIDES:[[F + .line 68 new-array v0, v8, [[F new-array v2, v1, [F - .line 68 fill-array-data v2, :array_7 aput-object v2, v0, v3 @@ -327,9 +327,9 @@ const/4 v2, 0x2 + .line 56 new-array v2, v2, [F - .line 56 iput-object v2, p0, Landroid/support/constraint/motion/TouchResponse;->mAnchorDpDt:[F const/high16 v2, 0x40800000 # 4.0f @@ -372,7 +372,7 @@ .end method .method private fill(Landroid/content/res/TypedArray;)V - .locals 6 + .locals 7 .line 130 invoke-virtual {p1}, Landroid/content/res/TypedArray;->getIndexCount()I @@ -425,15 +425,19 @@ iput v3, p0, Landroid/support/constraint/motion/TouchResponse;->mTouchAnchorSide:I .line 137 - sget-object v4, Landroid/support/constraint/motion/TouchResponse;->TOUCH_SIDES:[[F + sget-object v3, Landroid/support/constraint/motion/TouchResponse;->TOUCH_SIDES:[[F - aget-object v3, v4, v3 + iget v4, p0, Landroid/support/constraint/motion/TouchResponse;->mTouchAnchorSide:I - aget v4, v3, v1 + aget-object v6, v3, v4 - iput v4, p0, Landroid/support/constraint/motion/TouchResponse;->mTouchAnchorX:F + aget v6, v6, v1 + + iput v6, p0, Landroid/support/constraint/motion/TouchResponse;->mTouchAnchorX:F .line 138 + aget-object v3, v3, v4 + aget v3, v3, v5 iput v3, p0, Landroid/support/constraint/motion/TouchResponse;->mTouchAnchorY:F @@ -456,15 +460,19 @@ iput v3, p0, Landroid/support/constraint/motion/TouchResponse;->mTouchSide:I .line 141 - sget-object v4, Landroid/support/constraint/motion/TouchResponse;->TOUCH_DIRECTION:[[F + sget-object v3, Landroid/support/constraint/motion/TouchResponse;->TOUCH_DIRECTION:[[F + + iget v4, p0, Landroid/support/constraint/motion/TouchResponse;->mTouchSide:I - aget-object v3, v4, v3 + aget-object v6, v3, v4 - aget v4, v3, v1 + aget v6, v6, v1 - iput v4, p0, Landroid/support/constraint/motion/TouchResponse;->mTouchDirectionX:F + iput v6, p0, Landroid/support/constraint/motion/TouchResponse;->mTouchDirectionX:F .line 142 + aget-object v3, v3, v4 + aget v3, v3, v5 iput v3, p0, Landroid/support/constraint/motion/TouchResponse;->mTouchDirectionY:F @@ -805,29 +813,33 @@ const/4 v2, 0x0 - cmpl-float v3, v0, v2 + cmpl-float v0, v0, v2 - if-eqz v3, :cond_1 + if-eqz v0, :cond_1 .line 331 iget-object p2, p0, Landroid/support/constraint/motion/TouchResponse;->mAnchorDpDt:[F - const/4 v3, 0x0 + const/4 v0, 0x0 - aget v4, p2, v3 + aget v3, p2, v0 - cmpl-float v2, v4, v2 + cmpl-float v2, v3, v2 if-nez v2, :cond_0 .line 332 - aput v1, p2, v3 + aput v1, p2, v0 + .line 334 :cond_0 - mul-float p1, p1, v0 + iget p2, p0, Landroid/support/constraint/motion/TouchResponse;->mTouchDirectionX:F - .line 334 - aget p2, p2, v3 + mul-float p1, p1, p2 + + iget-object p2, p0, Landroid/support/constraint/motion/TouchResponse;->mAnchorDpDt:[F + + aget p2, p2, v0 div-float/2addr p1, p2 @@ -850,9 +862,11 @@ .line 339 :cond_2 - iget v1, p0, Landroid/support/constraint/motion/TouchResponse;->mTouchDirectionY:F + iget p1, p0, Landroid/support/constraint/motion/TouchResponse;->mTouchDirectionY:F - mul-float p2, p2, v1 + mul-float p2, p2, p1 + + iget-object p1, p0, Landroid/support/constraint/motion/TouchResponse;->mAnchorDpDt:[F aget p1, p1, v0 @@ -1343,20 +1357,28 @@ iget-object v6, v0, Landroid/support/constraint/motion/TouchResponse;->mAnchorDpDt:[F - aget v4, v6, v4 + aget v10, v6, v4 - aget v6, v6, v9 + iget v10, v0, Landroid/support/constraint/motion/TouchResponse;->mTouchDirectionY:F + + aget v10, v6, v9 cmpl-float v5, v5, v8 if-eqz v5, :cond_a - div-float/2addr v2, v4 + .line 289 + aget v1, v6, v4 + + div-float/2addr v2, v1 goto :goto_5 + .line 291 :cond_a - div-float v2, v1, v6 + aget v2, v6, v9 + + div-float v2, v1, v2 .line 299 :goto_5 @@ -1477,6 +1499,11 @@ .method scrollMove(FF)V .locals 8 + .line 366 + iget v0, p0, Landroid/support/constraint/motion/TouchResponse;->mTouchDirectionX:F + + iget v0, p0, Landroid/support/constraint/motion/TouchResponse;->mTouchDirectionY:F + .line 368 iget-object v0, p0, Landroid/support/constraint/motion/TouchResponse;->mMotionLayout:Landroid/support/constraint/motion/MotionLayout; @@ -1661,28 +1688,34 @@ aget v4, v3, v0 - iget v5, p0, Landroid/support/constraint/motion/TouchResponse;->mTouchDirectionY:F + iget v4, p0, Landroid/support/constraint/motion/TouchResponse;->mTouchDirectionY:F - const/4 v6, 0x1 + const/4 v5, 0x1 - aget v3, v3, v6 + aget v6, v3, v5 - const/4 v7, 0x0 + const/4 v6, 0x0 - cmpl-float v8, v2, v7 + cmpl-float v7, v2, v6 - if-eqz v8, :cond_0 + if-eqz v7, :cond_0 mul-float p1, p1, v2 - div-float/2addr p1, v4 + .line 352 + aget p2, v3, v0 + + div-float/2addr p1, p2 goto :goto_0 :cond_0 - mul-float p2, p2, v5 + mul-float p2, p2, v4 - div-float p1, p2, v3 + .line 354 + aget p1, v3, v5 + + div-float p1, p2, p1 .line 356 :goto_0 @@ -1699,7 +1732,7 @@ add-float/2addr v1, p2 :cond_1 - cmpl-float p2, v1, v7 + cmpl-float p2, v1, v6 if-eqz p2, :cond_5 @@ -1734,21 +1767,20 @@ .line 360 iget-object v0, p0, Landroid/support/constraint/motion/TouchResponse;->mMotionLayout:Landroid/support/constraint/motion/MotionLayout; - float-to-double v1, v1 + iget v2, p0, Landroid/support/constraint/motion/TouchResponse;->mOnTouchUp:I - const-wide/high16 v4, 0x3fe0000000000000L # 0.5 + float-to-double v3, v1 - cmpg-double v6, v1, v4 + const-wide/high16 v7, 0x3fe0000000000000L # 0.5 - if-gez v6, :cond_4 + cmpg-double v1, v3, v7 - goto :goto_2 + if-gez v1, :cond_4 - :cond_4 - const/high16 v7, 0x3f800000 # 1.0f + const/4 p2, 0x0 - :goto_2 - invoke-virtual {v0, v3, v7, p1}, Landroid/support/constraint/motion/MotionLayout;->touchAnimateTo(IFF)V + :cond_4 + invoke-virtual {v0, v2, p2, p1}, Landroid/support/constraint/motion/MotionLayout;->touchAnimateTo(IFF)V :cond_5 return-void @@ -1867,15 +1899,17 @@ iget v0, p0, Landroid/support/constraint/motion/TouchResponse;->mTouchAnchorSide:I - aget-object p1, p1, v0 + aget-object v1, p1, v0 - const/4 v0, 0x0 + const/4 v2, 0x0 - aget v1, p1, v0 + aget v1, v1, v2 iput v1, p0, Landroid/support/constraint/motion/TouchResponse;->mTouchAnchorX:F .line 119 + aget-object p1, p1, v0 + aget p1, p1, v3 iput p1, p0, Landroid/support/constraint/motion/TouchResponse;->mTouchAnchorY:F @@ -1883,15 +1917,17 @@ .line 120 sget-object p1, Landroid/support/constraint/motion/TouchResponse;->TOUCH_DIRECTION:[[F - iget v1, p0, Landroid/support/constraint/motion/TouchResponse;->mTouchSide:I + iget v0, p0, Landroid/support/constraint/motion/TouchResponse;->mTouchSide:I - aget-object p1, p1, v1 + aget-object v1, p1, v0 - aget v0, p1, v0 + aget v1, v1, v2 - iput v0, p0, Landroid/support/constraint/motion/TouchResponse;->mTouchDirectionX:F + iput v1, p0, Landroid/support/constraint/motion/TouchResponse;->mTouchDirectionX:F .line 121 + aget-object p1, p1, v0 + aget p1, p1, v3 iput p1, p0, Landroid/support/constraint/motion/TouchResponse;->mTouchDirectionY:F diff --git a/smali/android/support/constraint/motion/utils/ArcCurveFit$Arc.smali b/smali/android/support/constraint/motion/utils/ArcCurveFit$Arc.smali index 06ed6a22..950e0345 100644 --- a/smali/android/support/constraint/motion/utils/ArcCurveFit$Arc.smali +++ b/smali/android/support/constraint/motion/utils/ArcCurveFit$Arc.smali @@ -66,9 +66,9 @@ const/16 v0, 0x5b + .line 194 new-array v0, v0, [D - .line 194 sput-object v0, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->ourPercent:[D return-void @@ -81,159 +81,173 @@ move/from16 v0, p1 - move-wide/from16 v1, p2 - - move-wide/from16 v3, p4 - - move-wide/from16 v5, p6 + move-wide/from16 v1, p6 - move-wide/from16 v7, p8 + move-wide/from16 v3, p8 - move-wide/from16 v10, p10 + move-wide/from16 v5, p10 - move-wide/from16 v12, p12 + move-wide/from16 v7, p12 .line 212 invoke-direct/range {p0 .. p0}, Ljava/lang/Object;->()V - const/4 v14, 0x0 + const/4 v10, 0x0 .line 209 - iput-boolean v14, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->linear:Z + iput-boolean v10, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->linear:Z - const/4 v15, 0x1 + const/4 v11, 0x1 - if-ne v0, v15, :cond_0 + if-ne v0, v11, :cond_0 - const/4 v14, 0x1 + const/4 v10, 0x1 .line 213 :cond_0 - iput-boolean v14, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mVertical:Z + iput-boolean v10, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mVertical:Z + + move-wide/from16 v12, p2 .line 214 - iput-wide v1, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mTime1:D + iput-wide v12, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mTime1:D + + move-wide/from16 v12, p4 .line 215 - iput-wide v3, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mTime2:D + iput-wide v12, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mTime2:D - const-wide/high16 v16, 0x3ff0000000000000L # 1.0 + const-wide/high16 v12, 0x3ff0000000000000L # 1.0 - sub-double v1, v3, v1 + .line 216 + iget-wide v14, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mTime2:D - div-double v1, v16, v1 + iget-wide v3, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mTime1:D - .line 216 - iput-wide v1, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mOneOverDeltaTime:D + sub-double/2addr v14, v3 - const/4 v1, 0x3 + div-double/2addr v12, v14 - if-ne v1, v0, :cond_1 + iput-wide v12, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mOneOverDeltaTime:D + + const/4 v3, 0x3 + + if-ne v3, v0, :cond_1 .line 218 - iput-boolean v15, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->linear:Z + iput-boolean v11, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->linear:Z :cond_1 - sub-double v0, v10, v5 + sub-double v3, v5, v1 - sub-double v2, v12, v7 + move-wide/from16 v12, p8 + + sub-double v14, v7, v12 .line 222 - iget-boolean v4, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->linear:Z + iget-boolean v0, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->linear:Z - if-nez v4, :cond_7 + if-nez v0, :cond_7 - invoke-static {v0, v1}, Ljava/lang/Math;->abs(D)D + invoke-static {v3, v4}, Ljava/lang/Math;->abs(D)D move-result-wide v16 const-wide v18, 0x3f50624dd2f1a9fcL # 0.001 - cmpg-double v4, v16, v18 + cmpg-double v0, v16, v18 - if-ltz v4, :cond_7 + if-ltz v0, :cond_7 - invoke-static {v2, v3}, Ljava/lang/Math;->abs(D)D + invoke-static {v14, v15}, Ljava/lang/Math;->abs(D)D move-result-wide v16 - cmpg-double v4, v16, v18 + cmpg-double v0, v16, v18 - if-gez v4, :cond_2 + if-gez v0, :cond_2 goto :goto_4 :cond_2 - const/16 v4, 0x65 - - new-array v4, v4, [D + const/16 v0, 0x65 .line 234 - iput-object v4, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mLut:[D + new-array v0, v0, [D + + iput-object v0, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mLut:[D .line 235 - iget-boolean v4, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mVertical:Z + iget-boolean v0, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mVertical:Z - if-eqz v4, :cond_3 + if-eqz v0, :cond_3 - const/4 v14, -0x1 + const/4 v0, -0x1 goto :goto_0 :cond_3 - const/4 v14, 0x1 + const/4 v0, 0x1 :goto_0 - int-to-double v12, v14 + int-to-double v10, v0 + + invoke-static {v10, v11}, Ljava/lang/Double;->isNaN(D)Z + + mul-double v3, v3, v10 - invoke-static {v12, v13}, Ljava/lang/Double;->isNaN(D)Z + iput-wide v3, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mEllipseA:D - mul-double v0, v0, v12 + .line 236 + iget-boolean v0, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mVertical:Z - iput-wide v0, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mEllipseA:D + if-eqz v0, :cond_4 - if-eqz v4, :cond_4 + const/4 v0, 0x1 goto :goto_1 :cond_4 - const/4 v15, -0x1 + const/4 v0, -0x1 :goto_1 - int-to-double v0, v15 + int-to-double v3, v0 - .line 236 - invoke-static {v0, v1}, Ljava/lang/Double;->isNaN(D)Z + invoke-static {v3, v4}, Ljava/lang/Double;->isNaN(D)Z - mul-double v2, v2, v0 + mul-double v14, v14, v3 - iput-wide v2, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mEllipseB:D + iput-wide v14, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mEllipseB:D + + .line 237 + iget-boolean v0, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mVertical:Z - if-eqz v4, :cond_5 + if-eqz v0, :cond_5 - move-wide v0, v10 + move-wide v3, v5 goto :goto_2 :cond_5 - move-wide v0, v5 + move-wide v3, v1 - .line 237 :goto_2 - iput-wide v0, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mEllipseCenterX:D + iput-wide v3, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mEllipseCenterX:D + + .line 238 + iget-boolean v0, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mVertical:Z - if-eqz v4, :cond_6 + if-eqz v0, :cond_6 - move-wide v0, v7 + move-wide v3, v12 goto :goto_3 :cond_6 - move-wide/from16 v0, p12 + move-wide v3, v7 - .line 238 :goto_3 - iput-wide v0, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mEllipseCenterY:D + iput-wide v3, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mEllipseCenterY:D move-object/from16 v0, p0 @@ -259,56 +273,58 @@ return-void - .line 223 :cond_7 :goto_4 - iput-boolean v15, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->linear:Z + const/4 v0, 0x1 + + .line 223 + iput-boolean v0, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->linear:Z .line 224 - iput-wide v5, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mX1:D + iput-wide v1, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mX1:D .line 225 - iput-wide v10, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mX2:D + iput-wide v5, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mX2:D .line 226 - iput-wide v7, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mY1:D - - move-wide/from16 v4, p12 + iput-wide v12, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mY1:D .line 227 - iput-wide v4, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mY2:D + iput-wide v7, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mY2:D .line 228 - invoke-static {v2, v3, v0, v1}, Ljava/lang/Math;->hypot(DD)D + invoke-static {v14, v15, v3, v4}, Ljava/lang/Math;->hypot(DD)D - move-result-wide v4 + move-result-wide v0 - iput-wide v4, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mArcDistance:D + iput-wide v0, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mArcDistance:D .line 229 - iget-wide v6, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mOneOverDeltaTime:D + iget-wide v0, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mArcDistance:D + + iget-wide v5, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mOneOverDeltaTime:D - mul-double v4, v4, v6 + mul-double v0, v0, v5 - iput-wide v4, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mArcVelocity:D + iput-wide v0, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mArcVelocity:D .line 230 - iget-wide v4, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mTime2:D + iget-wide v0, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mTime2:D - iget-wide v6, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mTime1:D + iget-wide v5, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mTime1:D - sub-double v10, v4, v6 + sub-double v7, v0, v5 - div-double/2addr v0, v10 + div-double/2addr v3, v7 - iput-wide v0, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mEllipseCenterX:D + iput-wide v3, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mEllipseCenterX:D - sub-double/2addr v4, v6 + sub-double/2addr v0, v5 - div-double/2addr v2, v4 + div-double/2addr v14, v0 .line 231 - iput-wide v2, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mEllipseCenterY:D + iput-wide v14, v9, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mEllipseCenterY:D return-void .end method @@ -388,9 +404,7 @@ move-result-wide v11 - move-wide/from16 v13, p4 - - add-double/2addr v11, v13 + add-double v11, p4, v11 .line 319 sget-object v7, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->ourPercent:[D @@ -400,9 +414,7 @@ goto :goto_1 :cond_0 - move-wide/from16 v13, p4 - - move-wide v11, v13 + move-wide/from16 v11, p4 :goto_1 add-int/lit8 v8, v8, 0x1 @@ -418,10 +430,10 @@ goto :goto_0 :cond_1 - move-wide v13, v9 + move-wide v11, v9 .line 325 - iput-wide v13, v0, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mArcDistance:D + iput-wide v11, v0, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mArcDistance:D const/4 v1, 0x0 @@ -436,7 +448,7 @@ .line 328 aget-wide v3, v2, v1 - div-double/2addr v3, v13 + div-double/2addr v3, v11 aput-wide v3, v2, v1 @@ -445,118 +457,120 @@ goto :goto_2 :cond_2 - const/4 v5, 0x0 + const/4 v1, 0x0 .line 330 :goto_3 - iget-object v1, v0, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mLut:[D + iget-object v2, v0, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mLut:[D - array-length v2, v1 + array-length v3, v2 - if-ge v5, v2, :cond_5 + if-ge v1, v3, :cond_5 - int-to-double v2, v5 + int-to-double v3, v1 .line 331 - array-length v1, v1 + array-length v2, v2 - add-int/lit8 v1, v1, -0x1 + add-int/lit8 v2, v2, -0x1 - int-to-double v6, v1 + int-to-double v5, v2 - invoke-static {v2, v3}, Ljava/lang/Double;->isNaN(D)Z + invoke-static {v3, v4}, Ljava/lang/Double;->isNaN(D)Z - invoke-static {v6, v7}, Ljava/lang/Double;->isNaN(D)Z + invoke-static {v5, v6}, Ljava/lang/Double;->isNaN(D)Z - div-double/2addr v2, v6 + div-double/2addr v3, v5 .line 332 - sget-object v1, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->ourPercent:[D + sget-object v2, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->ourPercent:[D - invoke-static {v1, v2, v3}, Ljava/util/Arrays;->binarySearch([DD)I + invoke-static {v2, v3, v4}, Ljava/util/Arrays;->binarySearch([DD)I - move-result v1 + move-result v2 - if-ltz v1, :cond_3 + if-ltz v2, :cond_3 .line 334 - iget-object v2, v0, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mLut:[D + iget-object v3, v0, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mLut:[D - sget-object v3, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->ourPercent:[D + sget-object v4, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->ourPercent:[D - array-length v3, v3 + array-length v4, v4 - add-int/lit8 v3, v3, -0x1 + add-int/lit8 v4, v4, -0x1 - div-int/2addr v1, v3 + div-int/2addr v2, v4 - int-to-double v3, v1 + int-to-double v4, v2 - aput-wide v3, v2, v5 + aput-wide v4, v3, v1 - const-wide/16 v6, 0x0 + const-wide/16 v5, 0x0 goto :goto_4 :cond_3 - const/4 v4, -0x1 + const/4 v5, -0x1 - if-ne v1, v4, :cond_4 + if-ne v2, v5, :cond_4 .line 336 - iget-object v1, v0, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mLut:[D + iget-object v2, v0, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mLut:[D - const-wide/16 v6, 0x0 + const-wide/16 v5, 0x0 - aput-wide v6, v1, v5 + aput-wide v5, v2, v1 goto :goto_4 :cond_4 - const-wide/16 v6, 0x0 + const-wide/16 v5, 0x0 - neg-int v1, v1 + neg-int v2, v2 - add-int/lit8 v4, v1, -0x2 + add-int/lit8 v7, v2, -0x2 - add-int/lit8 v1, v1, -0x1 + add-int/lit8 v2, v2, -0x1 - int-to-double v8, v4 + int-to-double v8, v7 .line 341 sget-object v10, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->ourPercent:[D - aget-wide v11, v10, v4 + aget-wide v11, v10, v7 - sub-double/2addr v2, v11 + sub-double/2addr v3, v11 - aget-wide v13, v10, v1 + aget-wide v11, v10, v2 - sub-double/2addr v13, v11 + aget-wide v13, v10, v7 - div-double/2addr v2, v13 + sub-double/2addr v11, v13 + + div-double/2addr v3, v11 invoke-static {v8, v9}, Ljava/lang/Double;->isNaN(D)Z - add-double/2addr v8, v2 + add-double/2addr v8, v3 - array-length v1, v10 + array-length v2, v10 - add-int/lit8 v1, v1, -0x1 + add-int/lit8 v2, v2, -0x1 - int-to-double v1, v1 + int-to-double v2, v2 - invoke-static {v1, v2}, Ljava/lang/Double;->isNaN(D)Z + invoke-static {v2, v3}, Ljava/lang/Double;->isNaN(D)Z - div-double/2addr v8, v1 + div-double/2addr v8, v2 .line 343 - iget-object v1, v0, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mLut:[D + iget-object v2, v0, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->mLut:[D - aput-wide v8, v1, v5 + aput-wide v8, v2, v1 :goto_4 - add-int/lit8 v5, v5, 0x1 + add-int/lit8 v1, v1, 0x1 goto :goto_3 @@ -758,7 +772,7 @@ .end method .method lookup(D)D - .locals 6 + .locals 8 const-wide/16 v0, 0x0 @@ -803,11 +817,13 @@ .line 303 aget-wide v2, v0, v1 - add-int/lit8 v1, v1, 0x1 + add-int/lit8 v4, v1, 0x1 + + aget-wide v4, v0, v4 - aget-wide v4, v0, v1 + aget-wide v6, v0, v1 - sub-double/2addr v4, v2 + sub-double/2addr v4, v6 mul-double p1, p1, v4 diff --git a/smali/android/support/constraint/motion/utils/ArcCurveFit.smali b/smali/android/support/constraint/motion/utils/ArcCurveFit.smali index c465d32e..5f94c3e7 100644 --- a/smali/android/support/constraint/motion/utils/ArcCurveFit.smali +++ b/smali/android/support/constraint/motion/utils/ArcCurveFit.smali @@ -70,90 +70,96 @@ :goto_0 iget-object v7, v0, Landroid/support/constraint/motion/utils/ArcCurveFit;->mArcs:[Landroid/support/constraint/motion/utils/ArcCurveFit$Arc; - array-length v8, v7 + array-length v7, v7 - if-ge v4, v8, :cond_5 + if-ge v4, v7, :cond_5 .line 174 - aget v8, p1, v4 + aget v7, p1, v4 - const/4 v9, 0x3 + const/4 v8, 0x3 + + const/4 v9, 0x2 - const/4 v10, 0x2 + if-eqz v7, :cond_4 - if-eqz v8, :cond_4 + if-eq v7, v3, :cond_3 - if-eq v8, v3, :cond_3 + if-eq v7, v9, :cond_2 - if-eq v8, v10, :cond_2 + if-eq v7, v8, :cond_0 - if-eq v8, v9, :cond_0 + move v9, v6 goto :goto_2 :cond_0 if-ne v5, v3, :cond_1 - const/4 v5, 0x2 - goto :goto_1 :cond_1 - const/4 v5, 0x1 + const/4 v9, 0x1 :goto_1 - move v6, v5 + move v5, v9 goto :goto_2 :cond_2 const/4 v5, 0x2 - const/4 v6, 0x2 - goto :goto_2 :cond_3 const/4 v5, 0x1 - const/4 v6, 0x1 + const/4 v9, 0x1 goto :goto_2 :cond_4 - const/4 v6, 0x3 + const/4 v9, 0x3 .line 188 :goto_2 - new-instance v22, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc; + iget-object v6, v0, Landroid/support/constraint/motion/utils/ArcCurveFit;->mArcs:[Landroid/support/constraint/motion/utils/ArcCurveFit$Arc; - aget-wide v10, v1, v4 + new-instance v7, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc; - add-int/lit8 v23, v4, 0x1 + aget-wide v12, v1, v4 - aget-wide v12, v1, v23 + add-int/lit8 v8, v4, 0x1 - aget-object v8, p3, v4 + aget-wide v14, v1, v8 - aget-wide v14, v8, v2 + aget-object v10, p3, v4 - aget-wide v16, v8, v3 + aget-wide v16, v10, v2 - aget-object v8, p3, v23 + aget-object v10, p3, v4 - aget-wide v18, v8, v2 + aget-wide v18, v10, v3 - aget-wide v20, v8, v3 + aget-object v10, p3, v8 - move-object/from16 v8, v22 + aget-wide v20, v10, v2 - move v9, v6 + aget-object v10, p3, v8 + + aget-wide v22, v10, v3 + + move-object v10, v7 + + move v11, v9 + + invoke-direct/range {v10 .. v23}, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->(IDDDDDD)V - invoke-direct/range {v8 .. v21}, Landroid/support/constraint/motion/utils/ArcCurveFit$Arc;->(IDDDDDD)V + aput-object v7, v6, v4 - aput-object v22, v7, v4 + move v4, v8 - move/from16 v4, v23 + move v6, v9 goto :goto_0 diff --git a/smali/android/support/constraint/motion/utils/CurveFit$Constant.smali b/smali/android/support/constraint/motion/utils/CurveFit$Constant.smali index 647b8256..5a09d283 100644 --- a/smali/android/support/constraint/motion/utils/CurveFit$Constant.smali +++ b/smali/android/support/constraint/motion/utils/CurveFit$Constant.smali @@ -131,9 +131,9 @@ const/4 v0, 0x1 + .line 99 new-array v0, v0, [D - .line 99 iget-wide v1, p0, Landroid/support/constraint/motion/utils/CurveFit$Constant;->mTime:D const/4 v3, 0x0 diff --git a/smali/android/support/constraint/motion/utils/Easing.smali b/smali/android/support/constraint/motion/utils/Easing.smali index 7325a842..eb6c015d 100644 --- a/smali/android/support/constraint/motion/utils/Easing.smali +++ b/smali/android/support/constraint/motion/utils/Easing.smali @@ -81,7 +81,7 @@ .end method .method public static getInterpolator(Ljava/lang/String;)Landroid/support/constraint/motion/utils/Easing; - .locals 2 + .locals 5 if-nez p0, :cond_0 @@ -106,16 +106,20 @@ return-object v0 - .line 49 :cond_1 - invoke-virtual {p0}, Ljava/lang/String;->hashCode()I - const/4 v0, -0x1 + .line 49 invoke-virtual {p0}, Ljava/lang/String;->hashCode()I move-result v1 + const/4 v2, 0x3 + + const/4 v3, 0x2 + + const/4 v4, 0x1 + sparse-switch v1, :sswitch_data_0 goto :goto_0 @@ -127,12 +131,9 @@ move-result p0 - if-nez p0, :cond_2 + if-eqz p0, :cond_2 - goto :goto_0 - - :cond_2 - const/4 v0, 0x3 + const/4 v0, 0x0 goto :goto_0 @@ -143,12 +144,9 @@ move-result p0 - if-nez p0, :cond_3 - - goto :goto_0 + if-eqz p0, :cond_2 - :cond_3 - const/4 v0, 0x2 + const/4 v0, 0x3 goto :goto_0 @@ -159,12 +157,9 @@ move-result p0 - if-nez p0, :cond_4 + if-eqz p0, :cond_2 - goto :goto_0 - - :cond_4 - const/4 v0, 0x1 + const/4 v0, 0x2 goto :goto_0 @@ -175,15 +170,19 @@ move-result p0 - if-nez p0, :cond_5 - - goto :goto_0 + if-eqz p0, :cond_2 - :cond_5 - const/4 v0, 0x0 + const/4 v0, 0x1 + :cond_2 :goto_0 - packed-switch v0, :pswitch_data_0 + if-eqz v0, :cond_6 + + if-eq v0, v4, :cond_5 + + if-eq v0, v3, :cond_4 + + if-eq v0, v2, :cond_3 .line 59 new-instance p0, Ljava/lang/StringBuilder; @@ -217,18 +216,8 @@ return-object p0 - .line 51 - :pswitch_0 - new-instance p0, Landroid/support/constraint/motion/utils/Easing$CubicEasing; - - const-string v0, "cubic(0.4, 0.0, 0.2, 1)" - - invoke-direct {p0, v0}, Landroid/support/constraint/motion/utils/Easing$CubicEasing;->(Ljava/lang/String;)V - - return-object p0 - .line 57 - :pswitch_1 + :cond_3 new-instance p0, Landroid/support/constraint/motion/utils/Easing$CubicEasing; const-string v0, "cubic(1, 1, 0, 0)" @@ -238,7 +227,7 @@ return-object p0 .line 55 - :pswitch_2 + :cond_4 new-instance p0, Landroid/support/constraint/motion/utils/Easing$CubicEasing; const-string v0, "cubic(0.0, 0.0, 0.2, 0.95)" @@ -248,7 +237,7 @@ return-object p0 .line 53 - :pswitch_3 + :cond_5 new-instance p0, Landroid/support/constraint/motion/utils/Easing$CubicEasing; const-string v0, "cubic(0.4, 0.05, 0.8, 0.7)" @@ -257,7 +246,15 @@ return-object p0 - nop + .line 51 + :cond_6 + new-instance p0, Landroid/support/constraint/motion/utils/Easing$CubicEasing; + + const-string v0, "cubic(0.4, 0.0, 0.2, 1)" + + invoke-direct {p0, v0}, Landroid/support/constraint/motion/utils/Easing$CubicEasing;->(Ljava/lang/String;)V + + return-object p0 :sswitch_data_0 .sparse-switch @@ -266,14 +263,6 @@ -0x41b970db -> :sswitch_1 0x4e3d1ebd -> :sswitch_0 .end sparse-switch - - :pswitch_data_0 - .packed-switch 0x0 - :pswitch_3 - :pswitch_2 - :pswitch_1 - :pswitch_0 - .end packed-switch .end method diff --git a/smali/android/support/constraint/motion/utils/HyperSpline.smali b/smali/android/support/constraint/motion/utils/HyperSpline.smali index d658c990..eeea4479 100644 --- a/smali/android/support/constraint/motion/utils/HyperSpline.smali +++ b/smali/android/support/constraint/motion/utils/HyperSpline.smali @@ -48,7 +48,7 @@ .end method .method static calcNaturalCubic(I[D)[Landroid/support/constraint/motion/utils/HyperSpline$Cubic; - .locals 24 + .locals 22 move/from16 v0, p0 @@ -63,25 +63,25 @@ add-int/lit8 v0, v0, -0x1 - const-wide/high16 v4, 0x3fe0000000000000L # 0.5 + const/4 v4, 0x0 - const/4 v6, 0x0 + const-wide/high16 v5, 0x3fe0000000000000L # 0.5 .line 153 - aput-wide v4, v1, v6 - - const/4 v4, 0x1 + aput-wide v5, v1, v4 const/4 v5, 0x1 + const/4 v6, 0x1 + :goto_0 const-wide/high16 v7, 0x3ff0000000000000L # 1.0 - if-ge v5, v0, :cond_0 + if-ge v6, v0, :cond_0 const-wide/high16 v9, 0x4010000000000000L # 4.0 - add-int/lit8 v11, v5, -0x1 + add-int/lit8 v11, v6, -0x1 .line 155 aget-wide v11, v1, v11 @@ -90,17 +90,17 @@ div-double/2addr v7, v9 - aput-wide v7, v1, v5 + aput-wide v7, v1, v6 - add-int/lit8 v5, v5, 0x1 + add-int/lit8 v6, v6, 0x1 goto :goto_0 :cond_0 - add-int/lit8 v5, v0, -0x1 + add-int/lit8 v6, v0, -0x1 .line 157 - aget-wide v9, v1, v5 + aget-wide v9, v1, v6 const-wide/high16 v11, 0x4000000000000000L # 2.0 @@ -111,9 +111,9 @@ aput-wide v7, v1, v0 .line 159 - aget-wide v7, p1, v4 + aget-wide v7, p1, v5 - aget-wide v9, p1, v6 + aget-wide v9, p1, v4 sub-double/2addr v7, v9 @@ -121,21 +121,21 @@ mul-double v7, v7, v9 - aget-wide v13, v1, v6 + aget-wide v13, v1, v4 mul-double v7, v7, v13 - aput-wide v7, v2, v6 + aput-wide v7, v2, v4 :goto_1 - if-ge v4, v0, :cond_1 + if-ge v5, v0, :cond_1 - add-int/lit8 v7, v4, 0x1 + add-int/lit8 v7, v5, 0x1 .line 161 aget-wide v13, p1, v7 - add-int/lit8 v8, v4, -0x1 + add-int/lit8 v8, v5, -0x1 aget-wide v15, p1, v8 @@ -147,13 +147,13 @@ sub-double/2addr v13, v15 - aget-wide v15, v1, v4 + aget-wide v15, v1, v5 mul-double v13, v13, v15 - aput-wide v13, v2, v4 + aput-wide v13, v2, v5 - move v4, v7 + move v5, v7 goto :goto_1 @@ -161,13 +161,13 @@ :cond_1 aget-wide v7, p1, v0 - aget-wide v13, p1, v5 + aget-wide v13, p1, v6 sub-double/2addr v7, v13 mul-double v7, v7, v9 - aget-wide v13, v2, v5 + aget-wide v13, v2, v6 sub-double/2addr v7, v13 @@ -178,27 +178,29 @@ aput-wide v7, v2, v0 .line 165 + aget-wide v7, v2, v0 + aput-wide v7, v3, v0 :goto_2 - if-ltz v5, :cond_2 + if-ltz v6, :cond_2 .line 167 - aget-wide v7, v2, v5 + aget-wide v7, v2, v6 - aget-wide v13, v1, v5 + aget-wide v13, v1, v6 - add-int/lit8 v4, v5, 0x1 + add-int/lit8 v5, v6, 0x1 - aget-wide v15, v3, v4 + aget-wide v15, v3, v5 mul-double v13, v13, v15 sub-double/2addr v7, v13 - aput-wide v7, v3, v5 + aput-wide v7, v3, v6 - add-int/lit8 v5, v5, -0x1 + add-int/lit8 v6, v6, -0x1 goto :goto_2 @@ -207,54 +209,62 @@ new-array v1, v0, [Landroid/support/constraint/motion/utils/HyperSpline$Cubic; :goto_3 - if-ge v6, v0, :cond_3 + if-ge v4, v0, :cond_3 .line 172 new-instance v2, Landroid/support/constraint/motion/utils/HyperSpline$Cubic; - aget-wide v4, p1, v6 + aget-wide v5, p1, v4 - double-to-float v7, v4 + double-to-float v5, v5 - float-to-double v14, v7 + float-to-double v14, v5 - aget-wide v16, v3, v6 + aget-wide v16, v3, v4 - add-int/lit8 v7, v6, 0x1 + add-int/lit8 v5, v4, 0x1 - aget-wide v18, p1, v7 + aget-wide v6, p1, v5 - sub-double v20, v18, v4 + aget-wide v18, p1, v4 - mul-double v20, v20, v9 + sub-double v6, v6, v18 - mul-double v22, v16, v11 + mul-double v6, v6, v9 - sub-double v20, v20, v22 + aget-wide v18, v3, v4 - aget-wide v22, v3, v7 + mul-double v18, v18, v11 - sub-double v20, v20, v22 + sub-double v6, v6, v18 - sub-double v4, v4, v18 + aget-wide v18, v3, v5 - mul-double v4, v4, v11 + sub-double v18, v6, v18 - add-double v4, v4, v16 + aget-wide v6, p1, v4 - add-double v4, v4, v22 + aget-wide v20, p1, v5 - move-object v13, v2 + sub-double v6, v6, v20 - move-wide/from16 v18, v20 + mul-double v6, v6, v11 - move-wide/from16 v20, v4 + aget-wide v20, v3, v4 + + add-double v6, v6, v20 + + aget-wide v20, v3, v5 + + add-double v20, v6, v20 + + move-object v13, v2 invoke-direct/range {v13 .. v21}, Landroid/support/constraint/motion/utils/HyperSpline$Cubic;->(DDDD)V - aput-object v2, v1, v6 + aput-object v2, v1, v4 - move v6, v7 + move v4, v5 goto :goto_3 @@ -405,6 +415,9 @@ if-gez v4, :cond_0 + .line 115 + aget-wide v2, v1, v0 + sub-double/2addr p1, v2 add-int/lit8 v0, v0, 0x1 @@ -413,12 +426,14 @@ .line 117 :cond_0 - iget-object v2, p0, Landroid/support/constraint/motion/utils/HyperSpline;->mCurve:[[Landroid/support/constraint/motion/utils/HyperSpline$Cubic; + iget-object v1, p0, Landroid/support/constraint/motion/utils/HyperSpline;->mCurve:[[Landroid/support/constraint/motion/utils/HyperSpline$Cubic; - aget-object p3, v2, p3 + aget-object p3, v1, p3 aget-object p3, p3, v0 + iget-object v1, p0, Landroid/support/constraint/motion/utils/HyperSpline;->mCurveLength:[D + aget-wide v0, v1, v0 div-double/2addr p1, v0 @@ -440,55 +455,60 @@ const/4 v0, 0x0 - const/4 v1, 0x0 + move-wide v1, p1 + + const/4 p1, 0x0 .line 90 :goto_0 - iget-object v2, p0, Landroid/support/constraint/motion/utils/HyperSpline;->mCurveLength:[D + iget-object p2, p0, Landroid/support/constraint/motion/utils/HyperSpline;->mCurveLength:[D - array-length v3, v2 + array-length v3, p2 add-int/lit8 v3, v3, -0x1 - if-ge v1, v3, :cond_0 + if-ge p1, v3, :cond_0 - aget-wide v3, v2, v1 + aget-wide v3, p2, p1 - cmpg-double v2, v3, p1 + cmpg-double v5, v3, v1 - if-gez v2, :cond_0 + if-gez v5, :cond_0 - sub-double/2addr p1, v3 + .line 91 + aget-wide v3, p2, p1 - add-int/lit8 v1, v1, 0x1 + sub-double/2addr v1, v3 + + add-int/lit8 p1, p1, 0x1 goto :goto_0 .line 93 :cond_0 :goto_1 - array-length v2, p3 + array-length p2, p3 - if-ge v0, v2, :cond_1 + if-ge v0, p2, :cond_1 .line 94 - iget-object v2, p0, Landroid/support/constraint/motion/utils/HyperSpline;->mCurve:[[Landroid/support/constraint/motion/utils/HyperSpline$Cubic; + iget-object p2, p0, Landroid/support/constraint/motion/utils/HyperSpline;->mCurve:[[Landroid/support/constraint/motion/utils/HyperSpline$Cubic; - aget-object v2, v2, v0 + aget-object p2, p2, v0 - aget-object v2, v2, v1 + aget-object p2, p2, p1 iget-object v3, p0, Landroid/support/constraint/motion/utils/HyperSpline;->mCurveLength:[D - aget-wide v4, v3, v1 + aget-wide v4, v3, p1 - div-double v3, p1, v4 + div-double v3, v1, v4 - invoke-virtual {v2, v3, v4}, Landroid/support/constraint/motion/utils/HyperSpline$Cubic;->eval(D)D + invoke-virtual {p2, v3, v4}, Landroid/support/constraint/motion/utils/HyperSpline$Cubic;->eval(D)D - move-result-wide v2 + move-result-wide v3 - aput-wide v2, p3, v0 + aput-wide v3, p3, v0 add-int/lit8 v0, v0, 0x1 @@ -508,57 +528,62 @@ const/4 v0, 0x0 - const/4 v1, 0x0 + move-wide v1, p1 + + const/4 p1, 0x0 .line 102 :goto_0 - iget-object v2, p0, Landroid/support/constraint/motion/utils/HyperSpline;->mCurveLength:[D + iget-object p2, p0, Landroid/support/constraint/motion/utils/HyperSpline;->mCurveLength:[D - array-length v3, v2 + array-length v3, p2 add-int/lit8 v3, v3, -0x1 - if-ge v1, v3, :cond_0 + if-ge p1, v3, :cond_0 - aget-wide v3, v2, v1 + aget-wide v3, p2, p1 - cmpg-double v2, v3, p1 + cmpg-double v5, v3, v1 - if-gez v2, :cond_0 + if-gez v5, :cond_0 - sub-double/2addr p1, v3 + .line 103 + aget-wide v3, p2, p1 - add-int/lit8 v1, v1, 0x1 + sub-double/2addr v1, v3 + + add-int/lit8 p1, p1, 0x1 goto :goto_0 .line 105 :cond_0 :goto_1 - array-length v2, p3 + array-length p2, p3 - if-ge v0, v2, :cond_1 + if-ge v0, p2, :cond_1 .line 106 - iget-object v2, p0, Landroid/support/constraint/motion/utils/HyperSpline;->mCurve:[[Landroid/support/constraint/motion/utils/HyperSpline$Cubic; + iget-object p2, p0, Landroid/support/constraint/motion/utils/HyperSpline;->mCurve:[[Landroid/support/constraint/motion/utils/HyperSpline$Cubic; - aget-object v2, v2, v0 + aget-object p2, p2, v0 - aget-object v2, v2, v1 + aget-object p2, p2, p1 iget-object v3, p0, Landroid/support/constraint/motion/utils/HyperSpline;->mCurveLength:[D - aget-wide v4, v3, v1 + aget-wide v4, v3, p1 - div-double v3, p1, v4 + div-double v3, v1, v4 - invoke-virtual {v2, v3, v4}, Landroid/support/constraint/motion/utils/HyperSpline$Cubic;->eval(D)D + invoke-virtual {p2, v3, v4}, Landroid/support/constraint/motion/utils/HyperSpline$Cubic;->eval(D)D - move-result-wide v2 + move-result-wide v3 - double-to-float v2, v2 + double-to-float p2, v3 - aput v2, p3, v0 + aput p2, p3, v0 add-int/lit8 v0, v0, 0x1 @@ -578,55 +603,60 @@ const/4 v0, 0x0 - const/4 v1, 0x0 + move-wide v1, p1 + + const/4 p1, 0x0 .line 78 :goto_0 - iget-object v2, p0, Landroid/support/constraint/motion/utils/HyperSpline;->mCurveLength:[D + iget-object p2, p0, Landroid/support/constraint/motion/utils/HyperSpline;->mCurveLength:[D - array-length v3, v2 + array-length v3, p2 add-int/lit8 v3, v3, -0x1 - if-ge v1, v3, :cond_0 + if-ge p1, v3, :cond_0 - aget-wide v3, v2, v1 + aget-wide v3, p2, p1 - cmpg-double v2, v3, p1 + cmpg-double v5, v3, v1 - if-gez v2, :cond_0 + if-gez v5, :cond_0 - sub-double/2addr p1, v3 + .line 79 + aget-wide v3, p2, p1 - add-int/lit8 v1, v1, 0x1 + sub-double/2addr v1, v3 + + add-int/lit8 p1, p1, 0x1 goto :goto_0 .line 81 :cond_0 :goto_1 - array-length v2, p3 + array-length p2, p3 - if-ge v0, v2, :cond_1 + if-ge v0, p2, :cond_1 .line 82 - iget-object v2, p0, Landroid/support/constraint/motion/utils/HyperSpline;->mCurve:[[Landroid/support/constraint/motion/utils/HyperSpline$Cubic; + iget-object p2, p0, Landroid/support/constraint/motion/utils/HyperSpline;->mCurve:[[Landroid/support/constraint/motion/utils/HyperSpline$Cubic; - aget-object v2, v2, v0 + aget-object p2, p2, v0 - aget-object v2, v2, v1 + aget-object p2, p2, p1 iget-object v3, p0, Landroid/support/constraint/motion/utils/HyperSpline;->mCurveLength:[D - aget-wide v4, v3, v1 + aget-wide v4, v3, p1 - div-double v3, p1, v4 + div-double v3, v1, v4 - invoke-virtual {v2, v3, v4}, Landroid/support/constraint/motion/utils/HyperSpline$Cubic;->vel(D)D + invoke-virtual {p2, v3, v4}, Landroid/support/constraint/motion/utils/HyperSpline$Cubic;->vel(D)D - move-result-wide v2 + move-result-wide v3 - aput-wide v2, p3, v0 + aput-wide v3, p3, v0 add-int/lit8 v0, v0, 0x1 @@ -637,7 +667,7 @@ .end method .method public setup([[D)V - .locals 8 + .locals 7 const/4 v0, 0x0 @@ -649,24 +679,22 @@ iput v1, p0, Landroid/support/constraint/motion/utils/HyperSpline;->mDimensionality:I .line 48 - array-length v2, p1 + array-length v1, p1 - iput v2, p0, Landroid/support/constraint/motion/utils/HyperSpline;->mPoints:I + iput v1, p0, Landroid/support/constraint/motion/utils/HyperSpline;->mPoints:I - const/4 v3, 0x2 - - new-array v3, v3, [I + .line 49 + iget v1, p0, Landroid/support/constraint/motion/utils/HyperSpline;->mDimensionality:I - const/4 v4, 0x1 + iget v2, p0, Landroid/support/constraint/motion/utils/HyperSpline;->mPoints:I - aput v2, v3, v4 + filled-new-array {v1, v2}, [I - aput v1, v3, v0 + move-result-object v1 - .line 49 - sget-object v1, Ljava/lang/Double;->TYPE:Ljava/lang/Class; + const-class v2, D - invoke-static {v1, v3}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;[I)Ljava/lang/Object; + invoke-static {v2, v1}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;[I)Ljava/lang/Object; move-result-object v1 @@ -702,11 +730,11 @@ aget-object v3, v3, v1 - aget-object v5, p1, v2 + aget-object v4, p1, v2 - aget-wide v6, v5, v1 + aget-wide v5, v4, v1 - aput-wide v6, v3, v2 + aput-wide v5, v3, v2 add-int/lit8 v2, v2, 0x1 @@ -731,9 +759,11 @@ iget-object v2, p0, Landroid/support/constraint/motion/utils/HyperSpline;->mCtl:[[D - aget-object v2, v2, p1 + aget-object v3, v2, p1 - array-length v3, v2 + array-length v3, v3 + + aget-object v2, v2, p1 invoke-static {v3, v2}, Landroid/support/constraint/motion/utils/HyperSpline;->calcNaturalCubic(I[D)[Landroid/support/constraint/motion/utils/HyperSpline$Cubic; @@ -749,7 +779,7 @@ :cond_2 iget p1, p0, Landroid/support/constraint/motion/utils/HyperSpline;->mPoints:I - sub-int/2addr p1, v4 + add-int/lit8 p1, p1, -0x1 new-array p1, p1, [D diff --git a/smali/android/support/constraint/motion/utils/LinearCurveFit.smali b/smali/android/support/constraint/motion/utils/LinearCurveFit.smali index 4d67a357..ee68c482 100644 --- a/smali/android/support/constraint/motion/utils/LinearCurveFit.smali +++ b/smali/android/support/constraint/motion/utils/LinearCurveFit.smali @@ -17,7 +17,7 @@ # direct methods .method public constructor ([D[[D)V - .locals 11 + .locals 13 .line 30 invoke-direct {p0}, Landroid/support/constraint/motion/utils/CurveFit;->()V @@ -66,11 +66,16 @@ aget-wide v9, v8, v0 + .line 40 + aget-object v8, p2, v3 + + aget-wide v11, v8, v0 + if-lez v3, :cond_0 sub-double v4, v9, v4 - sub-double v6, v9, v6 + sub-double v6, v11, v6 .line 42 invoke-static {v4, v5, v6, v7}, Ljava/lang/Math;->hypot(DD)D @@ -80,7 +85,7 @@ move-wide v4, v9 - move-wide v6, v4 + move-wide v6, v11 goto :goto_0 @@ -93,7 +98,7 @@ .end method .method private getLength2D(D)D - .locals 22 + .locals 21 move-object/from16 v0, p0 @@ -159,18 +164,20 @@ .line 72 iget-object v13, v0, Landroid/support/constraint/motion/utils/LinearCurveFit;->mY:[[D - aget-object v13, v13, v1 + aget-object v14, v13, v1 - aget-wide v14, v13, v5 + aget-wide v15, v14, v5 .line 73 - aget-wide v16, v13, v6 + aget-object v13, v13, v1 + + aget-wide v17, v13, v6 if-lez v1, :cond_3 - sub-double v9, v14, v9 + sub-double v9, v15, v9 - sub-double v11, v16, v11 + sub-double v11, v17, v11 .line 75 invoke-static {v9, v10, v11, v12}, Ljava/lang/Math;->hypot(DD)D @@ -192,61 +199,73 @@ return-wide v7 :cond_4 - add-int/lit8 v12, v1, 0x1 + add-int/lit8 v10, v1, 0x1 .line 82 - aget-wide v18, v9, v12 + aget-wide v11, v9, v10 + + cmpg-double v13, p1, v11 + + if-gez v13, :cond_5 + + .line 83 + aget-wide v2, v9, v10 - cmpg-double v9, p1, v18 + aget-wide v11, v9, v1 - if-gez v9, :cond_5 + sub-double/2addr v2, v11 - sub-double v18, v18, v10 + .line 84 + aget-wide v11, v9, v1 - sub-double v2, p1, v10 + sub-double v11, p1, v11 - div-double v2, v2, v18 + div-double/2addr v11, v2 .line 85 - iget-object v4, v0, Landroid/support/constraint/motion/utils/LinearCurveFit;->mY:[[D + iget-object v2, v0, Landroid/support/constraint/motion/utils/LinearCurveFit;->mY:[[D - aget-object v1, v4, v1 + aget-object v3, v2, v1 - aget-wide v9, v1, v5 + aget-wide v13, v3, v5 .line 86 - aget-object v4, v4, v12 + aget-object v3, v2, v10 - aget-wide v11, v4, v5 + aget-wide v4, v3, v5 .line 87 - aget-wide v18, v1, v6 + aget-object v1, v2, v1 + + aget-wide v19, v1, v6 .line 88 - aget-wide v5, v4, v6 + aget-object v1, v2, v10 + + aget-wide v2, v1, v6 - const-wide/high16 v20, 0x3ff0000000000000L # 1.0 + const-wide/high16 v9, 0x3ff0000000000000L # 1.0 - sub-double v20, v20, v2 + sub-double/2addr v9, v11 - mul-double v18, v18, v20 + mul-double v19, v19, v9 - mul-double v5, v5, v2 + mul-double v2, v2, v11 - add-double v18, v18, v5 + add-double v19, v19, v2 - sub-double v4, v16, v18 + sub-double v1, v17, v19 - mul-double v9, v9, v20 + mul-double v13, v13, v9 - mul-double v11, v11, v2 + mul-double v4, v4, v11 - add-double/2addr v9, v11 + add-double/2addr v13, v4 - sub-double/2addr v14, v9 + sub-double v3, v15, v13 .line 92 - invoke-static {v4, v5, v14, v15}, Ljava/lang/Math;->hypot(DD)D + invoke-static {v1, v2, v3, v4}, Ljava/lang/Math;->hypot(DD)D move-result-wide v1 @@ -255,11 +274,11 @@ return-wide v7 :cond_5 - move v1, v12 + move v1, v10 - move-wide v9, v14 + move-wide v9, v15 - move-wide/from16 v11, v16 + move-wide/from16 v11, v17 goto :goto_0 @@ -337,47 +356,55 @@ return-wide p2 :cond_2 - add-int/lit8 v5, v2, 0x1 + add-int/lit8 v3, v2, 0x1 .line 185 - aget-wide v6, v0, v5 + aget-wide v4, v0, v3 + + cmpg-double v6, p1, v4 - cmpg-double v0, p1, v6 + if-gez v6, :cond_3 - if-gez v0, :cond_3 + .line 186 + aget-wide v4, v0, v3 - sub-double/2addr v6, v3 + aget-wide v6, v0, v2 - sub-double/2addr p1, v3 + sub-double/2addr v4, v6 - div-double/2addr p1, v6 + .line 187 + aget-wide v6, v0, v2 + + sub-double/2addr p1, v6 + + div-double/2addr p1, v4 .line 188 iget-object v0, p0, Landroid/support/constraint/motion/utils/LinearCurveFit;->mY:[[D aget-object v1, v0, v2 - aget-wide v2, v1, p3 + aget-wide v4, v1, p3 .line 189 - aget-object v0, v0, v5 + aget-object v0, v0, v3 - aget-wide v4, v0, p3 + aget-wide v1, v0, p3 - const-wide/high16 v0, 0x3ff0000000000000L # 1.0 + const-wide/high16 v6, 0x3ff0000000000000L # 1.0 - sub-double/2addr v0, p1 + sub-double/2addr v6, p1 - mul-double v2, v2, v0 + mul-double v4, v4, v6 - mul-double v4, v4, p1 + mul-double v1, v1, p1 - add-double/2addr v2, v4 + add-double/2addr v4, v1 - return-wide v2 + return-wide v4 :cond_3 - move v2, v5 + move v2, v3 goto :goto_0 @@ -507,10 +534,15 @@ if-gez v8, :cond_6 .line 123 + aget-wide v6, v4, v5 + aget-wide v8, v4, v0 sub-double/2addr v6, v8 + .line 124 + aget-wide v8, v4, v0 + sub-double/2addr p1, v8 div-double/2addr p1, v6 @@ -685,10 +717,15 @@ if-gez v8, :cond_6 .line 159 + aget-wide v6, v4, v5 + aget-wide v8, v4, v0 sub-double/2addr v6, v8 + .line 160 + aget-wide v8, v4, v0 + sub-double/2addr p1, v8 div-double/2addr p1, v6 @@ -756,25 +793,26 @@ if-gez v5, :cond_0 - :goto_0 - move-wide p1, v3 + .line 226 + aget-wide p1, v0, v2 - goto :goto_1 + goto :goto_0 :cond_0 add-int/lit8 v3, v1, -0x1 .line 227 - aget-wide v3, v0, v3 + aget-wide v4, v0, v3 - cmpl-double v0, p1, v3 + cmpl-double v6, p1, v4 - if-ltz v0, :cond_1 + if-ltz v6, :cond_1 - goto :goto_0 + .line 228 + aget-wide p1, v0, v3 :cond_1 - :goto_1 + :goto_0 add-int/lit8 v0, v1, -0x1 if-ge v2, v0, :cond_3 @@ -791,32 +829,37 @@ if-gtz v6, :cond_2 .line 232 - aget-wide p1, v0, v2 + aget-wide p1, v0, v3 + + aget-wide v4, v0, v2 + + sub-double/2addr p1, v4 - sub-double/2addr v4, p1 + .line 233 + aget-wide v4, v0, v2 .line 234 - iget-object p1, p0, Landroid/support/constraint/motion/utils/LinearCurveFit;->mY:[[D + iget-object v0, p0, Landroid/support/constraint/motion/utils/LinearCurveFit;->mY:[[D - aget-object p2, p1, v2 + aget-object v1, v0, v2 - aget-wide v0, p2, p3 + aget-wide v4, v1, p3 .line 235 - aget-object p1, p1, v3 + aget-object v0, v0, v3 - aget-wide p2, p1, p3 + aget-wide v1, v0, p3 - sub-double/2addr p2, v0 + sub-double/2addr v1, v4 - div-double/2addr p2, v4 + div-double/2addr v1, p1 - return-wide p2 + return-wide v1 :cond_2 move v2, v3 - goto :goto_1 + goto :goto_0 :cond_3 const-wide/16 p1, 0x0 @@ -825,7 +868,7 @@ .end method .method public getSlope(D[D)V - .locals 12 + .locals 10 .line 198 iget-object v0, p0, Landroid/support/constraint/motion/utils/LinearCurveFit;->mT:[D @@ -848,28 +891,29 @@ if-gtz v6, :cond_0 - :goto_0 - move-wide p1, v4 + .line 201 + aget-wide p1, v0, v3 - goto :goto_1 + goto :goto_0 :cond_0 add-int/lit8 v4, v1, -0x1 .line 202 - aget-wide v4, v0, v4 + aget-wide v5, v0, v4 - cmpl-double v0, p1, v4 + cmpl-double v7, p1, v5 - if-ltz v0, :cond_1 + if-ltz v7, :cond_1 - goto :goto_0 + .line 203 + aget-wide p1, v0, v4 :cond_1 - :goto_1 + :goto_0 const/4 v0, 0x0 - :goto_2 + :goto_1 add-int/lit8 v4, v1, -0x1 if-ge v0, v4, :cond_3 @@ -886,40 +930,45 @@ if-gtz v8, :cond_2 .line 208 - aget-wide p1, v4, v0 + aget-wide p1, v4, v5 - sub-double/2addr v6, p1 + aget-wide v6, v4, v0 - :goto_3 + sub-double/2addr p1, v6 + + .line 209 + aget-wide v6, v4, v0 + + :goto_2 if-ge v3, v2, :cond_3 .line 211 - iget-object p1, p0, Landroid/support/constraint/motion/utils/LinearCurveFit;->mY:[[D + iget-object v1, p0, Landroid/support/constraint/motion/utils/LinearCurveFit;->mY:[[D - aget-object p2, p1, v0 + aget-object v4, v1, v0 - aget-wide v8, p2, v3 + aget-wide v6, v4, v3 .line 212 - aget-object p1, p1, v5 + aget-object v1, v1, v5 - aget-wide v10, p1, v3 + aget-wide v8, v1, v3 - sub-double/2addr v10, v8 + sub-double/2addr v8, v6 - div-double/2addr v10, v6 + div-double/2addr v8, p1 .line 214 - aput-wide v10, p3, v3 + aput-wide v8, p3, v3 add-int/lit8 v3, v3, 0x1 - goto :goto_3 + goto :goto_2 :cond_2 move v0, v5 - goto :goto_2 + goto :goto_1 :cond_3 return-void diff --git a/smali/android/support/constraint/motion/utils/MonotonicCurveFit.smali b/smali/android/support/constraint/motion/utils/MonotonicCurveFit.smali index 140b5945..3898c452 100644 --- a/smali/android/support/constraint/motion/utils/MonotonicCurveFit.smali +++ b/smali/android/support/constraint/motion/utils/MonotonicCurveFit.smali @@ -17,7 +17,7 @@ # direct methods .method public constructor ([D[[D)V - .locals 21 + .locals 22 move-object/from16 v0, p0 @@ -40,121 +40,121 @@ add-int/lit8 v6, v3, -0x1 - const/4 v7, 0x2 + .line 32 + filled-new-array {v6, v5}, [I - new-array v8, v7, [I + move-result-object v7 - const/4 v9, 0x1 + const-class v8, D - aput v5, v8, v9 + invoke-static {v8, v7}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;[I)Ljava/lang/Object; - aput v6, v8, v4 + move-result-object v7 - .line 32 - sget-object v10, Ljava/lang/Double;->TYPE:Ljava/lang/Class; + check-cast v7, [[D - invoke-static {v10, v8}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;[I)Ljava/lang/Object; + .line 33 + filled-new-array {v3, v5}, [I move-result-object v8 - check-cast v8, [[D + const-class v9, D - new-array v10, v7, [I - - aput v5, v10, v9 - - aput v3, v10, v4 - - .line 33 - sget-object v9, Ljava/lang/Double;->TYPE:Ljava/lang/Class; + invoke-static {v9, v8}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;[I)Ljava/lang/Object; - invoke-static {v9, v10}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;[I)Ljava/lang/Object; - - move-result-object v9 + move-result-object v8 - check-cast v9, [[D + check-cast v8, [[D - const/4 v10, 0x0 + const/4 v9, 0x0 :goto_0 - if-ge v10, v5, :cond_2 + if-ge v9, v5, :cond_2 - const/4 v11, 0x0 + const/4 v10, 0x0 :goto_1 - if-ge v11, v6, :cond_1 + if-ge v10, v6, :cond_1 - add-int/lit8 v12, v11, 0x1 + add-int/lit8 v11, v10, 0x1 .line 36 - aget-wide v13, v1, v12 + aget-wide v12, v1, v11 - aget-wide v15, v1, v11 + aget-wide v14, v1, v10 - sub-double/2addr v13, v15 + sub-double/2addr v12, v14 .line 37 - aget-object v15, v8, v11 + aget-object v14, v7, v10 - aget-object v16, v2, v12 + aget-object v15, v2, v11 - aget-wide v17, v16, v10 + aget-wide v16, v15, v9 - aget-object v16, v2, v11 + aget-object v15, v2, v10 - aget-wide v19, v16, v10 + aget-wide v18, v15, v9 - sub-double v17, v17, v19 + sub-double v16, v16, v18 - div-double v17, v17, v13 + div-double v16, v16, v12 - aput-wide v17, v15, v10 + aput-wide v16, v14, v9 - if-nez v11, :cond_0 + if-nez v10, :cond_0 .line 39 - aget-object v11, v9, v11 + aget-object v12, v8, v10 + + aget-object v10, v7, v10 - aput-wide v17, v11, v10 + aget-wide v13, v10, v9 + + aput-wide v13, v12, v9 goto :goto_2 .line 41 :cond_0 - aget-object v13, v9, v11 + aget-object v12, v8, v10 + + add-int/lit8 v13, v10, -0x1 - add-int/lit8 v11, v11, -0x1 + aget-object v13, v7, v13 - aget-object v11, v8, v11 + aget-wide v14, v13, v9 - aget-wide v14, v11, v10 + aget-object v10, v7, v10 - add-double v14, v14, v17 + aget-wide v16, v10, v9 + + add-double v14, v14, v16 const-wide/high16 v16, 0x3fe0000000000000L # 0.5 mul-double v14, v14, v16 - aput-wide v14, v13, v10 + aput-wide v14, v12, v9 :goto_2 - move v11, v12 + move v10, v11 goto :goto_1 .line 44 :cond_1 - aget-object v11, v9, v6 + aget-object v10, v8, v6 - add-int/lit8 v12, v3, -0x2 + add-int/lit8 v11, v3, -0x2 - aget-object v12, v8, v12 + aget-object v11, v7, v11 - aget-wide v13, v12, v10 + aget-wide v12, v11, v9 - aput-wide v13, v11, v10 + aput-wide v12, v10, v9 - add-int/lit8 v10, v10, 0x1 + add-int/lit8 v9, v9, 0x1 goto :goto_0 @@ -164,15 +164,15 @@ :goto_3 if-ge v3, v6, :cond_6 - const/4 v7, 0x0 + const/4 v9, 0x0 :goto_4 - if-ge v7, v5, :cond_5 + if-ge v9, v5, :cond_5 .line 49 - aget-object v10, v8, v3 + aget-object v10, v7, v3 - aget-wide v11, v10, v7 + aget-wide v11, v10, v9 const-wide/16 v13, 0x0 @@ -181,78 +181,88 @@ if-nez v10, :cond_3 .line 50 - aget-object v10, v9, v3 + aget-object v10, v8, v3 - aput-wide v13, v10, v7 + aput-wide v13, v10, v9 add-int/lit8 v10, v3, 0x1 .line 51 - aget-object v10, v9, v10 + aget-object v10, v8, v10 - aput-wide v13, v10, v7 + aput-wide v13, v10, v9 goto :goto_5 .line 53 :cond_3 - aget-object v10, v9, v3 + aget-object v10, v8, v3 + + aget-wide v11, v10, v9 - aget-wide v13, v10, v7 + aget-object v10, v7, v3 - div-double/2addr v13, v11 + aget-wide v13, v10, v9 + + div-double/2addr v11, v13 add-int/lit8 v10, v3, 0x1 .line 54 - aget-object v15, v9, v10 + aget-object v13, v8, v10 + + aget-wide v14, v13, v9 - aget-wide v16, v15, v7 + aget-object v13, v7, v3 - div-double v11, v16, v11 + aget-wide v16, v13, v9 + + div-double v14, v14, v16 .line 55 - invoke-static {v13, v14, v11, v12}, Ljava/lang/Math;->hypot(DD)D + invoke-static {v11, v12, v14, v15}, Ljava/lang/Math;->hypot(DD)D - move-result-wide v15 + move-result-wide v16 - const-wide/high16 v17, 0x4022000000000000L # 9.0 + const-wide/high16 v18, 0x4022000000000000L # 9.0 - cmpl-double v19, v15, v17 + cmpl-double v13, v16, v18 - if-lez v19, :cond_4 + if-lez v13, :cond_4 - const-wide/high16 v17, 0x4008000000000000L # 3.0 + const-wide/high16 v18, 0x4008000000000000L # 3.0 - div-double v17, v17, v15 + div-double v18, v18, v16 .line 58 - aget-object v15, v9, v3 + aget-object v13, v8, v3 - mul-double v13, v13, v17 + mul-double v11, v11, v18 - aget-object v16, v8, v3 + aget-object v16, v7, v3 - aget-wide v19, v16, v7 + aget-wide v20, v16, v9 - mul-double v13, v13, v19 + mul-double v11, v11, v20 - aput-wide v13, v15, v7 + aput-wide v11, v13, v9 .line 59 - aget-object v10, v9, v10 + aget-object v10, v8, v10 + + mul-double v18, v18, v14 - mul-double v17, v17, v11 + aget-object v11, v7, v3 - aget-wide v11, v16, v7 + aget-wide v12, v11, v9 - mul-double v17, v17, v11 + mul-double v18, v18, v12 - aput-wide v17, v10, v7 + aput-wide v18, v10, v9 :cond_4 :goto_5 - add-int/lit8 v7, v7, 0x1 + add-int/lit8 v9, v9, 0x1 goto :goto_4 @@ -269,7 +279,7 @@ iput-object v2, v0, Landroid/support/constraint/motion/utils/MonotonicCurveFit;->mY:[[D .line 66 - iput-object v9, v0, Landroid/support/constraint/motion/utils/MonotonicCurveFit;->mTangent:[[D + iput-object v8, v0, Landroid/support/constraint/motion/utils/MonotonicCurveFit;->mTangent:[[D return-void .end method @@ -484,18 +494,26 @@ return-wide v2 :cond_2 - add-int/lit8 v6, v3, 0x1 + add-int/lit8 v4, v3, 0x1 .line 159 - aget-wide v7, v1, v6 + aget-wide v5, v1, v4 + + cmpg-double v7, p1, v5 + + if-gez v7, :cond_3 + + .line 160 + aget-wide v5, v1, v4 - cmpg-double v1, p1, v7 + aget-wide v7, v1, v3 - if-gez v1, :cond_3 + sub-double v9, v5, v7 - sub-double v9, v7, v4 + .line 161 + aget-wide v5, v1, v3 - sub-double v1, p1, v4 + sub-double v1, p1, v5 div-double v11, v1, v9 @@ -507,7 +525,7 @@ aget-wide v13, v2, p3 .line 163 - aget-object v1, v1, v6 + aget-object v1, v1, v4 aget-wide v15, v1, p3 @@ -519,7 +537,7 @@ aget-wide v17, v2, p3 .line 165 - aget-object v1, v1, v6 + aget-object v1, v1, v4 aget-wide v19, v1, p3 @@ -531,7 +549,7 @@ return-wide v1 :cond_3 - move v3, v6 + move v3, v4 goto :goto_0 @@ -663,10 +681,15 @@ if-gez v9, :cond_6 .line 93 + aget-wide v7, v5, v6 + aget-wide v9, v5, v1 sub-double/2addr v7, v9 + .line 94 + aget-wide v9, v5, v1 + sub-double v9, p1, v9 div-double/2addr v9, v7 @@ -853,10 +876,15 @@ if-gez v9, :cond_6 .line 131 + aget-wide v7, v5, v6 + aget-wide v9, v5, v1 sub-double/2addr v7, v9 + .line 132 + aget-wide v9, v5, v1 + sub-double v9, p1, v9 div-double/2addr v9, v7 @@ -936,17 +964,23 @@ if-gez v6, :cond_0 + .line 205 + aget-wide v4, v1, v3 + goto :goto_0 :cond_0 add-int/lit8 v4, v2, -0x1 .line 206 - aget-wide v4, v1, v4 + aget-wide v5, v1, v4 - cmpl-double v1, p1, v4 + cmpl-double v7, p1, v5 - if-ltz v1, :cond_1 + if-ltz v7, :cond_1 + + .line 207 + aget-wide v4, v1, v4 goto :goto_0 @@ -970,10 +1004,15 @@ if-gtz v9, :cond_2 .line 211 + aget-wide v7, v1, v6 + aget-wide v9, v1, v3 sub-double/2addr v7, v9 + .line 212 + aget-wide v9, v1, v3 + sub-double/2addr v4, v9 div-double v13, v4, v7 @@ -1050,17 +1089,23 @@ if-gtz v7, :cond_0 + .line 178 + aget-wide v5, v1, v4 + goto :goto_0 :cond_0 add-int/lit8 v5, v2, -0x1 .line 179 - aget-wide v5, v1, v5 + aget-wide v6, v1, v5 - cmpl-double v1, p1, v5 + cmpl-double v8, p1, v6 - if-ltz v1, :cond_1 + if-ltz v8, :cond_1 + + .line 180 + aget-wide v5, v1, v5 goto :goto_0 @@ -1087,10 +1132,15 @@ if-gtz v11, :cond_2 .line 185 + aget-wide v9, v7, v8 + aget-wide v11, v7, v1 sub-double/2addr v9, v11 + .line 186 + aget-wide v11, v7, v1 + sub-double/2addr v5, v11 div-double/2addr v5, v9 diff --git a/smali/android/support/constraint/motion/utils/Oscillator.smali b/smali/android/support/constraint/motion/utils/Oscillator.smali index c11cb218..a22c3d09 100644 --- a/smali/android/support/constraint/motion/utils/Oscillator.smali +++ b/smali/android/support/constraint/motion/utils/Oscillator.smali @@ -50,14 +50,14 @@ const/4 v0, 0x0 + .line 27 new-array v1, v0, [F - .line 27 iput-object v1, p0, Landroid/support/constraint/motion/utils/Oscillator;->mPeriod:[F + .line 28 new-array v1, v0, [D - .line 28 iput-object v1, p0, Landroid/support/constraint/motion/utils/Oscillator;->mPosition:[D const-wide v1, 0x401921fb54442d18L # 6.283185307179586 @@ -198,9 +198,9 @@ add-int/lit8 v3, v0, -0x1 - aget v1, v1, v3 + aget v4, v1, v3 - sub-float/2addr v2, v1 + sub-float/2addr v2, v4 float-to-double v4, v2 @@ -218,11 +218,15 @@ mul-double p1, p1, v4 - float-to-double v0, v1 + .line 152 + aget v0, v1, v3 - mul-double v4, v4, v8 + float-to-double v0, v0 + + aget-wide v6, v2, v3 + + mul-double v4, v4, v6 - .line 152 invoke-static {v0, v1}, Ljava/lang/Double;->isNaN(D)Z sub-double/2addr v0, v4 @@ -282,9 +286,9 @@ add-int/lit8 v3, v0, -0x1 - aget v1, v1, v3 + aget v4, v1, v3 - sub-float/2addr v2, v1 + sub-float/2addr v2, v4 float-to-double v4, v2 @@ -303,27 +307,37 @@ .line 109 iget-object v0, p0, Landroid/support/constraint/motion/utils/Oscillator;->mArea:[D - aget-wide v2, v0, v3 + aget-wide v6, v0, v3 - float-to-double v0, v1 + aget v0, v1, v3 - mul-double v6, v4, v8 + float-to-double v0, v0 + + aget-wide v8, v2, v3 + + mul-double v8, v8, v4 invoke-static {v0, v1}, Ljava/lang/Double;->isNaN(D)Z - sub-double/2addr v0, v6 + sub-double/2addr v0, v8 + + aget-wide v8, v2, v3 - sub-double v6, p1, v8 + sub-double v8, p1, v8 - mul-double v0, v0, v6 + mul-double v0, v0, v8 - add-double/2addr v2, v0 + add-double/2addr v6, v0 mul-double p1, p1, p1 - mul-double v8, v8, v8 + aget-wide v0, v2, v3 + + aget-wide v8, v2, v3 + + mul-double v0, v0, v8 - sub-double/2addr p1, v8 + sub-double/2addr p1, v0 mul-double v4, v4, p1 @@ -331,7 +345,7 @@ div-double/2addr v4, p1 - add-double v0, v2, v4 + add-double v0, v6, v4 goto :goto_1 diff --git a/smali/android/support/constraint/motion/utils/StopLogic.smali b/smali/android/support/constraint/motion/utils/StopLogic.smali index 2beb9cbd..4352298c 100644 --- a/smali/android/support/constraint/motion/utils/StopLogic.smali +++ b/smali/android/support/constraint/motion/utils/StopLogic.smali @@ -264,11 +264,13 @@ add-float/2addr p1, p5 - mul-float p1, p1, p4 + .line 180 + iget p3, p0, Landroid/support/constraint/motion/utils/StopLogic;->mStage1Duration:F + + mul-float p1, p1, p3 div-float/2addr p1, v3 - .line 180 iput p1, p0, Landroid/support/constraint/motion/utils/StopLogic;->mStage1EndPosition:F .line 181 @@ -311,10 +313,16 @@ add-float/2addr p1, p4 - mul-float p1, p1, p5 + .line 193 + iget p3, p0, Landroid/support/constraint/motion/utils/StopLogic;->mStage1Duration:F + + mul-float p1, p1, p3 div-float/2addr p1, v3 + .line 194 + iget p3, p0, Landroid/support/constraint/motion/utils/StopLogic;->mStage3Duration:F + mul-float p3, p3, p4 div-float/2addr p3, v3 @@ -475,11 +483,13 @@ add-float/2addr p1, p5 - mul-float p1, p1, v1 + .line 240 + iget p3, p0, Landroid/support/constraint/motion/utils/StopLogic;->mStage1Duration:F + + mul-float p1, p1, p3 div-float/2addr p1, v3 - .line 240 iput p1, p0, Landroid/support/constraint/motion/utils/StopLogic;->mStage1EndPosition:F .line 241 @@ -519,10 +529,16 @@ add-float/2addr p1, p4 - mul-float p1, p1, p5 + .line 254 + iget p3, p0, Landroid/support/constraint/motion/utils/StopLogic;->mStage1Duration:F + + mul-float p1, p1, p3 div-float/2addr p1, v3 + .line 255 + iget p3, p0, Landroid/support/constraint/motion/utils/StopLogic;->mStage3Duration:F + mul-float p3, p3, p4 div-float/2addr p3, v3 @@ -573,6 +589,9 @@ :goto_0 iput-boolean v1, p0, Landroid/support/constraint/motion/utils/StopLogic;->mBackwards:Z + .line 139 + iget-boolean v1, p0, Landroid/support/constraint/motion/utils/StopLogic;->mBackwards:Z + if-eqz v1, :cond_1 neg-float v1, p3 diff --git a/smali/android/support/constraint/solver/ArrayLinkedVariables.smali b/smali/android/support/constraint/solver/ArrayLinkedVariables.smali index 11629f3f..c5b185c4 100644 --- a/smali/android/support/constraint/solver/ArrayLinkedVariables.smali +++ b/smali/android/support/constraint/solver/ArrayLinkedVariables.smali @@ -63,24 +63,26 @@ .line 48 iput v1, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->ROW_SIZE:I - const/4 v2, 0x0 + const/4 v1, 0x0 .line 50 - iput-object v2, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->candidate:Landroid/support/constraint/solver/SolverVariable; + iput-object v1, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->candidate:Landroid/support/constraint/solver/SolverVariable; + + .line 53 + iget v1, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->ROW_SIZE:I new-array v2, v1, [I - .line 53 iput-object v2, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mArrayIndices:[I + .line 56 new-array v2, v1, [I - .line 56 iput-object v2, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mArrayNextIndices:[I + .line 59 new-array v1, v1, [F - .line 59 iput-object v1, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mArrayValues:[F const/4 v1, -0x1 @@ -141,14 +143,16 @@ .line 232 iget-object p3, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mArrayValues:[F - aput p2, p3, v1 + iget v0, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mHead:I + + aput p2, p3, v0 .line 233 iget-object p2, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mArrayIndices:[I iget p3, p1, Landroid/support/constraint/solver/SolverVariable;->id:I - aput p3, p2, v1 + aput p3, p2, v0 .line 234 iget-object p2, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mArrayNextIndices:[I @@ -189,6 +193,8 @@ iput p1, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mLast:I .line 241 + iget p1, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mLast:I + iget-object p2, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mArrayIndices:[I array-length p3, p2 @@ -234,32 +240,34 @@ .line 254 iget-object v1, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mArrayValues:[F - aget v2, v1, v0 + aget v1, v1, v0 - add-float/2addr v2, p2 + add-float/2addr v1, p2 .line 255 sget p2, Landroid/support/constraint/solver/ArrayLinkedVariables;->epsilon:F - neg-float v4, p2 + neg-float v2, p2 - const/4 v6, 0x0 + const/4 v4, 0x0 - cmpl-float v4, v2, v4 + cmpl-float v2, v1, v2 - if-lez v4, :cond_3 + if-lez v2, :cond_3 - cmpg-float p2, v2, p2 + cmpg-float p2, v1, p2 if-gez p2, :cond_3 - const/4 v2, 0x0 + const/4 v1, 0x0 .line 258 :cond_3 - aput v2, v1, v0 + iget-object p2, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mArrayValues:[F + + aput v1, p2, v0 - cmpl-float p2, v2, v6 + cmpl-float p2, v1, v4 if-nez p2, :cond_7 @@ -432,15 +440,17 @@ .line 312 iput-boolean v1, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mDidFillOnce:Z - add-int/lit8 v1, p3, -0x1 + add-int/lit8 v0, p3, -0x1 .line 313 - iput v1, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mLast:I + iput v0, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mLast:I .line 314 - iget-object v1, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mArrayValues:[F + iget-object v0, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mArrayValues:[F + + iget v1, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->ROW_SIZE:I - invoke-static {v1, v0}, Ljava/util/Arrays;->copyOf([FI)[F + invoke-static {v0, v1}, Ljava/util/Arrays;->copyOf([FI)[F move-result-object v0 @@ -1231,6 +1241,8 @@ .line 125 iget-object v1, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mArrayValues:[F + iget v2, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mHead:I + aput p2, v1, v2 .line 126 @@ -1279,6 +1291,8 @@ iput p1, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mLast:I .line 134 + iget p1, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mLast:I + iget-object p2, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mArrayIndices:[I array-length v1, p2 @@ -1447,6 +1461,8 @@ .line 185 iget-object v2, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mArrayValues:[F + iget v4, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->ROW_SIZE:I + invoke-static {v2, v4}, Ljava/util/Arrays;->copyOf([FI)[F move-result-object v2 @@ -1534,24 +1550,26 @@ iput p1, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->currentSize:I .line 203 - iget-boolean p2, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mDidFillOnce:Z + iget-boolean p1, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mDidFillOnce:Z - if-nez p2, :cond_c + if-nez p1, :cond_c .line 205 - iget p2, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mLast:I + iget p1, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mLast:I - add-int/2addr p2, v0 + add-int/2addr p1, v0 - iput p2, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mLast:I + iput p1, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mLast:I .line 207 :cond_c + iget p1, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->currentSize:I + iget-object p2, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mArrayIndices:[I - array-length v1, p2 + array-length p2, p2 - if-lt p1, v1, :cond_d + if-lt p1, p2, :cond_d .line 208 iput-boolean v0, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mDidFillOnce:Z @@ -1560,6 +1578,8 @@ :cond_d iget p1, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mLast:I + iget-object p2, p0, Landroid/support/constraint/solver/ArrayLinkedVariables;->mArrayIndices:[I + array-length v1, p2 if-lt p1, v1, :cond_e diff --git a/smali/android/support/constraint/solver/ArrayRow.smali b/smali/android/support/constraint/solver/ArrayRow.smali index 1b35e696..e5096f2b 100644 --- a/smali/android/support/constraint/solver/ArrayRow.smali +++ b/smali/android/support/constraint/solver/ArrayRow.smali @@ -391,9 +391,7 @@ const/4 v3, 0x0 - move-object v2, v1 - - const/4 v4, 0x0 + move-object v4, v1 const/4 v5, 0x0 @@ -404,19 +402,19 @@ const/4 v8, 0x0 :goto_0 - if-ge v4, v0, :cond_6 + if-ge v2, v0, :cond_6 .line 466 iget-object v9, p0, Landroid/support/constraint/solver/ArrayRow;->variables:Landroid/support/constraint/solver/ArrayRow$ArrayRowVariables; - invoke-interface {v9, v4}, Landroid/support/constraint/solver/ArrayRow$ArrayRowVariables;->getVariableValue(I)F + invoke-interface {v9, v2}, Landroid/support/constraint/solver/ArrayRow$ArrayRowVariables;->getVariableValue(I)F move-result v9 .line 467 iget-object v10, p0, Landroid/support/constraint/solver/ArrayRow;->variables:Landroid/support/constraint/solver/ArrayRow$ArrayRowVariables; - invoke-interface {v10, v4}, Landroid/support/constraint/solver/ArrayRow$ArrayRowVariables;->getVariable(I)Landroid/support/constraint/solver/SolverVariable; + invoke-interface {v10, v2}, Landroid/support/constraint/solver/ArrayRow$ArrayRowVariables;->getVariable(I)Landroid/support/constraint/solver/SolverVariable; move-result-object v10 @@ -437,16 +435,16 @@ move-result v1 :goto_1 - move v5, v1 + move v6, v1 - move v7, v9 + move v5, v9 move-object v1, v10 goto :goto_3 :cond_0 - cmpl-float v11, v7, v9 + cmpl-float v11, v5, v9 if-lez v11, :cond_1 @@ -458,7 +456,7 @@ goto :goto_1 :cond_1 - if-nez v5, :cond_5 + if-nez v6, :cond_5 .line 477 invoke-direct {p0, v10, p1}, Landroid/support/constraint/solver/ArrayRow;->isNew(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/LinearSystem;)Z @@ -467,11 +465,11 @@ if-eqz v11, :cond_5 - move v7, v9 + move v5, v9 move-object v1, v10 - const/4 v5, 0x1 + const/4 v6, 0x1 goto :goto_3 @@ -482,36 +480,36 @@ if-gez v11, :cond_5 - if-nez v2, :cond_3 + if-nez v4, :cond_3 .line 487 invoke-direct {p0, v10, p1}, Landroid/support/constraint/solver/ArrayRow;->isNew(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/LinearSystem;)Z - move-result v2 + move-result v4 :goto_2 - move v6, v2 + move v8, v4 - move v8, v9 + move v7, v9 - move-object v2, v10 + move-object v4, v10 goto :goto_3 :cond_3 - cmpl-float v11, v8, v9 + cmpl-float v11, v7, v9 if-lez v11, :cond_4 .line 491 invoke-direct {p0, v10, p1}, Landroid/support/constraint/solver/ArrayRow;->isNew(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/LinearSystem;)Z - move-result v2 + move-result v4 goto :goto_2 :cond_4 - if-nez v6, :cond_5 + if-nez v8, :cond_5 .line 492 invoke-direct {p0, v10, p1}, Landroid/support/constraint/solver/ArrayRow;->isNew(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/LinearSystem;)Z @@ -520,15 +518,15 @@ if-eqz v11, :cond_5 - move v8, v9 + move v7, v9 - move-object v2, v10 + move-object v4, v10 - const/4 v6, 0x1 + const/4 v8, 0x1 :cond_5 :goto_3 - add-int/lit8 v4, v4, 0x1 + add-int/lit8 v2, v2, 0x1 goto :goto_0 @@ -538,7 +536,7 @@ return-object v1 :cond_7 - return-object v2 + return-object v4 .end method .method public clear()V @@ -1641,9 +1639,24 @@ .line 76 iget-object v0, p0, Landroid/support/constraint/solver/ArrayRow;->variable:Landroid/support/constraint/solver/SolverVariable; + const-string v1, "" + if-nez v0, :cond_0 - const-string v0, "0" + .line 77 + new-instance v0, Ljava/lang/StringBuilder; + + invoke-direct {v0}, Ljava/lang/StringBuilder;->()V + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + const-string v1, "0" + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + + move-result-object v0 goto :goto_0 @@ -1653,8 +1666,6 @@ invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - const-string v1, "" - invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; iget-object v1, p0, Landroid/support/constraint/solver/ArrayRow;->variable:Landroid/support/constraint/solver/SolverVariable; diff --git a/smali/android/support/constraint/solver/Cache.smali b/smali/android/support/constraint/solver/Cache.smali index 2ba7f02b..20880159 100644 --- a/smali/android/support/constraint/solver/Cache.smali +++ b/smali/android/support/constraint/solver/Cache.smali @@ -69,9 +69,9 @@ const/16 v0, 0x20 + .line 25 new-array v0, v0, [Landroid/support/constraint/solver/SolverVariable; - .line 25 iput-object v0, p0, Landroid/support/constraint/solver/Cache;->mIndexedVariables:[Landroid/support/constraint/solver/SolverVariable; return-void diff --git a/smali/android/support/constraint/solver/LinearSystem.smali b/smali/android/support/constraint/solver/LinearSystem.smali index 1fc4cf48..5b5037cb 100644 --- a/smali/android/support/constraint/solver/LinearSystem.smali +++ b/smali/android/support/constraint/solver/LinearSystem.smali @@ -119,6 +119,8 @@ iput v2, p0, Landroid/support/constraint/solver/LinearSystem;->TABLE_SIZE:I .line 66 + iget v2, p0, Landroid/support/constraint/solver/LinearSystem;->TABLE_SIZE:I + iput v2, p0, Landroid/support/constraint/solver/LinearSystem;->mMaxColumns:I .line 67 @@ -130,9 +132,9 @@ .line 71 iput-boolean v0, p0, Landroid/support/constraint/solver/LinearSystem;->newgraphOptimizer:Z + .line 74 new-array v1, v2, [Z - .line 74 iput-object v1, p0, Landroid/support/constraint/solver/LinearSystem;->mAlreadyTestedCandidates:[Z const/4 v1, 0x1 @@ -156,9 +158,9 @@ .line 83 iput v0, p0, Landroid/support/constraint/solver/LinearSystem;->mPoolVariablesCount:I + .line 95 new-array v0, v2, [Landroid/support/constraint/solver/ArrayRow; - .line 95 iput-object v0, p0, Landroid/support/constraint/solver/LinearSystem;->mRows:[Landroid/support/constraint/solver/ArrayRow; .line 96 @@ -172,33 +174,39 @@ iput-object v0, p0, Landroid/support/constraint/solver/LinearSystem;->mCache:Landroid/support/constraint/solver/Cache; .line 98 - new-instance v1, Landroid/support/constraint/solver/PriorityGoalRow; + new-instance v0, Landroid/support/constraint/solver/PriorityGoalRow; + + iget-object v1, p0, Landroid/support/constraint/solver/LinearSystem;->mCache:Landroid/support/constraint/solver/Cache; - invoke-direct {v1, v0}, Landroid/support/constraint/solver/PriorityGoalRow;->(Landroid/support/constraint/solver/Cache;)V + invoke-direct {v0, v1}, Landroid/support/constraint/solver/PriorityGoalRow;->(Landroid/support/constraint/solver/Cache;)V - iput-object v1, p0, Landroid/support/constraint/solver/LinearSystem;->mGoal:Landroid/support/constraint/solver/LinearSystem$Row; + iput-object v0, p0, Landroid/support/constraint/solver/LinearSystem;->mGoal:Landroid/support/constraint/solver/LinearSystem$Row; .line 99 - sget-boolean v1, Landroid/support/constraint/solver/LinearSystem;->OPTIMIZED_ENGINE:Z + sget-boolean v0, Landroid/support/constraint/solver/LinearSystem;->OPTIMIZED_ENGINE:Z - if-eqz v1, :cond_0 + if-eqz v0, :cond_0 .line 100 - new-instance v1, Landroid/support/constraint/solver/LinearSystem$ValuesRow; + new-instance v0, Landroid/support/constraint/solver/LinearSystem$ValuesRow; - invoke-direct {v1, p0, v0}, Landroid/support/constraint/solver/LinearSystem$ValuesRow;->(Landroid/support/constraint/solver/LinearSystem;Landroid/support/constraint/solver/Cache;)V + iget-object v1, p0, Landroid/support/constraint/solver/LinearSystem;->mCache:Landroid/support/constraint/solver/Cache; - iput-object v1, p0, Landroid/support/constraint/solver/LinearSystem;->mTempGoal:Landroid/support/constraint/solver/LinearSystem$Row; + invoke-direct {v0, p0, v1}, Landroid/support/constraint/solver/LinearSystem$ValuesRow;->(Landroid/support/constraint/solver/LinearSystem;Landroid/support/constraint/solver/Cache;)V + + iput-object v0, p0, Landroid/support/constraint/solver/LinearSystem;->mTempGoal:Landroid/support/constraint/solver/LinearSystem$Row; goto :goto_0 .line 102 :cond_0 - new-instance v1, Landroid/support/constraint/solver/ArrayRow; + new-instance v0, Landroid/support/constraint/solver/ArrayRow; - invoke-direct {v1, v0}, Landroid/support/constraint/solver/ArrayRow;->(Landroid/support/constraint/solver/Cache;)V + iget-object v1, p0, Landroid/support/constraint/solver/LinearSystem;->mCache:Landroid/support/constraint/solver/Cache; - iput-object v1, p0, Landroid/support/constraint/solver/LinearSystem;->mTempGoal:Landroid/support/constraint/solver/LinearSystem$Row; + invoke-direct {v0, v1}, Landroid/support/constraint/solver/ArrayRow;->(Landroid/support/constraint/solver/Cache;)V + + iput-object v0, p0, Landroid/support/constraint/solver/LinearSystem;->mTempGoal:Landroid/support/constraint/solver/LinearSystem$Row; :goto_0 return-void @@ -253,6 +261,8 @@ .line 380 iget-object p1, p0, Landroid/support/constraint/solver/LinearSystem;->mPoolVariables:[Landroid/support/constraint/solver/SolverVariable; + sget p2, Landroid/support/constraint/solver/LinearSystem;->POOL_SIZE:I + invoke-static {p1, p2}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object; move-result-object p1 @@ -323,12 +333,10 @@ iput v1, v0, Landroid/support/constraint/solver/SolverVariable;->definitionId:I - .line 644 - iget v0, p0, Landroid/support/constraint/solver/LinearSystem;->mNumRows:I - - add-int/lit8 v0, v0, 0x1 + add-int/lit8 v1, v1, 0x1 - iput v0, p0, Landroid/support/constraint/solver/LinearSystem;->mNumRows:I + .line 644 + iput v1, p0, Landroid/support/constraint/solver/LinearSystem;->mNumRows:I .line 645 iget-object v0, p1, Landroid/support/constraint/solver/ArrayRow;->variable:Landroid/support/constraint/solver/SolverVariable; @@ -373,9 +381,11 @@ :cond_1 iget-object v1, p0, Landroid/support/constraint/solver/LinearSystem;->mRows:[Landroid/support/constraint/solver/ArrayRow; - aget-object v1, v1, v0 + aget-object v2, v1, v0 - if-eqz v1, :cond_6 + if-eqz v2, :cond_6 + + aget-object v1, v1, v0 iget-boolean v1, v1, Landroid/support/constraint/solver/ArrayRow;->isSimpleDefinition:Z @@ -443,7 +453,9 @@ aput-object v5, v3, v4 .line 670 - iget-object v3, v5, Landroid/support/constraint/solver/ArrayRow;->variable:Landroid/support/constraint/solver/SolverVariable; + aget-object v3, v3, v4 + + iget-object v3, v3, Landroid/support/constraint/solver/ArrayRow;->variable:Landroid/support/constraint/solver/SolverVariable; iget v3, v3, Landroid/support/constraint/solver/SolverVariable;->definitionId:I @@ -477,11 +489,13 @@ aput-object v2, v1, v3 + .line 678 :cond_5 - add-int/lit8 v4, v4, -0x1 + iget v1, p0, Landroid/support/constraint/solver/LinearSystem;->mNumRows:I - .line 678 - iput v4, p0, Landroid/support/constraint/solver/LinearSystem;->mNumRows:I + add-int/lit8 v1, v1, -0x1 + + iput v1, p0, Landroid/support/constraint/solver/LinearSystem;->mNumRows:I add-int/lit8 v0, v0, -0x1 @@ -605,13 +619,15 @@ iput v0, p0, Landroid/support/constraint/solver/LinearSystem;->mVariablesID:I .line 337 - iget v1, p0, Landroid/support/constraint/solver/LinearSystem;->mNumColumns:I + iget v0, p0, Landroid/support/constraint/solver/LinearSystem;->mNumColumns:I - add-int/lit8 v1, v1, 0x1 + add-int/lit8 v0, v0, 0x1 - iput v1, p0, Landroid/support/constraint/solver/LinearSystem;->mNumColumns:I + iput v0, p0, Landroid/support/constraint/solver/LinearSystem;->mNumColumns:I .line 338 + iget v0, p0, Landroid/support/constraint/solver/LinearSystem;->mVariablesID:I + iput v0, p2, Landroid/support/constraint/solver/SolverVariable;->id:I .line 339 @@ -763,7 +779,7 @@ .end method .method private enforceBFS(Landroid/support/constraint/solver/LinearSystem$Row;)I - .locals 19 + .locals 17 .annotation system Ldalvik/annotation/Throws; value = { Ljava/lang/Exception; @@ -832,7 +848,7 @@ :cond_3 :goto_3 - if-nez v2, :cond_16 + if-nez v2, :cond_18 .line 902 sget-object v6, Landroid/support/constraint/solver/LinearSystem;->sMetrics:Landroid/support/constraint/solver/Metrics; @@ -853,11 +869,13 @@ const v6, 0x7f7fffff # Float.MAX_VALUE - const/4 v10, 0x0 + const/4 v6, 0x0 + + const/4 v10, -0x1 const/4 v11, -0x1 - const/4 v12, -0x1 + const v12, 0x7f7fffff # Float.MAX_VALUE const/4 v13, 0x0 @@ -865,12 +883,12 @@ :goto_4 iget v14, v0, Landroid/support/constraint/solver/LinearSystem;->mNumRows:I - if-ge v10, v14, :cond_13 + if-ge v6, v14, :cond_14 .line 915 iget-object v14, v0, Landroid/support/constraint/solver/LinearSystem;->mRows:[Landroid/support/constraint/solver/ArrayRow; - aget-object v14, v14, v10 + aget-object v14, v14, v6 .line 916 iget-object v15, v14, Landroid/support/constraint/solver/ArrayRow;->variable:Landroid/support/constraint/solver/SolverVariable; @@ -898,14 +916,14 @@ cmpg-float v1, v1, v4 - if-gez v1, :cond_12 + if-gez v1, :cond_13 .line 930 sget-boolean v1, Landroid/support/constraint/solver/LinearSystem;->SKIP_COLUMNS:Z const/16 v15, 0x9 - if-eqz v1, :cond_c + if-eqz v1, :cond_d .line 931 iget-object v1, v14, Landroid/support/constraint/solver/ArrayRow;->variables:Landroid/support/constraint/solver/ArrayRow$ArrayRowVariables; @@ -914,73 +932,87 @@ move-result v1 - const/4 v5, 0x0 + move/from16 v16, v13 + + move v13, v12 + + move v12, v11 + + move v11, v10 + + const/4 v10, 0x0 :goto_5 - if-ge v5, v1, :cond_12 + if-ge v10, v1, :cond_c .line 933 - iget-object v7, v14, Landroid/support/constraint/solver/ArrayRow;->variables:Landroid/support/constraint/solver/ArrayRow$ArrayRowVariables; + iget-object v5, v14, Landroid/support/constraint/solver/ArrayRow;->variables:Landroid/support/constraint/solver/ArrayRow$ArrayRowVariables; - invoke-interface {v7, v5}, Landroid/support/constraint/solver/ArrayRow$ArrayRowVariables;->getVariable(I)Landroid/support/constraint/solver/SolverVariable; + invoke-interface {v5, v10}, Landroid/support/constraint/solver/ArrayRow$ArrayRowVariables;->getVariable(I)Landroid/support/constraint/solver/SolverVariable; - move-result-object v7 + move-result-object v5 .line 934 - iget-object v8, v14, Landroid/support/constraint/solver/ArrayRow;->variables:Landroid/support/constraint/solver/ArrayRow$ArrayRowVariables; + iget-object v7, v14, Landroid/support/constraint/solver/ArrayRow;->variables:Landroid/support/constraint/solver/ArrayRow$ArrayRowVariables; - invoke-interface {v8, v7}, Landroid/support/constraint/solver/ArrayRow$ArrayRowVariables;->get(Landroid/support/constraint/solver/SolverVariable;)F + invoke-interface {v7, v5}, Landroid/support/constraint/solver/ArrayRow$ArrayRowVariables;->get(Landroid/support/constraint/solver/SolverVariable;)F - move-result v8 + move-result v7 - cmpg-float v16, v8, v4 + cmpg-float v8, v7, v4 - if-gtz v16, :cond_7 + if-gtz v8, :cond_7 goto :goto_7 :cond_7 - const/4 v9, 0x0 + move/from16 v9, v16 + + const/4 v8, 0x0 :goto_6 - if-ge v9, v15, :cond_b + if-ge v8, v15, :cond_b .line 942 - iget-object v15, v7, Landroid/support/constraint/solver/SolverVariable;->strengthVector:[F + iget-object v15, v5, Landroid/support/constraint/solver/SolverVariable;->strengthVector:[F - aget v15, v15, v9 + aget v15, v15, v8 - div-float/2addr v15, v8 + div-float/2addr v15, v7 - cmpg-float v18, v15, v6 + cmpg-float v16, v15, v13 - if-gez v18, :cond_8 + if-gez v16, :cond_8 - if-eq v9, v13, :cond_9 + if-eq v8, v9, :cond_9 :cond_8 - if-le v9, v13, :cond_a + if-le v8, v9, :cond_a .line 946 :cond_9 - iget v12, v7, Landroid/support/constraint/solver/SolverVariable;->id:I + iget v9, v5, Landroid/support/constraint/solver/SolverVariable;->id:I - move v13, v9 + move v11, v6 - move v11, v10 + move v12, v9 - move v6, v15 + move v13, v15 + + move v9, v8 :cond_a - add-int/lit8 v9, v9, 0x1 + add-int/lit8 v8, v8, 0x1 const/16 v15, 0x9 goto :goto_6 :cond_b + move/from16 v16, v9 + :goto_7 - add-int/lit8 v5, v5, 0x1 + add-int/lit8 v10, v10, 0x1 const-wide/16 v7, 0x1 @@ -989,13 +1021,24 @@ goto :goto_5 :cond_c + move v10, v11 + + move v11, v12 + + move v12, v13 + + move/from16 v13, v16 + + goto :goto_b + + :cond_d const/4 v1, 0x1 .line 952 :goto_8 iget v5, v0, Landroid/support/constraint/solver/LinearSystem;->mNumColumns:I - if-ge v1, v5, :cond_12 + if-ge v1, v5, :cond_13 .line 953 iget-object v5, v0, Landroid/support/constraint/solver/LinearSystem;->mCache:Landroid/support/constraint/solver/Cache; @@ -1013,19 +1056,19 @@ cmpg-float v8, v7, v4 - if-gtz v8, :cond_d + if-gtz v8, :cond_e const/16 v9, 0x9 goto :goto_a - :cond_d + :cond_e const/4 v8, 0x0 const/16 v9, 0x9 :goto_9 - if-ge v8, v9, :cond_11 + if-ge v8, v9, :cond_12 .line 962 iget-object v15, v5, Landroid/support/constraint/solver/SolverVariable;->strengthVector:[F @@ -1034,52 +1077,52 @@ div-float/2addr v15, v7 - cmpg-float v17, v15, v6 + cmpg-float v16, v15, v12 - if-gez v17, :cond_e + if-gez v16, :cond_f - if-eq v8, v13, :cond_f - - :cond_e - if-le v8, v13, :cond_10 + if-eq v8, v13, :cond_10 :cond_f - move v12, v1 + if-le v8, v13, :cond_11 - move v13, v8 + :cond_10 + move v11, v1 - move v11, v10 + move v10, v6 - move v6, v15 + move v13, v8 - :cond_10 + move v12, v15 + + :cond_11 add-int/lit8 v8, v8, 0x1 goto :goto_9 - :cond_11 + :cond_12 :goto_a add-int/lit8 v1, v1, 0x1 goto :goto_8 - :cond_12 + :cond_13 :goto_b - add-int/lit8 v10, v10, 0x1 + add-int/lit8 v6, v6, 0x1 const-wide/16 v7, 0x1 goto/16 :goto_4 - :cond_13 + :cond_14 const/4 v1, -0x1 - if-eq v11, v1, :cond_15 + if-eq v10, v1, :cond_16 .line 977 iget-object v5, v0, Landroid/support/constraint/solver/LinearSystem;->mRows:[Landroid/support/constraint/solver/ArrayRow; - aget-object v5, v5, v11 + aget-object v5, v5, v10 .line 982 iget-object v6, v5, Landroid/support/constraint/solver/ArrayRow;->variable:Landroid/support/constraint/solver/SolverVariable; @@ -1089,7 +1132,7 @@ .line 983 sget-object v1, Landroid/support/constraint/solver/LinearSystem;->sMetrics:Landroid/support/constraint/solver/Metrics; - if-eqz v1, :cond_14 + if-eqz v1, :cond_15 .line 984 iget-wide v6, v1, Landroid/support/constraint/solver/Metrics;->pivots:J @@ -1101,19 +1144,19 @@ iput-wide v6, v1, Landroid/support/constraint/solver/Metrics;->pivots:J .line 986 - :cond_14 + :cond_15 iget-object v1, v0, Landroid/support/constraint/solver/LinearSystem;->mCache:Landroid/support/constraint/solver/Cache; iget-object v1, v1, Landroid/support/constraint/solver/Cache;->mIndexedVariables:[Landroid/support/constraint/solver/SolverVariable; - aget-object v1, v1, v12 + aget-object v1, v1, v11 invoke-virtual {v5, v1}, Landroid/support/constraint/solver/ArrayRow;->pivot(Landroid/support/constraint/solver/SolverVariable;)V .line 987 iget-object v1, v5, Landroid/support/constraint/solver/ArrayRow;->variable:Landroid/support/constraint/solver/SolverVariable; - iput v11, v1, Landroid/support/constraint/solver/SolverVariable;->definitionId:I + iput v10, v1, Landroid/support/constraint/solver/SolverVariable;->definitionId:I .line 988 iget-object v1, v5, Landroid/support/constraint/solver/ArrayRow;->variable:Landroid/support/constraint/solver/SolverVariable; @@ -1122,7 +1165,7 @@ goto :goto_c - :cond_15 + :cond_16 const/4 v2, 0x1 .line 997 @@ -1137,16 +1180,11 @@ goto/16 :goto_3 - :cond_16 - move v1, v3 - - goto :goto_d - :cond_17 - const/4 v1, 0x0 + const/4 v3, 0x0 - :goto_d - return v1 + :cond_18 + return v3 .end method .method private getDisplaySize(I)Ljava/lang/String; @@ -1316,9 +1354,11 @@ iput v0, p0, Landroid/support/constraint/solver/LinearSystem;->TABLE_SIZE:I .line 141 - iget-object v1, p0, Landroid/support/constraint/solver/LinearSystem;->mRows:[Landroid/support/constraint/solver/ArrayRow; + iget-object v0, p0, Landroid/support/constraint/solver/LinearSystem;->mRows:[Landroid/support/constraint/solver/ArrayRow; + + iget v1, p0, Landroid/support/constraint/solver/LinearSystem;->TABLE_SIZE:I - invoke-static {v1, v0}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object; + invoke-static {v0, v1}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object; move-result-object v0 @@ -1521,20 +1561,22 @@ const/4 v6, -0x1 - const/4 v7, 0x0 + const/4 v5, 0x0 + + const/4 v7, -0x1 - const/4 v8, -0x1 + const v8, 0x7f7fffff # Float.MAX_VALUE .line 785 :goto_2 iget v9, p0, Landroid/support/constraint/solver/LinearSystem;->mNumRows:I - if-ge v7, v9, :cond_b + if-ge v5, v9, :cond_b .line 786 iget-object v9, p0, Landroid/support/constraint/solver/LinearSystem;->mRows:[Landroid/support/constraint/solver/ArrayRow; - aget-object v9, v9, v7 + aget-object v9, v9, v5 .line 787 iget-object v10, v9, Landroid/support/constraint/solver/ArrayRow;->variable:Landroid/support/constraint/solver/SolverVariable; @@ -1584,32 +1626,32 @@ div-float/2addr v9, v10 - cmpg-float v10, v9, v5 + cmpg-float v10, v9, v8 if-gez v10, :cond_a - move v8, v7 + move v7, v5 - move v5, v9 + move v8, v9 :cond_a :goto_3 - add-int/lit8 v7, v7, 0x1 + add-int/lit8 v5, v5, 0x1 goto :goto_2 :cond_b - if-le v8, v6, :cond_2 + if-le v7, v6, :cond_2 .line 819 iget-object v5, p0, Landroid/support/constraint/solver/LinearSystem;->mRows:[Landroid/support/constraint/solver/ArrayRow; - aget-object v5, v5, v8 + aget-object v5, v5, v7 .line 820 - iget-object v7, v5, Landroid/support/constraint/solver/ArrayRow;->variable:Landroid/support/constraint/solver/SolverVariable; + iget-object v8, v5, Landroid/support/constraint/solver/ArrayRow;->variable:Landroid/support/constraint/solver/SolverVariable; - iput v6, v7, Landroid/support/constraint/solver/SolverVariable;->definitionId:I + iput v6, v8, Landroid/support/constraint/solver/SolverVariable;->definitionId:I .line 821 sget-object v6, Landroid/support/constraint/solver/LinearSystem;->sMetrics:Landroid/support/constraint/solver/Metrics; @@ -1617,11 +1659,11 @@ if-eqz v6, :cond_c .line 822 - iget-wide v9, v6, Landroid/support/constraint/solver/Metrics;->pivots:J + iget-wide v8, v6, Landroid/support/constraint/solver/Metrics;->pivots:J - add-long/2addr v9, v0 + add-long/2addr v8, v0 - iput-wide v9, v6, Landroid/support/constraint/solver/Metrics;->pivots:J + iput-wide v8, v6, Landroid/support/constraint/solver/Metrics;->pivots:J .line 824 :cond_c @@ -1630,7 +1672,7 @@ .line 825 iget-object v4, v5, Landroid/support/constraint/solver/ArrayRow;->variable:Landroid/support/constraint/solver/SolverVariable; - iput v8, v4, Landroid/support/constraint/solver/SolverVariable;->definitionId:I + iput v7, v4, Landroid/support/constraint/solver/SolverVariable;->definitionId:I .line 826 iget-object v4, v5, Landroid/support/constraint/solver/ArrayRow;->variable:Landroid/support/constraint/solver/SolverVariable; @@ -2004,7 +2046,7 @@ .line 571 iget-boolean v4, p1, Landroid/support/constraint/solver/ArrayRow;->isSimpleDefinition:Z - if-nez v4, :cond_c + if-nez v4, :cond_b .line 573 invoke-virtual {p1, p0}, Landroid/support/constraint/solver/ArrayRow;->updateFromSystem(Landroid/support/constraint/solver/LinearSystem;)V @@ -2027,7 +2069,7 @@ move-result v4 - if-eqz v4, :cond_9 + if-eqz v4, :cond_a .line 589 invoke-virtual {p0}, Landroid/support/constraint/solver/LinearSystem;->createExtraVariable()Landroid/support/constraint/solver/SolverVariable; @@ -2048,7 +2090,7 @@ add-int/2addr v5, v3 - if-ne v6, v5, :cond_9 + if-ne v6, v5, :cond_a .line 595 iget-object v0, p0, Landroid/support/constraint/solver/LinearSystem;->mTempGoal:Landroid/support/constraint/solver/LinearSystem$Row; @@ -2065,7 +2107,7 @@ const/4 v5, -0x1 - if-ne v0, v5, :cond_a + if-ne v0, v5, :cond_9 .line 601 iget-object v0, p1, Landroid/support/constraint/solver/ArrayRow;->variable:Landroid/support/constraint/solver/SolverVariable; @@ -2137,32 +2179,26 @@ iput v0, p0, Landroid/support/constraint/solver/LinearSystem;->mNumRows:I - goto :goto_1 - :cond_9 - const/4 v3, 0x0 + const/4 v0, 0x1 .line 624 :cond_a - :goto_1 invoke-virtual {p1}, Landroid/support/constraint/solver/ArrayRow;->hasKeyVariable()Z - move-result v0 + move-result v1 - if-nez v0, :cond_b + if-nez v1, :cond_b return-void :cond_b - move v0, v3 - - :cond_c - if-nez v0, :cond_d + if-nez v0, :cond_c .line 634 invoke-direct {p0, p1}, Landroid/support/constraint/solver/LinearSystem;->addRow(Landroid/support/constraint/solver/ArrayRow;)V - :cond_d + :cond_c return-void .end method @@ -2800,13 +2836,15 @@ iput v0, p0, Landroid/support/constraint/solver/LinearSystem;->mVariablesID:I .line 356 - iget v1, p0, Landroid/support/constraint/solver/LinearSystem;->mNumColumns:I + iget v0, p0, Landroid/support/constraint/solver/LinearSystem;->mNumColumns:I - add-int/lit8 v1, v1, 0x1 + add-int/lit8 v0, v0, 0x1 - iput v1, p0, Landroid/support/constraint/solver/LinearSystem;->mNumColumns:I + iput v0, p0, Landroid/support/constraint/solver/LinearSystem;->mNumColumns:I .line 357 + iget v0, p0, Landroid/support/constraint/solver/LinearSystem;->mVariablesID:I + iput v0, p2, Landroid/support/constraint/solver/SolverVariable;->id:I .line 358 @@ -2877,13 +2915,15 @@ iput v1, p0, Landroid/support/constraint/solver/LinearSystem;->mVariablesID:I .line 299 - iget v2, p0, Landroid/support/constraint/solver/LinearSystem;->mNumColumns:I + iget v1, p0, Landroid/support/constraint/solver/LinearSystem;->mNumColumns:I - add-int/lit8 v2, v2, 0x1 + add-int/lit8 v1, v1, 0x1 - iput v2, p0, Landroid/support/constraint/solver/LinearSystem;->mNumColumns:I + iput v1, p0, Landroid/support/constraint/solver/LinearSystem;->mNumColumns:I .line 300 + iget v1, p0, Landroid/support/constraint/solver/LinearSystem;->mVariablesID:I + iput v1, v0, Landroid/support/constraint/solver/SolverVariable;->id:I .line 301 @@ -2989,13 +3029,15 @@ iput p1, p0, Landroid/support/constraint/solver/LinearSystem;->mVariablesID:I .line 240 - iget v1, p0, Landroid/support/constraint/solver/LinearSystem;->mNumColumns:I + iget p1, p0, Landroid/support/constraint/solver/LinearSystem;->mNumColumns:I - add-int/lit8 v1, v1, 0x1 + add-int/lit8 p1, p1, 0x1 - iput v1, p0, Landroid/support/constraint/solver/LinearSystem;->mNumColumns:I + iput p1, p0, Landroid/support/constraint/solver/LinearSystem;->mNumColumns:I .line 241 + iget p1, p0, Landroid/support/constraint/solver/LinearSystem;->mVariablesID:I + iput p1, v0, Landroid/support/constraint/solver/SolverVariable;->id:I .line 242 @@ -3150,13 +3192,15 @@ iput v1, p0, Landroid/support/constraint/solver/LinearSystem;->mVariablesID:I .line 284 - iget v2, p0, Landroid/support/constraint/solver/LinearSystem;->mNumColumns:I + iget v1, p0, Landroid/support/constraint/solver/LinearSystem;->mNumColumns:I - add-int/lit8 v2, v2, 0x1 + add-int/lit8 v1, v1, 0x1 - iput v2, p0, Landroid/support/constraint/solver/LinearSystem;->mNumColumns:I + iput v1, p0, Landroid/support/constraint/solver/LinearSystem;->mNumColumns:I .line 285 + iget v1, p0, Landroid/support/constraint/solver/LinearSystem;->mVariablesID:I + iput v1, v0, Landroid/support/constraint/solver/SolverVariable;->id:I .line 286 @@ -3200,7 +3244,9 @@ const/4 v2, 0x0 - const/4 v3, 0x0 + move-object v3, v0 + + const/4 v0, 0x0 .line 1061 :goto_0 @@ -3212,14 +3258,14 @@ const-string v6, "] => " - if-ge v3, v4, :cond_1 + if-ge v0, v4, :cond_1 .line 1062 iget-object v4, p0, Landroid/support/constraint/solver/LinearSystem;->mCache:Landroid/support/constraint/solver/Cache; iget-object v4, v4, Landroid/support/constraint/solver/Cache;->mIndexedVariables:[Landroid/support/constraint/solver/SolverVariable; - aget-object v4, v4, v3 + aget-object v4, v4, v0 if-eqz v4, :cond_0 @@ -3233,13 +3279,13 @@ invoke-direct {v7}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v7, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v7, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v0, " $[" + const-string v3, " $[" - invoke-virtual {v7, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v7, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v7, v3}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; + invoke-virtual {v7, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; invoke-virtual {v7, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; @@ -3247,36 +3293,38 @@ invoke-virtual {v7, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - iget v0, v4, Landroid/support/constraint/solver/SolverVariable;->computedValue:F + iget v3, v4, Landroid/support/constraint/solver/SolverVariable;->computedValue:F - invoke-virtual {v7, v0}, Ljava/lang/StringBuilder;->append(F)Ljava/lang/StringBuilder; + invoke-virtual {v7, v3}, Ljava/lang/StringBuilder;->append(F)Ljava/lang/StringBuilder; invoke-virtual {v7, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v0 + move-result-object v3 :cond_0 - add-int/lit8 v3, v3, 0x1 + add-int/lit8 v0, v0, 0x1 goto :goto_0 .line 1067 :cond_1 - new-instance v3, Ljava/lang/StringBuilder; + new-instance v0, Ljava/lang/StringBuilder; - invoke-direct {v3}, Ljava/lang/StringBuilder;->()V + invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; move-result-object v0 - const/4 v3, 0x0 + move-object v3, v0 + + const/4 v0, 0x0 .line 1068 :goto_1 @@ -3284,14 +3332,14 @@ add-int/lit8 v4, v4, 0x1 - if-ge v3, v4, :cond_3 + if-ge v0, v4, :cond_3 .line 1069 iget-object v4, p0, Landroid/support/constraint/solver/LinearSystem;->mCache:Landroid/support/constraint/solver/Cache; iget-object v4, v4, Landroid/support/constraint/solver/Cache;->mIndexedVariables:[Landroid/support/constraint/solver/SolverVariable; - aget-object v4, v4, v3 + aget-object v4, v4, v0 if-eqz v4, :cond_2 @@ -3314,13 +3362,13 @@ invoke-direct {v8}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v8, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v8, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v0, " ~[" + const-string v3, " ~[" - invoke-virtual {v8, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v8, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v8, v3}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; + invoke-virtual {v8, v0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; invoke-virtual {v8, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; @@ -3330,38 +3378,38 @@ invoke-virtual {v8, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - const-string v0, " + " + const-string v3, " + " - invoke-virtual {v8, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v8, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - iget v0, v4, Landroid/support/constraint/solver/SolverVariable;->synonymDelta:F + iget v3, v4, Landroid/support/constraint/solver/SolverVariable;->synonymDelta:F - invoke-virtual {v8, v0}, Ljava/lang/StringBuilder;->append(F)Ljava/lang/StringBuilder; + invoke-virtual {v8, v3}, Ljava/lang/StringBuilder;->append(F)Ljava/lang/StringBuilder; invoke-virtual {v8, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; invoke-virtual {v8}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v0 + move-result-object v3 :cond_2 - add-int/lit8 v3, v3, 0x1 + add-int/lit8 v0, v0, 0x1 goto :goto_1 .line 1075 :cond_3 - new-instance v3, Ljava/lang/StringBuilder; + new-instance v0, Ljava/lang/StringBuilder; - invoke-direct {v3}, Ljava/lang/StringBuilder;->()V + invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v0, "\n\n # " + const-string v3, "\n\n # " - invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; move-result-object v0 @@ -3465,11 +3513,13 @@ .line 1123 iget-object v3, p0, Landroid/support/constraint/solver/LinearSystem;->mRows:[Landroid/support/constraint/solver/ArrayRow; - aget-object v3, v3, v1 + aget-object v4, v3, v1 - if-eqz v3, :cond_0 + if-eqz v4, :cond_0 .line 1124 + aget-object v3, v3, v1 + invoke-virtual {v3}, Landroid/support/constraint/solver/ArrayRow;->sizeInBytes()I move-result v3 @@ -3495,11 +3545,13 @@ .line 1129 iget-object v4, p0, Landroid/support/constraint/solver/LinearSystem;->mRows:[Landroid/support/constraint/solver/ArrayRow; - aget-object v4, v4, v1 + aget-object v5, v4, v1 - if-eqz v4, :cond_2 + if-eqz v5, :cond_2 .line 1130 + aget-object v4, v4, v1 + invoke-virtual {v4}, Landroid/support/constraint/solver/ArrayRow;->sizeInBytes()I move-result v4 @@ -3745,7 +3797,7 @@ .end method .method public getMemoryUsed()I - .locals 3 + .locals 4 const/4 v0, 0x0 @@ -3760,11 +3812,13 @@ .line 1104 iget-object v2, p0, Landroid/support/constraint/solver/LinearSystem;->mRows:[Landroid/support/constraint/solver/ArrayRow; - aget-object v2, v2, v0 + aget-object v3, v2, v0 - if-eqz v2, :cond_0 + if-eqz v3, :cond_0 .line 1105 + aget-object v2, v2, v0 + invoke-virtual {v2}, Landroid/support/constraint/solver/ArrayRow;->sizeInBytes()I move-result v2 @@ -4300,11 +4354,13 @@ .line 202 iget-object v2, p0, Landroid/support/constraint/solver/LinearSystem;->mRows:[Landroid/support/constraint/solver/ArrayRow; - aget-object v2, v2, v1 + aget-object v3, v2, v1 - if-eqz v2, :cond_3 + if-eqz v3, :cond_3 .line 203 + aget-object v2, v2, v1 + iput-boolean v0, v2, Landroid/support/constraint/solver/ArrayRow;->used:Z :cond_3 diff --git a/smali/android/support/constraint/solver/PriorityGoalRow.smali b/smali/android/support/constraint/solver/PriorityGoalRow.smali index 564ed241..d1c23b6f 100644 --- a/smali/android/support/constraint/solver/PriorityGoalRow.smali +++ b/smali/android/support/constraint/solver/PriorityGoalRow.smali @@ -45,14 +45,16 @@ .line 29 iput v0, p0, Landroid/support/constraint/solver/PriorityGoalRow;->TABLE_SIZE:I + .line 30 + iget v0, p0, Landroid/support/constraint/solver/PriorityGoalRow;->TABLE_SIZE:I + new-array v1, v0, [Landroid/support/constraint/solver/SolverVariable; - .line 30 iput-object v1, p0, Landroid/support/constraint/solver/PriorityGoalRow;->arrayGoals:[Landroid/support/constraint/solver/SolverVariable; + .line 31 new-array v0, v0, [Landroid/support/constraint/solver/SolverVariable; - .line 31 iput-object v0, p0, Landroid/support/constraint/solver/PriorityGoalRow;->sortArray:[Landroid/support/constraint/solver/SolverVariable; const/4 v0, 0x0 @@ -112,6 +114,8 @@ iput-object v0, p0, Landroid/support/constraint/solver/PriorityGoalRow;->arrayGoals:[Landroid/support/constraint/solver/SolverVariable; .line 205 + iget-object v0, p0, Landroid/support/constraint/solver/PriorityGoalRow;->arrayGoals:[Landroid/support/constraint/solver/SolverVariable; + array-length v2, v0 mul-int/lit8 v2, v2, 0x2 @@ -137,11 +141,13 @@ .line 208 iput v2, p0, Landroid/support/constraint/solver/PriorityGoalRow;->numGoals:I + .line 210 + iget v2, p0, Landroid/support/constraint/solver/PriorityGoalRow;->numGoals:I + if-le v2, v1, :cond_2 sub-int/2addr v2, v1 - .line 210 aget-object v0, v0, v2 iget v0, v0, Landroid/support/constraint/solver/SolverVariable;->id:I diff --git a/smali/android/support/constraint/solver/SolverVariable$1.smali b/smali/android/support/constraint/solver/SolverVariable$1.smali index 1f51ce6d..52c0d3f2 100644 --- a/smali/android/support/constraint/solver/SolverVariable$1.smali +++ b/smali/android/support/constraint/solver/SolverVariable$1.smali @@ -34,6 +34,8 @@ sput-object v0, Landroid/support/constraint/solver/SolverVariable$1;->$SwitchMap$android$support$constraint$solver$SolverVariable$Type:[I :try_start_0 + sget-object v0, Landroid/support/constraint/solver/SolverVariable$1;->$SwitchMap$android$support$constraint$solver$SolverVariable$Type:[I + sget-object v1, Landroid/support/constraint/solver/SolverVariable$Type;->UNRESTRICTED:Landroid/support/constraint/solver/SolverVariable$Type; invoke-virtual {v1}, Landroid/support/constraint/solver/SolverVariable$Type;->ordinal()I diff --git a/smali/android/support/constraint/solver/SolverVariable$Type.smali b/smali/android/support/constraint/solver/SolverVariable$Type.smali index c35d2e55..15887f38 100644 --- a/smali/android/support/constraint/solver/SolverVariable$Type.smali +++ b/smali/android/support/constraint/solver/SolverVariable$Type.smali @@ -38,79 +38,89 @@ # direct methods .method static constructor ()V - .locals 11 + .locals 7 .line 79 new-instance v0, Landroid/support/constraint/solver/SolverVariable$Type; - const-string v1, "UNRESTRICTED" + const/4 v1, 0x0 - const/4 v2, 0x0 + const-string v2, "UNRESTRICTED" - invoke-direct {v0, v1, v2}, Landroid/support/constraint/solver/SolverVariable$Type;->(Ljava/lang/String;I)V + invoke-direct {v0, v2, v1}, Landroid/support/constraint/solver/SolverVariable$Type;->(Ljava/lang/String;I)V sput-object v0, Landroid/support/constraint/solver/SolverVariable$Type;->UNRESTRICTED:Landroid/support/constraint/solver/SolverVariable$Type; .line 83 - new-instance v1, Landroid/support/constraint/solver/SolverVariable$Type; + new-instance v0, Landroid/support/constraint/solver/SolverVariable$Type; - const-string v3, "CONSTANT" + const/4 v2, 0x1 - const/4 v4, 0x1 + const-string v3, "CONSTANT" - invoke-direct {v1, v3, v4}, Landroid/support/constraint/solver/SolverVariable$Type;->(Ljava/lang/String;I)V + invoke-direct {v0, v3, v2}, Landroid/support/constraint/solver/SolverVariable$Type;->(Ljava/lang/String;I)V - sput-object v1, Landroid/support/constraint/solver/SolverVariable$Type;->CONSTANT:Landroid/support/constraint/solver/SolverVariable$Type; + sput-object v0, Landroid/support/constraint/solver/SolverVariable$Type;->CONSTANT:Landroid/support/constraint/solver/SolverVariable$Type; .line 87 - new-instance v3, Landroid/support/constraint/solver/SolverVariable$Type; + new-instance v0, Landroid/support/constraint/solver/SolverVariable$Type; - const-string v5, "SLACK" + const/4 v3, 0x2 - const/4 v6, 0x2 + const-string v4, "SLACK" - invoke-direct {v3, v5, v6}, Landroid/support/constraint/solver/SolverVariable$Type;->(Ljava/lang/String;I)V + invoke-direct {v0, v4, v3}, Landroid/support/constraint/solver/SolverVariable$Type;->(Ljava/lang/String;I)V - sput-object v3, Landroid/support/constraint/solver/SolverVariable$Type;->SLACK:Landroid/support/constraint/solver/SolverVariable$Type; + sput-object v0, Landroid/support/constraint/solver/SolverVariable$Type;->SLACK:Landroid/support/constraint/solver/SolverVariable$Type; .line 91 - new-instance v5, Landroid/support/constraint/solver/SolverVariable$Type; + new-instance v0, Landroid/support/constraint/solver/SolverVariable$Type; - const-string v7, "ERROR" + const/4 v4, 0x3 - const/4 v8, 0x3 + const-string v5, "ERROR" - invoke-direct {v5, v7, v8}, Landroid/support/constraint/solver/SolverVariable$Type;->(Ljava/lang/String;I)V + invoke-direct {v0, v5, v4}, Landroid/support/constraint/solver/SolverVariable$Type;->(Ljava/lang/String;I)V - sput-object v5, Landroid/support/constraint/solver/SolverVariable$Type;->ERROR:Landroid/support/constraint/solver/SolverVariable$Type; + sput-object v0, Landroid/support/constraint/solver/SolverVariable$Type;->ERROR:Landroid/support/constraint/solver/SolverVariable$Type; .line 95 - new-instance v7, Landroid/support/constraint/solver/SolverVariable$Type; + new-instance v0, Landroid/support/constraint/solver/SolverVariable$Type; - const-string v9, "UNKNOWN" + const/4 v5, 0x4 - const/4 v10, 0x4 + const-string v6, "UNKNOWN" - invoke-direct {v7, v9, v10}, Landroid/support/constraint/solver/SolverVariable$Type;->(Ljava/lang/String;I)V + invoke-direct {v0, v6, v5}, Landroid/support/constraint/solver/SolverVariable$Type;->(Ljava/lang/String;I)V - sput-object v7, Landroid/support/constraint/solver/SolverVariable$Type;->UNKNOWN:Landroid/support/constraint/solver/SolverVariable$Type; + sput-object v0, Landroid/support/constraint/solver/SolverVariable$Type;->UNKNOWN:Landroid/support/constraint/solver/SolverVariable$Type; - const/4 v9, 0x5 + const/4 v0, 0x5 - new-array v9, v9, [Landroid/support/constraint/solver/SolverVariable$Type; + .line 75 + new-array v0, v0, [Landroid/support/constraint/solver/SolverVariable$Type; - aput-object v0, v9, v2 + sget-object v6, Landroid/support/constraint/solver/SolverVariable$Type;->UNRESTRICTED:Landroid/support/constraint/solver/SolverVariable$Type; - aput-object v1, v9, v4 + aput-object v6, v0, v1 - aput-object v3, v9, v6 + sget-object v1, Landroid/support/constraint/solver/SolverVariable$Type;->CONSTANT:Landroid/support/constraint/solver/SolverVariable$Type; - aput-object v5, v9, v8 + aput-object v1, v0, v2 - aput-object v7, v9, v10 + sget-object v1, Landroid/support/constraint/solver/SolverVariable$Type;->SLACK:Landroid/support/constraint/solver/SolverVariable$Type; - .line 75 - sput-object v9, Landroid/support/constraint/solver/SolverVariable$Type;->$VALUES:[Landroid/support/constraint/solver/SolverVariable$Type; + aput-object v1, v0, v3 + + sget-object v1, Landroid/support/constraint/solver/SolverVariable$Type;->ERROR:Landroid/support/constraint/solver/SolverVariable$Type; + + aput-object v1, v0, v4 + + sget-object v1, Landroid/support/constraint/solver/SolverVariable$Type;->UNKNOWN:Landroid/support/constraint/solver/SolverVariable$Type; + + aput-object v1, v0, v5 + + sput-object v0, Landroid/support/constraint/solver/SolverVariable$Type;->$VALUES:[Landroid/support/constraint/solver/SolverVariable$Type; return-void .end method diff --git a/smali/android/support/constraint/solver/SolverVariable.smali b/smali/android/support/constraint/solver/SolverVariable.smali index 49c404f6..35bff367 100644 --- a/smali/android/support/constraint/solver/SolverVariable.smali +++ b/smali/android/support/constraint/solver/SolverVariable.smali @@ -122,21 +122,21 @@ const/16 v1, 0x9 + .line 60 new-array v2, v1, [F - .line 60 iput-object v2, p0, Landroid/support/constraint/solver/SolverVariable;->strengthVector:[F + .line 61 new-array v1, v1, [F - .line 61 iput-object v1, p0, Landroid/support/constraint/solver/SolverVariable;->goalStrengthVector:[F const/16 v1, 0x10 + .line 65 new-array v1, v1, [Landroid/support/constraint/solver/ArrayRow; - .line 65 iput-object v1, p0, Landroid/support/constraint/solver/SolverVariable;->mClientEquations:[Landroid/support/constraint/solver/ArrayRow; .line 66 @@ -191,21 +191,21 @@ const/16 v2, 0x9 + .line 60 new-array v3, v2, [F - .line 60 iput-object v3, p0, Landroid/support/constraint/solver/SolverVariable;->strengthVector:[F + .line 61 new-array v2, v2, [F - .line 61 iput-object v2, p0, Landroid/support/constraint/solver/SolverVariable;->goalStrengthVector:[F const/16 v2, 0x10 + .line 65 new-array v2, v2, [Landroid/support/constraint/solver/ArrayRow; - .line 65 iput-object v2, p0, Landroid/support/constraint/solver/SolverVariable;->mClientEquations:[Landroid/support/constraint/solver/ArrayRow; .line 66 @@ -793,7 +793,7 @@ .end method .method strengthsToString()Ljava/lang/String; - .locals 10 + .locals 9 .line 143 new-instance v0, Ljava/lang/StringBuilder; @@ -814,9 +814,11 @@ const/4 v2, 0x0 - const/4 v3, 0x0 + move-object v4, v0 - const/4 v4, 0x0 + const/4 v0, 0x0 + + const/4 v3, 0x0 const/4 v5, 0x1 @@ -826,77 +828,87 @@ array-length v6, v6 - if-ge v3, v6, :cond_4 + if-ge v0, v6, :cond_4 .line 147 new-instance v6, Ljava/lang/StringBuilder; invoke-direct {v6}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v6, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v6, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - iget-object v0, p0, Landroid/support/constraint/solver/SolverVariable;->strengthVector:[F + iget-object v4, p0, Landroid/support/constraint/solver/SolverVariable;->strengthVector:[F - aget v0, v0, v3 + aget v4, v4, v0 - invoke-virtual {v6, v0}, Ljava/lang/StringBuilder;->append(F)Ljava/lang/StringBuilder; + invoke-virtual {v6, v4}, Ljava/lang/StringBuilder;->append(F)Ljava/lang/StringBuilder; invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v0 + move-result-object v4 .line 148 iget-object v6, p0, Landroid/support/constraint/solver/SolverVariable;->strengthVector:[F - aget v7, v6, v3 + aget v7, v6, v0 const/4 v8, 0x0 - cmpl-float v9, v7, v8 + cmpl-float v7, v7, v8 - if-lez v9, :cond_0 + if-lez v7, :cond_0 - const/4 v4, 0x0 + const/4 v3, 0x0 goto :goto_1 + .line 150 :cond_0 - cmpg-float v9, v7, v8 + aget v6, v6, v0 - if-gez v9, :cond_1 + cmpg-float v6, v6, v8 - const/4 v4, 0x1 + if-gez v6, :cond_1 + const/4 v3, 0x1 + + .line 153 :cond_1 :goto_1 - cmpl-float v7, v7, v8 + iget-object v6, p0, Landroid/support/constraint/solver/SolverVariable;->strengthVector:[F - if-eqz v7, :cond_2 + aget v6, v6, v0 + + cmpl-float v6, v6, v8 + + if-eqz v6, :cond_2 const/4 v5, 0x0 .line 156 :cond_2 + iget-object v6, p0, Landroid/support/constraint/solver/SolverVariable;->strengthVector:[F + array-length v6, v6 sub-int/2addr v6, v1 - if-ge v3, v6, :cond_3 + if-ge v0, v6, :cond_3 .line 157 new-instance v6, Ljava/lang/StringBuilder; invoke-direct {v6}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v6, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v6, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v0, ", " + const-string v4, ", " - invoke-virtual {v6, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v6, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v0 + move-result-object v4 goto :goto_2 @@ -906,59 +918,59 @@ invoke-direct {v6}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v6, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v6, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v0, "] " + const-string v4, "] " - invoke-virtual {v6, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v6, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v0 + move-result-object v4 :goto_2 - add-int/lit8 v3, v3, 0x1 + add-int/lit8 v0, v0, 0x1 goto :goto_0 :cond_4 - if-eqz v4, :cond_5 + if-eqz v3, :cond_5 .line 163 - new-instance v1, Ljava/lang/StringBuilder; + new-instance v0, Ljava/lang/StringBuilder; - invoke-direct {v1}, Ljava/lang/StringBuilder;->()V + invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v0, " (-)" + const-string v1, " (-)" - invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v0 + move-result-object v4 :cond_5 if-eqz v5, :cond_6 .line 166 - new-instance v1, Ljava/lang/StringBuilder; + new-instance v0, Ljava/lang/StringBuilder; - invoke-direct {v1}, Ljava/lang/StringBuilder;->()V + invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v0, " (*)" + const-string v1, " (*)" - invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v0 + move-result-object v4 :cond_6 - return-object v0 + return-object v4 .end method .method public toString()Ljava/lang/String; diff --git a/smali/android/support/constraint/solver/SolverVariableValues.smali b/smali/android/support/constraint/solver/SolverVariableValues.smali index ad529979..6bf7ed88 100644 --- a/smali/android/support/constraint/solver/SolverVariableValues.smali +++ b/smali/android/support/constraint/solver/SolverVariableValues.smali @@ -68,34 +68,36 @@ .line 31 iput v1, p0, Landroid/support/constraint/solver/SolverVariableValues;->HASH_SIZE:I + .line 33 + iget v1, p0, Landroid/support/constraint/solver/SolverVariableValues;->SIZE:I + new-array v2, v1, [I - .line 33 iput-object v2, p0, Landroid/support/constraint/solver/SolverVariableValues;->keys:[I + .line 34 new-array v2, v1, [I - .line 34 iput-object v2, p0, Landroid/support/constraint/solver/SolverVariableValues;->nextKeys:[I + .line 36 new-array v2, v1, [I - .line 36 iput-object v2, p0, Landroid/support/constraint/solver/SolverVariableValues;->variables:[I + .line 37 new-array v2, v1, [F - .line 37 iput-object v2, p0, Landroid/support/constraint/solver/SolverVariableValues;->values:[F + .line 38 new-array v2, v1, [I - .line 38 iput-object v2, p0, Landroid/support/constraint/solver/SolverVariableValues;->previous:[I + .line 39 new-array v1, v1, [I - .line 39 iput-object v1, p0, Landroid/support/constraint/solver/SolverVariableValues;->next:[I const/4 v1, 0x0 @@ -151,7 +153,8 @@ if-eq v0, v2, :cond_1 - move v1, v0 + .line 225 + aget v1, p1, v1 goto :goto_0 @@ -218,7 +221,7 @@ .end method .method private displayHash()V - .locals 7 + .locals 8 const/4 v0, 0x0 @@ -269,53 +272,58 @@ aget v4, v4, v1 - const/4 v5, 0x0 + move v5, v4 + + move-object v4, v2 + + const/4 v2, 0x0 :goto_1 - if-nez v5, :cond_1 + if-nez v2, :cond_1 .line 245 new-instance v6, Ljava/lang/StringBuilder; invoke-direct {v6}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v6, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v6, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v2, " " + const-string v4, " " - invoke-virtual {v6, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v6, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - iget-object v2, p0, Landroid/support/constraint/solver/SolverVariableValues;->variables:[I + iget-object v4, p0, Landroid/support/constraint/solver/SolverVariableValues;->variables:[I - aget v2, v2, v4 + aget v4, v4, v5 - invoke-virtual {v6, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; + invoke-virtual {v6, v4}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v2 + move-result-object v4 .line 246 iget-object v6, p0, Landroid/support/constraint/solver/SolverVariableValues;->nextKeys:[I - aget v6, v6, v4 + aget v7, v6, v5 - if-eq v6, v3, :cond_0 + if-eq v7, v3, :cond_0 - move v4, v6 + .line 247 + aget v5, v6, v5 goto :goto_1 :cond_0 - const/4 v5, 0x1 + const/4 v2, 0x1 goto :goto_1 .line 252 :cond_1 - sget-object v3, Ljava/lang/System;->out:Ljava/io/PrintStream; + sget-object v2, Ljava/lang/System;->out:Ljava/io/PrintStream; - invoke-virtual {v3, v2}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V + invoke-virtual {v2, v4}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V :cond_2 add-int/lit8 v1, v1, 0x1 @@ -504,13 +512,15 @@ :goto_0 iget-object p1, p0, Landroid/support/constraint/solver/SolverVariableValues;->next:[I - aget p1, p1, v0 + aget v1, p1, v0 - if-eq p1, p3, :cond_2 + if-eq v1, p3, :cond_2 .line 324 iget-object p3, p0, Landroid/support/constraint/solver/SolverVariableValues;->previous:[I + aget p1, p1, v0 + aput v0, p3, p1 .line 326 @@ -575,17 +585,25 @@ if-eq v3, v2, :cond_2 - iget-object v4, p0, Landroid/support/constraint/solver/SolverVariableValues;->variables:[I + iget-object v3, p0, Landroid/support/constraint/solver/SolverVariableValues;->variables:[I - aget v4, v4, v3 + aget v4, v0, v1 + + aget v3, v3, v4 - if-eq v4, p1, :cond_2 + if-eq v3, p1, :cond_2 - move v1, v3 + .line 275 + aget v1, v0, v1 goto :goto_0 + .line 277 :cond_2 + iget-object v0, p0, Landroid/support/constraint/solver/SolverVariableValues;->nextKeys:[I + + aget v3, v0, v1 + if-eq v3, v2, :cond_3 .line 278 @@ -654,15 +672,19 @@ aput v2, v1, v0 .line 418 - sget p2, Landroid/support/constraint/solver/SolverVariableValues;->epsilon:F + aget p2, v1, v0 - neg-float v3, p2 + sget v2, Landroid/support/constraint/solver/SolverVariableValues;->epsilon:F - cmpl-float v3, v2, v3 + neg-float v3, v2 - if-lez v3, :cond_2 + cmpl-float p2, p2, v3 - cmpg-float p2, v2, p2 + if-lez p2, :cond_2 + + aget p2, v1, v0 + + cmpg-float p2, p2, v2 if-gez p2, :cond_2 @@ -1044,7 +1066,7 @@ .end method .method public indexOf(Landroid/support/constraint/solver/SolverVariable;)I - .locals 3 + .locals 5 .line 99 iget v0, p0, Landroid/support/constraint/solver/SolverVariableValues;->mCount:I @@ -1090,32 +1112,47 @@ :goto_0 iget-object v2, p0, Landroid/support/constraint/solver/SolverVariableValues;->nextKeys:[I - aget v0, v2, v0 + aget v3, v2, v0 - if-eq v0, v1, :cond_3 + if-eq v3, v1, :cond_3 - iget-object v2, p0, Landroid/support/constraint/solver/SolverVariableValues;->variables:[I + iget-object v3, p0, Landroid/support/constraint/solver/SolverVariableValues;->variables:[I - aget v2, v2, v0 + aget v4, v2, v0 + + aget v3, v3, v4 - if-eq v2, p1, :cond_3 + if-eq v3, p1, :cond_3 + + .line 112 + aget v0, v2, v0 goto :goto_0 + .line 114 :cond_3 - if-ne v0, v1, :cond_4 + iget-object v2, p0, Landroid/support/constraint/solver/SolverVariableValues;->nextKeys:[I + + aget v3, v2, v0 + + if-ne v3, v1, :cond_4 return v1 .line 117 :cond_4 - iget-object v2, p0, Landroid/support/constraint/solver/SolverVariableValues;->variables:[I + iget-object v3, p0, Landroid/support/constraint/solver/SolverVariableValues;->variables:[I - aget v2, v2, v0 + aget v4, v2, v0 - if-ne v2, p1, :cond_5 + aget v3, v3, v4 - return v0 + if-ne v3, p1, :cond_5 + + .line 118 + aget p1, v2, v0 + + return p1 :cond_5 :goto_1 @@ -1305,7 +1342,7 @@ .end method .method public remove(Landroid/support/constraint/solver/SolverVariable;Z)F - .locals 7 + .locals 6 .line 381 invoke-virtual {p0, p1}, Landroid/support/constraint/solver/SolverVariableValues;->indexOf(Landroid/support/constraint/solver/SolverVariable;)I @@ -1355,24 +1392,30 @@ if-eq v4, v1, :cond_2 .line 392 - iget-object v5, p0, Landroid/support/constraint/solver/SolverVariableValues;->next:[I + iget-object v4, p0, Landroid/support/constraint/solver/SolverVariableValues;->next:[I - aget v6, v5, v0 + aget v3, v3, v0 - aput v6, v5, v4 + aget v5, v4, v0 + + aput v5, v4, v3 .line 394 :cond_2 - iget-object v4, p0, Landroid/support/constraint/solver/SolverVariableValues;->next:[I + iget-object v3, p0, Landroid/support/constraint/solver/SolverVariableValues;->next:[I - aget v4, v4, v0 + aget v4, v3, v0 if-eq v4, v1, :cond_3 .line 395 - aget v0, v3, v0 + iget-object v1, p0, Landroid/support/constraint/solver/SolverVariableValues;->previous:[I + + aget v3, v3, v0 + + aget v0, v1, v0 - aput v0, v3, v4 + aput v0, v1, v3 .line 397 :cond_3 diff --git a/smali/android/support/constraint/solver/state/ConstraintReference$1.smali b/smali/android/support/constraint/solver/state/ConstraintReference$1.smali index 904a3418..213df8db 100644 --- a/smali/android/support/constraint/solver/state/ConstraintReference$1.smali +++ b/smali/android/support/constraint/solver/state/ConstraintReference$1.smali @@ -34,6 +34,8 @@ sput-object v0, Landroid/support/constraint/solver/state/ConstraintReference$1;->$SwitchMap$android$support$constraint$solver$state$State$Constraint:[I :try_start_0 + sget-object v0, Landroid/support/constraint/solver/state/ConstraintReference$1;->$SwitchMap$android$support$constraint$solver$state$State$Constraint:[I + sget-object v1, Landroid/support/constraint/solver/state/State$Constraint;->LEFT_TO_LEFT:Landroid/support/constraint/solver/state/State$Constraint; invoke-virtual {v1}, Landroid/support/constraint/solver/state/State$Constraint;->ordinal()I diff --git a/smali/android/support/constraint/solver/state/ConstraintReference.smali b/smali/android/support/constraint/solver/state/ConstraintReference.smali index 609cf0c1..5c8b2eaa 100644 --- a/smali/android/support/constraint/solver/state/ConstraintReference.smali +++ b/smali/android/support/constraint/solver/state/ConstraintReference.smali @@ -1502,6 +1502,8 @@ iput-object v0, p0, Landroid/support/constraint/solver/state/ConstraintReference;->mConstraintWidget:Landroid/support/constraint/solver/widgets/ConstraintWidget; .line 110 + iget-object v0, p0, Landroid/support/constraint/solver/state/ConstraintReference;->mConstraintWidget:Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object v1, p0, Landroid/support/constraint/solver/state/ConstraintReference;->mView:Ljava/lang/Object; invoke-virtual {v0, v1}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->setCompanionWidget(Ljava/lang/Object;)V @@ -1922,6 +1924,8 @@ iput-object p1, p0, Landroid/support/constraint/solver/state/ConstraintReference;->mConstraintWidget:Landroid/support/constraint/solver/widgets/ConstraintWidget; .line 103 + iget-object p1, p0, Landroid/support/constraint/solver/state/ConstraintReference;->mConstraintWidget:Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object v0, p0, Landroid/support/constraint/solver/state/ConstraintReference;->mView:Ljava/lang/Object; invoke-virtual {p1, v0}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->setCompanionWidget(Ljava/lang/Object;)V @@ -1972,12 +1976,14 @@ iput-object p1, p0, Landroid/support/constraint/solver/state/ConstraintReference;->mView:Ljava/lang/Object; .line 89 - iget-object v0, p0, Landroid/support/constraint/solver/state/ConstraintReference;->mConstraintWidget:Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object p1, p0, Landroid/support/constraint/solver/state/ConstraintReference;->mConstraintWidget:Landroid/support/constraint/solver/widgets/ConstraintWidget; - if-eqz v0, :cond_0 + if-eqz p1, :cond_0 .line 90 - invoke-virtual {v0, p1}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->setCompanionWidget(Ljava/lang/Object;)V + iget-object v0, p0, Landroid/support/constraint/solver/state/ConstraintReference;->mView:Ljava/lang/Object; + + invoke-virtual {p1, v0}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->setCompanionWidget(Ljava/lang/Object;)V :cond_0 return-void diff --git a/smali/android/support/constraint/solver/state/Dimension$Type.smali b/smali/android/support/constraint/solver/state/Dimension$Type.smali index 6a7a1c35..594f6902 100644 --- a/smali/android/support/constraint/solver/state/Dimension$Type.smali +++ b/smali/android/support/constraint/solver/state/Dimension$Type.smali @@ -36,66 +36,74 @@ # direct methods .method static constructor ()V - .locals 9 + .locals 6 .line 45 new-instance v0, Landroid/support/constraint/solver/state/Dimension$Type; - const-string v1, "FIXED" + const/4 v1, 0x0 - const/4 v2, 0x0 + const-string v2, "FIXED" - invoke-direct {v0, v1, v2}, Landroid/support/constraint/solver/state/Dimension$Type;->(Ljava/lang/String;I)V + invoke-direct {v0, v2, v1}, Landroid/support/constraint/solver/state/Dimension$Type;->(Ljava/lang/String;I)V sput-object v0, Landroid/support/constraint/solver/state/Dimension$Type;->FIXED:Landroid/support/constraint/solver/state/Dimension$Type; .line 46 - new-instance v1, Landroid/support/constraint/solver/state/Dimension$Type; + new-instance v0, Landroid/support/constraint/solver/state/Dimension$Type; - const-string v3, "WRAP" + const/4 v2, 0x1 - const/4 v4, 0x1 + const-string v3, "WRAP" - invoke-direct {v1, v3, v4}, Landroid/support/constraint/solver/state/Dimension$Type;->(Ljava/lang/String;I)V + invoke-direct {v0, v3, v2}, Landroid/support/constraint/solver/state/Dimension$Type;->(Ljava/lang/String;I)V - sput-object v1, Landroid/support/constraint/solver/state/Dimension$Type;->WRAP:Landroid/support/constraint/solver/state/Dimension$Type; + sput-object v0, Landroid/support/constraint/solver/state/Dimension$Type;->WRAP:Landroid/support/constraint/solver/state/Dimension$Type; .line 47 - new-instance v3, Landroid/support/constraint/solver/state/Dimension$Type; + new-instance v0, Landroid/support/constraint/solver/state/Dimension$Type; - const-string v5, "MATCH_PARENT" + const/4 v3, 0x2 - const/4 v6, 0x2 + const-string v4, "MATCH_PARENT" - invoke-direct {v3, v5, v6}, Landroid/support/constraint/solver/state/Dimension$Type;->(Ljava/lang/String;I)V + invoke-direct {v0, v4, v3}, Landroid/support/constraint/solver/state/Dimension$Type;->(Ljava/lang/String;I)V - sput-object v3, Landroid/support/constraint/solver/state/Dimension$Type;->MATCH_PARENT:Landroid/support/constraint/solver/state/Dimension$Type; + sput-object v0, Landroid/support/constraint/solver/state/Dimension$Type;->MATCH_PARENT:Landroid/support/constraint/solver/state/Dimension$Type; .line 48 - new-instance v5, Landroid/support/constraint/solver/state/Dimension$Type; + new-instance v0, Landroid/support/constraint/solver/state/Dimension$Type; - const-string v7, "MATCH_CONSTRAINT" + const/4 v4, 0x3 - const/4 v8, 0x3 + const-string v5, "MATCH_CONSTRAINT" - invoke-direct {v5, v7, v8}, Landroid/support/constraint/solver/state/Dimension$Type;->(Ljava/lang/String;I)V + invoke-direct {v0, v5, v4}, Landroid/support/constraint/solver/state/Dimension$Type;->(Ljava/lang/String;I)V - sput-object v5, Landroid/support/constraint/solver/state/Dimension$Type;->MATCH_CONSTRAINT:Landroid/support/constraint/solver/state/Dimension$Type; + sput-object v0, Landroid/support/constraint/solver/state/Dimension$Type;->MATCH_CONSTRAINT:Landroid/support/constraint/solver/state/Dimension$Type; - const/4 v7, 0x4 + const/4 v0, 0x4 - new-array v7, v7, [Landroid/support/constraint/solver/state/Dimension$Type; + .line 44 + new-array v0, v0, [Landroid/support/constraint/solver/state/Dimension$Type; - aput-object v0, v7, v2 + sget-object v5, Landroid/support/constraint/solver/state/Dimension$Type;->FIXED:Landroid/support/constraint/solver/state/Dimension$Type; - aput-object v1, v7, v4 + aput-object v5, v0, v1 - aput-object v3, v7, v6 + sget-object v1, Landroid/support/constraint/solver/state/Dimension$Type;->WRAP:Landroid/support/constraint/solver/state/Dimension$Type; - aput-object v5, v7, v8 + aput-object v1, v0, v2 - .line 44 - sput-object v7, Landroid/support/constraint/solver/state/Dimension$Type;->$VALUES:[Landroid/support/constraint/solver/state/Dimension$Type; + sget-object v1, Landroid/support/constraint/solver/state/Dimension$Type;->MATCH_PARENT:Landroid/support/constraint/solver/state/Dimension$Type; + + aput-object v1, v0, v3 + + sget-object v1, Landroid/support/constraint/solver/state/Dimension$Type;->MATCH_CONSTRAINT:Landroid/support/constraint/solver/state/Dimension$Type; + + aput-object v1, v0, v4 + + sput-object v0, Landroid/support/constraint/solver/state/Dimension$Type;->$VALUES:[Landroid/support/constraint/solver/state/Dimension$Type; return-void .end method diff --git a/smali/android/support/constraint/solver/state/Dimension.smali b/smali/android/support/constraint/solver/state/Dimension.smali index 0657ae22..f01bde18 100644 --- a/smali/android/support/constraint/solver/state/Dimension.smali +++ b/smali/android/support/constraint/solver/state/Dimension.smali @@ -158,6 +158,11 @@ .line 40 iput v1, p0, Landroid/support/constraint/solver/state/Dimension;->mRatio:F + .line 41 + sget-object v1, Landroid/support/constraint/solver/state/Dimension;->WRAP_DIMENSION:Ljava/lang/Object; + + iput-object v1, p0, Landroid/support/constraint/solver/state/Dimension;->mInitialValue:Ljava/lang/Object; + .line 42 iput-boolean v0, p0, Landroid/support/constraint/solver/state/Dimension;->mIsSuggested:Z diff --git a/smali/android/support/constraint/solver/state/State$1.smali b/smali/android/support/constraint/solver/state/State$1.smali index 9e1c7aec..b5e206a0 100644 --- a/smali/android/support/constraint/solver/state/State$1.smali +++ b/smali/android/support/constraint/solver/state/State$1.smali @@ -34,6 +34,8 @@ sput-object v0, Landroid/support/constraint/solver/state/State$1;->$SwitchMap$android$support$constraint$solver$state$State$Helper:[I :try_start_0 + sget-object v0, Landroid/support/constraint/solver/state/State$1;->$SwitchMap$android$support$constraint$solver$state$State$Helper:[I + sget-object v1, Landroid/support/constraint/solver/state/State$Helper;->HORIZONTAL_CHAIN:Landroid/support/constraint/solver/state/State$Helper; invoke-virtual {v1}, Landroid/support/constraint/solver/state/State$Helper;->ordinal()I diff --git a/smali/android/support/constraint/solver/state/State$Chain.smali b/smali/android/support/constraint/solver/state/State$Chain.smali index 70cedcb1..f7c72349 100644 --- a/smali/android/support/constraint/solver/state/State$Chain.smali +++ b/smali/android/support/constraint/solver/state/State$Chain.smali @@ -34,53 +34,59 @@ # direct methods .method static constructor ()V - .locals 7 + .locals 5 .line 90 new-instance v0, Landroid/support/constraint/solver/state/State$Chain; - const-string v1, "SPREAD" + const/4 v1, 0x0 - const/4 v2, 0x0 + const-string v2, "SPREAD" - invoke-direct {v0, v1, v2}, Landroid/support/constraint/solver/state/State$Chain;->(Ljava/lang/String;I)V + invoke-direct {v0, v2, v1}, Landroid/support/constraint/solver/state/State$Chain;->(Ljava/lang/String;I)V sput-object v0, Landroid/support/constraint/solver/state/State$Chain;->SPREAD:Landroid/support/constraint/solver/state/State$Chain; .line 91 - new-instance v1, Landroid/support/constraint/solver/state/State$Chain; + new-instance v0, Landroid/support/constraint/solver/state/State$Chain; - const-string v3, "SPREAD_INSIDE" + const/4 v2, 0x1 - const/4 v4, 0x1 + const-string v3, "SPREAD_INSIDE" - invoke-direct {v1, v3, v4}, Landroid/support/constraint/solver/state/State$Chain;->(Ljava/lang/String;I)V + invoke-direct {v0, v3, v2}, Landroid/support/constraint/solver/state/State$Chain;->(Ljava/lang/String;I)V - sput-object v1, Landroid/support/constraint/solver/state/State$Chain;->SPREAD_INSIDE:Landroid/support/constraint/solver/state/State$Chain; + sput-object v0, Landroid/support/constraint/solver/state/State$Chain;->SPREAD_INSIDE:Landroid/support/constraint/solver/state/State$Chain; .line 92 - new-instance v3, Landroid/support/constraint/solver/state/State$Chain; + new-instance v0, Landroid/support/constraint/solver/state/State$Chain; - const-string v5, "PACKED" + const/4 v3, 0x2 - const/4 v6, 0x2 + const-string v4, "PACKED" - invoke-direct {v3, v5, v6}, Landroid/support/constraint/solver/state/State$Chain;->(Ljava/lang/String;I)V + invoke-direct {v0, v4, v3}, Landroid/support/constraint/solver/state/State$Chain;->(Ljava/lang/String;I)V - sput-object v3, Landroid/support/constraint/solver/state/State$Chain;->PACKED:Landroid/support/constraint/solver/state/State$Chain; + sput-object v0, Landroid/support/constraint/solver/state/State$Chain;->PACKED:Landroid/support/constraint/solver/state/State$Chain; - const/4 v5, 0x3 + const/4 v0, 0x3 - new-array v5, v5, [Landroid/support/constraint/solver/state/State$Chain; + .line 89 + new-array v0, v0, [Landroid/support/constraint/solver/state/State$Chain; - aput-object v0, v5, v2 + sget-object v4, Landroid/support/constraint/solver/state/State$Chain;->SPREAD:Landroid/support/constraint/solver/state/State$Chain; - aput-object v1, v5, v4 + aput-object v4, v0, v1 - aput-object v3, v5, v6 + sget-object v1, Landroid/support/constraint/solver/state/State$Chain;->SPREAD_INSIDE:Landroid/support/constraint/solver/state/State$Chain; - .line 89 - sput-object v5, Landroid/support/constraint/solver/state/State$Chain;->$VALUES:[Landroid/support/constraint/solver/state/State$Chain; + aput-object v1, v0, v2 + + sget-object v1, Landroid/support/constraint/solver/state/State$Chain;->PACKED:Landroid/support/constraint/solver/state/State$Chain; + + aput-object v1, v0, v3 + + sput-object v0, Landroid/support/constraint/solver/state/State$Chain;->$VALUES:[Landroid/support/constraint/solver/state/State$Chain; return-void .end method diff --git a/smali/android/support/constraint/solver/state/State$Constraint.smali b/smali/android/support/constraint/solver/state/State$Constraint.smali index bf7e6530..977b40fe 100644 --- a/smali/android/support/constraint/solver/state/State$Constraint.smali +++ b/smali/android/support/constraint/solver/state/State$Constraint.smali @@ -58,239 +58,241 @@ # direct methods .method static constructor ()V - .locals 18 + .locals 16 .line 53 new-instance v0, Landroid/support/constraint/solver/state/State$Constraint; - const-string v1, "LEFT_TO_LEFT" + const/4 v1, 0x0 - const/4 v2, 0x0 + const-string v2, "LEFT_TO_LEFT" - invoke-direct {v0, v1, v2}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V + invoke-direct {v0, v2, v1}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V sput-object v0, Landroid/support/constraint/solver/state/State$Constraint;->LEFT_TO_LEFT:Landroid/support/constraint/solver/state/State$Constraint; .line 54 - new-instance v1, Landroid/support/constraint/solver/state/State$Constraint; + new-instance v0, Landroid/support/constraint/solver/state/State$Constraint; - const-string v3, "LEFT_TO_RIGHT" + const/4 v2, 0x1 - const/4 v4, 0x1 + const-string v3, "LEFT_TO_RIGHT" - invoke-direct {v1, v3, v4}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V + invoke-direct {v0, v3, v2}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V - sput-object v1, Landroid/support/constraint/solver/state/State$Constraint;->LEFT_TO_RIGHT:Landroid/support/constraint/solver/state/State$Constraint; + sput-object v0, Landroid/support/constraint/solver/state/State$Constraint;->LEFT_TO_RIGHT:Landroid/support/constraint/solver/state/State$Constraint; .line 55 - new-instance v3, Landroid/support/constraint/solver/state/State$Constraint; + new-instance v0, Landroid/support/constraint/solver/state/State$Constraint; - const-string v5, "RIGHT_TO_LEFT" + const/4 v3, 0x2 - const/4 v6, 0x2 + const-string v4, "RIGHT_TO_LEFT" - invoke-direct {v3, v5, v6}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V + invoke-direct {v0, v4, v3}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V - sput-object v3, Landroid/support/constraint/solver/state/State$Constraint;->RIGHT_TO_LEFT:Landroid/support/constraint/solver/state/State$Constraint; + sput-object v0, Landroid/support/constraint/solver/state/State$Constraint;->RIGHT_TO_LEFT:Landroid/support/constraint/solver/state/State$Constraint; .line 56 - new-instance v5, Landroid/support/constraint/solver/state/State$Constraint; + new-instance v0, Landroid/support/constraint/solver/state/State$Constraint; - const-string v7, "RIGHT_TO_RIGHT" + const/4 v4, 0x3 - const/4 v8, 0x3 + const-string v5, "RIGHT_TO_RIGHT" - invoke-direct {v5, v7, v8}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V + invoke-direct {v0, v5, v4}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V - sput-object v5, Landroid/support/constraint/solver/state/State$Constraint;->RIGHT_TO_RIGHT:Landroid/support/constraint/solver/state/State$Constraint; + sput-object v0, Landroid/support/constraint/solver/state/State$Constraint;->RIGHT_TO_RIGHT:Landroid/support/constraint/solver/state/State$Constraint; .line 57 - new-instance v7, Landroid/support/constraint/solver/state/State$Constraint; + new-instance v0, Landroid/support/constraint/solver/state/State$Constraint; - const-string v9, "START_TO_START" + const/4 v5, 0x4 - const/4 v10, 0x4 + const-string v6, "START_TO_START" - invoke-direct {v7, v9, v10}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V + invoke-direct {v0, v6, v5}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V - sput-object v7, Landroid/support/constraint/solver/state/State$Constraint;->START_TO_START:Landroid/support/constraint/solver/state/State$Constraint; + sput-object v0, Landroid/support/constraint/solver/state/State$Constraint;->START_TO_START:Landroid/support/constraint/solver/state/State$Constraint; .line 58 - new-instance v9, Landroid/support/constraint/solver/state/State$Constraint; + new-instance v0, Landroid/support/constraint/solver/state/State$Constraint; - const-string v11, "START_TO_END" + const/4 v6, 0x5 - const/4 v12, 0x5 + const-string v7, "START_TO_END" - invoke-direct {v9, v11, v12}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V + invoke-direct {v0, v7, v6}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V - sput-object v9, Landroid/support/constraint/solver/state/State$Constraint;->START_TO_END:Landroid/support/constraint/solver/state/State$Constraint; + sput-object v0, Landroid/support/constraint/solver/state/State$Constraint;->START_TO_END:Landroid/support/constraint/solver/state/State$Constraint; .line 59 - new-instance v11, Landroid/support/constraint/solver/state/State$Constraint; + new-instance v0, Landroid/support/constraint/solver/state/State$Constraint; - const-string v13, "END_TO_START" + const/4 v7, 0x6 - const/4 v14, 0x6 + const-string v8, "END_TO_START" - invoke-direct {v11, v13, v14}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V + invoke-direct {v0, v8, v7}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V - sput-object v11, Landroid/support/constraint/solver/state/State$Constraint;->END_TO_START:Landroid/support/constraint/solver/state/State$Constraint; + sput-object v0, Landroid/support/constraint/solver/state/State$Constraint;->END_TO_START:Landroid/support/constraint/solver/state/State$Constraint; .line 60 - new-instance v13, Landroid/support/constraint/solver/state/State$Constraint; + new-instance v0, Landroid/support/constraint/solver/state/State$Constraint; - const-string v15, "END_TO_END" + const/4 v8, 0x7 - const/4 v14, 0x7 + const-string v9, "END_TO_END" - invoke-direct {v13, v15, v14}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V + invoke-direct {v0, v9, v8}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V - sput-object v13, Landroid/support/constraint/solver/state/State$Constraint;->END_TO_END:Landroid/support/constraint/solver/state/State$Constraint; + sput-object v0, Landroid/support/constraint/solver/state/State$Constraint;->END_TO_END:Landroid/support/constraint/solver/state/State$Constraint; .line 61 - new-instance v15, Landroid/support/constraint/solver/state/State$Constraint; + new-instance v0, Landroid/support/constraint/solver/state/State$Constraint; - const-string v14, "TOP_TO_TOP" + const/16 v9, 0x8 - const/16 v12, 0x8 + const-string v10, "TOP_TO_TOP" - invoke-direct {v15, v14, v12}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V + invoke-direct {v0, v10, v9}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V - sput-object v15, Landroid/support/constraint/solver/state/State$Constraint;->TOP_TO_TOP:Landroid/support/constraint/solver/state/State$Constraint; + sput-object v0, Landroid/support/constraint/solver/state/State$Constraint;->TOP_TO_TOP:Landroid/support/constraint/solver/state/State$Constraint; .line 62 - new-instance v14, Landroid/support/constraint/solver/state/State$Constraint; - - const-string v12, "TOP_TO_BOTTOM" + new-instance v0, Landroid/support/constraint/solver/state/State$Constraint; const/16 v10, 0x9 - invoke-direct {v14, v12, v10}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V + const-string v11, "TOP_TO_BOTTOM" - sput-object v14, Landroid/support/constraint/solver/state/State$Constraint;->TOP_TO_BOTTOM:Landroid/support/constraint/solver/state/State$Constraint; + invoke-direct {v0, v11, v10}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V + + sput-object v0, Landroid/support/constraint/solver/state/State$Constraint;->TOP_TO_BOTTOM:Landroid/support/constraint/solver/state/State$Constraint; .line 63 - new-instance v12, Landroid/support/constraint/solver/state/State$Constraint; + new-instance v0, Landroid/support/constraint/solver/state/State$Constraint; - const-string v10, "BOTTOM_TO_TOP" + const/16 v11, 0xa - const/16 v8, 0xa + const-string v12, "BOTTOM_TO_TOP" - invoke-direct {v12, v10, v8}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V + invoke-direct {v0, v12, v11}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V - sput-object v12, Landroid/support/constraint/solver/state/State$Constraint;->BOTTOM_TO_TOP:Landroid/support/constraint/solver/state/State$Constraint; + sput-object v0, Landroid/support/constraint/solver/state/State$Constraint;->BOTTOM_TO_TOP:Landroid/support/constraint/solver/state/State$Constraint; .line 64 - new-instance v10, Landroid/support/constraint/solver/state/State$Constraint; + new-instance v0, Landroid/support/constraint/solver/state/State$Constraint; - const-string v8, "BOTTOM_TO_BOTTOM" + const/16 v12, 0xb - const/16 v6, 0xb + const-string v13, "BOTTOM_TO_BOTTOM" - invoke-direct {v10, v8, v6}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V + invoke-direct {v0, v13, v12}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V - sput-object v10, Landroid/support/constraint/solver/state/State$Constraint;->BOTTOM_TO_BOTTOM:Landroid/support/constraint/solver/state/State$Constraint; + sput-object v0, Landroid/support/constraint/solver/state/State$Constraint;->BOTTOM_TO_BOTTOM:Landroid/support/constraint/solver/state/State$Constraint; .line 65 - new-instance v8, Landroid/support/constraint/solver/state/State$Constraint; + new-instance v0, Landroid/support/constraint/solver/state/State$Constraint; - const-string v6, "BASELINE_TO_BASELINE" + const/16 v13, 0xc - const/16 v4, 0xc + const-string v14, "BASELINE_TO_BASELINE" - invoke-direct {v8, v6, v4}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V + invoke-direct {v0, v14, v13}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V - sput-object v8, Landroid/support/constraint/solver/state/State$Constraint;->BASELINE_TO_BASELINE:Landroid/support/constraint/solver/state/State$Constraint; + sput-object v0, Landroid/support/constraint/solver/state/State$Constraint;->BASELINE_TO_BASELINE:Landroid/support/constraint/solver/state/State$Constraint; .line 66 - new-instance v6, Landroid/support/constraint/solver/state/State$Constraint; + new-instance v0, Landroid/support/constraint/solver/state/State$Constraint; - const-string v4, "CENTER_HORIZONTALLY" + const/16 v14, 0xd - const/16 v2, 0xd + const-string v15, "CENTER_HORIZONTALLY" - invoke-direct {v6, v4, v2}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V + invoke-direct {v0, v15, v14}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V - sput-object v6, Landroid/support/constraint/solver/state/State$Constraint;->CENTER_HORIZONTALLY:Landroid/support/constraint/solver/state/State$Constraint; + sput-object v0, Landroid/support/constraint/solver/state/State$Constraint;->CENTER_HORIZONTALLY:Landroid/support/constraint/solver/state/State$Constraint; .line 67 - new-instance v4, Landroid/support/constraint/solver/state/State$Constraint; + new-instance v0, Landroid/support/constraint/solver/state/State$Constraint; - const-string v2, "CENTER_VERTICALLY" + const/16 v15, 0xe - move-object/from16 v17, v6 + const-string v14, "CENTER_VERTICALLY" - const/16 v6, 0xe + invoke-direct {v0, v14, v15}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V - invoke-direct {v4, v2, v6}, Landroid/support/constraint/solver/state/State$Constraint;->(Ljava/lang/String;I)V + sput-object v0, Landroid/support/constraint/solver/state/State$Constraint;->CENTER_VERTICALLY:Landroid/support/constraint/solver/state/State$Constraint; - sput-object v4, Landroid/support/constraint/solver/state/State$Constraint;->CENTER_VERTICALLY:Landroid/support/constraint/solver/state/State$Constraint; + const/16 v0, 0xf - const/16 v2, 0xf + .line 52 + new-array v0, v0, [Landroid/support/constraint/solver/state/State$Constraint; - new-array v2, v2, [Landroid/support/constraint/solver/state/State$Constraint; + sget-object v14, Landroid/support/constraint/solver/state/State$Constraint;->LEFT_TO_LEFT:Landroid/support/constraint/solver/state/State$Constraint; - const/16 v16, 0x0 + aput-object v14, v0, v1 - aput-object v0, v2, v16 + sget-object v1, Landroid/support/constraint/solver/state/State$Constraint;->LEFT_TO_RIGHT:Landroid/support/constraint/solver/state/State$Constraint; - const/4 v0, 0x1 + aput-object v1, v0, v2 - aput-object v1, v2, v0 + sget-object v1, Landroid/support/constraint/solver/state/State$Constraint;->RIGHT_TO_LEFT:Landroid/support/constraint/solver/state/State$Constraint; - const/4 v0, 0x2 + aput-object v1, v0, v3 - aput-object v3, v2, v0 + sget-object v1, Landroid/support/constraint/solver/state/State$Constraint;->RIGHT_TO_RIGHT:Landroid/support/constraint/solver/state/State$Constraint; - const/4 v0, 0x3 + aput-object v1, v0, v4 - aput-object v5, v2, v0 + sget-object v1, Landroid/support/constraint/solver/state/State$Constraint;->START_TO_START:Landroid/support/constraint/solver/state/State$Constraint; - const/4 v0, 0x4 + aput-object v1, v0, v5 - aput-object v7, v2, v0 + sget-object v1, Landroid/support/constraint/solver/state/State$Constraint;->START_TO_END:Landroid/support/constraint/solver/state/State$Constraint; - const/4 v0, 0x5 + aput-object v1, v0, v6 - aput-object v9, v2, v0 + sget-object v1, Landroid/support/constraint/solver/state/State$Constraint;->END_TO_START:Landroid/support/constraint/solver/state/State$Constraint; - const/4 v0, 0x6 + aput-object v1, v0, v7 - aput-object v11, v2, v0 + sget-object v1, Landroid/support/constraint/solver/state/State$Constraint;->END_TO_END:Landroid/support/constraint/solver/state/State$Constraint; - const/4 v0, 0x7 + aput-object v1, v0, v8 - aput-object v13, v2, v0 + sget-object v1, Landroid/support/constraint/solver/state/State$Constraint;->TOP_TO_TOP:Landroid/support/constraint/solver/state/State$Constraint; - const/16 v0, 0x8 + aput-object v1, v0, v9 - aput-object v15, v2, v0 + sget-object v1, Landroid/support/constraint/solver/state/State$Constraint;->TOP_TO_BOTTOM:Landroid/support/constraint/solver/state/State$Constraint; - const/16 v0, 0x9 + aput-object v1, v0, v10 - aput-object v14, v2, v0 + sget-object v1, Landroid/support/constraint/solver/state/State$Constraint;->BOTTOM_TO_TOP:Landroid/support/constraint/solver/state/State$Constraint; - const/16 v0, 0xa + aput-object v1, v0, v11 - aput-object v12, v2, v0 + sget-object v1, Landroid/support/constraint/solver/state/State$Constraint;->BOTTOM_TO_BOTTOM:Landroid/support/constraint/solver/state/State$Constraint; - const/16 v0, 0xb + aput-object v1, v0, v12 - aput-object v10, v2, v0 + sget-object v1, Landroid/support/constraint/solver/state/State$Constraint;->BASELINE_TO_BASELINE:Landroid/support/constraint/solver/state/State$Constraint; - const/16 v0, 0xc + aput-object v1, v0, v13 - aput-object v8, v2, v0 + sget-object v1, Landroid/support/constraint/solver/state/State$Constraint;->CENTER_HORIZONTALLY:Landroid/support/constraint/solver/state/State$Constraint; - const/16 v0, 0xd + const/16 v2, 0xd - aput-object v17, v2, v0 + aput-object v1, v0, v2 - aput-object v4, v2, v6 + sget-object v1, Landroid/support/constraint/solver/state/State$Constraint;->CENTER_VERTICALLY:Landroid/support/constraint/solver/state/State$Constraint; - .line 52 - sput-object v2, Landroid/support/constraint/solver/state/State$Constraint;->$VALUES:[Landroid/support/constraint/solver/state/State$Constraint; + aput-object v1, v0, v15 + + sput-object v0, Landroid/support/constraint/solver/state/State$Constraint;->$VALUES:[Landroid/support/constraint/solver/state/State$Constraint; return-void .end method diff --git a/smali/android/support/constraint/solver/state/State$Direction.smali b/smali/android/support/constraint/solver/state/State$Direction.smali index 512c0637..dbe03d64 100644 --- a/smali/android/support/constraint/solver/state/State$Direction.smali +++ b/smali/android/support/constraint/solver/state/State$Direction.smali @@ -40,92 +40,104 @@ # direct methods .method static constructor ()V - .locals 13 + .locals 8 .line 71 new-instance v0, Landroid/support/constraint/solver/state/State$Direction; - const-string v1, "LEFT" + const/4 v1, 0x0 - const/4 v2, 0x0 + const-string v2, "LEFT" - invoke-direct {v0, v1, v2}, Landroid/support/constraint/solver/state/State$Direction;->(Ljava/lang/String;I)V + invoke-direct {v0, v2, v1}, Landroid/support/constraint/solver/state/State$Direction;->(Ljava/lang/String;I)V sput-object v0, Landroid/support/constraint/solver/state/State$Direction;->LEFT:Landroid/support/constraint/solver/state/State$Direction; .line 72 - new-instance v1, Landroid/support/constraint/solver/state/State$Direction; + new-instance v0, Landroid/support/constraint/solver/state/State$Direction; - const-string v3, "RIGHT" + const/4 v2, 0x1 - const/4 v4, 0x1 + const-string v3, "RIGHT" - invoke-direct {v1, v3, v4}, Landroid/support/constraint/solver/state/State$Direction;->(Ljava/lang/String;I)V + invoke-direct {v0, v3, v2}, Landroid/support/constraint/solver/state/State$Direction;->(Ljava/lang/String;I)V - sput-object v1, Landroid/support/constraint/solver/state/State$Direction;->RIGHT:Landroid/support/constraint/solver/state/State$Direction; + sput-object v0, Landroid/support/constraint/solver/state/State$Direction;->RIGHT:Landroid/support/constraint/solver/state/State$Direction; .line 73 - new-instance v3, Landroid/support/constraint/solver/state/State$Direction; + new-instance v0, Landroid/support/constraint/solver/state/State$Direction; - const-string v5, "START" + const/4 v3, 0x2 - const/4 v6, 0x2 + const-string v4, "START" - invoke-direct {v3, v5, v6}, Landroid/support/constraint/solver/state/State$Direction;->(Ljava/lang/String;I)V + invoke-direct {v0, v4, v3}, Landroid/support/constraint/solver/state/State$Direction;->(Ljava/lang/String;I)V - sput-object v3, Landroid/support/constraint/solver/state/State$Direction;->START:Landroid/support/constraint/solver/state/State$Direction; + sput-object v0, Landroid/support/constraint/solver/state/State$Direction;->START:Landroid/support/constraint/solver/state/State$Direction; .line 74 - new-instance v5, Landroid/support/constraint/solver/state/State$Direction; + new-instance v0, Landroid/support/constraint/solver/state/State$Direction; - const-string v7, "END" + const/4 v4, 0x3 - const/4 v8, 0x3 + const-string v5, "END" - invoke-direct {v5, v7, v8}, Landroid/support/constraint/solver/state/State$Direction;->(Ljava/lang/String;I)V + invoke-direct {v0, v5, v4}, Landroid/support/constraint/solver/state/State$Direction;->(Ljava/lang/String;I)V - sput-object v5, Landroid/support/constraint/solver/state/State$Direction;->END:Landroid/support/constraint/solver/state/State$Direction; + sput-object v0, Landroid/support/constraint/solver/state/State$Direction;->END:Landroid/support/constraint/solver/state/State$Direction; .line 75 - new-instance v7, Landroid/support/constraint/solver/state/State$Direction; + new-instance v0, Landroid/support/constraint/solver/state/State$Direction; - const-string v9, "TOP" + const/4 v5, 0x4 - const/4 v10, 0x4 + const-string v6, "TOP" - invoke-direct {v7, v9, v10}, Landroid/support/constraint/solver/state/State$Direction;->(Ljava/lang/String;I)V + invoke-direct {v0, v6, v5}, Landroid/support/constraint/solver/state/State$Direction;->(Ljava/lang/String;I)V - sput-object v7, Landroid/support/constraint/solver/state/State$Direction;->TOP:Landroid/support/constraint/solver/state/State$Direction; + sput-object v0, Landroid/support/constraint/solver/state/State$Direction;->TOP:Landroid/support/constraint/solver/state/State$Direction; .line 76 - new-instance v9, Landroid/support/constraint/solver/state/State$Direction; + new-instance v0, Landroid/support/constraint/solver/state/State$Direction; - const-string v11, "BOTTOM" + const/4 v6, 0x5 - const/4 v12, 0x5 + const-string v7, "BOTTOM" - invoke-direct {v9, v11, v12}, Landroid/support/constraint/solver/state/State$Direction;->(Ljava/lang/String;I)V + invoke-direct {v0, v7, v6}, Landroid/support/constraint/solver/state/State$Direction;->(Ljava/lang/String;I)V - sput-object v9, Landroid/support/constraint/solver/state/State$Direction;->BOTTOM:Landroid/support/constraint/solver/state/State$Direction; + sput-object v0, Landroid/support/constraint/solver/state/State$Direction;->BOTTOM:Landroid/support/constraint/solver/state/State$Direction; - const/4 v11, 0x6 + const/4 v0, 0x6 - new-array v11, v11, [Landroid/support/constraint/solver/state/State$Direction; + .line 70 + new-array v0, v0, [Landroid/support/constraint/solver/state/State$Direction; - aput-object v0, v11, v2 + sget-object v7, Landroid/support/constraint/solver/state/State$Direction;->LEFT:Landroid/support/constraint/solver/state/State$Direction; - aput-object v1, v11, v4 + aput-object v7, v0, v1 - aput-object v3, v11, v6 + sget-object v1, Landroid/support/constraint/solver/state/State$Direction;->RIGHT:Landroid/support/constraint/solver/state/State$Direction; - aput-object v5, v11, v8 + aput-object v1, v0, v2 - aput-object v7, v11, v10 + sget-object v1, Landroid/support/constraint/solver/state/State$Direction;->START:Landroid/support/constraint/solver/state/State$Direction; - aput-object v9, v11, v12 + aput-object v1, v0, v3 - .line 70 - sput-object v11, Landroid/support/constraint/solver/state/State$Direction;->$VALUES:[Landroid/support/constraint/solver/state/State$Direction; + sget-object v1, Landroid/support/constraint/solver/state/State$Direction;->END:Landroid/support/constraint/solver/state/State$Direction; + + aput-object v1, v0, v4 + + sget-object v1, Landroid/support/constraint/solver/state/State$Direction;->TOP:Landroid/support/constraint/solver/state/State$Direction; + + aput-object v1, v0, v5 + + sget-object v1, Landroid/support/constraint/solver/state/State$Direction;->BOTTOM:Landroid/support/constraint/solver/state/State$Direction; + + aput-object v1, v0, v6 + + sput-object v0, Landroid/support/constraint/solver/state/State$Direction;->$VALUES:[Landroid/support/constraint/solver/state/State$Direction; return-void .end method diff --git a/smali/android/support/constraint/solver/state/State$Helper.smali b/smali/android/support/constraint/solver/state/State$Helper.smali index 8c436ee9..a3c74bbe 100644 --- a/smali/android/support/constraint/solver/state/State$Helper.smali +++ b/smali/android/support/constraint/solver/state/State$Helper.smali @@ -42,105 +42,119 @@ # direct methods .method static constructor ()V - .locals 15 + .locals 9 .line 80 new-instance v0, Landroid/support/constraint/solver/state/State$Helper; - const-string v1, "HORIZONTAL_CHAIN" + const/4 v1, 0x0 - const/4 v2, 0x0 + const-string v2, "HORIZONTAL_CHAIN" - invoke-direct {v0, v1, v2}, Landroid/support/constraint/solver/state/State$Helper;->(Ljava/lang/String;I)V + invoke-direct {v0, v2, v1}, Landroid/support/constraint/solver/state/State$Helper;->(Ljava/lang/String;I)V sput-object v0, Landroid/support/constraint/solver/state/State$Helper;->HORIZONTAL_CHAIN:Landroid/support/constraint/solver/state/State$Helper; .line 81 - new-instance v1, Landroid/support/constraint/solver/state/State$Helper; + new-instance v0, Landroid/support/constraint/solver/state/State$Helper; - const-string v3, "VERTICAL_CHAIN" + const/4 v2, 0x1 - const/4 v4, 0x1 + const-string v3, "VERTICAL_CHAIN" - invoke-direct {v1, v3, v4}, Landroid/support/constraint/solver/state/State$Helper;->(Ljava/lang/String;I)V + invoke-direct {v0, v3, v2}, Landroid/support/constraint/solver/state/State$Helper;->(Ljava/lang/String;I)V - sput-object v1, Landroid/support/constraint/solver/state/State$Helper;->VERTICAL_CHAIN:Landroid/support/constraint/solver/state/State$Helper; + sput-object v0, Landroid/support/constraint/solver/state/State$Helper;->VERTICAL_CHAIN:Landroid/support/constraint/solver/state/State$Helper; .line 82 - new-instance v3, Landroid/support/constraint/solver/state/State$Helper; + new-instance v0, Landroid/support/constraint/solver/state/State$Helper; - const-string v5, "ALIGN_HORIZONTALLY" + const/4 v3, 0x2 - const/4 v6, 0x2 + const-string v4, "ALIGN_HORIZONTALLY" - invoke-direct {v3, v5, v6}, Landroid/support/constraint/solver/state/State$Helper;->(Ljava/lang/String;I)V + invoke-direct {v0, v4, v3}, Landroid/support/constraint/solver/state/State$Helper;->(Ljava/lang/String;I)V - sput-object v3, Landroid/support/constraint/solver/state/State$Helper;->ALIGN_HORIZONTALLY:Landroid/support/constraint/solver/state/State$Helper; + sput-object v0, Landroid/support/constraint/solver/state/State$Helper;->ALIGN_HORIZONTALLY:Landroid/support/constraint/solver/state/State$Helper; .line 83 - new-instance v5, Landroid/support/constraint/solver/state/State$Helper; + new-instance v0, Landroid/support/constraint/solver/state/State$Helper; - const-string v7, "ALIGN_VERTICALLY" + const/4 v4, 0x3 - const/4 v8, 0x3 + const-string v5, "ALIGN_VERTICALLY" - invoke-direct {v5, v7, v8}, Landroid/support/constraint/solver/state/State$Helper;->(Ljava/lang/String;I)V + invoke-direct {v0, v5, v4}, Landroid/support/constraint/solver/state/State$Helper;->(Ljava/lang/String;I)V - sput-object v5, Landroid/support/constraint/solver/state/State$Helper;->ALIGN_VERTICALLY:Landroid/support/constraint/solver/state/State$Helper; + sput-object v0, Landroid/support/constraint/solver/state/State$Helper;->ALIGN_VERTICALLY:Landroid/support/constraint/solver/state/State$Helper; .line 84 - new-instance v7, Landroid/support/constraint/solver/state/State$Helper; + new-instance v0, Landroid/support/constraint/solver/state/State$Helper; - const-string v9, "BARRIER" + const/4 v5, 0x4 - const/4 v10, 0x4 + const-string v6, "BARRIER" - invoke-direct {v7, v9, v10}, Landroid/support/constraint/solver/state/State$Helper;->(Ljava/lang/String;I)V + invoke-direct {v0, v6, v5}, Landroid/support/constraint/solver/state/State$Helper;->(Ljava/lang/String;I)V - sput-object v7, Landroid/support/constraint/solver/state/State$Helper;->BARRIER:Landroid/support/constraint/solver/state/State$Helper; + sput-object v0, Landroid/support/constraint/solver/state/State$Helper;->BARRIER:Landroid/support/constraint/solver/state/State$Helper; .line 85 - new-instance v9, Landroid/support/constraint/solver/state/State$Helper; + new-instance v0, Landroid/support/constraint/solver/state/State$Helper; - const-string v11, "LAYER" + const/4 v6, 0x5 - const/4 v12, 0x5 + const-string v7, "LAYER" - invoke-direct {v9, v11, v12}, Landroid/support/constraint/solver/state/State$Helper;->(Ljava/lang/String;I)V + invoke-direct {v0, v7, v6}, Landroid/support/constraint/solver/state/State$Helper;->(Ljava/lang/String;I)V - sput-object v9, Landroid/support/constraint/solver/state/State$Helper;->LAYER:Landroid/support/constraint/solver/state/State$Helper; + sput-object v0, Landroid/support/constraint/solver/state/State$Helper;->LAYER:Landroid/support/constraint/solver/state/State$Helper; .line 86 - new-instance v11, Landroid/support/constraint/solver/state/State$Helper; + new-instance v0, Landroid/support/constraint/solver/state/State$Helper; - const-string v13, "FLOW" + const/4 v7, 0x6 - const/4 v14, 0x6 + const-string v8, "FLOW" - invoke-direct {v11, v13, v14}, Landroid/support/constraint/solver/state/State$Helper;->(Ljava/lang/String;I)V + invoke-direct {v0, v8, v7}, Landroid/support/constraint/solver/state/State$Helper;->(Ljava/lang/String;I)V - sput-object v11, Landroid/support/constraint/solver/state/State$Helper;->FLOW:Landroid/support/constraint/solver/state/State$Helper; + sput-object v0, Landroid/support/constraint/solver/state/State$Helper;->FLOW:Landroid/support/constraint/solver/state/State$Helper; - const/4 v13, 0x7 + const/4 v0, 0x7 - new-array v13, v13, [Landroid/support/constraint/solver/state/State$Helper; + .line 79 + new-array v0, v0, [Landroid/support/constraint/solver/state/State$Helper; - aput-object v0, v13, v2 + sget-object v8, Landroid/support/constraint/solver/state/State$Helper;->HORIZONTAL_CHAIN:Landroid/support/constraint/solver/state/State$Helper; - aput-object v1, v13, v4 + aput-object v8, v0, v1 - aput-object v3, v13, v6 + sget-object v1, Landroid/support/constraint/solver/state/State$Helper;->VERTICAL_CHAIN:Landroid/support/constraint/solver/state/State$Helper; - aput-object v5, v13, v8 + aput-object v1, v0, v2 - aput-object v7, v13, v10 + sget-object v1, Landroid/support/constraint/solver/state/State$Helper;->ALIGN_HORIZONTALLY:Landroid/support/constraint/solver/state/State$Helper; - aput-object v9, v13, v12 + aput-object v1, v0, v3 - aput-object v11, v13, v14 + sget-object v1, Landroid/support/constraint/solver/state/State$Helper;->ALIGN_VERTICALLY:Landroid/support/constraint/solver/state/State$Helper; - .line 79 - sput-object v13, Landroid/support/constraint/solver/state/State$Helper;->$VALUES:[Landroid/support/constraint/solver/state/State$Helper; + aput-object v1, v0, v4 + + sget-object v1, Landroid/support/constraint/solver/state/State$Helper;->BARRIER:Landroid/support/constraint/solver/state/State$Helper; + + aput-object v1, v0, v5 + + sget-object v1, Landroid/support/constraint/solver/state/State$Helper;->LAYER:Landroid/support/constraint/solver/state/State$Helper; + + aput-object v1, v0, v6 + + sget-object v1, Landroid/support/constraint/solver/state/State$Helper;->FLOW:Landroid/support/constraint/solver/state/State$Helper; + + aput-object v1, v0, v7 + + sput-object v0, Landroid/support/constraint/solver/state/State$Helper;->$VALUES:[Landroid/support/constraint/solver/state/State$Helper; return-void .end method diff --git a/smali/android/support/constraint/solver/state/State.smali b/smali/android/support/constraint/solver/state/State.smali index be36bdbb..b1c2abb0 100644 --- a/smali/android/support/constraint/solver/state/State.smali +++ b/smali/android/support/constraint/solver/state/State.smali @@ -97,17 +97,19 @@ iput-object v0, p0, Landroid/support/constraint/solver/state/State;->mParent:Landroid/support/constraint/solver/state/ConstraintReference; - const/4 v1, 0x0 + const/4 v0, 0x0 .line 166 - iput v1, p0, Landroid/support/constraint/solver/state/State;->numHelpers:I + iput v0, p0, Landroid/support/constraint/solver/state/State;->numHelpers:I .line 96 - iget-object v1, p0, Landroid/support/constraint/solver/state/State;->mReferences:Ljava/util/HashMap; + iget-object v0, p0, Landroid/support/constraint/solver/state/State;->mReferences:Ljava/util/HashMap; + + sget-object v1, Landroid/support/constraint/solver/state/State;->PARENT:Ljava/lang/Integer; - sget-object v2, Landroid/support/constraint/solver/state/State;->PARENT:Ljava/lang/Integer; + iget-object v2, p0, Landroid/support/constraint/solver/state/State;->mParent:Landroid/support/constraint/solver/state/ConstraintReference; - invoke-virtual {v1, v2, v0}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; return-void .end method diff --git a/smali/android/support/constraint/solver/state/helpers/BarrierReference$1.smali b/smali/android/support/constraint/solver/state/helpers/BarrierReference$1.smali index 338a456e..f7b5c777 100644 --- a/smali/android/support/constraint/solver/state/helpers/BarrierReference$1.smali +++ b/smali/android/support/constraint/solver/state/helpers/BarrierReference$1.smali @@ -34,6 +34,8 @@ sput-object v0, Landroid/support/constraint/solver/state/helpers/BarrierReference$1;->$SwitchMap$android$support$constraint$solver$state$State$Direction:[I :try_start_0 + sget-object v0, Landroid/support/constraint/solver/state/helpers/BarrierReference$1;->$SwitchMap$android$support$constraint$solver$state$State$Direction:[I + sget-object v1, Landroid/support/constraint/solver/state/State$Direction;->LEFT:Landroid/support/constraint/solver/state/State$Direction; invoke-virtual {v1}, Landroid/support/constraint/solver/state/State$Direction;->ordinal()I diff --git a/smali/android/support/constraint/solver/state/helpers/HorizontalChainReference$1.smali b/smali/android/support/constraint/solver/state/helpers/HorizontalChainReference$1.smali index aa6b44a7..5d4d8422 100644 --- a/smali/android/support/constraint/solver/state/helpers/HorizontalChainReference$1.smali +++ b/smali/android/support/constraint/solver/state/helpers/HorizontalChainReference$1.smali @@ -34,6 +34,8 @@ sput-object v0, Landroid/support/constraint/solver/state/helpers/HorizontalChainReference$1;->$SwitchMap$android$support$constraint$solver$state$State$Chain:[I :try_start_0 + sget-object v0, Landroid/support/constraint/solver/state/helpers/HorizontalChainReference$1;->$SwitchMap$android$support$constraint$solver$state$State$Chain:[I + sget-object v1, Landroid/support/constraint/solver/state/State$Chain;->SPREAD:Landroid/support/constraint/solver/state/State$Chain; invoke-virtual {v1}, Landroid/support/constraint/solver/state/State$Chain;->ordinal()I diff --git a/smali/android/support/constraint/solver/state/helpers/VerticalChainReference$1.smali b/smali/android/support/constraint/solver/state/helpers/VerticalChainReference$1.smali index 0f3fd2aa..4ba55279 100644 --- a/smali/android/support/constraint/solver/state/helpers/VerticalChainReference$1.smali +++ b/smali/android/support/constraint/solver/state/helpers/VerticalChainReference$1.smali @@ -34,6 +34,8 @@ sput-object v0, Landroid/support/constraint/solver/state/helpers/VerticalChainReference$1;->$SwitchMap$android$support$constraint$solver$state$State$Chain:[I :try_start_0 + sget-object v0, Landroid/support/constraint/solver/state/helpers/VerticalChainReference$1;->$SwitchMap$android$support$constraint$solver$state$State$Chain:[I + sget-object v1, Landroid/support/constraint/solver/state/State$Chain;->SPREAD:Landroid/support/constraint/solver/state/State$Chain; invoke-virtual {v1}, Landroid/support/constraint/solver/state/State$Chain;->ordinal()I diff --git a/smali/android/support/constraint/solver/widgets/Barrier.smali b/smali/android/support/constraint/solver/widgets/Barrier.smali index 3c6ac4da..2098a9cd 100644 --- a/smali/android/support/constraint/solver/widgets/Barrier.smali +++ b/smali/android/support/constraint/solver/widgets/Barrier.smali @@ -414,17 +414,23 @@ if-nez v6, :cond_14 :cond_11 + iget v8, p0, Landroid/support/constraint/solver/widgets/Barrier;->mBarrierType:I + if-ne v8, v2, :cond_12 if-nez v7, :cond_14 :cond_12 + iget v8, p0, Landroid/support/constraint/solver/widgets/Barrier;->mBarrierType:I + if-ne v8, v3, :cond_13 if-nez v6, :cond_14 :cond_13 - if-ne v8, v4, :cond_15 + iget v6, p0, Landroid/support/constraint/solver/widgets/Barrier;->mBarrierType:I + + if-ne v6, v4, :cond_15 if-eqz v7, :cond_15 diff --git a/smali/android/support/constraint/solver/widgets/Chain.smali b/smali/android/support/constraint/solver/widgets/Chain.smali index e7406655..3715e741 100644 --- a/smali/android/support/constraint/solver/widgets/Chain.smali +++ b/smali/android/support/constraint/solver/widgets/Chain.smali @@ -20,7 +20,7 @@ .end method .method static applyChainConstraints(Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;Landroid/support/constraint/solver/LinearSystem;IILandroid/support/constraint/solver/widgets/ChainHead;)V - .locals 36 + .locals 37 move-object/from16 v0, p0 @@ -149,25 +149,27 @@ const/4 v5, 0x0 :goto_6 - move-object v7, v10 + move v15, v8 - move v15, v14 + move-object v8, v10 - move v14, v8 + move/from16 v16, v14 - const/4 v8, 0x0 + move v14, v5 + + const/4 v5, 0x0 :goto_7 const/16 v21, 0x0 - if-nez v8, :cond_13 + if-nez v5, :cond_13 .line 126 - iget-object v6, v7, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v6, v8, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; aget-object v6, v6, p3 - if-eqz v5, :cond_7 + if-eqz v14, :cond_7 const/16 v19, 0x1 @@ -180,22 +182,20 @@ :goto_8 invoke-virtual {v6}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->getMargin()I - move-result v22 - - move/from16 v23, v3 + move-result v23 .line 133 - iget-object v3, v7, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + iget-object v7, v8, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - aget-object v3, v3, p2 + aget-object v7, v7, p2 - move/from16 v24, v8 + move/from16 v25, v3 - sget-object v8, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + sget-object v3, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - if-ne v3, v8, :cond_8 + if-ne v7, v3, :cond_8 - iget-object v3, v7, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mResolvedMatchConstraintDefault:[I + iget-object v3, v8, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mResolvedMatchConstraintDefault:[I aget v3, v3, p2 @@ -210,84 +210,84 @@ .line 136 :goto_9 - iget-object v8, v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v7, v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - if-eqz v8, :cond_9 + if-eqz v7, :cond_9 - if-eq v7, v10, :cond_9 + if-eq v8, v10, :cond_9 .line 137 - iget-object v8, v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v7, v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - invoke-virtual {v8}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->getMargin()I + invoke-virtual {v7}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->getMargin()I - move-result v8 + move-result v7 - add-int v22, v22, v8 + add-int v23, v23, v7 :cond_9 - move/from16 v8, v22 + move/from16 v7, v23 - if-eqz v5, :cond_a + if-eqz v14, :cond_a - if-eq v7, v10, :cond_a + if-eq v8, v10, :cond_a - if-eq v7, v12, :cond_a + if-eq v8, v12, :cond_a - move/from16 v22, v15 + move/from16 v23, v5 const/16 v19, 0x8 goto :goto_a :cond_a - move/from16 v22, v15 + move/from16 v23, v5 .line 144 :goto_a - iget-object v15, v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v5, v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - if-eqz v15, :cond_d + if-eqz v5, :cond_d - if-ne v7, v12, :cond_b + if-ne v8, v12, :cond_b .line 146 - iget-object v15, v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; + iget-object v5, v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; - move/from16 v25, v14 + move/from16 v26, v15 - iget-object v14, v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v15, v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iget-object v14, v14, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; + iget-object v15, v15, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; - move-object/from16 v26, v2 + move-object/from16 v27, v2 const/4 v2, 0x6 - invoke-virtual {v9, v15, v14, v8, v2}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V + invoke-virtual {v9, v5, v15, v7, v2}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V goto :goto_b :cond_b - move-object/from16 v26, v2 + move-object/from16 v27, v2 - move/from16 v25, v14 + move/from16 v26, v15 .line 149 iget-object v2, v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; - iget-object v14, v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v5, v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iget-object v14, v14, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; + iget-object v5, v5, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; const/16 v15, 0x8 - invoke-virtual {v9, v2, v14, v8, v15}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V + invoke-virtual {v9, v2, v5, v7, v15}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V :goto_b if-eqz v3, :cond_c - if-nez v5, :cond_c + if-nez v14, :cond_c const/4 v2, 0x5 @@ -300,24 +300,24 @@ :goto_c iget-object v3, v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; - iget-object v6, v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v5, v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iget-object v6, v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; + iget-object v5, v5, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; - invoke-virtual {v9, v3, v6, v8, v2}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; + invoke-virtual {v9, v3, v5, v7, v2}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; goto :goto_d :cond_d - move-object/from16 v26, v2 + move-object/from16 v27, v2 - move/from16 v25, v14 + move/from16 v26, v15 :goto_d if-eqz v4, :cond_f .line 160 - invoke-virtual {v7}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getVisibility()I + invoke-virtual {v8}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getVisibility()I move-result v2 @@ -325,7 +325,7 @@ if-eq v2, v3, :cond_e - iget-object v2, v7, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + iget-object v2, v8, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; aget-object v2, v2, p2 @@ -334,7 +334,7 @@ if-ne v2, v3, :cond_e .line 162 - iget-object v2, v7, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v2, v8, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; add-int/lit8 v3, p3, 0x1 @@ -342,26 +342,26 @@ iget-object v2, v2, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; - iget-object v3, v7, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v3, v8, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; aget-object v3, v3, p3 iget-object v3, v3, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; - const/4 v6, 0x5 + const/4 v5, 0x5 - const/4 v8, 0x0 + const/4 v6, 0x0 - invoke-virtual {v9, v2, v3, v8, v6}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V + invoke-virtual {v9, v2, v3, v6, v5}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V goto :goto_e :cond_e - const/4 v8, 0x0 + const/4 v6, 0x0 .line 166 :goto_e - iget-object v2, v7, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v2, v8, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; aget-object v2, v2, p3 @@ -373,13 +373,13 @@ iget-object v3, v3, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; - const/16 v6, 0x8 + const/16 v5, 0x8 - invoke-virtual {v9, v2, v3, v8, v6}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V + invoke-virtual {v9, v2, v3, v6, v5}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V .line 172 :cond_f - iget-object v2, v7, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v2, v8, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; add-int/lit8 v3, p3, 0x1 @@ -409,7 +409,7 @@ iget-object v3, v3, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mOwner:Landroid/support/constraint/solver/widgets/ConstraintWidget; - if-eq v3, v7, :cond_10 + if-eq v3, v8, :cond_10 goto :goto_f @@ -420,34 +420,30 @@ :goto_f if-eqz v21, :cond_12 - move-object/from16 v7, v21 + move-object/from16 v8, v21 - move/from16 v8, v24 + move/from16 v5, v23 goto :goto_10 :cond_12 - const/4 v8, 0x1 + const/4 v5, 0x1 :goto_10 - move/from16 v15, v22 + move/from16 v3, v25 - move/from16 v3, v23 + move/from16 v15, v26 - move/from16 v14, v25 - - move-object/from16 v2, v26 + move-object/from16 v2, v27 goto/16 :goto_7 :cond_13 - move-object/from16 v26, v2 - - move/from16 v23, v3 + move-object/from16 v27, v2 - move/from16 v25, v14 + move/from16 v25, v3 - move/from16 v22, v15 + move/from16 v26, v15 if-eqz v13, :cond_17 @@ -468,95 +464,95 @@ aget-object v2, v2, v3 .line 191 - iget-object v6, v13, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + iget-object v5, v13, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - aget-object v6, v6, p2 + aget-object v5, v5, p2 - sget-object v7, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + sget-object v6, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - if-ne v6, v7, :cond_14 + if-ne v5, v6, :cond_14 - iget-object v6, v13, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mResolvedMatchConstraintDefault:[I + iget-object v5, v13, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mResolvedMatchConstraintDefault:[I - aget v6, v6, p2 + aget v5, v5, p2 - if-nez v6, :cond_14 + if-nez v5, :cond_14 - const/4 v6, 0x1 + const/4 v5, 0x1 goto :goto_11 :cond_14 - const/4 v6, 0x0 + const/4 v5, 0x0 :goto_11 - if-eqz v6, :cond_15 + if-eqz v5, :cond_15 - if-nez v5, :cond_15 + if-nez v14, :cond_15 .line 193 - iget-object v6, v2, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v5, v2, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iget-object v6, v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mOwner:Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object v5, v5, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mOwner:Landroid/support/constraint/solver/widgets/ConstraintWidget; - if-ne v6, v0, :cond_15 + if-ne v5, v0, :cond_15 .line 194 - iget-object v6, v2, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; + iget-object v5, v2, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; - iget-object v7, v2, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v6, v2, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iget-object v7, v7, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; + iget-object v6, v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; invoke-virtual {v2}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->getMargin()I - move-result v8 + move-result v7 - neg-int v8, v8 + neg-int v7, v7 - const/4 v14, 0x5 + const/4 v8, 0x5 - invoke-virtual {v9, v6, v7, v8, v14}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; + invoke-virtual {v9, v5, v6, v7, v8}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; goto :goto_12 :cond_15 - const/4 v14, 0x5 + const/4 v8, 0x5 - if-eqz v5, :cond_16 + if-eqz v14, :cond_16 .line 196 - iget-object v6, v2, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v5, v2, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iget-object v6, v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mOwner:Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object v5, v5, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mOwner:Landroid/support/constraint/solver/widgets/ConstraintWidget; - if-ne v6, v0, :cond_16 + if-ne v5, v0, :cond_16 .line 197 - iget-object v6, v2, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; + iget-object v5, v2, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; - iget-object v7, v2, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v6, v2, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iget-object v7, v7, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; + iget-object v6, v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; invoke-virtual {v2}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->getMargin()I - move-result v8 + move-result v7 - neg-int v8, v8 + neg-int v7, v7 const/4 v15, 0x4 - invoke-virtual {v9, v6, v7, v8, v15}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; + invoke-virtual {v9, v5, v6, v7, v15}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; .line 200 :cond_16 :goto_12 - iget-object v6, v2, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; + iget-object v5, v2, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; - iget-object v7, v11, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v6, v11, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; - aget-object v3, v7, v3 + aget-object v3, v6, v3 iget-object v3, v3, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; @@ -569,15 +565,15 @@ neg-int v2, v2 - const/4 v7, 0x6 + const/4 v6, 0x6 .line 200 - invoke-virtual {v9, v6, v3, v2, v7}, Landroid/support/constraint/solver/LinearSystem;->addLowerThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V + invoke-virtual {v9, v5, v3, v2, v6}, Landroid/support/constraint/solver/LinearSystem;->addLowerThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V goto :goto_13 :cond_17 - const/4 v14, 0x5 + const/4 v8, 0x5 :goto_13 if-eqz v4, :cond_18 @@ -643,22 +639,22 @@ goto :goto_14 :cond_19 - move/from16 v4, v23 + move/from16 v4, v25 :goto_14 - const/4 v6, 0x0 + const/4 v5, 0x0 move-object/from16 v7, v21 - const/4 v8, 0x0 + const/4 v6, 0x0 - const/16 v28, 0x0 + const/16 v29, 0x0 :goto_15 - if-ge v8, v2, :cond_1e + if-ge v6, v2, :cond_1e .line 225 - invoke-virtual {v0, v8}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v0, v6}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; move-result-object v15 @@ -669,9 +665,9 @@ aget v3, v3, p2 - cmpg-float v18, v3, v6 + cmpg-float v20, v3, v5 - if-gez v18, :cond_1b + if-gez v20, :cond_1b .line 229 iget-boolean v3, v1, Landroid/support/constraint/solver/widgets/ChainHead;->mHasComplexMatchWeights:Z @@ -681,9 +677,9 @@ .line 230 iget-object v3, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; - add-int/lit8 v18, p3, 0x1 + add-int/lit8 v20, p3, 0x1 - aget-object v3, v3, v18 + aget-object v3, v3, v20 iget-object v3, v3, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; @@ -693,39 +689,39 @@ iget-object v15, v15, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; - const/4 v6, 0x0 + const/4 v5, 0x0 - const/4 v14, 0x4 + const/4 v8, 0x4 - invoke-virtual {v9, v3, v15, v6, v14}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; + invoke-virtual {v9, v3, v15, v5, v8}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; - const/4 v14, 0x0 + const/4 v8, 0x0 goto :goto_17 :cond_1a - const/4 v14, 0x4 + const/4 v8, 0x4 const/high16 v3, 0x3f800000 # 1.0f - const/4 v6, 0x0 + const/4 v5, 0x0 goto :goto_16 :cond_1b - const/4 v14, 0x4 + const/4 v8, 0x4 :goto_16 - cmpl-float v18, v3, v6 + cmpl-float v19, v3, v5 - if-nez v18, :cond_1c + if-nez v19, :cond_1c .line 237 iget-object v3, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; - add-int/lit8 v18, p3, 0x1 + add-int/lit8 v19, p3, 0x1 - aget-object v3, v3, v18 + aget-object v3, v3, v19 iget-object v3, v3, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; @@ -735,79 +731,79 @@ iget-object v15, v15, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; - const/16 v6, 0x8 + const/16 v5, 0x8 - const/4 v14, 0x0 + const/4 v8, 0x0 - invoke-virtual {v9, v3, v15, v14, v6}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; + invoke-virtual {v9, v3, v15, v8, v5}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; :goto_17 - move-object/from16 v23, v0 + move-object/from16 v24, v0 - move/from16 v17, v2 + move/from16 v18, v2 goto :goto_19 :cond_1c - const/4 v14, 0x0 + const/4 v8, 0x0 if-eqz v7, :cond_1d .line 243 - iget-object v6, v7, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v5, v7, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; - aget-object v6, v6, p3 + aget-object v5, v5, p3 - iget-object v6, v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; + iget-object v5, v5, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; .line 244 iget-object v7, v7, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; - add-int/lit8 v17, p3, 0x1 + add-int/lit8 v18, p3, 0x1 - aget-object v7, v7, v17 + aget-object v7, v7, v18 iget-object v7, v7, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; .line 245 - iget-object v14, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v8, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; - aget-object v14, v14, p3 + aget-object v8, v8, p3 - iget-object v14, v14, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; + iget-object v8, v8, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; - move-object/from16 v23, v0 + move-object/from16 v24, v0 .line 246 iget-object v0, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; - aget-object v0, v0, v17 + aget-object v0, v0, v18 iget-object v0, v0, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; - move/from16 v17, v2 + move/from16 v18, v2 .line 247 invoke-virtual/range {p1 .. p1}, Landroid/support/constraint/solver/LinearSystem;->createRow()Landroid/support/constraint/solver/ArrayRow; move-result-object v2 - move-object/from16 v27, v2 + move-object/from16 v28, v2 - move/from16 v29, v4 + move/from16 v30, v4 - move/from16 v30, v3 + move/from16 v31, v3 - move-object/from16 v31, v6 + move-object/from16 v32, v5 - move-object/from16 v32, v7 + move-object/from16 v33, v7 - move-object/from16 v33, v14 + move-object/from16 v34, v8 - move-object/from16 v34, v0 + move-object/from16 v35, v0 .line 248 - invoke-virtual/range {v27 .. v34}, Landroid/support/constraint/solver/ArrayRow;->createRowEqualMatchDimensions(FFFLandroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;)Landroid/support/constraint/solver/ArrayRow; + invoke-virtual/range {v28 .. v35}, Landroid/support/constraint/solver/ArrayRow;->createRowEqualMatchDimensions(FFFLandroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;)Landroid/support/constraint/solver/ArrayRow; .line 250 invoke-virtual {v9, v2}, Landroid/support/constraint/solver/LinearSystem;->addConstraint(Landroid/support/constraint/solver/ArrayRow;)V @@ -815,27 +811,27 @@ goto :goto_18 :cond_1d - move-object/from16 v23, v0 + move-object/from16 v24, v0 - move/from16 v17, v2 + move/from16 v18, v2 :goto_18 - move/from16 v28, v3 + move/from16 v29, v3 move-object v7, v15 :goto_19 - add-int/lit8 v8, v8, 0x1 + add-int/lit8 v6, v6, 0x1 - move/from16 v2, v17 + move/from16 v2, v18 - move-object/from16 v0, v23 + move-object/from16 v0, v24 const/4 v3, 0x1 - const/4 v6, 0x0 + const/4 v5, 0x0 - const/4 v14, 0x5 + const/4 v8, 0x5 goto/16 :goto_15 @@ -844,7 +840,7 @@ if-eq v12, v13, :cond_1f - if-eqz v5, :cond_23 + if-eqz v14, :cond_23 .line 272 :cond_1f @@ -909,7 +905,7 @@ if-nez p2, :cond_22 - move-object/from16 v2, v26 + move-object/from16 v2, v27 .line 281 iget v2, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mHorizontalBiasPercent:F @@ -917,7 +913,7 @@ goto :goto_1c :cond_22 - move-object/from16 v2, v26 + move-object/from16 v2, v27 .line 283 iget v2, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mVerticalBiasPercent:F @@ -959,7 +955,7 @@ goto/16 :goto_33 :cond_23 - if-eqz v25, :cond_35 + if-eqz v26, :cond_35 if-eqz v12, :cond_35 @@ -974,12 +970,12 @@ if-ne v0, v1, :cond_24 - const/16 v16, 0x1 + const/16 v17, 0x1 goto :goto_1d :cond_24 - const/16 v16, 0x0 + const/16 v17, 0x0 :goto_1d move-object v14, v12 @@ -1026,7 +1022,7 @@ goto :goto_20 :cond_27 - move-object/from16 v17, v8 + move-object/from16 v18, v8 goto/16 :goto_27 @@ -1130,11 +1126,11 @@ iget-object v6, v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; - move-object/from16 v35, v7 + move-object/from16 v36, v7 move-object v7, v6 - move-object/from16 v6, v35 + move-object/from16 v6, v36 goto :goto_24 @@ -1222,22 +1218,22 @@ move-result v0 - move/from16 v17, v0 + move/from16 v18, v0 goto :goto_25 :cond_32 - move/from16 v17, v3 + move/from16 v18, v3 :goto_25 - if-eqz v16, :cond_33 + if-eqz v17, :cond_33 - const/16 v18, 0x8 + const/16 v19, 0x8 goto :goto_26 :cond_33 - const/16 v18, 0x5 + const/16 v19, 0x5 :goto_26 const/high16 v4, 0x3f000000 # 0.5f @@ -1250,11 +1246,11 @@ move-object v6, v7 - move/from16 v7, v17 + move/from16 v7, v18 - move-object/from16 v17, v8 + move-object/from16 v18, v8 - move/from16 v8, v18 + move/from16 v8, v19 .line 347 invoke-virtual/range {v0 .. v8}, Landroid/support/constraint/solver/LinearSystem;->addCentering(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;IFLandroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V @@ -1272,14 +1268,14 @@ move-object v15, v14 :cond_34 - move-object/from16 v14, v17 + move-object/from16 v14, v18 goto/16 :goto_1e :cond_35 const/16 v8, 0x8 - if-eqz v22, :cond_47 + if-eqz v16, :cond_47 if-eqz v12, :cond_47 @@ -1294,12 +1290,12 @@ if-ne v0, v1, :cond_36 - const/16 v16, 0x1 + const/16 v17, 0x1 goto :goto_28 :cond_36 - const/16 v16, 0x0 + const/16 v17, 0x0 :goto_28 move-object v14, v12 @@ -1450,7 +1446,7 @@ add-int/2addr v4, v5 :cond_3d - move/from16 v17, v4 + move/from16 v18, v4 if-eqz v15, :cond_3e @@ -1468,14 +1464,14 @@ :cond_3e move v3, v0 - if-eqz v16, :cond_3f + if-eqz v17, :cond_3f - const/16 v18, 0x8 + const/16 v20, 0x8 goto :goto_2e :cond_3f - const/16 v18, 0x4 + const/16 v20, 0x4 :goto_2e if-eqz v1, :cond_40 @@ -1496,15 +1492,15 @@ move-object v6, v8 - move-object/from16 v20, v7 + move-object/from16 v22, v7 - move/from16 v7, v17 + move/from16 v7, v18 - move-object/from16 v17, v15 + move-object/from16 v18, v15 const/16 v15, 0x8 - move/from16 v8, v18 + move/from16 v8, v20 .line 404 invoke-virtual/range {v0 .. v8}, Landroid/support/constraint/solver/LinearSystem;->addCentering(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;IFLandroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V @@ -1512,21 +1508,21 @@ goto :goto_2f :cond_40 - move-object/from16 v20, v7 + move-object/from16 v22, v7 - move-object/from16 v17, v15 + move-object/from16 v18, v15 const/16 v15, 0x8 const/16 v19, 0x4 :goto_2f - move-object/from16 v0, v20 + move-object/from16 v0, v22 goto :goto_30 :cond_41 - move-object/from16 v17, v15 + move-object/from16 v18, v15 const/16 v15, 0x8 @@ -1543,7 +1539,7 @@ goto :goto_31 :cond_42 - move-object/from16 v14, v17 + move-object/from16 v14, v18 :goto_31 move-object v15, v14 @@ -1625,7 +1621,7 @@ move-result v8 - const/16 v16, 0x5 + const/16 v17, 0x5 move-object/from16 v0, p1 @@ -1643,7 +1639,7 @@ move v7, v8 - move/from16 v8, v16 + move/from16 v8, v17 .line 423 invoke-virtual/range {v0 .. v8}, Landroid/support/constraint/solver/LinearSystem;->addCentering(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;IFLandroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V @@ -1674,9 +1670,9 @@ :cond_47 :goto_33 - if-nez v25, :cond_48 + if-nez v26, :cond_48 - if-eqz v22, :cond_4f + if-eqz v16, :cond_4f :cond_48 if-eqz v12, :cond_4f @@ -1741,17 +1737,15 @@ iget-object v4, v4, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mSolverVariable:Landroid/support/constraint/solver/SolverVariable; - move-object/from16 v21, v4 + goto :goto_36 :cond_4b - move-object/from16 v5, v21 - - goto :goto_36 + move-object/from16 v4, v21 :cond_4c + :goto_36 move-object v5, v4 - :goto_36 if-ne v12, v13, :cond_4d .line 444 @@ -1841,9 +1835,7 @@ .line 53 iget-object v2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mHorizontalChainsArray:[Landroid/support/constraint/solver/widgets/ChainHead; - move-object v3, v2 - - const/4 v2, 0x0 + const/4 v3, 0x0 goto :goto_0 @@ -1858,13 +1850,15 @@ move v1, v2 - const/4 v2, 0x2 + move-object v2, v3 + + const/4 v3, 0x2 :goto_0 if-ge v0, v1, :cond_3 .line 61 - aget-object v4, v3, v0 + aget-object v4, v2, v0 .line 64 invoke-virtual {v4}, Landroid/support/constraint/solver/widgets/ChainHead;->define()V @@ -1884,7 +1878,7 @@ .line 66 :cond_1 - invoke-static {p0, p1, p3, v2, v4}, Landroid/support/constraint/solver/widgets/Chain;->applyChainConstraints(Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;Landroid/support/constraint/solver/LinearSystem;IILandroid/support/constraint/solver/widgets/ChainHead;)V + invoke-static {p0, p1, p3, v3, v4}, Landroid/support/constraint/solver/widgets/Chain;->applyChainConstraints(Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;Landroid/support/constraint/solver/LinearSystem;IILandroid/support/constraint/solver/widgets/ChainHead;)V :cond_2 add-int/lit8 v0, v0, 0x1 diff --git a/smali/android/support/constraint/solver/widgets/ChainHead.smali b/smali/android/support/constraint/solver/widgets/ChainHead.smali index 9c5d106c..2181340e 100644 --- a/smali/android/support/constraint/solver/widgets/ChainHead.smali +++ b/smali/android/support/constraint/solver/widgets/ChainHead.smali @@ -69,6 +69,11 @@ .line 42 iput v0, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mTotalWeight:F + const/4 v0, 0x0 + + .line 48 + iput-boolean v0, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mIsRtl:Z + .line 64 iput-object p1, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mFirst:Landroid/support/constraint/solver/widgets/ConstraintWidget; @@ -103,10 +108,12 @@ move-object v5, v2 - const/4 v6, 0x0 + move-object v6, v5 + + const/4 v2, 0x0 :goto_0 - if-nez v6, :cond_15 + if-nez v2, :cond_15 .line 93 iget v7, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mWidgetsCount:I @@ -116,7 +123,7 @@ iput v7, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mWidgetsCount:I .line 94 - iget-object v7, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mNextChainWidget:[Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object v7, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mNextChainWidget:[Landroid/support/constraint/solver/widgets/ConstraintWidget; iget v8, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mOrientation:I @@ -125,14 +132,14 @@ aput-object v9, v7, v8 .line 95 - iget-object v7, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListNextMatchConstraintsWidget:[Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object v7, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListNextMatchConstraintsWidget:[Landroid/support/constraint/solver/widgets/ConstraintWidget; iget v8, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mOrientation:I aput-object v9, v7, v8 .line 96 - invoke-virtual {v2}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getVisibility()I + invoke-virtual {v5}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getVisibility()I move-result v7 @@ -150,7 +157,7 @@ .line 98 iget v7, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mOrientation:I - invoke-virtual {v2, v7}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getDimensionBehaviour(I)Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + invoke-virtual {v5, v7}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getDimensionBehaviour(I)Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; move-result-object v7 @@ -163,7 +170,7 @@ iget v8, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mOrientation:I - invoke-virtual {v2, v8}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getLength(I)I + invoke-virtual {v5, v8}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getLength(I)I move-result v8 @@ -175,7 +182,7 @@ :cond_0 iget v7, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mTotalSize:I - iget-object v8, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v8, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; aget-object v8, v8, v0 @@ -188,7 +195,9 @@ iput v7, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mTotalSize:I .line 102 - iget-object v8, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget v7, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mTotalSize:I + + iget-object v8, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; add-int/lit8 v10, v0, 0x1 @@ -205,7 +214,7 @@ .line 103 iget v7, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mTotalMargins:I - iget-object v8, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v8, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; aget-object v8, v8, v0 @@ -218,7 +227,9 @@ iput v7, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mTotalMargins:I .line 104 - iget-object v8, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget v7, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mTotalMargins:I + + iget-object v8, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; aget-object v8, v8, v10 @@ -236,14 +247,14 @@ if-nez v7, :cond_1 .line 107 - iput-object v2, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mFirstVisibleWidget:Landroid/support/constraint/solver/widgets/ConstraintWidget; + iput-object v5, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mFirstVisibleWidget:Landroid/support/constraint/solver/widgets/ConstraintWidget; .line 109 :cond_1 - iput-object v2, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mLastVisibleWidget:Landroid/support/constraint/solver/widgets/ConstraintWidget; + iput-object v5, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mLastVisibleWidget:Landroid/support/constraint/solver/widgets/ConstraintWidget; .line 112 - iget-object v7, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + iget-object v7, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; iget v8, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mOrientation:I @@ -254,7 +265,7 @@ if-ne v7, v8, :cond_10 .line 113 - iget-object v7, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mResolvedMatchConstraintDefault:[I + iget-object v7, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mResolvedMatchConstraintDefault:[I iget v8, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mOrientation:I @@ -264,7 +275,7 @@ if-eqz v7, :cond_2 - iget-object v7, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mResolvedMatchConstraintDefault:[I + iget-object v7, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mResolvedMatchConstraintDefault:[I iget v10, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mOrientation:I @@ -274,7 +285,7 @@ if-eq v7, v10, :cond_2 - iget-object v7, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mResolvedMatchConstraintDefault:[I + iget-object v7, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mResolvedMatchConstraintDefault:[I iget v10, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mOrientation:I @@ -291,7 +302,7 @@ iput v7, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mWidgetsMatchCount:I .line 117 - iget-object v7, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mWeight:[F + iget-object v7, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mWeight:[F iget v10, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mOrientation:I @@ -304,7 +315,7 @@ .line 119 iget v10, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mTotalWeight:F - iget-object v11, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mWeight:[F + iget-object v11, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mWeight:[F iget v12, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mOrientation:I @@ -318,7 +329,7 @@ :cond_3 iget v10, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mOrientation:I - invoke-static {v2, v10}, Landroid/support/constraint/solver/widgets/ChainHead;->isMatchConstraintEqualityCandidate(Landroid/support/constraint/solver/widgets/ConstraintWidget;I)Z + invoke-static {v5, v10}, Landroid/support/constraint/solver/widgets/ChainHead;->isMatchConstraintEqualityCandidate(Landroid/support/constraint/solver/widgets/ConstraintWidget;I)Z move-result v10 @@ -354,7 +365,7 @@ :cond_5 iget-object v7, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mWeightedMatchConstraintsWidgets:Ljava/util/ArrayList; - invoke-virtual {v7, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + invoke-virtual {v7, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z .line 134 :cond_6 @@ -363,7 +374,7 @@ if-nez v7, :cond_7 .line 135 - iput-object v2, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mFirstMatchConstraintWidget:Landroid/support/constraint/solver/widgets/ConstraintWidget; + iput-object v5, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mFirstMatchConstraintWidget:Landroid/support/constraint/solver/widgets/ConstraintWidget; .line 137 :cond_7 @@ -376,11 +387,11 @@ iget v10, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mOrientation:I - aput-object v2, v7, v10 + aput-object v5, v7, v10 .line 140 :cond_8 - iput-object v2, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mLastMatchConstraintWidget:Landroid/support/constraint/solver/widgets/ConstraintWidget; + iput-object v5, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mLastMatchConstraintWidget:Landroid/support/constraint/solver/widgets/ConstraintWidget; .line 142 :cond_9 @@ -389,7 +400,7 @@ if-nez v7, :cond_c .line 143 - iget v7, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintDefaultWidth:I + iget v7, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintDefaultWidth:I if-eqz v7, :cond_a @@ -400,11 +411,11 @@ .line 145 :cond_a - iget v7, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintMinWidth:I + iget v7, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintMinWidth:I if-nez v7, :cond_b - iget v7, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintMaxWidth:I + iget v7, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintMaxWidth:I if-eqz v7, :cond_f @@ -416,7 +427,7 @@ .line 149 :cond_c - iget v7, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintDefaultHeight:I + iget v7, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintDefaultHeight:I if-eqz v7, :cond_d @@ -427,11 +438,11 @@ .line 151 :cond_d - iget v7, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintMinHeight:I + iget v7, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintMinHeight:I if-nez v7, :cond_e - iget v7, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintMaxHeight:I + iget v7, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintMaxHeight:I if-eqz v7, :cond_f @@ -442,7 +453,7 @@ .line 155 :cond_f :goto_2 - iget v7, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mDimensionRatio:F + iget v7, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mDimensionRatio:F cmpl-float v7, v7, v8 @@ -455,32 +466,32 @@ iput-boolean v3, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mHasRatio:Z :cond_10 - if-eq v5, v2, :cond_11 + if-eq v6, v5, :cond_11 .line 163 - iget-object v5, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mNextChainWidget:[Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object v6, v6, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mNextChainWidget:[Landroid/support/constraint/solver/widgets/ConstraintWidget; iget v7, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mOrientation:I - aput-object v2, v5, v7 + aput-object v5, v6, v7 .line 168 :cond_11 - iget-object v5, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v6, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; add-int/lit8 v7, v0, 0x1 - aget-object v5, v5, v7 + aget-object v6, v6, v7 - iget-object v5, v5, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v6, v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - if-eqz v5, :cond_13 + if-eqz v6, :cond_13 .line 170 - iget-object v5, v5, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mOwner:Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object v6, v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mOwner:Landroid/support/constraint/solver/widgets/ConstraintWidget; .line 171 - iget-object v7, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v7, v6, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; aget-object v7, v7, v0 @@ -488,7 +499,7 @@ if-eqz v7, :cond_13 - iget-object v7, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v7, v6, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; aget-object v7, v7, v0 @@ -496,12 +507,12 @@ iget-object v7, v7, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mOwner:Landroid/support/constraint/solver/widgets/ConstraintWidget; - if-eq v7, v2, :cond_12 + if-eq v7, v5, :cond_12 goto :goto_3 :cond_12 - move-object v9, v5 + move-object v9, v6 :cond_13 :goto_3 @@ -510,14 +521,14 @@ goto :goto_4 :cond_14 - move-object v9, v2 + move-object v9, v5 - const/4 v6, 0x1 + const/4 v2, 0x1 :goto_4 - move-object v5, v2 + move-object v6, v5 - move-object v2, v9 + move-object v5, v9 goto/16 :goto_0 @@ -528,7 +539,7 @@ if-eqz v1, :cond_16 .line 185 - iget v5, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mTotalSize:I + iget v2, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mTotalSize:I iget-object v1, v1, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; @@ -538,9 +549,9 @@ move-result v1 - sub-int/2addr v5, v1 + sub-int/2addr v2, v1 - iput v5, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mTotalSize:I + iput v2, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mTotalSize:I .line 187 :cond_16 @@ -549,7 +560,7 @@ if-eqz v1, :cond_17 .line 188 - iget v5, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mTotalSize:I + iget v2, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mTotalSize:I iget-object v1, v1, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; @@ -561,13 +572,13 @@ move-result v0 - sub-int/2addr v5, v0 + sub-int/2addr v2, v0 - iput v5, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mTotalSize:I + iput v2, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mTotalSize:I .line 190 :cond_17 - iput-object v2, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mLast:Landroid/support/constraint/solver/widgets/ConstraintWidget; + iput-object v5, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mLast:Landroid/support/constraint/solver/widgets/ConstraintWidget; .line 192 iget v0, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mOrientation:I @@ -579,7 +590,9 @@ if-eqz v0, :cond_18 .line 193 - iput-object v2, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mHead:Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object v0, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mLast:Landroid/support/constraint/solver/widgets/ConstraintWidget; + + iput-object v0, p0, Landroid/support/constraint/solver/widgets/ChainHead;->mHead:Landroid/support/constraint/solver/widgets/ConstraintWidget; goto :goto_5 diff --git a/smali/android/support/constraint/solver/widgets/ConstraintAnchor$1.smali b/smali/android/support/constraint/solver/widgets/ConstraintAnchor$1.smali index f9262243..1c029ee5 100644 --- a/smali/android/support/constraint/solver/widgets/ConstraintAnchor$1.smali +++ b/smali/android/support/constraint/solver/widgets/ConstraintAnchor$1.smali @@ -34,6 +34,8 @@ sput-object v0, Landroid/support/constraint/solver/widgets/ConstraintAnchor$1;->$SwitchMap$android$support$constraint$solver$widgets$ConstraintAnchor$Type:[I :try_start_0 + sget-object v0, Landroid/support/constraint/solver/widgets/ConstraintAnchor$1;->$SwitchMap$android$support$constraint$solver$widgets$ConstraintAnchor$Type:[I + sget-object v1, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->CENTER:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; invoke-virtual {v1}, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->ordinal()I diff --git a/smali/android/support/constraint/solver/widgets/ConstraintAnchor$Type.smali b/smali/android/support/constraint/solver/widgets/ConstraintAnchor$Type.smali index 4e1e8f61..b758ced6 100644 --- a/smali/android/support/constraint/solver/widgets/ConstraintAnchor$Type.smali +++ b/smali/android/support/constraint/solver/widgets/ConstraintAnchor$Type.smali @@ -46,128 +46,140 @@ # direct methods .method static constructor ()V - .locals 16 + .locals 11 .line 91 new-instance v0, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - const-string v1, "NONE" + const/4 v1, 0x0 - const/4 v2, 0x0 + const-string v2, "NONE" - invoke-direct {v0, v1, v2}, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->(Ljava/lang/String;I)V + invoke-direct {v0, v2, v1}, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->(Ljava/lang/String;I)V sput-object v0, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->NONE:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - new-instance v1, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; + new-instance v0, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; + + const/4 v2, 0x1 const-string v3, "LEFT" - const/4 v4, 0x1 + invoke-direct {v0, v3, v2}, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->(Ljava/lang/String;I)V + + sput-object v0, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->LEFT:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; + + new-instance v0, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; + + const/4 v3, 0x2 + + const-string v4, "TOP" - invoke-direct {v1, v3, v4}, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->(Ljava/lang/String;I)V + invoke-direct {v0, v4, v3}, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->(Ljava/lang/String;I)V - sput-object v1, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->LEFT:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; + sput-object v0, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->TOP:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - new-instance v3, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; + new-instance v0, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - const-string v5, "TOP" + const/4 v4, 0x3 - const/4 v6, 0x2 + const-string v5, "RIGHT" - invoke-direct {v3, v5, v6}, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->(Ljava/lang/String;I)V + invoke-direct {v0, v5, v4}, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->(Ljava/lang/String;I)V - sput-object v3, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->TOP:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; + sput-object v0, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->RIGHT:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - new-instance v5, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; + new-instance v0, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - const-string v7, "RIGHT" + const/4 v5, 0x4 - const/4 v8, 0x3 + const-string v6, "BOTTOM" - invoke-direct {v5, v7, v8}, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->(Ljava/lang/String;I)V + invoke-direct {v0, v6, v5}, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->(Ljava/lang/String;I)V - sput-object v5, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->RIGHT:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; + sput-object v0, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->BOTTOM:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - new-instance v7, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; + new-instance v0, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - const-string v9, "BOTTOM" + const/4 v6, 0x5 - const/4 v10, 0x4 + const-string v7, "BASELINE" - invoke-direct {v7, v9, v10}, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->(Ljava/lang/String;I)V + invoke-direct {v0, v7, v6}, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->(Ljava/lang/String;I)V - sput-object v7, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->BOTTOM:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; + sput-object v0, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->BASELINE:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - new-instance v9, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; + new-instance v0, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - const-string v11, "BASELINE" + const/4 v7, 0x6 - const/4 v12, 0x5 + const-string v8, "CENTER" - invoke-direct {v9, v11, v12}, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->(Ljava/lang/String;I)V + invoke-direct {v0, v8, v7}, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->(Ljava/lang/String;I)V - sput-object v9, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->BASELINE:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; + sput-object v0, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->CENTER:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - new-instance v11, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; + new-instance v0, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; + + const/4 v8, 0x7 - const-string v13, "CENTER" + const-string v9, "CENTER_X" - const/4 v14, 0x6 + invoke-direct {v0, v9, v8}, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->(Ljava/lang/String;I)V - invoke-direct {v11, v13, v14}, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->(Ljava/lang/String;I)V + sput-object v0, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->CENTER_X:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - sput-object v11, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->CENTER:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; + new-instance v0, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - new-instance v13, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; + const/16 v9, 0x8 - const-string v15, "CENTER_X" + const-string v10, "CENTER_Y" - const/4 v14, 0x7 + invoke-direct {v0, v10, v9}, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->(Ljava/lang/String;I)V - invoke-direct {v13, v15, v14}, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->(Ljava/lang/String;I)V + sput-object v0, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->CENTER_Y:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - sput-object v13, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->CENTER_X:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; + const/16 v0, 0x9 - new-instance v15, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; + new-array v0, v0, [Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - const-string v14, "CENTER_Y" + sget-object v10, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->NONE:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - const/16 v12, 0x8 + aput-object v10, v0, v1 - invoke-direct {v15, v14, v12}, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->(Ljava/lang/String;I)V + sget-object v1, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->LEFT:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - sput-object v15, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->CENTER_Y:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; + aput-object v1, v0, v2 - const/16 v14, 0x9 + sget-object v1, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->TOP:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - new-array v14, v14, [Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; + aput-object v1, v0, v3 - aput-object v0, v14, v2 + sget-object v1, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->RIGHT:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - aput-object v1, v14, v4 + aput-object v1, v0, v4 - aput-object v3, v14, v6 + sget-object v1, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->BOTTOM:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - aput-object v5, v14, v8 + aput-object v1, v0, v5 - aput-object v7, v14, v10 + sget-object v1, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->BASELINE:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - const/4 v0, 0x5 + aput-object v1, v0, v6 - aput-object v9, v14, v0 + sget-object v1, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->CENTER:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - const/4 v0, 0x6 + aput-object v1, v0, v7 - aput-object v11, v14, v0 + sget-object v1, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->CENTER_X:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - const/4 v0, 0x7 + aput-object v1, v0, v8 - aput-object v13, v14, v0 + sget-object v1, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->CENTER_Y:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - aput-object v15, v14, v12 + aput-object v1, v0, v9 - sput-object v14, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->$VALUES:[Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; + sput-object v0, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->$VALUES:[Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; return-void .end method diff --git a/smali/android/support/constraint/solver/widgets/ConstraintAnchor.smali b/smali/android/support/constraint/solver/widgets/ConstraintAnchor.smali index eda24406..96f832e9 100644 --- a/smali/android/support/constraint/solver/widgets/ConstraintAnchor.smali +++ b/smali/android/support/constraint/solver/widgets/ConstraintAnchor.smali @@ -224,6 +224,8 @@ iput-object p1, p0, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; .line 223 + iget-object p1, p0, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object p4, p1, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mDependents:Ljava/util/HashSet; if-nez p4, :cond_2 @@ -1082,20 +1084,26 @@ if-eqz p1, :cond_8 - if-nez v2, :cond_6 + if-nez v2, :cond_7 .line 292 sget-object p1, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->CENTER_Y:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - if-ne v1, p1, :cond_7 + if-ne v1, p1, :cond_6 + + goto :goto_2 :cond_6 - const/4 v0, 0x1 + const/4 v2, 0x0 + + goto :goto_3 :cond_7 - move v2, v0 + :goto_2 + const/4 v2, 0x1 :cond_8 + :goto_3 return v2 .line 282 @@ -1108,19 +1116,19 @@ if-ne v1, v2, :cond_9 - goto :goto_2 + goto :goto_4 :cond_9 const/4 v2, 0x0 - goto :goto_3 + goto :goto_5 :cond_a - :goto_2 + :goto_4 const/4 v2, 0x1 .line 283 - :goto_3 + :goto_5 invoke-virtual {p1}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->getOwner()Landroid/support/constraint/solver/widgets/ConstraintWidget; move-result-object p1 @@ -1129,20 +1137,26 @@ if-eqz p1, :cond_d - if-nez v2, :cond_b + if-nez v2, :cond_c .line 284 sget-object p1, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->CENTER_X:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - if-ne v1, p1, :cond_c + if-ne v1, p1, :cond_b + + goto :goto_6 :cond_b - const/4 v0, 0x1 + const/4 v2, 0x0 + + goto :goto_7 :cond_c - move v2, v0 + :goto_6 + const/4 v2, 0x1 :cond_d + :goto_7 return v2 .line 277 diff --git a/smali/android/support/constraint/solver/widgets/ConstraintWidget$1.smali b/smali/android/support/constraint/solver/widgets/ConstraintWidget$1.smali index 5120ebf2..07e46087 100644 --- a/smali/android/support/constraint/solver/widgets/ConstraintWidget$1.smali +++ b/smali/android/support/constraint/solver/widgets/ConstraintWidget$1.smali @@ -35,21 +35,23 @@ sput-object v0, Landroid/support/constraint/solver/widgets/ConstraintWidget$1;->$SwitchMap$android$support$constraint$solver$widgets$ConstraintWidget$DimensionBehaviour:[I - const/4 v1, 0x1 + const/4 v0, 0x1 :try_start_0 + sget-object v1, Landroid/support/constraint/solver/widgets/ConstraintWidget$1;->$SwitchMap$android$support$constraint$solver$widgets$ConstraintWidget$DimensionBehaviour:[I + sget-object v2, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->FIXED:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; invoke-virtual {v2}, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->ordinal()I move-result v2 - aput v1, v0, v2 + aput v0, v1, v2 :try_end_0 .catch Ljava/lang/NoSuchFieldError; {:try_start_0 .. :try_end_0} :catch_0 :catch_0 - const/4 v0, 0x2 + const/4 v1, 0x2 :try_start_1 sget-object v2, Landroid/support/constraint/solver/widgets/ConstraintWidget$1;->$SwitchMap$android$support$constraint$solver$widgets$ConstraintWidget$DimensionBehaviour:[I @@ -60,7 +62,7 @@ move-result v3 - aput v0, v2, v3 + aput v1, v2, v3 :try_end_1 .catch Ljava/lang/NoSuchFieldError; {:try_start_1 .. :try_end_1} :catch_1 @@ -109,19 +111,21 @@ sput-object v4, Landroid/support/constraint/solver/widgets/ConstraintWidget$1;->$SwitchMap$android$support$constraint$solver$widgets$ConstraintAnchor$Type:[I :try_start_4 + sget-object v4, Landroid/support/constraint/solver/widgets/ConstraintWidget$1;->$SwitchMap$android$support$constraint$solver$widgets$ConstraintAnchor$Type:[I + sget-object v5, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->LEFT:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; invoke-virtual {v5}, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->ordinal()I move-result v5 - aput v1, v4, v5 + aput v0, v4, v5 :try_end_4 .catch Ljava/lang/NoSuchFieldError; {:try_start_4 .. :try_end_4} :catch_4 :catch_4 :try_start_5 - sget-object v1, Landroid/support/constraint/solver/widgets/ConstraintWidget$1;->$SwitchMap$android$support$constraint$solver$widgets$ConstraintAnchor$Type:[I + sget-object v0, Landroid/support/constraint/solver/widgets/ConstraintWidget$1;->$SwitchMap$android$support$constraint$solver$widgets$ConstraintAnchor$Type:[I sget-object v4, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->TOP:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; @@ -129,7 +133,7 @@ move-result v4 - aput v0, v1, v4 + aput v1, v0, v4 :try_end_5 .catch Ljava/lang/NoSuchFieldError; {:try_start_5 .. :try_end_5} :catch_5 diff --git a/smali/android/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour.smali b/smali/android/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour.smali index 9ac6f5dd..fa00ef15 100644 --- a/smali/android/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour.smali +++ b/smali/android/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour.smali @@ -36,63 +36,71 @@ # direct methods .method static constructor ()V - .locals 9 + .locals 6 .line 334 new-instance v0, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - const-string v1, "FIXED" + const/4 v1, 0x0 - const/4 v2, 0x0 + const-string v2, "FIXED" - invoke-direct {v0, v1, v2}, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->(Ljava/lang/String;I)V + invoke-direct {v0, v2, v1}, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->(Ljava/lang/String;I)V sput-object v0, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->FIXED:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - new-instance v1, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + new-instance v0, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + + const/4 v2, 0x1 const-string v3, "WRAP_CONTENT" - const/4 v4, 0x1 + invoke-direct {v0, v3, v2}, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->(Ljava/lang/String;I)V - invoke-direct {v1, v3, v4}, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->(Ljava/lang/String;I)V + sput-object v0, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->WRAP_CONTENT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - sput-object v1, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->WRAP_CONTENT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + new-instance v0, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - new-instance v3, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + const/4 v3, 0x2 - const-string v5, "MATCH_CONSTRAINT" + const-string v4, "MATCH_CONSTRAINT" - const/4 v6, 0x2 + invoke-direct {v0, v4, v3}, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->(Ljava/lang/String;I)V - invoke-direct {v3, v5, v6}, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->(Ljava/lang/String;I)V + sput-object v0, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - sput-object v3, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + new-instance v0, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - new-instance v5, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + const/4 v4, 0x3 - const-string v7, "MATCH_PARENT" + const-string v5, "MATCH_PARENT" - const/4 v8, 0x3 + invoke-direct {v0, v5, v4}, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->(Ljava/lang/String;I)V - invoke-direct {v5, v7, v8}, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->(Ljava/lang/String;I)V + sput-object v0, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_PARENT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - sput-object v5, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_PARENT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + const/4 v0, 0x4 - const/4 v7, 0x4 + .line 333 + new-array v0, v0, [Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - new-array v7, v7, [Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + sget-object v5, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->FIXED:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - aput-object v0, v7, v2 + aput-object v5, v0, v1 - aput-object v1, v7, v4 + sget-object v1, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->WRAP_CONTENT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - aput-object v3, v7, v6 + aput-object v1, v0, v2 - aput-object v5, v7, v8 + sget-object v1, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - .line 333 - sput-object v7, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->$VALUES:[Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + aput-object v1, v0, v3 + + sget-object v1, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_PARENT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + + aput-object v1, v0, v4 + + sput-object v0, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->$VALUES:[Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; return-void .end method diff --git a/smali/android/support/constraint/solver/widgets/ConstraintWidget.smali b/smali/android/support/constraint/solver/widgets/ConstraintWidget.smali index c6d617c8..3ddcf5ab 100644 --- a/smali/android/support/constraint/solver/widgets/ConstraintWidget.smali +++ b/smali/android/support/constraint/solver/widgets/ConstraintWidget.smali @@ -269,7 +269,7 @@ .end method .method public constructor ()V - .locals 11 + .locals 10 .line 524 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -281,9 +281,9 @@ const/4 v1, 0x2 + .line 62 new-array v2, v1, [Landroid/support/constraint/solver/widgets/analyzer/WidgetRun; - .line 62 iput-object v2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->run:[Landroid/support/constraint/solver/widgets/analyzer/WidgetRun; const/4 v2, 0x0 @@ -294,18 +294,18 @@ .line 67 iput-object v2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->verticalRun:Landroid/support/constraint/solver/widgets/analyzer/VerticalWidgetRun; + .line 69 new-array v3, v1, [Z - .line 69 fill-array-data v3, :array_0 iput-object v3, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->isTerminalWidget:[Z const/4 v3, 0x4 + .line 70 new-array v4, v3, [I - .line 70 fill-array-data v4, :array_1 iput-object v4, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->wrapMeasure:[I @@ -344,9 +344,9 @@ .line 226 iput v0, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintDefaultHeight:I + .line 227 new-array v6, v1, [I - .line 227 iput-object v6, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mResolvedMatchConstraintDefault:[I .line 229 @@ -375,9 +375,9 @@ .line 239 iput v6, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mResolvedDimensionRatio:F + .line 241 new-array v6, v1, [I - .line 241 fill-array-data v6, :array_2 iput-object v6, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMaxDimension:[I @@ -471,38 +471,40 @@ iput-object v7, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mCenter:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - const/4 v8, 0x6 - - new-array v8, v8, [Landroid/support/constraint/solver/widgets/ConstraintAnchor; + const/4 v7, 0x6 .line 354 - iget-object v9, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + new-array v7, v7, [Landroid/support/constraint/solver/widgets/ConstraintAnchor; - aput-object v9, v8, v0 + iget-object v8, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iget-object v9, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + aput-object v8, v7, v0 - aput-object v9, v8, v4 + iget-object v8, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iget-object v9, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mTop:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + aput-object v8, v7, v4 - aput-object v9, v8, v1 + iget-object v8, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mTop:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iget-object v9, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBottom:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + aput-object v8, v7, v1 - const/4 v10, 0x3 + iget-object v8, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBottom:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - aput-object v9, v8, v10 + const/4 v9, 0x3 - iget-object v9, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBaseline:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + aput-object v8, v7, v9 - aput-object v9, v8, v3 + iget-object v8, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBaseline:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - const/4 v3, 0x5 + aput-object v8, v7, v3 - aput-object v7, v8, v3 + iget-object v3, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mCenter:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iput-object v8, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; + const/4 v8, 0x5 + + aput-object v3, v7, v8 + + iput-object v7, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; .line 355 new-instance v3, Ljava/util/ArrayList; @@ -511,14 +513,14 @@ iput-object v3, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mAnchors:Ljava/util/ArrayList; + .line 357 new-array v3, v1, [Z - .line 357 iput-object v3, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mIsInBarrier:[Z + .line 362 new-array v3, v1, [Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - .line 362 sget-object v7, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->FIXED:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; aput-object v7, v3, v0 @@ -594,29 +596,29 @@ .line 424 iput v0, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mVerticalChainStyle:I + .line 428 new-array v3, v1, [F - .line 428 fill-array-data v3, :array_3 iput-object v3, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mWeight:[F + .line 430 new-array v3, v1, [Landroid/support/constraint/solver/widgets/ConstraintWidget; aput-object v2, v3, v0 aput-object v2, v3, v4 - .line 430 iput-object v3, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListNextMatchConstraintsWidget:[Landroid/support/constraint/solver/widgets/ConstraintWidget; + .line 431 new-array v1, v1, [Landroid/support/constraint/solver/widgets/ConstraintWidget; aput-object v2, v1, v0 aput-object v2, v1, v4 - .line 431 iput-object v1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mNextChainWidget:[Landroid/support/constraint/solver/widgets/ConstraintWidget; .line 433 @@ -677,7 +679,7 @@ .end method .method public constructor (IIII)V - .locals 11 + .locals 10 .line 541 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -689,9 +691,9 @@ const/4 v1, 0x2 + .line 62 new-array v2, v1, [Landroid/support/constraint/solver/widgets/analyzer/WidgetRun; - .line 62 iput-object v2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->run:[Landroid/support/constraint/solver/widgets/analyzer/WidgetRun; const/4 v2, 0x0 @@ -702,18 +704,18 @@ .line 67 iput-object v2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->verticalRun:Landroid/support/constraint/solver/widgets/analyzer/VerticalWidgetRun; + .line 69 new-array v3, v1, [Z - .line 69 fill-array-data v3, :array_0 iput-object v3, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->isTerminalWidget:[Z const/4 v3, 0x4 + .line 70 new-array v4, v3, [I - .line 70 fill-array-data v4, :array_1 iput-object v4, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->wrapMeasure:[I @@ -752,9 +754,9 @@ .line 226 iput v0, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintDefaultHeight:I + .line 227 new-array v6, v1, [I - .line 227 iput-object v6, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mResolvedMatchConstraintDefault:[I .line 229 @@ -783,9 +785,9 @@ .line 239 iput v6, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mResolvedDimensionRatio:F + .line 241 new-array v6, v1, [I - .line 241 fill-array-data v6, :array_2 iput-object v6, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMaxDimension:[I @@ -879,38 +881,40 @@ iput-object v7, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mCenter:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - const/4 v8, 0x6 - - new-array v8, v8, [Landroid/support/constraint/solver/widgets/ConstraintAnchor; + const/4 v7, 0x6 .line 354 - iget-object v9, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + new-array v7, v7, [Landroid/support/constraint/solver/widgets/ConstraintAnchor; - aput-object v9, v8, v0 + iget-object v8, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iget-object v9, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + aput-object v8, v7, v0 - aput-object v9, v8, v4 + iget-object v8, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iget-object v9, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mTop:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + aput-object v8, v7, v4 - aput-object v9, v8, v1 + iget-object v8, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mTop:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iget-object v9, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBottom:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + aput-object v8, v7, v1 - const/4 v10, 0x3 + iget-object v8, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBottom:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - aput-object v9, v8, v10 + const/4 v9, 0x3 - iget-object v9, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBaseline:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + aput-object v8, v7, v9 - aput-object v9, v8, v3 + iget-object v8, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBaseline:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - const/4 v3, 0x5 + aput-object v8, v7, v3 - aput-object v7, v8, v3 + iget-object v3, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mCenter:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iput-object v8, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; + const/4 v8, 0x5 + + aput-object v3, v7, v8 + + iput-object v7, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; .line 355 new-instance v3, Ljava/util/ArrayList; @@ -919,14 +923,14 @@ iput-object v3, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mAnchors:Ljava/util/ArrayList; + .line 357 new-array v3, v1, [Z - .line 357 iput-object v3, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mIsInBarrier:[Z + .line 362 new-array v3, v1, [Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - .line 362 sget-object v7, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->FIXED:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; aput-object v7, v3, v0 @@ -940,12 +944,24 @@ .line 365 iput-object v2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mParent:Landroid/support/constraint/solver/widgets/ConstraintWidget; + .line 368 + iput v0, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mWidth:I + + .line 369 + iput v0, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mHeight:I + .line 370 iput v6, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mDimensionRatio:F .line 371 iput v5, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mDimensionRatioSide:I + .line 374 + iput v0, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mX:I + + .line 375 + iput v0, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mY:I + .line 376 iput v0, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRelX:I @@ -990,29 +1006,29 @@ .line 424 iput v0, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mVerticalChainStyle:I + .line 428 new-array v3, v1, [F - .line 428 fill-array-data v3, :array_3 iput-object v3, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mWeight:[F + .line 430 new-array v3, v1, [Landroid/support/constraint/solver/widgets/ConstraintWidget; aput-object v2, v3, v0 aput-object v2, v3, v4 - .line 430 iput-object v3, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListNextMatchConstraintsWidget:[Landroid/support/constraint/solver/widgets/ConstraintWidget; + .line 431 new-array v1, v1, [Landroid/support/constraint/solver/widgets/ConstraintWidget; aput-object v2, v1, v0 aput-object v2, v1, v4 - .line 431 iput-object v1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mNextChainWidget:[Landroid/support/constraint/solver/widgets/ConstraintWidget; .line 433 @@ -1074,7 +1090,7 @@ .end method .method public constructor (Ljava/lang/String;)V - .locals 11 + .locals 10 .line 528 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -1086,9 +1102,9 @@ const/4 v1, 0x2 + .line 62 new-array v2, v1, [Landroid/support/constraint/solver/widgets/analyzer/WidgetRun; - .line 62 iput-object v2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->run:[Landroid/support/constraint/solver/widgets/analyzer/WidgetRun; const/4 v2, 0x0 @@ -1099,18 +1115,18 @@ .line 67 iput-object v2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->verticalRun:Landroid/support/constraint/solver/widgets/analyzer/VerticalWidgetRun; + .line 69 new-array v3, v1, [Z - .line 69 fill-array-data v3, :array_0 iput-object v3, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->isTerminalWidget:[Z const/4 v3, 0x4 + .line 70 new-array v4, v3, [I - .line 70 fill-array-data v4, :array_1 iput-object v4, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->wrapMeasure:[I @@ -1149,9 +1165,9 @@ .line 226 iput v0, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintDefaultHeight:I + .line 227 new-array v6, v1, [I - .line 227 iput-object v6, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mResolvedMatchConstraintDefault:[I .line 229 @@ -1180,9 +1196,9 @@ .line 239 iput v6, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mResolvedDimensionRatio:F + .line 241 new-array v6, v1, [I - .line 241 fill-array-data v6, :array_2 iput-object v6, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMaxDimension:[I @@ -1276,38 +1292,40 @@ iput-object v7, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mCenter:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - const/4 v8, 0x6 - - new-array v8, v8, [Landroid/support/constraint/solver/widgets/ConstraintAnchor; + const/4 v7, 0x6 .line 354 - iget-object v9, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + new-array v7, v7, [Landroid/support/constraint/solver/widgets/ConstraintAnchor; - aput-object v9, v8, v0 + iget-object v8, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iget-object v9, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + aput-object v8, v7, v0 - aput-object v9, v8, v4 + iget-object v8, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iget-object v9, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mTop:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + aput-object v8, v7, v4 - aput-object v9, v8, v1 + iget-object v8, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mTop:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iget-object v9, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBottom:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + aput-object v8, v7, v1 - const/4 v10, 0x3 + iget-object v8, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBottom:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - aput-object v9, v8, v10 + const/4 v9, 0x3 - iget-object v9, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBaseline:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + aput-object v8, v7, v9 - aput-object v9, v8, v3 + iget-object v8, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBaseline:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - const/4 v3, 0x5 + aput-object v8, v7, v3 - aput-object v7, v8, v3 + iget-object v3, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mCenter:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iput-object v8, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; + const/4 v8, 0x5 + + aput-object v3, v7, v8 + + iput-object v7, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; .line 355 new-instance v3, Ljava/util/ArrayList; @@ -1316,14 +1334,14 @@ iput-object v3, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mAnchors:Ljava/util/ArrayList; + .line 357 new-array v3, v1, [Z - .line 357 iput-object v3, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mIsInBarrier:[Z + .line 362 new-array v3, v1, [Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - .line 362 sget-object v7, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->FIXED:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; aput-object v7, v3, v0 @@ -1399,29 +1417,29 @@ .line 424 iput v0, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mVerticalChainStyle:I + .line 428 new-array v3, v1, [F - .line 428 fill-array-data v3, :array_3 iput-object v3, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mWeight:[F + .line 430 new-array v3, v1, [Landroid/support/constraint/solver/widgets/ConstraintWidget; aput-object v2, v3, v0 aput-object v2, v3, v4 - .line 430 iput-object v3, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListNextMatchConstraintsWidget:[Landroid/support/constraint/solver/widgets/ConstraintWidget; + .line 431 new-array v1, v1, [Landroid/support/constraint/solver/widgets/ConstraintWidget; aput-object v2, v1, v0 aput-object v2, v1, v4 - .line 431 iput-object v1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mNextChainWidget:[Landroid/support/constraint/solver/widgets/ConstraintWidget; .line 433 @@ -1562,7 +1580,7 @@ .end method .method private applyConstraints(Landroid/support/constraint/solver/LinearSystem;ZZZZLandroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;ZLandroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;IIIIFZZZZZIIIIFZ)V - .locals 31 + .locals 34 move-object/from16 v0, p0 @@ -1652,410 +1670,408 @@ move-result v16 - if-eqz v12, :cond_1 + if-eqz v11, :cond_1 - add-int/lit8 v5, v11, 0x1 + const/16 v18, 0x1 goto :goto_0 :cond_1 - move v5, v11 + const/16 v18, 0x0 :goto_0 - if-eqz v16, :cond_2 + if-eqz v12, :cond_2 - add-int/lit8 v5, v5, 0x1 + add-int/lit8 v18, v18, 0x1 :cond_2 - if-eqz p17, :cond_3 + if-eqz v16, :cond_3 + + add-int/lit8 v18, v18, 0x1 + + :cond_3 + move/from16 v19, v18 + + if-eqz p17, :cond_4 - const/16 v18, 0x3 + const/16 v20, 0x3 goto :goto_1 - :cond_3 - move/from16 v18, p22 + :cond_4 + move/from16 v20, p22 .line 2644 :goto_1 - sget-object v17, Landroid/support/constraint/solver/widgets/ConstraintWidget$1;->$SwitchMap$android$support$constraint$solver$widgets$ConstraintWidget$DimensionBehaviour:[I + sget-object v21, Landroid/support/constraint/solver/widgets/ConstraintWidget$1;->$SwitchMap$android$support$constraint$solver$widgets$ConstraintWidget$DimensionBehaviour:[I invoke-virtual/range {p8 .. p8}, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->ordinal()I - move-result v19 + move-result v22 - aget v2, v17, v19 + aget v5, v21, v22 - const/4 v14, 0x1 + const/4 v2, 0x2 - if-eq v2, v14, :cond_4 + const/4 v14, 0x1 - const/4 v14, 0x2 + if-eq v5, v14, :cond_5 - if-eq v2, v14, :cond_4 + if-eq v5, v2, :cond_5 const/4 v14, 0x3 - if-eq v2, v14, :cond_4 + if-eq v5, v14, :cond_5 const/4 v14, 0x4 - if-eq v2, v14, :cond_6 - - :cond_4 - move/from16 v2, v18 + if-eq v5, v14, :cond_7 :cond_5 - const/16 v18, 0x0 + move/from16 v5, v20 + + :cond_6 + const/16 v20, 0x0 goto :goto_2 - :cond_6 - move/from16 v2, v18 + :cond_7 + move/from16 v5, v20 - if-eq v2, v14, :cond_5 + if-eq v5, v14, :cond_6 - const/16 v18, 0x1 + const/16 v20, 0x1 .line 2663 :goto_2 iget v14, v0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mVisibility:I - const/16 v13, 0x8 + const/16 v2, 0x8 - if-ne v14, v13, :cond_7 + if-ne v14, v2, :cond_8 const/4 v14, 0x0 - const/16 v18, 0x0 + const/16 v20, 0x0 goto :goto_3 - :cond_7 + :cond_8 move/from16 v14, p13 :goto_3 - if-eqz p27, :cond_9 + if-eqz p27, :cond_a - if-nez v11, :cond_8 + if-nez v11, :cond_9 - if-nez v12, :cond_8 + if-nez v12, :cond_9 - if-nez v16, :cond_8 + if-nez v16, :cond_9 - move/from16 v13, p12 + move/from16 v2, p12 .line 2671 - invoke-virtual {v10, v9, v13}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;I)V + invoke-virtual {v10, v9, v2}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;I)V goto :goto_4 - :cond_8 - if-eqz v11, :cond_9 + :cond_9 + if-eqz v11, :cond_a - if-nez v12, :cond_9 + if-nez v12, :cond_a .line 2673 invoke-virtual/range {p10 .. p10}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->getMargin()I - move-result v13 + move-result v2 - move-object/from16 v21, v6 + move-object/from16 v22, v6 const/16 v6, 0x8 - invoke-virtual {v10, v9, v7, v13, v6}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; + invoke-virtual {v10, v9, v7, v2, v6}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; goto :goto_5 - :cond_9 + :cond_a :goto_4 - move-object/from16 v21, v6 + move-object/from16 v22, v6 const/16 v6, 0x8 :goto_5 - if-nez v18, :cond_d + if-nez v20, :cond_e - if-eqz p9, :cond_b + if-eqz p9, :cond_c - const/4 v6, 0x0 + const/4 v2, 0x3 - const/4 v13, 0x3 + const/4 v6, 0x0 .line 2680 - invoke-virtual {v10, v8, v9, v6, v13}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; + invoke-virtual {v10, v8, v9, v6, v2}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; - const/16 v13, 0x8 + if-lez v15, :cond_b - if-lez v15, :cond_a + const/16 v14, 0x8 .line 2682 - invoke-virtual {v10, v8, v9, v15, v13}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V - - :cond_a - const v14, 0x7fffffff - - if-ge v1, v14, :cond_c - - .line 2685 - invoke-virtual {v10, v8, v9, v1, v13}, Landroid/support/constraint/solver/LinearSystem;->addLowerThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V + invoke-virtual {v10, v8, v9, v15, v14}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V goto :goto_6 :cond_b - const/4 v6, 0x0 + const/16 v14, 0x8 - const/16 v13, 0x8 + :goto_6 + const v2, 0x7fffffff - .line 2688 - invoke-virtual {v10, v8, v9, v14, v13}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; + if-ge v1, v2, :cond_d - :cond_c - :goto_6 - move/from16 v22, v3 + .line 2685 + invoke-virtual {v10, v8, v9, v1, v14}, Landroid/support/constraint/solver/LinearSystem;->addLowerThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V + + goto :goto_7 - move v1, v4 + :cond_c + const/16 v1, 0x8 - move-object v14, v7 + const/4 v6, 0x0 - move-object v15, v8 + .line 2688 + invoke-virtual {v10, v8, v9, v14, v1}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; + :cond_d :goto_7 - move/from16 v23, v18 + move/from16 v23, v3 - move-object/from16 v13, v21 + move v15, v5 - const/16 v19, 0x0 + move-object v1, v7 + + move-object v14, v8 - move/from16 v18, p5 + move-object/from16 v2, v22 + + move/from16 v22, v19 :goto_8 - move/from16 v21, v5 + move/from16 v19, p5 goto/16 :goto_11 - :cond_d - const/4 v1, 0x2 + :cond_e + move/from16 v1, v19 + + const/4 v2, 0x2 const/4 v6, 0x0 - if-eq v5, v1, :cond_10 + if-eq v1, v2, :cond_11 - if-nez p17, :cond_10 + if-nez p17, :cond_11 - const/4 v1, 0x1 + const/4 v2, 0x1 - if-eq v2, v1, :cond_e + if-eq v5, v2, :cond_f - if-nez v2, :cond_10 + if-nez v5, :cond_11 .line 2696 - :cond_e + :cond_f invoke-static {v3, v14}, Ljava/lang/Math;->max(II)I - move-result v1 + move-result v2 - if-lez v4, :cond_f + if-lez v4, :cond_10 .line 2698 - invoke-static {v4, v1}, Ljava/lang/Math;->min(II)I + invoke-static {v4, v2}, Ljava/lang/Math;->min(II)I - move-result v1 + move-result v2 - :cond_f - const/16 v13, 0x8 + :cond_10 + const/16 v14, 0x8 .line 2700 - invoke-virtual {v10, v8, v9, v1, v13}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; - - move/from16 v18, p5 - - move/from16 v22, v3 + invoke-virtual {v10, v8, v9, v2, v14}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; - move v1, v4 + move/from16 v19, p5 - move-object v14, v7 + move/from16 v23, v3 - move-object v15, v8 + move v15, v5 - move-object/from16 v13, v21 + move-object v14, v8 - const/16 v19, 0x0 + move-object/from16 v2, v22 - const/16 v23, 0x0 + const/16 v20, 0x0 - goto :goto_8 + :goto_9 + move/from16 v22, v1 - :cond_10 - const/4 v1, -0x2 + move-object v1, v7 - if-ne v3, v1, :cond_11 + goto/16 :goto_11 - move v13, v14 + :cond_11 + const/4 v2, -0x2 - goto :goto_9 + if-ne v3, v2, :cond_12 - :cond_11 - move v13, v3 + move v3, v14 - :goto_9 - if-ne v4, v1, :cond_12 + :cond_12 + if-ne v4, v2, :cond_13 - move v1, v14 + move v2, v14 goto :goto_a - :cond_12 - move v1, v4 + :cond_13 + move v2, v4 :goto_a - if-lez v14, :cond_13 + if-lez v14, :cond_14 - const/4 v3, 0x1 + const/4 v4, 0x1 - if-eq v2, v3, :cond_13 + if-eq v5, v4, :cond_14 const/4 v14, 0x0 - :cond_13 - if-lez v13, :cond_14 + :cond_14 + if-lez v3, :cond_15 - const/16 v3, 0x8 + const/16 v4, 0x8 .line 2717 - invoke-virtual {v10, v8, v9, v13, v3}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V + invoke-virtual {v10, v8, v9, v3, v4}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V .line 2718 - invoke-static {v14, v13}, Ljava/lang/Math;->max(II)I + invoke-static {v14, v3}, Ljava/lang/Math;->max(II)I move-result v14 - :cond_14 - if-lez v1, :cond_17 + :cond_15 + if-lez v2, :cond_18 - if-eqz p3, :cond_15 + if-eqz p3, :cond_16 - const/4 v3, 0x1 + const/4 v4, 0x1 - if-ne v2, v3, :cond_15 + if-ne v5, v4, :cond_16 - const/4 v3, 0x0 + const/4 v4, 0x0 goto :goto_b - :cond_15 - const/4 v3, 0x1 + :cond_16 + const/4 v4, 0x1 :goto_b - if-eqz v3, :cond_16 + if-eqz v4, :cond_17 - const/16 v3, 0x8 + const/16 v4, 0x8 .line 2726 - invoke-virtual {v10, v8, v9, v1, v3}, Landroid/support/constraint/solver/LinearSystem;->addLowerThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V + invoke-virtual {v10, v8, v9, v2, v4}, Landroid/support/constraint/solver/LinearSystem;->addLowerThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V goto :goto_c - :cond_16 - const/16 v3, 0x8 + :cond_17 + const/16 v4, 0x8 .line 2728 :goto_c - invoke-static {v14, v1}, Ljava/lang/Math;->min(II)I + invoke-static {v14, v2}, Ljava/lang/Math;->min(II)I move-result v14 goto :goto_d - :cond_17 - const/16 v3, 0x8 + :cond_18 + const/16 v4, 0x8 :goto_d - const/4 v4, 0x1 + const/4 v6, 0x1 - if-ne v2, v4, :cond_1a + if-ne v5, v6, :cond_1b - if-eqz p3, :cond_18 + if-eqz p3, :cond_19 .line 2732 - invoke-virtual {v10, v8, v9, v14, v3}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; + invoke-virtual {v10, v8, v9, v14, v4}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; goto :goto_e - :cond_18 - if-eqz p19, :cond_19 + :cond_19 + if-eqz p19, :cond_1a - const/4 v4, 0x5 + const/4 v6, 0x5 .line 2734 - invoke-virtual {v10, v8, v9, v14, v4}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; + invoke-virtual {v10, v8, v9, v14, v6}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; .line 2735 - invoke-virtual {v10, v8, v9, v14, v3}, Landroid/support/constraint/solver/LinearSystem;->addLowerThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V + invoke-virtual {v10, v8, v9, v14, v4}, Landroid/support/constraint/solver/LinearSystem;->addLowerThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V goto :goto_e - :cond_19 - const/4 v4, 0x5 + :cond_1a + const/4 v6, 0x5 .line 2737 - invoke-virtual {v10, v8, v9, v14, v4}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; + invoke-virtual {v10, v8, v9, v14, v6}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; .line 2738 - invoke-virtual {v10, v8, v9, v14, v3}, Landroid/support/constraint/solver/LinearSystem;->addLowerThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V + invoke-virtual {v10, v8, v9, v14, v4}, Landroid/support/constraint/solver/LinearSystem;->addLowerThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V :goto_e - move-object v14, v7 + move/from16 v19, p5 - move-object v15, v8 + move v4, v2 - move/from16 v22, v13 + move/from16 v23, v3 - goto/16 :goto_7 + move v15, v5 - :cond_1a + move-object v14, v8 + + move-object/from16 v2, v22 + + goto :goto_9 + + :cond_1b const/4 v14, 0x2 - if-ne v2, v14, :cond_1d + if-ne v5, v14, :cond_1e .line 2743 invoke-virtual/range {p10 .. p10}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->getType()Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - move-result-object v3 + move-result-object v4 - sget-object v4, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->TOP:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; + sget-object v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->TOP:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - if-eq v3, v4, :cond_1c + if-eq v4, v6, :cond_1d invoke-virtual/range {p10 .. p10}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->getType()Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - move-result-object v3 + move-result-object v4 - sget-object v4, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->BOTTOM:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; + sget-object v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->BOTTOM:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - if-ne v3, v4, :cond_1b + if-ne v4, v6, :cond_1c goto :goto_f .line 2748 - :cond_1b - iget-object v3, v0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mParent:Landroid/support/constraint/solver/widgets/ConstraintWidget; - - sget-object v4, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->LEFT:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - - invoke-virtual {v3, v4}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getAnchor(Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;)Landroid/support/constraint/solver/widgets/ConstraintAnchor; - - move-result-object v3 - - invoke-virtual {v10, v3}, Landroid/support/constraint/solver/LinearSystem;->createObjectVariable(Ljava/lang/Object;)Landroid/support/constraint/solver/SolverVariable; - - move-result-object v3 - - .line 2749 + :cond_1c iget-object v4, v0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mParent:Landroid/support/constraint/solver/widgets/ConstraintWidget; - sget-object v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->RIGHT:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; + sget-object v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->LEFT:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; invoke-virtual {v4, v6}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getAnchor(Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;)Landroid/support/constraint/solver/widgets/ConstraintAnchor; @@ -2065,27 +2081,27 @@ move-result-object v4 - goto :goto_10 + .line 2749 + iget-object v6, v0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mParent:Landroid/support/constraint/solver/widgets/ConstraintWidget; - .line 2745 - :cond_1c - :goto_f - iget-object v3, v0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mParent:Landroid/support/constraint/solver/widgets/ConstraintWidget; + sget-object v14, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->RIGHT:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - sget-object v4, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->TOP:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; + invoke-virtual {v6, v14}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getAnchor(Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;)Landroid/support/constraint/solver/widgets/ConstraintAnchor; - invoke-virtual {v3, v4}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getAnchor(Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;)Landroid/support/constraint/solver/widgets/ConstraintAnchor; + move-result-object v6 - move-result-object v3 + invoke-virtual {v10, v6}, Landroid/support/constraint/solver/LinearSystem;->createObjectVariable(Ljava/lang/Object;)Landroid/support/constraint/solver/SolverVariable; - invoke-virtual {v10, v3}, Landroid/support/constraint/solver/LinearSystem;->createObjectVariable(Ljava/lang/Object;)Landroid/support/constraint/solver/SolverVariable; + move-result-object v6 - move-result-object v3 + goto :goto_10 - .line 2746 + .line 2745 + :cond_1d + :goto_f iget-object v4, v0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mParent:Landroid/support/constraint/solver/widgets/ConstraintWidget; - sget-object v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->BOTTOM:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; + sget-object v6, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->TOP:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; invoke-virtual {v4, v6}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getAnchor(Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;)Landroid/support/constraint/solver/widgets/ConstraintAnchor; @@ -2095,35 +2111,50 @@ move-result-object v4 - :goto_10 - move-object/from16 v18, v3 + .line 2746 + iget-object v6, v0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mParent:Landroid/support/constraint/solver/widgets/ConstraintWidget; - move-object v6, v4 + sget-object v14, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->BOTTOM:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; - .line 2751 - invoke-virtual/range {p1 .. p1}, Landroid/support/constraint/solver/LinearSystem;->createRow()Landroid/support/constraint/solver/ArrayRow; + invoke-virtual {v6, v14}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getAnchor(Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;)Landroid/support/constraint/solver/widgets/ConstraintAnchor; - move-result-object v3 + move-result-object v6 + + invoke-virtual {v10, v6}, Landroid/support/constraint/solver/LinearSystem;->createObjectVariable(Ljava/lang/Object;)Landroid/support/constraint/solver/SolverVariable; + + move-result-object v6 + + :goto_10 + move-object v14, v4 + + .line 2751 + invoke-virtual/range {p1 .. p1}, Landroid/support/constraint/solver/LinearSystem;->createRow()Landroid/support/constraint/solver/ArrayRow; + + move-result-object v4 + + move/from16 v19, v3 + + move-object v3, v4 move-object v4, v8 - move v14, v5 + move/from16 p9, v2 - move-object v5, v9 + move v15, v5 - move/from16 p9, v13 + const/4 v2, 0x0 - move-object/from16 v13, v21 + move-object v5, v9 - const/16 v19, 0x0 + move-object/from16 v2, v22 - move/from16 v21, v14 + move/from16 v22, v1 - move-object v14, v7 + move-object v1, v7 - move-object/from16 v7, v18 + move-object v7, v14 - move-object v15, v8 + move-object v14, v8 move/from16 v8, p26 @@ -2133,74 +2164,78 @@ invoke-virtual {v10, v3}, Landroid/support/constraint/solver/LinearSystem;->addConstraint(Landroid/support/constraint/solver/ArrayRow;)V - move/from16 v18, p5 + move/from16 v4, p9 + + move/from16 v23, v19 - move/from16 v22, p9 + const/16 v20, 0x0 - const/16 v23, 0x0 + goto/16 :goto_8 - goto :goto_11 + :cond_1e + move/from16 p9, v2 - :cond_1d - move-object v14, v7 + move/from16 v19, v3 - move-object v15, v8 + move v15, v5 - move/from16 p9, v13 + move-object v14, v8 - move-object/from16 v13, v21 + move-object/from16 v2, v22 - const/16 v19, 0x0 + move/from16 v22, v1 - move/from16 v21, v5 + move-object v1, v7 - move/from16 v22, p9 + move/from16 v4, p9 - move/from16 v23, v18 + move/from16 v23, v19 - const/16 v18, 0x1 + const/16 v19, 0x1 :goto_11 - if-eqz p27, :cond_58 + if-eqz p27, :cond_5a - if-eqz p19, :cond_1e + if-eqz p19, :cond_1f - move-object/from16 v1, p6 + move-object/from16 v3, p6 move-object/from16 v4, p7 - move-object v2, v15 - - move/from16 v5, v21 - - const/4 v3, 0x0 + move-object v7, v9 - const/4 v6, 0x2 + move/from16 v2, v22 - move-object v15, v9 + const/4 v1, 0x0 - goto/16 :goto_2d + const/4 v5, 0x2 - :cond_1e - if-nez v11, :cond_1f - - if-nez v12, :cond_1f + const/16 v13, 0x8 - if-nez v16, :cond_1f + const/16 v21, 0x1 - goto/16 :goto_2a + goto/16 :goto_2f :cond_1f - if-eqz v11, :cond_20 + if-nez v11, :cond_20 if-nez v12, :cond_20 - goto/16 :goto_2a + if-nez v16, :cond_20 + + goto/16 :goto_2b :cond_20 - if-nez v11, :cond_23 + if-eqz v11, :cond_21 - if-eqz v12, :cond_23 + if-nez v12, :cond_21 + + goto/16 :goto_2b + + :cond_21 + if-nez v11, :cond_24 + + if-eqz v12, :cond_24 .line 2799 invoke-virtual/range {p11 .. p11}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->getMargin()I @@ -2209,118 +2244,108 @@ neg-int v1, v1 - const/16 v2, 0x8 + const/16 v3, 0x8 - invoke-virtual {v10, v15, v13, v1, v2}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; + invoke-virtual {v10, v14, v2, v1, v3}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; - if-eqz p3, :cond_53 + if-eqz p3, :cond_55 .line 2801 iget-boolean v1, v0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->OPTIMIZE_WRAP:Z - if-eqz v1, :cond_22 + if-eqz v1, :cond_23 iget-boolean v1, v9, Landroid/support/constraint/solver/SolverVariable;->isFinalValue:Z - if-eqz v1, :cond_22 + if-eqz v1, :cond_23 iget-object v1, v0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mParent:Landroid/support/constraint/solver/widgets/ConstraintWidget; - if-eqz v1, :cond_22 + if-eqz v1, :cond_23 .line 2802 check-cast v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer; - if-eqz p2, :cond_21 - - move-object/from16 v7, p10 - - const/4 v8, 0x0 + if-eqz p2, :cond_22 .line 2804 - invoke-virtual {v1, v7}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->addHorizontalWrapMinVariable(Landroid/support/constraint/solver/widgets/ConstraintAnchor;)V - - goto/16 :goto_2a + invoke-virtual {v1, v13}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->addHorizontalWrapMinVariable(Landroid/support/constraint/solver/widgets/ConstraintAnchor;)V - :cond_21 - move-object/from16 v7, p10 - - const/4 v8, 0x0 + goto/16 :goto_2b .line 2806 - invoke-virtual {v1, v7}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->addVerticalWrapMinVariable(Landroid/support/constraint/solver/widgets/ConstraintAnchor;)V - - goto/16 :goto_2a - :cond_22 - const/4 v8, 0x0 + invoke-virtual {v1, v13}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->addVerticalWrapMinVariable(Landroid/support/constraint/solver/widgets/ConstraintAnchor;)V - move-object/from16 v6, p6 + goto/16 :goto_2b + + :cond_23 + move-object/from16 v8, p6 const/4 v1, 0x5 - .line 2812 - invoke-virtual {v10, v9, v6, v8, v1}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V + const/4 v3, 0x0 - goto/16 :goto_2a + .line 2812 + invoke-virtual {v10, v9, v8, v3, v1}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V - :cond_23 - move-object/from16 v6, p6 + goto/16 :goto_2b - move-object/from16 v7, p10 + :cond_24 + move-object/from16 v8, p6 - const/4 v8, 0x0 + const/4 v3, 0x0 - if-eqz v11, :cond_53 + if-eqz v11, :cond_55 - if-eqz v12, :cond_53 + if-eqz v12, :cond_55 .line 2827 - iget-object v3, v7, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v5, v13, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iget-object v11, v3, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mOwner:Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object v11, v5, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mOwner:Landroid/support/constraint/solver/widgets/ConstraintWidget; move-object/from16 v12, p11 - const/4 v3, 0x2 + const/16 v16, 0x4 .line 2828 - iget-object v4, v12, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v5, v12, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iget-object v5, v4, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mOwner:Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object v7, v5, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mOwner:Landroid/support/constraint/solver/widgets/ConstraintWidget; .line 2829 invoke-virtual/range {p0 .. p0}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getParent()Landroid/support/constraint/solver/widgets/ConstraintWidget; - move-result-object v4 + move-result-object v6 - const/16 v16, 0x6 + const/16 v18, 0x6 - if-eqz v23, :cond_36 + if-eqz v20, :cond_37 - if-nez v2, :cond_28 + if-nez v15, :cond_29 - if-nez v1, :cond_25 + if-nez v4, :cond_26 - if-nez v22, :cond_25 + if-nez v23, :cond_26 .line 2838 - iget-boolean v1, v14, Landroid/support/constraint/solver/SolverVariable;->isFinalValue:Z + iget-boolean v4, v1, Landroid/support/constraint/solver/SolverVariable;->isFinalValue:Z - if-eqz v1, :cond_24 + if-eqz v4, :cond_25 - iget-boolean v1, v13, Landroid/support/constraint/solver/SolverVariable;->isFinalValue:Z + iget-boolean v4, v2, Landroid/support/constraint/solver/SolverVariable;->isFinalValue:Z - if-eqz v1, :cond_24 + if-eqz v4, :cond_25 .line 2839 invoke-virtual/range {p10 .. p10}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->getMargin()I - move-result v1 + move-result v3 - const/16 v2, 0x8 + const/16 v5, 0x8 - invoke-virtual {v10, v9, v14, v1, v2}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; + invoke-virtual {v10, v9, v1, v3, v5}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; .line 2840 invoke-virtual/range {p11 .. p11}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->getMargin()I @@ -2329,423 +2354,485 @@ neg-int v1, v1 - invoke-virtual {v10, v15, v13, v1, v2}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; + invoke-virtual {v10, v14, v2, v1, v5}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; return-void - :cond_24 - const/4 v1, 0x0 + :cond_25 + const/16 v5, 0x8 - const/4 v3, 0x1 + const/4 v4, 0x0 - const/16 v19, 0x0 + const/16 v21, 0x1 - const/16 v21, 0x8 + const/16 v22, 0x0 const/16 v24, 0x8 + const/16 v25, 0x8 + goto :goto_12 - :cond_25 - const/4 v1, 0x1 + :cond_26 + const/16 v5, 0x8 - const/4 v3, 0x0 + const/4 v4, 0x1 - const/16 v19, 0x1 + const/16 v21, 0x0 - const/16 v21, 0x5 + const/16 v22, 0x1 const/16 v24, 0x5 + const/16 v25, 0x5 + .line 2850 :goto_12 - instance-of v8, v11, Landroid/support/constraint/solver/widgets/Barrier; + instance-of v3, v11, Landroid/support/constraint/solver/widgets/Barrier; - if-nez v8, :cond_27 + if-nez v3, :cond_28 - instance-of v8, v5, Landroid/support/constraint/solver/widgets/Barrier; + instance-of v3, v7, Landroid/support/constraint/solver/widgets/Barrier; - if-eqz v8, :cond_26 + if-eqz v3, :cond_27 goto :goto_13 - :cond_26 - move-object/from16 v8, p7 + :cond_27 + move/from16 v17, v22 + + move/from16 v27, v24 + + move/from16 v26, v25 + + const/4 v3, 0x5 + + const/4 v5, 0x1 + + const/16 v24, 0x6 + + move/from16 v22, v4 move/from16 v25, v21 goto :goto_14 - :cond_27 + :cond_28 :goto_13 - move-object/from16 v8, p7 - move/from16 v25, v21 - const/16 v24, 0x4 + move/from16 v17, v22 - :goto_14 - move/from16 v21, v3 + move/from16 v27, v24 + + const/4 v3, 0x5 + + const/4 v5, 0x1 - const/4 v3, 0x6 + const/16 v24, 0x6 + + const/16 v26, 0x4 + + move/from16 v22, v4 + + :goto_14 + move-object/from16 v4, p7 goto/16 :goto_1f - :cond_28 - const/4 v8, 0x1 + :cond_29 + const/4 v3, 0x1 - if-ne v2, v8, :cond_29 + const/16 v5, 0x8 - move-object/from16 v8, p7 + if-ne v15, v3, :cond_2a - const/4 v1, 0x1 + move-object/from16 v4, p7 - const/4 v3, 0x6 + const/4 v3, 0x5 - const/16 v19, 0x1 + const/4 v5, 0x1 - const/16 v21, 0x0 + const/16 v17, 0x1 - const/16 v24, 0x4 + const/16 v22, 0x1 + + const/16 v24, 0x6 + + const/16 v25, 0x0 + + const/16 v26, 0x4 :goto_15 - const/16 v25, 0x8 + const/16 v27, 0x8 goto/16 :goto_1f - :cond_29 - const/4 v8, 0x3 + :cond_2a + const/4 v3, 0x3 - if-ne v2, v8, :cond_35 + if-ne v15, v3, :cond_36 .line 2858 - iget v8, v0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mResolvedDimensionRatioSide:I + iget v3, v0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mResolvedDimensionRatioSide:I - const/4 v3, -0x1 - - if-ne v8, v3, :cond_2c + const/4 v5, -0x1 - if-eqz p20, :cond_2b + if-ne v3, v5, :cond_2d - move-object/from16 v8, p7 + if-eqz p20, :cond_2c - const/4 v1, 0x1 + if-eqz p3, :cond_2b - if-eqz p3, :cond_2a + move-object/from16 v4, p7 const/4 v3, 0x5 - goto :goto_16 + const/4 v5, 0x1 - :cond_2a - const/4 v3, 0x4 + const/16 v17, 0x1 + + const/16 v22, 0x1 + + const/16 v24, 0x5 goto :goto_16 :cond_2b - move-object/from16 v8, p7 + move-object/from16 v4, p7 - const/4 v1, 0x1 + const/4 v3, 0x5 - const/16 v3, 0x8 + const/4 v5, 0x1 - :goto_16 - const/16 v19, 0x1 + const/16 v17, 0x1 - const/16 v21, 0x1 + const/16 v22, 0x1 - const/16 v24, 0x5 + const/16 v24, 0x4 - goto :goto_15 + goto :goto_16 :cond_2c - if-eqz p17, :cond_30 + move-object/from16 v4, p7 + + const/4 v3, 0x5 + + const/4 v5, 0x1 + + const/16 v17, 0x1 + + const/16 v22, 0x1 + + const/16 v24, 0x8 + + :goto_16 + const/16 v25, 0x1 + + const/16 v26, 0x5 + + goto :goto_15 + + :cond_2d + if-eqz p17, :cond_31 move/from16 v3, p23 - const/4 v8, 0x2 + const/4 v5, 0x2 - if-eq v3, v8, :cond_2e + if-eq v3, v5, :cond_2f - const/4 v1, 0x1 + const/4 v5, 0x1 - if-ne v3, v1, :cond_2d + if-ne v3, v5, :cond_2e goto :goto_17 - :cond_2d - const/4 v1, 0x0 + :cond_2e + const/4 v3, 0x0 goto :goto_18 - :cond_2e + :cond_2f + const/4 v5, 0x1 + :goto_17 - const/4 v1, 0x1 + const/4 v3, 0x1 :goto_18 - if-nez v1, :cond_2f + if-nez v3, :cond_30 - const/16 v1, 0x8 + const/16 v3, 0x8 - const/4 v3, 0x5 + const/4 v4, 0x5 goto :goto_19 - :cond_2f - const/4 v1, 0x5 + :cond_30 + const/4 v3, 0x5 - const/4 v3, 0x4 + const/4 v4, 0x4 :goto_19 - move-object/from16 v8, p7 + move/from16 v27, v3 - move/from16 v25, v1 + move/from16 v26, v4 - move/from16 v24, v3 + const/4 v3, 0x5 - const/4 v1, 0x1 + const/16 v17, 0x1 - const/4 v3, 0x6 + const/16 v22, 0x1 - const/16 v19, 0x1 + const/16 v24, 0x6 - const/16 v21, 0x1 + const/16 v25, 0x1 - goto/16 :goto_1f + goto :goto_14 - :cond_30 - if-lez v1, :cond_31 + :cond_31 + const/4 v5, 0x1 - move-object/from16 v8, p7 + if-lez v4, :cond_32 - const/4 v1, 0x1 + move-object/from16 v4, p7 - const/4 v3, 0x6 + const/4 v3, 0x5 - const/16 v19, 0x1 + const/16 v17, 0x1 - const/16 v21, 0x1 + const/16 v22, 0x1 - const/16 v24, 0x5 + const/16 v24, 0x6 + + const/16 v25, 0x1 + + const/16 v26, 0x5 goto/16 :goto_1e - :cond_31 - if-nez v1, :cond_34 + :cond_32 + if-nez v4, :cond_35 - if-nez v22, :cond_34 + if-nez v23, :cond_35 - if-nez p20, :cond_32 + if-nez p20, :cond_33 - move-object/from16 v8, p7 + move-object/from16 v4, p7 - const/4 v1, 0x1 + const/4 v3, 0x5 - const/4 v3, 0x6 + const/16 v17, 0x1 - const/16 v19, 0x1 + const/16 v22, 0x1 - const/16 v21, 0x1 + const/16 v24, 0x6 - const/16 v24, 0x8 + const/16 v25, 0x1 + + const/16 v26, 0x8 goto/16 :goto_1e - :cond_32 - if-eq v11, v4, :cond_33 + :cond_33 + if-eq v11, v6, :cond_34 - if-eq v5, v4, :cond_33 + if-eq v7, v6, :cond_34 - const/4 v1, 0x4 + const/4 v3, 0x4 goto :goto_1a - :cond_33 - const/4 v1, 0x5 + :cond_34 + const/4 v3, 0x5 :goto_1a - move-object/from16 v8, p7 + move-object/from16 v4, p7 - move/from16 v25, v1 + move/from16 v27, v3 - const/4 v1, 0x1 + const/4 v3, 0x5 - const/4 v3, 0x6 + const/16 v17, 0x1 - const/16 v19, 0x1 + const/16 v22, 0x1 - const/16 v21, 0x1 + const/16 v24, 0x6 - const/16 v24, 0x4 + const/16 v25, 0x1 - goto :goto_1f + const/16 v26, 0x4 - :cond_34 - move-object/from16 v8, p7 + goto/16 :goto_1f - const/4 v1, 0x1 + :cond_35 + move-object/from16 v4, p7 - const/4 v3, 0x6 + const/4 v3, 0x5 - const/16 v19, 0x1 + const/16 v17, 0x1 - const/16 v21, 0x1 + const/16 v22, 0x1 + + const/16 v24, 0x6 + + const/16 v25, 0x1 goto :goto_1d - :cond_35 - move-object/from16 v8, p7 + :cond_36 + const/4 v5, 0x1 - const/4 v1, 0x0 + move-object/from16 v4, p7 - const/4 v3, 0x6 + const/4 v3, 0x5 - const/16 v19, 0x0 + const/16 v17, 0x0 + + const/16 v22, 0x0 goto :goto_1c + :cond_37 + const/4 v5, 0x1 + .line 2910 - :cond_36 - iget-boolean v1, v14, Landroid/support/constraint/solver/SolverVariable;->isFinalValue:Z + iget-boolean v3, v1, Landroid/support/constraint/solver/SolverVariable;->isFinalValue:Z - if-eqz v1, :cond_39 + if-eqz v3, :cond_3a - iget-boolean v1, v13, Landroid/support/constraint/solver/SolverVariable;->isFinalValue:Z + iget-boolean v3, v2, Landroid/support/constraint/solver/SolverVariable;->isFinalValue:Z - if-eqz v1, :cond_39 + if-eqz v3, :cond_3a .line 2911 invoke-virtual/range {p10 .. p10}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->getMargin()I - move-result v1 + move-result v3 .line 2912 invoke-virtual/range {p11 .. p11}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->getMargin()I - move-result v2 + move-result v4 - const/16 v3, 0x8 + const/16 v5, 0x8 move-object/from16 p17, p1 move-object/from16 p18, v9 - move-object/from16 p19, v14 + move-object/from16 p19, v1 - move/from16 p20, v1 + move/from16 p20, v3 move/from16 p21, p16 - move-object/from16 p22, v13 + move-object/from16 p22, v2 - move-object/from16 p23, v15 + move-object/from16 p23, v14 - move/from16 p24, v2 + move/from16 p24, v4 - move/from16 p25, v3 + move/from16 p25, v5 .line 2911 invoke-virtual/range {p17 .. p25}, Landroid/support/constraint/solver/LinearSystem;->addCentering(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;IFLandroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V - if-eqz p3, :cond_38 + if-eqz p3, :cond_39 - if-eqz v18, :cond_38 + if-eqz v19, :cond_39 .line 2915 iget-object v1, v12, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - if-eqz v1, :cond_37 + if-eqz v1, :cond_38 .line 2916 invoke-virtual/range {p11 .. p11}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->getMargin()I - move-result v1 + move-result v5 - move-object/from16 v8, p7 + move-object/from16 v4, p7 goto :goto_1b - :cond_37 - move-object/from16 v8, p7 + :cond_38 + move-object/from16 v4, p7 - const/4 v1, 0x0 + const/4 v5, 0x0 :goto_1b - if-eq v13, v8, :cond_38 + if-eq v2, v4, :cond_39 - const/4 v2, 0x5 + const/4 v3, 0x5 .line 2922 - invoke-virtual {v10, v8, v15, v1, v2}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V + invoke-virtual {v10, v4, v14, v5, v3}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V - :cond_38 + :cond_39 return-void - :cond_39 - move-object/from16 v8, p7 + :cond_3a + move-object/from16 v4, p7 - const/4 v1, 0x1 + const/4 v3, 0x5 - const/4 v3, 0x6 + const/16 v17, 0x1 - const/16 v19, 0x1 + const/16 v22, 0x1 :goto_1c - const/16 v21, 0x0 + const/16 v24, 0x6 + + const/16 v25, 0x0 :goto_1d - const/16 v24, 0x4 + const/16 v26, 0x4 :goto_1e - const/16 v25, 0x5 + const/16 v27, 0x5 :goto_1f - if-eqz v19, :cond_3a + if-eqz v17, :cond_3b - if-ne v14, v13, :cond_3a + if-ne v1, v2, :cond_3b - if-eq v11, v4, :cond_3a + if-eq v11, v6, :cond_3b - const/16 v19, 0x0 + const/16 v17, 0x0 - const/16 v26, 0x0 + const/16 v28, 0x0 goto :goto_20 - :cond_3a - const/16 v26, 0x1 + :cond_3b + const/16 v28, 0x1 :goto_20 - if-eqz v1, :cond_3c + if-eqz v22, :cond_3d - if-nez v23, :cond_3b + if-nez v20, :cond_3c - if-nez p18, :cond_3b + if-nez p18, :cond_3c - if-nez p20, :cond_3b + if-nez p20, :cond_3c - if-ne v14, v6, :cond_3b + if-ne v1, v8, :cond_3c - if-ne v13, v8, :cond_3b + if-ne v2, v4, :cond_3c - const/16 v25, 0x0 + const/16 v22, 0x0 - const/16 v26, 0x8 + const/16 v24, 0x8 - const/16 v27, 0x0 + const/16 v27, 0x8 - const/16 v28, 0x8 + const/16 v28, 0x0 goto :goto_21 - :cond_3b - move/from16 v28, v25 - - move/from16 v27, v26 - - move/from16 v25, p3 - - move/from16 v26, v3 + :cond_3c + move/from16 v22, p3 .line 2944 :goto_21 @@ -2758,514 +2845,531 @@ move-result v30 + move-object/from16 p8, v1 + move-object/from16 v1, p1 - move v3, v2 + move-object v5, v2 - move-object v2, v9 + const/4 v3, 0x3 - move v12, v3 + const/16 v13, 0x8 - move-object v3, v14 + const/16 v21, 0x1 - move/from16 p8, v12 + move-object v2, v9 - move-object v12, v4 + move-object/from16 v3, p8 move/from16 v4, v29 - move-object/from16 v29, v12 - - move-object v12, v5 + move-object/from16 p5, v5 move/from16 v5, p16 - move-object v6, v13 + move-object/from16 v31, v6 - move-object v7, v15 + move-object/from16 v6, p5 - move/from16 v8, v30 + move-object/from16 v32, v7 + + move-object v7, v14 - move-object/from16 v20, v15 + move/from16 v8, v30 - move-object v15, v9 + move-object/from16 v33, v9 - move/from16 v9, v26 + move/from16 v9, v24 .line 2944 invoke-virtual/range {v1 .. v9}, Landroid/support/constraint/solver/LinearSystem;->addCentering(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;IFLandroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V - move/from16 v26, v27 - goto :goto_22 - :cond_3c - move/from16 p8, v2 + :cond_3d + move-object/from16 p8, v1 + + move-object/from16 p5, v2 + + move-object/from16 v31, v6 - move-object/from16 v29, v4 + move-object/from16 v32, v7 - move-object v12, v5 + move-object/from16 v33, v9 - move-object/from16 v20, v15 + const/16 v13, 0x8 - move-object v15, v9 + const/16 v21, 0x1 - move/from16 v28, v25 + move/from16 v22, p3 - move/from16 v25, p3 + :goto_22 + move/from16 v5, v28 .line 2948 - :goto_22 iget v1, v0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mVisibility:I - const/16 v2, 0x8 - - if-ne v1, v2, :cond_3d + if-ne v1, v13, :cond_3e invoke-virtual/range {p11 .. p11}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->hasDependents()Z move-result v1 - if-nez v1, :cond_3d + if-nez v1, :cond_3e return-void - :cond_3d - if-eqz v19, :cond_40 + :cond_3e + if-eqz v17, :cond_43 + + if-eqz v22, :cond_40 - if-eqz v25, :cond_3f + move-object/from16 v2, p5 - if-eq v14, v13, :cond_3f + move-object/from16 v1, p8 - if-nez v23, :cond_3f + if-eq v1, v2, :cond_41 + + if-nez v20, :cond_41 .line 2955 - instance-of v1, v11, Landroid/support/constraint/solver/widgets/Barrier; + instance-of v3, v11, Landroid/support/constraint/solver/widgets/Barrier; - if-nez v1, :cond_3e + if-nez v3, :cond_3f - instance-of v1, v12, Landroid/support/constraint/solver/widgets/Barrier; + move-object/from16 v3, v32 - if-eqz v1, :cond_3f + instance-of v4, v3, Landroid/support/constraint/solver/widgets/Barrier; - :cond_3e - const/4 v1, 0x6 + if-eqz v4, :cond_42 goto :goto_23 :cond_3f - move/from16 v1, v28 + move-object/from16 v3, v32 - .line 2959 :goto_23 + const/4 v4, 0x6 + + goto :goto_24 + + :cond_40 + move-object/from16 v2, p5 + + move-object/from16 v1, p8 + + :cond_41 + move-object/from16 v3, v32 + + :cond_42 + move/from16 v4, v27 + + .line 2959 + :goto_24 invoke-virtual/range {p10 .. p10}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->getMargin()I - move-result v2 + move-result v6 + + move-object/from16 v7, v33 - invoke-virtual {v10, v15, v14, v2, v1}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V + invoke-virtual {v10, v7, v1, v6, v4}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V .line 2960 invoke-virtual/range {p11 .. p11}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->getMargin()I - move-result v2 + move-result v6 - neg-int v2, v2 + neg-int v6, v6 - move-object/from16 v3, v20 + invoke-virtual {v10, v14, v2, v6, v4}, Landroid/support/constraint/solver/LinearSystem;->addLowerThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V - invoke-virtual {v10, v3, v13, v2, v1}, Landroid/support/constraint/solver/LinearSystem;->addLowerThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V + goto :goto_25 - move/from16 v28, v1 + :cond_43 + move-object/from16 v2, p5 - goto :goto_24 + move-object/from16 v1, p8 - :cond_40 - move-object/from16 v3, v20 + move-object/from16 v3, v32 - :goto_24 - if-eqz v25, :cond_41 + move-object/from16 v7, v33 + + move/from16 v4, v27 + + :goto_25 + if-eqz v22, :cond_44 - if-eqz p21, :cond_41 + if-eqz p21, :cond_44 .line 2963 - instance-of v1, v11, Landroid/support/constraint/solver/widgets/Barrier; + instance-of v6, v11, Landroid/support/constraint/solver/widgets/Barrier; - if-nez v1, :cond_41 + if-nez v6, :cond_44 - instance-of v1, v12, Landroid/support/constraint/solver/widgets/Barrier; + instance-of v6, v3, Landroid/support/constraint/solver/widgets/Barrier; - if-nez v1, :cond_41 + if-nez v6, :cond_44 - const/4 v1, 0x6 + const/4 v4, 0x6 - const/4 v2, 0x6 + const/4 v5, 0x1 - const/16 v26, 0x1 + const/4 v6, 0x6 - goto :goto_25 + goto :goto_26 - :cond_41 - move/from16 v1, v24 + :cond_44 + move v6, v4 - move/from16 v2, v28 + move/from16 v4, v26 - :goto_25 - if-eqz v26, :cond_4d + :goto_26 + if-eqz v5, :cond_50 - if-eqz v21, :cond_4a + if-eqz v25, :cond_4d - if-eqz p20, :cond_42 + if-eqz p20, :cond_45 - if-eqz p4, :cond_4a + if-eqz p4, :cond_4d - :cond_42 - move-object/from16 v4, v29 + :cond_45 + move-object/from16 v5, v31 - if-eq v11, v4, :cond_44 + if-eq v11, v5, :cond_47 - if-ne v12, v4, :cond_43 + if-ne v3, v5, :cond_46 - goto :goto_26 + goto :goto_27 - :cond_43 - move/from16 v16, v1 + :cond_46 + move/from16 v18, v4 .line 2978 - :cond_44 - :goto_26 - instance-of v5, v11, Landroid/support/constraint/solver/widgets/Guideline; + :cond_47 + :goto_27 + instance-of v8, v11, Landroid/support/constraint/solver/widgets/Guideline; - if-nez v5, :cond_45 + if-nez v8, :cond_48 - instance-of v5, v12, Landroid/support/constraint/solver/widgets/Guideline; + instance-of v8, v3, Landroid/support/constraint/solver/widgets/Guideline; - if-eqz v5, :cond_46 + if-eqz v8, :cond_49 - :cond_45 - const/16 v16, 0x5 + :cond_48 + const/16 v18, 0x5 .line 2981 - :cond_46 - instance-of v5, v11, Landroid/support/constraint/solver/widgets/Barrier; + :cond_49 + instance-of v8, v11, Landroid/support/constraint/solver/widgets/Barrier; - if-nez v5, :cond_47 + if-nez v8, :cond_4a - instance-of v5, v12, Landroid/support/constraint/solver/widgets/Barrier; + instance-of v8, v3, Landroid/support/constraint/solver/widgets/Barrier; - if-eqz v5, :cond_48 + if-eqz v8, :cond_4b - :cond_47 - const/16 v16, 0x5 + :cond_4a + const/16 v18, 0x5 - :cond_48 - if-eqz p20, :cond_49 + :cond_4b + if-eqz p20, :cond_4c - const/4 v5, 0x5 + const/4 v8, 0x5 - goto :goto_27 + goto :goto_28 - :cond_49 - move/from16 v5, v16 + :cond_4c + move/from16 v8, v18 .line 2987 - :goto_27 - invoke-static {v5, v1}, Ljava/lang/Math;->max(II)I + :goto_28 + invoke-static {v8, v4}, Ljava/lang/Math;->max(II)I - move-result v1 + move-result v4 - goto :goto_28 + goto :goto_29 - :cond_4a - move-object/from16 v4, v29 + :cond_4d + move-object/from16 v5, v31 - :goto_28 - if-eqz v25, :cond_4c + :goto_29 + if-eqz v22, :cond_4f .line 2991 - invoke-static {v2, v1}, Ljava/lang/Math;->min(II)I + invoke-static {v6, v4}, Ljava/lang/Math;->min(II)I - move-result v1 + move-result v4 - if-eqz p17, :cond_4c + if-eqz p17, :cond_4f - if-nez p20, :cond_4c + if-nez p20, :cond_4f - if-eq v11, v4, :cond_4b + if-eq v11, v5, :cond_4e - if-ne v12, v4, :cond_4c + if-ne v3, v5, :cond_4f - :cond_4b - const/4 v1, 0x4 + :cond_4e + const/4 v4, 0x4 .line 2998 - :cond_4c + :cond_4f invoke-virtual/range {p10 .. p10}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->getMargin()I - move-result v2 + move-result v3 - invoke-virtual {v10, v15, v14, v2, v1}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; + invoke-virtual {v10, v7, v1, v3, v4}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; .line 2999 invoke-virtual/range {p11 .. p11}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->getMargin()I - move-result v2 + move-result v3 - neg-int v2, v2 + neg-int v3, v3 - invoke-virtual {v10, v3, v13, v2, v1}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; + invoke-virtual {v10, v14, v2, v3, v4}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; - :cond_4d - if-eqz v25, :cond_4f + :cond_50 + if-eqz v22, :cond_52 - move-object/from16 v1, p6 + move-object/from16 v3, p6 - if-ne v1, v14, :cond_4e + if-ne v3, v1, :cond_51 .line 3005 invoke-virtual/range {p10 .. p10}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->getMargin()I - move-result v2 + move-result v5 - goto :goto_29 + goto :goto_2a - :cond_4e - const/4 v2, 0x0 + :cond_51 + const/4 v5, 0x0 - :goto_29 - if-eq v14, v1, :cond_4f + :goto_2a + if-eq v1, v3, :cond_52 - const/4 v4, 0x5 + const/4 v1, 0x5 .line 3011 - invoke-virtual {v10, v15, v1, v2, v4}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V - - :cond_4f - if-eqz v25, :cond_51 - - if-eqz v23, :cond_51 + invoke-virtual {v10, v7, v3, v5, v1}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V - move-object v2, v3 + :cond_52 + if-eqz v22, :cond_54 - if-nez p14, :cond_52 + if-eqz v20, :cond_54 - if-nez v22, :cond_52 + move v5, v15 - if-eqz v23, :cond_50 + if-nez p14, :cond_54 - move/from16 v1, p8 + if-nez v23, :cond_54 - const/4 v3, 0x3 + if-eqz v20, :cond_53 - if-ne v1, v3, :cond_50 + const/4 v1, 0x3 - const/16 v1, 0x8 + if-ne v5, v1, :cond_53 - const/4 v3, 0x0 + const/4 v1, 0x0 .line 3020 - invoke-virtual {v10, v2, v15, v3, v1}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V + invoke-virtual {v10, v14, v7, v1, v13}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V - goto :goto_2b + goto :goto_2c - :cond_50 - const/4 v3, 0x0 + :cond_53 + const/4 v1, 0x0 - const/4 v1, 0x5 + const/4 v3, 0x5 .line 3022 - invoke-virtual {v10, v2, v15, v3, v1}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V - - goto :goto_2b - - :cond_51 - move-object v2, v3 + invoke-virtual {v10, v14, v7, v1, v3}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V - :cond_52 - const/4 v3, 0x0 + goto :goto_2c - goto :goto_2b + :cond_54 + const/4 v1, 0x0 - :cond_53 - :goto_2a - move-object v2, v15 + goto :goto_2c - const/4 v3, 0x0 + :cond_55 + :goto_2b + move-object/from16 v12, p11 - move/from16 v25, p3 + const/4 v1, 0x0 - :goto_2b - if-eqz v25, :cond_57 + move/from16 v22, p3 - if-eqz v18, :cond_57 + :goto_2c + if-eqz v22, :cond_59 - move-object/from16 v1, p11 + if-eqz v19, :cond_59 .line 3029 - iget-object v4, v1, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v3, v12, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - if-eqz v4, :cond_54 + if-eqz v3, :cond_56 .line 3030 invoke-virtual/range {p11 .. p11}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->getMargin()I - move-result v3 + move-result v5 - :cond_54 move-object/from16 v4, p7 - if-eq v13, v4, :cond_57 + goto :goto_2d + + :cond_56 + move-object/from16 v4, p7 + + const/4 v5, 0x0 + + :goto_2d + if-eq v2, v4, :cond_59 .line 3033 - iget-boolean v5, v0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->OPTIMIZE_WRAP:Z + iget-boolean v1, v0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->OPTIMIZE_WRAP:Z - if-eqz v5, :cond_56 + if-eqz v1, :cond_58 - iget-boolean v5, v2, Landroid/support/constraint/solver/SolverVariable;->isFinalValue:Z + iget-boolean v1, v14, Landroid/support/constraint/solver/SolverVariable;->isFinalValue:Z - if-eqz v5, :cond_56 + if-eqz v1, :cond_58 - iget-object v5, v0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mParent:Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object v1, v0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mParent:Landroid/support/constraint/solver/widgets/ConstraintWidget; - if-eqz v5, :cond_56 + if-eqz v1, :cond_58 .line 3034 - check-cast v5, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer; + check-cast v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer; - if-eqz p2, :cond_55 + if-eqz p2, :cond_57 .line 3036 - invoke-virtual {v5, v1}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->addHorizontalWrapMaxVariable(Landroid/support/constraint/solver/widgets/ConstraintAnchor;)V + invoke-virtual {v1, v12}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->addHorizontalWrapMaxVariable(Landroid/support/constraint/solver/widgets/ConstraintAnchor;)V - goto :goto_2c + goto :goto_2e .line 3038 - :cond_55 - invoke-virtual {v5, v1}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->addVerticalWrapMaxVariable(Landroid/support/constraint/solver/widgets/ConstraintAnchor;)V + :cond_57 + invoke-virtual {v1, v12}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->addVerticalWrapMaxVariable(Landroid/support/constraint/solver/widgets/ConstraintAnchor;)V - :goto_2c + :goto_2e return-void - :cond_56 + :cond_58 const/4 v1, 0x5 .line 3045 - invoke-virtual {v10, v4, v2, v3, v1}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V + invoke-virtual {v10, v4, v14, v5, v1}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V - :cond_57 + :cond_59 return-void - :cond_58 - move-object/from16 v1, p6 + :cond_5a + move-object/from16 v3, p6 move-object/from16 v4, p7 - move-object v2, v15 + move-object v7, v9 - const/4 v3, 0x0 + const/4 v1, 0x0 - move-object v15, v9 + const/4 v5, 0x2 - move/from16 v5, v21 + const/16 v13, 0x8 - const/4 v6, 0x2 + const/16 v21, 0x1 - :goto_2d - if-ge v5, v6, :cond_5d + move/from16 v2, v22 - if-eqz p3, :cond_5d + :goto_2f + if-ge v2, v5, :cond_5f - if-eqz v18, :cond_5d + if-eqz p3, :cond_5f - const/16 v5, 0x8 + if-eqz v19, :cond_5f .line 2766 - invoke-virtual {v10, v15, v1, v3, v5}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V + invoke-virtual {v10, v7, v3, v1, v13}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V - if-nez p2, :cond_5a + if-nez p2, :cond_5c .line 2767 - iget-object v1, v0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBaseline:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v2, v0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBaseline:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iget-object v1, v1, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v2, v2, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - if-nez v1, :cond_59 + if-nez v2, :cond_5b - goto :goto_2e + goto :goto_30 - :cond_59 - const/4 v13, 0x0 + :cond_5b + const/4 v5, 0x0 - goto :goto_2f + goto :goto_31 - :cond_5a - :goto_2e - const/4 v13, 0x1 + :cond_5c + :goto_30 + const/4 v5, 0x1 - :goto_2f - if-nez p2, :cond_5c + :goto_31 + if-nez p2, :cond_5e .line 2768 - iget-object v1, v0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBaseline:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v2, v0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBaseline:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iget-object v1, v1, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v2, v2, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - if-eqz v1, :cond_5c + if-eqz v2, :cond_5e .line 2771 - iget-object v1, v0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBaseline:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v2, v0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBaseline:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iget-object v1, v1, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v2, v2, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iget-object v1, v1, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mOwner:Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object v2, v2, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mOwner:Landroid/support/constraint/solver/widgets/ConstraintWidget; .line 2772 - iget v5, v1, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mDimensionRatio:F - - const/4 v6, 0x0 - - cmpl-float v5, v5, v6 - - if-eqz v5, :cond_5b - - iget-object v5, v1, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + iget v3, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mDimensionRatio:F - aget-object v5, v5, v3 + const/4 v5, 0x0 - sget-object v6, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + cmpl-float v3, v3, v5 - if-ne v5, v6, :cond_5b + if-eqz v3, :cond_5d - iget-object v1, v1, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + iget-object v3, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - const/4 v5, 0x1 + aget-object v3, v3, v1 - aget-object v1, v1, v5 + sget-object v5, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - sget-object v6, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + if-ne v3, v5, :cond_5d - if-ne v1, v6, :cond_5b + iget-object v2, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - const/4 v14, 0x1 + aget-object v2, v2, v21 - goto :goto_30 + sget-object v3, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - :cond_5b - const/4 v14, 0x0 + if-ne v2, v3, :cond_5d - goto :goto_30 + const/4 v5, 0x1 - :cond_5c - move v14, v13 + goto :goto_32 - :goto_30 - if-eqz v14, :cond_5d + :cond_5d + const/4 v5, 0x0 - const/16 v1, 0x8 + :cond_5e + :goto_32 + if-eqz v5, :cond_5f .line 2784 - invoke-virtual {v10, v4, v2, v3, v1}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V + invoke-virtual {v10, v4, v14, v1, v13}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V - :cond_5d + :cond_5f return-void .end method @@ -3598,23 +3702,19 @@ :try_start_0 invoke-virtual/range {v1 .. v6}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->addChildrenToSolverByDependency(Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;Landroid/support/constraint/solver/LinearSystem;Ljava/util/HashSet;IZ)V :try_end_0 - .catchall {:try_start_0 .. :try_end_0} :catchall_0 + .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0 goto :goto_4 :cond_6 return-void - :catchall_0 + :catch_0 move-exception p1 - goto :goto_6 - - :goto_5 throw p1 - :goto_6 - goto :goto_5 + return-void .end method .method addFirst()Z @@ -3735,9 +3835,9 @@ const/4 v1, 0x0 :goto_1 - move v5, v0 + move v6, v0 - move v6, v1 + move v5, v1 goto :goto_2 @@ -3780,11 +3880,14 @@ if-nez v0, :cond_4 - iget-boolean v1, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->resolvedVertical:Z + iget-boolean v0, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->resolvedVertical:Z + + if-eqz v0, :cond_a - if-eqz v1, :cond_a + .line 2194 + :cond_4 + iget-boolean v0, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->resolvedHorizontal:Z - :cond_4 if-eqz v0, :cond_6 .line 2195 @@ -3801,7 +3904,7 @@ invoke-virtual {v14, v12, v0}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;I)V - if-eqz v5, :cond_6 + if-eqz v6, :cond_6 .line 2197 iget-object v0, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mParent:Landroid/support/constraint/solver/widgets/ConstraintWidget; @@ -3878,7 +3981,7 @@ invoke-virtual {v14, v9, v0}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;I)V :cond_7 - if-eqz v6, :cond_9 + if-eqz v5, :cond_9 .line 2214 iget-object v0, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mParent:Landroid/support/constraint/solver/widgets/ConstraintWidget; @@ -4058,7 +4161,7 @@ if-eqz v0, :cond_e - if-eqz v5, :cond_d + if-eqz v6, :cond_d .line 2259 iget-object v0, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->isTerminalWidget:[Z @@ -4088,7 +4191,7 @@ invoke-virtual {v14, v0, v12, v7, v1}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V :cond_d - if-eqz v6, :cond_e + if-eqz v5, :cond_e .line 2263 iget-object v0, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->isTerminalWidget:[Z @@ -4199,7 +4302,7 @@ :goto_6 if-nez v0, :cond_13 - if-eqz v5, :cond_13 + if-eqz v6, :cond_13 .line 2296 iget v2, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mVisibility:I @@ -4235,7 +4338,7 @@ :cond_13 if-nez v1, :cond_14 - if-eqz v6, :cond_14 + if-eqz v5, :cond_14 .line 2305 iget v2, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mVisibility:I @@ -4273,9 +4376,9 @@ invoke-virtual {v14, v2, v10, v7, v8}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V :cond_14 - move/from16 v29, v0 + move/from16 v28, v0 - move/from16 v28, v1 + move/from16 v29, v1 goto :goto_7 @@ -4436,7 +4539,7 @@ if-ne v7, v1, :cond_1c .line 2354 - invoke-virtual {v15, v5, v6, v2, v3}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->setupDimensionRatio(ZZZZ)V + invoke-virtual {v15, v6, v5, v2, v3}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->setupDimensionRatio(ZZZZ)V goto :goto_a @@ -4477,22 +4580,24 @@ sget-object v3, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - move/from16 v31, v7 - if-eq v1, v3, :cond_1d - move/from16 v30, v23 + move/from16 v22, v0 + + move/from16 v31, v7 + + move/from16 v32, v23 const/4 v8, 0x0 - const/16 v32, 0x4 + const/16 v30, 0x4 - goto :goto_d + goto :goto_c :cond_1d - move/from16 v32, v8 + move/from16 v22, v0 - goto :goto_b + goto :goto_a :cond_1e const/4 v2, 0x1 @@ -4548,70 +4653,63 @@ sget-object v2, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - move/from16 v30, v1 - if-eq v0, v2, :cond_20 - move/from16 v32, v8 + move/from16 v32, v1 - move/from16 v0, v22 + move/from16 v30, v8 const/4 v8, 0x0 const/16 v31, 0x4 - goto :goto_d + goto :goto_c :cond_20 - move/from16 v31, v7 + move/from16 v32, v1 - move/from16 v32, v8 + move/from16 v31, v7 - move/from16 v0, v22 + move/from16 v30, v8 - goto :goto_c + goto :goto_b :cond_21 :goto_a move/from16 v31, v7 - move/from16 v32, v8 + move/from16 v30, v8 - move/from16 v0, v22 + move/from16 v32, v23 :goto_b - move/from16 v30, v23 - - :goto_c const/4 v8, 0x1 - goto :goto_d + goto :goto_c :cond_22 move/from16 v23, v1 move/from16 v31, v7 - move/from16 v32, v8 - - move/from16 v0, v22 + move/from16 v30, v8 - move/from16 v30, v23 + move/from16 v32, v23 const/4 v8, 0x0 .line 2378 - :goto_d - iget-object v1, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mResolvedMatchConstraintDefault:[I + :goto_c + iget-object v0, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mResolvedMatchConstraintDefault:[I - const/4 v2, 0x0 + const/4 v1, 0x0 - aput v32, v1, v2 + aput v30, v0, v1 - const/4 v2, 0x1 + const/4 v1, 0x1 .line 2379 - aput v31, v1, v2 + aput v31, v0, v1 .line 2380 iput-boolean v8, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mResolvedHasRatio:Z @@ -4619,21 +4717,26 @@ if-eqz v8, :cond_24 .line 2382 - iget v1, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mResolvedDimensionRatioSide:I + iget v0, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mResolvedDimensionRatioSide:I - const/4 v2, -0x1 + if-eqz v0, :cond_23 - if-eqz v1, :cond_23 + const/4 v1, -0x1 - if-ne v1, v2, :cond_25 + if-ne v0, v1, :cond_25 + + goto :goto_d :cond_23 + const/4 v1, -0x1 + + :goto_d const/16 v20, 0x1 goto :goto_e :cond_24 - const/4 v2, -0x1 + const/4 v1, -0x1 :cond_25 const/16 v20, 0x0 @@ -4642,13 +4745,13 @@ if-eqz v8, :cond_27 .line 2385 - iget v1, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mResolvedDimensionRatioSide:I + iget v0, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mResolvedDimensionRatioSide:I - const/4 v3, 0x1 + const/4 v2, 0x1 - if-eq v1, v3, :cond_26 + if-eq v0, v2, :cond_26 - if-ne v1, v2, :cond_27 + if-ne v0, v1, :cond_27 :cond_26 const/16 v33, 0x1 @@ -4660,19 +4763,19 @@ .line 2389 :goto_f - iget-object v1, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + iget-object v0, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - const/4 v2, 0x0 + const/4 v1, 0x0 - aget-object v1, v1, v2 + aget-object v0, v0, v1 - sget-object v2, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->WRAP_CONTENT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + sget-object v1, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->WRAP_CONTENT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - if-ne v1, v2, :cond_28 + if-ne v0, v1, :cond_28 - instance-of v1, v15, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer; + instance-of v0, v15, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer; - if-eqz v1, :cond_28 + if-eqz v0, :cond_28 const/16 v21, 0x1 @@ -4686,13 +4789,8 @@ const/16 v22, 0x0 - goto :goto_11 - - :cond_29 - move/from16 v22, v0 - .line 2396 - :goto_11 + :cond_29 iget-object v0, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mCenter:Landroid/support/constraint/solver/widgets/ConstraintAnchor; invoke-virtual {v0}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->isConnected()Z @@ -4747,7 +4845,7 @@ if-nez v0, :cond_2a - goto :goto_12 + goto :goto_11 :cond_2a if-eqz p2, :cond_2f @@ -4775,7 +4873,7 @@ if-eqz v0, :cond_2f - if-eqz v5, :cond_2f + if-eqz v6, :cond_2f .line 2415 iget-object v0, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->isTerminalWidget:[Z @@ -4806,10 +4904,10 @@ .line 2420 invoke-virtual {v14, v0, v12, v1, v4}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V - goto/16 :goto_16 + goto/16 :goto_15 :cond_2b - :goto_12 + :goto_11 const/16 v4, 0x8 .line 2405 @@ -4825,13 +4923,13 @@ move-object/from16 v16, v0 - goto :goto_13 + goto :goto_12 :cond_2c move-object/from16 v16, v36 .line 2406 - :goto_13 + :goto_12 iget-object v0, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mParent:Landroid/support/constraint/solver/widgets/ConstraintWidget; if-eqz v0, :cond_2d @@ -4844,13 +4942,13 @@ move-object/from16 v27, v0 - goto :goto_14 + goto :goto_13 :cond_2d move-object/from16 v27, v36 .line 2407 - :goto_14 + :goto_13 iget-object v0, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->isTerminalWidget:[Z const/16 v19, 0x0 @@ -4887,12 +4985,12 @@ const/16 v44, 0x1 - goto :goto_15 + goto :goto_14 :cond_2e const/16 v44, 0x0 - :goto_15 + :goto_14 iget v0, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintMinWidth:I move/from16 v24, v0 @@ -4921,11 +5019,11 @@ const/4 v7, 0x5 - move v3, v5 + move v3, v6 move/from16 v41, v4 - move v4, v6 + move v4, v5 move/from16 v46, v5 @@ -4971,13 +5069,13 @@ move/from16 v18, v44 - move/from16 v19, v29 + move/from16 v19, v28 - move/from16 v20, v28 + move/from16 v20, v29 move/from16 v21, v23 - move/from16 v22, v32 + move/from16 v22, v30 move/from16 v23, v31 @@ -4985,10 +5083,10 @@ invoke-direct/range {v0 .. v27}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->applyConstraints(Landroid/support/constraint/solver/LinearSystem;ZZZZLandroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;ZLandroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;IIIIFZZZZZIIIIFZ)V - goto :goto_17 + goto :goto_16 :cond_2f - :goto_16 + :goto_15 move/from16 v46, v5 move/from16 v37, v6 @@ -5005,21 +5103,21 @@ move-object/from16 v39, v13 - :goto_17 - if-eqz p2, :cond_33 + :goto_16 + if-eqz p2, :cond_32 move-object/from16 v15, p0 .line 2427 iget-object v0, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->verticalRun:Landroid/support/constraint/solver/widgets/analyzer/VerticalWidgetRun; - if-eqz v0, :cond_32 + if-eqz v0, :cond_33 iget-object v0, v0, Landroid/support/constraint/solver/widgets/analyzer/VerticalWidgetRun;->start:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; iget-boolean v0, v0, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolved:Z - if-eqz v0, :cond_32 + if-eqz v0, :cond_33 iget-object v0, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->verticalRun:Landroid/support/constraint/solver/widgets/analyzer/VerticalWidgetRun; @@ -5027,7 +5125,7 @@ iget-boolean v0, v0, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolved:Z - if-eqz v0, :cond_32 + if-eqz v0, :cond_33 .line 2428 iget-object v0, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->verticalRun:Landroid/support/constraint/solver/widgets/analyzer/VerticalWidgetRun; @@ -5069,9 +5167,9 @@ if-eqz v0, :cond_31 - if-nez v28, :cond_31 + if-nez v29, :cond_31 - if-eqz v37, :cond_31 + if-eqz v46, :cond_31 .line 2432 iget-object v2, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->isTerminalWidget:[Z @@ -5096,14 +5194,14 @@ .line 2437 invoke-virtual {v14, v0, v12, v10, v2}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V - goto :goto_18 + goto :goto_17 :cond_30 const/16 v2, 0x8 const/4 v10, 0x0 - goto :goto_18 + goto :goto_17 :cond_31 const/16 v2, 0x8 @@ -5112,12 +5210,15 @@ const/4 v11, 0x1 - :goto_18 - const/4 v8, 0x0 + :goto_17 + const/4 v7, 0x0 - goto :goto_1a + goto :goto_18 :cond_32 + move-object/from16 v15, p0 + + :cond_33 move-object/from16 v14, p1 move-object/from16 v1, v47 @@ -5132,30 +5233,10 @@ const/4 v11, 0x1 - goto :goto_19 - - :cond_33 - const/16 v2, 0x8 - - const/4 v10, 0x0 - - const/4 v11, 0x1 - - move-object/from16 v15, p0 - - move-object/from16 v14, p1 - - move-object/from16 v1, v47 - - move-object/from16 v12, v48 - - move-object/from16 v13, v49 - - :goto_19 - const/4 v8, 0x1 + const/4 v7, 0x1 .line 2442 - :goto_1a + :goto_18 iget v0, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mVerticalResolution:I const/4 v3, 0x2 @@ -5164,12 +5245,7 @@ const/4 v7, 0x0 - goto :goto_1b - :cond_34 - move v7, v8 - - :goto_1b if-eqz v7, :cond_3f .line 2451 @@ -5192,15 +5268,15 @@ const/4 v9, 0x1 - goto :goto_1c + goto :goto_19 :cond_35 const/4 v9, 0x0 - :goto_1c + :goto_19 if-eqz v9, :cond_36 - const/16 v30, 0x0 + const/16 v32, 0x0 .line 2459 :cond_36 @@ -5216,13 +5292,13 @@ move-object v7, v0 - goto :goto_1d + goto :goto_1a :cond_37 move-object/from16 v7, v36 .line 2460 - :goto_1d + :goto_1a iget-object v0, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mParent:Landroid/support/constraint/solver/widgets/ConstraintWidget; if-eqz v0, :cond_38 @@ -5235,13 +5311,13 @@ move-object v6, v0 - goto :goto_1e + goto :goto_1b :cond_38 move-object/from16 v6, v36 .line 2462 - :goto_1e + :goto_1b iget v0, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBaselineDistance:I if-gtz v0, :cond_39 @@ -5277,7 +5353,7 @@ .line 2468 invoke-virtual {v14, v1, v0, v10, v2}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; - if-eqz v37, :cond_3a + if-eqz v46, :cond_3a .line 2474 iget-object v0, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBottom:Landroid/support/constraint/solver/widgets/ConstraintAnchor; @@ -5294,7 +5370,7 @@ :cond_3a const/16 v27, 0x0 - goto :goto_20 + goto :goto_1d .line 2478 :cond_3b @@ -5305,7 +5381,7 @@ .line 2480 invoke-virtual {v14, v1, v13, v10, v2}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; - goto :goto_1f + goto :goto_1c .line 2482 :cond_3c @@ -5316,11 +5392,11 @@ invoke-virtual {v14, v1, v13, v0, v2}, Landroid/support/constraint/solver/LinearSystem;->addEquality(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)Landroid/support/constraint/solver/ArrayRow; :cond_3d - :goto_1f + :goto_1c move/from16 v27, v34 .line 2486 - :goto_20 + :goto_1d iget-object v0, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->isTerminalWidget:[Z aget-boolean v5, v0, v11 @@ -5353,12 +5429,12 @@ const/16 v18, 0x1 - goto :goto_21 + goto :goto_1e :cond_3e const/16 v18, 0x0 - :goto_21 + :goto_1e iget v0, v15, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintMinHeight:I move/from16 v24, v0 @@ -5383,11 +5459,11 @@ move-object v11, v3 - move/from16 v3, v37 + move/from16 v3, v46 move-object/from16 v21, v4 - move/from16 v4, v46 + move/from16 v4, v37 move/from16 v17, v10 @@ -5399,7 +5475,7 @@ move-object/from16 v36, v13 - move/from16 v13, v30 + move/from16 v13, v32 move/from16 v14, v20 @@ -5409,26 +5485,26 @@ move/from16 v17, v33 - move/from16 v19, v28 + move/from16 v19, v29 - move/from16 v20, v29 + move/from16 v20, v28 move/from16 v21, v35 move/from16 v22, v31 - move/from16 v23, v32 + move/from16 v23, v30 invoke-direct/range {v0 .. v27}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->applyConstraints(Landroid/support/constraint/solver/LinearSystem;ZZZZLandroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;ZLandroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;IIIIFZZZZZIIIIFZ)V - goto :goto_22 + goto :goto_1f :cond_3f move-object/from16 v34, v12 move-object/from16 v36, v13 - :goto_22 + :goto_1f if-eqz v43, :cond_41 const/16 v6, 0x8 @@ -5457,7 +5533,7 @@ invoke-virtual/range {v0 .. v6}, Landroid/support/constraint/solver/LinearSystem;->addRatio(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;FI)V - goto :goto_23 + goto :goto_20 .line 2497 :cond_40 @@ -5477,13 +5553,13 @@ invoke-virtual/range {v0 .. v6}, Landroid/support/constraint/solver/LinearSystem;->addRatio(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;FI)V - goto :goto_23 + goto :goto_20 :cond_41 move-object/from16 v7, p0 .line 2501 - :goto_23 + :goto_20 iget-object v0, v7, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mCenter:Landroid/support/constraint/solver/widgets/ConstraintAnchor; invoke-virtual {v0}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->isConnected()Z @@ -5824,7 +5900,7 @@ :try_start_0 invoke-virtual {p0, p1, p2, p3, v1}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;Landroid/support/constraint/solver/widgets/ConstraintWidget;Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;I)V :try_end_0 - .catchall {:try_start_0 .. :try_end_0} :catchall_0 + .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0 .line 1712 sget-object p1, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->CENTER:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; @@ -6262,7 +6338,7 @@ :goto_5 return-void - :catchall_0 + :catch_0 move-exception p1 .line 1710 @@ -7138,16 +7214,16 @@ const/4 v1, 0x0 - if-eqz v0, :cond_6 + if-eqz v0, :cond_5 move-object v2, p0 move-object v0, v1 :goto_0 - if-nez v0, :cond_5 + if-nez v0, :cond_6 - if-eqz v2, :cond_5 + if-eqz v2, :cond_6 .line 2075 sget-object v3, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->LEFT:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; @@ -7189,7 +7265,7 @@ if-ne v3, v4, :cond_2 - move-object v1, v2 + move-object v0, v2 goto :goto_4 @@ -7232,11 +7308,11 @@ goto :goto_0 :cond_5 - move-object v1, v0 + move-object v0, v1 :cond_6 :goto_4 - return-object v1 + return-object v0 .end method .method public getHorizontalChainStyle()I @@ -7783,16 +7859,16 @@ const/4 v1, 0x0 - if-eqz v0, :cond_6 + if-eqz v0, :cond_5 move-object v2, p0 move-object v0, v1 :goto_0 - if-nez v0, :cond_5 + if-nez v0, :cond_6 - if-eqz v2, :cond_5 + if-eqz v2, :cond_6 .line 2117 sget-object v3, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->TOP:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; @@ -7834,7 +7910,7 @@ if-ne v3, v4, :cond_2 - move-object v1, v2 + move-object v0, v2 goto :goto_4 @@ -7877,11 +7953,11 @@ goto :goto_0 :cond_5 - move-object v1, v0 + move-object v0, v1 :cond_6 :goto_4 - return-object v1 + return-object v0 .end method .method public getVerticalChainStyle()I @@ -9544,6 +9620,8 @@ iput p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mWidth:I .line 1369 + iget p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mWidth:I + iget v0, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMinWidth:I if-ge p1, v0, :cond_0 @@ -9556,12 +9634,14 @@ iput p2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mHeight:I .line 1373 - iget p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMinHeight:I + iget p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mHeight:I - if-ge p2, p1, :cond_1 + iget p2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMinHeight:I + + if-ge p1, p2, :cond_1 .line 1374 - iput p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mHeight:I + iput p2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mHeight:I :cond_1 return-void @@ -9759,8 +9839,6 @@ goto :goto_1 :catch_0 - nop - :cond_6 const/4 p1, 0x0 @@ -10059,49 +10137,59 @@ if-ge p3, p1, :cond_1 - move p3, p1 + goto :goto_0 - .line 1403 :cond_1 - iget-object p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + move p1, p3 - const/4 p2, 0x1 + .line 1403 + :goto_0 + iget-object p2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListDimensionBehaviors:[Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - aget-object p1, p1, p2 + const/4 p3, 0x1 - sget-object p2, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->FIXED:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + aget-object p2, p2, p3 - if-ne p1, p2, :cond_2 + sget-object p3, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->FIXED:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - iget p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mHeight:I + if-ne p2, p3, :cond_2 - if-ge p4, p1, :cond_2 + iget p2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mHeight:I - move p4, p1 + if-ge p4, p2, :cond_2 + + goto :goto_1 - .line 1407 :cond_2 - iput p3, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mWidth:I + move p2, p4 + + .line 1407 + :goto_1 + iput p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mWidth:I .line 1408 - iput p4, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mHeight:I + iput p2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mHeight:I .line 1410 - iget p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMinHeight:I + iget p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mHeight:I - if-ge p4, p1, :cond_3 + iget p2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMinHeight:I + + if-ge p1, p2, :cond_3 .line 1411 - iput p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mHeight:I + iput p2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mHeight:I .line 1413 :cond_3 - iget p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMinWidth:I + iget p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mWidth:I - if-ge p3, p1, :cond_4 + iget p2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMinWidth:I + + if-ge p1, p2, :cond_4 .line 1414 - iput p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mWidth:I + iput p2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mWidth:I :cond_4 return-void @@ -10187,6 +10275,8 @@ iput p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mHeight:I .line 1170 + iget p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mHeight:I + iget v0, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMinHeight:I if-ge p1, v0, :cond_0 @@ -10237,12 +10327,14 @@ iput p2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mWidth:I .line 1446 - iget p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMinWidth:I + iget p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mWidth:I - if-ge p2, p1, :cond_0 + iget p2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMinWidth:I + + if-ge p1, p2, :cond_0 .line 1447 - iput p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mWidth:I + iput p2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mWidth:I :cond_0 return-void @@ -10270,9 +10362,9 @@ .line 1199 iput p2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintMinWidth:I - const p2, 0x7fffffff + const p1, 0x7fffffff - if-ne p3, p2, :cond_0 + if-ne p3, p1, :cond_0 const/4 p3, 0x0 @@ -10283,17 +10375,20 @@ .line 1201 iput p4, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintPercentWidth:F - const/4 p2, 0x0 + const/4 p1, 0x0 - cmpl-float p2, p4, p2 + cmpl-float p1, p4, p1 - if-lez p2, :cond_1 + if-lez p1, :cond_1 - const/high16 p2, 0x3f800000 # 1.0f + const/high16 p1, 0x3f800000 # 1.0f - cmpg-float p2, p4, p2 + cmpg-float p1, p4, p1 - if-gez p2, :cond_1 + if-gez p1, :cond_1 + + .line 1202 + iget p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintDefaultWidth:I if-nez p1, :cond_1 @@ -10558,12 +10653,14 @@ iput p2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mHeight:I .line 1460 - iget p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMinHeight:I + iget p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mHeight:I - if-ge p2, p1, :cond_0 + iget p2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMinHeight:I + + if-ge p1, p2, :cond_0 .line 1461 - iput p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mHeight:I + iput p2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mHeight:I :cond_0 return-void @@ -10591,9 +10688,9 @@ .line 1217 iput p2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintMinHeight:I - const p2, 0x7fffffff + const p1, 0x7fffffff - if-ne p3, p2, :cond_0 + if-ne p3, p1, :cond_0 const/4 p3, 0x0 @@ -10604,17 +10701,20 @@ .line 1219 iput p4, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintPercentHeight:F - const/4 p2, 0x0 + const/4 p1, 0x0 - cmpl-float p2, p4, p2 + cmpl-float p1, p4, p1 - if-lez p2, :cond_1 + if-lez p1, :cond_1 - const/high16 p2, 0x3f800000 # 1.0f + const/high16 p1, 0x3f800000 # 1.0f - cmpg-float p2, p4, p2 + cmpg-float p1, p4, p1 - if-gez p2, :cond_1 + if-gez p1, :cond_1 + + .line 1220 + iget p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintDefaultHeight:I if-nez p1, :cond_1 @@ -10656,6 +10756,8 @@ iput p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mWidth:I .line 1158 + iget p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mWidth:I + iget v0, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMinWidth:I if-ge p1, v0, :cond_0 @@ -10898,19 +11000,21 @@ if-lez p1, :cond_9 - iget p3, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintMinHeight:I + iget p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintMinHeight:I - if-nez p3, :cond_9 + if-nez p1, :cond_9 .line 2575 iput v0, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mResolvedDimensionRatioSide:I goto :goto_3 + .line 2576 :cond_9 + iget p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintMinWidth:I + if-nez p1, :cond_a - .line 2576 iget p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintMinHeight:I if-lez p1, :cond_a @@ -11176,19 +11280,24 @@ if-ge v2, p1, :cond_5 - move v2, p1 + goto :goto_0 - .line 3227 :cond_5 - iput v2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mWidth:I + move p1, v2 + + .line 3227 + :goto_0 + iput p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mWidth:I .line 3228 - iget p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMinWidth:I + iget p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mWidth:I + + iget v0, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMinWidth:I - if-ge v2, p1, :cond_6 + if-ge p1, v0, :cond_6 .line 3229 - iput p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mWidth:I + iput v0, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mWidth:I :cond_6 if-eqz p2, :cond_8 @@ -11208,19 +11317,24 @@ if-ge v3, p1, :cond_7 - move v3, p1 + goto :goto_1 - .line 3237 :cond_7 - iput v3, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mHeight:I + move p1, v3 + + .line 3237 + :goto_1 + iput p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mHeight:I .line 3238 - iget p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMinHeight:I + iget p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mHeight:I + + iget p2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMinHeight:I - if-ge v3, p1, :cond_8 + if-ge p1, p2, :cond_8 .line 3239 - iput p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mHeight:I + iput p2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mHeight:I :cond_8 return-void diff --git a/smali/android/support/constraint/solver/widgets/ConstraintWidgetContainer.smali b/smali/android/support/constraint/solver/widgets/ConstraintWidgetContainer.smali index f351bb1f..34012b07 100644 --- a/smali/android/support/constraint/solver/widgets/ConstraintWidgetContainer.smali +++ b/smali/android/support/constraint/solver/widgets/ConstraintWidgetContainer.smali @@ -159,14 +159,14 @@ const/4 v2, 0x4 + .line 156 new-array v3, v2, [Landroid/support/constraint/solver/widgets/ChainHead; - .line 156 iput-object v3, p0, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mVerticalChainsArray:[Landroid/support/constraint/solver/widgets/ChainHead; + .line 157 new-array v2, v2, [Landroid/support/constraint/solver/widgets/ChainHead; - .line 157 iput-object v2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mHorizontalChainsArray:[Landroid/support/constraint/solver/widgets/ChainHead; .line 159 @@ -268,14 +268,14 @@ const/4 v0, 0x4 + .line 156 new-array v1, v0, [Landroid/support/constraint/solver/widgets/ChainHead; - .line 156 iput-object v1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mVerticalChainsArray:[Landroid/support/constraint/solver/widgets/ChainHead; + .line 157 new-array v0, v0, [Landroid/support/constraint/solver/widgets/ChainHead; - .line 157 iput-object v0, p0, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mHorizontalChainsArray:[Landroid/support/constraint/solver/widgets/ChainHead; .line 159 @@ -377,14 +377,14 @@ const/4 p3, 0x4 + .line 156 new-array p4, p3, [Landroid/support/constraint/solver/widgets/ChainHead; - .line 156 iput-object p4, p0, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mVerticalChainsArray:[Landroid/support/constraint/solver/widgets/ChainHead; + .line 157 new-array p3, p3, [Landroid/support/constraint/solver/widgets/ChainHead; - .line 157 iput-object p3, p0, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mHorizontalChainsArray:[Landroid/support/constraint/solver/widgets/ChainHead; .line 159 @@ -486,14 +486,14 @@ const/4 v0, 0x4 + .line 156 new-array v1, v0, [Landroid/support/constraint/solver/widgets/ChainHead; - .line 156 iput-object v1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mVerticalChainsArray:[Landroid/support/constraint/solver/widgets/ChainHead; + .line 157 new-array v0, v0, [Landroid/support/constraint/solver/widgets/ChainHead; - .line 157 iput-object v0, p0, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mHorizontalChainsArray:[Landroid/support/constraint/solver/widgets/ChainHead; .line 159 @@ -622,11 +622,11 @@ .line 316 iget-object v0, p0, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mSystem:Landroid/support/constraint/solver/LinearSystem; - const/4 v1, 0x0 + const/4 v1, 0x5 - const/4 v2, 0x5 + const/4 v2, 0x0 - invoke-virtual {v0, p2, p1, v1, v2}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V + invoke-virtual {v0, p2, p1, v2, v1}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V return-void .end method @@ -644,11 +644,11 @@ .line 310 iget-object v0, p0, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mSystem:Landroid/support/constraint/solver/LinearSystem; - const/4 v1, 0x0 + const/4 v1, 0x5 - const/4 v2, 0x5 + const/4 v2, 0x0 - invoke-virtual {v0, p1, p2, v1, v2}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V + invoke-virtual {v0, p1, p2, v2, v1}, Landroid/support/constraint/solver/LinearSystem;->addGreaterThan(Landroid/support/constraint/solver/SolverVariable;Landroid/support/constraint/solver/SolverVariable;II)V return-void .end method @@ -2320,21 +2320,17 @@ iput-boolean v2, v12, Landroid/support/constraint/solver/LinearSystem;->graphOptimizer:Z .line 733 - iget-object v12, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mSystem:Landroid/support/constraint/solver/LinearSystem; - iput-boolean v2, v12, Landroid/support/constraint/solver/LinearSystem;->newgraphOptimizer:Z .line 735 - iget v12, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mOptimizationLevel:I + iget v13, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mOptimizationLevel:I - if-eqz v12, :cond_c + if-eqz v13, :cond_c if-eqz v11, :cond_c .line 737 - iget-object v11, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mSystem:Landroid/support/constraint/solver/LinearSystem; - - iput-boolean v6, v11, Landroid/support/constraint/solver/LinearSystem;->newgraphOptimizer:Z + iput-boolean v6, v12, Landroid/support/constraint/solver/LinearSystem;->newgraphOptimizer:Z .line 741 :cond_c @@ -2407,14 +2403,14 @@ move-result v10 - move v13, v0 + move v14, v0 const/4 v0, 0x0 - const/4 v14, 0x1 + const/4 v13, 0x1 :goto_a - if-eqz v14, :cond_21 + if-eqz v13, :cond_21 add-int/lit8 v15, v0, 0x1 @@ -2465,7 +2461,7 @@ invoke-virtual {v1, v0}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->addChildrenToSolver(Landroid/support/constraint/solver/LinearSystem;)Z - move-result v14 + move-result v13 .line 785 iget-object v0, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->verticalWrapMin:Ljava/lang/ref/WeakReference; @@ -2474,6 +2470,8 @@ if-eqz v0, :cond_12 + iget-object v0, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->verticalWrapMin:Ljava/lang/ref/WeakReference; + invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object; move-result-object v0 @@ -2508,6 +2506,8 @@ if-eqz v0, :cond_13 + iget-object v0, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->verticalWrapMax:Ljava/lang/ref/WeakReference; + invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object; move-result-object v0 @@ -2542,6 +2542,8 @@ if-eqz v0, :cond_14 + iget-object v0, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->horizontalWrapMin:Ljava/lang/ref/WeakReference; + invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object; move-result-object v0 @@ -2576,6 +2578,8 @@ if-eqz v0, :cond_15 + iget-object v0, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->horizontalWrapMax:Ljava/lang/ref/WeakReference; + invoke-virtual {v0}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object; move-result-object v0 @@ -2605,7 +2609,7 @@ iput-object v2, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->horizontalWrapMax:Ljava/lang/ref/WeakReference; :cond_15 - if-eqz v14, :cond_16 + if-eqz v13, :cond_16 .line 802 iget-object v0, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mSystem:Landroid/support/constraint/solver/LinearSystem; @@ -2643,7 +2647,7 @@ :cond_16 :goto_c - if-eqz v14, :cond_17 + if-eqz v13, :cond_17 .line 809 iget-object v0, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mSystem:Landroid/support/constraint/solver/LinearSystem; @@ -2685,11 +2689,11 @@ :cond_18 :goto_e - if-eqz v12, :cond_1b + if-eqz v12, :cond_1c const/16 v0, 0x8 - if-ge v15, v0, :cond_1b + if-ge v15, v0, :cond_1c .line 819 sget-object v0, Landroid/support/constraint/solver/widgets/Optimizer;->flags:[Z @@ -2698,7 +2702,7 @@ aget-boolean v0, v0, v2 - if-eqz v0, :cond_1b + if-eqz v0, :cond_1c const/4 v0, 0x0 @@ -2710,18 +2714,18 @@ if-ge v0, v3, :cond_19 .line 825 - iget-object v14, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mChildren:Ljava/util/ArrayList; + iget-object v13, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mChildren:Ljava/util/ArrayList; - invoke-virtual {v14, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v13, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; - move-result-object v14 + move-result-object v13 - check-cast v14, Landroid/support/constraint/solver/widgets/ConstraintWidget; + check-cast v13, Landroid/support/constraint/solver/widgets/ConstraintWidget; .line 826 - iget v2, v14, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mX:I + iget v2, v13, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mX:I - invoke-virtual {v14}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getWidth()I + invoke-virtual {v13}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getWidth()I move-result v16 @@ -2732,13 +2736,13 @@ move-result v6 .line 827 - iget v2, v14, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mY:I + iget v2, v13, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mY:I - invoke-virtual {v14}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getHeight()I + invoke-virtual {v13}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getHeight()I - move-result v14 + move-result v13 - add-int/2addr v2, v14 + add-int/2addr v2, v13 invoke-static {v8, v2}, Ljava/lang/Math;->max(II)I @@ -2791,7 +2795,7 @@ const/4 v0, 0x1 - const/4 v13, 0x1 + const/4 v14, 0x1 goto :goto_10 @@ -2802,14 +2806,14 @@ :goto_10 sget-object v6, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->WRAP_CONTENT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - if-ne v5, v6, :cond_1c + if-ne v5, v6, :cond_1b .line 844 invoke-virtual/range {p0 .. p0}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->getHeight()I move-result v6 - if-ge v6, v2, :cond_1c + if-ge v6, v2, :cond_1b .line 849 invoke-virtual {v1, v2}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->setHeight(I)V @@ -2825,32 +2829,38 @@ const/4 v0, 0x1 - const/4 v13, 0x1 + const/4 v6, 0x1 goto :goto_11 :cond_1b + move v6, v14 + + goto :goto_11 + + :cond_1c + move v6, v14 + const/4 v0, 0x0 .line 857 - :cond_1c :goto_11 iget v2, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mMinWidth:I invoke-virtual/range {p0 .. p0}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->getWidth()I - move-result v6 + move-result v8 - invoke-static {v2, v6}, Ljava/lang/Math;->max(II)I + invoke-static {v2, v8}, Ljava/lang/Math;->max(II)I move-result v2 .line 858 invoke-virtual/range {p0 .. p0}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->getWidth()I - move-result v6 + move-result v8 - if-le v2, v6, :cond_1d + if-le v2, v8, :cond_1d .line 863 invoke-virtual {v1, v2}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->setWidth(I)V @@ -2866,7 +2876,7 @@ const/4 v0, 0x1 - const/4 v13, 0x1 + const/4 v6, 0x1 .line 868 :cond_1d @@ -2874,18 +2884,18 @@ invoke-virtual/range {p0 .. p0}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->getHeight()I - move-result v6 + move-result v8 - invoke-static {v2, v6}, Ljava/lang/Math;->max(II)I + invoke-static {v2, v8}, Ljava/lang/Math;->max(II)I move-result v2 .line 869 invoke-virtual/range {p0 .. p0}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->getHeight()I - move-result v6 + move-result v8 - if-le v2, v6, :cond_1e + if-le v2, v8, :cond_1e .line 874 invoke-virtual {v1, v2}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->setHeight(I)V @@ -2895,28 +2905,28 @@ sget-object v2, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->FIXED:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - const/4 v6, 0x1 + const/4 v8, 0x1 - aput-object v2, v0, v6 + aput-object v2, v0, v8 const/4 v0, 0x1 - const/4 v13, 0x1 + const/4 v6, 0x1 goto :goto_12 :cond_1e - const/4 v6, 0x1 + const/4 v8, 0x1 :goto_12 - if-nez v13, :cond_20 + if-nez v6, :cond_20 .line 881 iget-object v2, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mListDimensionBehaviors:[Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - const/4 v8, 0x0 + const/4 v13, 0x0 - aget-object v2, v2, v8 + aget-object v2, v2, v13 sget-object v14, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->WRAP_CONTENT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; @@ -2932,31 +2942,31 @@ if-le v2, v4, :cond_1f .line 889 - iput-boolean v6, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mWidthMeasuredTooSmall:Z + iput-boolean v8, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mWidthMeasuredTooSmall:Z .line 891 iget-object v0, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mListDimensionBehaviors:[Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; sget-object v2, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->FIXED:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - aput-object v2, v0, v8 + aput-object v2, v0, v13 .line 892 invoke-virtual {v1, v4}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->setWidth(I)V const/4 v0, 0x1 - const/4 v13, 0x1 + const/4 v6, 0x1 .line 896 :cond_1f iget-object v2, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mListDimensionBehaviors:[Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - aget-object v2, v2, v6 + aget-object v2, v2, v8 - sget-object v8, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->WRAP_CONTENT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + sget-object v13, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->WRAP_CONTENT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - if-ne v2, v8, :cond_20 + if-ne v2, v13, :cond_20 if-lez v9, :cond_20 @@ -2968,14 +2978,14 @@ if-le v2, v9, :cond_20 .line 904 - iput-boolean v6, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mHeightMeasuredTooSmall:Z + iput-boolean v8, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mHeightMeasuredTooSmall:Z .line 906 iget-object v0, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mListDimensionBehaviors:[Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; sget-object v2, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->FIXED:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - aput-object v2, v0, v6 + aput-object v2, v0, v8 .line 907 invoke-virtual {v1, v9}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->setHeight(I)V @@ -2987,7 +2997,9 @@ goto :goto_13 :cond_20 - move v14, v0 + move v13, v0 + + move v14, v6 :goto_13 move v0, v15 @@ -3002,13 +3014,11 @@ .line 920 :cond_21 - move-object v0, v11 - - check-cast v0, Ljava/util/ArrayList; + check-cast v11, Ljava/util/ArrayList; iput-object v11, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mChildren:Ljava/util/ArrayList; - if-eqz v13, :cond_22 + if-eqz v14, :cond_22 .line 923 iget-object v0, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mListDimensionBehaviors:[Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; @@ -3150,9 +3160,11 @@ .line 214 iput p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mOptimizationLevel:I + .line 215 + iget-object p1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mSystem:Landroid/support/constraint/solver/LinearSystem; + const/16 p1, 0x200 - .line 215 invoke-virtual {p0, p1}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->optimizeFor(I)Z move-result p1 @@ -3192,12 +3204,12 @@ .method public updateChildrenFromSolver(Landroid/support/constraint/solver/LinearSystem;[Z)V .locals 3 - const/4 v0, 0x2 + const/4 v0, 0x0 - const/4 v1, 0x0 + const/4 v1, 0x2 .line 423 - aput-boolean v1, p2, v0 + aput-boolean v0, p2, v1 const/16 p2, 0x40 @@ -3210,19 +3222,19 @@ invoke-virtual {p0, p1, p2}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->updateFromSolver(Landroid/support/constraint/solver/LinearSystem;Z)V .line 426 - iget-object v0, p0, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mChildren:Ljava/util/ArrayList; + iget-object v1, p0, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mChildren:Ljava/util/ArrayList; - invoke-virtual {v0}, Ljava/util/ArrayList;->size()I + invoke-virtual {v1}, Ljava/util/ArrayList;->size()I - move-result v0 + move-result v1 :goto_0 - if-ge v1, v0, :cond_0 + if-ge v0, v1, :cond_0 .line 428 iget-object v2, p0, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mChildren:Ljava/util/ArrayList; - invoke-virtual {v2, v1}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v2, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; move-result-object v2 @@ -3231,7 +3243,7 @@ .line 429 invoke-virtual {v2, p1, p2}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->updateFromSolver(Landroid/support/constraint/solver/LinearSystem;Z)V - add-int/lit8 v1, v1, 0x1 + add-int/lit8 v0, v0, 0x1 goto :goto_0 diff --git a/smali/android/support/constraint/solver/widgets/Flow$WidgetsList.smali b/smali/android/support/constraint/solver/widgets/Flow$WidgetsList.smali index 0a4cabea..ed72cac2 100644 --- a/smali/android/support/constraint/solver/widgets/Flow$WidgetsList.smali +++ b/smali/android/support/constraint/solver/widgets/Flow$WidgetsList.smali @@ -54,7 +54,7 @@ # direct methods .method public constructor (Landroid/support/constraint/solver/widgets/Flow;ILandroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)V - .locals 1 + .locals 2 .line 355 iput-object p1, p0, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->this$0:Landroid/support/constraint/solver/widgets/Flow; @@ -63,10 +63,13 @@ const/4 v0, 0x0 - .line 335 - iput-object v0, p0, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->biggest:Landroid/support/constraint/solver/widgets/ConstraintWidget; + .line 334 + iput v0, p0, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->mOrientation:I - const/4 v0, 0x0 + const/4 v1, 0x0 + + .line 335 + iput-object v1, p0, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->biggest:Landroid/support/constraint/solver/widgets/ConstraintWidget; .line 336 iput v0, p0, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->biggestDimension:I @@ -889,21 +892,23 @@ move-object v12, v9 :goto_9 - const/4 v10, 0x0 + move-object v10, v6 + + const/4 v6, 0x0 :goto_a - if-ge v10, v1, :cond_35 + if-ge v6, v1, :cond_35 if-eqz p1, :cond_11 add-int/lit8 v13, v1, -0x1 - sub-int/2addr v13, v10 + sub-int/2addr v13, v6 goto :goto_b :cond_11 - move v13, v10 + move v13, v6 .line 524 :goto_b @@ -935,7 +940,7 @@ aget-object v14, v14, v15 - if-nez v10, :cond_13 + if-nez v6, :cond_13 .line 529 iget-object v15, v14, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; @@ -1029,7 +1034,7 @@ :cond_16 add-int/lit8 v3, v1, -0x1 - if-ne v10, v3, :cond_17 + if-ne v6, v3, :cond_17 .line 548 iget-object v3, v14, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; @@ -1041,12 +1046,12 @@ invoke-virtual {v14, v3, v11, v13}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)V :cond_17 - if-eqz v6, :cond_19 + if-eqz v10, :cond_19 .line 551 iget-object v3, v14, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iget-object v11, v6, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v11, v10, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; iget-object v13, v0, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->this$0:Landroid/support/constraint/solver/widgets/Flow; @@ -1056,7 +1061,7 @@ invoke-virtual {v3, v11, v13}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)Z - if-ne v10, v7, :cond_18 + if-ne v6, v7, :cond_18 .line 553 iget-object v3, v14, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; @@ -1067,7 +1072,7 @@ .line 555 :cond_18 - iget-object v3, v6, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v3, v10, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; iget-object v11, v14, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; @@ -1077,14 +1082,14 @@ add-int/lit8 v11, v8, 0x1 - if-ne v10, v11, :cond_19 + if-ne v6, v11, :cond_19 .line 557 - iget-object v3, v6, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v3, v10, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iget v6, v0, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->mPaddingRight:I + iget v10, v0, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->mPaddingRight:I - invoke-virtual {v3, v6}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->setGoneMargin(I)V + invoke-virtual {v3, v10}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->setGoneMargin(I)V :cond_19 if-eq v14, v9, :cond_1e @@ -1096,9 +1101,9 @@ move-result v3 - const/4 v6, 0x3 + const/4 v10, 0x3 - if-ne v3, v6, :cond_1a + if-ne v3, v10, :cond_1a .line 562 invoke-virtual {v12}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->hasBaseline()Z @@ -1199,12 +1204,12 @@ goto :goto_d :cond_1e - const/4 v6, 0x3 + const/4 v10, 0x3 :goto_d - add-int/lit8 v10, v10, 0x1 + add-int/lit8 v6, v6, 0x1 - move-object v6, v14 + move-object v10, v14 const/4 v11, 0x3 @@ -1311,15 +1316,17 @@ :cond_24 :goto_e - const/4 v9, 0x0 + move-object v9, v6 + + const/4 v6, 0x0 :goto_f - if-ge v9, v1, :cond_35 + if-ge v6, v1, :cond_35 .line 618 iget v10, v0, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->mStartIndex:I - add-int/2addr v10, v9 + add-int/2addr v10, v6 iget-object v11, v0, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->this$0:Landroid/support/constraint/solver/widgets/Flow; @@ -1341,11 +1348,11 @@ iget v11, v0, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->mStartIndex:I - add-int/2addr v11, v9 + add-int/2addr v11, v6 aget-object v10, v10, v11 - if-nez v9, :cond_28 + if-nez v6, :cond_28 .line 623 iget-object v11, v10, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mTop:Landroid/support/constraint/solver/widgets/ConstraintAnchor; @@ -1436,7 +1443,7 @@ :cond_28 add-int/lit8 v11, v1, -0x1 - if-ne v9, v11, :cond_29 + if-ne v6, v11, :cond_29 .line 637 iget-object v11, v10, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBottom:Landroid/support/constraint/solver/widgets/ConstraintAnchor; @@ -1448,12 +1455,12 @@ invoke-virtual {v10, v11, v12, v13}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)V :cond_29 - if-eqz v6, :cond_2b + if-eqz v9, :cond_2b .line 640 iget-object v11, v10, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mTop:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iget-object v12, v6, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBottom:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v12, v9, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBottom:Landroid/support/constraint/solver/widgets/ConstraintAnchor; iget-object v13, v0, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->this$0:Landroid/support/constraint/solver/widgets/Flow; @@ -1463,7 +1470,7 @@ invoke-virtual {v11, v12, v13}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)Z - if-ne v9, v7, :cond_2a + if-ne v6, v7, :cond_2a .line 642 iget-object v11, v10, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mTop:Landroid/support/constraint/solver/widgets/ConstraintAnchor; @@ -1474,7 +1481,7 @@ .line 644 :cond_2a - iget-object v11, v6, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBottom:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v11, v9, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBottom:Landroid/support/constraint/solver/widgets/ConstraintAnchor; iget-object v12, v10, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mTop:Landroid/support/constraint/solver/widgets/ConstraintAnchor; @@ -1484,19 +1491,19 @@ add-int/lit8 v12, v8, 0x1 - if-ne v9, v12, :cond_2b + if-ne v6, v12, :cond_2b .line 646 - iget-object v6, v6, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBottom:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v9, v9, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBottom:Landroid/support/constraint/solver/widgets/ConstraintAnchor; iget v11, v0, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->mPaddingBottom:I - invoke-virtual {v6, v11}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->setGoneMargin(I)V + invoke-virtual {v9, v11}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->setGoneMargin(I)V :cond_2b if-eq v10, v3, :cond_34 - const/4 v6, 0x2 + const/4 v9, 0x2 if-eqz p1, :cond_2f @@ -1513,44 +1520,44 @@ if-eq v11, v12, :cond_2d - if-eq v11, v6, :cond_2c + if-eq v11, v9, :cond_2c goto :goto_11 .line 657 :cond_2c - iget-object v6, v10, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v9, v10, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; iget-object v11, v3, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - invoke-virtual {v6, v11, v2}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)Z + invoke-virtual {v9, v11, v2}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)Z .line 658 - iget-object v6, v10, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v9, v10, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; iget-object v11, v3, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - invoke-virtual {v6, v11, v2}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)Z + invoke-virtual {v9, v11, v2}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)Z goto :goto_11 .line 662 :cond_2d - iget-object v6, v10, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v9, v10, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; iget-object v11, v3, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - invoke-virtual {v6, v11, v2}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)Z + invoke-virtual {v9, v11, v2}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)Z goto :goto_11 .line 653 :cond_2e - iget-object v6, v10, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v9, v10, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; iget-object v11, v3, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - invoke-virtual {v6, v11, v2}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)Z + invoke-virtual {v9, v11, v2}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)Z goto :goto_11 @@ -1568,7 +1575,7 @@ if-eq v11, v12, :cond_32 - if-eq v11, v6, :cond_30 + if-eq v11, v9, :cond_30 goto :goto_12 @@ -1576,49 +1583,49 @@ if-eqz v4, :cond_31 .line 674 - iget-object v6, v10, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v9, v10, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; iget-object v11, v0, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; iget v13, v0, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->mPaddingLeft:I - invoke-virtual {v6, v11, v13}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)Z + invoke-virtual {v9, v11, v13}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)Z .line 675 - iget-object v6, v10, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v9, v10, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; iget-object v11, v0, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; iget v13, v0, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->mPaddingRight:I - invoke-virtual {v6, v11, v13}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)Z + invoke-virtual {v9, v11, v13}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)Z goto :goto_12 .line 677 :cond_31 - iget-object v6, v10, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v9, v10, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; iget-object v11, v3, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - invoke-virtual {v6, v11, v2}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)Z + invoke-virtual {v9, v11, v2}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)Z .line 678 - iget-object v6, v10, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v9, v10, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; iget-object v11, v3, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - invoke-virtual {v6, v11, v2}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)Z + invoke-virtual {v9, v11, v2}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)Z goto :goto_12 .line 683 :cond_32 - iget-object v6, v10, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v9, v10, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; iget-object v11, v3, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - invoke-virtual {v6, v11, v2}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)Z + invoke-virtual {v9, v11, v2}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)Z goto :goto_12 @@ -1626,11 +1633,11 @@ const/4 v12, 0x1 .line 669 - iget-object v6, v10, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v9, v10, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; iget-object v11, v3, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - invoke-virtual {v6, v11, v2}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)Z + invoke-virtual {v9, v11, v2}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)Z goto :goto_12 @@ -1639,9 +1646,9 @@ const/4 v12, 0x1 :goto_12 - add-int/lit8 v9, v9, 0x1 + add-int/lit8 v6, v6, 0x1 - move-object v6, v10 + move-object v9, v10 goto/16 :goto_f diff --git a/smali/android/support/constraint/solver/widgets/Flow.smali b/smali/android/support/constraint/solver/widgets/Flow.smali index 1b4228dd..4ceb7275 100644 --- a/smali/android/support/constraint/solver/widgets/Flow.smali +++ b/smali/android/support/constraint/solver/widgets/Flow.smali @@ -427,23 +427,25 @@ const/4 v4, 0x0 - const/4 v5, 0x0 + move-object v5, v4 + + const/4 v4, 0x0 :goto_1 const/16 v6, 0x8 - if-ge v5, v2, :cond_8 + if-ge v4, v2, :cond_8 if-eqz p1, :cond_2 - sub-int v7, v2, v5 + sub-int v7, v2, v4 sub-int/2addr v7, v3 goto :goto_2 :cond_2 - move v7, v5 + move v7, v4 .line 1141 :goto_2 @@ -463,7 +465,7 @@ goto :goto_3 :cond_3 - if-nez v5, :cond_4 + if-nez v4, :cond_4 .line 1146 iget-object v6, v7, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; @@ -489,7 +491,7 @@ :cond_4 add-int/lit8 v6, v2, -0x1 - if-ne v5, v6, :cond_5 + if-ne v4, v6, :cond_5 .line 1151 iget-object v6, v7, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; @@ -503,30 +505,30 @@ invoke-virtual {v7, v6, v8, v9}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)V :cond_5 - if-lez v5, :cond_6 + if-lez v4, :cond_6 .line 1154 iget-object v6, v7, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iget-object v8, v4, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v8, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; iget v9, p0, Landroid/support/constraint/solver/widgets/Flow;->mHorizontalGap:I invoke-virtual {v7, v6, v8, v9}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)V .line 1155 - iget-object v6, v4, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v6, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; iget-object v8, v7, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - invoke-virtual {v4, v6, v8, v0}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)V + invoke-virtual {v5, v6, v8, v0}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)V :cond_6 - move-object v4, v7 + move-object v5, v7 :cond_7 :goto_3 - add-int/lit8 v5, v5, 0x1 + add-int/lit8 v4, v4, 0x1 goto :goto_1 @@ -537,14 +539,14 @@ if-ge p1, v1, :cond_e .line 1160 - iget-object v5, p0, Landroid/support/constraint/solver/widgets/Flow;->mAlignedBiggestElementsInRows:[Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object v4, p0, Landroid/support/constraint/solver/widgets/Flow;->mAlignedBiggestElementsInRows:[Landroid/support/constraint/solver/widgets/ConstraintWidget; - aget-object v5, v5, p1 + aget-object v4, v4, p1 - if-eqz v5, :cond_d + if-eqz v4, :cond_d .line 1161 - invoke-virtual {v5}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getVisibility()I + invoke-virtual {v4}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getVisibility()I move-result v7 @@ -556,7 +558,7 @@ if-nez p1, :cond_a .line 1165 - iget-object v7, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mTop:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v7, v4, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mTop:Landroid/support/constraint/solver/widgets/ConstraintAnchor; iget-object v8, p0, Landroid/support/constraint/solver/widgets/Flow;->mTop:Landroid/support/constraint/solver/widgets/ConstraintAnchor; @@ -564,17 +566,17 @@ move-result v9 - invoke-virtual {v5, v7, v8, v9}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)V + invoke-virtual {v4, v7, v8, v9}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)V .line 1166 iget v7, p0, Landroid/support/constraint/solver/widgets/Flow;->mVerticalStyle:I - invoke-virtual {v5, v7}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->setVerticalChainStyle(I)V + invoke-virtual {v4, v7}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->setVerticalChainStyle(I)V .line 1167 iget v7, p0, Landroid/support/constraint/solver/widgets/Flow;->mVerticalBias:F - invoke-virtual {v5, v7}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->setVerticalBiasPercent(F)V + invoke-virtual {v4, v7}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->setVerticalBiasPercent(F)V :cond_a add-int/lit8 v7, v1, -0x1 @@ -582,7 +584,7 @@ if-ne p1, v7, :cond_b .line 1170 - iget-object v7, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBottom:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v7, v4, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBottom:Landroid/support/constraint/solver/widgets/ConstraintAnchor; iget-object v8, p0, Landroid/support/constraint/solver/widgets/Flow;->mBottom:Landroid/support/constraint/solver/widgets/ConstraintAnchor; @@ -590,29 +592,29 @@ move-result v9 - invoke-virtual {v5, v7, v8, v9}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)V + invoke-virtual {v4, v7, v8, v9}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)V :cond_b if-lez p1, :cond_c .line 1173 - iget-object v7, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mTop:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v7, v4, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mTop:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iget-object v8, v4, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBottom:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v8, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBottom:Landroid/support/constraint/solver/widgets/ConstraintAnchor; iget v9, p0, Landroid/support/constraint/solver/widgets/Flow;->mVerticalGap:I - invoke-virtual {v5, v7, v8, v9}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)V + invoke-virtual {v4, v7, v8, v9}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)V .line 1174 - iget-object v7, v4, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBottom:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v7, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBottom:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iget-object v8, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mTop:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v8, v4, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mTop:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - invoke-virtual {v4, v7, v8, v0}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)V + invoke-virtual {v5, v7, v8, v0}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->connect(Landroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)V :cond_c - move-object v4, v5 + move-object v5, v4 :cond_d :goto_5 @@ -982,456 +984,479 @@ .end method .method private measureAligned([Landroid/support/constraint/solver/widgets/ConstraintWidget;III[I)V - .locals 10 + .locals 16 - const/4 v0, 0x0 + move-object/from16 v0, p0 + + move-object/from16 v1, p1 + + move/from16 v2, p2 + + move/from16 v3, p3 - if-nez p3, :cond_4 + move/from16 v4, p4 + + const/4 v5, 0x0 + + if-nez v3, :cond_5 .line 972 - iget v1, p0, Landroid/support/constraint/solver/widgets/Flow;->mMaxElementsWrap:I + iget v6, v0, Landroid/support/constraint/solver/widgets/Flow;->mMaxElementsWrap:I - if-gtz v1, :cond_3 + if-gtz v6, :cond_3 - const/4 v1, 0x0 + const/4 v6, 0x0 - const/4 v2, 0x0 + const/4 v7, 0x0 - const/4 v3, 0x0 + const/4 v8, 0x0 :goto_0 - if-ge v2, p2, :cond_3 + if-ge v6, v2, :cond_4 - if-lez v2, :cond_0 + if-lez v6, :cond_0 .line 979 - iget v4, p0, Landroid/support/constraint/solver/widgets/Flow;->mHorizontalGap:I + iget v9, v0, Landroid/support/constraint/solver/widgets/Flow;->mHorizontalGap:I - add-int/2addr v3, v4 + add-int/2addr v7, v9 .line 981 :cond_0 - aget-object v4, p1, v2 + aget-object v9, v1, v6 - if-nez v4, :cond_1 + if-nez v9, :cond_1 goto :goto_1 .line 985 :cond_1 - invoke-direct {p0, v4, p4}, Landroid/support/constraint/solver/widgets/Flow;->getWidgetWidth(Landroid/support/constraint/solver/widgets/ConstraintWidget;I)I + invoke-direct {v0, v9, v4}, Landroid/support/constraint/solver/widgets/Flow;->getWidgetWidth(Landroid/support/constraint/solver/widgets/ConstraintWidget;I)I - move-result v4 + move-result v9 - add-int/2addr v3, v4 + add-int/2addr v7, v9 - if-le v3, p4, :cond_2 + if-le v7, v4, :cond_2 goto :goto_2 :cond_2 - add-int/lit8 v1, v1, 0x1 + add-int/lit8 v8, v8, 0x1 :goto_1 - add-int/lit8 v2, v2, 0x1 + add-int/lit8 v6, v6, 0x1 goto :goto_0 :cond_3 - :goto_2 - move v2, v1 + move v8, v6 - const/4 v1, 0x0 + :cond_4 + :goto_2 + const/4 v6, 0x0 goto :goto_6 .line 993 - :cond_4 - iget v1, p0, Landroid/support/constraint/solver/widgets/Flow;->mMaxElementsWrap:I + :cond_5 + iget v6, v0, Landroid/support/constraint/solver/widgets/Flow;->mMaxElementsWrap:I - if-gtz v1, :cond_8 + if-gtz v6, :cond_a - const/4 v1, 0x0 + const/4 v6, 0x0 - const/4 v2, 0x0 + const/4 v7, 0x0 - const/4 v3, 0x0 + const/4 v8, 0x0 :goto_3 - if-ge v2, p2, :cond_8 + if-ge v6, v2, :cond_9 - if-lez v2, :cond_5 + if-lez v6, :cond_6 .line 1000 - iget v4, p0, Landroid/support/constraint/solver/widgets/Flow;->mVerticalGap:I + iget v9, v0, Landroid/support/constraint/solver/widgets/Flow;->mVerticalGap:I - add-int/2addr v3, v4 + add-int/2addr v7, v9 .line 1002 - :cond_5 - aget-object v4, p1, v2 + :cond_6 + aget-object v9, v1, v6 - if-nez v4, :cond_6 + if-nez v9, :cond_7 goto :goto_4 .line 1006 - :cond_6 - invoke-direct {p0, v4, p4}, Landroid/support/constraint/solver/widgets/Flow;->getWidgetHeight(Landroid/support/constraint/solver/widgets/ConstraintWidget;I)I + :cond_7 + invoke-direct {v0, v9, v4}, Landroid/support/constraint/solver/widgets/Flow;->getWidgetHeight(Landroid/support/constraint/solver/widgets/ConstraintWidget;I)I - move-result v4 + move-result v9 - add-int/2addr v3, v4 + add-int/2addr v7, v9 - if-le v3, p4, :cond_7 + if-le v7, v4, :cond_8 goto :goto_5 - :cond_7 - add-int/lit8 v1, v1, 0x1 + :cond_8 + add-int/lit8 v8, v8, 0x1 :goto_4 - add-int/lit8 v2, v2, 0x1 + add-int/lit8 v6, v6, 0x1 goto :goto_3 - :cond_8 + :cond_9 :goto_5 - const/4 v2, 0x0 + move v6, v8 + + :cond_a + const/4 v8, 0x0 .line 1015 :goto_6 - iget-object v3, p0, Landroid/support/constraint/solver/widgets/Flow;->mAlignedDimensions:[I + iget-object v7, v0, Landroid/support/constraint/solver/widgets/Flow;->mAlignedDimensions:[I - if-nez v3, :cond_9 - - const/4 v3, 0x2 + if-nez v7, :cond_b - new-array v3, v3, [I + const/4 v7, 0x2 .line 1016 - iput-object v3, p0, Landroid/support/constraint/solver/widgets/Flow;->mAlignedDimensions:[I + new-array v7, v7, [I - :cond_9 - const/4 v3, 0x1 + iput-object v7, v0, Landroid/support/constraint/solver/widgets/Flow;->mAlignedDimensions:[I - if-nez v1, :cond_a + :cond_b + const/4 v7, 0x1 - if-eq p3, v3, :cond_b + if-nez v6, :cond_c - :cond_a - if-nez v2, :cond_c + if-eq v3, v7, :cond_d - if-nez p3, :cond_c + :cond_c + if-nez v8, :cond_f - :cond_b - const/4 v4, 0x1 + if-nez v3, :cond_f + + :cond_d + move v9, v6 + + :cond_e + const/4 v6, 0x1 goto :goto_7 - :cond_c - const/4 v4, 0x0 + :cond_f + move v9, v6 + + const/4 v6, 0x0 :goto_7 - if-nez v4, :cond_22 + if-nez v6, :cond_25 - if-nez p3, :cond_d + if-nez v3, :cond_10 - int-to-float v1, p2 + int-to-float v9, v2 - int-to-float v5, v2 + int-to-float v10, v8 - div-float/2addr v1, v5 + div-float/2addr v9, v10 - float-to-double v5, v1 + float-to-double v9, v9 .line 1029 - invoke-static {v5, v6}, Ljava/lang/Math;->ceil(D)D + invoke-static {v9, v10}, Ljava/lang/Math;->ceil(D)D - move-result-wide v5 + move-result-wide v9 - double-to-int v1, v5 + double-to-int v9, v9 goto :goto_8 - :cond_d - int-to-float v2, p2 + :cond_10 + int-to-float v8, v2 - int-to-float v5, v1 + int-to-float v10, v9 - div-float/2addr v2, v5 + div-float/2addr v8, v10 - float-to-double v5, v2 + float-to-double v10, v8 .line 1031 - invoke-static {v5, v6}, Ljava/lang/Math;->ceil(D)D + invoke-static {v10, v11}, Ljava/lang/Math;->ceil(D)D - move-result-wide v5 + move-result-wide v10 - double-to-int v2, v5 + double-to-int v8, v10 .line 1034 :goto_8 - iget-object v5, p0, Landroid/support/constraint/solver/widgets/Flow;->mAlignedBiggestElementsInCols:[Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object v10, v0, Landroid/support/constraint/solver/widgets/Flow;->mAlignedBiggestElementsInCols:[Landroid/support/constraint/solver/widgets/ConstraintWidget; - const/4 v6, 0x0 + const/4 v11, 0x0 - if-eqz v5, :cond_f + if-eqz v10, :cond_12 - array-length v7, v5 + array-length v12, v10 - if-ge v7, v2, :cond_e + if-ge v12, v8, :cond_11 goto :goto_9 .line 1037 - :cond_e - invoke-static {v5, v6}, Ljava/util/Arrays;->fill([Ljava/lang/Object;Ljava/lang/Object;)V + :cond_11 + invoke-static {v10, v11}, Ljava/util/Arrays;->fill([Ljava/lang/Object;Ljava/lang/Object;)V goto :goto_a .line 1035 - :cond_f + :cond_12 :goto_9 - new-array v5, v2, [Landroid/support/constraint/solver/widgets/ConstraintWidget; + new-array v10, v8, [Landroid/support/constraint/solver/widgets/ConstraintWidget; - iput-object v5, p0, Landroid/support/constraint/solver/widgets/Flow;->mAlignedBiggestElementsInCols:[Landroid/support/constraint/solver/widgets/ConstraintWidget; + iput-object v10, v0, Landroid/support/constraint/solver/widgets/Flow;->mAlignedBiggestElementsInCols:[Landroid/support/constraint/solver/widgets/ConstraintWidget; .line 1039 :goto_a - iget-object v5, p0, Landroid/support/constraint/solver/widgets/Flow;->mAlignedBiggestElementsInRows:[Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object v10, v0, Landroid/support/constraint/solver/widgets/Flow;->mAlignedBiggestElementsInRows:[Landroid/support/constraint/solver/widgets/ConstraintWidget; - if-eqz v5, :cond_11 + if-eqz v10, :cond_14 - array-length v7, v5 + array-length v12, v10 - if-ge v7, v1, :cond_10 + if-ge v12, v9, :cond_13 goto :goto_b .line 1042 - :cond_10 - invoke-static {v5, v6}, Ljava/util/Arrays;->fill([Ljava/lang/Object;Ljava/lang/Object;)V + :cond_13 + invoke-static {v10, v11}, Ljava/util/Arrays;->fill([Ljava/lang/Object;Ljava/lang/Object;)V goto :goto_c .line 1040 - :cond_11 + :cond_14 :goto_b - new-array v5, v1, [Landroid/support/constraint/solver/widgets/ConstraintWidget; + new-array v10, v9, [Landroid/support/constraint/solver/widgets/ConstraintWidget; - iput-object v5, p0, Landroid/support/constraint/solver/widgets/Flow;->mAlignedBiggestElementsInRows:[Landroid/support/constraint/solver/widgets/ConstraintWidget; + iput-object v10, v0, Landroid/support/constraint/solver/widgets/Flow;->mAlignedBiggestElementsInRows:[Landroid/support/constraint/solver/widgets/ConstraintWidget; :goto_c - const/4 v5, 0x0 + const/4 v10, 0x0 :goto_d - if-ge v5, v2, :cond_1a + if-ge v10, v8, :cond_1d - const/4 v6, 0x0 + const/4 v11, 0x0 :goto_e - if-ge v6, v1, :cond_19 + if-ge v11, v9, :cond_1c - mul-int v7, v6, v2 + mul-int v12, v11, v8 - add-int/2addr v7, v5 + add-int/2addr v12, v10 - if-ne p3, v3, :cond_12 + if-ne v3, v7, :cond_15 - mul-int v7, v5, v1 + mul-int v12, v10, v9 - add-int/2addr v7, v6 + add-int/2addr v12, v11 .line 1051 - :cond_12 - array-length v8, p1 + :cond_15 + array-length v13, v1 - if-lt v7, v8, :cond_13 + if-lt v12, v13, :cond_16 goto :goto_f .line 1054 - :cond_13 - aget-object v7, p1, v7 + :cond_16 + aget-object v12, v1, v12 - if-nez v7, :cond_14 + if-nez v12, :cond_17 goto :goto_f .line 1058 - :cond_14 - invoke-direct {p0, v7, p4}, Landroid/support/constraint/solver/widgets/Flow;->getWidgetWidth(Landroid/support/constraint/solver/widgets/ConstraintWidget;I)I + :cond_17 + invoke-direct {v0, v12, v4}, Landroid/support/constraint/solver/widgets/Flow;->getWidgetWidth(Landroid/support/constraint/solver/widgets/ConstraintWidget;I)I - move-result v8 + move-result v13 .line 1059 - iget-object v9, p0, Landroid/support/constraint/solver/widgets/Flow;->mAlignedBiggestElementsInCols:[Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object v14, v0, Landroid/support/constraint/solver/widgets/Flow;->mAlignedBiggestElementsInCols:[Landroid/support/constraint/solver/widgets/ConstraintWidget; + + aget-object v15, v14, v10 - aget-object v9, v9, v5 + if-eqz v15, :cond_18 - if-eqz v9, :cond_15 + aget-object v14, v14, v10 .line 1060 - invoke-virtual {v9}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getWidth()I + invoke-virtual {v14}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getWidth()I - move-result v9 + move-result v14 - if-ge v9, v8, :cond_16 + if-ge v14, v13, :cond_19 .line 1061 - :cond_15 - iget-object v8, p0, Landroid/support/constraint/solver/widgets/Flow;->mAlignedBiggestElementsInCols:[Landroid/support/constraint/solver/widgets/ConstraintWidget; + :cond_18 + iget-object v13, v0, Landroid/support/constraint/solver/widgets/Flow;->mAlignedBiggestElementsInCols:[Landroid/support/constraint/solver/widgets/ConstraintWidget; - aput-object v7, v8, v5 + aput-object v12, v13, v10 .line 1063 - :cond_16 - invoke-direct {p0, v7, p4}, Landroid/support/constraint/solver/widgets/Flow;->getWidgetHeight(Landroid/support/constraint/solver/widgets/ConstraintWidget;I)I + :cond_19 + invoke-direct {v0, v12, v4}, Landroid/support/constraint/solver/widgets/Flow;->getWidgetHeight(Landroid/support/constraint/solver/widgets/ConstraintWidget;I)I - move-result v8 + move-result v13 .line 1064 - iget-object v9, p0, Landroid/support/constraint/solver/widgets/Flow;->mAlignedBiggestElementsInRows:[Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object v14, v0, Landroid/support/constraint/solver/widgets/Flow;->mAlignedBiggestElementsInRows:[Landroid/support/constraint/solver/widgets/ConstraintWidget; + + aget-object v15, v14, v11 - aget-object v9, v9, v6 + if-eqz v15, :cond_1a - if-eqz v9, :cond_17 + aget-object v14, v14, v11 .line 1065 - invoke-virtual {v9}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getHeight()I + invoke-virtual {v14}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getHeight()I - move-result v9 + move-result v14 - if-ge v9, v8, :cond_18 + if-ge v14, v13, :cond_1b .line 1066 - :cond_17 - iget-object v8, p0, Landroid/support/constraint/solver/widgets/Flow;->mAlignedBiggestElementsInRows:[Landroid/support/constraint/solver/widgets/ConstraintWidget; + :cond_1a + iget-object v13, v0, Landroid/support/constraint/solver/widgets/Flow;->mAlignedBiggestElementsInRows:[Landroid/support/constraint/solver/widgets/ConstraintWidget; - aput-object v7, v8, v6 + aput-object v12, v13, v11 - :cond_18 + :cond_1b :goto_f - add-int/lit8 v6, v6, 0x1 + add-int/lit8 v11, v11, 0x1 goto :goto_e - :cond_19 - add-int/lit8 v5, v5, 0x1 + :cond_1c + add-int/lit8 v10, v10, 0x1 goto :goto_d - :cond_1a - const/4 v5, 0x0 + :cond_1d + const/4 v10, 0x0 - const/4 v6, 0x0 + const/4 v11, 0x0 :goto_10 - if-ge v5, v2, :cond_1d + if-ge v10, v8, :cond_20 .line 1073 - iget-object v7, p0, Landroid/support/constraint/solver/widgets/Flow;->mAlignedBiggestElementsInCols:[Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object v12, v0, Landroid/support/constraint/solver/widgets/Flow;->mAlignedBiggestElementsInCols:[Landroid/support/constraint/solver/widgets/ConstraintWidget; - aget-object v7, v7, v5 + aget-object v12, v12, v10 - if-eqz v7, :cond_1c + if-eqz v12, :cond_1f - if-lez v5, :cond_1b + if-lez v10, :cond_1e .line 1076 - iget v8, p0, Landroid/support/constraint/solver/widgets/Flow;->mHorizontalGap:I + iget v13, v0, Landroid/support/constraint/solver/widgets/Flow;->mHorizontalGap:I - add-int/2addr v6, v8 + add-int/2addr v11, v13 .line 1078 - :cond_1b - invoke-direct {p0, v7, p4}, Landroid/support/constraint/solver/widgets/Flow;->getWidgetWidth(Landroid/support/constraint/solver/widgets/ConstraintWidget;I)I + :cond_1e + invoke-direct {v0, v12, v4}, Landroid/support/constraint/solver/widgets/Flow;->getWidgetWidth(Landroid/support/constraint/solver/widgets/ConstraintWidget;I)I - move-result v7 + move-result v12 - add-int/2addr v6, v7 + add-int/2addr v11, v12 - :cond_1c - add-int/lit8 v5, v5, 0x1 + :cond_1f + add-int/lit8 v10, v10, 0x1 goto :goto_10 - :cond_1d - const/4 v5, 0x0 + :cond_20 + const/4 v10, 0x0 - const/4 v7, 0x0 + const/4 v12, 0x0 :goto_11 - if-ge v5, v1, :cond_20 + if-ge v10, v9, :cond_23 .line 1083 - iget-object v8, p0, Landroid/support/constraint/solver/widgets/Flow;->mAlignedBiggestElementsInRows:[Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object v13, v0, Landroid/support/constraint/solver/widgets/Flow;->mAlignedBiggestElementsInRows:[Landroid/support/constraint/solver/widgets/ConstraintWidget; - aget-object v8, v8, v5 + aget-object v13, v13, v10 - if-eqz v8, :cond_1f + if-eqz v13, :cond_22 - if-lez v5, :cond_1e + if-lez v10, :cond_21 .line 1086 - iget v9, p0, Landroid/support/constraint/solver/widgets/Flow;->mVerticalGap:I + iget v14, v0, Landroid/support/constraint/solver/widgets/Flow;->mVerticalGap:I - add-int/2addr v7, v9 + add-int/2addr v12, v14 .line 1088 - :cond_1e - invoke-direct {p0, v8, p4}, Landroid/support/constraint/solver/widgets/Flow;->getWidgetHeight(Landroid/support/constraint/solver/widgets/ConstraintWidget;I)I + :cond_21 + invoke-direct {v0, v13, v4}, Landroid/support/constraint/solver/widgets/Flow;->getWidgetHeight(Landroid/support/constraint/solver/widgets/ConstraintWidget;I)I - move-result v8 + move-result v13 - add-int/2addr v7, v8 + add-int/2addr v12, v13 - :cond_1f - add-int/lit8 v5, v5, 0x1 + :cond_22 + add-int/lit8 v10, v10, 0x1 goto :goto_11 .line 1091 - :cond_20 - aput v6, p5, v0 + :cond_23 + aput v11, p5, v5 .line 1092 - aput v7, p5, v3 + aput v12, p5, v7 - if-nez p3, :cond_21 + if-nez v3, :cond_24 - if-le v6, p4, :cond_b + if-le v11, v4, :cond_e - if-le v2, v3, :cond_b + if-le v8, v7, :cond_e - add-int/lit8 v2, v2, -0x1 + add-int/lit8 v8, v8, -0x1 goto/16 :goto_7 - :cond_21 - if-le v7, p4, :cond_b + :cond_24 + if-le v12, v4, :cond_e - if-le v1, v3, :cond_b + if-le v9, v7, :cond_e - add-int/lit8 v1, v1, -0x1 + add-int/lit8 v9, v9, -0x1 goto/16 :goto_7 .line 1116 - :cond_22 - iget-object p1, p0, Landroid/support/constraint/solver/widgets/Flow;->mAlignedDimensions:[I + :cond_25 + iget-object v1, v0, Landroid/support/constraint/solver/widgets/Flow;->mAlignedDimensions:[I - aput v2, p1, v0 + aput v8, v1, v5 .line 1117 - aput v1, p1, v3 + aput v9, v1, v7 return-void .end method .method private measureChainWrap([Landroid/support/constraint/solver/widgets/ConstraintWidget;III[I)V - .locals 28 + .locals 27 move-object/from16 v8, p0 @@ -1481,36 +1506,38 @@ if-nez p3, :cond_7 + move-object v2, v10 + const/4 v0, 0x0 const/4 v1, 0x0 - const/4 v11, 0x0 + const/4 v10, 0x0 :goto_0 - if-ge v11, v9, :cond_e + if-ge v10, v9, :cond_e .line 791 - aget-object v12, p1, v11 + aget-object v11, p1, v10 .line 792 - invoke-direct {v8, v12, v15}, Landroid/support/constraint/solver/widgets/Flow;->getWidgetWidth(Landroid/support/constraint/solver/widgets/ConstraintWidget;I)I + invoke-direct {v8, v11, v15}, Landroid/support/constraint/solver/widgets/Flow;->getWidgetWidth(Landroid/support/constraint/solver/widgets/ConstraintWidget;I)I - move-result v13 + move-result v12 .line 793 - invoke-virtual {v12}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getHorizontalDimensionBehaviour()Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + invoke-virtual {v11}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getHorizontalDimensionBehaviour()Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - move-result-object v2 + move-result-object v3 - sget-object v3, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + sget-object v4, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - if-ne v2, v3, :cond_1 + if-ne v3, v4, :cond_1 add-int/lit8 v0, v0, 0x1 :cond_1 - move v14, v0 + move v13, v0 if-eq v1, v15, :cond_2 @@ -1519,12 +1546,12 @@ add-int/2addr v0, v1 - add-int/2addr v0, v13 + add-int/2addr v0, v12 if-le v0, v15, :cond_3 :cond_2 - invoke-static {v10}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->access$2000(Landroid/support/constraint/solver/widgets/Flow$WidgetsList;)Landroid/support/constraint/solver/widgets/ConstraintWidget; + invoke-static {v2}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->access$2000(Landroid/support/constraint/solver/widgets/Flow$WidgetsList;)Landroid/support/constraint/solver/widgets/ConstraintWidget; move-result-object v0 @@ -1540,24 +1567,24 @@ :goto_1 if-nez v0, :cond_4 - if-lez v11, :cond_4 + if-lez v10, :cond_4 .line 797 - iget v2, v8, Landroid/support/constraint/solver/widgets/Flow;->mMaxElementsWrap:I + iget v3, v8, Landroid/support/constraint/solver/widgets/Flow;->mMaxElementsWrap:I - if-lez v2, :cond_4 + if-lez v3, :cond_4 - rem-int v2, v11, v2 + rem-int v3, v10, v3 - if-nez v2, :cond_4 + if-nez v3, :cond_4 const/4 v0, 0x1 :cond_4 - if-eqz v0, :cond_6 + if-eqz v0, :cond_5 .line 802 - new-instance v10, Landroid/support/constraint/solver/widgets/Flow$WidgetsList; + new-instance v14, Landroid/support/constraint/solver/widgets/Flow$WidgetsList; iget-object v3, v8, Landroid/support/constraint/solver/widgets/Flow;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; @@ -1567,7 +1594,7 @@ iget-object v6, v8, Landroid/support/constraint/solver/widgets/Flow;->mBottom:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - move-object v0, v10 + move-object v0, v14 move-object/from16 v1, p0 @@ -1578,69 +1605,77 @@ invoke-direct/range {v0 .. v7}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->(Landroid/support/constraint/solver/widgets/Flow;ILandroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)V .line 803 - invoke-virtual {v10, v11}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->setStartIndex(I)V + invoke-virtual {v14, v10}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->setStartIndex(I)V .line 804 iget-object v0, v8, Landroid/support/constraint/solver/widgets/Flow;->mChainList:Ljava/util/ArrayList; - invoke-virtual {v0, v10}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + invoke-virtual {v0, v14}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z - :cond_5 - move v1, v13 + move v1, v12 + + move-object v2, v14 goto :goto_2 - :cond_6 - if-lez v11, :cond_5 + :cond_5 + if-lez v10, :cond_6 .line 807 iget v0, v8, Landroid/support/constraint/solver/widgets/Flow;->mHorizontalGap:I - add-int/2addr v0, v13 + add-int/2addr v0, v12 add-int/2addr v1, v0 + goto :goto_2 + + :cond_6 + move v1, v12 + .line 812 :goto_2 - invoke-virtual {v10, v12}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->add(Landroid/support/constraint/solver/widgets/ConstraintWidget;)V + invoke-virtual {v2, v11}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->add(Landroid/support/constraint/solver/widgets/ConstraintWidget;)V - add-int/lit8 v11, v11, 0x1 + add-int/lit8 v10, v10, 0x1 - move v0, v14 + move v0, v13 goto :goto_0 :cond_7 + move-object v2, v10 + const/4 v0, 0x0 const/4 v1, 0x0 - const/4 v11, 0x0 + const/4 v10, 0x0 :goto_3 - if-ge v11, v9, :cond_e + if-ge v10, v9, :cond_e .line 817 - aget-object v12, p1, v11 + aget-object v11, p1, v10 .line 818 - invoke-direct {v8, v12, v15}, Landroid/support/constraint/solver/widgets/Flow;->getWidgetHeight(Landroid/support/constraint/solver/widgets/ConstraintWidget;I)I + invoke-direct {v8, v11, v15}, Landroid/support/constraint/solver/widgets/Flow;->getWidgetHeight(Landroid/support/constraint/solver/widgets/ConstraintWidget;I)I - move-result v13 + move-result v12 .line 819 - invoke-virtual {v12}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getVerticalDimensionBehaviour()Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + invoke-virtual {v11}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getVerticalDimensionBehaviour()Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - move-result-object v2 + move-result-object v3 - sget-object v3, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + sget-object v4, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - if-ne v2, v3, :cond_8 + if-ne v3, v4, :cond_8 add-int/lit8 v0, v0, 0x1 :cond_8 - move v14, v0 + move v13, v0 if-eq v1, v15, :cond_9 @@ -1649,12 +1684,12 @@ add-int/2addr v0, v1 - add-int/2addr v0, v13 + add-int/2addr v0, v12 if-le v0, v15, :cond_a :cond_9 - invoke-static {v10}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->access$2000(Landroid/support/constraint/solver/widgets/Flow$WidgetsList;)Landroid/support/constraint/solver/widgets/ConstraintWidget; + invoke-static {v2}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->access$2000(Landroid/support/constraint/solver/widgets/Flow$WidgetsList;)Landroid/support/constraint/solver/widgets/ConstraintWidget; move-result-object v0 @@ -1670,24 +1705,24 @@ :goto_4 if-nez v0, :cond_b - if-lez v11, :cond_b + if-lez v10, :cond_b .line 823 - iget v2, v8, Landroid/support/constraint/solver/widgets/Flow;->mMaxElementsWrap:I + iget v3, v8, Landroid/support/constraint/solver/widgets/Flow;->mMaxElementsWrap:I - if-lez v2, :cond_b + if-lez v3, :cond_b - rem-int v2, v11, v2 + rem-int v3, v10, v3 - if-nez v2, :cond_b + if-nez v3, :cond_b const/4 v0, 0x1 :cond_b - if-eqz v0, :cond_d + if-eqz v0, :cond_c .line 828 - new-instance v10, Landroid/support/constraint/solver/widgets/Flow$WidgetsList; + new-instance v14, Landroid/support/constraint/solver/widgets/Flow$WidgetsList; iget-object v3, v8, Landroid/support/constraint/solver/widgets/Flow;->mLeft:Landroid/support/constraint/solver/widgets/ConstraintAnchor; @@ -1697,7 +1732,7 @@ iget-object v6, v8, Landroid/support/constraint/solver/widgets/Flow;->mBottom:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - move-object v0, v10 + move-object v0, v14 move-object/from16 v1, p0 @@ -1708,35 +1743,41 @@ invoke-direct/range {v0 .. v7}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->(Landroid/support/constraint/solver/widgets/Flow;ILandroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;I)V .line 829 - invoke-virtual {v10, v11}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->setStartIndex(I)V + invoke-virtual {v14, v10}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->setStartIndex(I)V .line 830 iget-object v0, v8, Landroid/support/constraint/solver/widgets/Flow;->mChainList:Ljava/util/ArrayList; - invoke-virtual {v0, v10}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + invoke-virtual {v0, v14}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z - :cond_c - move v1, v13 + move v1, v12 + + move-object v2, v14 goto :goto_5 - :cond_d - if-lez v11, :cond_c + :cond_c + if-lez v10, :cond_d .line 833 iget v0, v8, Landroid/support/constraint/solver/widgets/Flow;->mVerticalGap:I - add-int/2addr v0, v13 + add-int/2addr v0, v12 add-int/2addr v1, v0 + goto :goto_5 + + :cond_d + move v1, v12 + .line 838 :goto_5 - invoke-virtual {v10, v12}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->add(Landroid/support/constraint/solver/widgets/ConstraintWidget;)V + invoke-virtual {v2, v11}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->add(Landroid/support/constraint/solver/widgets/ConstraintWidget;)V - add-int/lit8 v11, v11, 0x1 + add-int/lit8 v10, v10, 0x1 - move v0, v14 + move v0, v13 goto :goto_3 @@ -1857,114 +1898,110 @@ goto :goto_8 :cond_12 + move-object/from16 v24, v4 + move/from16 v22, v7 - move v0, v9 + move/from16 v25, v9 - const/4 v12, 0x0 + move/from16 v23, v10 - const/4 v13, 0x0 + const/4 v0, 0x0 - const/4 v14, 0x0 + move-object v4, v2 move v7, v6 - move-object v6, v3 + const/4 v2, 0x0 - move-object v3, v2 + move-object v6, v5 - move v2, v10 + move-object v5, v3 + + const/4 v3, 0x0 :goto_a - if-ge v14, v1, :cond_18 + if-ge v0, v1, :cond_18 .line 873 iget-object v9, v8, Landroid/support/constraint/solver/widgets/Flow;->mChainList:Ljava/util/ArrayList; - invoke-virtual {v9, v14}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v9, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; move-result-object v9 - move-object/from16 v23, v9 + move-object/from16 v26, v9 - check-cast v23, Landroid/support/constraint/solver/widgets/Flow$WidgetsList; + check-cast v26, Landroid/support/constraint/solver/widgets/Flow$WidgetsList; if-nez p3, :cond_15 - add-int/lit8 v2, v1, -0x1 + add-int/lit8 v6, v1, -0x1 - if-ge v14, v2, :cond_13 + if-ge v0, v6, :cond_13 .line 876 - iget-object v2, v8, Landroid/support/constraint/solver/widgets/Flow;->mChainList:Ljava/util/ArrayList; + iget-object v6, v8, Landroid/support/constraint/solver/widgets/Flow;->mChainList:Ljava/util/ArrayList; - add-int/lit8 v5, v14, 0x1 + add-int/lit8 v9, v0, 0x1 - invoke-virtual {v2, v5}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v6, v9}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; - move-result-object v2 + move-result-object v6 - check-cast v2, Landroid/support/constraint/solver/widgets/Flow$WidgetsList; + check-cast v6, Landroid/support/constraint/solver/widgets/Flow$WidgetsList; .line 877 - invoke-static {v2}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->access$2000(Landroid/support/constraint/solver/widgets/Flow$WidgetsList;)Landroid/support/constraint/solver/widgets/ConstraintWidget; + invoke-static {v6}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->access$2000(Landroid/support/constraint/solver/widgets/Flow$WidgetsList;)Landroid/support/constraint/solver/widgets/ConstraintWidget; - move-result-object v2 + move-result-object v6 - iget-object v2, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mTop:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v6, v6, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mTop:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - const/4 v5, 0x0 + const/16 v23, 0x0 goto :goto_b .line 880 :cond_13 - iget-object v2, v8, Landroid/support/constraint/solver/widgets/Flow;->mBottom:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v6, v8, Landroid/support/constraint/solver/widgets/Flow;->mBottom:Landroid/support/constraint/solver/widgets/ConstraintAnchor; .line 881 invoke-virtual/range {p0 .. p0}, Landroid/support/constraint/solver/widgets/Flow;->getPaddingBottom()I - move-result v5 + move-result v9 + + move/from16 v23, v9 .line 883 :goto_b - invoke-static/range {v23 .. v23}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->access$2000(Landroid/support/constraint/solver/widgets/Flow$WidgetsList;)Landroid/support/constraint/solver/widgets/ConstraintWidget; + invoke-static/range {v26 .. v26}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->access$2000(Landroid/support/constraint/solver/widgets/Flow$WidgetsList;)Landroid/support/constraint/solver/widgets/ConstraintWidget; move-result-object v9 - iget-object v11, v9, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBottom:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v14, v9, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mBottom:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - move-object/from16 v9, v23 + move-object/from16 v9, v26 move/from16 v10, p3 - move-object/from16 v24, v11 - - move-object v11, v3 - - move-object/from16 p1, v3 - - move v3, v12 + move-object v11, v4 - move-object v12, v6 + move-object v12, v5 - move v6, v13 - - move-object v13, v4 - - move-object/from16 p2, v4 + move-object/from16 v13, v24 - move v4, v14 + move-object v5, v14 - move-object v14, v2 + move-object v14, v6 move v15, v7 move/from16 v16, v22 - move/from16 v17, v0 + move/from16 v17, v25 - move/from16 v18, v5 + move/from16 v18, v23 move/from16 v19, p4 @@ -1972,66 +2009,44 @@ invoke-virtual/range {v9 .. v19}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->setup(ILandroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;IIIII)V .line 888 - invoke-virtual/range {v23 .. v23}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->getWidth()I + invoke-virtual/range {v26 .. v26}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->getWidth()I move-result v9 - invoke-static {v6, v9}, Ljava/lang/Math;->max(II)I + invoke-static {v2, v9}, Ljava/lang/Math;->max(II)I - move-result v6 + move-result v2 .line 889 - invoke-virtual/range {v23 .. v23}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->getHeight()I + invoke-virtual/range {v26 .. v26}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->getHeight()I move-result v9 - add-int v12, v3, v9 + add-int/2addr v3, v9 - if-lez v4, :cond_14 + if-lez v0, :cond_14 .line 891 - iget v3, v8, Landroid/support/constraint/solver/widgets/Flow;->mVerticalGap:I + iget v9, v8, Landroid/support/constraint/solver/widgets/Flow;->mVerticalGap:I - add-int/2addr v12, v3 + add-int/2addr v3, v9 :cond_14 - move-object/from16 v3, p1 - - move v13, v6 - - move-object/from16 v6, v24 - const/16 v22, 0x0 - move-object/from16 v24, p2 - - move/from16 v27, v5 - - move-object v5, v2 - - move/from16 v2, v27 - - goto/16 :goto_d + goto :goto_d :cond_15 - move-object/from16 p1, v3 - - move v3, v12 - - move v0, v13 - - move v4, v14 - add-int/lit8 v9, v1, -0x1 - if-ge v4, v9, :cond_16 + if-ge v0, v9, :cond_16 .line 895 iget-object v9, v8, Landroid/support/constraint/solver/widgets/Flow;->mChainList:Ljava/util/ArrayList; - add-int/lit8 v14, v4, 0x1 + add-int/lit8 v10, v0, 0x1 - invoke-virtual {v9, v14}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v9, v10}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; move-result-object v9 @@ -2065,25 +2080,25 @@ .line 902 :goto_c - invoke-static/range {v23 .. v23}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->access$2000(Landroid/support/constraint/solver/widgets/Flow$WidgetsList;)Landroid/support/constraint/solver/widgets/ConstraintWidget; + invoke-static/range {v26 .. v26}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->access$2000(Landroid/support/constraint/solver/widgets/Flow$WidgetsList;)Landroid/support/constraint/solver/widgets/ConstraintWidget; move-result-object v9 iget-object v15, v9, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mRight:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - move-object/from16 v9, v23 + move-object/from16 v9, v26 move/from16 v10, p3 - move-object/from16 v11, p1 + move-object v11, v4 - move-object v12, v6 + move-object v12, v5 move-object/from16 v13, v24 - move-object v14, v5 + move-object v14, v6 - move-object/from16 v26, v15 + move-object v4, v15 move v15, v7 @@ -2091,7 +2106,7 @@ move/from16 v17, v25 - move/from16 v18, v2 + move/from16 v18, v23 move/from16 v19, p4 @@ -2099,53 +2114,41 @@ invoke-virtual/range {v9 .. v19}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->setup(ILandroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;Landroid/support/constraint/solver/widgets/ConstraintAnchor;IIIII)V .line 907 - invoke-virtual/range {v23 .. v23}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->getWidth()I + invoke-virtual/range {v26 .. v26}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->getWidth()I move-result v7 - add-int v13, v0, v7 + add-int/2addr v2, v7 .line 908 - invoke-virtual/range {v23 .. v23}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->getHeight()I + invoke-virtual/range {v26 .. v26}, Landroid/support/constraint/solver/widgets/Flow$WidgetsList;->getHeight()I - move-result v0 + move-result v7 - invoke-static {v3, v0}, Ljava/lang/Math;->max(II)I + invoke-static {v3, v7}, Ljava/lang/Math;->max(II)I - move-result v0 + move-result v3 - if-lez v4, :cond_17 + if-lez v0, :cond_17 .line 910 - iget v3, v8, Landroid/support/constraint/solver/widgets/Flow;->mHorizontalGap:I + iget v7, v8, Landroid/support/constraint/solver/widgets/Flow;->mHorizontalGap:I - add-int/2addr v13, v3 + add-int/2addr v2, v7 :cond_17 - move v12, v0 - - move/from16 v0, v25 - - move-object/from16 v3, v26 - const/4 v7, 0x0 :goto_d - add-int/lit8 v14, v4, 0x1 + add-int/lit8 v0, v0, 0x1 move/from16 v15, p4 - move-object/from16 v4, v24 - goto/16 :goto_a - :cond_18 - move v3, v12 - - move v0, v13 - .line 914 - aput v0, p5, v21 + :cond_18 + aput v2, p5, v21 .line 915 aput v3, p5, v20 @@ -2533,7 +2536,7 @@ .end method .method public measure(IIII)V - .locals 18 + .locals 19 move-object/from16 v6, p0 @@ -2589,6 +2592,7 @@ const/4 v0, 0x2 + .line 240 new-array v5, v0, [I sub-int v1, v8, v12 @@ -2609,23 +2613,26 @@ :cond_1 move/from16 v16, v1 - const/4 v1, -0x1 + .line 246 + iget v1, v6, Landroid/support/constraint/solver/widgets/Flow;->mOrientation:I - if-nez v2, :cond_3 + const/4 v2, -0x1 + + if-nez v1, :cond_3 .line 247 - iget v2, v6, Landroid/support/constraint/solver/widgets/Flow;->mHorizontalStyle:I + iget v1, v6, Landroid/support/constraint/solver/widgets/Flow;->mHorizontalStyle:I - if-ne v2, v1, :cond_2 + if-ne v1, v2, :cond_2 .line 248 iput v11, v6, Landroid/support/constraint/solver/widgets/Flow;->mHorizontalStyle:I .line 250 :cond_2 - iget v2, v6, Landroid/support/constraint/solver/widgets/Flow;->mVerticalStyle:I + iget v1, v6, Landroid/support/constraint/solver/widgets/Flow;->mVerticalStyle:I - if-ne v2, v1, :cond_5 + if-ne v1, v2, :cond_5 .line 251 iput v11, v6, Landroid/support/constraint/solver/widgets/Flow;->mVerticalStyle:I @@ -2634,18 +2641,18 @@ .line 254 :cond_3 - iget v2, v6, Landroid/support/constraint/solver/widgets/Flow;->mHorizontalStyle:I + iget v1, v6, Landroid/support/constraint/solver/widgets/Flow;->mHorizontalStyle:I - if-ne v2, v1, :cond_4 + if-ne v1, v2, :cond_4 .line 255 iput v11, v6, Landroid/support/constraint/solver/widgets/Flow;->mHorizontalStyle:I .line 257 :cond_4 - iget v2, v6, Landroid/support/constraint/solver/widgets/Flow;->mVerticalStyle:I + iget v1, v6, Landroid/support/constraint/solver/widgets/Flow;->mVerticalStyle:I - if-ne v2, v1, :cond_5 + if-ne v1, v2, :cond_5 .line 258 iput v11, v6, Landroid/support/constraint/solver/widgets/Flow;->mVerticalStyle:I @@ -2760,10 +2767,11 @@ move-object/from16 v17, v5 - const/4 v0, 0x0 - const/4 v11, 0x1 + :goto_3 + const/16 v18, 0x0 + goto :goto_4 .line 288 @@ -2812,39 +2820,40 @@ invoke-direct/range {v0 .. v5}, Landroid/support/constraint/solver/widgets/Flow;->measureNoWrap([Landroid/support/constraint/solver/widgets/ConstraintWidget;III[I)V - :goto_3 - const/4 v0, 0x0 + goto :goto_3 + .line 301 :goto_4 - aget v1, v17, v0 + aget v0, v17, v18 - add-int/2addr v1, v12 + add-int/2addr v0, v12 - add-int/2addr v1, v13 + add-int/2addr v0, v13 - aget v2, v17, v11 + .line 302 + aget v1, v17, v11 - add-int/2addr v2, v14 + add-int/2addr v1, v14 - add-int/2addr v2, v15 + add-int/2addr v1, v15 - const/high16 v3, -0x80000000 + const/high16 v2, -0x80000000 - const/high16 v4, 0x40000000 # 2.0f + const/high16 v3, 0x40000000 # 2.0f - if-ne v7, v4, :cond_e + if-ne v7, v3, :cond_e - move v1, v8 + move v0, v8 goto :goto_5 :cond_e - if-ne v7, v3, :cond_f + if-ne v7, v2, :cond_f .line 310 - invoke-static {v1, v8}, Ljava/lang/Math;->min(II)I + invoke-static {v0, v8}, Ljava/lang/Math;->min(II)I - move-result v1 + move-result v0 goto :goto_5 @@ -2854,22 +2863,22 @@ goto :goto_5 :cond_10 - const/4 v1, 0x0 + const/4 v0, 0x0 :goto_5 - if-ne v9, v4, :cond_11 + if-ne v9, v3, :cond_11 - move v2, v10 + move v1, v10 goto :goto_6 :cond_11 - if-ne v9, v3, :cond_12 + if-ne v9, v2, :cond_12 .line 318 - invoke-static {v2, v10}, Ljava/lang/Math;->min(II)I + invoke-static {v1, v10}, Ljava/lang/Math;->min(II)I - move-result v2 + move-result v1 goto :goto_6 @@ -2879,22 +2888,22 @@ goto :goto_6 :cond_13 - const/4 v2, 0x0 + const/4 v1, 0x0 .line 323 :goto_6 - invoke-virtual {v6, v1, v2}, Landroid/support/constraint/solver/widgets/Flow;->setMeasure(II)V + invoke-virtual {v6, v0, v1}, Landroid/support/constraint/solver/widgets/Flow;->setMeasure(II)V .line 324 - invoke-virtual {v6, v1}, Landroid/support/constraint/solver/widgets/Flow;->setWidth(I)V + invoke-virtual {v6, v0}, Landroid/support/constraint/solver/widgets/Flow;->setWidth(I)V .line 325 - invoke-virtual {v6, v2}, Landroid/support/constraint/solver/widgets/Flow;->setHeight(I)V + invoke-virtual {v6, v1}, Landroid/support/constraint/solver/widgets/Flow;->setHeight(I)V .line 326 - iget v1, v6, Landroid/support/constraint/solver/widgets/Flow;->mWidgetsCount:I + iget v0, v6, Landroid/support/constraint/solver/widgets/Flow;->mWidgetsCount:I - if-lez v1, :cond_14 + if-lez v0, :cond_14 goto :goto_7 diff --git a/smali/android/support/constraint/solver/widgets/Guideline$1.smali b/smali/android/support/constraint/solver/widgets/Guideline$1.smali index 0087fda7..b90f5849 100644 --- a/smali/android/support/constraint/solver/widgets/Guideline$1.smali +++ b/smali/android/support/constraint/solver/widgets/Guideline$1.smali @@ -34,6 +34,8 @@ sput-object v0, Landroid/support/constraint/solver/widgets/Guideline$1;->$SwitchMap$android$support$constraint$solver$widgets$ConstraintAnchor$Type:[I :try_start_0 + sget-object v0, Landroid/support/constraint/solver/widgets/Guideline$1;->$SwitchMap$android$support$constraint$solver$widgets$ConstraintAnchor$Type:[I + sget-object v1, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->LEFT:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; invoke-virtual {v1}, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->ordinal()I diff --git a/smali/android/support/constraint/solver/widgets/Guideline.smali b/smali/android/support/constraint/solver/widgets/Guideline.smali index d41a9beb..1ea3ba99 100644 --- a/smali/android/support/constraint/solver/widgets/Guideline.smali +++ b/smali/android/support/constraint/solver/widgets/Guideline.smali @@ -193,16 +193,16 @@ if-ne p2, v2, :cond_2 + const/4 v2, 0x1 + goto :goto_1 :cond_2 - const/4 v3, 0x0 - - :goto_1 - move v2, v3 + const/4 v2, 0x0 .line 227 :cond_3 + :goto_1 iget-boolean p2, p0, Landroid/support/constraint/solver/widgets/Guideline;->resolved:Z const/4 v3, -0x1 diff --git a/smali/android/support/constraint/solver/widgets/HelperWidget.smali b/smali/android/support/constraint/solver/widgets/HelperWidget.smali index bb9832b9..1b042ad8 100644 --- a/smali/android/support/constraint/solver/widgets/HelperWidget.smali +++ b/smali/android/support/constraint/solver/widgets/HelperWidget.smali @@ -21,9 +21,9 @@ const/4 v0, 0x4 + .line 14 new-array v0, v0, [Landroid/support/constraint/solver/widgets/ConstraintWidget; - .line 14 iput-object v0, p0, Landroid/support/constraint/solver/widgets/HelperWidget;->mWidgets:[Landroid/support/constraint/solver/widgets/ConstraintWidget; const/4 v0, 0x0 diff --git a/smali/android/support/constraint/solver/widgets/Optimizer.smali b/smali/android/support/constraint/solver/widgets/Optimizer.smali index 3e8e81d2..0d74bdb2 100644 --- a/smali/android/support/constraint/solver/widgets/Optimizer.smali +++ b/smali/android/support/constraint/solver/widgets/Optimizer.smali @@ -45,9 +45,9 @@ const/4 v0, 0x3 + .line 52 new-array v0, v0, [Z - .line 52 sput-object v0, Landroid/support/constraint/solver/widgets/Optimizer;->flags:[Z return-void diff --git a/smali/android/support/constraint/solver/widgets/VirtualLayout.smali b/smali/android/support/constraint/solver/widgets/VirtualLayout.smali index c45f4e63..76c10e06 100644 --- a/smali/android/support/constraint/solver/widgets/VirtualLayout.smali +++ b/smali/android/support/constraint/solver/widgets/VirtualLayout.smali @@ -91,16 +91,16 @@ # virtual methods .method public applyRtl(Z)V - .locals 2 + .locals 1 .line 72 iget v0, p0, Landroid/support/constraint/solver/widgets/VirtualLayout;->mPaddingStart:I if-gtz v0, :cond_0 - iget v1, p0, Landroid/support/constraint/solver/widgets/VirtualLayout;->mPaddingEnd:I + iget v0, p0, Landroid/support/constraint/solver/widgets/VirtualLayout;->mPaddingEnd:I - if-lez v1, :cond_2 + if-lez v0, :cond_2 :cond_0 if-eqz p1, :cond_1 @@ -111,13 +111,17 @@ iput p1, p0, Landroid/support/constraint/solver/widgets/VirtualLayout;->mResolvedPaddingLeft:I .line 75 - iput v0, p0, Landroid/support/constraint/solver/widgets/VirtualLayout;->mResolvedPaddingRight:I + iget p1, p0, Landroid/support/constraint/solver/widgets/VirtualLayout;->mPaddingStart:I + + iput p1, p0, Landroid/support/constraint/solver/widgets/VirtualLayout;->mResolvedPaddingRight:I goto :goto_0 .line 77 :cond_1 - iput v0, p0, Landroid/support/constraint/solver/widgets/VirtualLayout;->mResolvedPaddingLeft:I + iget p1, p0, Landroid/support/constraint/solver/widgets/VirtualLayout;->mPaddingStart:I + + iput p1, p0, Landroid/support/constraint/solver/widgets/VirtualLayout;->mResolvedPaddingLeft:I .line 78 iget p1, p0, Landroid/support/constraint/solver/widgets/VirtualLayout;->mPaddingEnd:I @@ -259,26 +263,18 @@ iput-object p2, v0, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->horizontalBehavior:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; .line 212 - iget-object p2, p0, Landroid/support/constraint/solver/widgets/VirtualLayout;->mMeasure:Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure; - - iput-object p4, p2, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->verticalBehavior:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + iput-object p4, v0, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->verticalBehavior:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; .line 213 - iget-object p2, p0, Landroid/support/constraint/solver/widgets/VirtualLayout;->mMeasure:Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure; - - iput p3, p2, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->horizontalDimension:I + iput p3, v0, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->horizontalDimension:I .line 214 - iget-object p2, p0, Landroid/support/constraint/solver/widgets/VirtualLayout;->mMeasure:Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure; - - iput p5, p2, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->verticalDimension:I + iput p5, v0, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->verticalDimension:I .line 215 iget-object p2, p0, Landroid/support/constraint/solver/widgets/VirtualLayout;->mMeasurer:Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measurer; - iget-object p3, p0, Landroid/support/constraint/solver/widgets/VirtualLayout;->mMeasure:Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure; - - invoke-interface {p2, p1, p3}, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measurer;->measure(Landroid/support/constraint/solver/widgets/ConstraintWidget;Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;)V + invoke-interface {p2, p1, v0}, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measurer;->measure(Landroid/support/constraint/solver/widgets/ConstraintWidget;Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;)V .line 216 iget-object p2, p0, Landroid/support/constraint/solver/widgets/VirtualLayout;->mMeasure:Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure; @@ -431,13 +427,9 @@ iput-object v5, v4, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->horizontalBehavior:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; .line 191 - iget-object v4, p0, Landroid/support/constraint/solver/widgets/VirtualLayout;->mMeasure:Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure; - iput-object v6, v4, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->verticalBehavior:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; .line 192 - iget-object v4, p0, Landroid/support/constraint/solver/widgets/VirtualLayout;->mMeasure:Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure; - invoke-virtual {v3}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getWidth()I move-result v5 diff --git a/smali/android/support/constraint/solver/widgets/analyzer/BasicMeasure.smali b/smali/android/support/constraint/solver/widgets/analyzer/BasicMeasure.smali index c592ae07..819567ba 100644 --- a/smali/android/support/constraint/solver/widgets/analyzer/BasicMeasure.smali +++ b/smali/android/support/constraint/solver/widgets/analyzer/BasicMeasure.smali @@ -120,14 +120,10 @@ iput-boolean v1, v0, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->measuredNeedsSolverPass:Z .line 449 - iget-object v0, p0, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure;->mMeasure:Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure; - iput-boolean p3, v0, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->useCurrentDimensions:Z .line 451 - iget-object p3, p0, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure;->mMeasure:Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure; - - iget-object p3, p3, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->horizontalBehavior:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + iget-object p3, v0, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->horizontalBehavior:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; sget-object v0, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; @@ -271,8 +267,6 @@ iput-boolean v1, p1, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->useCurrentDimensions:Z .line 473 - iget-object p1, p0, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure;->mMeasure:Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure; - iget-boolean p1, p1, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->measuredNeedsSolverPass:Z return p1 @@ -321,7 +315,7 @@ if-eqz v6, :cond_0 - goto/16 :goto_3 + goto/16 :goto_2 .line 84 :cond_0 @@ -329,7 +323,7 @@ if-eqz v6, :cond_1 - goto/16 :goto_3 + goto/16 :goto_2 .line 87 :cond_1 @@ -339,7 +333,7 @@ if-eqz v6, :cond_2 - goto/16 :goto_3 + goto/16 :goto_2 :cond_2 if-eqz v1, :cond_3 @@ -369,7 +363,7 @@ if-eqz v6, :cond_3 - goto :goto_3 + goto :goto_2 .line 97 :cond_3 @@ -465,15 +459,12 @@ if-nez v6, :cond_6 - goto :goto_2 + const/4 v9, 0x1 :cond_6 - move v7, v9 - - :goto_2 - if-eqz v7, :cond_7 + if-eqz v9, :cond_7 - goto :goto_3 + goto :goto_2 .line 127 :cond_7 @@ -496,7 +487,7 @@ iput-wide v6, v5, Landroid/support/constraint/solver/Metrics;->measuredWidgets:J :cond_8 - :goto_3 + :goto_2 add-int/lit8 v4, v4, 0x1 goto/16 :goto_0 @@ -856,7 +847,7 @@ move-result v9 - const/4 v11, 0x2 + const/4 v12, 0x2 goto :goto_a @@ -875,16 +866,12 @@ and-int/2addr v11, v12 - move v12, v11 - - const/4 v11, 0x1 + const/4 v12, 0x1 goto :goto_9 :cond_12 - move v12, v11 - - const/4 v11, 0x0 + const/4 v12, 0x0 :goto_9 if-ne v4, v13, :cond_13 @@ -896,14 +883,14 @@ move-result v9 - and-int/2addr v9, v12 + and-int/2addr v9, v11 - add-int/lit8 v11, v11, 0x1 + add-int/lit8 v12, v12, 0x1 goto :goto_a :cond_13 - move v9, v12 + move v9, v11 :goto_a if-eqz v9, :cond_17 @@ -936,13 +923,13 @@ :cond_16 const/4 v9, 0x0 - const/4 v11, 0x0 + const/4 v12, 0x0 :cond_17 :goto_d if-eqz v9, :cond_18 - if-eq v11, v14, :cond_36 + if-eq v12, v14, :cond_37 .line 268 :cond_18 @@ -971,7 +958,7 @@ invoke-direct {v0, v1, v6, v7, v8}, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure;->solveLinearSystem(Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;Ljava/lang/String;II)V :cond_1a - if-lez v4, :cond_35 + if-lez v4, :cond_36 .line 290 invoke-virtual/range {p1 .. p1}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->getHorizontalDimensionBehaviour()Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; @@ -982,72 +969,76 @@ if-ne v6, v9, :cond_1b - const/4 v15, 0x1 + const/4 v6, 0x1 goto :goto_e :cond_1b - const/4 v15, 0x0 + const/4 v6, 0x0 .line 292 :goto_e invoke-virtual/range {p1 .. p1}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->getVerticalDimensionBehaviour()Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - move-result-object v6 + move-result-object v9 - sget-object v9, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->WRAP_CONTENT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + sget-object v11, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->WRAP_CONTENT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - if-ne v6, v9, :cond_1c + if-ne v9, v11, :cond_1c - const/4 v6, 0x1 + const/4 v9, 0x1 goto :goto_f :cond_1c - const/4 v6, 0x0 + const/4 v9, 0x0 .line 294 :goto_f invoke-virtual/range {p1 .. p1}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->getWidth()I - move-result v9 + move-result v11 - iget-object v11, v0, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure;->constraintWidgetContainer:Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer; + iget-object v12, v0, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure;->constraintWidgetContainer:Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer; - invoke-virtual {v11}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->getMinWidth()I + invoke-virtual {v12}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->getMinWidth()I - move-result v11 + move-result v12 - invoke-static {v9, v11}, Ljava/lang/Math;->max(II)I + invoke-static {v11, v12}, Ljava/lang/Math;->max(II)I - move-result v9 + move-result v11 .line 295 invoke-virtual/range {p1 .. p1}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->getHeight()I - move-result v11 + move-result v12 - iget-object v12, v0, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure;->constraintWidgetContainer:Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer; + iget-object v13, v0, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure;->constraintWidgetContainer:Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer; + + invoke-virtual {v13}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->getMinHeight()I + + move-result v13 - invoke-virtual {v12}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->getMinHeight()I + invoke-static {v12, v13}, Ljava/lang/Math;->max(II)I move-result v12 - invoke-static {v11, v12}, Ljava/lang/Math;->max(II)I + move v13, v11 - move-result v11 + move v15, v12 - const/4 v12, 0x0 + const/4 v11, 0x0 - const/4 v13, 0x0 + const/4 v12, 0x0 :goto_10 - if-ge v12, v4, :cond_23 + if-ge v11, v4, :cond_23 .line 301 iget-object v10, v0, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure;->mVariableDimensionsWidgets:Ljava/util/ArrayList; - invoke-virtual {v10, v12}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v10, v11}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; move-result-object v10 @@ -1088,27 +1079,27 @@ move-result v17 - or-int v7, v13, v17 + or-int v7, v12, v17 .line 308 - iget-object v13, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mMetrics:Landroid/support/constraint/solver/Metrics; + iget-object v12, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mMetrics:Landroid/support/constraint/solver/Metrics; - if-eqz v13, :cond_1e + if-eqz v12, :cond_1e .line 309 - iget-object v13, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mMetrics:Landroid/support/constraint/solver/Metrics; + iget-object v12, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mMetrics:Landroid/support/constraint/solver/Metrics; move/from16 p6, v7 move/from16 v17, v8 - iget-wide v7, v13, Landroid/support/constraint/solver/Metrics;->measuredMatchWidgets:J + iget-wide v7, v12, Landroid/support/constraint/solver/Metrics;->measuredMatchWidgets:J const-wide/16 v18, 0x1 add-long v7, v7, v18 - iput-wide v7, v13, Landroid/support/constraint/solver/Metrics;->measuredMatchWidgets:J + iput-wide v7, v12, Landroid/support/constraint/solver/Metrics;->measuredMatchWidgets:J goto :goto_11 @@ -1133,39 +1124,39 @@ .line 314 invoke-virtual {v10, v7}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->setWidth(I)V - if-eqz v15, :cond_1f + if-eqz v6, :cond_1f .line 315 invoke-virtual {v10}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getRight()I move-result v7 - if-le v7, v9, :cond_1f + if-le v7, v13, :cond_1f .line 316 invoke-virtual {v10}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getRight()I move-result v7 - sget-object v13, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->RIGHT:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; + sget-object v12, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->RIGHT:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; .line 317 - invoke-virtual {v10, v13}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getAnchor(Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;)Landroid/support/constraint/solver/widgets/ConstraintAnchor; + invoke-virtual {v10, v12}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getAnchor(Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;)Landroid/support/constraint/solver/widgets/ConstraintAnchor; - move-result-object v13 + move-result-object v12 - invoke-virtual {v13}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->getMargin()I + invoke-virtual {v12}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->getMargin()I - move-result v13 + move-result v12 - add-int/2addr v7, v13 + add-int/2addr v7, v12 .line 318 - invoke-static {v9, v7}, Ljava/lang/Math;->max(II)I + invoke-static {v13, v7}, Ljava/lang/Math;->max(II)I move-result v7 - move v9, v7 + move v13, v7 :cond_1f const/4 v7, 0x1 @@ -1181,14 +1172,14 @@ .line 323 invoke-virtual {v10, v8}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->setHeight(I)V - if-eqz v6, :cond_21 + if-eqz v9, :cond_21 .line 324 invoke-virtual {v10}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getBottom()I move-result v3 - if-le v3, v11, :cond_21 + if-le v3, v15, :cond_21 .line 325 invoke-virtual {v10}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getBottom()I @@ -1209,11 +1200,11 @@ add-int/2addr v3, v7 .line 327 - invoke-static {v11, v3}, Ljava/lang/Math;->max(II)I + invoke-static {v15, v3}, Ljava/lang/Math;->max(II)I move-result v3 - move v11, v3 + move v15, v3 :cond_21 const/4 v7, 0x1 @@ -1227,10 +1218,12 @@ move-result v3 - or-int v13, v7, v3 + or-int/2addr v3, v7 + + move v12, v3 :goto_13 - add-int/lit8 v12, v12, 0x1 + add-int/lit8 v11, v11, 0x1 move/from16 v3, p5 @@ -1256,7 +1249,9 @@ const/4 v7, 0x2 :goto_14 - if-ge v3, v7, :cond_31 + if-ge v3, v7, :cond_32 + + move v11, v12 const/4 v8, 0x0 @@ -1365,7 +1360,7 @@ move-result v19 - or-int v13, v13, v19 + or-int v11, v11, v19 .line 366 iget-object v2, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->mMetrics:Landroid/support/constraint/solver/Metrics; @@ -1412,14 +1407,14 @@ .line 374 invoke-virtual {v10, v2}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->setWidth(I)V - if-eqz v15, :cond_2b + if-eqz v6, :cond_2b .line 375 invoke-virtual {v10}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getRight()I move-result v2 - if-le v2, v9, :cond_2b + if-le v2, v13, :cond_2b .line 376 invoke-virtual {v10}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getRight()I @@ -1440,12 +1435,12 @@ add-int/2addr v2, v5 .line 378 - invoke-static {v9, v2}, Ljava/lang/Math;->max(II)I + invoke-static {v13, v2}, Ljava/lang/Math;->max(II)I - move-result v9 + move-result v13 :cond_2b - const/4 v13, 0x1 + const/4 v11, 0x1 :cond_2c if-eq v4, v14, :cond_2e @@ -1453,14 +1448,14 @@ .line 386 invoke-virtual {v10, v4}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->setHeight(I)V - if-eqz v6, :cond_2d + if-eqz v9, :cond_2d .line 387 invoke-virtual {v10}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getBottom()I move-result v2 - if-le v2, v11, :cond_2d + if-le v2, v15, :cond_2d .line 388 invoke-virtual {v10}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getBottom()I @@ -1481,14 +1476,14 @@ add-int/2addr v2, v4 .line 390 - invoke-static {v11, v2}, Ljava/lang/Math;->max(II)I + invoke-static {v15, v2}, Ljava/lang/Math;->max(II)I move-result v2 - move v11, v2 + move v15, v2 :cond_2d - const/4 v13, 0x1 + const/4 v11, 0x1 .line 397 :cond_2e @@ -1504,7 +1499,7 @@ if-eq v7, v2, :cond_2f - const/4 v13, 0x1 + const/4 v11, 0x1 :cond_2f :goto_18 @@ -1529,7 +1524,7 @@ const-wide/16 v20, 0x1 - if-eqz v13, :cond_31 + if-eqz v11, :cond_31 const-string v2, "intermediate pass" @@ -1548,7 +1543,7 @@ const/4 v7, 0x2 - const/4 v13, 0x0 + const/4 v12, 0x0 move/from16 v4, p6 @@ -1559,7 +1554,17 @@ move/from16 v5, v17 - if-eqz v13, :cond_34 + goto :goto_19 + + :cond_32 + move/from16 v4, v16 + + move/from16 v5, v17 + + move v11, v12 + + :goto_19 + if-eqz v11, :cond_35 const-string v2, "2nd pass" @@ -1571,57 +1576,52 @@ move-result v2 - if-ge v2, v9, :cond_32 + if-ge v2, v13, :cond_33 .line 415 - invoke-virtual {v1, v9}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->setWidth(I)V + invoke-virtual {v1, v13}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->setWidth(I)V - const/4 v10, 0x1 + const/4 v11, 0x1 - goto :goto_19 + goto :goto_1a - :cond_32 - const/4 v10, 0x0 + :cond_33 + const/4 v11, 0x0 .line 418 - :goto_19 + :goto_1a invoke-virtual/range {p1 .. p1}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->getHeight()I move-result v2 - if-ge v2, v11, :cond_33 + if-ge v2, v15, :cond_34 .line 419 - invoke-virtual {v1, v11}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->setHeight(I)V + invoke-virtual {v1, v15}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->setHeight(I)V const/4 v11, 0x1 - goto :goto_1a - - :cond_33 - move v11, v10 - - :goto_1a - if-eqz v11, :cond_34 + :cond_34 + if-eqz v11, :cond_35 const-string v2, "3rd pass" .line 423 invoke-direct {v0, v1, v2, v4, v5}, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure;->solveLinearSystem(Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;Ljava/lang/String;II)V - :cond_34 + :cond_35 move/from16 v2, p5 goto :goto_1b - :cond_35 + :cond_36 move v2, v3 .line 427 :goto_1b invoke-virtual {v1, v2}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->setOptimizationLevel(I)V - :cond_36 + :cond_37 const-wide/16 v1, 0x0 return-wide v1 diff --git a/smali/android/support/constraint/solver/widgets/analyzer/ChainRun.smali b/smali/android/support/constraint/solver/widgets/analyzer/ChainRun.smali index 605ba9bd..b6ec2248 100644 --- a/smali/android/support/constraint/solver/widgets/analyzer/ChainRun.smali +++ b/smali/android/support/constraint/solver/widgets/analyzer/ChainRun.smali @@ -1337,7 +1337,7 @@ if-ne v9, v11, :cond_17 - goto/16 :goto_11 + goto/16 :goto_12 .line 227 :cond_17 @@ -1376,23 +1376,23 @@ add-float/2addr v9, v11 - float-to-int v9, v9 + float-to-int v11, v9 goto :goto_d :cond_18 - move/from16 v9, v18 + move/from16 v11, v18 .line 233 :goto_d - iget v11, v0, Landroid/support/constraint/solver/widgets/analyzer/ChainRun;->orientation:I + iget v9, v0, Landroid/support/constraint/solver/widgets/analyzer/ChainRun;->orientation:I - if-nez v11, :cond_1b + if-nez v9, :cond_1b .line 234 - iget-object v11, v12, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->widget:Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object v9, v12, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->widget:Landroid/support/constraint/solver/widgets/ConstraintWidget; - iget v11, v11, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintMaxWidth:I + iget v9, v9, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintMaxWidth:I move/from16 v19, v10 @@ -1417,14 +1417,14 @@ iget v7, v7, Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency;->wrapValue:I - invoke-static {v9, v7}, Ljava/lang/Math;->min(II)I + invoke-static {v11, v7}, Ljava/lang/Math;->min(II)I move-result v7 goto :goto_e :cond_19 - move v7, v9 + move v7, v11 .line 240 :goto_e @@ -1432,21 +1432,17 @@ move-result v7 - if-lez v11, :cond_1a + if-lez v9, :cond_1a .line 242 - invoke-static {v11, v7}, Ljava/lang/Math;->min(II)I + invoke-static {v9, v7}, Ljava/lang/Math;->min(II)I move-result v7 :cond_1a - if-eq v7, v9, :cond_1e - - add-int/lit8 v16, v16, 0x1 + if-eq v7, v11, :cond_1e - move v9, v7 - - goto :goto_10 + goto :goto_11 :cond_1b move/from16 v21, v7 @@ -1461,69 +1457,74 @@ iget v7, v7, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintMaxHeight:I .line 250 - iget-object v10, v12, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->widget:Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object v9, v12, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->widget:Landroid/support/constraint/solver/widgets/ConstraintWidget; - iget v10, v10, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintMinHeight:I + iget v9, v9, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintMinHeight:I .line 252 - iget v11, v12, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->matchConstraintsType:I + iget v10, v12, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->matchConstraintsType:I const/4 v14, 0x1 - if-ne v11, v14, :cond_1c + if-ne v10, v14, :cond_1c .line 253 - iget-object v11, v12, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->dimension:Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency; + iget-object v10, v12, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->dimension:Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency; - iget v11, v11, Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency;->wrapValue:I + iget v10, v10, Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency;->wrapValue:I - invoke-static {v9, v11}, Ljava/lang/Math;->min(II)I + invoke-static {v11, v10}, Ljava/lang/Math;->min(II)I - move-result v11 + move-result v10 goto :goto_f :cond_1c - move v11, v9 + move v10, v11 .line 255 :goto_f - invoke-static {v10, v11}, Ljava/lang/Math;->max(II)I + invoke-static {v9, v10}, Ljava/lang/Math;->max(II)I - move-result v10 + move-result v9 if-lez v7, :cond_1d .line 257 - invoke-static {v7, v10}, Ljava/lang/Math;->min(II)I + invoke-static {v7, v9}, Ljava/lang/Math;->min(II)I - move-result v10 + move-result v7 + + goto :goto_10 :cond_1d - if-eq v10, v9, :cond_1e + move v7, v9 + :goto_10 + if-eq v7, v11, :cond_1e + + :goto_11 add-int/lit8 v16, v16, 0x1 - move v9, v10 + move v11, v7 .line 265 :cond_1e - :goto_10 iget-object v7, v12, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->dimension:Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency; - invoke-virtual {v7, v9}, Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency;->resolve(I)V + invoke-virtual {v7, v11}, Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency;->resolve(I)V - goto :goto_12 + goto :goto_13 :cond_1f - :goto_11 + :goto_12 move/from16 v21, v7 move/from16 v19, v10 move/from16 v20, v14 - :goto_12 + :goto_13 add-int/lit8 v13, v13, 0x1 move/from16 v11, v18 @@ -1553,7 +1554,7 @@ const/4 v9, 0x0 - :goto_13 + :goto_14 if-ge v7, v4, :cond_24 .line 273 @@ -1576,7 +1577,7 @@ if-ne v11, v12, :cond_21 - goto :goto_14 + goto :goto_15 :cond_21 if-lez v7, :cond_22 @@ -1612,21 +1613,21 @@ add-int/2addr v9, v10 :cond_23 - :goto_14 + :goto_15 add-int/lit8 v7, v7, 0x1 - goto :goto_13 + goto :goto_14 :cond_24 move v14, v9 - goto :goto_15 + goto :goto_16 :cond_25 move/from16 v14, v20 .line 286 - :goto_15 + :goto_16 iget v7, v0, Landroid/support/constraint/solver/widgets/analyzer/ChainRun;->chainStyle:I const/4 v9, 0x2 @@ -1640,12 +1641,12 @@ .line 287 iput v7, v0, Landroid/support/constraint/solver/widgets/analyzer/ChainRun;->chainStyle:I - goto :goto_16 + goto :goto_17 :cond_26 const/4 v7, 0x0 - goto :goto_16 + goto :goto_17 :cond_27 move/from16 v21, v7 @@ -1656,7 +1657,7 @@ const/4 v9, 0x2 - :goto_16 + :goto_17 if-le v14, v3, :cond_28 .line 292 @@ -1687,9 +1688,9 @@ sub-int/2addr v2, v10 .line 303 - div-int/2addr v3, v2 + div-int v2, v3, v2 - goto :goto_17 + goto :goto_18 :cond_2a if-ne v2, v10, :cond_2b @@ -1699,39 +1700,37 @@ const/4 v2, 0x2 .line 305 - div-int/2addr v3, v2 + div-int/lit8 v2, v3, 0x2 - goto :goto_17 + goto :goto_18 :cond_2b - const/4 v3, 0x0 + const/4 v2, 0x0 - :goto_17 + :goto_18 if-lez v15, :cond_2c - const/4 v3, 0x0 + const/4 v2, 0x0 :cond_2c - move/from16 v7, v21 + move/from16 v3, v21 - const/4 v2, 0x0 - - :goto_18 - if-ge v2, v4, :cond_57 + :goto_19 + if-ge v7, v4, :cond_57 if-eqz v1, :cond_2d - add-int/lit8 v9, v2, 0x1 + add-int/lit8 v9, v7, 0x1 sub-int v9, v4, v9 - goto :goto_19 + goto :goto_1a :cond_2d - move v9, v2 + move v9, v7 .line 315 - :goto_19 + :goto_1a iget-object v10, v0, Landroid/support/constraint/solver/widgets/analyzer/ChainRun;->widgets:Ljava/util/ArrayList; invoke-virtual {v10, v9}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; @@ -1754,32 +1753,32 @@ .line 317 iget-object v10, v9, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->start:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; - invoke-virtual {v10, v7}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V + invoke-virtual {v10, v3}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V .line 318 iget-object v9, v9, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->end:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; - invoke-virtual {v9, v7}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V + invoke-virtual {v9, v3}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V - goto :goto_1f + goto :goto_20 :cond_2e - if-lez v2, :cond_30 + if-lez v7, :cond_30 if-eqz v1, :cond_2f - sub-int/2addr v7, v3 + sub-int/2addr v3, v2 - goto :goto_1a + goto :goto_1b :cond_2f - add-int/2addr v7, v3 + add-int/2addr v3, v2 :cond_30 - :goto_1a - if-lez v2, :cond_32 + :goto_1b + if-lez v7, :cond_32 - if-lt v2, v5, :cond_32 + if-lt v7, v5, :cond_32 if-eqz v1, :cond_31 @@ -1788,9 +1787,9 @@ iget v10, v10, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->margin:I - sub-int/2addr v7, v10 + sub-int/2addr v3, v10 - goto :goto_1b + goto :goto_1c .line 332 :cond_31 @@ -1798,27 +1797,27 @@ iget v10, v10, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->margin:I - add-int/2addr v7, v10 + add-int/2addr v3, v10 :cond_32 - :goto_1b + :goto_1c if-eqz v1, :cond_33 .line 337 iget-object v10, v9, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->end:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; - invoke-virtual {v10, v7}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V + invoke-virtual {v10, v3}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V - goto :goto_1c + goto :goto_1d .line 339 :cond_33 iget-object v10, v9, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->start:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; - invoke-virtual {v10, v7}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V + invoke-virtual {v10, v3}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V .line 342 - :goto_1c + :goto_1d iget-object v10, v9, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->dimension:Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency; iget v10, v10, Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency;->value:I @@ -1844,38 +1843,38 @@ :cond_34 if-eqz v1, :cond_35 - sub-int/2addr v7, v10 + sub-int/2addr v3, v10 - goto :goto_1d + goto :goto_1e :cond_35 - add-int/2addr v7, v10 + add-int/2addr v3, v10 - :goto_1d + :goto_1e if-eqz v1, :cond_36 .line 354 iget-object v10, v9, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->start:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; - invoke-virtual {v10, v7}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V + invoke-virtual {v10, v3}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V - goto :goto_1e + goto :goto_1f .line 356 :cond_36 iget-object v10, v9, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->end:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; - invoke-virtual {v10, v7}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V + invoke-virtual {v10, v3}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V - :goto_1e + :goto_1f const/4 v10, 0x1 .line 358 iput-boolean v10, v9, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->resolved:Z - if-ge v2, v8, :cond_38 + if-ge v7, v8, :cond_38 - if-ge v2, v6, :cond_38 + if-ge v7, v6, :cond_38 if-eqz v1, :cond_37 @@ -1886,9 +1885,9 @@ neg-int v9, v9 - sub-int/2addr v7, v9 + sub-int/2addr v3, v9 - goto :goto_1f + goto :goto_20 .line 363 :cond_37 @@ -1898,13 +1897,13 @@ neg-int v9, v9 - add-int/2addr v7, v9 + add-int/2addr v3, v9 :cond_38 - :goto_1f - add-int/lit8 v2, v2, 0x1 + :goto_20 + add-int/lit8 v7, v7, 0x1 - goto/16 :goto_18 + goto/16 :goto_19 :cond_39 if-nez v9, :cond_46 @@ -1916,33 +1915,31 @@ add-int/2addr v2, v9 .line 368 - div-int/2addr v3, v2 + div-int v2, v3, v2 if-lez v15, :cond_3a - const/4 v3, 0x0 + const/4 v2, 0x0 :cond_3a - move/from16 v7, v21 - - const/4 v2, 0x0 + move/from16 v3, v21 - :goto_20 - if-ge v2, v4, :cond_57 + :goto_21 + if-ge v7, v4, :cond_57 if-eqz v1, :cond_3b - add-int/lit8 v9, v2, 0x1 + add-int/lit8 v9, v7, 0x1 sub-int v9, v4, v9 - goto :goto_21 + goto :goto_22 :cond_3b - move v9, v2 + move v9, v7 .line 377 - :goto_21 + :goto_22 iget-object v10, v0, Landroid/support/constraint/solver/widgets/analyzer/ChainRun;->widgets:Ljava/util/ArrayList; invoke-virtual {v10, v9}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; @@ -1965,29 +1962,29 @@ .line 379 iget-object v10, v9, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->start:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; - invoke-virtual {v10, v7}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V + invoke-virtual {v10, v3}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V .line 380 iget-object v9, v9, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->end:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; - invoke-virtual {v9, v7}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V + invoke-virtual {v9, v3}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V - goto :goto_27 + goto :goto_28 :cond_3c if-eqz v1, :cond_3d - sub-int/2addr v7, v3 + sub-int/2addr v3, v2 - goto :goto_22 + goto :goto_23 :cond_3d - add-int/2addr v7, v3 + add-int/2addr v3, v2 - :goto_22 - if-lez v2, :cond_3f + :goto_23 + if-lez v7, :cond_3f - if-lt v2, v5, :cond_3f + if-lt v7, v5, :cond_3f if-eqz v1, :cond_3e @@ -1996,9 +1993,9 @@ iget v10, v10, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->margin:I - sub-int/2addr v7, v10 + sub-int/2addr v3, v10 - goto :goto_23 + goto :goto_24 .line 392 :cond_3e @@ -2006,27 +2003,27 @@ iget v10, v10, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->margin:I - add-int/2addr v7, v10 + add-int/2addr v3, v10 :cond_3f - :goto_23 + :goto_24 if-eqz v1, :cond_40 .line 397 iget-object v10, v9, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->end:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; - invoke-virtual {v10, v7}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V + invoke-virtual {v10, v3}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V - goto :goto_24 + goto :goto_25 .line 399 :cond_40 iget-object v10, v9, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->start:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; - invoke-virtual {v10, v7}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V + invoke-virtual {v10, v3}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V .line 402 - :goto_24 + :goto_25 iget-object v10, v9, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->dimension:Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency; iget v10, v10, Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency;->value:I @@ -2056,33 +2053,33 @@ :cond_41 if-eqz v1, :cond_42 - sub-int/2addr v7, v10 + sub-int/2addr v3, v10 - goto :goto_25 + goto :goto_26 :cond_42 - add-int/2addr v7, v10 + add-int/2addr v3, v10 - :goto_25 + :goto_26 if-eqz v1, :cond_43 .line 415 iget-object v10, v9, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->start:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; - invoke-virtual {v10, v7}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V + invoke-virtual {v10, v3}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V - goto :goto_26 + goto :goto_27 .line 417 :cond_43 iget-object v10, v9, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->end:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; - invoke-virtual {v10, v7}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V + invoke-virtual {v10, v3}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V - :goto_26 - if-ge v2, v8, :cond_45 + :goto_27 + if-ge v7, v8, :cond_45 - if-ge v2, v6, :cond_45 + if-ge v7, v6, :cond_45 if-eqz v1, :cond_44 @@ -2093,9 +2090,9 @@ neg-int v9, v9 - sub-int/2addr v7, v9 + sub-int/2addr v3, v9 - goto :goto_27 + goto :goto_28 .line 423 :cond_44 @@ -2105,13 +2102,13 @@ neg-int v9, v9 - add-int/2addr v7, v9 + add-int/2addr v3, v9 :cond_45 - :goto_27 - add-int/lit8 v2, v2, 0x1 + :goto_28 + add-int/lit8 v7, v7, 0x1 - goto/16 :goto_20 + goto/16 :goto_21 :cond_46 const/4 v2, 0x2 @@ -2129,7 +2126,7 @@ move-result v2 - goto :goto_28 + goto :goto_29 :cond_47 iget-object v2, v0, Landroid/support/constraint/solver/widgets/analyzer/ChainRun;->widget:Landroid/support/constraint/solver/widgets/ConstraintWidget; @@ -2139,7 +2136,7 @@ move-result v2 - :goto_28 + :goto_29 if-eqz v1, :cond_48 const/high16 v9, 0x3f800000 # 1.0f @@ -2171,42 +2168,37 @@ sub-int v2, v21, v2 - goto :goto_29 + goto :goto_2a :cond_4b add-int v2, v21, v2 - :goto_29 - move v3, v2 - - const/4 v2, 0x0 - :goto_2a - if-ge v2, v4, :cond_57 + if-ge v7, v4, :cond_57 if-eqz v1, :cond_4c - add-int/lit8 v7, v2, 0x1 + add-int/lit8 v3, v7, 0x1 - sub-int v7, v4, v7 + sub-int v3, v4, v3 goto :goto_2b :cond_4c - move v7, v2 + move v3, v7 .line 447 :goto_2b iget-object v9, v0, Landroid/support/constraint/solver/widgets/analyzer/ChainRun;->widgets:Ljava/util/ArrayList; - invoke-virtual {v9, v7}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v9, v3}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; - move-result-object v7 + move-result-object v3 - check-cast v7, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun; + check-cast v3, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun; .line 448 - iget-object v9, v7, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->widget:Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object v9, v3, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->widget:Landroid/support/constraint/solver/widgets/ConstraintWidget; invoke-virtual {v9}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getVisibility()I @@ -2217,81 +2209,81 @@ if-ne v9, v10, :cond_4d .line 449 - iget-object v9, v7, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->start:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; + iget-object v9, v3, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->start:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; - invoke-virtual {v9, v3}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V + invoke-virtual {v9, v2}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V .line 450 - iget-object v7, v7, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->end:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; + iget-object v3, v3, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->end:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; - invoke-virtual {v7, v3}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V + invoke-virtual {v3, v2}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V const/4 v12, 0x1 goto :goto_31 :cond_4d - if-lez v2, :cond_4f + if-lez v7, :cond_4f - if-lt v2, v5, :cond_4f + if-lt v7, v5, :cond_4f if-eqz v1, :cond_4e .line 455 - iget-object v9, v7, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->start:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; + iget-object v9, v3, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->start:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; iget v9, v9, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->margin:I - sub-int/2addr v3, v9 + sub-int/2addr v2, v9 goto :goto_2c .line 457 :cond_4e - iget-object v9, v7, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->start:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; + iget-object v9, v3, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->start:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; iget v9, v9, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->margin:I - add-int/2addr v3, v9 + add-int/2addr v2, v9 :cond_4f :goto_2c if-eqz v1, :cond_50 .line 461 - iget-object v9, v7, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->end:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; + iget-object v9, v3, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->end:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; - invoke-virtual {v9, v3}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V + invoke-virtual {v9, v2}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V goto :goto_2d .line 463 :cond_50 - iget-object v9, v7, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->start:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; + iget-object v9, v3, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->start:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; - invoke-virtual {v9, v3}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V + invoke-virtual {v9, v2}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V .line 466 :goto_2d - iget-object v9, v7, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->dimension:Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency; + iget-object v9, v3, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->dimension:Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency; iget v9, v9, Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency;->value:I .line 467 - iget-object v11, v7, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->dimensionBehavior:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + iget-object v11, v3, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->dimensionBehavior:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; sget-object v12, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; if-ne v11, v12, :cond_51 - iget v11, v7, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->matchConstraintsType:I + iget v11, v3, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->matchConstraintsType:I const/4 v12, 0x1 if-ne v11, v12, :cond_52 .line 469 - iget-object v9, v7, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->dimension:Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency; + iget-object v9, v3, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->dimension:Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency; iget v9, v9, Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency;->wrapValue:I @@ -2304,60 +2296,60 @@ :goto_2e if-eqz v1, :cond_53 - sub-int/2addr v3, v9 + sub-int/2addr v2, v9 goto :goto_2f :cond_53 - add-int/2addr v3, v9 + add-int/2addr v2, v9 :goto_2f if-eqz v1, :cond_54 .line 478 - iget-object v9, v7, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->start:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; + iget-object v9, v3, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->start:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; - invoke-virtual {v9, v3}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V + invoke-virtual {v9, v2}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V goto :goto_30 .line 480 :cond_54 - iget-object v9, v7, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->end:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; + iget-object v9, v3, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->end:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; - invoke-virtual {v9, v3}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V + invoke-virtual {v9, v2}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V :goto_30 - if-ge v2, v8, :cond_56 + if-ge v7, v8, :cond_56 - if-ge v2, v6, :cond_56 + if-ge v7, v6, :cond_56 if-eqz v1, :cond_55 .line 484 - iget-object v7, v7, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->end:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; + iget-object v3, v3, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->end:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; - iget v7, v7, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->margin:I + iget v3, v3, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->margin:I - neg-int v7, v7 + neg-int v3, v3 - sub-int/2addr v3, v7 + sub-int/2addr v2, v3 goto :goto_31 .line 486 :cond_55 - iget-object v7, v7, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->end:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; + iget-object v3, v3, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->end:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; - iget v7, v7, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->margin:I + iget v3, v3, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->margin:I - neg-int v7, v7 + neg-int v3, v3 - add-int/2addr v3, v7 + add-int/2addr v2, v3 :cond_56 :goto_31 - add-int/lit8 v2, v2, 0x1 + add-int/lit8 v7, v7, 0x1 goto/16 :goto_2a diff --git a/smali/android/support/constraint/solver/widgets/analyzer/DependencyGraph.smali b/smali/android/support/constraint/solver/widgets/analyzer/DependencyGraph.smali index db91b38b..9c81e527 100644 --- a/smali/android/support/constraint/solver/widgets/analyzer/DependencyGraph.smali +++ b/smali/android/support/constraint/solver/widgets/analyzer/DependencyGraph.smali @@ -472,7 +472,7 @@ :try_start_0 invoke-direct/range {v0 .. v6}, Landroid/support/constraint/solver/widgets/analyzer/DependencyGraph;->applyGroup(Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;IILandroid/support/constraint/solver/widgets/analyzer/DependencyNode;Ljava/util/ArrayList;Landroid/support/constraint/solver/widgets/analyzer/RunGroup;)V :try_end_0 - .catchall {:try_start_0 .. :try_end_0} :catchall_0 + .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0 goto :goto_5 @@ -480,16 +480,12 @@ :goto_6 return-void - :catchall_0 + :catch_0 move-exception p1 - goto :goto_8 - - :goto_7 throw p1 - :goto_8 - goto :goto_7 + return-void .end method .method private basicMeasureWidgets(Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;)Z @@ -2355,6 +2351,29 @@ invoke-virtual {v0}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getDebugName()Ljava/lang/String; + move-result-object v0 + + .line 986 + new-instance v1, Ljava/lang/StringBuilder; + + invoke-direct {v1}, Ljava/lang/StringBuilder;->()V + + invoke-virtual {v1, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + const-string v2, "_VERTICAL -> " + + invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + const-string v0, "_HORIZONTAL;\n" + + invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + goto/16 :goto_3 .line 976 @@ -2519,6 +2538,29 @@ invoke-virtual {v0}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getDebugName()Ljava/lang/String; + move-result-object v0 + + .line 967 + new-instance v1, Ljava/lang/StringBuilder; + + invoke-direct {v1}, Ljava/lang/StringBuilder;->()V + + invoke-virtual {v1, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + const-string v2, "_HORIZONTAL -> " + + invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + const-string v0, "_VERTICAL;\n" + + invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + goto/16 :goto_3 .line 957 @@ -2971,26 +3013,18 @@ iput-object p2, v0, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->horizontalBehavior:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; .line 376 - iget-object p2, p0, Landroid/support/constraint/solver/widgets/analyzer/DependencyGraph;->mMeasure:Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure; - - iput-object p4, p2, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->verticalBehavior:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + iput-object p4, v0, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->verticalBehavior:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; .line 377 - iget-object p2, p0, Landroid/support/constraint/solver/widgets/analyzer/DependencyGraph;->mMeasure:Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure; - - iput p3, p2, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->horizontalDimension:I + iput p3, v0, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->horizontalDimension:I .line 378 - iget-object p2, p0, Landroid/support/constraint/solver/widgets/analyzer/DependencyGraph;->mMeasure:Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure; - - iput p5, p2, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->verticalDimension:I + iput p5, v0, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;->verticalDimension:I .line 379 iget-object p2, p0, Landroid/support/constraint/solver/widgets/analyzer/DependencyGraph;->mMeasurer:Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measurer; - iget-object p3, p0, Landroid/support/constraint/solver/widgets/analyzer/DependencyGraph;->mMeasure:Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure; - - invoke-interface {p2, p1, p3}, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measurer;->measure(Landroid/support/constraint/solver/widgets/ConstraintWidget;Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;)V + invoke-interface {p2, p1, v0}, Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measurer;->measure(Landroid/support/constraint/solver/widgets/ConstraintWidget;Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure;)V .line 380 iget-object p2, p0, Landroid/support/constraint/solver/widgets/analyzer/DependencyGraph;->mMeasure:Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measure; @@ -3024,419 +3058,433 @@ .end method .method private nodeDefinition(Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;)Ljava/lang/String; - .locals 8 + .locals 10 .line 823 instance-of v0, p1, Landroid/support/constraint/solver/widgets/analyzer/VerticalWidgetRun; + const/4 v1, 0x1 + + if-eqz v0, :cond_0 + + const/4 v2, 0x1 + + goto :goto_0 + + :cond_0 + const/4 v2, 0x0 + .line 824 - iget-object v1, p1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->widget:Landroid/support/constraint/solver/widgets/ConstraintWidget; + :goto_0 + iget-object v3, p1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->widget:Landroid/support/constraint/solver/widgets/ConstraintWidget; - invoke-virtual {v1}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getDebugName()Ljava/lang/String; + invoke-virtual {v3}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getDebugName()Ljava/lang/String; - move-result-object v1 + move-result-object v3 + + if-nez v2, :cond_1 .line 826 - iget-object v2, p1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->widget:Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object v4, p1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->widget:Landroid/support/constraint/solver/widgets/ConstraintWidget; - if-nez v0, :cond_0 + invoke-virtual {v4}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getHorizontalDimensionBehaviour()Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - invoke-virtual {v2}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getHorizontalDimensionBehaviour()Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + move-result-object v4 - move-result-object v2 + goto :goto_1 - goto :goto_0 + :cond_1 + iget-object v4, p1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->widget:Landroid/support/constraint/solver/widgets/ConstraintWidget; .line 827 - :cond_0 - invoke-virtual {v2}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getVerticalDimensionBehaviour()Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + invoke-virtual {v4}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getVerticalDimensionBehaviour()Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - move-result-object v2 + move-result-object v4 .line 828 - :goto_0 - iget-object v3, p1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->runGroup:Landroid/support/constraint/solver/widgets/analyzer/RunGroup; + :goto_1 + iget-object v5, p1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->runGroup:Landroid/support/constraint/solver/widgets/analyzer/RunGroup; - if-nez v0, :cond_1 + if-nez v2, :cond_2 .line 831 - new-instance v4, Ljava/lang/StringBuilder; + new-instance v6, Ljava/lang/StringBuilder; - invoke-direct {v4}, Ljava/lang/StringBuilder;->()V + invoke-direct {v6}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v4, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v6, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v5, "_HORIZONTAL" + const-string v7, "_HORIZONTAL" - invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v6, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v4 + move-result-object v6 - goto :goto_1 + goto :goto_2 .line 833 - :cond_1 - new-instance v4, Ljava/lang/StringBuilder; + :cond_2 + new-instance v6, Ljava/lang/StringBuilder; - invoke-direct {v4}, Ljava/lang/StringBuilder;->()V + invoke-direct {v6}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v4, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v6, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v5, "_VERTICAL" + const-string v7, "_VERTICAL" - invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v6, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v4 + move-result-object v6 .line 835 - :goto_1 - new-instance v5, Ljava/lang/StringBuilder; + :goto_2 + new-instance v7, Ljava/lang/StringBuilder; - invoke-direct {v5}, Ljava/lang/StringBuilder;->()V + invoke-direct {v7}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v5, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v7, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v4, " [shape=none, label=<" + const-string v6, " [shape=none, label=<" - invoke-virtual {v5, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v7, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v4 + move-result-object v6 .line 836 - new-instance v5, Ljava/lang/StringBuilder; + new-instance v7, Ljava/lang/StringBuilder; - invoke-direct {v5}, Ljava/lang/StringBuilder;->()V + invoke-direct {v7}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v5, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v7, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v4, "" + const-string v6, "
" - invoke-virtual {v5, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v7, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v4 + move-result-object v6 .line 837 - new-instance v5, Ljava/lang/StringBuilder; + new-instance v7, Ljava/lang/StringBuilder; - invoke-direct {v5}, Ljava/lang/StringBuilder;->()V + invoke-direct {v7}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v5, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v7, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v4, " " + const-string v6, " " - invoke-virtual {v5, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v7, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v4 + move-result-object v6 - const-string v5, " BGCOLOR=\"green\"" + const-string v7, " BGCOLOR=\"green\"" - const-string v6, " " + const-string v6, " PORT=\"LEFT\" BORDER=\"1\">L" - invoke-virtual {v7, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v9, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v9}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v4 + move-result-object v6 - goto :goto_2 + goto :goto_3 .line 845 - :cond_3 - new-instance v7, Ljava/lang/StringBuilder; + :cond_4 + new-instance v9, Ljava/lang/StringBuilder; - invoke-direct {v7}, Ljava/lang/StringBuilder;->()V + invoke-direct {v9}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v7, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v9, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v7, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v9, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v9}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v4 + move-result-object v6 .line 846 - iget-object v7, p1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->start:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; + iget-object v9, p1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->start:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; - iget-boolean v7, v7, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolved:Z + iget-boolean v9, v9, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolved:Z - if-eqz v7, :cond_4 + if-eqz v9, :cond_5 .line 847 - new-instance v7, Ljava/lang/StringBuilder; + new-instance v9, Ljava/lang/StringBuilder; - invoke-direct {v7}, Ljava/lang/StringBuilder;->()V + invoke-direct {v9}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v7, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v9, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v7, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v9, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v9}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v4 + move-result-object v6 .line 849 - :cond_4 - new-instance v7, Ljava/lang/StringBuilder; + :cond_5 + new-instance v9, Ljava/lang/StringBuilder; - invoke-direct {v7}, Ljava/lang/StringBuilder;->()V + invoke-direct {v9}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v7, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v9, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v4, " PORT=\"TOP\" BORDER=\"1\">T" + const-string v6, " PORT=\"TOP\" BORDER=\"1\">T" - invoke-virtual {v7, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v9, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v9}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v4 + move-result-object v6 .line 851 - :goto_2 - new-instance v7, Ljava/lang/StringBuilder; + :goto_3 + new-instance v9, Ljava/lang/StringBuilder; - invoke-direct {v7}, Ljava/lang/StringBuilder;->()V + invoke-direct {v9}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v7, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v9, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v4, " " - invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v4, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; move-result-object v1 - if-nez v0, :cond_b + if-nez v2, :cond_c .line 871 new-instance v0, Ljava/lang/StringBuilder; @@ -3445,7 +3493,7 @@ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v0, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; @@ -3456,7 +3504,7 @@ iget-boolean p1, p1, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolved:Z - if-eqz p1, :cond_a + if-eqz p1, :cond_b .line 873 new-instance p1, Ljava/lang/StringBuilder; @@ -3465,14 +3513,14 @@ invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {p1, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {p1, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; move-result-object v0 .line 875 - :cond_a + :cond_b new-instance p1, Ljava/lang/StringBuilder; invoke-direct {p1}, Ljava/lang/StringBuilder;->()V @@ -3487,23 +3535,23 @@ move-result-object p1 - goto :goto_5 + goto :goto_6 .line 877 - :cond_b + :cond_c new-instance v2, Ljava/lang/StringBuilder; invoke-direct {v2}, Ljava/lang/StringBuilder;->()V invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v2, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v2, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; move-result-object v1 - if-eqz v0, :cond_c + if-eqz v0, :cond_d .line 879 move-object v0, p1 @@ -3514,7 +3562,7 @@ iget-boolean v0, v0, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolved:Z - if-eqz v0, :cond_c + if-eqz v0, :cond_d .line 880 new-instance v0, Ljava/lang/StringBuilder; @@ -3523,14 +3571,14 @@ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v0, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; move-result-object v1 .line 883 - :cond_c + :cond_d new-instance v0, Ljava/lang/StringBuilder; invoke-direct {v0}, Ljava/lang/StringBuilder;->()V @@ -3552,7 +3600,7 @@ invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v1, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; @@ -3563,7 +3611,7 @@ iget-boolean p1, p1, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolved:Z - if-eqz p1, :cond_d + if-eqz p1, :cond_e .line 886 new-instance p1, Ljava/lang/StringBuilder; @@ -3572,14 +3620,14 @@ invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {p1, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {p1, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; move-result-object v0 .line 888 - :cond_d + :cond_e new-instance p1, Ljava/lang/StringBuilder; invoke-direct {p1}, Ljava/lang/StringBuilder;->()V @@ -3595,7 +3643,7 @@ move-result-object p1 .line 890 - :goto_5 + :goto_6 new-instance v0, Ljava/lang/StringBuilder; invoke-direct {v0}, Ljava/lang/StringBuilder;->()V @@ -4114,8 +4162,6 @@ iput-boolean v2, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->measured:Z .line 120 - iget-object v1, p0, Landroid/support/constraint/solver/widgets/analyzer/DependencyGraph;->container:Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer; - iget-object v1, v1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->horizontalRun:Landroid/support/constraint/solver/widgets/analyzer/HorizontalWidgetRun; invoke-virtual {v1}, Landroid/support/constraint/solver/widgets/analyzer/HorizontalWidgetRun;->reset()V @@ -4531,10 +4577,7 @@ if-nez v6, :cond_12 - :goto_5 - const/4 v0, 0x0 - - goto :goto_6 + goto :goto_5 .line 215 :cond_12 @@ -4568,9 +4611,11 @@ goto :goto_5 - .line 225 :cond_14 - :goto_6 + const/4 v2, 0x1 + + .line 225 + :goto_5 iget-object p1, p0, Landroid/support/constraint/solver/widgets/analyzer/DependencyGraph;->container:Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer; invoke-virtual {p1, v1}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->setHorizontalDimensionBehaviour(Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;)V @@ -4580,7 +4625,7 @@ invoke-virtual {p1, v3}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->setVerticalDimensionBehaviour(Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;)V - return v0 + return v2 .end method .method public directMeasureSetup(Z)Z @@ -4669,8 +4714,6 @@ iput-boolean v0, p1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->measured:Z .line 245 - iget-object p1, p0, Landroid/support/constraint/solver/widgets/analyzer/DependencyGraph;->container:Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer; - iget-object p1, p1, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->horizontalRun:Landroid/support/constraint/solver/widgets/analyzer/HorizontalWidgetRun; iget-object p1, p1, Landroid/support/constraint/solver/widgets/analyzer/HorizontalWidgetRun;->dimension:Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency; @@ -5148,10 +5191,7 @@ if-nez v6, :cond_f - :goto_6 - const/4 v0, 0x0 - - goto :goto_7 + goto :goto_6 .line 347 :cond_f @@ -5177,9 +5217,11 @@ goto :goto_6 - .line 357 :cond_11 - :goto_7 + const/4 v2, 0x1 + + .line 357 + :goto_6 iget-object p1, p0, Landroid/support/constraint/solver/widgets/analyzer/DependencyGraph;->container:Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer; invoke-virtual {p1, v1}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->setHorizontalDimensionBehaviour(Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;)V @@ -5189,7 +5231,7 @@ invoke-virtual {p1, v3}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->setVerticalDimensionBehaviour(Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;)V - return v0 + return v2 .end method .method public invalidateGraph()V diff --git a/smali/android/support/constraint/solver/widgets/analyzer/DependencyNode$Type.smali b/smali/android/support/constraint/solver/widgets/analyzer/DependencyNode$Type.smali index b86ae2a6..bb2a746a 100644 --- a/smali/android/support/constraint/solver/widgets/analyzer/DependencyNode$Type.smali +++ b/smali/android/support/constraint/solver/widgets/analyzer/DependencyNode$Type.smali @@ -44,112 +44,126 @@ # direct methods .method static constructor ()V - .locals 16 + .locals 10 .line 27 new-instance v0, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; - const-string v1, "UNKNOWN" + const/4 v1, 0x0 - const/4 v2, 0x0 + const-string v2, "UNKNOWN" - invoke-direct {v0, v1, v2}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->(Ljava/lang/String;I)V + invoke-direct {v0, v2, v1}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->(Ljava/lang/String;I)V sput-object v0, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->UNKNOWN:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; - new-instance v1, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; + new-instance v0, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; + + const/4 v2, 0x1 const-string v3, "HORIZONTAL_DIMENSION" - const/4 v4, 0x1 + invoke-direct {v0, v3, v2}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->(Ljava/lang/String;I)V + + sput-object v0, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->HORIZONTAL_DIMENSION:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; + + new-instance v0, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; + + const/4 v3, 0x2 + + const-string v4, "VERTICAL_DIMENSION" - invoke-direct {v1, v3, v4}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->(Ljava/lang/String;I)V + invoke-direct {v0, v4, v3}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->(Ljava/lang/String;I)V - sput-object v1, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->HORIZONTAL_DIMENSION:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; + sput-object v0, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->VERTICAL_DIMENSION:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; - new-instance v3, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; + new-instance v0, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; - const-string v5, "VERTICAL_DIMENSION" + const/4 v4, 0x3 - const/4 v6, 0x2 + const-string v5, "LEFT" - invoke-direct {v3, v5, v6}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->(Ljava/lang/String;I)V + invoke-direct {v0, v5, v4}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->(Ljava/lang/String;I)V - sput-object v3, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->VERTICAL_DIMENSION:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; + sput-object v0, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->LEFT:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; - new-instance v5, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; + new-instance v0, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; - const-string v7, "LEFT" + const/4 v5, 0x4 - const/4 v8, 0x3 + const-string v6, "RIGHT" - invoke-direct {v5, v7, v8}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->(Ljava/lang/String;I)V + invoke-direct {v0, v6, v5}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->(Ljava/lang/String;I)V - sput-object v5, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->LEFT:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; + sput-object v0, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->RIGHT:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; - new-instance v7, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; + new-instance v0, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; - const-string v9, "RIGHT" + const/4 v6, 0x5 - const/4 v10, 0x4 + const-string v7, "TOP" - invoke-direct {v7, v9, v10}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->(Ljava/lang/String;I)V + invoke-direct {v0, v7, v6}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->(Ljava/lang/String;I)V - sput-object v7, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->RIGHT:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; + sput-object v0, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->TOP:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; - new-instance v9, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; + new-instance v0, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; - const-string v11, "TOP" + const/4 v7, 0x6 - const/4 v12, 0x5 + const-string v8, "BOTTOM" - invoke-direct {v9, v11, v12}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->(Ljava/lang/String;I)V + invoke-direct {v0, v8, v7}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->(Ljava/lang/String;I)V + + sput-object v0, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->BOTTOM:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; + + new-instance v0, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; - sput-object v9, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->TOP:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; + const/4 v8, 0x7 - new-instance v11, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; + const-string v9, "BASELINE" - const-string v13, "BOTTOM" + invoke-direct {v0, v9, v8}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->(Ljava/lang/String;I)V - const/4 v14, 0x6 + sput-object v0, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->BASELINE:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; - invoke-direct {v11, v13, v14}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->(Ljava/lang/String;I)V + const/16 v0, 0x8 - sput-object v11, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->BOTTOM:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; + new-array v0, v0, [Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; - new-instance v13, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; + sget-object v9, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->UNKNOWN:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; - const-string v15, "BASELINE" + aput-object v9, v0, v1 - const/4 v14, 0x7 + sget-object v1, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->HORIZONTAL_DIMENSION:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; - invoke-direct {v13, v15, v14}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->(Ljava/lang/String;I)V + aput-object v1, v0, v2 - sput-object v13, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->BASELINE:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; + sget-object v1, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->VERTICAL_DIMENSION:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; - const/16 v15, 0x8 + aput-object v1, v0, v3 - new-array v15, v15, [Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; + sget-object v1, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->LEFT:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; - aput-object v0, v15, v2 + aput-object v1, v0, v4 - aput-object v1, v15, v4 + sget-object v1, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->RIGHT:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; - aput-object v3, v15, v6 + aput-object v1, v0, v5 - aput-object v5, v15, v8 + sget-object v1, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->TOP:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; - aput-object v7, v15, v10 + aput-object v1, v0, v6 - aput-object v9, v15, v12 + sget-object v1, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->BOTTOM:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; - const/4 v0, 0x6 + aput-object v1, v0, v7 - aput-object v11, v15, v0 + sget-object v1, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->BASELINE:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; - aput-object v13, v15, v14 + aput-object v1, v0, v8 - sput-object v15, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->$VALUES:[Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; + sput-object v0, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type;->$VALUES:[Landroid/support/constraint/solver/widgets/analyzer/DependencyNode$Type; return-void .end method diff --git a/smali/android/support/constraint/solver/widgets/analyzer/Direct.smali b/smali/android/support/constraint/solver/widgets/analyzer/Direct.smali index ef120d87..f4c07c97 100644 --- a/smali/android/support/constraint/solver/widgets/analyzer/Direct.smali +++ b/smali/android/support/constraint/solver/widgets/analyzer/Direct.smali @@ -1338,129 +1338,129 @@ add-int/2addr v6, v8 - move-object/from16 v1, v17 + move-object/from16 v2, v17 - const/4 v9, 0x0 + const/4 v1, 0x0 :goto_7 - if-nez v9, :cond_21 + if-nez v1, :cond_21 .line 835 - iget-object v2, v1, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v3, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; - aget-object v2, v2, p3 + aget-object v3, v3, p3 .line 836 - invoke-virtual {v1}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getVisibility()I + invoke-virtual {v2}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getVisibility()I - move-result v2 + move-result v3 - const/16 v3, 0x8 + const/16 v4, 0x8 - if-ne v2, v3, :cond_19 + if-ne v3, v4, :cond_19 if-nez p2, :cond_18 .line 838 - invoke-virtual {v1, v6, v6}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->setFinalHorizontal(II)V + invoke-virtual {v2, v6, v6}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->setFinalHorizontal(II)V .line 839 invoke-virtual/range {p0 .. p0}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->getMeasurer()Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measurer; - move-result-object v2 + move-result-object v3 - invoke-static {v1, v2}, Landroid/support/constraint/solver/widgets/analyzer/Direct;->horizontalSolvingPass(Landroid/support/constraint/solver/widgets/ConstraintWidget;Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measurer;)V + invoke-static {v2, v3}, Landroid/support/constraint/solver/widgets/analyzer/Direct;->horizontalSolvingPass(Landroid/support/constraint/solver/widgets/ConstraintWidget;Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measurer;)V goto :goto_8 .line 841 :cond_18 - invoke-virtual {v1, v6, v6}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->setFinalVertical(II)V + invoke-virtual {v2, v6, v6}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->setFinalVertical(II)V .line 842 invoke-virtual/range {p0 .. p0}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->getMeasurer()Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measurer; - move-result-object v2 + move-result-object v3 - invoke-static {v1, v2}, Landroid/support/constraint/solver/widgets/analyzer/Direct;->verticalSolvingPass(Landroid/support/constraint/solver/widgets/ConstraintWidget;Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measurer;)V + invoke-static {v2, v3}, Landroid/support/constraint/solver/widgets/analyzer/Direct;->verticalSolvingPass(Landroid/support/constraint/solver/widgets/ConstraintWidget;Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measurer;)V :goto_8 - move-object/from16 v2, p1 + move-object/from16 v3, p1 goto :goto_a .line 845 :cond_19 - iget-object v2, v1, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v3, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; - aget-object v2, v2, p3 + aget-object v3, v3, p3 - invoke-virtual {v2}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->getMargin()I + invoke-virtual {v3}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->getMargin()I - move-result v2 + move-result v3 - add-int/2addr v6, v2 + add-int/2addr v6, v3 if-nez p2, :cond_1a .line 847 - invoke-virtual {v1}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getWidth()I + invoke-virtual {v2}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getWidth()I - move-result v2 + move-result v3 - add-int/2addr v2, v6 + add-int/2addr v3, v6 - invoke-virtual {v1, v6, v2}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->setFinalHorizontal(II)V + invoke-virtual {v2, v6, v3}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->setFinalHorizontal(II)V .line 848 invoke-virtual/range {p0 .. p0}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->getMeasurer()Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measurer; - move-result-object v2 + move-result-object v3 - invoke-static {v1, v2}, Landroid/support/constraint/solver/widgets/analyzer/Direct;->horizontalSolvingPass(Landroid/support/constraint/solver/widgets/ConstraintWidget;Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measurer;)V + invoke-static {v2, v3}, Landroid/support/constraint/solver/widgets/analyzer/Direct;->horizontalSolvingPass(Landroid/support/constraint/solver/widgets/ConstraintWidget;Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measurer;)V .line 849 - invoke-virtual {v1}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getWidth()I + invoke-virtual {v2}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getWidth()I - move-result v2 + move-result v3 goto :goto_9 .line 851 :cond_1a - invoke-virtual {v1}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getHeight()I + invoke-virtual {v2}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getHeight()I - move-result v2 + move-result v3 - add-int/2addr v2, v6 + add-int/2addr v3, v6 - invoke-virtual {v1, v6, v2}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->setFinalVertical(II)V + invoke-virtual {v2, v6, v3}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->setFinalVertical(II)V .line 852 invoke-virtual/range {p0 .. p0}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->getMeasurer()Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measurer; - move-result-object v2 + move-result-object v3 - invoke-static {v1, v2}, Landroid/support/constraint/solver/widgets/analyzer/Direct;->verticalSolvingPass(Landroid/support/constraint/solver/widgets/ConstraintWidget;Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measurer;)V + invoke-static {v2, v3}, Landroid/support/constraint/solver/widgets/analyzer/Direct;->verticalSolvingPass(Landroid/support/constraint/solver/widgets/ConstraintWidget;Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measurer;)V .line 853 - invoke-virtual {v1}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getHeight()I + invoke-virtual {v2}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getHeight()I - move-result v2 + move-result v3 :goto_9 - add-int/2addr v6, v2 + add-int/2addr v6, v3 .line 855 - iget-object v2, v1, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v3, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; - aget-object v2, v2, v7 + aget-object v3, v3, v7 - invoke-virtual {v2}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->getMargin()I + invoke-virtual {v3}, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->getMargin()I - move-result v2 + move-result v3 - add-int/2addr v6, v2 + add-int/2addr v6, v3 add-int/2addr v6, v8 @@ -1468,51 +1468,51 @@ .line 859 :goto_a - invoke-virtual {v1, v2, v0}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->addToSolver(Landroid/support/constraint/solver/LinearSystem;Z)V + invoke-virtual {v2, v3, v0}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->addToSolver(Landroid/support/constraint/solver/LinearSystem;Z)V .line 862 - iget-object v4, v1, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v5, v2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; - aget-object v4, v4, v7 + aget-object v5, v5, v7 - iget-object v4, v4, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v5, v5, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - if-eqz v4, :cond_1b + if-eqz v5, :cond_1b .line 864 - iget-object v4, v4, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mOwner:Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object v5, v5, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mOwner:Landroid/support/constraint/solver/widgets/ConstraintWidget; .line 865 - iget-object v5, v4, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v9, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; - aget-object v5, v5, p3 + aget-object v9, v9, p3 - iget-object v5, v5, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v9, v9, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - if-eqz v5, :cond_1b + if-eqz v9, :cond_1b - iget-object v5, v4, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v9, v5, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mListAnchors:[Landroid/support/constraint/solver/widgets/ConstraintAnchor; - aget-object v5, v5, p3 + aget-object v9, v9, p3 - iget-object v5, v5, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; + iget-object v9, v9, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mTarget:Landroid/support/constraint/solver/widgets/ConstraintAnchor; - iget-object v5, v5, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mOwner:Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object v9, v9, Landroid/support/constraint/solver/widgets/ConstraintAnchor;->mOwner:Landroid/support/constraint/solver/widgets/ConstraintWidget; - if-eq v5, v1, :cond_1c + if-eq v9, v2, :cond_1c :cond_1b - move-object/from16 v4, v16 + move-object/from16 v5, v16 :cond_1c - if-eqz v4, :cond_1d + if-eqz v5, :cond_1d - move-object v1, v4 + move-object v2, v5 goto/16 :goto_7 :cond_1d - const/4 v9, 0x1 + const/4 v1, 0x1 goto/16 :goto_7 @@ -3462,21 +3462,17 @@ :try_start_0 invoke-static {v3, p1}, Landroid/support/constraint/solver/widgets/analyzer/Direct;->verticalSolvingPass(Landroid/support/constraint/solver/widgets/ConstraintWidget;Landroid/support/constraint/solver/widgets/analyzer/BasicMeasure$Measurer;)V :try_end_0 - .catchall {:try_start_0 .. :try_end_0} :catchall_0 + .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0 goto :goto_6 :cond_1e return-void - :catchall_0 + :catch_0 move-exception p0 - goto :goto_8 - - :goto_7 throw p0 - :goto_8 - goto :goto_7 + return-void .end method diff --git a/smali/android/support/constraint/solver/widgets/analyzer/Grouping.smali b/smali/android/support/constraint/solver/widgets/analyzer/Grouping.smali index ea025da1..49fe3db6 100644 --- a/smali/android/support/constraint/solver/widgets/analyzer/Grouping.smali +++ b/smali/android/support/constraint/solver/widgets/analyzer/Grouping.smali @@ -655,11 +655,9 @@ if-nez v11, :cond_12 .line 149 - new-instance v3, Ljava/util/ArrayList; - - invoke-direct {v3}, Ljava/util/ArrayList;->()V + new-instance v11, Ljava/util/ArrayList; - move-object v11, v3 + invoke-direct {v11}, Ljava/util/ArrayList;->()V .line 151 :cond_12 @@ -1298,60 +1296,60 @@ move-result-object v1 - move-object v2, v12 + move-object v4, v12 - const/4 v6, 0x0 + const/4 v2, 0x0 :cond_25 :goto_12 invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z - move-result v4 + move-result v5 - if-eqz v4, :cond_27 + if-eqz v5, :cond_27 invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object; - move-result-object v4 + move-result-object v5 - check-cast v4, Landroid/support/constraint/solver/widgets/analyzer/WidgetGroup; + check-cast v5, Landroid/support/constraint/solver/widgets/analyzer/WidgetGroup; .line 301 - invoke-virtual {v4}, Landroid/support/constraint/solver/widgets/analyzer/WidgetGroup;->getOrientation()I + invoke-virtual {v5}, Landroid/support/constraint/solver/widgets/analyzer/WidgetGroup;->getOrientation()I - move-result v5 + move-result v6 const/4 v7, 0x1 - if-ne v5, v7, :cond_26 + if-ne v6, v7, :cond_26 goto :goto_12 :cond_26 - const/4 v5, 0x0 + const/4 v6, 0x0 .line 304 - invoke-virtual {v4, v5}, Landroid/support/constraint/solver/widgets/analyzer/WidgetGroup;->setAuthoritative(Z)V + invoke-virtual {v5, v6}, Landroid/support/constraint/solver/widgets/analyzer/WidgetGroup;->setAuthoritative(Z)V .line 305 invoke-virtual/range {p0 .. p0}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->getSystem()Landroid/support/constraint/solver/LinearSystem; move-result-object v7 - invoke-virtual {v4, v7, v5}, Landroid/support/constraint/solver/widgets/analyzer/WidgetGroup;->measureWrap(Landroid/support/constraint/solver/LinearSystem;I)I + invoke-virtual {v5, v7, v6}, Landroid/support/constraint/solver/widgets/analyzer/WidgetGroup;->measureWrap(Landroid/support/constraint/solver/LinearSystem;I)I move-result v7 - if-le v7, v6, :cond_25 + if-le v7, v2, :cond_25 - move-object v2, v4 + move-object v4, v5 - move v6, v7 + move v2, v7 goto :goto_12 :cond_27 - if-eqz v2, :cond_28 + if-eqz v4, :cond_28 .line 318 sget-object v1, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->FIXED:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; @@ -1359,17 +1357,17 @@ invoke-virtual {v0, v1}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->setHorizontalDimensionBehaviour(Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;)V .line 319 - invoke-virtual {v0, v6}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->setWidth(I)V + invoke-virtual {v0, v2}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->setWidth(I)V const/4 v1, 0x1 .line 320 - invoke-virtual {v2, v1}, Landroid/support/constraint/solver/widgets/analyzer/WidgetGroup;->setAuthoritative(Z)V + invoke-virtual {v4, v1}, Landroid/support/constraint/solver/widgets/analyzer/WidgetGroup;->setAuthoritative(Z)V goto :goto_13 :cond_28 - move-object v2, v12 + move-object v4, v12 .line 325 :goto_13 @@ -1377,47 +1375,47 @@ move-result-object v1 - sget-object v4, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->WRAP_CONTENT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + sget-object v2, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->WRAP_CONTENT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - if-ne v1, v4, :cond_2c + if-ne v1, v2, :cond_2c .line 328 invoke-virtual {v3}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator; move-result-object v1 - move-object v3, v12 + move-object v2, v12 - const/4 v6, 0x0 + const/4 v3, 0x0 :cond_29 :goto_14 invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z - move-result v4 + move-result v5 - if-eqz v4, :cond_2b + if-eqz v5, :cond_2b invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object; - move-result-object v4 + move-result-object v5 - check-cast v4, Landroid/support/constraint/solver/widgets/analyzer/WidgetGroup; + check-cast v5, Landroid/support/constraint/solver/widgets/analyzer/WidgetGroup; .line 329 - invoke-virtual {v4}, Landroid/support/constraint/solver/widgets/analyzer/WidgetGroup;->getOrientation()I + invoke-virtual {v5}, Landroid/support/constraint/solver/widgets/analyzer/WidgetGroup;->getOrientation()I - move-result v5 + move-result v6 - if-nez v5, :cond_2a + if-nez v6, :cond_2a goto :goto_14 :cond_2a - const/4 v5, 0x0 + const/4 v6, 0x0 .line 332 - invoke-virtual {v4, v5}, Landroid/support/constraint/solver/widgets/analyzer/WidgetGroup;->setAuthoritative(Z)V + invoke-virtual {v5, v6}, Landroid/support/constraint/solver/widgets/analyzer/WidgetGroup;->setAuthoritative(Z)V .line 333 invoke-virtual/range {p0 .. p0}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->getSystem()Landroid/support/constraint/solver/LinearSystem; @@ -1426,24 +1424,24 @@ const/4 v8, 0x1 - invoke-virtual {v4, v7, v8}, Landroid/support/constraint/solver/widgets/analyzer/WidgetGroup;->measureWrap(Landroid/support/constraint/solver/LinearSystem;I)I + invoke-virtual {v5, v7, v8}, Landroid/support/constraint/solver/widgets/analyzer/WidgetGroup;->measureWrap(Landroid/support/constraint/solver/LinearSystem;I)I move-result v7 - if-le v7, v6, :cond_29 + if-le v7, v3, :cond_29 - move-object v3, v4 + move-object v2, v5 - move v6, v7 + move v3, v7 goto :goto_14 :cond_2b - const/4 v5, 0x0 + const/4 v6, 0x0 const/4 v8, 0x1 - if-eqz v3, :cond_2d + if-eqz v2, :cond_2d .line 346 sget-object v1, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->FIXED:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; @@ -1451,41 +1449,31 @@ invoke-virtual {v0, v1}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->setVerticalDimensionBehaviour(Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;)V .line 347 - invoke-virtual {v0, v6}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->setHeight(I)V + invoke-virtual {v0, v3}, Landroid/support/constraint/solver/widgets/ConstraintWidgetContainer;->setHeight(I)V .line 348 - invoke-virtual {v3, v8}, Landroid/support/constraint/solver/widgets/analyzer/WidgetGroup;->setAuthoritative(Z)V - - move-object v4, v3 + invoke-virtual {v2, v8}, Landroid/support/constraint/solver/widgets/analyzer/WidgetGroup;->setAuthoritative(Z)V goto :goto_15 :cond_2c - const/4 v5, 0x0 + const/4 v6, 0x0 const/4 v8, 0x1 :cond_2d - move-object v4, v12 + move-object v2, v12 :goto_15 - if-nez v2, :cond_2f - - if-eqz v4, :cond_2e + if-nez v4, :cond_2e - goto :goto_16 + if-eqz v2, :cond_2f :cond_2e - const/4 v3, 0x0 - - goto :goto_17 + const/4 v6, 0x1 :cond_2f - :goto_16 - const/4 v3, 0x1 - - :goto_17 - return v3 + return v6 .end method .method public static validInGroup(Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;)Z diff --git a/smali/android/support/constraint/solver/widgets/analyzer/HelperReferences.smali b/smali/android/support/constraint/solver/widgets/analyzer/HelperReferences.smali index 91a5e31d..1cffef02 100644 --- a/smali/android/support/constraint/solver/widgets/analyzer/HelperReferences.smali +++ b/smali/android/support/constraint/solver/widgets/analyzer/HelperReferences.smali @@ -511,7 +511,9 @@ const/4 v3, 0x0 - const/4 v4, -0x1 + const/4 v3, -0x1 + + const/4 v4, 0x0 :cond_0 :goto_0 @@ -530,17 +532,17 @@ .line 128 iget v5, v5, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->value:I - if-eq v4, v2, :cond_1 + if-eq v3, v2, :cond_1 - if-ge v5, v4, :cond_2 + if-ge v5, v3, :cond_2 :cond_1 - move v4, v5 + move v3, v5 :cond_2 - if-ge v3, v5, :cond_0 + if-ge v4, v5, :cond_0 - move v3, v5 + move v4, v5 goto :goto_0 @@ -561,9 +563,9 @@ move-result p1 - add-int/2addr v3, p1 + add-int/2addr v4, p1 - invoke-virtual {v0, v3}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V + invoke-virtual {v0, v4}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V goto :goto_2 @@ -576,9 +578,9 @@ move-result p1 - add-int/2addr v4, p1 + add-int/2addr v3, p1 - invoke-virtual {v0, v4}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V + invoke-virtual {v0, v3}, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolve(I)V :goto_2 return-void diff --git a/smali/android/support/constraint/solver/widgets/analyzer/HorizontalWidgetRun$1.smali b/smali/android/support/constraint/solver/widgets/analyzer/HorizontalWidgetRun$1.smali index b303ee71..4c0a9d14 100644 --- a/smali/android/support/constraint/solver/widgets/analyzer/HorizontalWidgetRun$1.smali +++ b/smali/android/support/constraint/solver/widgets/analyzer/HorizontalWidgetRun$1.smali @@ -34,6 +34,8 @@ sput-object v0, Landroid/support/constraint/solver/widgets/analyzer/HorizontalWidgetRun$1;->$SwitchMap$android$support$constraint$solver$widgets$analyzer$WidgetRun$RunType:[I :try_start_0 + sget-object v0, Landroid/support/constraint/solver/widgets/analyzer/HorizontalWidgetRun$1;->$SwitchMap$android$support$constraint$solver$widgets$analyzer$WidgetRun$RunType:[I + sget-object v1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType;->START:Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType; invoke-virtual {v1}, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType;->ordinal()I diff --git a/smali/android/support/constraint/solver/widgets/analyzer/HorizontalWidgetRun.smali b/smali/android/support/constraint/solver/widgets/analyzer/HorizontalWidgetRun.smali index 6cc96a68..229489c5 100644 --- a/smali/android/support/constraint/solver/widgets/analyzer/HorizontalWidgetRun.smali +++ b/smali/android/support/constraint/solver/widgets/analyzer/HorizontalWidgetRun.smali @@ -13,9 +13,9 @@ const/4 v0, 0x2 + .line 37 new-array v0, v0, [I - .line 37 sput-object v0, Landroid/support/constraint/solver/widgets/analyzer/HorizontalWidgetRun;->tempDimensions:[I return-void @@ -125,6 +125,8 @@ if-gt p2, p3, :cond_3 + if-gt p5, p5, :cond_3 + .line 280 aput p2, p1, p4 @@ -134,6 +136,8 @@ goto :goto_0 :cond_3 + if-gt p3, p3, :cond_4 + if-gt p6, p5, :cond_4 .line 283 diff --git a/smali/android/support/constraint/solver/widgets/analyzer/RunGroup.smali b/smali/android/support/constraint/solver/widgets/analyzer/RunGroup.smali index 5f5e6977..4ac349ed 100644 --- a/smali/android/support/constraint/solver/widgets/analyzer/RunGroup.smali +++ b/smali/android/support/constraint/solver/widgets/analyzer/RunGroup.smali @@ -39,7 +39,7 @@ # direct methods .method public constructor (Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;I)V - .locals 1 + .locals 2 .line 43 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -52,20 +52,23 @@ .line 34 iput-boolean v0, p0, Landroid/support/constraint/solver/widgets/analyzer/RunGroup;->dual:Z - const/4 v0, 0x0 + const/4 v1, 0x0 .line 36 - iput-object v0, p0, Landroid/support/constraint/solver/widgets/analyzer/RunGroup;->firstRun:Landroid/support/constraint/solver/widgets/analyzer/WidgetRun; + iput-object v1, p0, Landroid/support/constraint/solver/widgets/analyzer/RunGroup;->firstRun:Landroid/support/constraint/solver/widgets/analyzer/WidgetRun; .line 37 - iput-object v0, p0, Landroid/support/constraint/solver/widgets/analyzer/RunGroup;->lastRun:Landroid/support/constraint/solver/widgets/analyzer/WidgetRun; + iput-object v1, p0, Landroid/support/constraint/solver/widgets/analyzer/RunGroup;->lastRun:Landroid/support/constraint/solver/widgets/analyzer/WidgetRun; .line 38 - new-instance v0, Ljava/util/ArrayList; + new-instance v1, Ljava/util/ArrayList; - invoke-direct {v0}, Ljava/util/ArrayList;->()V + invoke-direct {v1}, Ljava/util/ArrayList;->()V - iput-object v0, p0, Landroid/support/constraint/solver/widgets/analyzer/RunGroup;->runs:Ljava/util/ArrayList; + iput-object v1, p0, Landroid/support/constraint/solver/widgets/analyzer/RunGroup;->runs:Ljava/util/ArrayList; + + .line 40 + iput v0, p0, Landroid/support/constraint/solver/widgets/analyzer/RunGroup;->groupIndex:I .line 44 sget v0, Landroid/support/constraint/solver/widgets/analyzer/RunGroup;->index:I diff --git a/smali/android/support/constraint/solver/widgets/analyzer/VerticalWidgetRun$1.smali b/smali/android/support/constraint/solver/widgets/analyzer/VerticalWidgetRun$1.smali index 5bce1ab3..fafd1140 100644 --- a/smali/android/support/constraint/solver/widgets/analyzer/VerticalWidgetRun$1.smali +++ b/smali/android/support/constraint/solver/widgets/analyzer/VerticalWidgetRun$1.smali @@ -34,6 +34,8 @@ sput-object v0, Landroid/support/constraint/solver/widgets/analyzer/VerticalWidgetRun$1;->$SwitchMap$android$support$constraint$solver$widgets$analyzer$WidgetRun$RunType:[I :try_start_0 + sget-object v0, Landroid/support/constraint/solver/widgets/analyzer/VerticalWidgetRun$1;->$SwitchMap$android$support$constraint$solver$widgets$analyzer$WidgetRun$RunType:[I + sget-object v1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType;->START:Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType; invoke-virtual {v1}, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType;->ordinal()I diff --git a/smali/android/support/constraint/solver/widgets/analyzer/WidgetGroup.smali b/smali/android/support/constraint/solver/widgets/analyzer/WidgetGroup.smali index aa632187..4e217b85 100644 --- a/smali/android/support/constraint/solver/widgets/analyzer/WidgetGroup.smali +++ b/smali/android/support/constraint/solver/widgets/analyzer/WidgetGroup.smali @@ -67,17 +67,23 @@ iput-object v0, p0, Landroid/support/constraint/solver/widgets/analyzer/WidgetGroup;->widgets:Ljava/util/ArrayList; - const/4 v0, 0x0 + const/4 v0, -0x1 + + .line 37 + iput v0, p0, Landroid/support/constraint/solver/widgets/analyzer/WidgetGroup;->id:I + + const/4 v1, 0x0 .line 38 - iput-boolean v0, p0, Landroid/support/constraint/solver/widgets/analyzer/WidgetGroup;->authoritative:Z + iput-boolean v1, p0, Landroid/support/constraint/solver/widgets/analyzer/WidgetGroup;->authoritative:Z - const/4 v0, 0x0 + .line 39 + iput v1, p0, Landroid/support/constraint/solver/widgets/analyzer/WidgetGroup;->orientation:I - .line 40 - iput-object v0, p0, Landroid/support/constraint/solver/widgets/analyzer/WidgetGroup;->results:Ljava/util/ArrayList; + const/4 v1, 0x0 - const/4 v0, -0x1 + .line 40 + iput-object v1, p0, Landroid/support/constraint/solver/widgets/analyzer/WidgetGroup;->results:Ljava/util/ArrayList; .line 41 iput v0, p0, Landroid/support/constraint/solver/widgets/analyzer/WidgetGroup;->moveTo:I diff --git a/smali/android/support/constraint/solver/widgets/analyzer/WidgetRun$1.smali b/smali/android/support/constraint/solver/widgets/analyzer/WidgetRun$1.smali index 56711eeb..1abab04a 100644 --- a/smali/android/support/constraint/solver/widgets/analyzer/WidgetRun$1.smali +++ b/smali/android/support/constraint/solver/widgets/analyzer/WidgetRun$1.smali @@ -34,6 +34,8 @@ sput-object v0, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$1;->$SwitchMap$android$support$constraint$solver$widgets$ConstraintAnchor$Type:[I :try_start_0 + sget-object v0, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$1;->$SwitchMap$android$support$constraint$solver$widgets$ConstraintAnchor$Type:[I + sget-object v1, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->LEFT:Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type; invoke-virtual {v1}, Landroid/support/constraint/solver/widgets/ConstraintAnchor$Type;->ordinal()I diff --git a/smali/android/support/constraint/solver/widgets/analyzer/WidgetRun$RunType.smali b/smali/android/support/constraint/solver/widgets/analyzer/WidgetRun$RunType.smali index 092d9d61..e6322364 100644 --- a/smali/android/support/constraint/solver/widgets/analyzer/WidgetRun$RunType.smali +++ b/smali/android/support/constraint/solver/widgets/analyzer/WidgetRun$RunType.smali @@ -36,62 +36,70 @@ # direct methods .method static constructor ()V - .locals 9 + .locals 6 .line 303 new-instance v0, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType; - const-string v1, "NONE" + const/4 v1, 0x0 - const/4 v2, 0x0 + const-string v2, "NONE" - invoke-direct {v0, v1, v2}, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType;->(Ljava/lang/String;I)V + invoke-direct {v0, v2, v1}, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType;->(Ljava/lang/String;I)V sput-object v0, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType;->NONE:Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType; - new-instance v1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType; + new-instance v0, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType; + + const/4 v2, 0x1 const-string v3, "START" - const/4 v4, 0x1 + invoke-direct {v0, v3, v2}, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType;->(Ljava/lang/String;I)V - invoke-direct {v1, v3, v4}, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType;->(Ljava/lang/String;I)V + sput-object v0, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType;->START:Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType; + + new-instance v0, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType; - sput-object v1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType;->START:Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType; + const/4 v3, 0x2 - new-instance v3, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType; + const-string v4, "END" - const-string v5, "END" + invoke-direct {v0, v4, v3}, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType;->(Ljava/lang/String;I)V + + sput-object v0, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType;->END:Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType; + + new-instance v0, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType; - const/4 v6, 0x2 + const/4 v4, 0x3 - invoke-direct {v3, v5, v6}, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType;->(Ljava/lang/String;I)V + const-string v5, "CENTER" - sput-object v3, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType;->END:Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType; + invoke-direct {v0, v5, v4}, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType;->(Ljava/lang/String;I)V - new-instance v5, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType; + sput-object v0, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType;->CENTER:Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType; - const-string v7, "CENTER" + const/4 v0, 0x4 - const/4 v8, 0x3 + new-array v0, v0, [Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType; - invoke-direct {v5, v7, v8}, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType;->(Ljava/lang/String;I)V + sget-object v5, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType;->NONE:Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType; - sput-object v5, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType;->CENTER:Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType; + aput-object v5, v0, v1 - const/4 v7, 0x4 + sget-object v1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType;->START:Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType; - new-array v7, v7, [Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType; + aput-object v1, v0, v2 - aput-object v0, v7, v2 + sget-object v1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType;->END:Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType; - aput-object v1, v7, v4 + aput-object v1, v0, v3 - aput-object v3, v7, v6 + sget-object v1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType;->CENTER:Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType; - aput-object v5, v7, v8 + aput-object v1, v0, v4 - sput-object v7, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType;->$VALUES:[Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType; + sput-object v0, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType;->$VALUES:[Landroid/support/constraint/solver/widgets/analyzer/WidgetRun$RunType; return-void .end method diff --git a/smali/android/support/constraint/solver/widgets/analyzer/WidgetRun.smali b/smali/android/support/constraint/solver/widgets/analyzer/WidgetRun.smali index bb920e67..2c1d48b4 100644 --- a/smali/android/support/constraint/solver/widgets/analyzer/WidgetRun.smali +++ b/smali/android/support/constraint/solver/widgets/analyzer/WidgetRun.smali @@ -147,17 +147,19 @@ goto/16 :goto_4 - .line 205 :cond_1 - iget-object p2, p0, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->widget:Landroid/support/constraint/solver/widgets/ConstraintWidget; - if-nez p1, :cond_2 + .line 205 + iget-object p2, p0, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->widget:Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object p2, p2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->verticalRun:Landroid/support/constraint/solver/widgets/analyzer/VerticalWidgetRun; goto :goto_0 :cond_2 + iget-object p2, p0, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->widget:Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object p2, p2, Landroid/support/constraint/solver/widgets/ConstraintWidget;->horizontalRun:Landroid/support/constraint/solver/widgets/analyzer/HorizontalWidgetRun; .line 206 @@ -242,16 +244,18 @@ if-eqz v0, :cond_9 + if-nez p1, :cond_6 + .line 183 iget-object v0, p0, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->widget:Landroid/support/constraint/solver/widgets/ConstraintWidget; - if-nez p1, :cond_6 - iget v0, v0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintPercentWidth:F goto :goto_3 :cond_6 + iget-object v0, p0, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->widget:Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget v0, v0, Landroid/support/constraint/solver/widgets/ConstraintWidget;->mMatchConstraintPercentHeight:F .line 186 @@ -409,7 +413,9 @@ :cond_0 if-eq v0, p1, :cond_3 - goto :goto_0 + move p1, v0 + + goto :goto_1 .line 244 :cond_1 @@ -432,15 +438,20 @@ .line 248 invoke-static {p2, p1}, Ljava/lang/Math;->min(II)I - move-result v0 + move-result p2 + + goto :goto_0 :cond_2 - if-eq v0, p1, :cond_3 + move p2, v0 :goto_0 - move p1, v0 + if-eq p2, p1, :cond_3 + + move p1, p2 :cond_3 + :goto_1 return p1 .end method @@ -861,20 +872,22 @@ return-void - .line 154 :cond_3 - iget-object p3, p0, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->widget:Landroid/support/constraint/solver/widgets/ConstraintWidget; - if-nez p4, :cond_4 + .line 154 + iget-object p3, p0, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->widget:Landroid/support/constraint/solver/widgets/ConstraintWidget; + invoke-virtual {p3}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getHorizontalBiasPercent()F move-result p3 goto :goto_0 - .line 155 :cond_4 + iget-object p3, p0, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->widget:Landroid/support/constraint/solver/widgets/ConstraintWidget; + + .line 155 invoke-virtual {p3}, Landroid/support/constraint/solver/widgets/ConstraintWidget;->getVerticalBiasPercent()F move-result p3 diff --git a/smali/android/support/constraint/utils/ImageFilterButton.smali b/smali/android/support/constraint/utils/ImageFilterButton.smali index 73c03bb4..f5f24d9f 100644 --- a/smali/android/support/constraint/utils/ImageFilterButton.smali +++ b/smali/android/support/constraint/utils/ImageFilterButton.smali @@ -333,12 +333,14 @@ const/4 p2, 0x2 + .line 142 new-array p2, p2, [Landroid/graphics/drawable/Drawable; - .line 142 iput-object p2, p0, Landroid/support/constraint/utils/ImageFilterButton;->mLayers:[Landroid/graphics/drawable/Drawable; .line 143 + iget-object p2, p0, Landroid/support/constraint/utils/ImageFilterButton;->mLayers:[Landroid/graphics/drawable/Drawable; + invoke-virtual {p0}, Landroid/support/constraint/utils/ImageFilterButton;->getDrawable()Landroid/graphics/drawable/Drawable; move-result-object v0 @@ -353,15 +355,15 @@ aput-object v1, p1, p2 .line 146 - new-instance p1, Landroid/graphics/drawable/LayerDrawable; + new-instance v0, Landroid/graphics/drawable/LayerDrawable; - iget-object v0, p0, Landroid/support/constraint/utils/ImageFilterButton;->mLayers:[Landroid/graphics/drawable/Drawable; + invoke-direct {v0, p1}, Landroid/graphics/drawable/LayerDrawable;->([Landroid/graphics/drawable/Drawable;)V - invoke-direct {p1, v0}, Landroid/graphics/drawable/LayerDrawable;->([Landroid/graphics/drawable/Drawable;)V - - iput-object p1, p0, Landroid/support/constraint/utils/ImageFilterButton;->mLayer:Landroid/graphics/drawable/LayerDrawable; + iput-object v0, p0, Landroid/support/constraint/utils/ImageFilterButton;->mLayer:Landroid/graphics/drawable/LayerDrawable; .line 147 + iget-object p1, p0, Landroid/support/constraint/utils/ImageFilterButton;->mLayer:Landroid/graphics/drawable/LayerDrawable; + invoke-virtual {p1, p2}, Landroid/graphics/drawable/LayerDrawable;->getDrawable(I)Landroid/graphics/drawable/Drawable; move-result-object p1 @@ -516,9 +518,7 @@ iput p1, v0, Landroid/support/constraint/utils/ImageFilterView$ImageMatrix;->mBrightness:F .line 256 - iget-object p1, p0, Landroid/support/constraint/utils/ImageFilterButton;->mImageMatrix:Landroid/support/constraint/utils/ImageFilterView$ImageMatrix; - - invoke-virtual {p1, p0}, Landroid/support/constraint/utils/ImageFilterView$ImageMatrix;->updateMatrix(Landroid/widget/ImageView;)V + invoke-virtual {v0, p0}, Landroid/support/constraint/utils/ImageFilterView$ImageMatrix;->updateMatrix(Landroid/widget/ImageView;)V return-void .end method @@ -532,9 +532,7 @@ iput p1, v0, Landroid/support/constraint/utils/ImageFilterView$ImageMatrix;->mContrast:F .line 191 - iget-object p1, p0, Landroid/support/constraint/utils/ImageFilterButton;->mImageMatrix:Landroid/support/constraint/utils/ImageFilterView$ImageMatrix; - - invoke-virtual {p1, p0}, Landroid/support/constraint/utils/ImageFilterView$ImageMatrix;->updateMatrix(Landroid/widget/ImageView;)V + invoke-virtual {v0, p0}, Landroid/support/constraint/utils/ImageFilterView$ImageMatrix;->updateMatrix(Landroid/widget/ImageView;)V return-void .end method @@ -607,6 +605,9 @@ .method public setRound(F)V .locals 5 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x15 + .end annotation .line 317 invoke-static {p1}, Ljava/lang/Float;->isNaN(F)Z @@ -654,6 +655,9 @@ :goto_0 iput p1, p0, Landroid/support/constraint/utils/ImageFilterButton;->mRound:F + .line 327 + iget p1, p0, Landroid/support/constraint/utils/ImageFilterButton;->mRound:F + const/16 v3, 0x15 const/4 v4, 0x0 @@ -706,6 +710,8 @@ iput-object p1, p0, Landroid/support/constraint/utils/ImageFilterButton;->mViewOutlineProvider:Landroid/view/ViewOutlineProvider; .line 344 + iget-object p1, p0, Landroid/support/constraint/utils/ImageFilterButton;->mViewOutlineProvider:Landroid/view/ViewOutlineProvider; + invoke-virtual {p0, p1}, Landroid/support/constraint/utils/ImageFilterButton;->setOutlineProvider(Landroid/view/ViewOutlineProvider;)V .line 346 @@ -777,6 +783,9 @@ .method public setRoundPercent(F)V .locals 6 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x15 + .end annotation .line 267 iget v0, p0, Landroid/support/constraint/utils/ImageFilterButton;->mRoundPercent:F @@ -800,6 +809,9 @@ :goto_0 iput p1, p0, Landroid/support/constraint/utils/ImageFilterButton;->mRoundPercent:F + .line 269 + iget p1, p0, Landroid/support/constraint/utils/ImageFilterButton;->mRoundPercent:F + const/16 v3, 0x15 const/4 v4, 0x0 @@ -852,6 +864,8 @@ iput-object p1, p0, Landroid/support/constraint/utils/ImageFilterButton;->mViewOutlineProvider:Landroid/view/ViewOutlineProvider; .line 287 + iget-object p1, p0, Landroid/support/constraint/utils/ImageFilterButton;->mViewOutlineProvider:Landroid/view/ViewOutlineProvider; + invoke-virtual {p0, p1}, Landroid/support/constraint/utils/ImageFilterButton;->setOutlineProvider(Landroid/view/ViewOutlineProvider;)V .line 289 @@ -943,9 +957,7 @@ iput p1, v0, Landroid/support/constraint/utils/ImageFilterView$ImageMatrix;->mSaturation:F .line 172 - iget-object p1, p0, Landroid/support/constraint/utils/ImageFilterButton;->mImageMatrix:Landroid/support/constraint/utils/ImageFilterView$ImageMatrix; - - invoke-virtual {p1, p0}, Landroid/support/constraint/utils/ImageFilterView$ImageMatrix;->updateMatrix(Landroid/widget/ImageView;)V + invoke-virtual {v0, p0}, Landroid/support/constraint/utils/ImageFilterView$ImageMatrix;->updateMatrix(Landroid/widget/ImageView;)V return-void .end method @@ -959,9 +971,7 @@ iput p1, v0, Landroid/support/constraint/utils/ImageFilterView$ImageMatrix;->mWarmth:F .line 210 - iget-object p1, p0, Landroid/support/constraint/utils/ImageFilterButton;->mImageMatrix:Landroid/support/constraint/utils/ImageFilterView$ImageMatrix; - - invoke-virtual {p1, p0}, Landroid/support/constraint/utils/ImageFilterView$ImageMatrix;->updateMatrix(Landroid/widget/ImageView;)V + invoke-virtual {v0, p0}, Landroid/support/constraint/utils/ImageFilterView$ImageMatrix;->updateMatrix(Landroid/widget/ImageView;)V return-void .end method diff --git a/smali/android/support/constraint/utils/ImageFilterView$ImageMatrix.smali b/smali/android/support/constraint/utils/ImageFilterView$ImageMatrix.smali index 2759104b..f53341f9 100644 --- a/smali/android/support/constraint/utils/ImageFilterView$ImageMatrix.smali +++ b/smali/android/support/constraint/utils/ImageFilterView$ImageMatrix.smali @@ -39,9 +39,9 @@ const/16 v0, 0x14 + .line 87 new-array v0, v0, [F - .line 87 iput-object v0, p0, Landroid/support/constraint/utils/ImageFilterView$ImageMatrix;->m:[F .line 88 @@ -85,104 +85,104 @@ aput p1, v0, v1 - const/4 v1, 0x1 + const/4 v1, 0x0 - const/4 v2, 0x0 + const/4 v2, 0x1 .line 226 - aput v2, v0, v1 + aput v1, v0, v2 - const/4 v1, 0x2 + const/4 v2, 0x2 .line 227 - aput v2, v0, v1 + aput v1, v0, v2 - const/4 v1, 0x3 + const/4 v2, 0x3 .line 228 - aput v2, v0, v1 + aput v1, v0, v2 - const/4 v1, 0x4 + const/4 v2, 0x4 .line 229 - aput v2, v0, v1 + aput v1, v0, v2 - const/4 v1, 0x5 + const/4 v2, 0x5 .line 231 - aput v2, v0, v1 + aput v1, v0, v2 - const/4 v1, 0x6 + const/4 v2, 0x6 .line 232 - aput p1, v0, v1 + aput p1, v0, v2 - const/4 v1, 0x7 + const/4 v2, 0x7 .line 233 - aput v2, v0, v1 + aput v1, v0, v2 - const/16 v1, 0x8 + const/16 v2, 0x8 .line 234 - aput v2, v0, v1 + aput v1, v0, v2 - const/16 v1, 0x9 + const/16 v2, 0x9 .line 235 - aput v2, v0, v1 + aput v1, v0, v2 - const/16 v1, 0xa + const/16 v2, 0xa .line 237 - aput v2, v0, v1 + aput v1, v0, v2 - const/16 v1, 0xb + const/16 v2, 0xb .line 238 - aput v2, v0, v1 + aput v1, v0, v2 - const/16 v1, 0xc + const/16 v2, 0xc .line 239 - aput p1, v0, v1 + aput p1, v0, v2 const/16 p1, 0xd .line 240 - aput v2, v0, p1 + aput v1, v0, p1 const/16 p1, 0xe .line 241 - aput v2, v0, p1 + aput v1, v0, p1 const/16 p1, 0xf .line 243 - aput v2, v0, p1 + aput v1, v0, p1 const/16 p1, 0x10 .line 244 - aput v2, v0, p1 + aput v1, v0, p1 const/16 p1, 0x11 .line 245 - aput v2, v0, p1 + aput v1, v0, p1 const/16 p1, 0x12 - const/high16 v1, 0x3f800000 # 1.0f + const/high16 v2, 0x3f800000 # 1.0f .line 246 - aput v1, v0, p1 + aput v2, v0, p1 const/16 p1, 0x13 .line 247 - aput v2, v0, p1 + aput v1, v0, p1 return-void .end method @@ -225,49 +225,49 @@ .line 108 aput v1, v4, v5 - const/4 v5, 0x3 + const/4 v5, 0x0 - const/4 v6, 0x0 + const/4 v6, 0x3 .line 109 - aput v6, v4, v5 + aput v5, v4, v6 - const/4 v5, 0x4 + const/4 v6, 0x4 .line 110 - aput v6, v4, v5 + aput v5, v4, v6 - const/4 v5, 0x5 + const/4 v6, 0x5 .line 112 - aput v2, v4, v5 + aput v2, v4, v6 - add-float v5, v3, p1 + add-float v6, v3, p1 const/4 v7, 0x6 .line 113 - aput v5, v4, v7 + aput v6, v4, v7 - const/4 v5, 0x7 + const/4 v6, 0x7 .line 114 - aput v1, v4, v5 + aput v1, v4, v6 - const/16 v5, 0x8 + const/16 v6, 0x8 .line 115 - aput v6, v4, v5 + aput v5, v4, v6 - const/16 v5, 0x9 + const/16 v6, 0x9 .line 116 - aput v6, v4, v5 + aput v5, v4, v6 - const/16 v5, 0xa + const/16 v6, 0xa .line 118 - aput v2, v4, v5 + aput v2, v4, v6 const/16 v2, 0xb @@ -284,27 +284,27 @@ const/16 p1, 0xd .line 121 - aput v6, v4, p1 + aput v5, v4, p1 const/16 p1, 0xe .line 122 - aput v6, v4, p1 + aput v5, v4, p1 const/16 p1, 0xf .line 124 - aput v6, v4, p1 + aput v5, v4, p1 const/16 p1, 0x10 .line 125 - aput v6, v4, p1 + aput v5, v4, p1 const/16 p1, 0x11 .line 126 - aput v6, v4, p1 + aput v5, v4, p1 const/16 p1, 0x12 @@ -314,7 +314,7 @@ const/16 p1, 0x13 .line 128 - aput v6, v4, p1 + aput v5, v4, p1 return-void .end method @@ -753,13 +753,10 @@ invoke-virtual {v0, v2}, Landroid/graphics/ColorMatrix;->postConcat(Landroid/graphics/ColorMatrix;)V - goto :goto_1 + const/4 v0, 0x1 :cond_3 - move v1, v0 - - :goto_1 - if-eqz v1, :cond_4 + if-eqz v0, :cond_4 .line 277 new-instance v0, Landroid/graphics/ColorMatrixColorFilter; @@ -770,12 +767,12 @@ invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setColorFilter(Landroid/graphics/ColorFilter;)V - goto :goto_2 + goto :goto_1 .line 279 :cond_4 invoke-virtual {p1}, Landroid/widget/ImageView;->clearColorFilter()V - :goto_2 + :goto_1 return-void .end method diff --git a/smali/android/support/constraint/utils/ImageFilterView.smali b/smali/android/support/constraint/utils/ImageFilterView.smali index c5dbfee8..763d4b27 100644 --- a/smali/android/support/constraint/utils/ImageFilterView.smali +++ b/smali/android/support/constraint/utils/ImageFilterView.smali @@ -338,12 +338,14 @@ const/4 p1, 0x2 + .line 343 new-array p1, p1, [Landroid/graphics/drawable/Drawable; - .line 343 iput-object p1, p0, Landroid/support/constraint/utils/ImageFilterView;->mLayers:[Landroid/graphics/drawable/Drawable; .line 344 + iget-object p1, p0, Landroid/support/constraint/utils/ImageFilterView;->mLayers:[Landroid/graphics/drawable/Drawable; + invoke-virtual {p0}, Landroid/support/constraint/utils/ImageFilterView;->getDrawable()Landroid/graphics/drawable/Drawable; move-result-object p2 @@ -358,15 +360,15 @@ aput-object v0, p1, p2 .line 347 - new-instance p1, Landroid/graphics/drawable/LayerDrawable; - - iget-object v0, p0, Landroid/support/constraint/utils/ImageFilterView;->mLayers:[Landroid/graphics/drawable/Drawable; + new-instance v0, Landroid/graphics/drawable/LayerDrawable; - invoke-direct {p1, v0}, Landroid/graphics/drawable/LayerDrawable;->([Landroid/graphics/drawable/Drawable;)V + invoke-direct {v0, p1}, Landroid/graphics/drawable/LayerDrawable;->([Landroid/graphics/drawable/Drawable;)V - iput-object p1, p0, Landroid/support/constraint/utils/ImageFilterView;->mLayer:Landroid/graphics/drawable/LayerDrawable; + iput-object v0, p0, Landroid/support/constraint/utils/ImageFilterView;->mLayer:Landroid/graphics/drawable/LayerDrawable; .line 348 + iget-object p1, p0, Landroid/support/constraint/utils/ImageFilterView;->mLayer:Landroid/graphics/drawable/LayerDrawable; + invoke-virtual {p1, p2}, Landroid/graphics/drawable/LayerDrawable;->getDrawable(I)Landroid/graphics/drawable/Drawable; move-result-object p1 @@ -532,9 +534,7 @@ iput p1, v0, Landroid/support/constraint/utils/ImageFilterView$ImageMatrix;->mBrightness:F .line 457 - iget-object p1, p0, Landroid/support/constraint/utils/ImageFilterView;->mImageMatrix:Landroid/support/constraint/utils/ImageFilterView$ImageMatrix; - - invoke-virtual {p1, p0}, Landroid/support/constraint/utils/ImageFilterView$ImageMatrix;->updateMatrix(Landroid/widget/ImageView;)V + invoke-virtual {v0, p0}, Landroid/support/constraint/utils/ImageFilterView$ImageMatrix;->updateMatrix(Landroid/widget/ImageView;)V return-void .end method @@ -548,9 +548,7 @@ iput p1, v0, Landroid/support/constraint/utils/ImageFilterView$ImageMatrix;->mContrast:F .line 392 - iget-object p1, p0, Landroid/support/constraint/utils/ImageFilterView;->mImageMatrix:Landroid/support/constraint/utils/ImageFilterView$ImageMatrix; - - invoke-virtual {p1, p0}, Landroid/support/constraint/utils/ImageFilterView$ImageMatrix;->updateMatrix(Landroid/widget/ImageView;)V + invoke-virtual {v0, p0}, Landroid/support/constraint/utils/ImageFilterView$ImageMatrix;->updateMatrix(Landroid/widget/ImageView;)V return-void .end method @@ -623,6 +621,9 @@ .method public setRound(F)V .locals 5 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x15 + .end annotation .line 528 invoke-static {p1}, Ljava/lang/Float;->isNaN(F)Z @@ -670,6 +671,9 @@ :goto_0 iput p1, p0, Landroid/support/constraint/utils/ImageFilterView;->mRound:F + .line 538 + iget p1, p0, Landroid/support/constraint/utils/ImageFilterView;->mRound:F + const/16 v3, 0x15 const/4 v4, 0x0 @@ -722,6 +726,8 @@ iput-object p1, p0, Landroid/support/constraint/utils/ImageFilterView;->mViewOutlineProvider:Landroid/view/ViewOutlineProvider; .line 555 + iget-object p1, p0, Landroid/support/constraint/utils/ImageFilterView;->mViewOutlineProvider:Landroid/view/ViewOutlineProvider; + invoke-virtual {p0, p1}, Landroid/support/constraint/utils/ImageFilterView;->setOutlineProvider(Landroid/view/ViewOutlineProvider;)V .line 557 @@ -793,6 +799,9 @@ .method public setRoundPercent(F)V .locals 6 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x15 + .end annotation .line 477 iget v0, p0, Landroid/support/constraint/utils/ImageFilterView;->mRoundPercent:F @@ -816,6 +825,9 @@ :goto_0 iput p1, p0, Landroid/support/constraint/utils/ImageFilterView;->mRoundPercent:F + .line 479 + iget p1, p0, Landroid/support/constraint/utils/ImageFilterView;->mRoundPercent:F + const/16 v3, 0x15 const/4 v4, 0x0 @@ -868,6 +880,8 @@ iput-object p1, p0, Landroid/support/constraint/utils/ImageFilterView;->mViewOutlineProvider:Landroid/view/ViewOutlineProvider; .line 497 + iget-object p1, p0, Landroid/support/constraint/utils/ImageFilterView;->mViewOutlineProvider:Landroid/view/ViewOutlineProvider; + invoke-virtual {p0, p1}, Landroid/support/constraint/utils/ImageFilterView;->setOutlineProvider(Landroid/view/ViewOutlineProvider;)V .line 499 @@ -959,9 +973,7 @@ iput p1, v0, Landroid/support/constraint/utils/ImageFilterView$ImageMatrix;->mSaturation:F .line 373 - iget-object p1, p0, Landroid/support/constraint/utils/ImageFilterView;->mImageMatrix:Landroid/support/constraint/utils/ImageFilterView$ImageMatrix; - - invoke-virtual {p1, p0}, Landroid/support/constraint/utils/ImageFilterView$ImageMatrix;->updateMatrix(Landroid/widget/ImageView;)V + invoke-virtual {v0, p0}, Landroid/support/constraint/utils/ImageFilterView$ImageMatrix;->updateMatrix(Landroid/widget/ImageView;)V return-void .end method @@ -975,9 +987,7 @@ iput p1, v0, Landroid/support/constraint/utils/ImageFilterView$ImageMatrix;->mWarmth:F .line 411 - iget-object p1, p0, Landroid/support/constraint/utils/ImageFilterView;->mImageMatrix:Landroid/support/constraint/utils/ImageFilterView$ImageMatrix; - - invoke-virtual {p1, p0}, Landroid/support/constraint/utils/ImageFilterView$ImageMatrix;->updateMatrix(Landroid/widget/ImageView;)V + invoke-virtual {v0, p0}, Landroid/support/constraint/utils/ImageFilterView$ImageMatrix;->updateMatrix(Landroid/widget/ImageView;)V return-void .end method diff --git a/smali/android/support/constraint/utils/MockView.smali b/smali/android/support/constraint/utils/MockView.smali index b8ee68d0..dc1b29c0 100644 --- a/smali/android/support/constraint/utils/MockView.smali +++ b/smali/android/support/constraint/utils/MockView.smali @@ -75,30 +75,30 @@ iput-object v1, p0, Landroid/support/constraint/utils/MockView;->mTextBounds:Landroid/graphics/Rect; - const/16 v1, 0xff + const/4 v1, 0x0 - const/4 v2, 0x0 + const/16 v2, 0xff .line 30 - invoke-static {v1, v2, v2, v2}, Landroid/graphics/Color;->argb(IIII)I + invoke-static {v2, v1, v1, v1}, Landroid/graphics/Color;->argb(IIII)I - move-result v2 + move-result v1 - iput v2, p0, Landroid/support/constraint/utils/MockView;->mDiagonalsColor:I + iput v1, p0, Landroid/support/constraint/utils/MockView;->mDiagonalsColor:I - const/16 v2, 0xc8 + const/16 v1, 0xc8 .line 31 - invoke-static {v1, v2, v2, v2}, Landroid/graphics/Color;->argb(IIII)I + invoke-static {v2, v1, v1, v1}, Landroid/graphics/Color;->argb(IIII)I - move-result v2 + move-result v1 - iput v2, p0, Landroid/support/constraint/utils/MockView;->mTextColor:I + iput v1, p0, Landroid/support/constraint/utils/MockView;->mTextColor:I - const/16 v2, 0x32 + const/16 v1, 0x32 .line 32 - invoke-static {v1, v2, v2, v2}, Landroid/graphics/Color;->argb(IIII)I + invoke-static {v2, v1, v1, v1}, Landroid/graphics/Color;->argb(IIII)I move-result v1 @@ -162,30 +162,30 @@ iput-object v0, p0, Landroid/support/constraint/utils/MockView;->mTextBounds:Landroid/graphics/Rect; - const/16 v0, 0xff + const/4 v0, 0x0 - const/4 v1, 0x0 + const/16 v1, 0xff .line 30 - invoke-static {v0, v1, v1, v1}, Landroid/graphics/Color;->argb(IIII)I + invoke-static {v1, v0, v0, v0}, Landroid/graphics/Color;->argb(IIII)I - move-result v1 + move-result v0 - iput v1, p0, Landroid/support/constraint/utils/MockView;->mDiagonalsColor:I + iput v0, p0, Landroid/support/constraint/utils/MockView;->mDiagonalsColor:I - const/16 v1, 0xc8 + const/16 v0, 0xc8 .line 31 - invoke-static {v0, v1, v1, v1}, Landroid/graphics/Color;->argb(IIII)I + invoke-static {v1, v0, v0, v0}, Landroid/graphics/Color;->argb(IIII)I - move-result v1 + move-result v0 - iput v1, p0, Landroid/support/constraint/utils/MockView;->mTextColor:I + iput v0, p0, Landroid/support/constraint/utils/MockView;->mTextColor:I - const/16 v1, 0x32 + const/16 v0, 0x32 .line 32 - invoke-static {v0, v1, v1, v1}, Landroid/graphics/Color;->argb(IIII)I + invoke-static {v1, v0, v0, v0}, Landroid/graphics/Color;->argb(IIII)I move-result v0 @@ -249,30 +249,30 @@ iput-object p3, p0, Landroid/support/constraint/utils/MockView;->mTextBounds:Landroid/graphics/Rect; - const/16 p3, 0xff + const/4 p3, 0x0 - const/4 v0, 0x0 + const/16 v0, 0xff .line 30 - invoke-static {p3, v0, v0, v0}, Landroid/graphics/Color;->argb(IIII)I + invoke-static {v0, p3, p3, p3}, Landroid/graphics/Color;->argb(IIII)I - move-result v0 + move-result p3 - iput v0, p0, Landroid/support/constraint/utils/MockView;->mDiagonalsColor:I + iput p3, p0, Landroid/support/constraint/utils/MockView;->mDiagonalsColor:I - const/16 v0, 0xc8 + const/16 p3, 0xc8 .line 31 - invoke-static {p3, v0, v0, v0}, Landroid/graphics/Color;->argb(IIII)I + invoke-static {v0, p3, p3, p3}, Landroid/graphics/Color;->argb(IIII)I - move-result v0 + move-result p3 - iput v0, p0, Landroid/support/constraint/utils/MockView;->mTextColor:I + iput p3, p0, Landroid/support/constraint/utils/MockView;->mTextColor:I - const/16 v0, 0x32 + const/16 p3, 0x32 .line 32 - invoke-static {p3, v0, v0, v0}, Landroid/graphics/Color;->argb(IIII)I + invoke-static {v0, p3, p3, p3}, Landroid/graphics/Color;->argb(IIII)I move-result p3 diff --git a/smali/android/support/constraint/utils/MotionTelltales.smali b/smali/android/support/constraint/utils/MotionTelltales.smali index d9966b3b..5abf089e 100644 --- a/smali/android/support/constraint/utils/MotionTelltales.smali +++ b/smali/android/support/constraint/utils/MotionTelltales.smali @@ -39,9 +39,9 @@ const/4 v0, 0x2 + .line 49 new-array v0, v0, [F - .line 49 iput-object v0, p0, Landroid/support/constraint/utils/MotionTelltales;->velocity:[F .line 50 @@ -89,9 +89,9 @@ const/4 v0, 0x2 + .line 49 new-array v0, v0, [F - .line 49 iput-object v0, p0, Landroid/support/constraint/utils/MotionTelltales;->velocity:[F .line 50 @@ -137,9 +137,9 @@ const/4 p3, 0x2 + .line 49 new-array p3, p3, [F - .line 49 iput-object p3, p0, Landroid/support/constraint/utils/MotionTelltales;->velocity:[F .line 50 @@ -285,7 +285,7 @@ .end method .method public onDraw(Landroid/graphics/Canvas;)V - .locals 22 + .locals 21 move-object/from16 v6, p0 @@ -336,30 +336,36 @@ move-result v8 - const/4 v9, 0x5 - - new-array v10, v9, [F + const/4 v0, 0x5 .line 119 - fill-array-data v10, :array_0 + new-array v9, v0, [F - const/4 v11, 0x0 + fill-array-data v9, :array_0 + + const/4 v10, 0x0 - const/4 v12, 0x0 + const/4 v11, 0x0 + .line 120 :goto_0 - if-ge v12, v9, :cond_3 + array-length v0, v9 + + if-ge v11, v0, :cond_3 .line 121 - aget v13, v10, v12 + aget v12, v9, v11 - const/4 v14, 0x0 + const/4 v13, 0x0 + .line 122 :goto_1 - if-ge v14, v9, :cond_2 + array-length v0, v9 + + if-ge v13, v0, :cond_2 .line 123 - aget v15, v10, v14 + aget v14, v9, v13 .line 124 iget-object v0, v6, Landroid/support/constraint/utils/MotionTelltales;->mMotionLayout:Landroid/support/constraint/motion/MotionLayout; @@ -370,9 +376,9 @@ move-object/from16 v1, p0 - move v2, v15 + move v2, v14 - move v3, v13 + move v3, v12 invoke-virtual/range {v0 .. v5}, Landroid/support/constraint/motion/MotionLayout;->getViewVelocity(Landroid/view/View;FF[FI)V @@ -385,22 +391,22 @@ int-to-float v0, v7 - mul-float v17, v0, v15 + mul-float v16, v0, v14 int-to-float v0, v8 - mul-float v18, v0, v13 + mul-float v17, v0, v12 .line 129 iget-object v0, v6, Landroid/support/constraint/utils/MotionTelltales;->velocity:[F - aget v1, v0, v11 + aget v1, v0, v10 iget v2, v6, Landroid/support/constraint/utils/MotionTelltales;->mTailScale:F mul-float v1, v1, v2 - sub-float v19, v17, v1 + sub-float v18, v16, v1 const/4 v1, 0x1 @@ -409,7 +415,7 @@ mul-float v1, v1, v2 - sub-float v20, v18, v1 + sub-float v19, v17, v1 .line 131 iget-object v1, v6, Landroid/support/constraint/utils/MotionTelltales;->mInvertMatrix:Landroid/graphics/Matrix; @@ -419,18 +425,18 @@ .line 132 iget-object v0, v6, Landroid/support/constraint/utils/MotionTelltales;->mPaintTelltales:Landroid/graphics/Paint; - move-object/from16 v16, p1 + move-object/from16 v15, p1 - move-object/from16 v21, v0 + move-object/from16 v20, v0 - invoke-virtual/range {v16 .. v21}, Landroid/graphics/Canvas;->drawLine(FFFFLandroid/graphics/Paint;)V + invoke-virtual/range {v15 .. v20}, Landroid/graphics/Canvas;->drawLine(FFFFLandroid/graphics/Paint;)V - add-int/lit8 v14, v14, 0x1 + add-int/lit8 v13, v13, 0x1 goto :goto_1 :cond_2 - add-int/lit8 v12, v12, 0x1 + add-int/lit8 v11, v11, 0x1 goto :goto_0 diff --git a/smali/android/support/coordinatorlayout/R$attr.smali b/smali/android/support/coordinatorlayout/R$attr.smali index 6fd05213..98a4deeb 100644 --- a/smali/android/support/coordinatorlayout/R$attr.smali +++ b/smali/android/support/coordinatorlayout/R$attr.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coordinatorlayout/R$attr; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -61,6 +62,7 @@ .method private constructor ()V .locals 0 + .line 13 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coordinatorlayout/R$color.smali b/smali/android/support/coordinatorlayout/R$color.smali index 6773cff9..74934529 100644 --- a/smali/android/support/coordinatorlayout/R$color.smali +++ b/smali/android/support/coordinatorlayout/R$color.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coordinatorlayout/R$color; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -27,6 +28,7 @@ .method private constructor ()V .locals 0 + .line 38 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coordinatorlayout/R$dimen.smali b/smali/android/support/coordinatorlayout/R$dimen.smali index 1ecb31a3..059722b6 100644 --- a/smali/android/support/coordinatorlayout/R$dimen.smali +++ b/smali/android/support/coordinatorlayout/R$dimen.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coordinatorlayout/R$dimen; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -63,6 +64,7 @@ .method private constructor ()V .locals 0 + .line 46 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coordinatorlayout/R$drawable.smali b/smali/android/support/coordinatorlayout/R$drawable.smali index 2d685d01..c5aaab40 100644 --- a/smali/android/support/coordinatorlayout/R$drawable.smali +++ b/smali/android/support/coordinatorlayout/R$drawable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coordinatorlayout/R$drawable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -43,6 +44,7 @@ .method private constructor ()V .locals 0 + .line 72 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coordinatorlayout/R$id.smali b/smali/android/support/coordinatorlayout/R$id.smali index 214d799d..ed442edc 100644 --- a/smali/android/support/coordinatorlayout/R$id.smali +++ b/smali/android/support/coordinatorlayout/R$id.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coordinatorlayout/R$id; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -89,6 +90,7 @@ .method private constructor ()V .locals 0 + .line 88 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coordinatorlayout/R$integer.smali b/smali/android/support/coordinatorlayout/R$integer.smali index ec3dcf6b..a6193d03 100644 --- a/smali/android/support/coordinatorlayout/R$integer.smali +++ b/smali/android/support/coordinatorlayout/R$integer.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coordinatorlayout/R$integer; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -21,6 +22,7 @@ .method private constructor ()V .locals 0 + .line 127 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coordinatorlayout/R$layout.smali b/smali/android/support/coordinatorlayout/R$layout.smali index bf513c23..a0bbb5f3 100644 --- a/smali/android/support/coordinatorlayout/R$layout.smali +++ b/smali/android/support/coordinatorlayout/R$layout.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coordinatorlayout/R$layout; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -31,6 +32,7 @@ .method private constructor ()V .locals 0 + .line 132 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coordinatorlayout/R$string.smali b/smali/android/support/coordinatorlayout/R$string.smali index 37e6d68e..9a66c4f5 100644 --- a/smali/android/support/coordinatorlayout/R$string.smali +++ b/smali/android/support/coordinatorlayout/R$string.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coordinatorlayout/R$string; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -21,6 +22,7 @@ .method private constructor ()V .locals 0 + .line 142 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coordinatorlayout/R$style.smali b/smali/android/support/coordinatorlayout/R$style.smali index 63d54ff8..f6806353 100644 --- a/smali/android/support/coordinatorlayout/R$style.smali +++ b/smali/android/support/coordinatorlayout/R$style.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coordinatorlayout/R$style; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -35,6 +36,7 @@ .method private constructor ()V .locals 0 + .line 147 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coordinatorlayout/R$styleable.smali b/smali/android/support/coordinatorlayout/R$styleable.smali index 2922e69f..ab566dcf 100644 --- a/smali/android/support/coordinatorlayout/R$styleable.smali +++ b/smali/android/support/coordinatorlayout/R$styleable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coordinatorlayout/R$styleable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -114,11 +115,12 @@ # direct methods -.method public static constructor ()V +.method static constructor ()V .locals 2 const/4 v0, 0x3 + .line 161 new-array v0, v0, [I fill-array-data v0, :array_0 @@ -127,6 +129,7 @@ const/4 v0, 0x2 + .line 165 new-array v1, v0, [I fill-array-data v1, :array_1 @@ -135,6 +138,7 @@ const/4 v1, 0x7 + .line 168 new-array v1, v1, [I fill-array-data v1, :array_2 @@ -143,6 +147,7 @@ const/4 v1, 0x6 + .line 176 new-array v1, v1, [I fill-array-data v1, :array_3 @@ -151,6 +156,7 @@ const/16 v1, 0xa + .line 183 new-array v1, v1, [I fill-array-data v1, :array_4 @@ -159,12 +165,14 @@ const/16 v1, 0xc + .line 194 new-array v1, v1, [I fill-array-data v1, :array_5 sput-object v1, Landroid/support/coordinatorlayout/R$styleable;->GradientColor:[I + .line 207 new-array v0, v0, [I fill-array-data v0, :array_6 @@ -247,6 +255,7 @@ .method private constructor ()V .locals 0 + .line 159 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coordinatorlayout/R.smali b/smali/android/support/coordinatorlayout/R.smali index 53c42132..27cd518e 100644 --- a/smali/android/support/coordinatorlayout/R.smali +++ b/smali/android/support/coordinatorlayout/R.smali @@ -1,20 +1,21 @@ .class public final Landroid/support/coordinatorlayout/R; .super Ljava/lang/Object; +.source "R.java" # annotations .annotation system Ldalvik/annotation/MemberClasses; value = { - Landroid/support/coordinatorlayout/R$attr;, - Landroid/support/coordinatorlayout/R$color;, - Landroid/support/coordinatorlayout/R$dimen;, - Landroid/support/coordinatorlayout/R$drawable;, - Landroid/support/coordinatorlayout/R$id;, - Landroid/support/coordinatorlayout/R$integer;, - Landroid/support/coordinatorlayout/R$layout;, - Landroid/support/coordinatorlayout/R$string;, + Landroid/support/coordinatorlayout/R$styleable;, Landroid/support/coordinatorlayout/R$style;, - Landroid/support/coordinatorlayout/R$styleable; + Landroid/support/coordinatorlayout/R$string;, + Landroid/support/coordinatorlayout/R$layout;, + Landroid/support/coordinatorlayout/R$integer;, + Landroid/support/coordinatorlayout/R$id;, + Landroid/support/coordinatorlayout/R$drawable;, + Landroid/support/coordinatorlayout/R$dimen;, + Landroid/support/coordinatorlayout/R$color;, + Landroid/support/coordinatorlayout/R$attr; } .end annotation @@ -23,6 +24,7 @@ .method private constructor ()V .locals 0 + .line 10 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coreui/R$attr.smali b/smali/android/support/coreui/R$attr.smali index 9d14d8da..bac1eec9 100644 --- a/smali/android/support/coreui/R$attr.smali +++ b/smali/android/support/coreui/R$attr.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coreui/R$attr; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -61,6 +62,7 @@ .method private constructor ()V .locals 0 + .line 13 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coreui/R$color.smali b/smali/android/support/coreui/R$color.smali index 73a1b904..da3ca25c 100644 --- a/smali/android/support/coreui/R$color.smali +++ b/smali/android/support/coreui/R$color.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coreui/R$color; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -27,6 +28,7 @@ .method private constructor ()V .locals 0 + .line 38 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coreui/R$dimen.smali b/smali/android/support/coreui/R$dimen.smali index a85c1ef3..5c323798 100644 --- a/smali/android/support/coreui/R$dimen.smali +++ b/smali/android/support/coreui/R$dimen.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coreui/R$dimen; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -63,6 +64,7 @@ .method private constructor ()V .locals 0 + .line 46 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coreui/R$drawable.smali b/smali/android/support/coreui/R$drawable.smali index 23a596de..00ab0833 100644 --- a/smali/android/support/coreui/R$drawable.smali +++ b/smali/android/support/coreui/R$drawable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coreui/R$drawable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -43,6 +44,7 @@ .method private constructor ()V .locals 0 + .line 72 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coreui/R$id.smali b/smali/android/support/coreui/R$id.smali index c1244db4..9d356d4d 100644 --- a/smali/android/support/coreui/R$id.smali +++ b/smali/android/support/coreui/R$id.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coreui/R$id; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -89,6 +90,7 @@ .method private constructor ()V .locals 0 + .line 88 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coreui/R$integer.smali b/smali/android/support/coreui/R$integer.smali index 90a0cf05..ad707279 100644 --- a/smali/android/support/coreui/R$integer.smali +++ b/smali/android/support/coreui/R$integer.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coreui/R$integer; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -21,6 +22,7 @@ .method private constructor ()V .locals 0 + .line 127 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coreui/R$layout.smali b/smali/android/support/coreui/R$layout.smali index b540ca81..4afac282 100644 --- a/smali/android/support/coreui/R$layout.smali +++ b/smali/android/support/coreui/R$layout.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coreui/R$layout; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -31,6 +32,7 @@ .method private constructor ()V .locals 0 + .line 132 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coreui/R$string.smali b/smali/android/support/coreui/R$string.smali index 1bdf2371..b561febe 100644 --- a/smali/android/support/coreui/R$string.smali +++ b/smali/android/support/coreui/R$string.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coreui/R$string; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -21,6 +22,7 @@ .method private constructor ()V .locals 0 + .line 142 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coreui/R$style.smali b/smali/android/support/coreui/R$style.smali index 6d877459..ffb1307f 100644 --- a/smali/android/support/coreui/R$style.smali +++ b/smali/android/support/coreui/R$style.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coreui/R$style; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -35,6 +36,7 @@ .method private constructor ()V .locals 0 + .line 147 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coreui/R$styleable.smali b/smali/android/support/coreui/R$styleable.smali index be841c04..bd61c4d5 100644 --- a/smali/android/support/coreui/R$styleable.smali +++ b/smali/android/support/coreui/R$styleable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coreui/R$styleable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -114,11 +115,12 @@ # direct methods -.method public static constructor ()V +.method static constructor ()V .locals 2 const/4 v0, 0x3 + .line 161 new-array v0, v0, [I fill-array-data v0, :array_0 @@ -127,6 +129,7 @@ const/4 v0, 0x2 + .line 165 new-array v1, v0, [I fill-array-data v1, :array_1 @@ -135,6 +138,7 @@ const/4 v1, 0x7 + .line 168 new-array v1, v1, [I fill-array-data v1, :array_2 @@ -143,6 +147,7 @@ const/4 v1, 0x6 + .line 176 new-array v1, v1, [I fill-array-data v1, :array_3 @@ -151,6 +156,7 @@ const/16 v1, 0xa + .line 183 new-array v1, v1, [I fill-array-data v1, :array_4 @@ -159,12 +165,14 @@ const/16 v1, 0xc + .line 194 new-array v1, v1, [I fill-array-data v1, :array_5 sput-object v1, Landroid/support/coreui/R$styleable;->GradientColor:[I + .line 207 new-array v0, v0, [I fill-array-data v0, :array_6 @@ -247,6 +255,7 @@ .method private constructor ()V .locals 0 + .line 159 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coreui/R.smali b/smali/android/support/coreui/R.smali index 4f5ab408..7cc175d4 100644 --- a/smali/android/support/coreui/R.smali +++ b/smali/android/support/coreui/R.smali @@ -1,20 +1,21 @@ .class public final Landroid/support/coreui/R; .super Ljava/lang/Object; +.source "R.java" # annotations .annotation system Ldalvik/annotation/MemberClasses; value = { - Landroid/support/coreui/R$attr;, - Landroid/support/coreui/R$color;, - Landroid/support/coreui/R$dimen;, - Landroid/support/coreui/R$drawable;, - Landroid/support/coreui/R$id;, - Landroid/support/coreui/R$integer;, - Landroid/support/coreui/R$layout;, - Landroid/support/coreui/R$string;, + Landroid/support/coreui/R$styleable;, Landroid/support/coreui/R$style;, - Landroid/support/coreui/R$styleable; + Landroid/support/coreui/R$string;, + Landroid/support/coreui/R$layout;, + Landroid/support/coreui/R$integer;, + Landroid/support/coreui/R$id;, + Landroid/support/coreui/R$drawable;, + Landroid/support/coreui/R$dimen;, + Landroid/support/coreui/R$color;, + Landroid/support/coreui/R$attr; } .end annotation @@ -23,6 +24,7 @@ .method private constructor ()V .locals 0 + .line 10 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coreutils/R$attr.smali b/smali/android/support/coreutils/R$attr.smali index 0a2fd34b..3efdcaab 100644 --- a/smali/android/support/coreutils/R$attr.smali +++ b/smali/android/support/coreutils/R$attr.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coreutils/R$attr; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -43,6 +44,7 @@ .method private constructor ()V .locals 0 + .line 13 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coreutils/R$color.smali b/smali/android/support/coreutils/R$color.smali index c6388f0d..7eead357 100644 --- a/smali/android/support/coreutils/R$color.smali +++ b/smali/android/support/coreutils/R$color.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coreutils/R$color; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -27,6 +28,7 @@ .method private constructor ()V .locals 0 + .line 29 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coreutils/R$dimen.smali b/smali/android/support/coreutils/R$dimen.smali index 3940daba..75ab9037 100644 --- a/smali/android/support/coreutils/R$dimen.smali +++ b/smali/android/support/coreutils/R$dimen.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coreutils/R$dimen; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -63,6 +64,7 @@ .method private constructor ()V .locals 0 + .line 37 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coreutils/R$drawable.smali b/smali/android/support/coreutils/R$drawable.smali index c51a6642..413078a5 100644 --- a/smali/android/support/coreutils/R$drawable.smali +++ b/smali/android/support/coreutils/R$drawable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coreutils/R$drawable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -43,6 +44,7 @@ .method private constructor ()V .locals 0 + .line 63 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coreutils/R$id.smali b/smali/android/support/coreutils/R$id.smali index 6539c57a..c1e18d32 100644 --- a/smali/android/support/coreutils/R$id.smali +++ b/smali/android/support/coreutils/R$id.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coreutils/R$id; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -75,6 +76,7 @@ .method private constructor ()V .locals 0 + .line 79 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coreutils/R$integer.smali b/smali/android/support/coreutils/R$integer.smali index 6d1f8437..37e63d53 100644 --- a/smali/android/support/coreutils/R$integer.smali +++ b/smali/android/support/coreutils/R$integer.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coreutils/R$integer; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -21,6 +22,7 @@ .method private constructor ()V .locals 0 + .line 111 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coreutils/R$layout.smali b/smali/android/support/coreutils/R$layout.smali index a7ea3f62..4ec5d045 100644 --- a/smali/android/support/coreutils/R$layout.smali +++ b/smali/android/support/coreutils/R$layout.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coreutils/R$layout; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -31,6 +32,7 @@ .method private constructor ()V .locals 0 + .line 116 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coreutils/R$string.smali b/smali/android/support/coreutils/R$string.smali index 0741daf6..666e21a4 100644 --- a/smali/android/support/coreutils/R$string.smali +++ b/smali/android/support/coreutils/R$string.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coreutils/R$string; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -21,6 +22,7 @@ .method private constructor ()V .locals 0 + .line 126 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coreutils/R$style.smali b/smali/android/support/coreutils/R$style.smali index da6a16d7..ffb677a8 100644 --- a/smali/android/support/coreutils/R$style.smali +++ b/smali/android/support/coreutils/R$style.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coreutils/R$style; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -33,6 +34,7 @@ .method private constructor ()V .locals 0 + .line 131 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coreutils/R$styleable.smali b/smali/android/support/coreutils/R$styleable.smali index f81ddf72..8dc6620c 100644 --- a/smali/android/support/coreutils/R$styleable.smali +++ b/smali/android/support/coreutils/R$styleable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/coreutils/R$styleable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -92,11 +93,12 @@ # direct methods -.method public static constructor ()V +.method static constructor ()V .locals 1 const/4 v0, 0x3 + .line 144 new-array v0, v0, [I fill-array-data v0, :array_0 @@ -105,6 +107,7 @@ const/4 v0, 0x6 + .line 148 new-array v0, v0, [I fill-array-data v0, :array_1 @@ -113,6 +116,7 @@ const/16 v0, 0xa + .line 155 new-array v0, v0, [I fill-array-data v0, :array_2 @@ -121,6 +125,7 @@ const/16 v0, 0xc + .line 166 new-array v0, v0, [I fill-array-data v0, :array_3 @@ -129,6 +134,7 @@ const/4 v0, 0x2 + .line 179 new-array v0, v0, [I fill-array-data v0, :array_4 @@ -196,6 +202,7 @@ .method private constructor ()V .locals 0 + .line 142 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/coreutils/R.smali b/smali/android/support/coreutils/R.smali index 62e01719..aaaa1cdc 100644 --- a/smali/android/support/coreutils/R.smali +++ b/smali/android/support/coreutils/R.smali @@ -1,20 +1,21 @@ .class public final Landroid/support/coreutils/R; .super Ljava/lang/Object; +.source "R.java" # annotations .annotation system Ldalvik/annotation/MemberClasses; value = { - Landroid/support/coreutils/R$attr;, - Landroid/support/coreutils/R$color;, - Landroid/support/coreutils/R$dimen;, - Landroid/support/coreutils/R$drawable;, - Landroid/support/coreutils/R$id;, - Landroid/support/coreutils/R$integer;, - Landroid/support/coreutils/R$layout;, - Landroid/support/coreutils/R$string;, + Landroid/support/coreutils/R$styleable;, Landroid/support/coreutils/R$style;, - Landroid/support/coreutils/R$styleable; + Landroid/support/coreutils/R$string;, + Landroid/support/coreutils/R$layout;, + Landroid/support/coreutils/R$integer;, + Landroid/support/coreutils/R$id;, + Landroid/support/coreutils/R$drawable;, + Landroid/support/coreutils/R$dimen;, + Landroid/support/coreutils/R$color;, + Landroid/support/coreutils/R$attr; } .end annotation @@ -23,6 +24,7 @@ .method private constructor ()V .locals 0 + .line 10 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/cursoradapter/R.smali b/smali/android/support/cursoradapter/R.smali index d09f11d8..f2e67c13 100644 --- a/smali/android/support/cursoradapter/R.smali +++ b/smali/android/support/cursoradapter/R.smali @@ -1,11 +1,13 @@ .class public final Landroid/support/cursoradapter/R; .super Ljava/lang/Object; +.source "R.java" # direct methods .method private constructor ()V .locals 0 + .line 10 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/customview/R$attr.smali b/smali/android/support/customview/R$attr.smali index cd21b973..39a313f2 100644 --- a/smali/android/support/customview/R$attr.smali +++ b/smali/android/support/customview/R$attr.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/customview/R$attr; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -43,6 +44,7 @@ .method private constructor ()V .locals 0 + .line 13 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/customview/R$color.smali b/smali/android/support/customview/R$color.smali index 7f49fefa..429f352b 100644 --- a/smali/android/support/customview/R$color.smali +++ b/smali/android/support/customview/R$color.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/customview/R$color; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -27,6 +28,7 @@ .method private constructor ()V .locals 0 + .line 29 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/customview/R$dimen.smali b/smali/android/support/customview/R$dimen.smali index 0d977e2f..42a84c69 100644 --- a/smali/android/support/customview/R$dimen.smali +++ b/smali/android/support/customview/R$dimen.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/customview/R$dimen; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -63,6 +64,7 @@ .method private constructor ()V .locals 0 + .line 37 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/customview/R$drawable.smali b/smali/android/support/customview/R$drawable.smali index 685077fe..b8ca31bf 100644 --- a/smali/android/support/customview/R$drawable.smali +++ b/smali/android/support/customview/R$drawable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/customview/R$drawable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -43,6 +44,7 @@ .method private constructor ()V .locals 0 + .line 63 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/customview/R$id.smali b/smali/android/support/customview/R$id.smali index c6da9dd7..d05adb45 100644 --- a/smali/android/support/customview/R$id.smali +++ b/smali/android/support/customview/R$id.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/customview/R$id; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -75,6 +76,7 @@ .method private constructor ()V .locals 0 + .line 79 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/customview/R$integer.smali b/smali/android/support/customview/R$integer.smali index 370bbe5c..9977f067 100644 --- a/smali/android/support/customview/R$integer.smali +++ b/smali/android/support/customview/R$integer.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/customview/R$integer; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -21,6 +22,7 @@ .method private constructor ()V .locals 0 + .line 111 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/customview/R$layout.smali b/smali/android/support/customview/R$layout.smali index babc0f54..b41e75aa 100644 --- a/smali/android/support/customview/R$layout.smali +++ b/smali/android/support/customview/R$layout.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/customview/R$layout; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -31,6 +32,7 @@ .method private constructor ()V .locals 0 + .line 116 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/customview/R$string.smali b/smali/android/support/customview/R$string.smali index 48263a28..4fc8e0b5 100644 --- a/smali/android/support/customview/R$string.smali +++ b/smali/android/support/customview/R$string.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/customview/R$string; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -21,6 +22,7 @@ .method private constructor ()V .locals 0 + .line 126 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/customview/R$style.smali b/smali/android/support/customview/R$style.smali index b484239c..e87bee15 100644 --- a/smali/android/support/customview/R$style.smali +++ b/smali/android/support/customview/R$style.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/customview/R$style; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -33,6 +34,7 @@ .method private constructor ()V .locals 0 + .line 131 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/customview/R$styleable.smali b/smali/android/support/customview/R$styleable.smali index bc313bbf..94e6ae9e 100644 --- a/smali/android/support/customview/R$styleable.smali +++ b/smali/android/support/customview/R$styleable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/customview/R$styleable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -92,11 +93,12 @@ # direct methods -.method public static constructor ()V +.method static constructor ()V .locals 1 const/4 v0, 0x3 + .line 144 new-array v0, v0, [I fill-array-data v0, :array_0 @@ -105,6 +107,7 @@ const/4 v0, 0x6 + .line 148 new-array v0, v0, [I fill-array-data v0, :array_1 @@ -113,6 +116,7 @@ const/16 v0, 0xa + .line 155 new-array v0, v0, [I fill-array-data v0, :array_2 @@ -121,6 +125,7 @@ const/16 v0, 0xc + .line 166 new-array v0, v0, [I fill-array-data v0, :array_3 @@ -129,6 +134,7 @@ const/4 v0, 0x2 + .line 179 new-array v0, v0, [I fill-array-data v0, :array_4 @@ -196,6 +202,7 @@ .method private constructor ()V .locals 0 + .line 142 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/customview/R.smali b/smali/android/support/customview/R.smali index aa04f391..df786390 100644 --- a/smali/android/support/customview/R.smali +++ b/smali/android/support/customview/R.smali @@ -1,20 +1,21 @@ .class public final Landroid/support/customview/R; .super Ljava/lang/Object; +.source "R.java" # annotations .annotation system Ldalvik/annotation/MemberClasses; value = { - Landroid/support/customview/R$attr;, - Landroid/support/customview/R$color;, - Landroid/support/customview/R$dimen;, - Landroid/support/customview/R$drawable;, - Landroid/support/customview/R$id;, - Landroid/support/customview/R$integer;, - Landroid/support/customview/R$layout;, - Landroid/support/customview/R$string;, + Landroid/support/customview/R$styleable;, Landroid/support/customview/R$style;, - Landroid/support/customview/R$styleable; + Landroid/support/customview/R$string;, + Landroid/support/customview/R$layout;, + Landroid/support/customview/R$integer;, + Landroid/support/customview/R$id;, + Landroid/support/customview/R$drawable;, + Landroid/support/customview/R$dimen;, + Landroid/support/customview/R$color;, + Landroid/support/customview/R$attr; } .end annotation @@ -23,6 +24,7 @@ .method private constructor ()V .locals 0 + .line 10 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/design/widget/CoordinatorLayout$AttachedBehavior.smali b/smali/android/support/design/widget/CoordinatorLayout$AttachedBehavior.smali index fda5cd4c..8b9539cd 100644 --- a/smali/android/support/design/widget/CoordinatorLayout$AttachedBehavior.smali +++ b/smali/android/support/design/widget/CoordinatorLayout$AttachedBehavior.smali @@ -16,4 +16,6 @@ # virtual methods .method public abstract getBehavior()Landroid/support/design/widget/CoordinatorLayout$Behavior; + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method diff --git a/smali/android/support/design/widget/CoordinatorLayout$Behavior.smali b/smali/android/support/design/widget/CoordinatorLayout$Behavior.smali index 2df1b4eb..5cd048c1 100644 --- a/smali/android/support/design/widget/CoordinatorLayout$Behavior.smali +++ b/smali/android/support/design/widget/CoordinatorLayout$Behavior.smali @@ -44,6 +44,12 @@ .method public static getTag(Landroid/view/View;)Ljava/lang/Object; .locals 0 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 2318 invoke-virtual {p0}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams; @@ -60,6 +66,14 @@ .method public static setTag(Landroid/view/View;Ljava/lang/Object;)V .locals 0 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 2305 invoke-virtual {p0}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams; @@ -78,6 +92,14 @@ # virtual methods .method public blocksInteractionBelow(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;)Z .locals 0 + .param p1 # Landroid/support/design/widget/CoordinatorLayout; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -110,6 +132,18 @@ .method public getInsetDodgeRect(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;Landroid/graphics/Rect;)Z .locals 0 + .param p1 # Landroid/support/design/widget/CoordinatorLayout; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -127,6 +161,17 @@ .method public getScrimColor(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;)I .locals 0 + .param p1 # Landroid/support/design/widget/CoordinatorLayout; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -142,6 +187,19 @@ .method public getScrimOpacity(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;)F .locals 0 + .param p1 # Landroid/support/design/widget/CoordinatorLayout; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/FloatRange; + from = 0.0 + to = 1.0 + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -157,6 +215,18 @@ .method public layoutDependsOn(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/View;)Z .locals 0 + .param p1 # Landroid/support/design/widget/CoordinatorLayout; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -174,6 +244,21 @@ .method public onApplyWindowInsets(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;Landroid/support/v4/view/WindowInsetsCompat;)Landroid/support/v4/view/WindowInsetsCompat; .locals 0 + .param p1 # Landroid/support/design/widget/CoordinatorLayout; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/support/v4/view/WindowInsetsCompat; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -190,12 +275,28 @@ .method public onAttachedToLayoutParams(Landroid/support/design/widget/CoordinatorLayout$LayoutParams;)V .locals 0 + .param p1 # Landroid/support/design/widget/CoordinatorLayout$LayoutParams; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param return-void .end method .method public onDependentViewChanged(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/View;)Z .locals 0 + .param p1 # Landroid/support/design/widget/CoordinatorLayout; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -213,6 +314,18 @@ .method public onDependentViewRemoved(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/View;)V .locals 0 + .param p1 # Landroid/support/design/widget/CoordinatorLayout; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -234,6 +347,18 @@ .method public onInterceptTouchEvent(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/MotionEvent;)Z .locals 0 + .param p1 # Landroid/support/design/widget/CoordinatorLayout; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/view/MotionEvent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -251,6 +376,14 @@ .method public onLayoutChild(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;I)Z .locals 0 + .param p1 # Landroid/support/design/widget/CoordinatorLayout; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -266,6 +399,14 @@ .method public onMeasureChild(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;IIII)Z .locals 0 + .param p1 # Landroid/support/design/widget/CoordinatorLayout; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -281,6 +422,18 @@ .method public onNestedFling(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/View;FFZ)Z .locals 0 + .param p1 # Landroid/support/design/widget/CoordinatorLayout; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -298,6 +451,18 @@ .method public onNestedPreFling(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/View;FF)Z .locals 0 + .param p1 # Landroid/support/design/widget/CoordinatorLayout; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -315,6 +480,22 @@ .method public onNestedPreScroll(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/View;II[I)V .locals 0 + .param p1 # Landroid/support/design/widget/CoordinatorLayout; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p6 # [I + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -333,6 +514,22 @@ .method public onNestedPreScroll(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/View;II[II)V .locals 0 + .param p1 # Landroid/support/design/widget/CoordinatorLayout; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p6 # [I + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -354,6 +551,18 @@ .method public onNestedScroll(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/View;IIII)V .locals 0 + .param p1 # Landroid/support/design/widget/CoordinatorLayout; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -372,6 +581,18 @@ .method public onNestedScroll(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/View;IIIII)V .locals 0 + .param p1 # Landroid/support/design/widget/CoordinatorLayout; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -393,6 +614,22 @@ .method public onNestedScrollAccepted(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/View;Landroid/view/View;I)V .locals 0 + .param p1 # Landroid/support/design/widget/CoordinatorLayout; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -412,6 +649,22 @@ .method public onNestedScrollAccepted(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/View;Landroid/view/View;II)V .locals 0 + .param p1 # Landroid/support/design/widget/CoordinatorLayout; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -434,6 +687,18 @@ .method public onRequestChildRectangleOnScreen(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;Landroid/graphics/Rect;Z)Z .locals 0 + .param p1 # Landroid/support/design/widget/CoordinatorLayout; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -451,6 +716,18 @@ .method public onRestoreInstanceState(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;Landroid/os/Parcelable;)V .locals 0 + .param p1 # Landroid/support/design/widget/CoordinatorLayout; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/os/Parcelable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -466,6 +743,17 @@ .method public onSaveInstanceState(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;)Landroid/os/Parcelable; .locals 0 + .param p1 # Landroid/support/design/widget/CoordinatorLayout; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -483,6 +771,22 @@ .method public onStartNestedScroll(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/View;Landroid/view/View;I)Z .locals 0 + .param p1 # Landroid/support/design/widget/CoordinatorLayout; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -504,6 +808,22 @@ .method public onStartNestedScroll(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/View;Landroid/view/View;II)Z .locals 0 + .param p1 # Landroid/support/design/widget/CoordinatorLayout; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -532,6 +852,18 @@ .method public onStopNestedScroll(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/View;)V .locals 0 + .param p1 # Landroid/support/design/widget/CoordinatorLayout; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -550,6 +882,18 @@ .method public onStopNestedScroll(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/View;I)V .locals 0 + .param p1 # Landroid/support/design/widget/CoordinatorLayout; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -571,6 +915,18 @@ .method public onTouchEvent(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/MotionEvent;)Z .locals 0 + .param p1 # Landroid/support/design/widget/CoordinatorLayout; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/view/MotionEvent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", diff --git a/smali/android/support/design/widget/CoordinatorLayout$DispatchChangeEvent.smali b/smali/android/support/design/widget/CoordinatorLayout$DispatchChangeEvent.smali index 92541a46..2834597c 100644 --- a/smali/android/support/design/widget/CoordinatorLayout$DispatchChangeEvent.smali +++ b/smali/android/support/design/widget/CoordinatorLayout$DispatchChangeEvent.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/design/widget/CoordinatorLayout; .end annotation diff --git a/smali/android/support/design/widget/CoordinatorLayout$LayoutParams.smali b/smali/android/support/design/widget/CoordinatorLayout$LayoutParams.smali index ed8e717c..a1489721 100644 --- a/smali/android/support/design/widget/CoordinatorLayout$LayoutParams.smali +++ b/smali/android/support/design/widget/CoordinatorLayout$LayoutParams.smali @@ -96,6 +96,14 @@ .method constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V .locals 4 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 2782 invoke-direct {p0, p1, p2}, Landroid/view/ViewGroup$MarginLayoutParams;->(Landroid/content/Context;Landroid/util/AttributeSet;)V @@ -202,6 +210,9 @@ iput-boolean v0, p0, Landroid/support/design/widget/CoordinatorLayout$LayoutParams;->mBehaviorResolved:Z + .line 2804 + iget-boolean v0, p0, Landroid/support/design/widget/CoordinatorLayout$LayoutParams;->mBehaviorResolved:Z + if-eqz v0, :cond_0 .line 2805 @@ -368,6 +379,9 @@ iput-object v0, p0, Landroid/support/design/widget/CoordinatorLayout$LayoutParams;->mAnchorView:Landroid/view/View; + .line 3049 + iget-object v0, p0, Landroid/support/design/widget/CoordinatorLayout$LayoutParams;->mAnchorView:Landroid/view/View; + const/4 v1, 0x0 if-eqz v0, :cond_6 @@ -512,13 +526,9 @@ invoke-direct {v0, p1}, Ljava/lang/IllegalStateException;->(Ljava/lang/String;)V - goto :goto_2 - - :goto_1 throw v0 - :goto_2 - goto :goto_1 + return-void .end method .method private shouldDodge(Landroid/view/View;I)Z @@ -774,6 +784,8 @@ .method public getAnchorId()I .locals 1 + .annotation build Landroid/support/annotation/IdRes; + .end annotation .line 2835 iget v0, p0, Landroid/support/design/widget/CoordinatorLayout$LayoutParams;->mAnchorId:I @@ -783,6 +795,8 @@ .method public getBehavior()Landroid/support/design/widget/CoordinatorLayout$Behavior; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 2861 iget-object v0, p0, Landroid/support/design/widget/CoordinatorLayout$LayoutParams;->mBehavior:Landroid/support/design/widget/CoordinatorLayout$Behavior; @@ -918,6 +932,10 @@ .method public setAnchorId(I)V .locals 0 + .param p1 # I + .annotation build Landroid/support/annotation/IdRes; + .end annotation + .end param .line 2849 invoke-virtual {p0}, Landroid/support/design/widget/CoordinatorLayout$LayoutParams;->invalidateAnchor()V @@ -930,6 +948,10 @@ .method public setBehavior(Landroid/support/design/widget/CoordinatorLayout$Behavior;)V .locals 1 + .param p1 # Landroid/support/design/widget/CoordinatorLayout$Behavior; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 2874 iget-object v0, p0, Landroid/support/design/widget/CoordinatorLayout$LayoutParams;->mBehavior:Landroid/support/design/widget/CoordinatorLayout$Behavior; diff --git a/smali/android/support/design/widget/CoordinatorLayout.smali b/smali/android/support/design/widget/CoordinatorLayout.smali index 1e09d20c..d0bdb0c8 100644 --- a/smali/android/support/design/widget/CoordinatorLayout.smali +++ b/smali/android/support/design/widget/CoordinatorLayout.smali @@ -204,11 +204,11 @@ :goto_1 const/4 v0, 0x2 + .line 131 new-array v0, v0, [Ljava/lang/Class; const/4 v1, 0x0 - .line 131 const-class v2, Landroid/content/Context; aput-object v2, v0, v1 @@ -242,6 +242,10 @@ .method public constructor (Landroid/content/Context;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 v0, 0x0 @@ -253,6 +257,14 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 201 sget v0, Landroid/support/coordinatorlayout/R$attr;->coordinatorLayoutStyle:I @@ -264,6 +276,18 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;I)V .locals 3 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # I + .annotation build Landroid/support/annotation/AttrRes; + .end annotation + .end param .line 206 invoke-direct {p0, p1, p2, p3}, Landroid/view/ViewGroup;->(Landroid/content/Context;Landroid/util/AttributeSet;I)V @@ -298,9 +322,9 @@ const/4 v0, 0x2 + .line 171 new-array v0, v0, [I - .line 171 iput-object v0, p0, Landroid/support/design/widget/CoordinatorLayout;->mTempIntPair:[I .line 193 @@ -416,6 +440,8 @@ .method private static acquireTempRect()Landroid/graphics/Rect; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 154 sget-object v0, Landroid/support/design/widget/CoordinatorLayout;->sRectPool:Landroid/support/v4/util/Pools$Pool; @@ -1366,7 +1392,7 @@ if-gtz v0, :cond_1 - goto/16 :goto_4 + goto/16 :goto_3 .line 1390 :cond_1 @@ -1651,13 +1677,10 @@ invoke-direct {p0, p1, p3}, Landroid/support/design/widget/CoordinatorLayout;->setInsetOffsetX(Landroid/view/View;I)V - goto :goto_3 + const/4 v1, 0x1 :cond_9 - move v4, v1 - - :goto_3 - if-nez v4, :cond_a + if-nez v1, :cond_a .line 1454 invoke-direct {p0, p1, v5}, Landroid/support/design/widget/CoordinatorLayout;->setInsetOffsetX(Landroid/view/View;I)V @@ -1667,7 +1690,7 @@ invoke-static {v2}, Landroid/support/design/widget/CoordinatorLayout;->releaseTempRect(Landroid/graphics/Rect;)V :cond_b - :goto_4 + :goto_3 return-void .end method @@ -1732,21 +1755,23 @@ invoke-static {v1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z - move-result v2 + move-result v1 - if-nez v2, :cond_3 + if-nez v1, :cond_3 - new-instance v2, Ljava/lang/StringBuilder; + new-instance v1, Ljava/lang/StringBuilder; - invoke-direct {v2}, Ljava/lang/StringBuilder;->()V + invoke-direct {v1}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + sget-object v2, Landroid/support/design/widget/CoordinatorLayout;->WIDGET_PACKAGE_NAME:Ljava/lang/String; - invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder; + invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v2, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder; - invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; move-result-object p2 @@ -1758,68 +1783,70 @@ invoke-virtual {v0}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object; - move-result-object v1 + move-result-object v0 - check-cast v1, Ljava/util/Map; + check-cast v0, Ljava/util/Map; - if-nez v1, :cond_4 + if-nez v0, :cond_4 .line 609 - new-instance v1, Ljava/util/HashMap; + new-instance v0, Ljava/util/HashMap; - invoke-direct {v1}, Ljava/util/HashMap;->()V + invoke-direct {v0}, Ljava/util/HashMap;->()V .line 610 - invoke-virtual {v0, v1}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V + sget-object v1, Landroid/support/design/widget/CoordinatorLayout;->sConstructors:Ljava/lang/ThreadLocal; + + invoke-virtual {v1, v0}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V .line 612 :cond_4 - invoke-interface {v1, p2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v0, p2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v0 + move-result-object v1 - check-cast v0, Ljava/lang/reflect/Constructor; + check-cast v1, Ljava/lang/reflect/Constructor; const/4 v2, 0x1 - if-nez v0, :cond_5 + if-nez v1, :cond_5 .line 614 invoke-virtual {p0}, Landroid/content/Context;->getClassLoader()Ljava/lang/ClassLoader; - move-result-object v0 + move-result-object v1 .line 615 - invoke-virtual {v0, p2}, Ljava/lang/ClassLoader;->loadClass(Ljava/lang/String;)Ljava/lang/Class; + invoke-virtual {v1, p2}, Ljava/lang/ClassLoader;->loadClass(Ljava/lang/String;)Ljava/lang/Class; - move-result-object v0 + move-result-object v1 .line 616 sget-object v3, Landroid/support/design/widget/CoordinatorLayout;->CONSTRUCTOR_PARAMS:[Ljava/lang/Class; - invoke-virtual {v0, v3}, Ljava/lang/Class;->getConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor; + invoke-virtual {v1, v3}, Ljava/lang/Class;->getConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor; - move-result-object v0 + move-result-object v1 .line 617 - invoke-virtual {v0, v2}, Ljava/lang/reflect/Constructor;->setAccessible(Z)V + invoke-virtual {v1, v2}, Ljava/lang/reflect/Constructor;->setAccessible(Z)V .line 618 - invoke-interface {v1, p2, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v0, p2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; :cond_5 - const/4 v1, 0x2 + const/4 v0, 0x2 - new-array v1, v1, [Ljava/lang/Object; + .line 620 + new-array v0, v0, [Ljava/lang/Object; const/4 v3, 0x0 - aput-object p0, v1, v3 + aput-object p0, v0, v3 - aput-object p1, v1, v2 + aput-object p1, v0, v2 - .line 620 - invoke-virtual {v0, v1}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object; + invoke-virtual {v1, v0}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object; move-result-object p0 @@ -1883,17 +1910,19 @@ const/4 v7, 0x0 + move-object v10, v7 + + const/4 v7, 0x0 + const/4 v8, 0x0 const/4 v9, 0x0 - const/4 v10, 0x0 - :goto_0 - if-ge v8, v5, :cond_a + if-ge v7, v5, :cond_b .line 445 - invoke-interface {v4, v8}, Ljava/util/List;->get(I)Ljava/lang/Object; + invoke-interface {v4, v7}, Ljava/util/List;->get(I)Ljava/lang/Object; move-result-object v11 @@ -1913,16 +1942,16 @@ const/4 v14, 0x1 - if-nez v9, :cond_0 + if-nez v8, :cond_0 - if-eqz v10, :cond_4 + if-eqz v9, :cond_4 :cond_0 if-eqz v3, :cond_4 - if-eqz v13, :cond_9 + if-eqz v13, :cond_a - if-nez v7, :cond_1 + if-nez v10, :cond_1 .line 454 invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J @@ -1942,7 +1971,7 @@ .line 455 invoke-static/range {v15 .. v22}, Landroid/view/MotionEvent;->obtain(JJIFFI)Landroid/view/MotionEvent; - move-result-object v7 + move-result-object v10 :cond_1 if-eqz v2, :cond_3 @@ -1953,18 +1982,18 @@ .line 463 :cond_2 - invoke-virtual {v13, v0, v11, v7}, Landroid/support/design/widget/CoordinatorLayout$Behavior;->onTouchEvent(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/MotionEvent;)Z + invoke-virtual {v13, v0, v11, v10}, Landroid/support/design/widget/CoordinatorLayout$Behavior;->onTouchEvent(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/MotionEvent;)Z goto :goto_3 .line 460 :cond_3 - invoke-virtual {v13, v0, v11, v7}, Landroid/support/design/widget/CoordinatorLayout$Behavior;->onInterceptTouchEvent(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/MotionEvent;)Z + invoke-virtual {v13, v0, v11, v10}, Landroid/support/design/widget/CoordinatorLayout$Behavior;->onInterceptTouchEvent(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/MotionEvent;)Z goto :goto_3 :cond_4 - if-nez v9, :cond_7 + if-nez v8, :cond_7 if-eqz v13, :cond_7 @@ -1978,7 +2007,7 @@ :cond_5 invoke-virtual {v13, v0, v11, v1}, Landroid/support/design/widget/CoordinatorLayout$Behavior;->onTouchEvent(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/MotionEvent;)Z - move-result v9 + move-result v8 goto :goto_1 @@ -1986,10 +2015,10 @@ :cond_6 invoke-virtual {v13, v0, v11, v1}, Landroid/support/design/widget/CoordinatorLayout$Behavior;->onInterceptTouchEvent(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/MotionEvent;)Z - move-result v9 + move-result v8 :goto_1 - if-eqz v9, :cond_7 + if-eqz v8, :cond_7 .line 480 iput-object v11, v0, Landroid/support/design/widget/CoordinatorLayout;->mBehaviorTouchView:Landroid/view/View; @@ -1998,7 +2027,7 @@ :cond_7 invoke-virtual {v12}, Landroid/support/design/widget/CoordinatorLayout$LayoutParams;->didBlockInteraction()Z - move-result v10 + move-result v9 .line 487 invoke-virtual {v12, v0, v11}, Landroid/support/design/widget/CoordinatorLayout$LayoutParams;->isBlockingInteractionBelow(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;)Z @@ -2007,34 +2036,35 @@ if-eqz v11, :cond_8 - if-nez v10, :cond_8 - - const/4 v10, 0x1 + if-nez v9, :cond_8 goto :goto_2 :cond_8 - const/4 v10, 0x0 + const/4 v14, 0x0 :goto_2 if-eqz v11, :cond_9 - if-nez v10, :cond_9 + if-nez v14, :cond_9 goto :goto_4 :cond_9 + move v9, v14 + + :cond_a :goto_3 - add-int/lit8 v8, v8, 0x1 + add-int/lit8 v7, v7, 0x1 goto :goto_0 .line 496 - :cond_a + :cond_b :goto_4 invoke-interface {v4}, Ljava/util/List;->clear()V - return v9 + return v8 .end method .method private prepareChildren()V @@ -2155,6 +2185,10 @@ .method private static releaseTempRect(Landroid/graphics/Rect;)V .locals 1 + .param p0 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 162 invoke-virtual {p0}, Landroid/graphics/Rect;->setEmpty()V @@ -2506,6 +2540,10 @@ .method public dispatchDependentViewsChanged(Landroid/view/View;)V .locals 4 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1489 iget-object v0, p0, Landroid/support/design/widget/CoordinatorLayout;->mChildDag:Landroid/support/v4/widget/DirectedAcyclicGraph; @@ -2568,6 +2606,14 @@ .method public doViewsOverlap(Landroid/view/View;Landroid/view/View;)Z .locals 4 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1686 invoke-virtual {p1}, Landroid/view/View;->getVisibility()I @@ -3124,6 +3170,13 @@ .method public getDependencies(Landroid/view/View;)Ljava/util/List; .locals 1 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -3163,6 +3216,9 @@ .method final getDependencySortedChildren()Ljava/util/List; .locals 1 + .annotation build Landroid/support/annotation/VisibleForTesting; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "()", @@ -3187,6 +3243,13 @@ .method public getDependents(Landroid/view/View;)Ljava/util/List; .locals 1 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -3300,6 +3363,11 @@ .method public final getLastWindowInsets()Landroid/support/v4/view/WindowInsetsCompat; .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 374 iget-object v0, p0, Landroid/support/design/widget/CoordinatorLayout;->mLastInsets:Landroid/support/v4/view/WindowInsetsCompat; @@ -3477,6 +3545,8 @@ .method public getStatusBarBackground()Landroid/graphics/drawable/Drawable; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 300 iget-object v0, p0, Landroid/support/design/widget/CoordinatorLayout;->mStatusBarBackground:Landroid/graphics/drawable/Drawable; @@ -3536,6 +3606,10 @@ .method public isPointInChildBounds(Landroid/view/View;II)Z .locals 1 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1668 invoke-static {}, Landroid/support/design/widget/CoordinatorLayout;->acquireTempRect()Landroid/graphics/Rect; @@ -4338,6 +4412,10 @@ .method public onLayoutChild(Landroid/view/View;I)V .locals 2 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 860 invoke-virtual {p1}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams; @@ -4504,21 +4582,21 @@ move-result v6 - move v5, v0 - - move v4, v1 + move v4, v0 - const/4 v2, 0x0 + move v2, v1 const/4 v3, 0x0 + const/4 v5, 0x0 + :goto_2 - if-ge v3, v6, :cond_d + if-ge v5, v6, :cond_d .line 763 iget-object v0, v7, Landroid/support/design/widget/CoordinatorLayout;->mDependencySortedChildren:Ljava/util/List; - invoke-interface {v0, v3}, Ljava/util/List;->get(I)Ljava/lang/Object; + invoke-interface {v0, v5}, Ljava/util/List;->get(I)Ljava/lang/Object; move-result-object v0 @@ -4535,12 +4613,10 @@ if-ne v0, v1, :cond_2 - move/from16 v22, v3 + move/from16 v22, v5 move/from16 v29, v6 - move/from16 v28, v8 - goto/16 :goto_6 .line 769 @@ -4736,17 +4812,15 @@ move-object/from16 v2, v20 - move/from16 v22, v3 + move/from16 v27, v3 move v3, v11 - move/from16 v27, v4 + move/from16 v28, v4 move/from16 v4, v21 - move/from16 v28, v8 - - move v8, v5 + move/from16 v22, v5 move/from16 v5, v23 @@ -4766,17 +4840,15 @@ :cond_b move-object/from16 v26, v1 - move/from16 v27, v4 + move/from16 v27, v3 - move/from16 v29, v6 + move/from16 v28, v4 - move/from16 v28, v8 + move/from16 v29, v6 move/from16 v25, v22 - move/from16 v22, v3 - - move v8, v5 + move/from16 v22, v5 :goto_5 const/4 v5, 0x0 @@ -4812,7 +4884,9 @@ add-int/2addr v0, v2 - invoke-static {v8, v0}, Ljava/lang/Math;->max(II)I + move/from16 v2, v28 + + invoke-static {v2, v0}, Ljava/lang/Math;->max(II)I move-result v0 @@ -4831,7 +4905,7 @@ add-int/2addr v2, v1 - move/from16 v1, v27 + move/from16 v1, v25 invoke-static {v1, v2}, Ljava/lang/Math;->max(II)I @@ -4842,40 +4916,40 @@ move-result v2 - move/from16 v11, v25 + move/from16 v11, v27 invoke-static {v11, v2}, Landroid/view/View;->combineMeasuredStates(II)I move-result v2 - move v5, v0 + move v4, v0 + + move v3, v2 - move v4, v1 + move v2, v1 :goto_6 - add-int/lit8 v3, v22, 0x1 - - move/from16 v8, v28 + add-int/lit8 v5, v22, 0x1 move/from16 v6, v29 goto/16 :goto_2 :cond_d - move v11, v2 + move v1, v2 - move v1, v4 + move v11, v3 - move v8, v5 + move v2, v4 const/high16 v0, -0x1000000 and-int/2addr v0, v11 - move/from16 v2, p1 + move/from16 v3, p1 .line 817 - invoke-static {v8, v2, v0}, Landroid/view/View;->resolveSizeAndState(III)I + invoke-static {v2, v3, v0}, Landroid/view/View;->resolveSizeAndState(III)I move-result v0 @@ -5192,11 +5266,11 @@ .line 1875 invoke-virtual/range {v0 .. v7}, Landroid/support/design/widget/CoordinatorLayout$Behavior;->onNestedPreScroll(Landroid/support/design/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/View;II[II)V + if-lez p2, :cond_2 + .line 1877 iget-object v0, v8, Landroid/support/design/widget/CoordinatorLayout;->mTempIntPair:[I - if-lez p2, :cond_2 - aget v0, v0, v10 invoke-static {v12, v0}, Ljava/lang/Math;->max(II)I @@ -5206,6 +5280,8 @@ goto :goto_1 :cond_2 + iget-object v0, v8, Landroid/support/design/widget/CoordinatorLayout;->mTempIntPair:[I + aget v0, v0, v10 .line 1878 @@ -5214,31 +5290,33 @@ move-result v0 :goto_1 - move v12, v0 + if-lez p3, :cond_3 .line 1879 - iget-object v0, v8, Landroid/support/design/widget/CoordinatorLayout;->mTempIntPair:[I - - if-lez p3, :cond_3 + iget-object v1, v8, Landroid/support/design/widget/CoordinatorLayout;->mTempIntPair:[I - aget v0, v0, v14 + aget v1, v1, v14 - invoke-static {v13, v0}, Ljava/lang/Math;->max(II)I + invoke-static {v13, v1}, Ljava/lang/Math;->max(II)I - move-result v0 + move-result v1 goto :goto_2 :cond_3 - aget v0, v0, v14 + iget-object v1, v8, Landroid/support/design/widget/CoordinatorLayout;->mTempIntPair:[I + + aget v1, v1, v14 .line 1880 - invoke-static {v13, v0}, Ljava/lang/Math;->min(II)I + invoke-static {v13, v1}, Ljava/lang/Math;->min(II)I - move-result v0 + move-result v1 :goto_2 - move v13, v0 + move v12, v0 + + move v13, v1 const/4 v0, 0x1 @@ -5715,11 +5793,13 @@ move-result v0 - or-int/2addr v11, v0 + or-int v1, v11, v0 .line 1749 invoke-virtual {v13, v7, v0}, Landroid/support/design/widget/CoordinatorLayout$LayoutParams;->setNestedScrollAccepted(IZ)V + move v11, v1 + goto :goto_1 .line 1751 @@ -6080,6 +6160,10 @@ .method public setStatusBarBackground(Landroid/graphics/drawable/Drawable;)V .locals 2 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 275 iget-object v0, p0, Landroid/support/design/widget/CoordinatorLayout;->mStatusBarBackground:Landroid/graphics/drawable/Drawable; @@ -6104,10 +6188,13 @@ :cond_1 iput-object v1, p0, Landroid/support/design/widget/CoordinatorLayout;->mStatusBarBackground:Landroid/graphics/drawable/Drawable; - if-eqz v1, :cond_4 + .line 280 + iget-object p1, p0, Landroid/support/design/widget/CoordinatorLayout;->mStatusBarBackground:Landroid/graphics/drawable/Drawable; + + if-eqz p1, :cond_4 .line 281 - invoke-virtual {v1}, Landroid/graphics/drawable/Drawable;->isStateful()Z + invoke-virtual {p1}, Landroid/graphics/drawable/Drawable;->isStateful()Z move-result p1 @@ -6170,6 +6257,10 @@ .method public setStatusBarBackgroundColor(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param .line 353 new-instance v0, Landroid/graphics/drawable/ColorDrawable; @@ -6183,6 +6274,10 @@ .method public setStatusBarBackgroundResource(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param if-eqz p1, :cond_0 @@ -6282,9 +6377,11 @@ :goto_0 iput-boolean v2, p0, Landroid/support/design/widget/CoordinatorLayout;->mDrawStatusBarBackground:Z + .line 360 + iget-boolean v2, p0, Landroid/support/design/widget/CoordinatorLayout;->mDrawStatusBarBackground:Z + if-nez v2, :cond_1 - .line 360 invoke-virtual {p0}, Landroid/support/design/widget/CoordinatorLayout;->getBackground()Landroid/graphics/drawable/Drawable; move-result-object v2 diff --git a/smali/android/support/documentfile/R.smali b/smali/android/support/documentfile/R.smali index c1ff0ee1..ab98fdc0 100644 --- a/smali/android/support/documentfile/R.smali +++ b/smali/android/support/documentfile/R.smali @@ -1,11 +1,13 @@ .class public final Landroid/support/documentfile/R; .super Ljava/lang/Object; +.source "R.java" # direct methods .method private constructor ()V .locals 0 + .line 10 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/drawerlayout/R$attr.smali b/smali/android/support/drawerlayout/R$attr.smali index 45f1c3c7..f05a9652 100644 --- a/smali/android/support/drawerlayout/R$attr.smali +++ b/smali/android/support/drawerlayout/R$attr.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/drawerlayout/R$attr; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -43,6 +44,7 @@ .method private constructor ()V .locals 0 + .line 13 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/drawerlayout/R$color.smali b/smali/android/support/drawerlayout/R$color.smali index eb5b5f8f..c4d16960 100644 --- a/smali/android/support/drawerlayout/R$color.smali +++ b/smali/android/support/drawerlayout/R$color.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/drawerlayout/R$color; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -27,6 +28,7 @@ .method private constructor ()V .locals 0 + .line 29 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/drawerlayout/R$dimen.smali b/smali/android/support/drawerlayout/R$dimen.smali index 7bfd3f8b..0dc926f0 100644 --- a/smali/android/support/drawerlayout/R$dimen.smali +++ b/smali/android/support/drawerlayout/R$dimen.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/drawerlayout/R$dimen; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -63,6 +64,7 @@ .method private constructor ()V .locals 0 + .line 37 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/drawerlayout/R$drawable.smali b/smali/android/support/drawerlayout/R$drawable.smali index e425b0e2..57643fa7 100644 --- a/smali/android/support/drawerlayout/R$drawable.smali +++ b/smali/android/support/drawerlayout/R$drawable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/drawerlayout/R$drawable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -43,6 +44,7 @@ .method private constructor ()V .locals 0 + .line 63 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/drawerlayout/R$id.smali b/smali/android/support/drawerlayout/R$id.smali index 2a3a0f2c..7f2c8ffc 100644 --- a/smali/android/support/drawerlayout/R$id.smali +++ b/smali/android/support/drawerlayout/R$id.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/drawerlayout/R$id; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -75,6 +76,7 @@ .method private constructor ()V .locals 0 + .line 79 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/drawerlayout/R$integer.smali b/smali/android/support/drawerlayout/R$integer.smali index 4d9c79e8..fd3102a8 100644 --- a/smali/android/support/drawerlayout/R$integer.smali +++ b/smali/android/support/drawerlayout/R$integer.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/drawerlayout/R$integer; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -21,6 +22,7 @@ .method private constructor ()V .locals 0 + .line 111 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/drawerlayout/R$layout.smali b/smali/android/support/drawerlayout/R$layout.smali index d4977322..6b819101 100644 --- a/smali/android/support/drawerlayout/R$layout.smali +++ b/smali/android/support/drawerlayout/R$layout.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/drawerlayout/R$layout; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -31,6 +32,7 @@ .method private constructor ()V .locals 0 + .line 116 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/drawerlayout/R$string.smali b/smali/android/support/drawerlayout/R$string.smali index 32d0e391..38bde921 100644 --- a/smali/android/support/drawerlayout/R$string.smali +++ b/smali/android/support/drawerlayout/R$string.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/drawerlayout/R$string; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -21,6 +22,7 @@ .method private constructor ()V .locals 0 + .line 126 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/drawerlayout/R$style.smali b/smali/android/support/drawerlayout/R$style.smali index 558f2238..2f0e7ac1 100644 --- a/smali/android/support/drawerlayout/R$style.smali +++ b/smali/android/support/drawerlayout/R$style.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/drawerlayout/R$style; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -33,6 +34,7 @@ .method private constructor ()V .locals 0 + .line 131 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/drawerlayout/R$styleable.smali b/smali/android/support/drawerlayout/R$styleable.smali index 9fd8ef07..5f99622c 100644 --- a/smali/android/support/drawerlayout/R$styleable.smali +++ b/smali/android/support/drawerlayout/R$styleable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/drawerlayout/R$styleable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -92,11 +93,12 @@ # direct methods -.method public static constructor ()V +.method static constructor ()V .locals 1 const/4 v0, 0x3 + .line 144 new-array v0, v0, [I fill-array-data v0, :array_0 @@ -105,6 +107,7 @@ const/4 v0, 0x6 + .line 148 new-array v0, v0, [I fill-array-data v0, :array_1 @@ -113,6 +116,7 @@ const/16 v0, 0xa + .line 155 new-array v0, v0, [I fill-array-data v0, :array_2 @@ -121,6 +125,7 @@ const/16 v0, 0xc + .line 166 new-array v0, v0, [I fill-array-data v0, :array_3 @@ -129,6 +134,7 @@ const/4 v0, 0x2 + .line 179 new-array v0, v0, [I fill-array-data v0, :array_4 @@ -196,6 +202,7 @@ .method private constructor ()V .locals 0 + .line 142 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/drawerlayout/R.smali b/smali/android/support/drawerlayout/R.smali index c5974675..d528abc4 100644 --- a/smali/android/support/drawerlayout/R.smali +++ b/smali/android/support/drawerlayout/R.smali @@ -1,20 +1,21 @@ .class public final Landroid/support/drawerlayout/R; .super Ljava/lang/Object; +.source "R.java" # annotations .annotation system Ldalvik/annotation/MemberClasses; value = { - Landroid/support/drawerlayout/R$attr;, - Landroid/support/drawerlayout/R$color;, - Landroid/support/drawerlayout/R$dimen;, - Landroid/support/drawerlayout/R$drawable;, - Landroid/support/drawerlayout/R$id;, - Landroid/support/drawerlayout/R$integer;, - Landroid/support/drawerlayout/R$layout;, - Landroid/support/drawerlayout/R$string;, + Landroid/support/drawerlayout/R$styleable;, Landroid/support/drawerlayout/R$style;, - Landroid/support/drawerlayout/R$styleable; + Landroid/support/drawerlayout/R$string;, + Landroid/support/drawerlayout/R$layout;, + Landroid/support/drawerlayout/R$integer;, + Landroid/support/drawerlayout/R$id;, + Landroid/support/drawerlayout/R$drawable;, + Landroid/support/drawerlayout/R$dimen;, + Landroid/support/drawerlayout/R$color;, + Landroid/support/drawerlayout/R$attr; } .end annotation @@ -23,6 +24,7 @@ .method private constructor ()V .locals 0 + .line 10 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/fragment/R$attr.smali b/smali/android/support/fragment/R$attr.smali index 6a4ea3f7..202b7886 100644 --- a/smali/android/support/fragment/R$attr.smali +++ b/smali/android/support/fragment/R$attr.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/fragment/R$attr; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -61,6 +62,7 @@ .method private constructor ()V .locals 0 + .line 13 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/fragment/R$color.smali b/smali/android/support/fragment/R$color.smali index 878b4f10..f4b3556c 100644 --- a/smali/android/support/fragment/R$color.smali +++ b/smali/android/support/fragment/R$color.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/fragment/R$color; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -27,6 +28,7 @@ .method private constructor ()V .locals 0 + .line 38 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/fragment/R$dimen.smali b/smali/android/support/fragment/R$dimen.smali index ff6cfea8..08272e69 100644 --- a/smali/android/support/fragment/R$dimen.smali +++ b/smali/android/support/fragment/R$dimen.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/fragment/R$dimen; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -63,6 +64,7 @@ .method private constructor ()V .locals 0 + .line 46 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/fragment/R$drawable.smali b/smali/android/support/fragment/R$drawable.smali index 7575657f..fecb5c16 100644 --- a/smali/android/support/fragment/R$drawable.smali +++ b/smali/android/support/fragment/R$drawable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/fragment/R$drawable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -43,6 +44,7 @@ .method private constructor ()V .locals 0 + .line 72 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/fragment/R$id.smali b/smali/android/support/fragment/R$id.smali index 66502fc5..7913cc28 100644 --- a/smali/android/support/fragment/R$id.smali +++ b/smali/android/support/fragment/R$id.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/fragment/R$id; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -89,6 +90,7 @@ .method private constructor ()V .locals 0 + .line 88 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/fragment/R$integer.smali b/smali/android/support/fragment/R$integer.smali index 37586870..8700373b 100644 --- a/smali/android/support/fragment/R$integer.smali +++ b/smali/android/support/fragment/R$integer.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/fragment/R$integer; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -21,6 +22,7 @@ .method private constructor ()V .locals 0 + .line 127 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/fragment/R$layout.smali b/smali/android/support/fragment/R$layout.smali index f59bc495..8471a526 100644 --- a/smali/android/support/fragment/R$layout.smali +++ b/smali/android/support/fragment/R$layout.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/fragment/R$layout; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -31,6 +32,7 @@ .method private constructor ()V .locals 0 + .line 132 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/fragment/R$string.smali b/smali/android/support/fragment/R$string.smali index 225dbead..a76e971a 100644 --- a/smali/android/support/fragment/R$string.smali +++ b/smali/android/support/fragment/R$string.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/fragment/R$string; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -21,6 +22,7 @@ .method private constructor ()V .locals 0 + .line 142 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/fragment/R$style.smali b/smali/android/support/fragment/R$style.smali index 65c6763c..2ca1af3d 100644 --- a/smali/android/support/fragment/R$style.smali +++ b/smali/android/support/fragment/R$style.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/fragment/R$style; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -35,6 +36,7 @@ .method private constructor ()V .locals 0 + .line 147 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/fragment/R$styleable.smali b/smali/android/support/fragment/R$styleable.smali index 0b416233..b69cc910 100644 --- a/smali/android/support/fragment/R$styleable.smali +++ b/smali/android/support/fragment/R$styleable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/fragment/R$styleable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -114,11 +115,12 @@ # direct methods -.method public static constructor ()V +.method static constructor ()V .locals 2 const/4 v0, 0x3 + .line 161 new-array v0, v0, [I fill-array-data v0, :array_0 @@ -127,6 +129,7 @@ const/4 v0, 0x2 + .line 165 new-array v1, v0, [I fill-array-data v1, :array_1 @@ -135,6 +138,7 @@ const/4 v1, 0x7 + .line 168 new-array v1, v1, [I fill-array-data v1, :array_2 @@ -143,6 +147,7 @@ const/4 v1, 0x6 + .line 176 new-array v1, v1, [I fill-array-data v1, :array_3 @@ -151,6 +156,7 @@ const/16 v1, 0xa + .line 183 new-array v1, v1, [I fill-array-data v1, :array_4 @@ -159,12 +165,14 @@ const/16 v1, 0xc + .line 194 new-array v1, v1, [I fill-array-data v1, :array_5 sput-object v1, Landroid/support/fragment/R$styleable;->GradientColor:[I + .line 207 new-array v0, v0, [I fill-array-data v0, :array_6 @@ -247,6 +255,7 @@ .method private constructor ()V .locals 0 + .line 159 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/fragment/R.smali b/smali/android/support/fragment/R.smali index 2e95c2e6..747cd1a8 100644 --- a/smali/android/support/fragment/R.smali +++ b/smali/android/support/fragment/R.smali @@ -1,20 +1,21 @@ .class public final Landroid/support/fragment/R; .super Ljava/lang/Object; +.source "R.java" # annotations .annotation system Ldalvik/annotation/MemberClasses; value = { - Landroid/support/fragment/R$attr;, - Landroid/support/fragment/R$color;, - Landroid/support/fragment/R$dimen;, - Landroid/support/fragment/R$drawable;, - Landroid/support/fragment/R$id;, - Landroid/support/fragment/R$integer;, - Landroid/support/fragment/R$layout;, - Landroid/support/fragment/R$string;, + Landroid/support/fragment/R$styleable;, Landroid/support/fragment/R$style;, - Landroid/support/fragment/R$styleable; + Landroid/support/fragment/R$string;, + Landroid/support/fragment/R$layout;, + Landroid/support/fragment/R$integer;, + Landroid/support/fragment/R$id;, + Landroid/support/fragment/R$drawable;, + Landroid/support/fragment/R$dimen;, + Landroid/support/fragment/R$color;, + Landroid/support/fragment/R$attr; } .end annotation @@ -23,6 +24,7 @@ .method private constructor ()V .locals 0 + .line 10 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/graphics/drawable/AndroidResources.smali b/smali/android/support/graphics/drawable/AndroidResources.smali index 6f2fe709..dfa03564 100644 --- a/smali/android/support/graphics/drawable/AndroidResources.smali +++ b/smali/android/support/graphics/drawable/AndroidResources.smali @@ -17,8 +17,14 @@ .field static final STYLEABLE_ANIMATED_VECTOR_DRAWABLE_TARGET:[I .field static final STYLEABLE_ANIMATED_VECTOR_DRAWABLE_TARGET_ANIMATION:I = 0x1 + .annotation build Landroid/support/annotation/StyleableRes; + .end annotation +.end field .field static final STYLEABLE_ANIMATED_VECTOR_DRAWABLE_TARGET_NAME:I = 0x0 + .annotation build Landroid/support/annotation/StyleableRes; + .end annotation +.end field .field public static final STYLEABLE_ANIMATOR:[I @@ -165,104 +171,104 @@ const/16 v0, 0x9 + .line 22 new-array v0, v0, [I - .line 22 fill-array-data v0, :array_0 sput-object v0, Landroid/support/graphics/drawable/AndroidResources;->STYLEABLE_VECTOR_DRAWABLE_TYPE_ARRAY:[I const/16 v0, 0x8 + .line 36 new-array v1, v0, [I - .line 36 fill-array-data v1, :array_1 sput-object v1, Landroid/support/graphics/drawable/AndroidResources;->STYLEABLE_VECTOR_DRAWABLE_GROUP:[I const/16 v1, 0xe + .line 49 new-array v1, v1, [I - .line 49 fill-array-data v1, :array_2 sput-object v1, Landroid/support/graphics/drawable/AndroidResources;->STYLEABLE_VECTOR_DRAWABLE_PATH:[I const/4 v1, 0x2 + .line 70 new-array v2, v1, [I - .line 70 fill-array-data v2, :array_3 sput-object v2, Landroid/support/graphics/drawable/AndroidResources;->STYLEABLE_VECTOR_DRAWABLE_CLIP_PATH:[I const/4 v2, 0x1 + .line 76 new-array v3, v2, [I - const v4, 0x1010199 + const/4 v4, 0x0 - const/4 v5, 0x0 + const v5, 0x1010199 - aput v4, v3, v5 + aput v5, v3, v4 - .line 76 sput-object v3, Landroid/support/graphics/drawable/AndroidResources;->STYLEABLE_ANIMATED_VECTOR_DRAWABLE:[I + .line 80 new-array v1, v1, [I - .line 80 fill-array-data v1, :array_4 sput-object v1, Landroid/support/graphics/drawable/AndroidResources;->STYLEABLE_ANIMATED_VECTOR_DRAWABLE_TARGET:[I + .line 90 new-array v0, v0, [I - .line 90 fill-array-data v0, :array_5 sput-object v0, Landroid/support/graphics/drawable/AndroidResources;->STYLEABLE_ANIMATOR:[I + .line 103 new-array v0, v2, [I const v1, 0x10102e2 - aput v1, v0, v5 + aput v1, v0, v4 - .line 103 sput-object v0, Landroid/support/graphics/drawable/AndroidResources;->STYLEABLE_ANIMATOR_SET:[I const/4 v0, 0x4 + .line 108 new-array v1, v0, [I - .line 108 fill-array-data v1, :array_6 sput-object v1, Landroid/support/graphics/drawable/AndroidResources;->STYLEABLE_PROPERTY_VALUES_HOLDER:[I + .line 116 new-array v1, v0, [I - .line 116 fill-array-data v1, :array_7 sput-object v1, Landroid/support/graphics/drawable/AndroidResources;->STYLEABLE_KEYFRAME:[I + .line 124 new-array v0, v0, [I - .line 124 fill-array-data v0, :array_8 sput-object v0, Landroid/support/graphics/drawable/AndroidResources;->STYLEABLE_PROPERTY_ANIMATOR:[I const/4 v0, 0x5 + .line 133 new-array v0, v0, [I - .line 133 fill-array-data v0, :array_9 sput-object v0, Landroid/support/graphics/drawable/AndroidResources;->STYLEABLE_PATH_INTERPOLATOR:[I diff --git a/smali/android/support/graphics/drawable/Animatable2Compat$AnimationCallback.smali b/smali/android/support/graphics/drawable/Animatable2Compat$AnimationCallback.smali index 1b2b21e3..033a9ca0 100644 --- a/smali/android/support/graphics/drawable/Animatable2Compat$AnimationCallback.smali +++ b/smali/android/support/graphics/drawable/Animatable2Compat$AnimationCallback.smali @@ -32,6 +32,9 @@ # virtual methods .method getPlatformCallback()Landroid/graphics/drawable/Animatable2$AnimationCallback; .locals 1 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x17 + .end annotation .line 77 iget-object v0, p0, Landroid/support/graphics/drawable/Animatable2Compat$AnimationCallback;->mPlatformCallback:Landroid/graphics/drawable/Animatable2$AnimationCallback; diff --git a/smali/android/support/graphics/drawable/Animatable2Compat.smali b/smali/android/support/graphics/drawable/Animatable2Compat.smali index b135b594..2764f505 100644 --- a/smali/android/support/graphics/drawable/Animatable2Compat.smali +++ b/smali/android/support/graphics/drawable/Animatable2Compat.smali @@ -19,7 +19,15 @@ .end method .method public abstract registerAnimationCallback(Landroid/support/graphics/drawable/Animatable2Compat$AnimationCallback;)V + .param p1 # Landroid/support/graphics/drawable/Animatable2Compat$AnimationCallback; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method .method public abstract unregisterAnimationCallback(Landroid/support/graphics/drawable/Animatable2Compat$AnimationCallback;)Z + .param p1 # Landroid/support/graphics/drawable/Animatable2Compat$AnimationCallback; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method diff --git a/smali/android/support/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState.smali b/smali/android/support/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState.smali index b4ea82f9..40d39f8f 100644 --- a/smali/android/support/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState.smali +++ b/smali/android/support/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState.smali @@ -105,6 +105,8 @@ iput-object p1, p0, Landroid/support/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState;->mVectorDrawable:Landroid/support/graphics/drawable/VectorDrawableCompat; .line 600 + iget-object p1, p0, Landroid/support/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState;->mVectorDrawable:Landroid/support/graphics/drawable/VectorDrawableCompat; + invoke-virtual {p1, p3}, Landroid/support/graphics/drawable/VectorDrawableCompat;->setCallback(Landroid/graphics/drawable/Drawable$Callback;)V .line 601 diff --git a/smali/android/support/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableDelegateState.smali b/smali/android/support/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableDelegateState.smali index 47e48a02..71cc8575 100644 --- a/smali/android/support/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableDelegateState.smali +++ b/smali/android/support/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableDelegateState.smali @@ -4,6 +4,10 @@ # annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0x18 +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/graphics/drawable/AnimatedVectorDrawableCompat; .end annotation diff --git a/smali/android/support/graphics/drawable/AnimatedVectorDrawableCompat.smali b/smali/android/support/graphics/drawable/AnimatedVectorDrawableCompat.smali index aa1774fd..657b979d 100644 --- a/smali/android/support/graphics/drawable/AnimatedVectorDrawableCompat.smali +++ b/smali/android/support/graphics/drawable/AnimatedVectorDrawableCompat.smali @@ -63,6 +63,10 @@ .method private constructor (Landroid/content/Context;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param const/4 v0, 0x0 @@ -74,6 +78,18 @@ .method private constructor (Landroid/content/Context;Landroid/support/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState;Landroid/content/res/Resources;)V .locals 2 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p2 # Landroid/support/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 177 invoke-direct {p0}, Landroid/support/graphics/drawable/VectorDrawableCommon;->()V @@ -108,11 +124,13 @@ .line 182 :cond_0 - new-instance v1, Landroid/support/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState; + new-instance v0, Landroid/support/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState; - invoke-direct {v1, p1, p2, v0, p3}, Landroid/support/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState;->(Landroid/content/Context;Landroid/support/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState;Landroid/graphics/drawable/Drawable$Callback;Landroid/content/res/Resources;)V + iget-object v1, p0, Landroid/support/graphics/drawable/AnimatedVectorDrawableCompat;->mCallback:Landroid/graphics/drawable/Drawable$Callback; - iput-object v1, p0, Landroid/support/graphics/drawable/AnimatedVectorDrawableCompat;->mAnimatedVectorState:Landroid/support/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState; + invoke-direct {v0, p1, p2, v1, p3}, Landroid/support/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState;->(Landroid/content/Context;Landroid/support/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState;Landroid/graphics/drawable/Drawable$Callback;Landroid/content/res/Resources;)V + + iput-object v0, p0, Landroid/support/graphics/drawable/AnimatedVectorDrawableCompat;->mAnimatedVectorState:Landroid/support/graphics/drawable/AnimatedVectorDrawableCompat$AnimatedVectorDrawableCompatState; :goto_0 return-void @@ -158,6 +176,16 @@ .method public static create(Landroid/content/Context;I)Landroid/support/graphics/drawable/AnimatedVectorDrawableCompat; .locals 6 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation const-string v0, "parser error" @@ -366,6 +394,17 @@ .method private static registerPlatformCallback(Landroid/graphics/drawable/AnimatedVectorDrawable;Landroid/support/graphics/drawable/Animatable2Compat$AnimationCallback;)V .locals 0 + .param p0 # Landroid/graphics/drawable/AnimatedVectorDrawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/support/graphics/drawable/Animatable2Compat$AnimationCallback; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x17 + .end annotation .line 810 invoke-virtual {p1}, Landroid/support/graphics/drawable/Animatable2Compat$AnimationCallback;->getPlatformCallback()Landroid/graphics/drawable/Animatable2$AnimationCallback; @@ -621,6 +660,9 @@ .method private static unregisterPlatformCallback(Landroid/graphics/drawable/AnimatedVectorDrawable;Landroid/support/graphics/drawable/Animatable2Compat$AnimationCallback;)Z .locals 0 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x17 + .end annotation .line 747 invoke-virtual {p1}, Landroid/support/graphics/drawable/Animatable2Compat$AnimationCallback;->getPlatformCallback()Landroid/graphics/drawable/Animatable2$AnimationCallback; @@ -1454,6 +1496,10 @@ .method public registerAnimationCallback(Landroid/support/graphics/drawable/Animatable2Compat$AnimationCallback;)V .locals 1 + .param p1 # Landroid/support/graphics/drawable/Animatable2Compat$AnimationCallback; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 753 iget-object v0, p0, Landroid/support/graphics/drawable/AnimatedVectorDrawableCompat;->mDelegateDrawable:Landroid/graphics/drawable/Drawable; @@ -1850,6 +1896,10 @@ .method public unregisterAnimationCallback(Landroid/support/graphics/drawable/Animatable2Compat$AnimationCallback;)Z .locals 1 + .param p1 # Landroid/support/graphics/drawable/Animatable2Compat$AnimationCallback; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 826 iget-object v0, p0, Landroid/support/graphics/drawable/AnimatedVectorDrawableCompat;->mDelegateDrawable:Landroid/graphics/drawable/Drawable; diff --git a/smali/android/support/graphics/drawable/AnimationUtilsCompat.smali b/smali/android/support/graphics/drawable/AnimationUtilsCompat.smali index c7f520c8..aa861c13 100644 --- a/smali/android/support/graphics/drawable/AnimationUtilsCompat.smali +++ b/smali/android/support/graphics/drawable/AnimationUtilsCompat.smali @@ -3,6 +3,14 @@ .source "AnimationUtilsCompat.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # direct methods .method private constructor ()V .locals 0 diff --git a/smali/android/support/graphics/drawable/AnimatorInflaterCompat$PathDataEvaluator.smali b/smali/android/support/graphics/drawable/AnimatorInflaterCompat$PathDataEvaluator.smali index ef4cc38e..8e719016 100644 --- a/smali/android/support/graphics/drawable/AnimatorInflaterCompat$PathDataEvaluator.smali +++ b/smali/android/support/graphics/drawable/AnimatorInflaterCompat$PathDataEvaluator.smali @@ -137,11 +137,7 @@ invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;->(Ljava/lang/String;)V - goto :goto_2 - - :goto_1 throw p1 - :goto_2 - goto :goto_1 + return-void .end method diff --git a/smali/android/support/graphics/drawable/AnimatorInflaterCompat.smali b/smali/android/support/graphics/drawable/AnimatorInflaterCompat.smali index 9208b9cd..e011e773 100644 --- a/smali/android/support/graphics/drawable/AnimatorInflaterCompat.smali +++ b/smali/android/support/graphics/drawable/AnimatorInflaterCompat.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/graphics/drawable/AnimatorInflaterCompat$PathDataEvaluator; @@ -232,9 +238,9 @@ move-result v16 .line 538 - move-object v0, v15 + move-object v5, v15 - check-cast v0, Landroid/animation/AnimatorSet; + check-cast v5, Landroid/animation/AnimatorSet; move-object/from16 v0, p0 @@ -246,8 +252,6 @@ move-object/from16 v4, p4 - move-object v5, v15 - move-object/from16 v17, v6 move/from16 v6, v16 @@ -752,13 +756,13 @@ if-eqz v3, :cond_a + .line 243 new-array p0, v9, [Ljava/lang/Object; aput-object p2, p0, v2 aput-object p3, p0, v1 - .line 243 invoke-static {p4, v0, p0}, Landroid/animation/PropertyValuesHolder;->ofObject(Ljava/lang/String;Landroid/animation/TypeEvaluator;[Ljava/lang/Object;)Landroid/animation/PropertyValuesHolder; move-result-object p0 @@ -793,12 +797,12 @@ throw p2 + .line 246 :cond_b new-array p0, v1, [Ljava/lang/Object; aput-object p2, p0, v2 - .line 246 invoke-static {p4, v0, p0}, Landroid/animation/PropertyValuesHolder;->ofObject(Ljava/lang/String;Landroid/animation/TypeEvaluator;[Ljava/lang/Object;)Landroid/animation/PropertyValuesHolder; move-result-object p0 @@ -816,11 +820,11 @@ invoke-direct {p0}, Landroid/support/graphics/drawable/AnimatorInflaterCompat$PathDataEvaluator;->()V + .line 251 new-array p1, v1, [Ljava/lang/Object; aput-object p3, p1, v2 - .line 251 invoke-static {p4, p0, p1}, Landroid/animation/PropertyValuesHolder;->ofObject(Ljava/lang/String;Landroid/animation/TypeEvaluator;[Ljava/lang/Object;)Landroid/animation/PropertyValuesHolder; move-result-object v8 @@ -882,6 +886,7 @@ move-result p0 + .line 277 :goto_9 new-array p3, v9, [F @@ -889,19 +894,18 @@ aput p0, p3, v1 - .line 277 invoke-static {p4, p3}, Landroid/animation/PropertyValuesHolder;->ofFloat(Ljava/lang/String;[F)Landroid/animation/PropertyValuesHolder; move-result-object p0 goto :goto_b + .line 280 :cond_11 new-array p0, v1, [F aput p2, p0, v2 - .line 280 invoke-static {p4, p0}, Landroid/animation/PropertyValuesHolder;->ofFloat(Ljava/lang/String;[F)Landroid/animation/PropertyValuesHolder; move-result-object p0 @@ -924,12 +928,12 @@ move-result p0 + .line 288 :goto_a new-array p2, v1, [F aput p0, p2, v2 - .line 288 invoke-static {p4, p2}, Landroid/animation/PropertyValuesHolder;->ofFloat(Ljava/lang/String;[F)Landroid/animation/PropertyValuesHolder; move-result-object p0 @@ -1009,6 +1013,7 @@ move-result p0 + .line 309 :goto_d new-array p3, v9, [I @@ -1016,19 +1021,18 @@ aput p0, p3, v1 - .line 309 invoke-static {p4, p3}, Landroid/animation/PropertyValuesHolder;->ofInt(Ljava/lang/String;[I)Landroid/animation/PropertyValuesHolder; move-result-object v8 goto :goto_f + .line 311 :cond_19 new-array p0, v1, [I aput p2, p0, v2 - .line 311 invoke-static {p4, p0}, Landroid/animation/PropertyValuesHolder;->ofInt(Ljava/lang/String;[I)Landroid/animation/PropertyValuesHolder; move-result-object v8 @@ -1070,12 +1074,12 @@ move-result p0 + .line 322 :goto_e new-array p2, v1, [I aput p0, p2, v2 - .line 322 invoke-static {p4, p2}, Landroid/animation/PropertyValuesHolder;->ofInt(Ljava/lang/String;[I)Landroid/animation/PropertyValuesHolder; move-result-object v8 @@ -1186,16 +1190,16 @@ move-result-object p0 - const-string p1, "value" + const/4 p1, 0x0 - const/4 p2, 0x0 + const-string p2, "value" .line 639 - invoke-static {p0, p3, p1, p2}, Landroid/support/v4/content/res/TypedArrayUtils;->peekNamedValue(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;I)Landroid/util/TypedValue; + invoke-static {p0, p3, p2, p1}, Landroid/support/v4/content/res/TypedArrayUtils;->peekNamedValue(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;I)Landroid/util/TypedValue; - move-result-object p1 + move-result-object p2 - if-eqz p1, :cond_0 + if-eqz p2, :cond_0 const/4 p3, 0x1 @@ -1208,21 +1212,21 @@ if-eqz p3, :cond_1 .line 644 - iget p1, p1, Landroid/util/TypedValue;->type:I + iget p2, p2, Landroid/util/TypedValue;->type:I - invoke-static {p1}, Landroid/support/graphics/drawable/AnimatorInflaterCompat;->isColorType(I)Z + invoke-static {p2}, Landroid/support/graphics/drawable/AnimatorInflaterCompat;->isColorType(I)Z - move-result p1 + move-result p2 - if-eqz p1, :cond_1 + if-eqz p2, :cond_1 - const/4 p2, 0x3 + const/4 p1, 0x3 .line 649 :cond_1 invoke-virtual {p0}, Landroid/content/res/TypedArray;->recycle()V - return p2 + return p1 .end method .method private static isColorType(I)Z @@ -1249,6 +1253,10 @@ .method public static loadAnimator(Landroid/content/Context;I)Landroid/animation/Animator; .locals 2 + .param p1 # I + .annotation build Landroid/support/annotation/AnimatorRes; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Landroid/content/res/Resources$NotFoundException; @@ -1289,6 +1297,10 @@ .method public static loadAnimator(Landroid/content/Context;Landroid/content/res/Resources;Landroid/content/res/Resources$Theme;I)Landroid/animation/Animator; .locals 1 + .param p3 # I + .annotation build Landroid/support/annotation/AnimatorRes; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Landroid/content/res/Resources$NotFoundException; @@ -1307,6 +1319,10 @@ .method public static loadAnimator(Landroid/content/Context;Landroid/content/res/Resources;Landroid/content/res/Resources$Theme;IF)Landroid/animation/Animator; .locals 2 + .param p3 # I + .annotation build Landroid/support/annotation/AnimatorRes; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Landroid/content/res/Resources$NotFoundException; @@ -1453,12 +1469,12 @@ :cond_0 invoke-static {p4, v0, p1, p5, p6}, Landroid/support/graphics/drawable/AnimatorInflaterCompat;->parseAnimatorFromTypeArray(Landroid/animation/ValueAnimator;Landroid/content/res/TypedArray;Landroid/content/res/TypedArray;FLorg/xmlpull/v1/XmlPullParser;)V - const-string p2, "interpolator" + const/4 p2, 0x0 - const/4 p3, 0x0 + const-string p3, "interpolator" .line 902 - invoke-static {v0, p6, p2, p3, p3}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedResourceId(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I + invoke-static {v0, p6, p3, p2, p2}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedResourceId(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I move-result p2 @@ -1501,16 +1517,16 @@ move-result-object p1 - const-string p2, "fraction" + const/4 p2, 0x3 - const/4 p3, 0x3 + const-string p3, "fraction" const/high16 v0, -0x40800000 # -1.0f .line 823 - invoke-static {p1, p5, p2, p3, v0}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedFloat(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;IF)F + invoke-static {p1, p5, p3, p2, v0}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedFloat(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;IF)F - move-result p2 + move-result p3 const-string v0, "value" @@ -1563,7 +1579,7 @@ if-eq p4, v3, :cond_3 - if-eq p4, p3, :cond_3 + if-eq p4, p2, :cond_3 const/4 p2, 0x0 @@ -1573,25 +1589,25 @@ :cond_3 invoke-static {p1, p5, v0, v1, v1}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedInt(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I - move-result p3 + move-result p2 .line 850 - invoke-static {p2, p3}, Landroid/animation/Keyframe;->ofInt(FI)Landroid/animation/Keyframe; + invoke-static {p3, p2}, Landroid/animation/Keyframe;->ofInt(FI)Landroid/animation/Keyframe; move-result-object p2 goto :goto_2 :cond_4 - const/4 p3, 0x0 + const/4 p2, 0x0 .line 842 - invoke-static {p1, p5, v0, v1, p3}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedFloat(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;IF)F + invoke-static {p1, p5, v0, v1, p2}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedFloat(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;IF)F - move-result p3 + move-result p2 .line 844 - invoke-static {p2, p3}, Landroid/animation/Keyframe;->ofFloat(FF)Landroid/animation/Keyframe; + invoke-static {p3, p2}, Landroid/animation/Keyframe;->ofFloat(FF)Landroid/animation/Keyframe; move-result-object p2 @@ -1601,7 +1617,7 @@ if-nez p4, :cond_6 .line 854 - invoke-static {p2}, Landroid/animation/Keyframe;->ofFloat(F)Landroid/animation/Keyframe; + invoke-static {p3}, Landroid/animation/Keyframe;->ofFloat(F)Landroid/animation/Keyframe; move-result-object p2 @@ -1609,7 +1625,7 @@ .line 855 :cond_6 - invoke-static {p2}, Landroid/animation/Keyframe;->ofInt(F)Landroid/animation/Keyframe; + invoke-static {p3}, Landroid/animation/Keyframe;->ofInt(F)Landroid/animation/Keyframe; move-result-object p2 @@ -1682,7 +1698,9 @@ const/4 v0, 0x0 - move-object v1, v0 + move v1, p5 + + move-object p5, v0 .line 696 :cond_0 @@ -1715,16 +1733,16 @@ const/4 v2, 0x4 - if-ne p5, v2, :cond_1 + if-ne v1, v2, :cond_1 .line 701 invoke-static {p3}, Landroid/util/Xml;->asAttributeSet(Lorg/xmlpull/v1/XmlPullParser;)Landroid/util/AttributeSet; - move-result-object p5 + move-result-object v1 - invoke-static {p1, p2, p5, p3}, Landroid/support/graphics/drawable/AnimatorInflaterCompat;->inferValueTypeOfKeyframe(Landroid/content/res/Resources;Landroid/content/res/Resources$Theme;Landroid/util/AttributeSet;Lorg/xmlpull/v1/XmlPullParser;)I + invoke-static {p1, p2, v1, p3}, Landroid/support/graphics/drawable/AnimatorInflaterCompat;->inferValueTypeOfKeyframe(Landroid/content/res/Resources;Landroid/content/res/Resources$Theme;Landroid/util/AttributeSet;Lorg/xmlpull/v1/XmlPullParser;)I - move-result p5 + move-result v1 .line 704 :cond_1 @@ -1738,7 +1756,7 @@ move-object v4, p2 - move v6, p5 + move v6, v1 move-object v7, p3 @@ -1748,16 +1766,16 @@ if-eqz v2, :cond_3 - if-nez v1, :cond_2 + if-nez p5, :cond_2 .line 708 - new-instance v1, Ljava/util/ArrayList; + new-instance p5, Ljava/util/ArrayList; - invoke-direct {v1}, Ljava/util/ArrayList;->()V + invoke-direct {p5}, Ljava/util/ArrayList;->()V .line 710 :cond_2 - invoke-virtual {v1, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + invoke-virtual {p5, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z .line 712 :cond_3 @@ -1766,10 +1784,10 @@ goto :goto_0 :cond_4 - if-eqz v1, :cond_f + if-eqz p5, :cond_f .line 717 - invoke-virtual {v1}, Ljava/util/ArrayList;->size()I + invoke-virtual {p5}, Ljava/util/ArrayList;->size()I move-result p0 @@ -1778,7 +1796,7 @@ const/4 p1, 0x0 .line 723 - invoke-virtual {v1, p1}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {p5, p1}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; move-result-object p2 @@ -1787,7 +1805,7 @@ add-int/lit8 p3, p0, -0x1 .line 724 - invoke-virtual {v1, p3}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {p5, p3}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; move-result-object p3 @@ -1817,7 +1835,7 @@ .line 730 :cond_5 - invoke-virtual {v1}, Ljava/util/ArrayList;->size()I + invoke-virtual {p5}, Ljava/util/ArrayList;->size()I move-result v0 @@ -1825,7 +1843,7 @@ move-result-object p3 - invoke-virtual {v1, v0, p3}, Ljava/util/ArrayList;->add(ILjava/lang/Object;)V + invoke-virtual {p5, v0, p3}, Ljava/util/ArrayList;->add(ILjava/lang/Object;)V add-int/lit8 p0, p0, 0x1 @@ -1855,7 +1873,7 @@ move-result-object p2 - invoke-virtual {v1, p1, p2}, Ljava/util/ArrayList;->add(ILjava/lang/Object;)V + invoke-virtual {p5, p1, p2}, Ljava/util/ArrayList;->add(ILjava/lang/Object;)V add-int/lit8 p0, p0, 0x1 @@ -1865,7 +1883,7 @@ new-array p2, p0, [Landroid/animation/Keyframe; .line 744 - invoke-virtual {v1, p2}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object; + invoke-virtual {p5, p2}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object; :goto_3 if-ge p1, p0, :cond_e @@ -1876,11 +1894,11 @@ .line 747 invoke-virtual {p3}, Landroid/animation/Keyframe;->getFraction()F - move-result v0 + move-result p5 - cmpg-float v0, v0, v4 + cmpg-float p5, p5, v4 - if-gez v0, :cond_d + if-gez p5, :cond_d if-nez p1, :cond_9 @@ -1890,9 +1908,9 @@ goto :goto_6 :cond_9 - add-int/lit8 v0, p0, -0x1 + add-int/lit8 p5, p0, -0x1 - if-ne p1, v0, :cond_a + if-ne p1, p5, :cond_a .line 751 invoke-virtual {p3, v2}, Landroid/animation/Keyframe;->setFraction(F)V @@ -1902,10 +1920,10 @@ :cond_a add-int/lit8 p3, p1, 0x1 - move v1, p1 + move v0, p1 :goto_4 - if-ge p3, v0, :cond_c + if-ge p3, p5, :cond_c .line 758 aget-object v5, p2, p3 @@ -1921,11 +1939,11 @@ goto :goto_5 :cond_b - add-int/lit8 v1, p3, 0x1 + add-int/lit8 v0, p3, 0x1 - move v8, v1 + move v8, v0 - move v1, p3 + move v0, p3 move p3, v8 @@ -1933,7 +1951,7 @@ :cond_c :goto_5 - add-int/lit8 p3, v1, 0x1 + add-int/lit8 p3, v0, 0x1 .line 763 aget-object p3, p2, p3 @@ -1942,19 +1960,19 @@ move-result p3 - add-int/lit8 v0, p1, -0x1 + add-int/lit8 p5, p1, -0x1 - aget-object v0, p2, v0 + aget-object p5, p2, p5 .line 764 - invoke-virtual {v0}, Landroid/animation/Keyframe;->getFraction()F + invoke-virtual {p5}, Landroid/animation/Keyframe;->getFraction()F - move-result v0 + move-result p5 - sub-float/2addr p3, v0 + sub-float/2addr p3, p5 .line 765 - invoke-static {p2, p3, p1, v1}, Landroid/support/graphics/drawable/AnimatorInflaterCompat;->distributeKeyframes([Landroid/animation/Keyframe;FII)V + invoke-static {p2, p3, p1, v0}, Landroid/support/graphics/drawable/AnimatorInflaterCompat;->distributeKeyframes([Landroid/animation/Keyframe;FII)V :cond_d :goto_6 @@ -1968,7 +1986,7 @@ move-result-object v0 - if-ne p5, v3, :cond_f + if-ne v1, v3, :cond_f .line 771 invoke-static {}, Landroid/support/graphics/drawable/ArgbEvaluator;->getInstance()Landroid/support/graphics/drawable/ArgbEvaluator; @@ -2160,111 +2178,111 @@ .method private static parseAnimatorFromTypeArray(Landroid/animation/ValueAnimator;Landroid/content/res/TypedArray;Landroid/content/res/TypedArray;FLorg/xmlpull/v1/XmlPullParser;)V .locals 11 - const-string v0, "duration" + const/4 v0, 0x1 - const/4 v1, 0x1 + const-string v1, "duration" const/16 v2, 0x12c .line 345 - invoke-static {p1, p4, v0, v1, v2}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedInt(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I + invoke-static {p1, p4, v1, v0, v2}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedInt(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I - move-result v0 + move-result v1 - int-to-long v2, v0 + int-to-long v1, v1 - const-string v0, "startOffset" + const/4 v3, 0x0 - const/4 v4, 0x2 + const-string v4, "startOffset" - const/4 v5, 0x0 + const/4 v5, 0x2 .line 347 - invoke-static {p1, p4, v0, v4, v5}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedInt(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I + invoke-static {p1, p4, v4, v5, v3}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedInt(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I - move-result v0 + move-result v4 - int-to-long v6, v0 + int-to-long v4, v4 - const-string v0, "valueType" + const/4 v6, 0x4 - const/4 v4, 0x7 + const-string v7, "valueType" - const/4 v8, 0x4 + const/4 v8, 0x7 .line 349 - invoke-static {p1, p4, v0, v4, v8}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedInt(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I + invoke-static {p1, p4, v7, v8, v6}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedInt(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I - move-result v0 + move-result v7 - const-string v4, "valueFrom" + const-string v8, "valueFrom" .line 353 - invoke-static {p4, v4}, Landroid/support/v4/content/res/TypedArrayUtils;->hasAttribute(Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;)Z + invoke-static {p4, v8}, Landroid/support/v4/content/res/TypedArrayUtils;->hasAttribute(Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;)Z - move-result v4 + move-result v8 - if-eqz v4, :cond_1 + if-eqz v8, :cond_1 - const-string v4, "valueTo" + const-string v8, "valueTo" .line 354 - invoke-static {p4, v4}, Landroid/support/v4/content/res/TypedArrayUtils;->hasAttribute(Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;)Z + invoke-static {p4, v8}, Landroid/support/v4/content/res/TypedArrayUtils;->hasAttribute(Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;)Z - move-result v4 + move-result v8 - if-eqz v4, :cond_1 + if-eqz v8, :cond_1 - const/4 v4, 0x6 + const/4 v8, 0x6 const/4 v9, 0x5 - if-ne v0, v8, :cond_0 + if-ne v7, v6, :cond_0 .line 356 - invoke-static {p1, v9, v4}, Landroid/support/graphics/drawable/AnimatorInflaterCompat;->inferValueTypeFromValues(Landroid/content/res/TypedArray;II)I + invoke-static {p1, v9, v8}, Landroid/support/graphics/drawable/AnimatorInflaterCompat;->inferValueTypeFromValues(Landroid/content/res/TypedArray;II)I - move-result v0 + move-result v7 :cond_0 const-string v10, "" .line 360 - invoke-static {p1, v0, v9, v4, v10}, Landroid/support/graphics/drawable/AnimatorInflaterCompat;->getPVH(Landroid/content/res/TypedArray;IIILjava/lang/String;)Landroid/animation/PropertyValuesHolder; + invoke-static {p1, v7, v9, v8, v10}, Landroid/support/graphics/drawable/AnimatorInflaterCompat;->getPVH(Landroid/content/res/TypedArray;IIILjava/lang/String;)Landroid/animation/PropertyValuesHolder; - move-result-object v4 + move-result-object v8 - if-eqz v4, :cond_1 + if-eqz v8, :cond_1 - new-array v9, v1, [Landroid/animation/PropertyValuesHolder; + .line 364 + new-array v9, v0, [Landroid/animation/PropertyValuesHolder; - aput-object v4, v9, v5 + aput-object v8, v9, v3 - .line 364 invoke-virtual {p0, v9}, Landroid/animation/ValueAnimator;->setValues([Landroid/animation/PropertyValuesHolder;)V .line 367 :cond_1 - invoke-virtual {p0, v2, v3}, Landroid/animation/ValueAnimator;->setDuration(J)Landroid/animation/ValueAnimator; + invoke-virtual {p0, v1, v2}, Landroid/animation/ValueAnimator;->setDuration(J)Landroid/animation/ValueAnimator; .line 368 - invoke-virtual {p0, v6, v7}, Landroid/animation/ValueAnimator;->setStartDelay(J)V + invoke-virtual {p0, v4, v5}, Landroid/animation/ValueAnimator;->setStartDelay(J)V - const/4 v2, 0x3 + const/4 v1, 0x3 - const-string v3, "repeatCount" + const-string v2, "repeatCount" .line 370 - invoke-static {p1, p4, v3, v2, v5}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedInt(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I + invoke-static {p1, p4, v2, v1, v3}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedInt(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I - move-result v2 + move-result v1 - invoke-virtual {p0, v2}, Landroid/animation/ValueAnimator;->setRepeatCount(I)V + invoke-virtual {p0, v1}, Landroid/animation/ValueAnimator;->setRepeatCount(I)V - const-string v2, "repeatMode" + const-string v1, "repeatMode" .line 372 - invoke-static {p1, p4, v2, v8, v1}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedInt(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I + invoke-static {p1, p4, v1, v6, v0}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedInt(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I move-result p1 @@ -2273,7 +2291,7 @@ if-eqz p2, :cond_2 .line 376 - invoke-static {p0, p2, v0, p3, p4}, Landroid/support/graphics/drawable/AnimatorInflaterCompat;->setupObjectAnimator(Landroid/animation/ValueAnimator;Landroid/content/res/TypedArray;IFLorg/xmlpull/v1/XmlPullParser;)V + invoke-static {p0, p2, v7, p3, p4}, Landroid/support/graphics/drawable/AnimatorInflaterCompat;->setupObjectAnimator(Landroid/animation/ValueAnimator;Landroid/content/res/TypedArray;IFLorg/xmlpull/v1/XmlPullParser;)V :cond_2 return-void @@ -2296,14 +2314,14 @@ if-eqz v0, :cond_3 - const-string v1, "propertyXName" + const/4 v1, 0x2 - const/4 v2, 0x2 + const-string v2, "propertyXName" .line 403 - invoke-static {p1, p4, v1, v2}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedString(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;I)Ljava/lang/String; + invoke-static {p1, p4, v2, v1}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedString(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;I)Ljava/lang/String; - move-result-object v1 + move-result-object v2 const/4 v3, 0x3 @@ -2314,12 +2332,12 @@ move-result-object p4 - if-eq p2, v2, :cond_0 + if-eq p2, v1, :cond_0 - const/4 v2, 0x4 + const/4 v1, 0x4 :cond_0 - if-nez v1, :cond_2 + if-nez v2, :cond_2 if-eqz p4, :cond_1 @@ -2363,7 +2381,7 @@ mul-float p3, p3, p2 .line 419 - invoke-static {p1, p0, p3, v1, p4}, Landroid/support/graphics/drawable/AnimatorInflaterCompat;->setupPathMotion(Landroid/graphics/Path;Landroid/animation/ObjectAnimator;FLjava/lang/String;Ljava/lang/String;)V + invoke-static {p1, p0, p3, v2, p4}, Landroid/support/graphics/drawable/AnimatorInflaterCompat;->setupPathMotion(Landroid/graphics/Path;Landroid/animation/ObjectAnimator;FLjava/lang/String;Ljava/lang/String;)V goto :goto_1 @@ -2468,6 +2486,7 @@ const/4 v12, 0x2 + .line 456 new-array v13, v12, [F add-int/lit8 v14, v0, -0x1 @@ -2476,6 +2495,8 @@ div-float/2addr v8, v14 + const/4 v7, 0x0 + const/4 v14, 0x0 const/4 v15, 0x0 @@ -2483,7 +2504,7 @@ :goto_0 const/4 v12, 0x0 - if-ge v14, v0, :cond_2 + if-ge v7, v0, :cond_2 .line 466 invoke-virtual {v6, v15}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; @@ -2496,23 +2517,23 @@ move-result v16 - sub-float v10, v7, v16 + sub-float v10, v14, v16 invoke-virtual {v4, v10, v13, v12}, Landroid/graphics/PathMeasure;->getPosTan(F[F[F)Z + .line 469 aget v10, v13, v5 - .line 469 - aput v10, v9, v14 + aput v10, v9, v7 const/4 v10, 0x1 + .line 470 aget v12, v13, v10 - .line 470 - aput v12, v11, v14 + aput v12, v11, v7 - add-float/2addr v7, v8 + add-float/2addr v14, v8 add-int/lit8 v10, v15, 0x1 @@ -2534,7 +2555,7 @@ move-result v12 - cmpl-float v12, v7, v12 + cmpl-float v12, v14, v12 if-lez v12, :cond_1 @@ -2544,7 +2565,7 @@ move v15, v10 :cond_1 - add-int/lit8 v14, v14, 0x1 + add-int/lit8 v7, v7, 0x1 const/4 v10, 0x1 @@ -2576,11 +2597,11 @@ const/4 v2, 0x1 + .line 489 new-array v0, v2, [Landroid/animation/PropertyValuesHolder; aput-object v12, v0, v5 - .line 489 invoke-virtual {v1, v0}, Landroid/animation/ObjectAnimator;->setValues([Landroid/animation/PropertyValuesHolder;)V goto :goto_2 @@ -2590,11 +2611,11 @@ if-nez v12, :cond_6 + .line 491 new-array v2, v2, [Landroid/animation/PropertyValuesHolder; aput-object v0, v2, v5 - .line 491 invoke-virtual {v1, v2}, Landroid/animation/ObjectAnimator;->setValues([Landroid/animation/PropertyValuesHolder;)V goto :goto_2 @@ -2602,13 +2623,13 @@ :cond_6 const/4 v3, 0x2 + .line 493 new-array v3, v3, [Landroid/animation/PropertyValuesHolder; aput-object v0, v3, v5 aput-object v12, v3, v2 - .line 493 invoke-virtual {v1, v3}, Landroid/animation/ObjectAnimator;->setValues([Landroid/animation/PropertyValuesHolder;)V :goto_2 diff --git a/smali/android/support/graphics/drawable/ArgbEvaluator.smali b/smali/android/support/graphics/drawable/ArgbEvaluator.smali index 8d7117c6..dba48e64 100644 --- a/smali/android/support/graphics/drawable/ArgbEvaluator.smali +++ b/smali/android/support/graphics/drawable/ArgbEvaluator.smali @@ -6,6 +6,14 @@ .implements Landroid/animation/TypeEvaluator; +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field private static final sInstance:Landroid/support/graphics/drawable/ArgbEvaluator; diff --git a/smali/android/support/graphics/drawable/PathInterpolatorCompat.smali b/smali/android/support/graphics/drawable/PathInterpolatorCompat.smali index bbe3eaeb..12f0f832 100644 --- a/smali/android/support/graphics/drawable/PathInterpolatorCompat.smali +++ b/smali/android/support/graphics/drawable/PathInterpolatorCompat.smali @@ -6,6 +6,14 @@ .implements Landroid/view/animation/Interpolator; +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field public static final EPSILON:D = 1.0E-5 @@ -142,6 +150,7 @@ const/4 v4, 0x2 + .line 149 new-array v4, v4, [F const/4 v5, 0x0 @@ -253,6 +262,8 @@ const/4 p1, 0x0 + const/4 p1, 0x0 + const/4 v3, 0x0 :goto_1 @@ -261,46 +272,46 @@ .line 169 iget-object v4, p0, Landroid/support/graphics/drawable/PathInterpolatorCompat;->mX:[F - add-int/lit8 v5, v3, 0x1 + add-int/lit8 v5, p1, 0x1 - aget v3, v4, v3 + aget p1, v4, p1 - cmpg-float p1, v3, p1 + cmpg-float v3, p1, v3 - if-ltz p1, :cond_1 + if-ltz v3, :cond_1 .line 173 - aput v3, v4, v1 + aput p1, v4, v1 add-int/lit8 v1, v1, 0x1 - move p1, v3 + move v3, p1 - move v3, v5 + move p1, v5 goto :goto_1 .line 171 :cond_1 - new-instance p1, Ljava/lang/IllegalArgumentException; + new-instance v0, Ljava/lang/IllegalArgumentException; - new-instance v0, Ljava/lang/StringBuilder; + new-instance v1, Ljava/lang/StringBuilder; - invoke-direct {v0}, Ljava/lang/StringBuilder;->()V + invoke-direct {v1}, Ljava/lang/StringBuilder;->()V - const-string v1, "The Path cannot loop back on itself, x :" + const-string v2, "The Path cannot loop back on itself, x :" - invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(F)Ljava/lang/StringBuilder; + invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(F)Ljava/lang/StringBuilder; - invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v0 + move-result-object p1 - invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;->(Ljava/lang/String;)V + invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;->(Ljava/lang/String;)V - throw p1 + throw v0 .line 177 :cond_2 @@ -398,13 +409,9 @@ invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;->(Ljava/lang/String;)V - goto :goto_3 - - :goto_2 throw v0 - :goto_3 - goto :goto_2 + return-void .end method .method private initQuad(FF)V @@ -662,9 +669,9 @@ aget v4, v3, v2 - aget v3, v3, v1 + aget v5, v3, v1 - sub-float/2addr v4, v3 + sub-float/2addr v4, v5 cmpl-float v0, v4, v0 @@ -677,8 +684,11 @@ return p1 + .line 218 :cond_4 - sub-float/2addr p1, v3 + aget v0, v3, v1 + + sub-float/2addr p1, v0 div-float/2addr p1, v4 diff --git a/smali/android/support/graphics/drawable/R$attr.smali b/smali/android/support/graphics/drawable/R$attr.smali index 10a6781c..5938f35d 100644 --- a/smali/android/support/graphics/drawable/R$attr.smali +++ b/smali/android/support/graphics/drawable/R$attr.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/graphics/drawable/R$attr; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -61,6 +62,7 @@ .method private constructor ()V .locals 0 + .line 13 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/graphics/drawable/R$color.smali b/smali/android/support/graphics/drawable/R$color.smali index 08ca7b9e..84f18f9e 100644 --- a/smali/android/support/graphics/drawable/R$color.smali +++ b/smali/android/support/graphics/drawable/R$color.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/graphics/drawable/R$color; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -27,6 +28,7 @@ .method private constructor ()V .locals 0 + .line 38 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/graphics/drawable/R$dimen.smali b/smali/android/support/graphics/drawable/R$dimen.smali index 13e4091c..fe2b3d63 100644 --- a/smali/android/support/graphics/drawable/R$dimen.smali +++ b/smali/android/support/graphics/drawable/R$dimen.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/graphics/drawable/R$dimen; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -63,6 +64,7 @@ .method private constructor ()V .locals 0 + .line 46 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/graphics/drawable/R$drawable.smali b/smali/android/support/graphics/drawable/R$drawable.smali index 9d72f171..cecb333c 100644 --- a/smali/android/support/graphics/drawable/R$drawable.smali +++ b/smali/android/support/graphics/drawable/R$drawable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/graphics/drawable/R$drawable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -43,6 +44,7 @@ .method private constructor ()V .locals 0 + .line 72 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/graphics/drawable/R$id.smali b/smali/android/support/graphics/drawable/R$id.smali index beeeafef..60200b3c 100644 --- a/smali/android/support/graphics/drawable/R$id.smali +++ b/smali/android/support/graphics/drawable/R$id.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/graphics/drawable/R$id; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -89,6 +90,7 @@ .method private constructor ()V .locals 0 + .line 88 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/graphics/drawable/R$integer.smali b/smali/android/support/graphics/drawable/R$integer.smali index 1b768a11..a894f66e 100644 --- a/smali/android/support/graphics/drawable/R$integer.smali +++ b/smali/android/support/graphics/drawable/R$integer.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/graphics/drawable/R$integer; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -21,6 +22,7 @@ .method private constructor ()V .locals 0 + .line 127 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/graphics/drawable/R$layout.smali b/smali/android/support/graphics/drawable/R$layout.smali index f6dfad73..a74fbb88 100644 --- a/smali/android/support/graphics/drawable/R$layout.smali +++ b/smali/android/support/graphics/drawable/R$layout.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/graphics/drawable/R$layout; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -31,6 +32,7 @@ .method private constructor ()V .locals 0 + .line 132 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/graphics/drawable/R$string.smali b/smali/android/support/graphics/drawable/R$string.smali index 7376fe3e..df1ea730 100644 --- a/smali/android/support/graphics/drawable/R$string.smali +++ b/smali/android/support/graphics/drawable/R$string.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/graphics/drawable/R$string; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -21,6 +22,7 @@ .method private constructor ()V .locals 0 + .line 142 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/graphics/drawable/R$style.smali b/smali/android/support/graphics/drawable/R$style.smali index 78cfe477..ba2a109a 100644 --- a/smali/android/support/graphics/drawable/R$style.smali +++ b/smali/android/support/graphics/drawable/R$style.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/graphics/drawable/R$style; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -35,6 +36,7 @@ .method private constructor ()V .locals 0 + .line 147 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/graphics/drawable/R$styleable.smali b/smali/android/support/graphics/drawable/R$styleable.smali index 5b0e4802..5c998f10 100644 --- a/smali/android/support/graphics/drawable/R$styleable.smali +++ b/smali/android/support/graphics/drawable/R$styleable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/graphics/drawable/R$styleable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -114,11 +115,12 @@ # direct methods -.method public static constructor ()V +.method static constructor ()V .locals 2 const/4 v0, 0x3 + .line 161 new-array v0, v0, [I fill-array-data v0, :array_0 @@ -127,6 +129,7 @@ const/4 v0, 0x2 + .line 165 new-array v1, v0, [I fill-array-data v1, :array_1 @@ -135,6 +138,7 @@ const/4 v1, 0x7 + .line 168 new-array v1, v1, [I fill-array-data v1, :array_2 @@ -143,6 +147,7 @@ const/4 v1, 0x6 + .line 176 new-array v1, v1, [I fill-array-data v1, :array_3 @@ -151,6 +156,7 @@ const/16 v1, 0xa + .line 183 new-array v1, v1, [I fill-array-data v1, :array_4 @@ -159,12 +165,14 @@ const/16 v1, 0xc + .line 194 new-array v1, v1, [I fill-array-data v1, :array_5 sput-object v1, Landroid/support/graphics/drawable/R$styleable;->GradientColor:[I + .line 207 new-array v0, v0, [I fill-array-data v0, :array_6 @@ -247,6 +255,7 @@ .method private constructor ()V .locals 0 + .line 159 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/graphics/drawable/R.smali b/smali/android/support/graphics/drawable/R.smali index 7de3c9ea..62df8cb2 100644 --- a/smali/android/support/graphics/drawable/R.smali +++ b/smali/android/support/graphics/drawable/R.smali @@ -1,20 +1,21 @@ .class public final Landroid/support/graphics/drawable/R; .super Ljava/lang/Object; +.source "R.java" # annotations .annotation system Ldalvik/annotation/MemberClasses; value = { - Landroid/support/graphics/drawable/R$attr;, - Landroid/support/graphics/drawable/R$color;, - Landroid/support/graphics/drawable/R$dimen;, - Landroid/support/graphics/drawable/R$drawable;, - Landroid/support/graphics/drawable/R$id;, - Landroid/support/graphics/drawable/R$integer;, - Landroid/support/graphics/drawable/R$layout;, - Landroid/support/graphics/drawable/R$string;, + Landroid/support/graphics/drawable/R$styleable;, Landroid/support/graphics/drawable/R$style;, - Landroid/support/graphics/drawable/R$styleable; + Landroid/support/graphics/drawable/R$string;, + Landroid/support/graphics/drawable/R$layout;, + Landroid/support/graphics/drawable/R$integer;, + Landroid/support/graphics/drawable/R$id;, + Landroid/support/graphics/drawable/R$drawable;, + Landroid/support/graphics/drawable/R$dimen;, + Landroid/support/graphics/drawable/R$color;, + Landroid/support/graphics/drawable/R$attr; } .end annotation @@ -23,6 +24,7 @@ .method private constructor ()V .locals 0 + .line 10 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/graphics/drawable/VectorDrawableCompat$VFullPath.smali b/smali/android/support/graphics/drawable/VectorDrawableCompat$VFullPath.smali index 81a22d88..6706377f 100644 --- a/smali/android/support/graphics/drawable/VectorDrawableCompat$VFullPath.smali +++ b/smali/android/support/graphics/drawable/VectorDrawableCompat$VFullPath.smali @@ -366,19 +366,19 @@ const/16 v0, 0x8 - const-string v1, "strokeLineCap" + const/4 v1, -0x1 - const/4 v2, -0x1 + const-string v2, "strokeLineCap" .line 1912 - invoke-static {p1, p2, v1, v0, v2}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedInt(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I + invoke-static {p1, p2, v2, v0, v1}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedInt(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I move-result v0 .line 1914 - iget-object v1, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VFullPath;->mStrokeLineCap:Landroid/graphics/Paint$Cap; + iget-object v2, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VFullPath;->mStrokeLineCap:Landroid/graphics/Paint$Cap; - invoke-direct {p0, v0, v1}, Landroid/support/graphics/drawable/VectorDrawableCompat$VFullPath;->getStrokeLineCap(ILandroid/graphics/Paint$Cap;)Landroid/graphics/Paint$Cap; + invoke-direct {p0, v0, v2}, Landroid/support/graphics/drawable/VectorDrawableCompat$VFullPath;->getStrokeLineCap(ILandroid/graphics/Paint$Cap;)Landroid/graphics/Paint$Cap; move-result-object v0 @@ -386,10 +386,10 @@ const/16 v0, 0x9 - const-string v1, "strokeLineJoin" + const-string v2, "strokeLineJoin" .line 1915 - invoke-static {p1, p2, v1, v0, v2}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedInt(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I + invoke-static {p1, p2, v2, v0, v1}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedInt(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I move-result v0 @@ -516,6 +516,12 @@ .method public applyTheme(Landroid/content/res/Resources$Theme;)V .locals 0 + .line 1954 + iget-object p1, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VFullPath;->mThemeAttrs:[I + + if-nez p1, :cond_0 + + :cond_0 return-void .end method @@ -549,6 +555,8 @@ .method getFillColor()I .locals 1 + .annotation build Landroid/support/annotation/ColorInt; + .end annotation .line 2000 iget-object v0, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VFullPath;->mFillColor:Landroid/support/v4/content/res/ComplexColorCompat; @@ -571,6 +579,8 @@ .method getStrokeColor()I .locals 1 + .annotation build Landroid/support/annotation/ColorInt; + .end annotation .line 1969 iget-object v0, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VFullPath;->mStrokeColor:Landroid/support/v4/content/res/ComplexColorCompat; diff --git a/smali/android/support/graphics/drawable/VectorDrawableCompat$VGroup.smali b/smali/android/support/graphics/drawable/VectorDrawableCompat$VGroup.smali index 20c483ed..a9a8b0ce 100644 --- a/smali/android/support/graphics/drawable/VectorDrawableCompat$VGroup.smali +++ b/smali/android/support/graphics/drawable/VectorDrawableCompat$VGroup.smali @@ -224,9 +224,12 @@ iput-object v0, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VGroup;->mGroupName:Ljava/lang/String; .line 1461 - iget v2, p1, Landroid/support/graphics/drawable/VectorDrawableCompat$VGroup;->mChangingConfigurations:I + iget v0, p1, Landroid/support/graphics/drawable/VectorDrawableCompat$VGroup;->mChangingConfigurations:I - iput v2, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VGroup;->mChangingConfigurations:I + iput v0, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VGroup;->mChangingConfigurations:I + + .line 1462 + iget-object v0, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VGroup;->mGroupName:Ljava/lang/String; if-eqz v0, :cond_0 @@ -235,9 +238,11 @@ .line 1466 :cond_0 - iget-object v0, p1, Landroid/support/graphics/drawable/VectorDrawableCompat$VGroup;->mLocalMatrix:Landroid/graphics/Matrix; + iget-object v0, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VGroup;->mLocalMatrix:Landroid/graphics/Matrix; + + iget-object v1, p1, Landroid/support/graphics/drawable/VectorDrawableCompat$VGroup;->mLocalMatrix:Landroid/graphics/Matrix; - invoke-virtual {v1, v0}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V + invoke-virtual {v0, v1}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V .line 1468 iget-object p1, p1, Landroid/support/graphics/drawable/VectorDrawableCompat$VGroup;->mChildren:Ljava/util/ArrayList; diff --git a/smali/android/support/graphics/drawable/VectorDrawableCompat$VPath.smali b/smali/android/support/graphics/drawable/VectorDrawableCompat$VPath.smali index a1668df0..4cc6c72d 100644 --- a/smali/android/support/graphics/drawable/VectorDrawableCompat$VPath.smali +++ b/smali/android/support/graphics/drawable/VectorDrawableCompat$VPath.smali @@ -119,78 +119,84 @@ const-string v1, " " - const/4 v2, 0x0 + move-object v2, v1 + + const/4 v1, 0x0 .line 1691 :goto_0 array-length v3, p1 - if-ge v2, v3, :cond_1 + if-ge v1, v3, :cond_1 .line 1692 new-instance v3, Ljava/lang/StringBuilder; invoke-direct {v3}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - aget-object v1, p1, v2 + aget-object v2, p1, v1 - iget-char v1, v1, Landroid/support/v4/graphics/PathParser$PathDataNode;->mType:C + iget-char v2, v2, Landroid/support/v4/graphics/PathParser$PathDataNode;->mType:C - invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder; + invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder; - const-string v1, ":" + const-string v2, ":" - invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v1 + move-result-object v2 .line 1693 - aget-object v3, p1, v2 + aget-object v3, p1, v1 iget-object v3, v3, Landroid/support/v4/graphics/PathParser$PathDataNode;->mParams:[F - const/4 v4, 0x0 + move-object v4, v2 + + const/4 v2, 0x0 .line 1694 :goto_1 array-length v5, v3 - if-ge v4, v5, :cond_0 + if-ge v2, v5, :cond_0 .line 1695 new-instance v5, Ljava/lang/StringBuilder; invoke-direct {v5}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v5, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v5, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - aget v1, v3, v4 + aget v4, v3, v2 - invoke-virtual {v5, v1}, Ljava/lang/StringBuilder;->append(F)Ljava/lang/StringBuilder; + invoke-virtual {v5, v4}, Ljava/lang/StringBuilder;->append(F)Ljava/lang/StringBuilder; - const-string v1, "," + const-string v4, "," - invoke-virtual {v5, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v5, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v1 + move-result-object v4 - add-int/lit8 v4, v4, 0x1 + add-int/lit8 v2, v2, 0x1 goto :goto_1 :cond_0 - add-int/lit8 v2, v2, 0x1 + add-int/lit8 v1, v1, 0x1 + + move-object v2, v4 goto :goto_0 :cond_1 - return-object v1 + return-object v2 .end method .method public printVPath(I)V diff --git a/smali/android/support/graphics/drawable/VectorDrawableCompat$VPathRenderer.smali b/smali/android/support/graphics/drawable/VectorDrawableCompat$VPathRenderer.smali index 5600d0e3..49871d3b 100644 --- a/smali/android/support/graphics/drawable/VectorDrawableCompat$VPathRenderer.smali +++ b/smali/android/support/graphics/drawable/VectorDrawableCompat$VPathRenderer.smali @@ -194,74 +194,78 @@ iput-object v0, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mVGTargetsMap:Landroid/support/v4/util/ArrayMap; .line 1208 - new-instance v1, Landroid/support/graphics/drawable/VectorDrawableCompat$VGroup; + new-instance v0, Landroid/support/graphics/drawable/VectorDrawableCompat$VGroup; + + iget-object v1, p1, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mRootGroup:Landroid/support/graphics/drawable/VectorDrawableCompat$VGroup; - iget-object v2, p1, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mRootGroup:Landroid/support/graphics/drawable/VectorDrawableCompat$VGroup; + iget-object v2, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mVGTargetsMap:Landroid/support/v4/util/ArrayMap; - invoke-direct {v1, v2, v0}, Landroid/support/graphics/drawable/VectorDrawableCompat$VGroup;->(Landroid/support/graphics/drawable/VectorDrawableCompat$VGroup;Landroid/support/v4/util/ArrayMap;)V + invoke-direct {v0, v1, v2}, Landroid/support/graphics/drawable/VectorDrawableCompat$VGroup;->(Landroid/support/graphics/drawable/VectorDrawableCompat$VGroup;Landroid/support/v4/util/ArrayMap;)V - iput-object v1, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mRootGroup:Landroid/support/graphics/drawable/VectorDrawableCompat$VGroup; + iput-object v0, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mRootGroup:Landroid/support/graphics/drawable/VectorDrawableCompat$VGroup; .line 1209 - new-instance v1, Landroid/graphics/Path; + new-instance v0, Landroid/graphics/Path; - iget-object v2, p1, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mPath:Landroid/graphics/Path; + iget-object v1, p1, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mPath:Landroid/graphics/Path; - invoke-direct {v1, v2}, Landroid/graphics/Path;->(Landroid/graphics/Path;)V + invoke-direct {v0, v1}, Landroid/graphics/Path;->(Landroid/graphics/Path;)V - iput-object v1, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mPath:Landroid/graphics/Path; + iput-object v0, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mPath:Landroid/graphics/Path; .line 1210 - new-instance v1, Landroid/graphics/Path; + new-instance v0, Landroid/graphics/Path; - iget-object v2, p1, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mRenderPath:Landroid/graphics/Path; + iget-object v1, p1, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mRenderPath:Landroid/graphics/Path; - invoke-direct {v1, v2}, Landroid/graphics/Path;->(Landroid/graphics/Path;)V + invoke-direct {v0, v1}, Landroid/graphics/Path;->(Landroid/graphics/Path;)V - iput-object v1, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mRenderPath:Landroid/graphics/Path; + iput-object v0, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mRenderPath:Landroid/graphics/Path; .line 1211 - iget v1, p1, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mBaseWidth:F + iget v0, p1, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mBaseWidth:F - iput v1, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mBaseWidth:F + iput v0, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mBaseWidth:F .line 1212 - iget v1, p1, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mBaseHeight:F + iget v0, p1, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mBaseHeight:F - iput v1, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mBaseHeight:F + iput v0, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mBaseHeight:F .line 1213 - iget v1, p1, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mViewportWidth:F + iget v0, p1, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mViewportWidth:F - iput v1, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mViewportWidth:F + iput v0, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mViewportWidth:F .line 1214 - iget v1, p1, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mViewportHeight:F + iget v0, p1, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mViewportHeight:F - iput v1, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mViewportHeight:F + iput v0, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mViewportHeight:F .line 1215 - iget v1, p1, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mChangingConfigurations:I + iget v0, p1, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mChangingConfigurations:I - iput v1, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mChangingConfigurations:I + iput v0, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mChangingConfigurations:I .line 1216 - iget v1, p1, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mRootAlpha:I + iget v0, p1, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mRootAlpha:I - iput v1, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mRootAlpha:I + iput v0, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mRootAlpha:I .line 1217 - iget-object v1, p1, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mRootName:Ljava/lang/String; + iget-object v0, p1, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mRootName:Ljava/lang/String; - iput-object v1, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mRootName:Ljava/lang/String; + iput-object v0, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mRootName:Ljava/lang/String; .line 1218 - iget-object v1, p1, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mRootName:Ljava/lang/String; + iget-object v0, p1, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mRootName:Ljava/lang/String; - if-eqz v1, :cond_0 + if-eqz v0, :cond_0 .line 1219 - invoke-virtual {v0, v1, p0}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + iget-object v1, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mVGTargetsMap:Landroid/support/v4/util/ArrayMap; + + invoke-virtual {v1, v0, p0}, Landroid/support/v4/util/ArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 1221 :cond_0 @@ -609,6 +613,8 @@ iput-object v1, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mFillPaint:Landroid/graphics/Paint; .line 1311 + iget-object v1, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mFillPaint:Landroid/graphics/Paint; + sget-object v2, Landroid/graphics/Paint$Style;->FILL:Landroid/graphics/Paint$Style; invoke-virtual {v1, v2}, Landroid/graphics/Paint;->setStyle(Landroid/graphics/Paint$Style;)V @@ -716,6 +722,8 @@ iput-object v1, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mStrokePaint:Landroid/graphics/Paint; .line 1333 + iget-object v1, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->mStrokePaint:Landroid/graphics/Paint; + sget-object v2, Landroid/graphics/Paint$Style;->STROKE:Landroid/graphics/Paint$Style; invoke-virtual {v1, v2}, Landroid/graphics/Paint;->setStyle(Landroid/graphics/Paint$Style;)V @@ -826,9 +834,9 @@ const/4 v0, 0x4 + .line 1378 new-array v0, v0, [F - .line 1378 fill-array-data v0, :array_0 .line 1379 @@ -836,6 +844,7 @@ const/4 p1, 0x0 + .line 1380 aget v1, v0, p1 float-to-double v1, v1 @@ -846,7 +855,6 @@ float-to-double v4, v4 - .line 1380 invoke-static {v1, v2, v4, v5}, Ljava/lang/Math;->hypot(DD)D move-result-wide v1 @@ -855,6 +863,7 @@ const/4 v2, 0x2 + .line 1381 aget v4, v0, v2 float-to-double v4, v4 @@ -865,13 +874,13 @@ float-to-double v7, v7 - .line 1381 invoke-static {v4, v5, v7, v8}, Ljava/lang/Math;->hypot(DD)D move-result-wide v4 double-to-float v4, v4 + .line 1382 aget p1, v0, p1 aget v3, v0, v3 @@ -880,7 +889,6 @@ aget v0, v0, v6 - .line 1382 invoke-static {p1, v3, v2, v0}, Landroid/support/graphics/drawable/VectorDrawableCompat$VPathRenderer;->cross(FFFF)F move-result p1 diff --git a/smali/android/support/graphics/drawable/VectorDrawableCompat$VectorDrawableCompatState.smali b/smali/android/support/graphics/drawable/VectorDrawableCompat$VectorDrawableCompatState.smali index 7f6cdbb0..3edd4bd2 100644 --- a/smali/android/support/graphics/drawable/VectorDrawableCompat$VectorDrawableCompatState.smali +++ b/smali/android/support/graphics/drawable/VectorDrawableCompat$VectorDrawableCompatState.smali @@ -331,9 +331,11 @@ iput-object v0, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VectorDrawableCompatState;->mTempPaint:Landroid/graphics/Paint; + .line 1061 + iget-object v0, p0, Landroid/support/graphics/drawable/VectorDrawableCompat$VectorDrawableCompatState;->mTempPaint:Landroid/graphics/Paint; + const/4 v1, 0x1 - .line 1061 invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setFilterBitmap(Z)V .line 1063 @@ -399,6 +401,8 @@ .method public newDrawable()Landroid/graphics/drawable/Drawable; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 1119 new-instance v0, Landroid/support/graphics/drawable/VectorDrawableCompat; @@ -410,6 +414,8 @@ .method public newDrawable(Landroid/content/res/Resources;)Landroid/graphics/drawable/Drawable; .locals 0 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 1125 new-instance p1, Landroid/support/graphics/drawable/VectorDrawableCompat; diff --git a/smali/android/support/graphics/drawable/VectorDrawableCompat$VectorDrawableDelegateState.smali b/smali/android/support/graphics/drawable/VectorDrawableCompat$VectorDrawableDelegateState.smali index d6468542..9d1e78ef 100644 --- a/smali/android/support/graphics/drawable/VectorDrawableCompat$VectorDrawableDelegateState.smali +++ b/smali/android/support/graphics/drawable/VectorDrawableCompat$VectorDrawableDelegateState.smali @@ -4,6 +4,10 @@ # annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0x18 +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/graphics/drawable/VectorDrawableCompat; .end annotation diff --git a/smali/android/support/graphics/drawable/VectorDrawableCompat.smali b/smali/android/support/graphics/drawable/VectorDrawableCompat.smali index 1c4c32d1..3b96f36d 100644 --- a/smali/android/support/graphics/drawable/VectorDrawableCompat.smali +++ b/smali/android/support/graphics/drawable/VectorDrawableCompat.smali @@ -93,9 +93,9 @@ const/16 v0, 0x9 + .line 317 new-array v0, v0, [F - .line 317 iput-object v0, p0, Landroid/support/graphics/drawable/VectorDrawableCompat;->mTmpFloats:[F .line 318 @@ -124,6 +124,10 @@ .method constructor (Landroid/support/graphics/drawable/VectorDrawableCompat$VectorDrawableCompatState;)V .locals 2 + .param p1 # Landroid/support/graphics/drawable/VectorDrawableCompat$VectorDrawableCompatState; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 325 invoke-direct {p0}, Landroid/support/graphics/drawable/VectorDrawableCommon;->()V @@ -135,9 +139,9 @@ const/16 v0, 0x9 + .line 317 new-array v0, v0, [F - .line 317 iput-object v0, p0, Landroid/support/graphics/drawable/VectorDrawableCompat;->mTmpFloats:[F .line 318 @@ -200,6 +204,20 @@ .method public static create(Landroid/content/res/Resources;ILandroid/content/res/Resources$Theme;)Landroid/support/graphics/drawable/VectorDrawableCompat; .locals 6 + .param p0 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param + .param p2 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation const-string v0, "parser error" @@ -600,13 +618,9 @@ invoke-direct {p1, p2}, Lorg/xmlpull/v1/XmlPullParserException;->(Ljava/lang/String;)V - goto :goto_3 - - :goto_2 throw p1 - :goto_3 - goto :goto_2 + return-void .end method .method private needMirroring()Z @@ -713,86 +727,88 @@ const-string v1, "" - const/4 v2, 0x0 + move-object v2, v1 + + const/4 v1, 0x0 :goto_0 - if-ge v2, p2, :cond_0 + if-ge v1, p2, :cond_0 .line 875 new-instance v3, Ljava/lang/StringBuilder; invoke-direct {v3}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v1, " " + const-string v2, " " - invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v1 + move-result-object v2 - add-int/lit8 v2, v2, 0x1 + add-int/lit8 v1, v1, 0x1 goto :goto_0 .line 878 :cond_0 - new-instance v2, Ljava/lang/StringBuilder; + new-instance v1, Ljava/lang/StringBuilder; - invoke-direct {v2}, Ljava/lang/StringBuilder;->()V + invoke-direct {v1}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; const-string v3, "current group is :" - invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; invoke-virtual {p1}, Landroid/support/graphics/drawable/VectorDrawableCompat$VGroup;->getGroupName()Ljava/lang/String; move-result-object v3 - invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; const-string v3, " rotation is " - invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; iget v3, p1, Landroid/support/graphics/drawable/VectorDrawableCompat$VGroup;->mRotate:F - invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(F)Ljava/lang/StringBuilder; + invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(F)Ljava/lang/StringBuilder; - invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v2 + move-result-object v1 const-string v3, "VectorDrawableCompat" - invoke-static {v3, v2}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I + invoke-static {v3, v1}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I .line 880 - new-instance v2, Ljava/lang/StringBuilder; + new-instance v1, Ljava/lang/StringBuilder; - invoke-direct {v2}, Ljava/lang/StringBuilder;->()V + invoke-direct {v1}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v1, "matrix is :" + const-string v2, "matrix is :" - invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; invoke-virtual {p1}, Landroid/support/graphics/drawable/VectorDrawableCompat$VGroup;->getLocalMatrix()Landroid/graphics/Matrix; - move-result-object v1 + move-result-object v2 - invoke-virtual {v1}, Landroid/graphics/Matrix;->toString()Ljava/lang/String; + invoke-virtual {v2}, Landroid/graphics/Matrix;->toString()Ljava/lang/String; - move-result-object v1 + move-result-object v2 - invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; move-result-object v1 @@ -1685,6 +1701,11 @@ .method public getPixelSize()F .locals 4 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 610 iget-object v0, p0, Landroid/support/graphics/drawable/VectorDrawableCompat;->mVectorState:Landroid/support/graphics/drawable/VectorDrawableCompat$VectorDrawableCompatState; @@ -2188,13 +2209,10 @@ .line 543 invoke-virtual {p0}, Landroid/support/graphics/drawable/VectorDrawableCompat;->invalidateSelf()V - goto :goto_0 + const/4 v0, 0x1 :cond_2 - move v3, v0 - - :goto_0 - return v3 + return v0 .end method .method public scheduleSelf(Ljava/lang/Runnable;J)V diff --git a/smali/android/support/interpolator/R.smali b/smali/android/support/interpolator/R.smali index 8eadda3e..6789bdef 100644 --- a/smali/android/support/interpolator/R.smali +++ b/smali/android/support/interpolator/R.smali @@ -1,11 +1,13 @@ .class public final Landroid/support/interpolator/R; .super Ljava/lang/Object; +.source "R.java" # direct methods .method private constructor ()V .locals 0 + .line 10 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/loader/R$attr.smali b/smali/android/support/loader/R$attr.smali index 03fd631f..bc940781 100644 --- a/smali/android/support/loader/R$attr.smali +++ b/smali/android/support/loader/R$attr.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/loader/R$attr; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -43,6 +44,7 @@ .method private constructor ()V .locals 0 + .line 13 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/loader/R$color.smali b/smali/android/support/loader/R$color.smali index ad433e84..3ccbf012 100644 --- a/smali/android/support/loader/R$color.smali +++ b/smali/android/support/loader/R$color.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/loader/R$color; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -27,6 +28,7 @@ .method private constructor ()V .locals 0 + .line 29 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/loader/R$dimen.smali b/smali/android/support/loader/R$dimen.smali index 8eb812a6..232f9d48 100644 --- a/smali/android/support/loader/R$dimen.smali +++ b/smali/android/support/loader/R$dimen.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/loader/R$dimen; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -63,6 +64,7 @@ .method private constructor ()V .locals 0 + .line 37 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/loader/R$drawable.smali b/smali/android/support/loader/R$drawable.smali index 5ae71a70..9db13295 100644 --- a/smali/android/support/loader/R$drawable.smali +++ b/smali/android/support/loader/R$drawable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/loader/R$drawable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -43,6 +44,7 @@ .method private constructor ()V .locals 0 + .line 63 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/loader/R$id.smali b/smali/android/support/loader/R$id.smali index 7fd563e6..7d442cc6 100644 --- a/smali/android/support/loader/R$id.smali +++ b/smali/android/support/loader/R$id.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/loader/R$id; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -75,6 +76,7 @@ .method private constructor ()V .locals 0 + .line 79 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/loader/R$integer.smali b/smali/android/support/loader/R$integer.smali index 076af065..4bc5a3e1 100644 --- a/smali/android/support/loader/R$integer.smali +++ b/smali/android/support/loader/R$integer.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/loader/R$integer; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -21,6 +22,7 @@ .method private constructor ()V .locals 0 + .line 111 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/loader/R$layout.smali b/smali/android/support/loader/R$layout.smali index 2ec7127d..7d9cdfbb 100644 --- a/smali/android/support/loader/R$layout.smali +++ b/smali/android/support/loader/R$layout.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/loader/R$layout; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -31,6 +32,7 @@ .method private constructor ()V .locals 0 + .line 116 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/loader/R$string.smali b/smali/android/support/loader/R$string.smali index 18785e0e..0dd285ab 100644 --- a/smali/android/support/loader/R$string.smali +++ b/smali/android/support/loader/R$string.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/loader/R$string; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -21,6 +22,7 @@ .method private constructor ()V .locals 0 + .line 126 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/loader/R$style.smali b/smali/android/support/loader/R$style.smali index 1a317ae6..2bfc684d 100644 --- a/smali/android/support/loader/R$style.smali +++ b/smali/android/support/loader/R$style.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/loader/R$style; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -33,6 +34,7 @@ .method private constructor ()V .locals 0 + .line 131 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/loader/R$styleable.smali b/smali/android/support/loader/R$styleable.smali index 0387d5bc..d403d827 100644 --- a/smali/android/support/loader/R$styleable.smali +++ b/smali/android/support/loader/R$styleable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/loader/R$styleable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -92,11 +93,12 @@ # direct methods -.method public static constructor ()V +.method static constructor ()V .locals 1 const/4 v0, 0x3 + .line 144 new-array v0, v0, [I fill-array-data v0, :array_0 @@ -105,6 +107,7 @@ const/4 v0, 0x6 + .line 148 new-array v0, v0, [I fill-array-data v0, :array_1 @@ -113,6 +116,7 @@ const/16 v0, 0xa + .line 155 new-array v0, v0, [I fill-array-data v0, :array_2 @@ -121,6 +125,7 @@ const/16 v0, 0xc + .line 166 new-array v0, v0, [I fill-array-data v0, :array_3 @@ -129,6 +134,7 @@ const/4 v0, 0x2 + .line 179 new-array v0, v0, [I fill-array-data v0, :array_4 @@ -196,6 +202,7 @@ .method private constructor ()V .locals 0 + .line 142 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/loader/R.smali b/smali/android/support/loader/R.smali index 6104b3f9..ffa9d50c 100644 --- a/smali/android/support/loader/R.smali +++ b/smali/android/support/loader/R.smali @@ -1,20 +1,21 @@ .class public final Landroid/support/loader/R; .super Ljava/lang/Object; +.source "R.java" # annotations .annotation system Ldalvik/annotation/MemberClasses; value = { - Landroid/support/loader/R$attr;, - Landroid/support/loader/R$color;, - Landroid/support/loader/R$dimen;, - Landroid/support/loader/R$drawable;, - Landroid/support/loader/R$id;, - Landroid/support/loader/R$integer;, - Landroid/support/loader/R$layout;, - Landroid/support/loader/R$string;, + Landroid/support/loader/R$styleable;, Landroid/support/loader/R$style;, - Landroid/support/loader/R$styleable; + Landroid/support/loader/R$string;, + Landroid/support/loader/R$layout;, + Landroid/support/loader/R$integer;, + Landroid/support/loader/R$id;, + Landroid/support/loader/R$drawable;, + Landroid/support/loader/R$dimen;, + Landroid/support/loader/R$color;, + Landroid/support/loader/R$attr; } .end annotation @@ -23,6 +24,7 @@ .method private constructor ()V .locals 0 + .line 10 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/localbroadcastmanager/R.smali b/smali/android/support/localbroadcastmanager/R.smali index 3fabbb6c..f6648f38 100644 --- a/smali/android/support/localbroadcastmanager/R.smali +++ b/smali/android/support/localbroadcastmanager/R.smali @@ -1,11 +1,13 @@ .class public final Landroid/support/localbroadcastmanager/R; .super Ljava/lang/Object; +.source "R.java" # direct methods .method private constructor ()V .locals 0 + .line 10 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/print/R.smali b/smali/android/support/print/R.smali index 8a502242..6342dfb8 100644 --- a/smali/android/support/print/R.smali +++ b/smali/android/support/print/R.smali @@ -1,11 +1,13 @@ .class public final Landroid/support/print/R; .super Ljava/lang/Object; +.source "R.java" # direct methods .method private constructor ()V .locals 0 + .line 10 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/slidingpanelayout/R$attr.smali b/smali/android/support/slidingpanelayout/R$attr.smali index fafa41f2..a86c21d9 100644 --- a/smali/android/support/slidingpanelayout/R$attr.smali +++ b/smali/android/support/slidingpanelayout/R$attr.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/slidingpanelayout/R$attr; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -43,6 +44,7 @@ .method private constructor ()V .locals 0 + .line 13 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/slidingpanelayout/R$color.smali b/smali/android/support/slidingpanelayout/R$color.smali index e2b33789..4c0b8cc4 100644 --- a/smali/android/support/slidingpanelayout/R$color.smali +++ b/smali/android/support/slidingpanelayout/R$color.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/slidingpanelayout/R$color; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -27,6 +28,7 @@ .method private constructor ()V .locals 0 + .line 29 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/slidingpanelayout/R$dimen.smali b/smali/android/support/slidingpanelayout/R$dimen.smali index 0433084f..d8da0db9 100644 --- a/smali/android/support/slidingpanelayout/R$dimen.smali +++ b/smali/android/support/slidingpanelayout/R$dimen.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/slidingpanelayout/R$dimen; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -63,6 +64,7 @@ .method private constructor ()V .locals 0 + .line 37 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/slidingpanelayout/R$drawable.smali b/smali/android/support/slidingpanelayout/R$drawable.smali index 5a67837a..d1aa5978 100644 --- a/smali/android/support/slidingpanelayout/R$drawable.smali +++ b/smali/android/support/slidingpanelayout/R$drawable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/slidingpanelayout/R$drawable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -43,6 +44,7 @@ .method private constructor ()V .locals 0 + .line 63 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/slidingpanelayout/R$id.smali b/smali/android/support/slidingpanelayout/R$id.smali index 1f9da34e..6ce4e5ad 100644 --- a/smali/android/support/slidingpanelayout/R$id.smali +++ b/smali/android/support/slidingpanelayout/R$id.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/slidingpanelayout/R$id; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -75,6 +76,7 @@ .method private constructor ()V .locals 0 + .line 79 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/slidingpanelayout/R$integer.smali b/smali/android/support/slidingpanelayout/R$integer.smali index 0d70b01c..42bccff3 100644 --- a/smali/android/support/slidingpanelayout/R$integer.smali +++ b/smali/android/support/slidingpanelayout/R$integer.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/slidingpanelayout/R$integer; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -21,6 +22,7 @@ .method private constructor ()V .locals 0 + .line 111 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/slidingpanelayout/R$layout.smali b/smali/android/support/slidingpanelayout/R$layout.smali index ab92e304..869e9b40 100644 --- a/smali/android/support/slidingpanelayout/R$layout.smali +++ b/smali/android/support/slidingpanelayout/R$layout.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/slidingpanelayout/R$layout; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -31,6 +32,7 @@ .method private constructor ()V .locals 0 + .line 116 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/slidingpanelayout/R$string.smali b/smali/android/support/slidingpanelayout/R$string.smali index 81621744..36ae6c89 100644 --- a/smali/android/support/slidingpanelayout/R$string.smali +++ b/smali/android/support/slidingpanelayout/R$string.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/slidingpanelayout/R$string; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -21,6 +22,7 @@ .method private constructor ()V .locals 0 + .line 126 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/slidingpanelayout/R$style.smali b/smali/android/support/slidingpanelayout/R$style.smali index b870c594..d4d3d820 100644 --- a/smali/android/support/slidingpanelayout/R$style.smali +++ b/smali/android/support/slidingpanelayout/R$style.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/slidingpanelayout/R$style; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -33,6 +34,7 @@ .method private constructor ()V .locals 0 + .line 131 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/slidingpanelayout/R$styleable.smali b/smali/android/support/slidingpanelayout/R$styleable.smali index 74ce5dcf..ad9f4882 100644 --- a/smali/android/support/slidingpanelayout/R$styleable.smali +++ b/smali/android/support/slidingpanelayout/R$styleable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/slidingpanelayout/R$styleable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -92,11 +93,12 @@ # direct methods -.method public static constructor ()V +.method static constructor ()V .locals 1 const/4 v0, 0x3 + .line 144 new-array v0, v0, [I fill-array-data v0, :array_0 @@ -105,6 +107,7 @@ const/4 v0, 0x6 + .line 148 new-array v0, v0, [I fill-array-data v0, :array_1 @@ -113,6 +116,7 @@ const/16 v0, 0xa + .line 155 new-array v0, v0, [I fill-array-data v0, :array_2 @@ -121,6 +125,7 @@ const/16 v0, 0xc + .line 166 new-array v0, v0, [I fill-array-data v0, :array_3 @@ -129,6 +134,7 @@ const/4 v0, 0x2 + .line 179 new-array v0, v0, [I fill-array-data v0, :array_4 @@ -196,6 +202,7 @@ .method private constructor ()V .locals 0 + .line 142 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/slidingpanelayout/R.smali b/smali/android/support/slidingpanelayout/R.smali index b1db514a..554d3761 100644 --- a/smali/android/support/slidingpanelayout/R.smali +++ b/smali/android/support/slidingpanelayout/R.smali @@ -1,20 +1,21 @@ .class public final Landroid/support/slidingpanelayout/R; .super Ljava/lang/Object; +.source "R.java" # annotations .annotation system Ldalvik/annotation/MemberClasses; value = { - Landroid/support/slidingpanelayout/R$attr;, - Landroid/support/slidingpanelayout/R$color;, - Landroid/support/slidingpanelayout/R$dimen;, - Landroid/support/slidingpanelayout/R$drawable;, - Landroid/support/slidingpanelayout/R$id;, - Landroid/support/slidingpanelayout/R$integer;, - Landroid/support/slidingpanelayout/R$layout;, - Landroid/support/slidingpanelayout/R$string;, + Landroid/support/slidingpanelayout/R$styleable;, Landroid/support/slidingpanelayout/R$style;, - Landroid/support/slidingpanelayout/R$styleable; + Landroid/support/slidingpanelayout/R$string;, + Landroid/support/slidingpanelayout/R$layout;, + Landroid/support/slidingpanelayout/R$integer;, + Landroid/support/slidingpanelayout/R$id;, + Landroid/support/slidingpanelayout/R$drawable;, + Landroid/support/slidingpanelayout/R$dimen;, + Landroid/support/slidingpanelayout/R$color;, + Landroid/support/slidingpanelayout/R$attr; } .end annotation @@ -23,6 +24,7 @@ .method private constructor ()V .locals 0 + .line 10 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/swiperefreshlayout/R$attr.smali b/smali/android/support/swiperefreshlayout/R$attr.smali index 32fa4f54..aa194f07 100644 --- a/smali/android/support/swiperefreshlayout/R$attr.smali +++ b/smali/android/support/swiperefreshlayout/R$attr.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/swiperefreshlayout/R$attr; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -43,6 +44,7 @@ .method private constructor ()V .locals 0 + .line 13 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/swiperefreshlayout/R$color.smali b/smali/android/support/swiperefreshlayout/R$color.smali index b430cda1..eb42630e 100644 --- a/smali/android/support/swiperefreshlayout/R$color.smali +++ b/smali/android/support/swiperefreshlayout/R$color.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/swiperefreshlayout/R$color; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -27,6 +28,7 @@ .method private constructor ()V .locals 0 + .line 29 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/swiperefreshlayout/R$dimen.smali b/smali/android/support/swiperefreshlayout/R$dimen.smali index 954520fd..ef3048d5 100644 --- a/smali/android/support/swiperefreshlayout/R$dimen.smali +++ b/smali/android/support/swiperefreshlayout/R$dimen.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/swiperefreshlayout/R$dimen; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -63,6 +64,7 @@ .method private constructor ()V .locals 0 + .line 37 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/swiperefreshlayout/R$drawable.smali b/smali/android/support/swiperefreshlayout/R$drawable.smali index f394aaf2..0e9e69f9 100644 --- a/smali/android/support/swiperefreshlayout/R$drawable.smali +++ b/smali/android/support/swiperefreshlayout/R$drawable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/swiperefreshlayout/R$drawable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -43,6 +44,7 @@ .method private constructor ()V .locals 0 + .line 63 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/swiperefreshlayout/R$id.smali b/smali/android/support/swiperefreshlayout/R$id.smali index eba2bbf0..e423d88d 100644 --- a/smali/android/support/swiperefreshlayout/R$id.smali +++ b/smali/android/support/swiperefreshlayout/R$id.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/swiperefreshlayout/R$id; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -75,6 +76,7 @@ .method private constructor ()V .locals 0 + .line 79 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/swiperefreshlayout/R$integer.smali b/smali/android/support/swiperefreshlayout/R$integer.smali index 01373f0e..96fb6070 100644 --- a/smali/android/support/swiperefreshlayout/R$integer.smali +++ b/smali/android/support/swiperefreshlayout/R$integer.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/swiperefreshlayout/R$integer; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -21,6 +22,7 @@ .method private constructor ()V .locals 0 + .line 111 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/swiperefreshlayout/R$layout.smali b/smali/android/support/swiperefreshlayout/R$layout.smali index 85b5f4ab..4113914c 100644 --- a/smali/android/support/swiperefreshlayout/R$layout.smali +++ b/smali/android/support/swiperefreshlayout/R$layout.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/swiperefreshlayout/R$layout; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -31,6 +32,7 @@ .method private constructor ()V .locals 0 + .line 116 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/swiperefreshlayout/R$string.smali b/smali/android/support/swiperefreshlayout/R$string.smali index b326738c..a4a90e09 100644 --- a/smali/android/support/swiperefreshlayout/R$string.smali +++ b/smali/android/support/swiperefreshlayout/R$string.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/swiperefreshlayout/R$string; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -21,6 +22,7 @@ .method private constructor ()V .locals 0 + .line 126 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/swiperefreshlayout/R$style.smali b/smali/android/support/swiperefreshlayout/R$style.smali index c573b386..5b593ccd 100644 --- a/smali/android/support/swiperefreshlayout/R$style.smali +++ b/smali/android/support/swiperefreshlayout/R$style.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/swiperefreshlayout/R$style; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -33,6 +34,7 @@ .method private constructor ()V .locals 0 + .line 131 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/swiperefreshlayout/R$styleable.smali b/smali/android/support/swiperefreshlayout/R$styleable.smali index 41b011df..b059bc83 100644 --- a/smali/android/support/swiperefreshlayout/R$styleable.smali +++ b/smali/android/support/swiperefreshlayout/R$styleable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/swiperefreshlayout/R$styleable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -92,11 +93,12 @@ # direct methods -.method public static constructor ()V +.method static constructor ()V .locals 1 const/4 v0, 0x3 + .line 144 new-array v0, v0, [I fill-array-data v0, :array_0 @@ -105,6 +107,7 @@ const/4 v0, 0x6 + .line 148 new-array v0, v0, [I fill-array-data v0, :array_1 @@ -113,6 +116,7 @@ const/16 v0, 0xa + .line 155 new-array v0, v0, [I fill-array-data v0, :array_2 @@ -121,6 +125,7 @@ const/16 v0, 0xc + .line 166 new-array v0, v0, [I fill-array-data v0, :array_3 @@ -129,6 +134,7 @@ const/4 v0, 0x2 + .line 179 new-array v0, v0, [I fill-array-data v0, :array_4 @@ -196,6 +202,7 @@ .method private constructor ()V .locals 0 + .line 142 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/swiperefreshlayout/R.smali b/smali/android/support/swiperefreshlayout/R.smali index bd808c13..7c62785c 100644 --- a/smali/android/support/swiperefreshlayout/R.smali +++ b/smali/android/support/swiperefreshlayout/R.smali @@ -1,20 +1,21 @@ .class public final Landroid/support/swiperefreshlayout/R; .super Ljava/lang/Object; +.source "R.java" # annotations .annotation system Ldalvik/annotation/MemberClasses; value = { - Landroid/support/swiperefreshlayout/R$attr;, - Landroid/support/swiperefreshlayout/R$color;, - Landroid/support/swiperefreshlayout/R$dimen;, - Landroid/support/swiperefreshlayout/R$drawable;, - Landroid/support/swiperefreshlayout/R$id;, - Landroid/support/swiperefreshlayout/R$integer;, - Landroid/support/swiperefreshlayout/R$layout;, - Landroid/support/swiperefreshlayout/R$string;, + Landroid/support/swiperefreshlayout/R$styleable;, Landroid/support/swiperefreshlayout/R$style;, - Landroid/support/swiperefreshlayout/R$styleable; + Landroid/support/swiperefreshlayout/R$string;, + Landroid/support/swiperefreshlayout/R$layout;, + Landroid/support/swiperefreshlayout/R$integer;, + Landroid/support/swiperefreshlayout/R$id;, + Landroid/support/swiperefreshlayout/R$drawable;, + Landroid/support/swiperefreshlayout/R$dimen;, + Landroid/support/swiperefreshlayout/R$color;, + Landroid/support/swiperefreshlayout/R$attr; } .end annotation @@ -23,6 +24,7 @@ .method private constructor ()V .locals 0 + .line 10 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/v13/view/DragAndDropPermissionsCompat.smali b/smali/android/support/v13/view/DragAndDropPermissionsCompat.smali index f2f2d419..67af3cd0 100644 --- a/smali/android/support/v13/view/DragAndDropPermissionsCompat.smali +++ b/smali/android/support/v13/view/DragAndDropPermissionsCompat.smali @@ -22,6 +22,14 @@ .method public static request(Landroid/app/Activity;Landroid/view/DragEvent;)Landroid/support/v13/view/DragAndDropPermissionsCompat; .locals 2 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 44 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v13/view/DragStartHelper.smali b/smali/android/support/v13/view/DragStartHelper.smali index b2ffcd84..923ed351 100644 --- a/smali/android/support/v13/view/DragStartHelper.smali +++ b/smali/android/support/v13/view/DragStartHelper.smali @@ -220,6 +220,9 @@ iput-boolean p1, p0, Landroid/support/v13/view/DragStartHelper;->mDragging:Z + .line 154 + iget-boolean p1, p0, Landroid/support/v13/view/DragStartHelper;->mDragging:Z + return p1 .line 158 diff --git a/smali/android/support/v13/view/inputmethod/EditorInfoCompat.smali b/smali/android/support/v13/view/inputmethod/EditorInfoCompat.smali index ebeab675..e06a5bd6 100644 --- a/smali/android/support/v13/view/inputmethod/EditorInfoCompat.smali +++ b/smali/android/support/v13/view/inputmethod/EditorInfoCompat.smali @@ -19,9 +19,9 @@ const/4 v0, 0x0 + .line 71 new-array v0, v0, [Ljava/lang/String; - .line 71 sput-object v0, Landroid/support/v13/view/inputmethod/EditorInfoCompat;->EMPTY_STRING_ARRAY:[Ljava/lang/String; return-void @@ -40,6 +40,8 @@ .method public static getContentMimeTypes(Landroid/view/inputmethod/EditorInfo;)[Ljava/lang/String; .locals 2 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 111 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -97,6 +99,14 @@ .method public static setContentMimeTypes(Landroid/view/inputmethod/EditorInfo;[Ljava/lang/String;)V .locals 2 + .param p0 # Landroid/view/inputmethod/EditorInfo; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # [Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 89 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v13/view/inputmethod/InputConnectionCompat.smali b/smali/android/support/v13/view/inputmethod/InputConnectionCompat.smali index a8363fc3..cdacaad4 100644 --- a/smali/android/support/v13/view/inputmethod/InputConnectionCompat.smali +++ b/smali/android/support/v13/view/inputmethod/InputConnectionCompat.smali @@ -43,6 +43,22 @@ .method public static commitContent(Landroid/view/inputmethod/InputConnection;Landroid/view/inputmethod/EditorInfo;Landroid/support/v13/view/inputmethod/InputContentInfoCompat;ILandroid/os/Bundle;)Z .locals 5 + .param p0 # Landroid/view/inputmethod/InputConnection; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/view/inputmethod/EditorInfo; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v13/view/inputmethod/InputContentInfoCompat; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 99 invoke-virtual {p2}, Landroid/support/v13/view/inputmethod/InputContentInfoCompat;->getDescription()Landroid/content/ClipDescription; @@ -166,6 +182,20 @@ .method public static createWrapper(Landroid/view/inputmethod/InputConnection;Landroid/view/inputmethod/EditorInfo;Landroid/support/v13/view/inputmethod/InputConnectionCompat$OnCommitContentListener;)Landroid/view/inputmethod/InputConnection; .locals 3 + .param p0 # Landroid/view/inputmethod/InputConnection; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/view/inputmethod/EditorInfo; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v13/view/inputmethod/InputConnectionCompat$OnCommitContentListener; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation if-eqz p0, :cond_4 @@ -243,6 +273,18 @@ .method static handlePerformPrivateCommand(Ljava/lang/String;Landroid/os/Bundle;Landroid/support/v13/view/inputmethod/InputConnectionCompat$OnCommitContentListener;)Z .locals 7 + .param p0 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p1 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v13/view/inputmethod/InputConnectionCompat$OnCommitContentListener; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const-string v0, "android.support.v13.view.inputmethod.InputConnectionCompat.COMMIT_CONTENT" diff --git a/smali/android/support/v13/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatApi25Impl.smali b/smali/android/support/v13/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatApi25Impl.smali index d28c771f..ba2c2982 100644 --- a/smali/android/support/v13/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatApi25Impl.smali +++ b/smali/android/support/v13/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatApi25Impl.smali @@ -7,6 +7,10 @@ # annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0x19 +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v13/view/inputmethod/InputContentInfoCompat; .end annotation @@ -19,11 +23,26 @@ # instance fields .field final mObject:Landroid/view/inputmethod/InputContentInfo; + .annotation build Landroid/support/annotation/NonNull; + .end annotation +.end field # direct methods .method constructor (Landroid/net/Uri;Landroid/content/ClipDescription;Landroid/net/Uri;)V .locals 1 + .param p1 # Landroid/net/Uri; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/content/ClipDescription; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/net/Uri; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 114 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -40,6 +59,10 @@ .method constructor (Ljava/lang/Object;)V .locals 0 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 109 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -56,6 +79,8 @@ # virtual methods .method public getContentUri()Landroid/net/Uri; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 121 iget-object v0, p0, Landroid/support/v13/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatApi25Impl;->mObject:Landroid/view/inputmethod/InputContentInfo; @@ -69,6 +94,8 @@ .method public getDescription()Landroid/content/ClipDescription; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 127 iget-object v0, p0, Landroid/support/v13/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatApi25Impl;->mObject:Landroid/view/inputmethod/InputContentInfo; @@ -82,6 +109,8 @@ .method public getInputContentInfo()Ljava/lang/Object; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 139 iget-object v0, p0, Landroid/support/v13/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatApi25Impl;->mObject:Landroid/view/inputmethod/InputContentInfo; @@ -91,6 +120,8 @@ .method public getLinkUri()Landroid/net/Uri; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 133 iget-object v0, p0, Landroid/support/v13/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatApi25Impl;->mObject:Landroid/view/inputmethod/InputContentInfo; diff --git a/smali/android/support/v13/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatBaseImpl.smali b/smali/android/support/v13/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatBaseImpl.smali index 6c096e66..8eafb86b 100644 --- a/smali/android/support/v13/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatBaseImpl.smali +++ b/smali/android/support/v13/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatBaseImpl.smali @@ -19,15 +19,36 @@ # instance fields .field private final mContentUri:Landroid/net/Uri; + .annotation build Landroid/support/annotation/NonNull; + .end annotation +.end field .field private final mDescription:Landroid/content/ClipDescription; + .annotation build Landroid/support/annotation/NonNull; + .end annotation +.end field .field private final mLinkUri:Landroid/net/Uri; + .annotation build Landroid/support/annotation/Nullable; + .end annotation +.end field # direct methods .method constructor (Landroid/net/Uri;Landroid/content/ClipDescription;Landroid/net/Uri;)V .locals 0 + .param p1 # Landroid/net/Uri; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/content/ClipDescription; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/net/Uri; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 62 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -48,6 +69,8 @@ # virtual methods .method public getContentUri()Landroid/net/Uri; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 71 iget-object v0, p0, Landroid/support/v13/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatBaseImpl;->mContentUri:Landroid/net/Uri; @@ -57,6 +80,8 @@ .method public getDescription()Landroid/content/ClipDescription; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 77 iget-object v0, p0, Landroid/support/v13/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatBaseImpl;->mDescription:Landroid/content/ClipDescription; @@ -66,6 +91,8 @@ .method public getInputContentInfo()Ljava/lang/Object; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation const/4 v0, 0x0 @@ -74,6 +101,8 @@ .method public getLinkUri()Landroid/net/Uri; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 83 iget-object v0, p0, Landroid/support/v13/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatBaseImpl;->mLinkUri:Landroid/net/Uri; diff --git a/smali/android/support/v13/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatImpl.smali b/smali/android/support/v13/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatImpl.smali index 9c907603..e4132c7f 100644 --- a/smali/android/support/v13/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatImpl.smali +++ b/smali/android/support/v13/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatImpl.smali @@ -16,15 +16,23 @@ # virtual methods .method public abstract getContentUri()Landroid/net/Uri; + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract getDescription()Landroid/content/ClipDescription; + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract getInputContentInfo()Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method .method public abstract getLinkUri()Landroid/net/Uri; + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method .method public abstract releasePermission()V diff --git a/smali/android/support/v13/view/inputmethod/InputContentInfoCompat.smali b/smali/android/support/v13/view/inputmethod/InputContentInfoCompat.smali index 9a2c99c3..5b95db1f 100644 --- a/smali/android/support/v13/view/inputmethod/InputContentInfoCompat.smali +++ b/smali/android/support/v13/view/inputmethod/InputContentInfoCompat.smali @@ -20,6 +20,18 @@ # direct methods .method public constructor (Landroid/net/Uri;Landroid/content/ClipDescription;Landroid/net/Uri;)V .locals 2 + .param p1 # Landroid/net/Uri; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/content/ClipDescription; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/net/Uri; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 169 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -54,6 +66,10 @@ .method private constructor (Landroid/support/v13/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatImpl;)V .locals 0 + .param p1 # Landroid/support/v13/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatImpl; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 177 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -66,6 +82,12 @@ .method public static wrap(Ljava/lang/Object;)Landroid/support/v13/view/inputmethod/InputContentInfoCompat; .locals 3 + .param p0 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation const/4 v0, 0x0 @@ -100,6 +122,8 @@ # virtual methods .method public getContentUri()Landroid/net/Uri; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 186 iget-object v0, p0, Landroid/support/v13/view/inputmethod/InputContentInfoCompat;->mImpl:Landroid/support/v13/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatImpl; @@ -113,6 +137,8 @@ .method public getDescription()Landroid/content/ClipDescription; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 196 iget-object v0, p0, Landroid/support/v13/view/inputmethod/InputContentInfoCompat;->mImpl:Landroid/support/v13/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatImpl; @@ -126,6 +152,8 @@ .method public getLinkUri()Landroid/net/Uri; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 204 iget-object v0, p0, Landroid/support/v13/view/inputmethod/InputContentInfoCompat;->mImpl:Landroid/support/v13/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatImpl; @@ -161,6 +189,8 @@ .method public unwrap()Ljava/lang/Object; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 238 iget-object v0, p0, Landroid/support/v13/view/inputmethod/InputContentInfoCompat;->mImpl:Landroid/support/v13/view/inputmethod/InputContentInfoCompat$InputContentInfoCompatImpl; diff --git a/smali/android/support/v4/accessibilityservice/AccessibilityServiceInfoCompat.smali b/smali/android/support/v4/accessibilityservice/AccessibilityServiceInfoCompat.smali index 4434f340..4cb11c9b 100644 --- a/smali/android/support/v4/accessibilityservice/AccessibilityServiceInfoCompat.smali +++ b/smali/android/support/v4/accessibilityservice/AccessibilityServiceInfoCompat.smali @@ -39,6 +39,8 @@ .method public static capabilityToString(I)Ljava/lang/String; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation const/4 v0, 0x1 @@ -83,6 +85,8 @@ .method public static feedbackTypeToString(I)Ljava/lang/String; .locals 4 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 215 new-instance v0, Ljava/lang/StringBuilder; @@ -199,6 +203,8 @@ .method public static flagToString(I)Ljava/lang/String; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation const/4 v0, 0x1 @@ -261,6 +267,10 @@ .method public static getCapabilities(Landroid/accessibilityservice/AccessibilityServiceInfo;)I .locals 2 + .param p0 # Landroid/accessibilityservice/AccessibilityServiceInfo; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 286 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -296,6 +306,16 @@ .method public static loadDescription(Landroid/accessibilityservice/AccessibilityServiceInfo;Landroid/content/pm/PackageManager;)Ljava/lang/String; .locals 2 + .param p0 # Landroid/accessibilityservice/AccessibilityServiceInfo; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/content/pm/PackageManager; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 197 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/app/ActionBarDrawerToggle$Delegate.smali b/smali/android/support/v4/app/ActionBarDrawerToggle$Delegate.smali index ce725807..ab19cb2e 100644 --- a/smali/android/support/v4/app/ActionBarDrawerToggle$Delegate.smali +++ b/smali/android/support/v4/app/ActionBarDrawerToggle$Delegate.smali @@ -19,10 +19,20 @@ # virtual methods .method public abstract getThemeUpIndicator()Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method .method public abstract setActionBarDescription(I)V + .param p1 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param .end method .method public abstract setActionBarUpIndicator(Landroid/graphics/drawable/Drawable;I)V + .param p2 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param .end method diff --git a/smali/android/support/v4/app/ActionBarDrawerToggle$DelegateProvider.smali b/smali/android/support/v4/app/ActionBarDrawerToggle$DelegateProvider.smali index d79fb3f1..aff21d93 100644 --- a/smali/android/support/v4/app/ActionBarDrawerToggle$DelegateProvider.smali +++ b/smali/android/support/v4/app/ActionBarDrawerToggle$DelegateProvider.smali @@ -19,4 +19,6 @@ # virtual methods .method public abstract getDrawerToggleDelegate()Landroid/support/v4/app/ActionBarDrawerToggle$Delegate; + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method diff --git a/smali/android/support/v4/app/ActionBarDrawerToggle$SetIndicatorInfo.smali b/smali/android/support/v4/app/ActionBarDrawerToggle$SetIndicatorInfo.smali index 58ea826e..d52d99c7 100644 --- a/smali/android/support/v4/app/ActionBarDrawerToggle$SetIndicatorInfo.smali +++ b/smali/android/support/v4/app/ActionBarDrawerToggle$SetIndicatorInfo.smali @@ -123,20 +123,23 @@ if-ne v1, v2, :cond_2 - move-object v0, p1 + goto :goto_0 - .line 536 :cond_2 + move-object p1, v0 + + .line 536 + :goto_0 nop - instance-of p1, v0, Landroid/widget/ImageView; + instance-of v0, p1, Landroid/widget/ImageView; - if-eqz p1, :cond_3 + if-eqz v0, :cond_3 .line 538 - check-cast v0, Landroid/widget/ImageView; + check-cast p1, Landroid/widget/ImageView; - iput-object v0, p0, Landroid/support/v4/app/ActionBarDrawerToggle$SetIndicatorInfo;->mUpIndicatorView:Landroid/widget/ImageView; + iput-object p1, p0, Landroid/support/v4/app/ActionBarDrawerToggle$SetIndicatorInfo;->mUpIndicatorView:Landroid/widget/ImageView; :cond_3 return-void diff --git a/smali/android/support/v4/app/ActionBarDrawerToggle$SlideDrawable.smali b/smali/android/support/v4/app/ActionBarDrawerToggle$SlideDrawable.smali index a2abb55d..66f70c3c 100644 --- a/smali/android/support/v4/app/ActionBarDrawerToggle$SlideDrawable.smali +++ b/smali/android/support/v4/app/ActionBarDrawerToggle$SlideDrawable.smali @@ -67,6 +67,10 @@ # virtual methods .method public draw(Landroid/graphics/Canvas;)V .locals 5 + .param p1 # Landroid/graphics/Canvas; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 582 iget-object v0, p0, Landroid/support/v4/app/ActionBarDrawerToggle$SlideDrawable;->mTmpRect:Landroid/graphics/Rect; diff --git a/smali/android/support/v4/app/ActionBarDrawerToggle.smali b/smali/android/support/v4/app/ActionBarDrawerToggle.smali index 288d297a..3995783e 100644 --- a/smali/android/support/v4/app/ActionBarDrawerToggle.smali +++ b/smali/android/support/v4/app/ActionBarDrawerToggle.smali @@ -62,6 +62,7 @@ const/4 v0, 0x1 + .line 120 new-array v0, v0, [I const/4 v1, 0x0 @@ -70,7 +71,6 @@ aput v2, v0, v1 - .line 120 sput-object v0, Landroid/support/v4/app/ActionBarDrawerToggle;->THEME_ATTRS:[I return-void @@ -78,6 +78,18 @@ .method public constructor (Landroid/app/Activity;Landroid/support/v4/widget/DrawerLayout;III)V .locals 8 + .param p3 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param + .param p4 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param + .param p5 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param .line 167 invoke-static {p1}, Landroid/support/v4/app/ActionBarDrawerToggle;->assumeMaterial(Landroid/content/Context;)Z @@ -105,6 +117,18 @@ .method public constructor (Landroid/app/Activity;Landroid/support/v4/widget/DrawerLayout;ZIII)V .locals 1 + .param p4 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param + .param p5 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param + .param p6 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param .line 199 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -177,6 +201,9 @@ iput-object p1, p0, Landroid/support/v4/app/ActionBarDrawerToggle;->mSlider:Landroid/support/v4/app/ActionBarDrawerToggle$SlideDrawable; + .line 217 + iget-object p1, p0, Landroid/support/v4/app/ActionBarDrawerToggle;->mSlider:Landroid/support/v4/app/ActionBarDrawerToggle$SlideDrawable; + if-eqz p3, :cond_1 const p2, 0x3eaaaaab @@ -186,7 +213,6 @@ :cond_1 const/4 p2, 0x0 - .line 217 :goto_1 invoke-virtual {p1, p2}, Landroid/support/v4/app/ActionBarDrawerToggle$SlideDrawable;->setOffset(F)V diff --git a/smali/android/support/v4/app/ActivityCompat$OnRequestPermissionsResultCallback.smali b/smali/android/support/v4/app/ActivityCompat$OnRequestPermissionsResultCallback.smali index e44eeda5..41d4c110 100644 --- a/smali/android/support/v4/app/ActivityCompat$OnRequestPermissionsResultCallback.smali +++ b/smali/android/support/v4/app/ActivityCompat$OnRequestPermissionsResultCallback.smali @@ -16,4 +16,12 @@ # virtual methods .method public abstract onRequestPermissionsResult(I[Ljava/lang/String;[I)V + .param p2 # [Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # [I + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method diff --git a/smali/android/support/v4/app/ActivityCompat$PermissionCompatDelegate.smali b/smali/android/support/v4/app/ActivityCompat$PermissionCompatDelegate.smali index 2582efae..d7dcca3a 100644 --- a/smali/android/support/v4/app/ActivityCompat$PermissionCompatDelegate.smali +++ b/smali/android/support/v4/app/ActivityCompat$PermissionCompatDelegate.smali @@ -16,7 +16,33 @@ # virtual methods .method public abstract onActivityResult(Landroid/app/Activity;IILandroid/content/Intent;)Z + .param p1 # Landroid/app/Activity; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + .end annotation + .end param + .param p4 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .end method .method public abstract requestPermissions(Landroid/app/Activity;[Ljava/lang/String;I)Z + .param p1 # Landroid/app/Activity; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # [Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # I + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + .end annotation + .end param .end method diff --git a/smali/android/support/v4/app/ActivityCompat$RequestPermissionsRequestCodeValidator.smali b/smali/android/support/v4/app/ActivityCompat$RequestPermissionsRequestCodeValidator.smali index 4ab46d6d..220a4ab0 100644 --- a/smali/android/support/v4/app/ActivityCompat$RequestPermissionsRequestCodeValidator.smali +++ b/smali/android/support/v4/app/ActivityCompat$RequestPermissionsRequestCodeValidator.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/app/ActivityCompat; .end annotation diff --git a/smali/android/support/v4/app/ActivityCompat$SharedElementCallback21Impl.smali b/smali/android/support/v4/app/ActivityCompat$SharedElementCallback21Impl.smali index c1e38ac7..122b8389 100644 --- a/smali/android/support/v4/app/ActivityCompat$SharedElementCallback21Impl.smali +++ b/smali/android/support/v4/app/ActivityCompat$SharedElementCallback21Impl.smali @@ -4,6 +4,10 @@ # annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0x15 +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/app/ActivityCompat; .end annotation @@ -153,6 +157,10 @@ .method public onSharedElementsArrived(Ljava/util/List;Ljava/util/List;Landroid/app/SharedElementCallback$OnSharedElementsReadyListener;)V .locals 2 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x17 + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", diff --git a/smali/android/support/v4/app/ActivityCompat.smali b/smali/android/support/v4/app/ActivityCompat.smali index 208f0337..a6546f2b 100644 --- a/smali/android/support/v4/app/ActivityCompat.smali +++ b/smali/android/support/v4/app/ActivityCompat.smali @@ -30,6 +30,10 @@ .method public static finishAffinity(Landroid/app/Activity;)V .locals 2 + .param p0 # Landroid/app/Activity; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 287 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -53,6 +57,10 @@ .method public static finishAfterTransition(Landroid/app/Activity;)V .locals 2 + .param p0 # Landroid/app/Activity; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 304 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -76,6 +84,11 @@ .method public static getPermissionCompatDelegate()Landroid/support/v4/app/ActivityCompat$PermissionCompatDelegate; .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 169 sget-object v0, Landroid/support/v4/app/ActivityCompat;->sDelegate:Landroid/support/v4/app/ActivityCompat$PermissionCompatDelegate; @@ -85,6 +98,12 @@ .method public static getReferrer(Landroid/app/Activity;)Landroid/net/Uri; .locals 2 + .param p0 # Landroid/app/Activity; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 329 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -157,6 +176,10 @@ .method public static postponeEnterTransition(Landroid/app/Activity;)V .locals 2 + .param p0 # Landroid/app/Activity; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 411 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -174,6 +197,8 @@ .method public static requestDragAndDropPermissions(Landroid/app/Activity;Landroid/view/DragEvent;)Landroid/support/v13/view/DragAndDropPermissionsCompat; .locals 0 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 565 invoke-static {p0, p1}, Landroid/support/v13/view/DragAndDropPermissionsCompat;->request(Landroid/app/Activity;Landroid/view/DragEvent;)Landroid/support/v13/view/DragAndDropPermissionsCompat; @@ -185,6 +210,19 @@ .method public static requestPermissions(Landroid/app/Activity;[Ljava/lang/String;I)V .locals 2 + .param p0 # Landroid/app/Activity; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # [Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + .end annotation + .end param .line 491 sget-object v0, Landroid/support/v4/app/ActivityCompat;->sDelegate:Landroid/support/v4/app/ActivityCompat$PermissionCompatDelegate; @@ -256,6 +294,17 @@ .method public static requireViewById(Landroid/app/Activity;I)Landroid/view/View; .locals 2 + .param p0 # Landroid/app/Activity; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/IdRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "SDK_INT:I @@ -333,6 +390,14 @@ .method public static setExitSharedElementCallback(Landroid/app/Activity;Landroid/support/v4/app/SharedElementCallback;)V .locals 2 + .param p0 # Landroid/app/Activity; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/support/v4/app/SharedElementCallback; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 402 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -363,6 +428,10 @@ .method public static setPermissionCompatDelegate(Landroid/support/v4/app/ActivityCompat$PermissionCompatDelegate;)V .locals 0 + .param p0 # Landroid/support/v4/app/ActivityCompat$PermissionCompatDelegate; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 161 sput-object p0, Landroid/support/v4/app/ActivityCompat;->sDelegate:Landroid/support/v4/app/ActivityCompat$PermissionCompatDelegate; @@ -372,6 +441,14 @@ .method public static shouldShowRequestPermissionRationale(Landroid/app/Activity;Ljava/lang/String;)Z .locals 2 + .param p0 # Landroid/app/Activity; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 548 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -395,6 +472,18 @@ .method public static startActivityForResult(Landroid/app/Activity;Landroid/content/Intent;ILandroid/os/Bundle;)V .locals 2 + .param p0 # Landroid/app/Activity; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 233 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -418,6 +507,22 @@ .method public static startIntentSenderForResult(Landroid/app/Activity;Landroid/content/IntentSender;ILandroid/content/Intent;IIILandroid/os/Bundle;)V .locals 2 + .param p0 # Landroid/app/Activity; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/content/IntentSender; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p7 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Landroid/content/IntentSender$SendIntentException; @@ -446,6 +551,10 @@ .method public static startPostponedEnterTransition(Landroid/app/Activity;)V .locals 2 + .param p0 # Landroid/app/Activity; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 417 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/app/ActivityManagerCompat.smali b/smali/android/support/v4/app/ActivityManagerCompat.smali index bffdfa8e..a76c4bd1 100644 --- a/smali/android/support/v4/app/ActivityManagerCompat.smali +++ b/smali/android/support/v4/app/ActivityManagerCompat.smali @@ -15,6 +15,10 @@ .method public static isLowRamDevice(Landroid/app/ActivityManager;)Z .locals 2 + .param p0 # Landroid/app/ActivityManager; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 40 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/app/ActivityOptionsCompat$ActivityOptionsCompatImpl.smali b/smali/android/support/v4/app/ActivityOptionsCompat$ActivityOptionsCompatImpl.smali index 7d4043b3..7fb41cab 100644 --- a/smali/android/support/v4/app/ActivityOptionsCompat$ActivityOptionsCompatImpl.smali +++ b/smali/android/support/v4/app/ActivityOptionsCompat$ActivityOptionsCompatImpl.smali @@ -4,6 +4,10 @@ # annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0x10 +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/app/ActivityOptionsCompat; .end annotation @@ -79,6 +83,10 @@ .method public setLaunchBounds(Landroid/graphics/Rect;)Landroid/support/v4/app/ActivityOptionsCompat; .locals 2 + .param p1 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 283 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/app/ActivityOptionsCompat.smali b/smali/android/support/v4/app/ActivityOptionsCompat.smali index b1053343..676b21bd 100644 --- a/smali/android/support/v4/app/ActivityOptionsCompat.smali +++ b/smali/android/support/v4/app/ActivityOptionsCompat.smali @@ -29,6 +29,8 @@ .method public static makeBasic()Landroid/support/v4/app/ActivityOptionsCompat; .locals 2 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 246 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -59,6 +61,12 @@ .method public static makeClipRevealAnimation(Landroid/view/View;IIII)Landroid/support/v4/app/ActivityOptionsCompat; .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 122 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -89,6 +97,12 @@ .method public static makeCustomAnimation(Landroid/content/Context;II)Landroid/support/v4/app/ActivityOptionsCompat; .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 68 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -119,6 +133,12 @@ .method public static makeScaleUpAnimation(Landroid/view/View;IIII)Landroid/support/v4/app/ActivityOptionsCompat; .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 98 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -149,6 +169,20 @@ .method public static makeSceneTransitionAnimation(Landroid/app/Activity;Landroid/view/View;Ljava/lang/String;)Landroid/support/v4/app/ActivityOptionsCompat; .locals 2 + .param p0 # Landroid/app/Activity; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 179 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -179,6 +213,13 @@ .method public static varargs makeSceneTransitionAnimation(Landroid/app/Activity;[Landroid/support/v4/util/Pair;)Landroid/support/v4/app/ActivityOptionsCompat; .locals 4 + .param p0 # Landroid/app/Activity; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -259,6 +300,8 @@ .method public static makeTaskLaunchBehind()Landroid/support/v4/app/ActivityOptionsCompat; .locals 2 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 234 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -289,6 +332,16 @@ .method public static makeThumbnailScaleUpAnimation(Landroid/view/View;Landroid/graphics/Bitmap;II)Landroid/support/v4/app/ActivityOptionsCompat; .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/graphics/Bitmap; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 151 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -321,6 +374,8 @@ # virtual methods .method public getLaunchBounds()Landroid/graphics/Rect; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation const/4 v0, 0x0 @@ -329,18 +384,30 @@ .method public requestUsageTimeReport(Landroid/app/PendingIntent;)V .locals 0 + .param p1 # Landroid/app/PendingIntent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param return-void .end method .method public setLaunchBounds(Landroid/graphics/Rect;)Landroid/support/v4/app/ActivityOptionsCompat; .locals 0 + .param p1 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation return-object p0 .end method .method public toBundle()Landroid/os/Bundle; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation const/4 v0, 0x0 @@ -349,6 +416,10 @@ .method public update(Landroid/support/v4/app/ActivityOptionsCompat;)V .locals 0 + .param p1 # Landroid/support/v4/app/ActivityOptionsCompat; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param return-void .end method diff --git a/smali/android/support/v4/app/AlarmManagerCompat.smali b/smali/android/support/v4/app/AlarmManagerCompat.smali index d4edf202..038f1b08 100644 --- a/smali/android/support/v4/app/AlarmManagerCompat.smali +++ b/smali/android/support/v4/app/AlarmManagerCompat.smali @@ -15,6 +15,18 @@ .method public static setAlarmClock(Landroid/app/AlarmManager;JLandroid/app/PendingIntent;Landroid/app/PendingIntent;)V .locals 2 + .param p0 # Landroid/app/AlarmManager; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/app/PendingIntent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Landroid/app/PendingIntent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 59 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -44,6 +56,14 @@ .method public static setAndAllowWhileIdle(Landroid/app/AlarmManager;IJLandroid/app/PendingIntent;)V .locals 2 + .param p0 # Landroid/app/AlarmManager; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Landroid/app/PendingIntent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 117 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -67,6 +87,14 @@ .method public static setExact(Landroid/app/AlarmManager;IJLandroid/app/PendingIntent;)V .locals 2 + .param p0 # Landroid/app/AlarmManager; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Landroid/app/PendingIntent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 162 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -90,6 +118,14 @@ .method public static setExactAndAllowWhileIdle(Landroid/app/AlarmManager;IJLandroid/app/PendingIntent;)V .locals 2 + .param p0 # Landroid/app/AlarmManager; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Landroid/app/PendingIntent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 222 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/app/AppComponentFactory.smali b/smali/android/support/v4/app/AppComponentFactory.smali index 8173f3fa..2f17ae3c 100644 --- a/smali/android/support/v4/app/AppComponentFactory.smali +++ b/smali/android/support/v4/app/AppComponentFactory.smali @@ -3,6 +3,12 @@ .source "AppComponentFactory.java" +# annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0x1c +.end annotation + + # direct methods .method public constructor ()V .locals 0 @@ -41,6 +47,21 @@ .method public instantiateActivityCompat(Ljava/lang/ClassLoader;Ljava/lang/String;Landroid/content/Intent;)Landroid/app/Activity; .locals 0 + .param p1 # Ljava/lang/ClassLoader; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Ljava/lang/InstantiationException;, @@ -121,6 +142,17 @@ .method public instantiateApplicationCompat(Ljava/lang/ClassLoader;Ljava/lang/String;)Landroid/app/Application; .locals 1 + .param p1 # Ljava/lang/ClassLoader; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Ljava/lang/InstantiationException;, @@ -201,6 +233,17 @@ .method public instantiateProviderCompat(Ljava/lang/ClassLoader;Ljava/lang/String;)Landroid/content/ContentProvider; .locals 1 + .param p1 # Ljava/lang/ClassLoader; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Ljava/lang/InstantiationException;, @@ -281,6 +324,21 @@ .method public instantiateReceiverCompat(Ljava/lang/ClassLoader;Ljava/lang/String;Landroid/content/Intent;)Landroid/content/BroadcastReceiver; .locals 0 + .param p1 # Ljava/lang/ClassLoader; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Ljava/lang/InstantiationException;, @@ -362,6 +420,21 @@ .method public instantiateServiceCompat(Ljava/lang/ClassLoader;Ljava/lang/String;Landroid/content/Intent;)Landroid/app/Service; .locals 0 + .param p1 # Ljava/lang/ClassLoader; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Ljava/lang/InstantiationException;, diff --git a/smali/android/support/v4/app/AppLaunchChecker.smali b/smali/android/support/v4/app/AppLaunchChecker.smali index 557cedc9..3cea05a0 100644 --- a/smali/android/support/v4/app/AppLaunchChecker.smali +++ b/smali/android/support/v4/app/AppLaunchChecker.smali @@ -23,20 +23,24 @@ .method public static hasStartedFromLauncher(Landroid/content/Context;)Z .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param - const-string v0, "android.support.AppLaunchChecker" + const/4 v0, 0x0 - const/4 v1, 0x0 + const-string v1, "android.support.AppLaunchChecker" .line 51 - invoke-virtual {p0, v0, v1}, Landroid/content/Context;->getSharedPreferences(Ljava/lang/String;I)Landroid/content/SharedPreferences; + invoke-virtual {p0, v1, v0}, Landroid/content/Context;->getSharedPreferences(Ljava/lang/String;I)Landroid/content/SharedPreferences; move-result-object p0 - const-string v0, "startedFromLauncher" + const-string v1, "startedFromLauncher" .line 52 - invoke-interface {p0, v0, v1}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z + invoke-interface {p0, v1, v0}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z move-result p0 @@ -45,24 +49,28 @@ .method public static onActivityCreate(Landroid/app/Activity;)V .locals 4 + .param p0 # Landroid/app/Activity; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param - const-string v0, "android.support.AppLaunchChecker" + const/4 v0, 0x0 - const/4 v1, 0x0 + const-string v1, "android.support.AppLaunchChecker" .line 67 - invoke-virtual {p0, v0, v1}, Landroid/app/Activity;->getSharedPreferences(Ljava/lang/String;I)Landroid/content/SharedPreferences; + invoke-virtual {p0, v1, v0}, Landroid/app/Activity;->getSharedPreferences(Ljava/lang/String;I)Landroid/content/SharedPreferences; - move-result-object v0 + move-result-object v1 const-string v2, "startedFromLauncher" .line 68 - invoke-interface {v0, v2, v1}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z + invoke-interface {v1, v2, v0}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z - move-result v1 + move-result v0 - if-eqz v1, :cond_0 + if-eqz v0, :cond_0 return-void @@ -80,29 +88,29 @@ :cond_1 invoke-virtual {p0}, Landroid/content/Intent;->getAction()Ljava/lang/String; - move-result-object v1 + move-result-object v0 const-string v3, "android.intent.action.MAIN" - invoke-virtual {v3, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v3, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z - move-result v1 + move-result v0 - if-eqz v1, :cond_3 + if-eqz v0, :cond_3 - const-string v1, "android.intent.category.LAUNCHER" + const-string v0, "android.intent.category.LAUNCHER" .line 78 - invoke-virtual {p0, v1}, Landroid/content/Intent;->hasCategory(Ljava/lang/String;)Z + invoke-virtual {p0, v0}, Landroid/content/Intent;->hasCategory(Ljava/lang/String;)Z - move-result v1 + move-result v0 - if-nez v1, :cond_2 + if-nez v0, :cond_2 - const-string v1, "android.intent.category.LEANBACK_LAUNCHER" + const-string v0, "android.intent.category.LEANBACK_LAUNCHER" .line 79 - invoke-virtual {p0, v1}, Landroid/content/Intent;->hasCategory(Ljava/lang/String;)Z + invoke-virtual {p0, v0}, Landroid/content/Intent;->hasCategory(Ljava/lang/String;)Z move-result p0 @@ -110,7 +118,7 @@ .line 80 :cond_2 - invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor; + invoke-interface {v1}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor; move-result-object p0 diff --git a/smali/android/support/v4/app/AppOpsManagerCompat.smali b/smali/android/support/v4/app/AppOpsManagerCompat.smali index 05a91f64..814803dc 100644 --- a/smali/android/support/v4/app/AppOpsManagerCompat.smali +++ b/smali/android/support/v4/app/AppOpsManagerCompat.smali @@ -25,6 +25,18 @@ .method public static noteOp(Landroid/content/Context;Ljava/lang/String;ILjava/lang/String;)I .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 104 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -57,6 +69,18 @@ .method public static noteOpNoThrow(Landroid/content/Context;Ljava/lang/String;ILjava/lang/String;)I .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 124 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -89,6 +113,18 @@ .method public static noteProxyOp(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)I .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 156 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -121,6 +157,18 @@ .method public static noteProxyOpNoThrow(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)I .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 175 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -153,6 +201,12 @@ .method public static permissionToOp(Ljava/lang/String;)Ljava/lang/String; .locals 2 + .param p0 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 75 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/app/BackStackRecord.smali b/smali/android/support/v4/app/BackStackRecord.smali index 6e017c0c..2f079c95 100644 --- a/smali/android/support/v4/app/BackStackRecord.smali +++ b/smali/android/support/v4/app/BackStackRecord.smali @@ -73,6 +73,9 @@ .field final mManager:Landroid/support/v4/app/FragmentManagerImpl; .field mName:Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation +.end field .field mOps:Ljava/util/ArrayList; .annotation system Ldalvik/annotation/Signature; @@ -152,6 +155,10 @@ .method private doAddOp(ILandroid/support/v4/app/Fragment;Ljava/lang/String;I)V .locals 3 + .param p3 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 396 invoke-virtual {p2}, Ljava/lang/Object;->getClass()Ljava/lang/Class; @@ -450,6 +457,10 @@ .method public add(ILandroid/support/v4/app/Fragment;Ljava/lang/String;)Landroid/support/v4/app/FragmentTransaction; .locals 1 + .param p3 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param const/4 v0, 0x1 @@ -461,6 +472,10 @@ .method public add(Landroid/support/v4/app/Fragment;Ljava/lang/String;)Landroid/support/v4/app/FragmentTransaction; .locals 2 + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param const/4 v0, 0x0 @@ -642,6 +657,10 @@ .method public addToBackStack(Ljava/lang/String;)Landroid/support/v4/app/FragmentTransaction; .locals 1 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 544 iget-boolean v0, p0, Landroid/support/v4/app/BackStackRecord;->mAllowAddToBackStack:Z @@ -870,12 +889,12 @@ invoke-direct {v1, v0}, Ljava/io/PrintWriter;->(Ljava/io/Writer;)V - const-string v0, " " + const/4 v0, 0x0 - const/4 v2, 0x0 + const-string v2, " " .line 674 - invoke-virtual {p0, v0, v2, v1, v2}, Landroid/support/v4/app/BackStackRecord;->dump(Ljava/lang/String;Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V + invoke-virtual {p0, v2, v0, v1, v0}, Landroid/support/v4/app/BackStackRecord;->dump(Ljava/lang/String;Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V .line 675 invoke-virtual {v1}, Ljava/io/PrintWriter;->close()V @@ -1256,6 +1275,19 @@ invoke-virtual {p2, v0}, Ljava/io/PrintWriter;->println(Ljava/lang/String;)V + .line 293 + new-instance v0, Ljava/lang/StringBuilder; + + invoke-direct {v0}, Ljava/lang/StringBuilder;->()V + + invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + const-string v1, " " + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + .line 294 iget-object v0, p0, Landroid/support/v4/app/BackStackRecord;->mOps:Ljava/util/ArrayList; @@ -1943,9 +1975,9 @@ move-object/from16 v1, p1 - move-object/from16 v3, p2 + move-object/from16 v4, p2 - const/4 v4, 0x0 + const/4 v3, 0x0 .line 888 :goto_0 @@ -1955,12 +1987,12 @@ move-result v5 - if-ge v4, v5, :cond_a + if-ge v3, v5, :cond_a .line 889 iget-object v5, v0, Landroid/support/v4/app/BackStackRecord;->mOps:Ljava/util/ArrayList; - invoke-virtual {v5, v4}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v5, v3}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; move-result-object v5 @@ -1997,7 +2029,7 @@ if-eq v6, v7, :cond_0 - goto/16 :goto_3 + goto/16 :goto_4 .line 945 :cond_0 @@ -2005,16 +2037,16 @@ new-instance v7, Landroid/support/v4/app/BackStackRecord$Op; - invoke-direct {v7, v11, v3}, Landroid/support/v4/app/BackStackRecord$Op;->(ILandroid/support/v4/app/Fragment;)V + invoke-direct {v7, v11, v4}, Landroid/support/v4/app/BackStackRecord$Op;->(ILandroid/support/v4/app/Fragment;)V - invoke-virtual {v6, v4, v7}, Ljava/util/ArrayList;->add(ILjava/lang/Object;)V + invoke-virtual {v6, v3, v7}, Ljava/util/ArrayList;->add(ILjava/lang/Object;)V - add-int/lit8 v4, v4, 0x1 + add-int/lit8 v3, v3, 0x1 .line 948 - iget-object v3, v5, Landroid/support/v4/app/BackStackRecord$Op;->fragment:Landroid/support/v4/app/Fragment; + iget-object v4, v5, Landroid/support/v4/app/BackStackRecord$Op;->fragment:Landroid/support/v4/app/Fragment; - goto/16 :goto_3 + goto/16 :goto_4 .line 897 :cond_1 @@ -2025,10 +2057,10 @@ .line 898 iget-object v6, v5, Landroid/support/v4/app/BackStackRecord$Op;->fragment:Landroid/support/v4/app/Fragment; - if-ne v6, v3, :cond_9 + if-ne v6, v4, :cond_9 .line 899 - iget-object v3, v0, Landroid/support/v4/app/BackStackRecord;->mOps:Ljava/util/ArrayList; + iget-object v4, v0, Landroid/support/v4/app/BackStackRecord;->mOps:Ljava/util/ArrayList; new-instance v6, Landroid/support/v4/app/BackStackRecord$Op; @@ -2036,13 +2068,13 @@ invoke-direct {v6, v11, v5}, Landroid/support/v4/app/BackStackRecord$Op;->(ILandroid/support/v4/app/Fragment;)V - invoke-virtual {v3, v4, v6}, Ljava/util/ArrayList;->add(ILjava/lang/Object;)V + invoke-virtual {v4, v3, v6}, Ljava/util/ArrayList;->add(ILjava/lang/Object;)V - add-int/lit8 v4, v4, 0x1 + add-int/lit8 v3, v3, 0x1 - move-object v3, v7 + move-object v4, v7 - goto :goto_3 + goto :goto_4 .line 906 :cond_2 @@ -2058,7 +2090,11 @@ sub-int/2addr v12, v8 - const/4 v13, 0x0 + move-object v13, v4 + + move v4, v3 + + const/4 v3, 0x0 :goto_1 if-ltz v12, :cond_6 @@ -2077,25 +2113,25 @@ if-ne v14, v6, :cond_3 - const/4 v13, 0x1 + const/4 v3, 0x1 goto :goto_2 :cond_3 - if-ne v14, v3, :cond_4 + if-ne v14, v13, :cond_4 .line 918 - iget-object v3, v0, Landroid/support/v4/app/BackStackRecord;->mOps:Ljava/util/ArrayList; + iget-object v13, v0, Landroid/support/v4/app/BackStackRecord;->mOps:Ljava/util/ArrayList; new-instance v15, Landroid/support/v4/app/BackStackRecord$Op; invoke-direct {v15, v11, v14}, Landroid/support/v4/app/BackStackRecord$Op;->(ILandroid/support/v4/app/Fragment;)V - invoke-virtual {v3, v4, v15}, Ljava/util/ArrayList;->add(ILjava/lang/Object;)V + invoke-virtual {v13, v4, v15}, Ljava/util/ArrayList;->add(ILjava/lang/Object;)V add-int/lit8 v4, v4, 0x1 - move-object v3, v7 + move-object v13, v7 .line 922 :cond_4 @@ -2140,7 +2176,7 @@ goto :goto_1 :cond_6 - if-eqz v13, :cond_7 + if-eqz v3, :cond_7 .line 934 iget-object v2, v0, Landroid/support/v4/app/BackStackRecord;->mOps:Ljava/util/ArrayList; @@ -2158,7 +2194,12 @@ .line 938 invoke-virtual {v1, v6}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z - goto :goto_3 + :goto_3 + move v3, v4 + + move-object v4, v13 + + goto :goto_4 .line 893 :cond_8 @@ -2167,13 +2208,13 @@ invoke-virtual {v1, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z :cond_9 - :goto_3 - add-int/2addr v4, v8 + :goto_4 + add-int/2addr v3, v8 goto/16 :goto_0 :cond_a - return-object v3 + return-object v4 .end method .method public generateOps(Ljava/util/ArrayList;Ljava/util/ArrayList;)Z @@ -2245,6 +2286,8 @@ .method public getBreadCrumbShortTitle()Ljava/lang/CharSequence; .locals 2 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 363 iget v0, p0, Landroid/support/v4/app/BackStackRecord;->mBreadCrumbShortTitleRes:I @@ -2286,6 +2329,8 @@ .method public getBreadCrumbTitle()Ljava/lang/CharSequence; .locals 2 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 354 iget v0, p0, Landroid/support/v4/app/BackStackRecord;->mBreadCrumbTitleRes:I @@ -2336,6 +2381,8 @@ .method public getName()Ljava/lang/String; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 1017 iget-object v0, p0, Landroid/support/v4/app/BackStackRecord;->mName:Ljava/lang/String; @@ -2461,15 +2508,17 @@ const/4 v2, -0x1 - const/4 v3, 0x0 + const/4 v2, 0x0 + + const/4 v3, -0x1 :goto_0 - if-ge v3, v1, :cond_7 + if-ge v2, v1, :cond_7 .line 729 iget-object v4, p0, Landroid/support/v4/app/BackStackRecord;->mOps:Ljava/util/ArrayList; - invoke-virtual {v4, v3}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v4, v2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; move-result-object v4 @@ -2492,15 +2541,15 @@ :goto_1 if-eqz v4, :cond_6 - if-eq v4, v2, :cond_6 + if-eq v4, v3, :cond_6 - move v2, p2 + move v3, p2 :goto_2 - if-ge v2, p3, :cond_5 + if-ge v3, p3, :cond_5 .line 734 - invoke-virtual {p1, v2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {p1, v3}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; move-result-object v5 @@ -2554,15 +2603,15 @@ goto :goto_3 :cond_4 - add-int/lit8 v2, v2, 0x1 + add-int/lit8 v3, v3, 0x1 goto :goto_2 :cond_5 - move v2, v4 + move v3, v4 :cond_6 - add-int/lit8 v3, v3, 0x1 + add-int/lit8 v2, v2, 0x1 goto :goto_0 @@ -2668,6 +2717,10 @@ .method public replace(ILandroid/support/v4/app/Fragment;Ljava/lang/String;)Landroid/support/v4/app/FragmentTransaction; .locals 1 + .param p3 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param if-eqz p1, :cond_0 @@ -2798,6 +2851,10 @@ .method public setBreadCrumbShortTitle(Ljava/lang/CharSequence;)Landroid/support/v4/app/FragmentTransaction; .locals 1 + .param p1 # Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param const/4 v0, 0x0 @@ -2826,6 +2883,10 @@ .method public setBreadCrumbTitle(Ljava/lang/CharSequence;)Landroid/support/v4/app/FragmentTransaction; .locals 1 + .param p1 # Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param const/4 v0, 0x0 @@ -2916,6 +2977,10 @@ .method public setPrimaryNavigationFragment(Landroid/support/v4/app/Fragment;)Landroid/support/v4/app/FragmentTransaction; .locals 2 + .param p1 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 485 new-instance v0, Landroid/support/v4/app/BackStackRecord$Op; diff --git a/smali/android/support/v4/app/BackStackState.smali b/smali/android/support/v4/app/BackStackState.smali index 3a188bd6..cd863f0a 100644 --- a/smali/android/support/v4/app/BackStackState.smali +++ b/smali/android/support/v4/app/BackStackState.smali @@ -364,13 +364,9 @@ invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;->(Ljava/lang/String;)V - goto :goto_3 - - :goto_2 throw p1 - :goto_3 - goto :goto_2 + return-void .end method @@ -492,33 +488,27 @@ add-int/lit8 v5, v4, 0x1 - aget v1, v1, v4 + aget v4, v1, v4 - iput v1, v3, Landroid/support/v4/app/BackStackRecord$Op;->enterAnim:I - - .line 111 - iget-object v1, p0, Landroid/support/v4/app/BackStackState;->mOps:[I + iput v4, v3, Landroid/support/v4/app/BackStackRecord$Op;->enterAnim:I add-int/lit8 v4, v5, 0x1 - aget v1, v1, v5 + .line 111 + aget v5, v1, v5 - iput v1, v3, Landroid/support/v4/app/BackStackRecord$Op;->exitAnim:I - - .line 112 - iget-object v1, p0, Landroid/support/v4/app/BackStackState;->mOps:[I + iput v5, v3, Landroid/support/v4/app/BackStackRecord$Op;->exitAnim:I add-int/lit8 v5, v4, 0x1 - aget v1, v1, v4 + .line 112 + aget v4, v1, v4 - iput v1, v3, Landroid/support/v4/app/BackStackRecord$Op;->popEnterAnim:I - - .line 113 - iget-object v1, p0, Landroid/support/v4/app/BackStackState;->mOps:[I + iput v4, v3, Landroid/support/v4/app/BackStackRecord$Op;->popEnterAnim:I add-int/lit8 v4, v5, 0x1 + .line 113 aget v1, v1, v5 iput v1, v3, Landroid/support/v4/app/BackStackRecord$Op;->popExitAnim:I diff --git a/smali/android/support/v4/app/BundleCompat$BundleCompatBaseImpl.smali b/smali/android/support/v4/app/BundleCompat$BundleCompatBaseImpl.smali index f662a8f9..eed84030 100644 --- a/smali/android/support/v4/app/BundleCompat$BundleCompatBaseImpl.smali +++ b/smali/android/support/v4/app/BundleCompat$BundleCompatBaseImpl.smali @@ -69,6 +69,8 @@ sput-object v0, Landroid/support/v4/app/BundleCompat$BundleCompatBaseImpl;->sGetIBinderMethod:Ljava/lang/reflect/Method; .line 51 + sget-object v0, Landroid/support/v4/app/BundleCompat$BundleCompatBaseImpl;->sGetIBinderMethod:Ljava/lang/reflect/Method; + invoke-virtual {v0, v3}, Ljava/lang/reflect/Method;->setAccessible(Z)V :try_end_0 .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0 @@ -95,12 +97,12 @@ if-eqz v0, :cond_1 + .line 60 :try_start_1 new-array v3, v3, [Ljava/lang/Object; aput-object p1, v3, v1 - .line 60 invoke-virtual {v0, p0, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; move-result-object p0 @@ -179,6 +181,8 @@ sput-object v0, Landroid/support/v4/app/BundleCompat$BundleCompatBaseImpl;->sPutIBinderMethod:Ljava/lang/reflect/Method; .line 75 + sget-object v0, Landroid/support/v4/app/BundleCompat$BundleCompatBaseImpl;->sPutIBinderMethod:Ljava/lang/reflect/Method; + invoke-virtual {v0, v4}, Ljava/lang/reflect/Method;->setAccessible(Z)V :try_end_0 .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0 @@ -203,6 +207,7 @@ if-eqz v0, :cond_1 + .line 84 :try_start_1 new-array v3, v3, [Ljava/lang/Object; @@ -210,7 +215,6 @@ aput-object p2, v3, v4 - .line 84 invoke-virtual {v0, p0, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; :try_end_1 .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_1 .. :try_end_1} :catch_3 diff --git a/smali/android/support/v4/app/BundleCompat.smali b/smali/android/support/v4/app/BundleCompat.smali index c1f1ac32..fca6e134 100644 --- a/smali/android/support/v4/app/BundleCompat.smali +++ b/smali/android/support/v4/app/BundleCompat.smali @@ -23,6 +23,16 @@ .method public static getBinder(Landroid/os/Bundle;Ljava/lang/String;)Landroid/os/IBinder; .locals 2 + .param p0 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 105 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -49,6 +59,18 @@ .method public static putBinder(Landroid/os/Bundle;Ljava/lang/String;Landroid/os/IBinder;)V .locals 2 + .param p0 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p2 # Landroid/os/IBinder; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 121 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/app/CoreComponentFactory$CompatWrapped.smali b/smali/android/support/v4/app/CoreComponentFactory$CompatWrapped.smali index d252f88b..99801500 100644 --- a/smali/android/support/v4/app/CoreComponentFactory$CompatWrapped.smali +++ b/smali/android/support/v4/app/CoreComponentFactory$CompatWrapped.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/app/CoreComponentFactory; .end annotation diff --git a/smali/android/support/v4/app/CoreComponentFactory.smali b/smali/android/support/v4/app/CoreComponentFactory.smali index 1e225297..69ccccf2 100644 --- a/smali/android/support/v4/app/CoreComponentFactory.smali +++ b/smali/android/support/v4/app/CoreComponentFactory.smali @@ -4,6 +4,16 @@ # annotations +.annotation build Landroid/support/annotation/RequiresApi; + api = 0x1c +.end annotation + +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v4/app/CoreComponentFactory$CompatWrapped; diff --git a/smali/android/support/v4/app/DialogFragment.smali b/smali/android/support/v4/app/DialogFragment.smali index 73fe9304..7b2328af 100644 --- a/smali/android/support/v4/app/DialogFragment.smali +++ b/smali/android/support/v4/app/DialogFragment.smali @@ -206,6 +206,8 @@ .method public getTheme()I .locals 1 + .annotation build Landroid/support/annotation/StyleRes; + .end annotation .line 235 iget v0, p0, Landroid/support/v4/app/DialogFragment;->mTheme:I @@ -224,6 +226,10 @@ .method public onActivityCreated(Landroid/os/Bundle;)V .locals 2 + .param p1 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 401 invoke-super {p0, p1}, Landroid/support/v4/app/Fragment;->onActivityCreated(Landroid/os/Bundle;)V @@ -347,6 +353,10 @@ .method public onCreate(Landroid/os/Bundle;)V .locals 3 + .param p1 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 310 invoke-super {p0, p1}, Landroid/support/v4/app/Fragment;->onCreate(Landroid/os/Bundle;)V @@ -427,6 +437,12 @@ .method public onCreateDialog(Landroid/os/Bundle;)Landroid/app/Dialog; .locals 2 + .param p1 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 381 new-instance p1, Landroid/app/Dialog; @@ -515,6 +531,12 @@ .method public onGetLayoutInflater(Landroid/os/Bundle;)Landroid/view/LayoutInflater; .locals 2 + .param p1 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 326 iget-boolean v0, p0, Landroid/support/v4/app/DialogFragment;->mShowsDialog:Z @@ -536,6 +558,9 @@ iput-object p1, p0, Landroid/support/v4/app/DialogFragment;->mDialog:Landroid/app/Dialog; + .line 332 + iget-object p1, p0, Landroid/support/v4/app/DialogFragment;->mDialog:Landroid/app/Dialog; + const-string v0, "layout_inflater" if-eqz p1, :cond_1 @@ -579,6 +604,10 @@ .method public onSaveInstanceState(Landroid/os/Bundle;)V .locals 2 + .param p1 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 442 invoke-super {p0, p1}, Landroid/support/v4/app/Fragment;->onSaveInstanceState(Landroid/os/Bundle;)V @@ -730,10 +759,17 @@ .method public setStyle(II)V .locals 1 + .param p2 # I + .annotation build Landroid/support/annotation/StyleRes; + .end annotation + .end param .line 119 iput p1, p0, Landroid/support/v4/app/DialogFragment;->mStyle:I + .line 120 + iget p1, p0, Landroid/support/v4/app/DialogFragment;->mStyle:I + const/4 v0, 0x2 if-eq p1, v0, :cond_0 @@ -760,6 +796,11 @@ .method public setupDialog(Landroid/app/Dialog;I)V .locals 2 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation const/4 v0, 0x1 @@ -819,6 +860,9 @@ iput p1, p0, Landroid/support/v4/app/DialogFragment;->mBackStackId:I + .line 162 + iget p1, p0, Landroid/support/v4/app/DialogFragment;->mBackStackId:I + return p1 .end method diff --git a/smali/android/support/v4/app/Fragment$2.smali b/smali/android/support/v4/app/Fragment$2.smali index 0123ae59..e24be91d 100644 --- a/smali/android/support/v4/app/Fragment$2.smali +++ b/smali/android/support/v4/app/Fragment$2.smali @@ -49,6 +49,8 @@ .method public onFindViewById(I)Landroid/view/View; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 2390 iget-object v0, p0, Landroid/support/v4/app/Fragment$2;->this$0:Landroid/support/v4/app/Fragment; diff --git a/smali/android/support/v4/app/Fragment$3.smali b/smali/android/support/v4/app/Fragment$3.smali index 40e56a7e..02107081 100644 --- a/smali/android/support/v4/app/Fragment$3.smali +++ b/smali/android/support/v4/app/Fragment$3.smali @@ -50,9 +50,7 @@ new-instance v1, Landroid/arch/lifecycle/LifecycleRegistry; - iget-object v2, p0, Landroid/support/v4/app/Fragment$3;->this$0:Landroid/support/v4/app/Fragment; - - iget-object v2, v2, Landroid/support/v4/app/Fragment;->mViewLifecycleOwner:Landroid/arch/lifecycle/LifecycleOwner; + iget-object v2, v0, Landroid/support/v4/app/Fragment;->mViewLifecycleOwner:Landroid/arch/lifecycle/LifecycleOwner; invoke-direct {v1, v2}, Landroid/arch/lifecycle/LifecycleRegistry;->(Landroid/arch/lifecycle/LifecycleOwner;)V diff --git a/smali/android/support/v4/app/Fragment$SavedState.smali b/smali/android/support/v4/app/Fragment$SavedState.smali index eb01ad9f..1519cdf3 100644 --- a/smali/android/support/v4/app/Fragment$SavedState.smali +++ b/smali/android/support/v4/app/Fragment$SavedState.smali @@ -74,6 +74,9 @@ if-eqz p2, :cond_0 + .line 350 + iget-object p1, p0, Landroid/support/v4/app/Fragment$SavedState;->mState:Landroid/os/Bundle; + if-eqz p1, :cond_0 .line 351 diff --git a/smali/android/support/v4/app/Fragment.smali b/smali/android/support/v4/app/Fragment.smali index e6c8ce39..115a9f3e 100644 --- a/smali/android/support/v4/app/Fragment.smali +++ b/smali/android/support/v4/app/Fragment.smali @@ -115,6 +115,9 @@ .field mSavedFragmentState:Landroid/os/Bundle; .field mSavedUserVisibleHint:Ljava/lang/Boolean; + .annotation build Landroid/support/annotation/Nullable; + .end annotation +.end field .field mSavedViewState:Landroid/util/SparseArray; .annotation system Ldalvik/annotation/Signature; @@ -261,6 +264,10 @@ .method public static instantiate(Landroid/content/Context;Ljava/lang/String;Landroid/os/Bundle;)Landroid/support/v4/app/Fragment; .locals 5 + .param p2 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param const-string v0, " empty constructor that is public" @@ -274,11 +281,11 @@ invoke-virtual {v3, p1}, Landroid/support/v4/util/SimpleArrayMap;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v4 + move-result-object v3 - check-cast v4, Ljava/lang/Class; + check-cast v3, Ljava/lang/Class; - if-nez v4, :cond_0 + if-nez v3, :cond_0 .line 440 invoke-virtual {p0}, Landroid/content/Context;->getClassLoader()Ljava/lang/ClassLoader; @@ -287,18 +294,20 @@ invoke-virtual {p0, p1}, Ljava/lang/ClassLoader;->loadClass(Ljava/lang/String;)Ljava/lang/Class; - move-result-object v4 + move-result-object v3 .line 441 - invoke-virtual {v3, p1, v4}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + sget-object p0, Landroid/support/v4/app/Fragment;->sClassMap:Landroid/support/v4/util/SimpleArrayMap; + + invoke-virtual {p0, p1, v3}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; :cond_0 const/4 p0, 0x0 - new-array v3, p0, [Ljava/lang/Class; - .line 443 - invoke-virtual {v4, v3}, Ljava/lang/Class;->getConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor; + new-array v4, p0, [Ljava/lang/Class; + + invoke-virtual {v3, v4}, Ljava/lang/Class;->getConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor; move-result-object v3 @@ -467,7 +476,7 @@ .end method .method static isSupportFragmentClass(Landroid/content/Context;Ljava/lang/String;)Z - .locals 2 + .locals 1 .line 480 :try_start_0 @@ -475,11 +484,11 @@ invoke-virtual {v0, p1}, Landroid/support/v4/util/SimpleArrayMap;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v1 + move-result-object v0 - check-cast v1, Ljava/lang/Class; + check-cast v0, Ljava/lang/Class; - if-nez v1, :cond_0 + if-nez v0, :cond_0 .line 483 invoke-virtual {p0}, Landroid/content/Context;->getClassLoader()Ljava/lang/ClassLoader; @@ -488,16 +497,18 @@ invoke-virtual {p0, p1}, Ljava/lang/ClassLoader;->loadClass(Ljava/lang/String;)Ljava/lang/Class; - move-result-object v1 + move-result-object v0 .line 484 - invoke-virtual {v0, p1, v1}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + sget-object p0, Landroid/support/v4/app/Fragment;->sClassMap:Landroid/support/v4/util/SimpleArrayMap; + + invoke-virtual {p0, p1, v0}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 486 :cond_0 const-class p0, Landroid/support/v4/app/Fragment; - invoke-virtual {p0, v1}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z + invoke-virtual {p0, v0}, Ljava/lang/Class;->isAssignableFrom(Ljava/lang/Class;)Z move-result p0 :try_end_0 @@ -523,6 +534,8 @@ if-nez v0, :cond_0 + move-object v0, v1 + goto :goto_0 :cond_0 @@ -532,8 +545,6 @@ iput-boolean v2, v0, Landroid/support/v4/app/Fragment$AnimationInfo;->mEnterTransitionPostponed:Z .line 2276 - iget-object v0, p0, Landroid/support/v4/app/Fragment;->mAnimationInfo:Landroid/support/v4/app/Fragment$AnimationInfo; - iget-object v0, v0, Landroid/support/v4/app/Fragment$AnimationInfo;->mStartEnterTransitionListener:Landroid/support/v4/app/Fragment$OnStartEnterTransitionListener; .line 2277 @@ -541,13 +552,11 @@ iput-object v1, v2, Landroid/support/v4/app/Fragment$AnimationInfo;->mStartEnterTransitionListener:Landroid/support/v4/app/Fragment$OnStartEnterTransitionListener; - move-object v1, v0 - :goto_0 - if-eqz v1, :cond_1 + if-eqz v0, :cond_1 .line 2280 - invoke-interface {v1}, Landroid/support/v4/app/Fragment$OnStartEnterTransitionListener;->onStartEnterTransition()V + invoke-interface {v0}, Landroid/support/v4/app/Fragment$OnStartEnterTransitionListener;->onStartEnterTransition()V :cond_1 return-void @@ -1096,6 +1105,8 @@ .method public final getActivity()Landroid/support/v4/app/FragmentActivity; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 710 iget-object v0, p0, Landroid/support/v4/app/Fragment;->mHost:Landroid/support/v4/app/FragmentHostCallback; @@ -1225,6 +1236,8 @@ .method public final getArguments()Landroid/os/Bundle; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 592 iget-object v0, p0, Landroid/support/v4/app/Fragment;->mArguments:Landroid/os/Bundle; @@ -1234,6 +1247,8 @@ .method public final getChildFragmentManager()Landroid/support/v4/app/FragmentManager; .locals 2 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 844 iget-object v0, p0, Landroid/support/v4/app/Fragment;->mChildFragmentManager:Landroid/support/v4/app/FragmentManagerImpl; @@ -1301,6 +1316,8 @@ .method public getContext()Landroid/content/Context; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 683 iget-object v0, p0, Landroid/support/v4/app/Fragment;->mHost:Landroid/support/v4/app/FragmentHostCallback; @@ -1322,6 +1339,8 @@ .method public getEnterTransition()Ljava/lang/Object; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 1961 iget-object v0, p0, Landroid/support/v4/app/Fragment;->mAnimationInfo:Landroid/support/v4/app/Fragment$AnimationInfo; @@ -1360,6 +1379,8 @@ .method public getExitTransition()Ljava/lang/Object; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 2040 iget-object v0, p0, Landroid/support/v4/app/Fragment;->mAnimationInfo:Landroid/support/v4/app/Fragment$AnimationInfo; @@ -1398,6 +1419,8 @@ .method public final getFragmentManager()Landroid/support/v4/app/FragmentManager; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 812 iget-object v0, p0, Landroid/support/v4/app/Fragment;->mFragmentManager:Landroid/support/v4/app/FragmentManagerImpl; @@ -1407,6 +1430,8 @@ .method public final getHost()Ljava/lang/Object; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 737 iget-object v0, p0, Landroid/support/v4/app/Fragment;->mHost:Landroid/support/v4/app/FragmentHostCallback; @@ -1456,6 +1481,19 @@ .method public getLayoutInflater(Landroid/os/Bundle;)Landroid/view/LayoutInflater; .locals 1 + .param p1 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation + .annotation runtime Ljava/lang/Deprecated; .end annotation @@ -1575,6 +1613,8 @@ .method public final getParentFragment()Landroid/support/v4/app/Fragment; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 874 iget-object v0, p0, Landroid/support/v4/app/Fragment;->mParentFragment:Landroid/support/v4/app/Fragment; @@ -1619,6 +1659,8 @@ .method public final getResources()Landroid/content/res/Resources; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 760 invoke-virtual {p0}, Landroid/support/v4/app/Fragment;->requireContext()Landroid/content/Context; @@ -1643,6 +1685,8 @@ .method public getReturnTransition()Ljava/lang/Object; .locals 2 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 2000 iget-object v0, p0, Landroid/support/v4/app/Fragment;->mAnimationInfo:Landroid/support/v4/app/Fragment$AnimationInfo; @@ -1678,6 +1722,8 @@ .method public getSharedElementEnterTransition()Ljava/lang/Object; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 2111 iget-object v0, p0, Landroid/support/v4/app/Fragment;->mAnimationInfo:Landroid/support/v4/app/Fragment$AnimationInfo; @@ -1697,6 +1743,8 @@ .method public getSharedElementReturnTransition()Ljava/lang/Object; .locals 2 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 2149 iget-object v0, p0, Landroid/support/v4/app/Fragment;->mAnimationInfo:Landroid/support/v4/app/Fragment$AnimationInfo; @@ -1752,6 +1800,12 @@ .method public final getString(I)Ljava/lang/String; .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 782 invoke-virtual {p0}, Landroid/support/v4/app/Fragment;->getResources()Landroid/content/res/Resources; @@ -1767,6 +1821,12 @@ .method public final varargs getString(I[Ljava/lang/Object;)Ljava/lang/String; .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 795 invoke-virtual {p0}, Landroid/support/v4/app/Fragment;->getResources()Landroid/content/res/Resources; @@ -1782,6 +1842,8 @@ .method public final getTag()Ljava/lang/String; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 569 iget-object v0, p0, Landroid/support/v4/app/Fragment;->mTag:Ljava/lang/String; @@ -1791,6 +1853,8 @@ .method public final getTargetFragment()Landroid/support/v4/app/Fragment; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 666 iget-object v0, p0, Landroid/support/v4/app/Fragment;->mTarget:Landroid/support/v4/app/Fragment; @@ -1809,6 +1873,12 @@ .method public final getText(I)Ljava/lang/CharSequence; .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 771 invoke-virtual {p0}, Landroid/support/v4/app/Fragment;->getResources()Landroid/content/res/Resources; @@ -1833,6 +1903,8 @@ .method public getView()Landroid/view/View; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 1577 iget-object v0, p0, Landroid/support/v4/app/Fragment;->mView:Landroid/view/View; @@ -1842,6 +1914,11 @@ .method public getViewLifecycleOwner()Landroid/arch/lifecycle/LifecycleOwner; .locals 2 + .annotation build Landroid/support/annotation/MainThread; + .end annotation + + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 296 iget-object v0, p0, Landroid/support/v4/app/Fragment;->mViewLifecycleOwner:Landroid/arch/lifecycle/LifecycleOwner; @@ -1863,6 +1940,9 @@ .method public getViewLifecycleOwnerLiveData()Landroid/arch/lifecycle/LiveData; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "()", @@ -1880,6 +1960,8 @@ .method public getViewModelStore()Landroid/arch/lifecycle/ViewModelStore; .locals 2 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 327 invoke-virtual {p0}, Landroid/support/v4/app/Fragment;->getContext()Landroid/content/Context; @@ -1919,6 +2001,11 @@ .method public final hasOptionsMenu()Z .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 945 iget-boolean v0, p0, Landroid/support/v4/app/Fragment;->mHasMenu:Z @@ -2016,6 +2103,8 @@ iput-object v0, p0, Landroid/support/v4/app/Fragment;->mChildFragmentManager:Landroid/support/v4/app/FragmentManagerImpl; .line 2386 + iget-object v0, p0, Landroid/support/v4/app/Fragment;->mChildFragmentManager:Landroid/support/v4/app/FragmentManagerImpl; + iget-object v1, p0, Landroid/support/v4/app/Fragment;->mHost:Landroid/support/v4/app/FragmentHostCallback; new-instance v2, Landroid/support/v4/app/Fragment$2; @@ -2127,6 +2216,11 @@ .method public final isMenuVisible()Z .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 951 iget-boolean v0, p0, Landroid/support/v4/app/Fragment;->mMenuVisible:Z @@ -2267,6 +2361,12 @@ .method public onActivityCreated(Landroid/os/Bundle;)V .locals 0 + .param p1 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/CallSuper; + .end annotation const/4 p1, 0x1 @@ -2284,6 +2384,9 @@ .method public onAttach(Landroid/app/Activity;)V .locals 0 + .annotation build Landroid/support/annotation/CallSuper; + .end annotation + .annotation runtime Ljava/lang/Deprecated; .end annotation @@ -2297,6 +2400,8 @@ .method public onAttach(Landroid/content/Context;)V .locals 1 + .annotation build Landroid/support/annotation/CallSuper; + .end annotation const/4 p1, 0x1 @@ -2340,6 +2445,8 @@ .method public onConfigurationChanged(Landroid/content/res/Configuration;)V .locals 0 + .annotation build Landroid/support/annotation/CallSuper; + .end annotation const/4 p1, 0x1 @@ -2359,6 +2466,12 @@ .method public onCreate(Landroid/os/Bundle;)V .locals 1 + .param p1 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/CallSuper; + .end annotation const/4 v0, 0x1 @@ -2426,6 +2539,20 @@ .method public onCreateView(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Landroid/os/Bundle;)Landroid/view/View; .locals 0 + .param p1 # Landroid/view/LayoutInflater; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/ViewGroup; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation const/4 p1, 0x0 @@ -2434,6 +2561,8 @@ .method public onDestroy()V .locals 2 + .annotation build Landroid/support/annotation/CallSuper; + .end annotation const/4 v0, 0x1 @@ -2482,6 +2611,8 @@ .method public onDestroyView()V .locals 1 + .annotation build Landroid/support/annotation/CallSuper; + .end annotation const/4 v0, 0x1 @@ -2493,6 +2624,8 @@ .method public onDetach()V .locals 1 + .annotation build Landroid/support/annotation/CallSuper; + .end annotation const/4 v0, 0x1 @@ -2504,6 +2637,12 @@ .method public onGetLayoutInflater(Landroid/os/Bundle;)Landroid/view/LayoutInflater; .locals 0 + .param p1 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 1277 invoke-virtual {p0, p1}, Landroid/support/v4/app/Fragment;->getLayoutInflater(Landroid/os/Bundle;)Landroid/view/LayoutInflater; @@ -2521,6 +2660,9 @@ .method public onInflate(Landroid/app/Activity;Landroid/util/AttributeSet;Landroid/os/Bundle;)V .locals 0 + .annotation build Landroid/support/annotation/CallSuper; + .end annotation + .annotation runtime Ljava/lang/Deprecated; .end annotation @@ -2534,6 +2676,8 @@ .method public onInflate(Landroid/content/Context;Landroid/util/AttributeSet;Landroid/os/Bundle;)V .locals 1 + .annotation build Landroid/support/annotation/CallSuper; + .end annotation const/4 p1, 0x1 @@ -2571,6 +2715,8 @@ .method public onLowMemory()V .locals 1 + .annotation build Landroid/support/annotation/CallSuper; + .end annotation const/4 v0, 0x1 @@ -2602,6 +2748,8 @@ .method public onPause()V .locals 1 + .annotation build Landroid/support/annotation/CallSuper; + .end annotation const/4 v0, 0x1 @@ -2625,12 +2773,22 @@ .method public onRequestPermissionsResult(I[Ljava/lang/String;[I)V .locals 0 + .param p2 # [Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # [I + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param return-void .end method .method public onResume()V .locals 1 + .annotation build Landroid/support/annotation/CallSuper; + .end annotation const/4 v0, 0x1 @@ -2642,12 +2800,18 @@ .method public onSaveInstanceState(Landroid/os/Bundle;)V .locals 0 + .param p1 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param return-void .end method .method public onStart()V .locals 1 + .annotation build Landroid/support/annotation/CallSuper; + .end annotation const/4 v0, 0x1 @@ -2659,6 +2823,8 @@ .method public onStop()V .locals 1 + .annotation build Landroid/support/annotation/CallSuper; + .end annotation const/4 v0, 0x1 @@ -2670,12 +2836,26 @@ .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V .locals 0 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param return-void .end method .method public onViewStateRestored(Landroid/os/Bundle;)V .locals 0 + .param p1 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/CallSuper; + .end annotation const/4 p1, 0x1 @@ -2687,6 +2867,8 @@ .method peekChildFragmentManager()Landroid/support/v4/app/FragmentManager; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 865 iget-object v0, p0, Landroid/support/v4/app/Fragment;->mChildFragmentManager:Landroid/support/v4/app/FragmentManagerImpl; @@ -2934,6 +3116,18 @@ .method performCreateView(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Landroid/os/Bundle;)V .locals 1 + .param p1 # Landroid/view/LayoutInflater; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/ViewGroup; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 2425 iget-object v0, p0, Landroid/support/v4/app/Fragment;->mChildFragmentManager:Landroid/support/v4/app/FragmentManagerImpl; @@ -2968,6 +3162,9 @@ iput-object p1, p0, Landroid/support/v4/app/Fragment;->mView:Landroid/view/View; + .line 2440 + iget-object p1, p0, Landroid/support/v4/app/Fragment;->mView:Landroid/view/View; + if-eqz p1, :cond_1 .line 2442 @@ -3263,6 +3460,12 @@ .method performGetLayoutInflater(Landroid/os/Bundle;)Landroid/view/LayoutInflater; .locals 0 + .param p1 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 1308 invoke-virtual {p0, p1}, Landroid/support/v4/app/Fragment;->onGetLayoutInflater(Landroid/os/Bundle;)Landroid/view/LayoutInflater; @@ -3272,6 +3475,9 @@ .line 1309 iput-object p1, p0, Landroid/support/v4/app/Fragment;->mLayoutInflater:Landroid/view/LayoutInflater; + .line 1310 + iget-object p1, p0, Landroid/support/v4/app/Fragment;->mLayoutInflater:Landroid/view/LayoutInflater; + return-object p1 .end method @@ -3856,6 +4062,10 @@ .method public final requestPermissions([Ljava/lang/String;I)V .locals 1 + .param p1 # [Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1211 iget-object v0, p0, Landroid/support/v4/app/Fragment;->mHost:Landroid/support/v4/app/FragmentHostCallback; @@ -3896,6 +4106,8 @@ .method public final requireActivity()Landroid/support/v4/app/FragmentActivity; .locals 3 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 722 invoke-virtual {p0}, Landroid/support/v4/app/Fragment;->getActivity()Landroid/support/v4/app/FragmentActivity; @@ -3935,6 +4147,8 @@ .method public final requireContext()Landroid/content/Context; .locals 3 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 694 invoke-virtual {p0}, Landroid/support/v4/app/Fragment;->getContext()Landroid/content/Context; @@ -3974,6 +4188,8 @@ .method public final requireFragmentManager()Landroid/support/v4/app/FragmentManager; .locals 3 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 830 invoke-virtual {p0}, Landroid/support/v4/app/Fragment;->getFragmentManager()Landroid/support/v4/app/FragmentManager; @@ -4013,6 +4229,8 @@ .method public final requireHost()Ljava/lang/Object; .locals 3 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 748 invoke-virtual {p0}, Landroid/support/v4/app/Fragment;->getHost()Ljava/lang/Object; @@ -4052,6 +4270,10 @@ .method restoreChildFragmentState(Landroid/os/Bundle;)V .locals 2 + .param p1 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param if-eqz p1, :cond_1 @@ -4230,6 +4452,10 @@ .method public setArguments(Landroid/os/Bundle;)V .locals 1 + .param p1 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 580 iget v0, p0, Landroid/support/v4/app/Fragment;->mIndex:I @@ -4277,6 +4503,10 @@ .method public setEnterTransition(Ljava/lang/Object;)V .locals 1 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 1947 invoke-direct {p0}, Landroid/support/v4/app/Fragment;->ensureAnimationInfo()Landroid/support/v4/app/Fragment$AnimationInfo; @@ -4303,6 +4533,10 @@ .method public setExitTransition(Ljava/lang/Object;)V .locals 1 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 2023 invoke-direct {p0}, Landroid/support/v4/app/Fragment;->ensureAnimationInfo()Landroid/support/v4/app/Fragment$AnimationInfo; @@ -4419,6 +4653,10 @@ .method public setInitialSavedState(Landroid/support/v4/app/Fragment$SavedState;)V .locals 1 + .param p1 # Landroid/support/v4/app/Fragment$SavedState; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 619 iget v0, p0, Landroid/support/v4/app/Fragment;->mIndex:I @@ -4539,9 +4777,7 @@ iput p1, v0, Landroid/support/v4/app/Fragment$AnimationInfo;->mNextTransition:I .line 2780 - iget-object p1, p0, Landroid/support/v4/app/Fragment;->mAnimationInfo:Landroid/support/v4/app/Fragment$AnimationInfo; - - iput p2, p1, Landroid/support/v4/app/Fragment$AnimationInfo;->mNextTransitionStyle:I + iput p2, v0, Landroid/support/v4/app/Fragment$AnimationInfo;->mNextTransitionStyle:I return-void .end method @@ -4621,6 +4857,10 @@ .method public setReenterTransition(Ljava/lang/Object;)V .locals 1 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 2062 invoke-direct {p0}, Landroid/support/v4/app/Fragment;->ensureAnimationInfo()Landroid/support/v4/app/Fragment$AnimationInfo; @@ -4643,6 +4883,10 @@ .method public setReturnTransition(Ljava/lang/Object;)V .locals 1 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 1983 invoke-direct {p0}, Landroid/support/v4/app/Fragment;->ensureAnimationInfo()Landroid/support/v4/app/Fragment$AnimationInfo; @@ -4656,6 +4900,10 @@ .method public setSharedElementEnterTransition(Ljava/lang/Object;)V .locals 1 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 2097 invoke-direct {p0}, Landroid/support/v4/app/Fragment;->ensureAnimationInfo()Landroid/support/v4/app/Fragment$AnimationInfo; @@ -4669,6 +4917,10 @@ .method public setSharedElementReturnTransition(Ljava/lang/Object;)V .locals 1 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 2132 invoke-direct {p0}, Landroid/support/v4/app/Fragment;->ensureAnimationInfo()Landroid/support/v4/app/Fragment$AnimationInfo; @@ -4695,6 +4947,10 @@ .method public setTargetFragment(Landroid/support/v4/app/Fragment;I)V .locals 2 + .param p1 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 643 invoke-virtual {p0}, Landroid/support/v4/app/Fragment;->getFragmentManager()Landroid/support/v4/app/FragmentManager; @@ -4881,6 +5137,10 @@ .method public shouldShowRequestPermissionRationale(Ljava/lang/String;)Z .locals 1 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1260 iget-object v0, p0, Landroid/support/v4/app/Fragment;->mHost:Landroid/support/v4/app/FragmentHostCallback; @@ -4913,6 +5173,10 @@ .method public startActivity(Landroid/content/Intent;Landroid/os/Bundle;)V .locals 2 + .param p2 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 1081 iget-object v0, p0, Landroid/support/v4/app/Fragment;->mHost:Landroid/support/v4/app/FragmentHostCallback; @@ -4966,6 +5230,10 @@ .method public startActivityForResult(Landroid/content/Intent;ILandroid/os/Bundle;)V .locals 1 + .param p3 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 1100 iget-object v0, p0, Landroid/support/v4/app/Fragment;->mHost:Landroid/support/v4/app/FragmentHostCallback; @@ -5006,6 +5274,10 @@ .method public startIntentSenderForResult(Landroid/content/IntentSender;ILandroid/content/Intent;IIILandroid/os/Bundle;)V .locals 10 + .param p3 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Landroid/content/IntentSender$SendIntentException; diff --git a/smali/android/support/v4/app/FragmentActivity$HostCallbacks.smali b/smali/android/support/v4/app/FragmentActivity$HostCallbacks.smali index 7315f8a4..7c4d357b 100644 --- a/smali/android/support/v4/app/FragmentActivity$HostCallbacks.smali +++ b/smali/android/support/v4/app/FragmentActivity$HostCallbacks.smali @@ -65,6 +65,8 @@ .method public onFindViewById(I)Landroid/view/View; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 1038 iget-object v0, p0, Landroid/support/v4/app/FragmentActivity$HostCallbacks;->this$0:Landroid/support/v4/app/FragmentActivity; @@ -198,6 +200,14 @@ .method public onRequestPermissionsFromFragment(Landroid/support/v4/app/Fragment;[Ljava/lang/String;I)V .locals 1 + .param p1 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # [Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1009 iget-object v0, p0, Landroid/support/v4/app/FragmentActivity$HostCallbacks;->this$0:Landroid/support/v4/app/FragmentActivity; @@ -224,6 +234,10 @@ .method public onShouldShowRequestPermissionRationale(Ljava/lang/String;)Z .locals 1 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1015 iget-object v0, p0, Landroid/support/v4/app/FragmentActivity$HostCallbacks;->this$0:Landroid/support/v4/app/FragmentActivity; @@ -248,6 +262,10 @@ .method public onStartActivityFromFragment(Landroid/support/v4/app/Fragment;Landroid/content/Intent;ILandroid/os/Bundle;)V .locals 1 + .param p4 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 995 iget-object v0, p0, Landroid/support/v4/app/FragmentActivity$HostCallbacks;->this$0:Landroid/support/v4/app/FragmentActivity; @@ -259,6 +277,10 @@ .method public onStartIntentSenderFromFragment(Landroid/support/v4/app/Fragment;Landroid/content/IntentSender;ILandroid/content/Intent;IIILandroid/os/Bundle;)V .locals 10 + .param p4 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Landroid/content/IntentSender$SendIntentException; diff --git a/smali/android/support/v4/app/FragmentActivity.smali b/smali/android/support/v4/app/FragmentActivity.smali index cbead71d..409cde86 100644 --- a/smali/android/support/v4/app/FragmentActivity.smali +++ b/smali/android/support/v4/app/FragmentActivity.smali @@ -165,13 +165,9 @@ invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;->(Ljava/lang/String;)V - goto :goto_2 - - :goto_1 throw p1 - :goto_2 - goto :goto_1 + return-void .end method .method static checkForValidRequestCode(I)V @@ -474,6 +470,8 @@ .method public getViewModelStore()Landroid/arch/lifecycle/ViewModelStore; .locals 2 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 299 invoke-virtual {p0}, Landroid/support/v4/app/FragmentActivity;->getApplication()Landroid/app/Application; @@ -533,6 +531,10 @@ .method protected onActivityResult(IILandroid/content/Intent;)V .locals 3 + .param p3 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 145 iget-object v0, p0, Landroid/support/v4/app/FragmentActivity;->mFragments:Landroid/support/v4/app/FragmentController; @@ -705,6 +707,10 @@ .method protected onCreate(Landroid/os/Bundle;)V .locals 6 + .param p1 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 333 iget-object v0, p0, Landroid/support/v4/app/FragmentActivity;->mFragments:Landroid/support/v4/app/FragmentController; @@ -1040,6 +1046,8 @@ .method public onMultiWindowModeChanged(Z)V .locals 1 + .annotation build Landroid/support/annotation/CallSuper; + .end annotation .line 261 iget-object v0, p0, Landroid/support/v4/app/FragmentActivity;->mFragments:Landroid/support/v4/app/FragmentController; @@ -1124,6 +1132,8 @@ .method public onPictureInPictureModeChanged(Z)V .locals 1 + .annotation build Landroid/support/annotation/CallSuper; + .end annotation .line 276 iget-object v0, p0, Landroid/support/v4/app/FragmentActivity;->mFragments:Landroid/support/v4/app/FragmentController; @@ -1159,6 +1169,11 @@ .method protected onPrepareOptionsPanel(Landroid/view/View;Landroid/view/Menu;)Z .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation const/4 v0, 0x0 @@ -1204,6 +1219,14 @@ .method public onRequestPermissionsResult(I[Ljava/lang/String;[I)V .locals 4 + .param p2 # [Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # [I + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 845 iget-object v0, p0, Landroid/support/v4/app/FragmentActivity;->mFragments:Landroid/support/v4/app/FragmentController; @@ -1664,6 +1687,10 @@ .method public startActivityForResult(Landroid/content/Intent;ILandroid/os/Bundle;)V .locals 1 + .param p3 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 762 iget-boolean v0, p0, Landroid/support/v4/app/FragmentActivity;->mStartedActivityFromFragment:Z @@ -1697,6 +1724,10 @@ .method public startActivityFromFragment(Landroid/support/v4/app/Fragment;Landroid/content/Intent;ILandroid/os/Bundle;)V .locals 3 + .param p4 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param const/4 v0, 0x1 @@ -1760,6 +1791,10 @@ .method public startIntentSenderForResult(Landroid/content/IntentSender;ILandroid/content/Intent;III)V .locals 1 + .param p3 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Landroid/content/IntentSender$SendIntentException; @@ -1787,6 +1822,10 @@ .method public startIntentSenderForResult(Landroid/content/IntentSender;ILandroid/content/Intent;IIILandroid/os/Bundle;)V .locals 1 + .param p3 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Landroid/content/IntentSender$SendIntentException; @@ -1814,6 +1853,10 @@ .method public startIntentSenderFromFragment(Landroid/support/v4/app/Fragment;Landroid/content/IntentSender;ILandroid/content/Intent;IIILandroid/os/Bundle;)V .locals 11 + .param p4 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Landroid/content/IntentSender$SendIntentException; diff --git a/smali/android/support/v4/app/FragmentContainer.smali b/smali/android/support/v4/app/FragmentContainer.smali index 8732cda5..6a9ecd9e 100644 --- a/smali/android/support/v4/app/FragmentContainer.smali +++ b/smali/android/support/v4/app/FragmentContainer.smali @@ -27,6 +27,12 @@ .end method .method public abstract onFindViewById(I)Landroid/view/View; + .param p1 # I + .annotation build Landroid/support/annotation/IdRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method .method public abstract onHasView()Z diff --git a/smali/android/support/v4/app/FragmentController.smali b/smali/android/support/v4/app/FragmentController.smali index 7a4ce2cd..f2bfb96e 100644 --- a/smali/android/support/v4/app/FragmentController.smali +++ b/smali/android/support/v4/app/FragmentController.smali @@ -364,6 +364,8 @@ .method public findFragmentByWho(Ljava/lang/String;)Landroid/support/v4/app/Fragment; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 82 iget-object v0, p0, Landroid/support/v4/app/FragmentController;->mHost:Landroid/support/v4/app/FragmentHostCallback; diff --git a/smali/android/support/v4/app/FragmentHostCallback.smali b/smali/android/support/v4/app/FragmentHostCallback.smali index b414a7d0..a95d4e69 100644 --- a/smali/android/support/v4/app/FragmentHostCallback.smali +++ b/smali/android/support/v4/app/FragmentHostCallback.smali @@ -16,12 +16,21 @@ # instance fields .field private final mActivity:Landroid/app/Activity; + .annotation build Landroid/support/annotation/Nullable; + .end annotation +.end field .field private final mContext:Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation +.end field .field final mFragmentManager:Landroid/support/v4/app/FragmentManagerImpl; .field private final mHandler:Landroid/os/Handler; + .annotation build Landroid/support/annotation/NonNull; + .end annotation +.end field .field private final mWindowAnimations:I @@ -29,6 +38,18 @@ # direct methods .method constructor (Landroid/app/Activity;Landroid/content/Context;Landroid/os/Handler;I)V .locals 1 + .param p1 # Landroid/app/Activity; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p2 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/os/Handler; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 61 invoke-direct {p0}, Landroid/support/v4/app/FragmentContainer;->()V @@ -73,6 +94,14 @@ .method public constructor (Landroid/content/Context;Landroid/os/Handler;I)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/os/Handler; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 52 instance-of v0, p1, Landroid/app/Activity; @@ -96,6 +125,10 @@ .method constructor (Landroid/support/v4/app/FragmentActivity;)V .locals 2 + .param p1 # Landroid/support/v4/app/FragmentActivity; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 57 iget-object v0, p1, Landroid/support/v4/app/FragmentActivity;->mHandler:Landroid/os/Handler; @@ -111,6 +144,8 @@ # virtual methods .method getActivity()Landroid/app/Activity; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 190 iget-object v0, p0, Landroid/support/v4/app/FragmentHostCallback;->mActivity:Landroid/app/Activity; @@ -120,6 +155,8 @@ .method getContext()Landroid/content/Context; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 195 iget-object v0, p0, Landroid/support/v4/app/FragmentHostCallback;->mContext:Landroid/content/Context; @@ -138,6 +175,8 @@ .method getHandler()Landroid/os/Handler; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 200 iget-object v0, p0, Landroid/support/v4/app/FragmentHostCallback;->mHandler:Landroid/os/Handler; @@ -159,6 +198,8 @@ .method public onFindViewById(I)Landroid/view/View; .locals 0 + .annotation build Landroid/support/annotation/Nullable; + .end annotation const/4 p1, 0x0 @@ -166,6 +207,9 @@ .end method .method public abstract onGetHost()Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "()TE;" @@ -175,6 +219,8 @@ .method public onGetLayoutInflater()Landroid/view/LayoutInflater; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 93 iget-object v0, p0, Landroid/support/v4/app/FragmentHostCallback;->mContext:Landroid/content/Context; @@ -213,6 +259,14 @@ .method public onRequestPermissionsFromFragment(Landroid/support/v4/app/Fragment;[Ljava/lang/String;I)V .locals 0 + .param p1 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # [Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param return-void .end method @@ -227,6 +281,10 @@ .method public onShouldShowRequestPermissionRationale(Ljava/lang/String;)Z .locals 0 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 p1, 0x0 @@ -246,6 +304,10 @@ .method public onStartActivityFromFragment(Landroid/support/v4/app/Fragment;Landroid/content/Intent;ILandroid/os/Bundle;)V .locals 0 + .param p4 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param const/4 p1, -0x1 @@ -271,6 +333,10 @@ .method public onStartIntentSenderFromFragment(Landroid/support/v4/app/Fragment;Landroid/content/IntentSender;ILandroid/content/Intent;IIILandroid/os/Bundle;)V .locals 9 + .param p4 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Landroid/content/IntentSender$SendIntentException; diff --git a/smali/android/support/v4/app/FragmentManager$BackStackEntry.smali b/smali/android/support/v4/app/FragmentManager$BackStackEntry.smali index 96be535c..e5482975 100644 --- a/smali/android/support/v4/app/FragmentManager$BackStackEntry.smali +++ b/smali/android/support/v4/app/FragmentManager$BackStackEntry.smali @@ -16,19 +16,29 @@ # virtual methods .method public abstract getBreadCrumbShortTitle()Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method .method public abstract getBreadCrumbShortTitleRes()I + .annotation build Landroid/support/annotation/StringRes; + .end annotation .end method .method public abstract getBreadCrumbTitle()Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method .method public abstract getBreadCrumbTitleRes()I + .annotation build Landroid/support/annotation/StringRes; + .end annotation .end method .method public abstract getId()I .end method .method public abstract getName()Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method diff --git a/smali/android/support/v4/app/FragmentManager$FragmentLifecycleCallbacks.smali b/smali/android/support/v4/app/FragmentManager$FragmentLifecycleCallbacks.smali index 423476dc..1027fc28 100644 --- a/smali/android/support/v4/app/FragmentManager$FragmentLifecycleCallbacks.smali +++ b/smali/android/support/v4/app/FragmentManager$FragmentLifecycleCallbacks.smali @@ -28,84 +28,228 @@ # virtual methods .method public onFragmentActivityCreated(Landroid/support/v4/app/FragmentManager;Landroid/support/v4/app/Fragment;Landroid/os/Bundle;)V .locals 0 + .param p1 # Landroid/support/v4/app/FragmentManager; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param return-void .end method .method public onFragmentAttached(Landroid/support/v4/app/FragmentManager;Landroid/support/v4/app/Fragment;Landroid/content/Context;)V .locals 0 + .param p1 # Landroid/support/v4/app/FragmentManager; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param return-void .end method .method public onFragmentCreated(Landroid/support/v4/app/FragmentManager;Landroid/support/v4/app/Fragment;Landroid/os/Bundle;)V .locals 0 + .param p1 # Landroid/support/v4/app/FragmentManager; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param return-void .end method .method public onFragmentDestroyed(Landroid/support/v4/app/FragmentManager;Landroid/support/v4/app/Fragment;)V .locals 0 + .param p1 # Landroid/support/v4/app/FragmentManager; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param return-void .end method .method public onFragmentDetached(Landroid/support/v4/app/FragmentManager;Landroid/support/v4/app/Fragment;)V .locals 0 + .param p1 # Landroid/support/v4/app/FragmentManager; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param return-void .end method .method public onFragmentPaused(Landroid/support/v4/app/FragmentManager;Landroid/support/v4/app/Fragment;)V .locals 0 + .param p1 # Landroid/support/v4/app/FragmentManager; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param return-void .end method .method public onFragmentPreAttached(Landroid/support/v4/app/FragmentManager;Landroid/support/v4/app/Fragment;Landroid/content/Context;)V .locals 0 + .param p1 # Landroid/support/v4/app/FragmentManager; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param return-void .end method .method public onFragmentPreCreated(Landroid/support/v4/app/FragmentManager;Landroid/support/v4/app/Fragment;Landroid/os/Bundle;)V .locals 0 + .param p1 # Landroid/support/v4/app/FragmentManager; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param return-void .end method .method public onFragmentResumed(Landroid/support/v4/app/FragmentManager;Landroid/support/v4/app/Fragment;)V .locals 0 + .param p1 # Landroid/support/v4/app/FragmentManager; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param return-void .end method .method public onFragmentSaveInstanceState(Landroid/support/v4/app/FragmentManager;Landroid/support/v4/app/Fragment;Landroid/os/Bundle;)V .locals 0 + .param p1 # Landroid/support/v4/app/FragmentManager; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param return-void .end method .method public onFragmentStarted(Landroid/support/v4/app/FragmentManager;Landroid/support/v4/app/Fragment;)V .locals 0 + .param p1 # Landroid/support/v4/app/FragmentManager; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param return-void .end method .method public onFragmentStopped(Landroid/support/v4/app/FragmentManager;Landroid/support/v4/app/Fragment;)V .locals 0 + .param p1 # Landroid/support/v4/app/FragmentManager; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param return-void .end method .method public onFragmentViewCreated(Landroid/support/v4/app/FragmentManager;Landroid/support/v4/app/Fragment;Landroid/view/View;Landroid/os/Bundle;)V .locals 0 + .param p1 # Landroid/support/v4/app/FragmentManager; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param return-void .end method .method public onFragmentViewDestroyed(Landroid/support/v4/app/FragmentManager;Landroid/support/v4/app/Fragment;)V .locals 0 + .param p1 # Landroid/support/v4/app/FragmentManager; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param return-void .end method diff --git a/smali/android/support/v4/app/FragmentManager.smali b/smali/android/support/v4/app/FragmentManager.smali index 228ee10c..85cdb5e5 100644 --- a/smali/android/support/v4/app/FragmentManager.smali +++ b/smali/android/support/v4/app/FragmentManager.smali @@ -39,9 +39,15 @@ # virtual methods .method public abstract addOnBackStackChangedListener(Landroid/support/v4/app/FragmentManager$OnBackStackChangedListener;)V + .param p1 # Landroid/support/v4/app/FragmentManager$OnBackStackChangedListener; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method .method public abstract beginTransaction()Landroid/support/v4/app/FragmentTransaction; + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract dump(Ljava/lang/String;Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V @@ -51,21 +57,48 @@ .end method .method public abstract findFragmentById(I)Landroid/support/v4/app/Fragment; + .param p1 # I + .annotation build Landroid/support/annotation/IdRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method .method public abstract findFragmentByTag(Ljava/lang/String;)Landroid/support/v4/app/Fragment; + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method .method public abstract getBackStackEntryAt(I)Landroid/support/v4/app/FragmentManager$BackStackEntry; + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract getBackStackEntryCount()I .end method .method public abstract getFragment(Landroid/os/Bundle;Ljava/lang/String;)Landroid/support/v4/app/Fragment; + .param p1 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method .method public abstract getFragments()Ljava/util/List; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "()", @@ -77,6 +110,8 @@ .end method .method public abstract getPrimaryNavigationFragment()Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method .method public abstract isDestroyed()Z @@ -87,6 +122,12 @@ .method public openTransaction()Landroid/support/v4/app/FragmentTransaction; .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation + .annotation runtime Ljava/lang/Deprecated; .end annotation @@ -105,6 +146,10 @@ .end method .method public abstract popBackStack(Ljava/lang/String;I)V + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .end method .method public abstract popBackStackImmediate()Z @@ -114,19 +159,49 @@ .end method .method public abstract popBackStackImmediate(Ljava/lang/String;I)Z + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .end method .method public abstract putFragment(Landroid/os/Bundle;Ljava/lang/String;Landroid/support/v4/app/Fragment;)V + .param p1 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method .method public abstract registerFragmentLifecycleCallbacks(Landroid/support/v4/app/FragmentManager$FragmentLifecycleCallbacks;Z)V + .param p1 # Landroid/support/v4/app/FragmentManager$FragmentLifecycleCallbacks; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method .method public abstract removeOnBackStackChangedListener(Landroid/support/v4/app/FragmentManager$OnBackStackChangedListener;)V + .param p1 # Landroid/support/v4/app/FragmentManager$OnBackStackChangedListener; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method .method public abstract saveFragmentInstanceState(Landroid/support/v4/app/Fragment;)Landroid/support/v4/app/Fragment$SavedState; + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method .method public abstract unregisterFragmentLifecycleCallbacks(Landroid/support/v4/app/FragmentManager$FragmentLifecycleCallbacks;)V + .param p1 # Landroid/support/v4/app/FragmentManager$FragmentLifecycleCallbacks; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method diff --git a/smali/android/support/v4/app/FragmentManagerImpl$AnimateOnHWLayerIfNeededListener.smali b/smali/android/support/v4/app/FragmentManagerImpl$AnimateOnHWLayerIfNeededListener.smali index c822138c..c06dd459 100644 --- a/smali/android/support/v4/app/FragmentManagerImpl$AnimateOnHWLayerIfNeededListener.smali +++ b/smali/android/support/v4/app/FragmentManagerImpl$AnimateOnHWLayerIfNeededListener.smali @@ -35,6 +35,8 @@ # virtual methods .method public onAnimationEnd(Landroid/view/animation/Animation;)V .locals 3 + .annotation build Landroid/support/annotation/CallSuper; + .end annotation .line 4021 iget-object v0, p0, Landroid/support/v4/app/FragmentManagerImpl$AnimateOnHWLayerIfNeededListener;->mView:Landroid/view/View; diff --git a/smali/android/support/v4/app/FragmentManagerImpl$AnimationListenerWrapper.smali b/smali/android/support/v4/app/FragmentManagerImpl$AnimationListenerWrapper.smali index 2cf0105c..5ccfb75a 100644 --- a/smali/android/support/v4/app/FragmentManagerImpl$AnimationListenerWrapper.smali +++ b/smali/android/support/v4/app/FragmentManagerImpl$AnimationListenerWrapper.smali @@ -38,6 +38,8 @@ # virtual methods .method public onAnimationEnd(Landroid/view/animation/Animation;)V .locals 1 + .annotation build Landroid/support/annotation/CallSuper; + .end annotation .line 3983 iget-object v0, p0, Landroid/support/v4/app/FragmentManagerImpl$AnimationListenerWrapper;->mWrapped:Landroid/view/animation/Animation$AnimationListener; @@ -53,6 +55,8 @@ .method public onAnimationRepeat(Landroid/view/animation/Animation;)V .locals 1 + .annotation build Landroid/support/annotation/CallSuper; + .end annotation .line 3991 iget-object v0, p0, Landroid/support/v4/app/FragmentManagerImpl$AnimationListenerWrapper;->mWrapped:Landroid/view/animation/Animation$AnimationListener; @@ -68,6 +72,8 @@ .method public onAnimationStart(Landroid/view/animation/Animation;)V .locals 1 + .annotation build Landroid/support/annotation/CallSuper; + .end annotation .line 3975 iget-object v0, p0, Landroid/support/v4/app/FragmentManagerImpl$AnimationListenerWrapper;->mWrapped:Landroid/view/animation/Animation$AnimationListener; diff --git a/smali/android/support/v4/app/FragmentManagerImpl$EndViewTransitionAnimator.smali b/smali/android/support/v4/app/FragmentManagerImpl$EndViewTransitionAnimator.smali index 4a135534..81f074f2 100644 --- a/smali/android/support/v4/app/FragmentManagerImpl$EndViewTransitionAnimator.smali +++ b/smali/android/support/v4/app/FragmentManagerImpl$EndViewTransitionAnimator.smali @@ -32,6 +32,18 @@ # direct methods .method constructor (Landroid/view/animation/Animation;Landroid/view/ViewGroup;Landroid/view/View;)V .locals 1 + .param p1 # Landroid/view/animation/Animation; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/ViewGroup; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 v0, 0x0 @@ -53,7 +65,9 @@ invoke-virtual {p0, p1}, Landroid/support/v4/app/FragmentManagerImpl$EndViewTransitionAnimator;->addAnimation(Landroid/view/animation/Animation;)V .line 4078 - invoke-virtual {p2, p0}, Landroid/view/ViewGroup;->post(Ljava/lang/Runnable;)Z + iget-object p1, p0, Landroid/support/v4/app/FragmentManagerImpl$EndViewTransitionAnimator;->mParent:Landroid/view/ViewGroup; + + invoke-virtual {p1, p0}, Landroid/view/ViewGroup;->post(Ljava/lang/Runnable;)Z return-void .end method diff --git a/smali/android/support/v4/app/FragmentManagerImpl$FragmentTag.smali b/smali/android/support/v4/app/FragmentManagerImpl$FragmentTag.smali index fb77ec0a..664edc17 100644 --- a/smali/android/support/v4/app/FragmentManagerImpl$FragmentTag.smali +++ b/smali/android/support/v4/app/FragmentManagerImpl$FragmentTag.smali @@ -30,9 +30,9 @@ const/4 v0, 0x3 + .line 3800 new-array v0, v0, [I - .line 3800 fill-array-data v0, :array_0 sput-object v0, Landroid/support/v4/app/FragmentManagerImpl$FragmentTag;->Fragment:[I diff --git a/smali/android/support/v4/app/FragmentManagerImpl$StartEnterTransitionListener.smali b/smali/android/support/v4/app/FragmentManagerImpl$StartEnterTransitionListener.smali index 91fae86f..a5e5187b 100644 --- a/smali/android/support/v4/app/FragmentManagerImpl$StartEnterTransitionListener.smali +++ b/smali/android/support/v4/app/FragmentManagerImpl$StartEnterTransitionListener.smali @@ -174,6 +174,9 @@ iput v0, p0, Landroid/support/v4/app/FragmentManagerImpl$StartEnterTransitionListener;->mNumPostponed:I + .line 3886 + iget v0, p0, Landroid/support/v4/app/FragmentManagerImpl$StartEnterTransitionListener;->mNumPostponed:I + if-eqz v0, :cond_0 return-void diff --git a/smali/android/support/v4/app/FragmentManagerImpl.smali b/smali/android/support/v4/app/FragmentManagerImpl.smali index 3aea25c9..4d5b24c7 100644 --- a/smali/android/support/v4/app/FragmentManagerImpl.smali +++ b/smali/android/support/v4/app/FragmentManagerImpl.smali @@ -185,6 +185,9 @@ .end field .field mPrimaryNav:Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/Nullable; + .end annotation +.end field .field mSavedNonConfig:Landroid/support/v4/app/FragmentManagerNonConfig; @@ -424,6 +427,14 @@ .method private animateRemoveFragment(Landroid/support/v4/app/Fragment;Landroid/support/v4/app/FragmentManagerImpl$AnimationOrAnimator;I)V .locals 4 + .param p1 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v4/app/FragmentManagerImpl$AnimationOrAnimator; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1630 iget-object v0, p1, Landroid/support/v4/app/Fragment;->mView:Landroid/view/View; @@ -1024,24 +1035,26 @@ const/4 v1, 0x0 - move v2, v9 + move-object v2, v0 + + move v0, v9 const/4 v12, 0x0 :goto_1 const/4 v13, 0x1 - if-ge v2, v10, :cond_4 + if-ge v0, v10, :cond_4 .line 2396 - invoke-virtual {v7, v2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v7, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; move-result-object v3 check-cast v3, Landroid/support/v4/app/BackStackRecord; .line 2397 - invoke-virtual {v8, v2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v8, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; move-result-object v4 @@ -1056,9 +1069,9 @@ .line 2399 iget-object v4, v6, Landroid/support/v4/app/FragmentManagerImpl;->mTmpAddedFragments:Ljava/util/ArrayList; - invoke-virtual {v3, v4, v0}, Landroid/support/v4/app/BackStackRecord;->expandOps(Ljava/util/ArrayList;Landroid/support/v4/app/Fragment;)Landroid/support/v4/app/Fragment; + invoke-virtual {v3, v4, v2}, Landroid/support/v4/app/BackStackRecord;->expandOps(Ljava/util/ArrayList;Landroid/support/v4/app/Fragment;)Landroid/support/v4/app/Fragment; - move-result-object v0 + move-result-object v2 goto :goto_2 @@ -1066,9 +1079,9 @@ :cond_1 iget-object v4, v6, Landroid/support/v4/app/FragmentManagerImpl;->mTmpAddedFragments:Ljava/util/ArrayList; - invoke-virtual {v3, v4, v0}, Landroid/support/v4/app/BackStackRecord;->trackAddedFragmentsInPop(Ljava/util/ArrayList;Landroid/support/v4/app/Fragment;)Landroid/support/v4/app/Fragment; + invoke-virtual {v3, v4, v2}, Landroid/support/v4/app/BackStackRecord;->trackAddedFragmentsInPop(Ljava/util/ArrayList;Landroid/support/v4/app/Fragment;)Landroid/support/v4/app/Fragment; - move-result-object v0 + move-result-object v2 :goto_2 if-nez v12, :cond_3 @@ -1090,7 +1103,7 @@ const/4 v12, 0x1 :goto_4 - add-int/lit8 v2, v2, 0x1 + add-int/lit8 v0, v0, 0x1 goto :goto_1 @@ -1269,15 +1282,17 @@ move-result v0 :goto_0 - const/4 v2, 0x0 + move v2, v0 + + const/4 v0, 0x0 :goto_1 - if-ge v2, v0, :cond_5 + if-ge v0, v2, :cond_5 .line 2294 iget-object v3, p0, Landroid/support/v4/app/FragmentManagerImpl;->mPostponedTransactions:Ljava/util/ArrayList; - invoke-virtual {v3, v2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v3, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; move-result-object v3 @@ -1346,12 +1361,12 @@ :cond_2 iget-object v5, p0, Landroid/support/v4/app/FragmentManagerImpl;->mPostponedTransactions:Ljava/util/ArrayList; - invoke-virtual {v5, v2}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object; - - add-int/lit8 v2, v2, -0x1 + invoke-virtual {v5, v0}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object; add-int/lit8 v0, v0, -0x1 + add-int/lit8 v2, v2, -0x1 + if-eqz p1, :cond_3 .line 2308 @@ -1392,7 +1407,7 @@ :cond_4 :goto_2 - add-int/lit8 v2, v2, 0x1 + add-int/lit8 v0, v0, 0x1 goto :goto_1 @@ -1522,6 +1537,8 @@ if-eqz v0, :cond_2 + iget-object v0, p0, Landroid/support/v4/app/FragmentManagerImpl;->mPendingActions:Ljava/util/ArrayList; + invoke-virtual {v0}, Ljava/util/ArrayList;->size()I move-result v0 @@ -1599,13 +1616,9 @@ :try_end_0 .catchall {:try_start_0 .. :try_end_0} :catchall_0 - goto :goto_3 - - :goto_2 throw p1 - :goto_3 - goto :goto_2 + return-void .end method .method private static getAnimationListener(Landroid/view/animation/Animation;)Landroid/view/animation/Animation$AnimationListener; @@ -1630,9 +1643,11 @@ sput-object v1, Landroid/support/v4/app/FragmentManagerImpl;->sAnimationListenerField:Ljava/lang/reflect/Field; + .line 1302 + sget-object v1, Landroid/support/v4/app/FragmentManagerImpl;->sAnimationListenerField:Ljava/lang/reflect/Field; + const/4 v2, 0x1 - .line 1302 invoke-virtual {v1, v2}, Ljava/lang/reflect/Field;->setAccessible(Z)V .line 1304 @@ -2636,10 +2651,10 @@ if-eqz v0, :cond_0 + .line 793 :try_start_0 new-array v4, v4, [Ljava/lang/String; - .line 793 invoke-virtual {v0, v6, v5, v2, v4}, Landroid/support/v4/app/FragmentHostCallback;->onDump(Ljava/lang/String;Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V :try_end_0 .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0 @@ -2654,11 +2669,11 @@ goto :goto_0 + .line 799 :cond_0 :try_start_1 new-array v0, v4, [Ljava/lang/String; - .line 799 invoke-virtual {p0, v6, v5, v2, v0}, Landroid/support/v4/app/FragmentManagerImpl;->dump(Ljava/lang/String;Ljava/io/FileDescriptor;Ljava/io/PrintWriter;[Ljava/lang/String;)V :try_end_1 .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_1 @@ -2767,23 +2782,23 @@ if-eqz v0, :cond_0 - const-string v0, "FragmentManager" + new-instance v0, Ljava/lang/StringBuilder; - new-instance v1, Ljava/lang/StringBuilder; + invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - invoke-direct {v1}, Ljava/lang/StringBuilder;->()V + const-string v1, "add: " - const-string v2, "add: " + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + move-result-object v0 - move-result-object v1 + const-string v1, "FragmentManager" - invoke-static {v0, v1}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I + invoke-static {v1, v0}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I .line 1913 :cond_0 @@ -2932,6 +2947,8 @@ if-eqz v0, :cond_2 + iget-object v0, p0, Landroid/support/v4/app/FragmentManagerImpl;->mAvailBackStackIndices:Ljava/util/ArrayList; + invoke-virtual {v0}, Ljava/util/ArrayList;->size()I move-result v0 @@ -2944,7 +2961,9 @@ :cond_0 iget-object v0, p0, Landroid/support/v4/app/FragmentManagerImpl;->mAvailBackStackIndices:Ljava/util/ArrayList; - invoke-virtual {v0}, Ljava/util/ArrayList;->size()I + iget-object v1, p0, Landroid/support/v4/app/FragmentManagerImpl;->mAvailBackStackIndices:Ljava/util/ArrayList; + + invoke-virtual {v1}, Ljava/util/ArrayList;->size()I move-result v1 @@ -3111,23 +3130,23 @@ if-eqz v0, :cond_0 - const-string v0, "FragmentManager" + new-instance v0, Ljava/lang/StringBuilder; - new-instance v1, Ljava/lang/StringBuilder; + invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - invoke-direct {v1}, Ljava/lang/StringBuilder;->()V + const-string v1, "attach: " - const-string v2, "attach: " + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + move-result-object v0 - move-result-object v1 + const-string v1, "FragmentManager" - invoke-static {v0, v1}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I + invoke-static {v1, v0}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I .line 2002 :cond_0 @@ -3159,23 +3178,23 @@ if-eqz v0, :cond_1 - const-string v0, "FragmentManager" + new-instance v0, Ljava/lang/StringBuilder; - new-instance v1, Ljava/lang/StringBuilder; + invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - invoke-direct {v1}, Ljava/lang/StringBuilder;->()V + const-string v1, "add from attach: " - const-string v2, "add from attach: " + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + move-result-object v0 - move-result-object v1 + const-string v1, "FragmentManager" - invoke-static {v0, v1}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I + invoke-static {v1, v0}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I .line 2009 :cond_1 @@ -3598,30 +3617,30 @@ .end method .method public detachFragment(Landroid/support/v4/app/Fragment;)V - .locals 4 + .locals 3 .line 1983 sget-boolean v0, Landroid/support/v4/app/FragmentManagerImpl;->DEBUG:Z if-eqz v0, :cond_0 - const-string v0, "FragmentManager" + new-instance v0, Ljava/lang/StringBuilder; - new-instance v1, Ljava/lang/StringBuilder; + invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - invoke-direct {v1}, Ljava/lang/StringBuilder;->()V + const-string v1, "detach: " - const-string v2, "detach: " + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + move-result-object v0 - move-result-object v1 + const-string v1, "FragmentManager" - invoke-static {v0, v1}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I + invoke-static {v1, v0}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I .line 1984 :cond_0 @@ -3644,23 +3663,23 @@ if-eqz v1, :cond_1 - const-string v1, "FragmentManager" + new-instance v1, Ljava/lang/StringBuilder; - new-instance v2, Ljava/lang/StringBuilder; + invoke-direct {v1}, Ljava/lang/StringBuilder;->()V - invoke-direct {v2}, Ljava/lang/StringBuilder;->()V + const-string v2, "remove from detach: " - const-string v3, "remove from detach: " + invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - invoke-virtual {v2, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + move-result-object v1 - move-result-object v2 + const-string v2, "FragmentManager" - invoke-static {v1, v2}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I + invoke-static {v2, v1}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I .line 1989 :cond_1 @@ -3864,7 +3883,9 @@ :cond_0 const/4 v0, 0x0 - const/4 v3, 0x0 + move-object v3, v0 + + const/4 v0, 0x0 const/4 v4, 0x0 @@ -3876,12 +3897,12 @@ move-result v5 - if-ge v3, v5, :cond_3 + if-ge v0, v5, :cond_3 .line 3319 iget-object v5, p0, Landroid/support/v4/app/FragmentManagerImpl;->mAdded:Ljava/util/ArrayList; - invoke-virtual {v5, v3}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v5, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; move-result-object v5 @@ -3896,21 +3917,21 @@ if-eqz v6, :cond_2 - if-nez v0, :cond_1 + if-nez v3, :cond_1 .line 3324 - new-instance v0, Ljava/util/ArrayList; + new-instance v3, Ljava/util/ArrayList; - invoke-direct {v0}, Ljava/util/ArrayList;->()V + invoke-direct {v3}, Ljava/util/ArrayList;->()V .line 3326 :cond_1 - invoke-virtual {v0, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + invoke-virtual {v3, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z const/4 v4, 0x1 :cond_2 - add-int/lit8 v3, v3, 0x1 + add-int/lit8 v0, v0, 0x1 goto :goto_0 @@ -3939,10 +3960,10 @@ check-cast p1, Landroid/support/v4/app/Fragment; - if-eqz v0, :cond_4 + if-eqz v3, :cond_4 .line 3334 - invoke-virtual {v0, p1}, Ljava/util/ArrayList;->contains(Ljava/lang/Object;)Z + invoke-virtual {v3, p1}, Ljava/util/ArrayList;->contains(Ljava/lang/Object;)Z move-result p2 @@ -3959,7 +3980,7 @@ .line 3340 :cond_6 - iput-object v0, p0, Landroid/support/v4/app/FragmentManagerImpl;->mCreatedMenus:Ljava/util/ArrayList; + iput-object v3, p0, Landroid/support/v4/app/FragmentManagerImpl;->mCreatedMenus:Ljava/util/ArrayList; return v4 .end method @@ -4083,6 +4104,14 @@ .method dispatchOnFragmentActivityCreated(Landroid/support/v4/app/Fragment;Landroid/os/Bundle;Z)V .locals 3 + .param p1 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 3503 iget-object v0, p0, Landroid/support/v4/app/FragmentManagerImpl;->mParent:Landroid/support/v4/app/Fragment; @@ -4150,6 +4179,14 @@ .method dispatchOnFragmentAttached(Landroid/support/v4/app/Fragment;Landroid/content/Context;Z)V .locals 3 + .param p1 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3455 iget-object v0, p0, Landroid/support/v4/app/FragmentManagerImpl;->mParent:Landroid/support/v4/app/Fragment; @@ -4217,6 +4254,14 @@ .method dispatchOnFragmentCreated(Landroid/support/v4/app/Fragment;Landroid/os/Bundle;Z)V .locals 3 + .param p1 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 3487 iget-object v0, p0, Landroid/support/v4/app/FragmentManagerImpl;->mParent:Landroid/support/v4/app/Fragment; @@ -4284,6 +4329,10 @@ .method dispatchOnFragmentDestroyed(Landroid/support/v4/app/Fragment;Z)V .locals 3 + .param p1 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3625 iget-object v0, p0, Landroid/support/v4/app/FragmentManagerImpl;->mParent:Landroid/support/v4/app/Fragment; @@ -4351,6 +4400,10 @@ .method dispatchOnFragmentDetached(Landroid/support/v4/app/Fragment;Z)V .locals 3 + .param p1 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3640 iget-object v0, p0, Landroid/support/v4/app/FragmentManagerImpl;->mParent:Landroid/support/v4/app/Fragment; @@ -4418,6 +4471,10 @@ .method dispatchOnFragmentPaused(Landroid/support/v4/app/Fragment;Z)V .locals 3 + .param p1 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3564 iget-object v0, p0, Landroid/support/v4/app/FragmentManagerImpl;->mParent:Landroid/support/v4/app/Fragment; @@ -4485,6 +4542,14 @@ .method dispatchOnFragmentPreAttached(Landroid/support/v4/app/Fragment;Landroid/content/Context;Z)V .locals 3 + .param p1 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3439 iget-object v0, p0, Landroid/support/v4/app/FragmentManagerImpl;->mParent:Landroid/support/v4/app/Fragment; @@ -4552,6 +4617,14 @@ .method dispatchOnFragmentPreCreated(Landroid/support/v4/app/Fragment;Landroid/os/Bundle;Z)V .locals 3 + .param p1 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 3471 iget-object v0, p0, Landroid/support/v4/app/FragmentManagerImpl;->mParent:Landroid/support/v4/app/Fragment; @@ -4619,6 +4692,10 @@ .method dispatchOnFragmentResumed(Landroid/support/v4/app/Fragment;Z)V .locals 3 + .param p1 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3549 iget-object v0, p0, Landroid/support/v4/app/FragmentManagerImpl;->mParent:Landroid/support/v4/app/Fragment; @@ -4686,6 +4763,14 @@ .method dispatchOnFragmentSaveInstanceState(Landroid/support/v4/app/Fragment;Landroid/os/Bundle;Z)V .locals 3 + .param p1 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3595 iget-object v0, p0, Landroid/support/v4/app/FragmentManagerImpl;->mParent:Landroid/support/v4/app/Fragment; @@ -4753,6 +4838,10 @@ .method dispatchOnFragmentStarted(Landroid/support/v4/app/Fragment;Z)V .locals 3 + .param p1 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3534 iget-object v0, p0, Landroid/support/v4/app/FragmentManagerImpl;->mParent:Landroid/support/v4/app/Fragment; @@ -4820,6 +4909,10 @@ .method dispatchOnFragmentStopped(Landroid/support/v4/app/Fragment;Z)V .locals 3 + .param p1 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3579 iget-object v0, p0, Landroid/support/v4/app/FragmentManagerImpl;->mParent:Landroid/support/v4/app/Fragment; @@ -4887,6 +4980,18 @@ .method dispatchOnFragmentViewCreated(Landroid/support/v4/app/Fragment;Landroid/view/View;Landroid/os/Bundle;Z)V .locals 3 + .param p1 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 3519 iget-object v0, p0, Landroid/support/v4/app/FragmentManagerImpl;->mParent:Landroid/support/v4/app/Fragment; @@ -4954,6 +5059,10 @@ .method dispatchOnFragmentViewDestroyed(Landroid/support/v4/app/Fragment;Z)V .locals 3 + .param p1 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3610 iget-object v0, p0, Landroid/support/v4/app/FragmentManagerImpl;->mParent:Landroid/support/v4/app/Fragment; @@ -5585,6 +5694,8 @@ if-eqz p2, :cond_5 .line 1080 + iget-object p2, p0, Landroid/support/v4/app/FragmentManagerImpl;->mBackStackIndices:Ljava/util/ArrayList; + invoke-virtual {p2}, Ljava/util/ArrayList;->size()I move-result p2 @@ -5638,6 +5749,8 @@ if-eqz p2, :cond_6 + iget-object p2, p0, Landroid/support/v4/app/FragmentManagerImpl;->mAvailBackStackIndices:Ljava/util/ArrayList; + invoke-virtual {p2}, Ljava/util/ArrayList;->size()I move-result p2 @@ -5853,13 +5966,9 @@ :try_end_1 .catchall {:try_start_1 .. :try_end_1} :catchall_0 - goto :goto_7 - - :goto_6 throw p1 - :goto_7 - goto :goto_6 + return-void .end method .method public enqueueAction(Landroid/support/v4/app/FragmentManagerImpl$OpGenerator;Z)V @@ -6167,6 +6276,8 @@ .method public findFragmentById(I)Landroid/support/v4/app/Fragment; .locals 3 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 2024 iget-object v0, p0, Landroid/support/v4/app/FragmentManagerImpl;->mAdded:Ljava/util/ArrayList; @@ -6250,6 +6361,12 @@ .method public findFragmentByTag(Ljava/lang/String;)Landroid/support/v4/app/Fragment; .locals 3 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation if-eqz p1, :cond_1 @@ -6581,6 +6698,8 @@ .method public getFragment(Landroid/os/Bundle;Ljava/lang/String;)Landroid/support/v4/app/Fragment; .locals 4 + .annotation build Landroid/support/annotation/Nullable; + .end annotation const/4 v0, -0x1 @@ -6704,6 +6823,8 @@ .method public getPrimaryNavigationFragment()Landroid/support/v4/app/Fragment; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 3416 iget-object v0, p0, Landroid/support/v4/app/FragmentManagerImpl;->mPrimaryNav:Landroid/support/v4/app/Fragment; @@ -6899,8 +7020,8 @@ invoke-direct {v3, v2}, Landroid/support/v4/app/FragmentManagerImpl$AnimationOrAnimator;->(Landroid/view/animation/Animation;)V :try_end_0 - .catch Landroid/content/res/Resources$NotFoundException; {:try_start_0 .. :try_end_0} :catch_1 - .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_0 + .catch Landroid/content/res/Resources$NotFoundException; {:try_start_0 .. :try_end_0} :catch_0 + .catch Ljava/lang/RuntimeException; {:try_start_0 .. :try_end_0} :catch_1 return-object v3 @@ -6910,16 +7031,12 @@ goto :goto_0 :catch_0 - nop - - goto :goto_0 - - :catch_1 move-exception p1 .line 1185 throw p1 + :catch_1 :cond_3 :goto_0 if-nez v1, :cond_5 @@ -7018,6 +7135,8 @@ invoke-virtual {p2}, Landroid/support/v4/app/FragmentHostCallback;->onGetWindowAnimations()I + move-result p4 + goto :goto_1 .line 1232 @@ -7106,8 +7225,13 @@ move-result-object p1 + return-object p1 + :cond_8 :goto_1 + if-nez p4, :cond_9 + + :cond_9 return-object p1 :pswitch_data_0 @@ -7904,23 +8028,19 @@ iput-object v0, v7, Landroid/support/v4/app/Fragment;->mHost:Landroid/support/v4/app/FragmentHostCallback; .line 1385 - iget-object v0, v6, Landroid/support/v4/app/FragmentManagerImpl;->mParent:Landroid/support/v4/app/Fragment; - - iput-object v0, v7, Landroid/support/v4/app/Fragment;->mParentFragment:Landroid/support/v4/app/Fragment; + iget-object v1, v6, Landroid/support/v4/app/FragmentManagerImpl;->mParent:Landroid/support/v4/app/Fragment; - .line 1386 - iget-object v0, v6, Landroid/support/v4/app/FragmentManagerImpl;->mParent:Landroid/support/v4/app/Fragment; + iput-object v1, v7, Landroid/support/v4/app/Fragment;->mParentFragment:Landroid/support/v4/app/Fragment; - if-eqz v0, :cond_e + if-eqz v1, :cond_e - iget-object v0, v0, Landroid/support/v4/app/Fragment;->mChildFragmentManager:Landroid/support/v4/app/FragmentManagerImpl; + .line 1386 + iget-object v0, v1, Landroid/support/v4/app/Fragment;->mChildFragmentManager:Landroid/support/v4/app/FragmentManagerImpl; goto :goto_5 - :cond_e - iget-object v0, v6, Landroid/support/v4/app/FragmentManagerImpl;->mHost:Landroid/support/v4/app/FragmentHostCallback; - .line 1387 + :cond_e invoke-virtual {v0}, Landroid/support/v4/app/FragmentHostCallback;->getFragmentManagerImpl()Landroid/support/v4/app/FragmentManagerImpl; move-result-object v0 @@ -8997,12 +9117,12 @@ :cond_1 move-object v7, v2 - const/4 v2, 0x1 + const/4 v2, -0x1 - const/4 v8, -0x1 + const/4 v8, 0x1 .line 3705 - invoke-virtual {v4, v2, v8}, Landroid/content/res/TypedArray;->getResourceId(II)I + invoke-virtual {v4, v8, v2}, Landroid/content/res/TypedArray;->getResourceId(II)I move-result v9 @@ -9040,9 +9160,9 @@ move-result v5 :cond_3 - if-ne v5, v8, :cond_5 + if-ne v5, v2, :cond_5 - if-ne v9, v8, :cond_5 + if-ne v9, v2, :cond_5 if-eqz v10, :cond_4 @@ -9078,7 +9198,7 @@ :cond_5 :goto_0 - if-eq v9, v8, :cond_6 + if-eq v9, v2, :cond_6 .line 3724 invoke-virtual {p0, v9}, Landroid/support/v4/app/FragmentManagerImpl;->findFragmentById(I)Landroid/support/v4/app/Fragment; @@ -9103,7 +9223,7 @@ :cond_7 if-nez v4, :cond_8 - if-eq v5, v8, :cond_8 + if-eq v5, v2, :cond_8 .line 3729 invoke-virtual {p0, v5}, Landroid/support/v4/app/FragmentManagerImpl;->findFragmentById(I)Landroid/support/v4/app/Fragment; @@ -9112,102 +9232,102 @@ .line 3732 :cond_8 - sget-boolean v8, Landroid/support/v4/app/FragmentManagerImpl;->DEBUG:Z + sget-boolean v2, Landroid/support/v4/app/FragmentManagerImpl;->DEBUG:Z - if-eqz v8, :cond_9 + if-eqz v2, :cond_9 - new-instance v8, Ljava/lang/StringBuilder; + new-instance v2, Ljava/lang/StringBuilder; - invoke-direct {v8}, Ljava/lang/StringBuilder;->()V + invoke-direct {v2}, Ljava/lang/StringBuilder;->()V const-string v11, "onCreateView: id=0x" - invoke-virtual {v8, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v2, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; .line 3733 invoke-static {v9}, Ljava/lang/Integer;->toHexString(I)Ljava/lang/String; move-result-object v11 - invoke-virtual {v8, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v2, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; const-string v11, " fname=" - invoke-virtual {v8, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v2, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v8, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v2, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; const-string v11, " existing=" - invoke-virtual {v8, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v2, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v8, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - invoke-virtual {v8}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v8 + move-result-object v2 const-string v11, "FragmentManager" .line 3732 - invoke-static {v11, v8}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I + invoke-static {v11, v2}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I :cond_9 if-nez v4, :cond_b .line 3736 - iget-object v4, v6, Landroid/support/v4/app/FragmentManagerImpl;->mContainer:Landroid/support/v4/app/FragmentContainer; + iget-object v2, v6, Landroid/support/v4/app/FragmentManagerImpl;->mContainer:Landroid/support/v4/app/FragmentContainer; - invoke-virtual {v4, p3, v7, v3}, Landroid/support/v4/app/FragmentContainer;->instantiate(Landroid/content/Context;Ljava/lang/String;Landroid/os/Bundle;)Landroid/support/v4/app/Fragment; + invoke-virtual {v2, p3, v7, v3}, Landroid/support/v4/app/FragmentContainer;->instantiate(Landroid/content/Context;Ljava/lang/String;Landroid/os/Bundle;)Landroid/support/v4/app/Fragment; - move-result-object v4 + move-result-object v0 .line 3737 - iput-boolean v2, v4, Landroid/support/v4/app/Fragment;->mFromLayout:Z + iput-boolean v8, v0, Landroid/support/v4/app/Fragment;->mFromLayout:Z if-eqz v9, :cond_a - move v0, v9 + move v2, v9 goto :goto_2 :cond_a - move v0, v5 + move v2, v5 .line 3738 :goto_2 - iput v0, v4, Landroid/support/v4/app/Fragment;->mFragmentId:I + iput v2, v0, Landroid/support/v4/app/Fragment;->mFragmentId:I .line 3739 - iput v5, v4, Landroid/support/v4/app/Fragment;->mContainerId:I + iput v5, v0, Landroid/support/v4/app/Fragment;->mContainerId:I .line 3740 - iput-object v10, v4, Landroid/support/v4/app/Fragment;->mTag:Ljava/lang/String; + iput-object v10, v0, Landroid/support/v4/app/Fragment;->mTag:Ljava/lang/String; .line 3741 - iput-boolean v2, v4, Landroid/support/v4/app/Fragment;->mInLayout:Z + iput-boolean v8, v0, Landroid/support/v4/app/Fragment;->mInLayout:Z .line 3742 - iput-object v6, v4, Landroid/support/v4/app/Fragment;->mFragmentManager:Landroid/support/v4/app/FragmentManagerImpl; + iput-object v6, v0, Landroid/support/v4/app/Fragment;->mFragmentManager:Landroid/support/v4/app/FragmentManagerImpl; .line 3743 - iget-object v0, v6, Landroid/support/v4/app/FragmentManagerImpl;->mHost:Landroid/support/v4/app/FragmentHostCallback; + iget-object v2, v6, Landroid/support/v4/app/FragmentManagerImpl;->mHost:Landroid/support/v4/app/FragmentHostCallback; - iput-object v0, v4, Landroid/support/v4/app/Fragment;->mHost:Landroid/support/v4/app/FragmentHostCallback; + iput-object v2, v0, Landroid/support/v4/app/Fragment;->mHost:Landroid/support/v4/app/FragmentHostCallback; .line 3744 - iget-object v0, v6, Landroid/support/v4/app/FragmentManagerImpl;->mHost:Landroid/support/v4/app/FragmentHostCallback; - - invoke-virtual {v0}, Landroid/support/v4/app/FragmentHostCallback;->getContext()Landroid/content/Context; + invoke-virtual {v2}, Landroid/support/v4/app/FragmentHostCallback;->getContext()Landroid/content/Context; - move-result-object v0 + move-result-object v2 - iget-object v3, v4, Landroid/support/v4/app/Fragment;->mSavedFragmentState:Landroid/os/Bundle; + iget-object v3, v0, Landroid/support/v4/app/Fragment;->mSavedFragmentState:Landroid/os/Bundle; - invoke-virtual {v4, v0, v1, v3}, Landroid/support/v4/app/Fragment;->onInflate(Landroid/content/Context;Landroid/util/AttributeSet;Landroid/os/Bundle;)V + invoke-virtual {v0, v2, v1, v3}, Landroid/support/v4/app/Fragment;->onInflate(Landroid/content/Context;Landroid/util/AttributeSet;Landroid/os/Bundle;)V .line 3745 - invoke-virtual {p0, v4, v2}, Landroid/support/v4/app/FragmentManagerImpl;->addFragment(Landroid/support/v4/app/Fragment;Z)V + invoke-virtual {p0, v0, v8}, Landroid/support/v4/app/FragmentManagerImpl;->addFragment(Landroid/support/v4/app/Fragment;Z)V + + move-object v11, v0 goto :goto_3 @@ -9218,7 +9338,7 @@ if-nez v0, :cond_11 .line 3757 - iput-boolean v2, v4, Landroid/support/v4/app/Fragment;->mInLayout:Z + iput-boolean v8, v4, Landroid/support/v4/app/Fragment;->mInLayout:Z .line 3758 iget-object v0, v6, Landroid/support/v4/app/FragmentManagerImpl;->mHost:Landroid/support/v4/app/FragmentHostCallback; @@ -9237,20 +9357,20 @@ move-result-object v0 - iget-object v3, v4, Landroid/support/v4/app/Fragment;->mSavedFragmentState:Landroid/os/Bundle; + iget-object v2, v4, Landroid/support/v4/app/Fragment;->mSavedFragmentState:Landroid/os/Bundle; - invoke-virtual {v4, v0, v1, v3}, Landroid/support/v4/app/Fragment;->onInflate(Landroid/content/Context;Landroid/util/AttributeSet;Landroid/os/Bundle;)V + invoke-virtual {v4, v0, v1, v2}, Landroid/support/v4/app/Fragment;->onInflate(Landroid/content/Context;Landroid/util/AttributeSet;Landroid/os/Bundle;)V :cond_c - :goto_3 - move-object v8, v4 + move-object v11, v4 .line 3771 + :goto_3 iget v0, v6, Landroid/support/v4/app/FragmentManagerImpl;->mCurState:I - if-ge v0, v2, :cond_d + if-ge v0, v8, :cond_d - iget-boolean v0, v8, Landroid/support/v4/app/Fragment;->mFromLayout:Z + iget-boolean v0, v11, Landroid/support/v4/app/Fragment;->mFromLayout:Z if-eqz v0, :cond_d @@ -9264,7 +9384,7 @@ move-object v0, p0 - move-object v1, v8 + move-object v1, v11 .line 3772 invoke-virtual/range {v0 .. v5}, Landroid/support/v4/app/FragmentManagerImpl;->moveToState(Landroid/support/v4/app/Fragment;IIIZ)V @@ -9273,24 +9393,24 @@ .line 3774 :cond_d - invoke-virtual {p0, v8}, Landroid/support/v4/app/FragmentManagerImpl;->moveToState(Landroid/support/v4/app/Fragment;)V + invoke-virtual {p0, v11}, Landroid/support/v4/app/FragmentManagerImpl;->moveToState(Landroid/support/v4/app/Fragment;)V .line 3777 :goto_4 - iget-object v0, v8, Landroid/support/v4/app/Fragment;->mView:Landroid/view/View; + iget-object v0, v11, Landroid/support/v4/app/Fragment;->mView:Landroid/view/View; if-eqz v0, :cond_10 if-eqz v9, :cond_e .line 3782 - iget-object v0, v8, Landroid/support/v4/app/Fragment;->mView:Landroid/view/View; + iget-object v0, v11, Landroid/support/v4/app/Fragment;->mView:Landroid/view/View; invoke-virtual {v0, v9}, Landroid/view/View;->setId(I)V .line 3784 :cond_e - iget-object v0, v8, Landroid/support/v4/app/Fragment;->mView:Landroid/view/View; + iget-object v0, v11, Landroid/support/v4/app/Fragment;->mView:Landroid/view/View; invoke-virtual {v0}, Landroid/view/View;->getTag()Ljava/lang/Object; @@ -9299,13 +9419,13 @@ if-nez v0, :cond_f .line 3785 - iget-object v0, v8, Landroid/support/v4/app/Fragment;->mView:Landroid/view/View; + iget-object v0, v11, Landroid/support/v4/app/Fragment;->mView:Landroid/view/View; invoke-virtual {v0, v10}, Landroid/view/View;->setTag(Ljava/lang/Object;)V .line 3787 :cond_f - iget-object v0, v8, Landroid/support/v4/app/Fragment;->mView:Landroid/view/View; + iget-object v0, v11, Landroid/support/v4/app/Fragment;->mView:Landroid/view/View; return-object v0 @@ -9458,13 +9578,13 @@ const/4 v1, 0x0 - const/4 v2, -0x1 + const/4 v2, 0x0 - const/4 v3, 0x0 + const/4 v3, -0x1 - invoke-direct {v0, p0, v1, v2, v3}, Landroid/support/v4/app/FragmentManagerImpl$PopBackStackState;->(Landroid/support/v4/app/FragmentManagerImpl;Ljava/lang/String;II)V + invoke-direct {v0, p0, v2, v3, v1}, Landroid/support/v4/app/FragmentManagerImpl$PopBackStackState;->(Landroid/support/v4/app/FragmentManagerImpl;Ljava/lang/String;II)V - invoke-virtual {p0, v0, v3}, Landroid/support/v4/app/FragmentManagerImpl;->enqueueAction(Landroid/support/v4/app/FragmentManagerImpl$OpGenerator;Z)V + invoke-virtual {p0, v0, v1}, Landroid/support/v4/app/FragmentManagerImpl;->enqueueAction(Landroid/support/v4/app/FragmentManagerImpl$OpGenerator;Z)V return-void .end method @@ -9512,6 +9632,10 @@ .method public popBackStack(Ljava/lang/String;I)V .locals 2 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 832 new-instance v0, Landroid/support/v4/app/FragmentManagerImpl$PopBackStackState; @@ -9592,6 +9716,10 @@ .method public popBackStackImmediate(Ljava/lang/String;I)Z .locals 1 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 837 invoke-direct {p0}, Landroid/support/v4/app/FragmentManagerImpl;->checkStateLoss()V @@ -9682,11 +9810,15 @@ :cond_3 const/4 p3, -0x1 + const/4 v0, -0x1 + goto :goto_4 .line 2763 :cond_4 :goto_0 + iget-object v0, p0, Landroid/support/v4/app/FragmentManagerImpl;->mBackStack:Ljava/util/ArrayList; + invoke-virtual {v0}, Ljava/util/ArrayList;->size()I move-result v0 @@ -9783,53 +9915,51 @@ goto :goto_3 - :cond_b - move p3, v0 - .line 2791 + :cond_b :goto_4 - iget-object p4, p0, Landroid/support/v4/app/FragmentManagerImpl;->mBackStack:Ljava/util/ArrayList; + iget-object p3, p0, Landroid/support/v4/app/FragmentManagerImpl;->mBackStack:Ljava/util/ArrayList; - invoke-virtual {p4}, Ljava/util/ArrayList;->size()I + invoke-virtual {p3}, Ljava/util/ArrayList;->size()I - move-result p4 + move-result p3 - sub-int/2addr p4, v2 + sub-int/2addr p3, v2 - if-ne p3, p4, :cond_c + if-ne v0, p3, :cond_c return v1 .line 2794 :cond_c - iget-object p4, p0, Landroid/support/v4/app/FragmentManagerImpl;->mBackStack:Ljava/util/ArrayList; + iget-object p3, p0, Landroid/support/v4/app/FragmentManagerImpl;->mBackStack:Ljava/util/ArrayList; - invoke-virtual {p4}, Ljava/util/ArrayList;->size()I + invoke-virtual {p3}, Ljava/util/ArrayList;->size()I - move-result p4 + move-result p3 - sub-int/2addr p4, v2 + sub-int/2addr p3, v2 :goto_5 - if-le p4, p3, :cond_d + if-le p3, v0, :cond_d .line 2795 - iget-object p5, p0, Landroid/support/v4/app/FragmentManagerImpl;->mBackStack:Ljava/util/ArrayList; + iget-object p4, p0, Landroid/support/v4/app/FragmentManagerImpl;->mBackStack:Ljava/util/ArrayList; - invoke-virtual {p5, p4}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object; + invoke-virtual {p4, p3}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object; - move-result-object p5 + move-result-object p4 - invoke-virtual {p1, p5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + invoke-virtual {p1, p4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z .line 2796 invoke-static {v2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean; - move-result-object p5 + move-result-object p4 - invoke-virtual {p2, p5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + invoke-virtual {p2, p4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z - add-int/lit8 p4, p4, -0x1 + add-int/lit8 p3, p3, -0x1 goto :goto_5 @@ -9903,31 +10033,31 @@ if-eqz v0, :cond_0 - const-string v0, "FragmentManager" + new-instance v0, Ljava/lang/StringBuilder; - new-instance v1, Ljava/lang/StringBuilder; + invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - invoke-direct {v1}, Ljava/lang/StringBuilder;->()V + const-string v1, "remove: " - const-string v2, "remove: " + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + const-string v1, " nesting=" - const-string v2, " nesting=" + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + iget v1, p1, Landroid/support/v4/app/Fragment;->mBackStackNesting:I - iget v2, p1, Landroid/support/v4/app/Fragment;->mBackStackNesting:I + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; - invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + move-result-object v0 - move-result-object v1 + const-string v1, "FragmentManager" - invoke-static {v0, v1}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I + invoke-static {v1, v0}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I .line 1937 :cond_0 @@ -10123,23 +10253,23 @@ if-eqz v8, :cond_3 - const-string v8, "FragmentManager" + new-instance v8, Ljava/lang/StringBuilder; - new-instance v9, Ljava/lang/StringBuilder; + invoke-direct {v8}, Ljava/lang/StringBuilder;->()V - invoke-direct {v9}, Ljava/lang/StringBuilder;->()V + const-string v9, "restoreAllState: re-attaching retained " - const-string v10, "restoreAllState: re-attaching retained " + invoke-virtual {v8, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v9, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v8, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - invoke-virtual {v9, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + invoke-virtual {v8}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - invoke-virtual {v9}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + move-result-object v8 - move-result-object v9 + const-string v9, "FragmentManager" - invoke-static {v8, v9}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I + invoke-static {v9, v8}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I :cond_3 const/4 v8, 0x0 @@ -10362,29 +10492,29 @@ if-eqz v7, :cond_b - const-string v7, "FragmentManager" + new-instance v7, Ljava/lang/StringBuilder; - new-instance v8, Ljava/lang/StringBuilder; + invoke-direct {v7}, Ljava/lang/StringBuilder;->()V - invoke-direct {v8}, Ljava/lang/StringBuilder;->()V + const-string v8, "restoreAllState: active #" - const-string v9, "restoreAllState: active #" + invoke-virtual {v7, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v8, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v7, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; - invoke-virtual {v8, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; + const-string v8, ": " - const-string v9, ": " + invoke-virtual {v7, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v8, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v7, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - invoke-virtual {v8, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - invoke-virtual {v8}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + move-result-object v7 - move-result-object v8 + const-string v8, "FragmentManager" - invoke-static {v7, v8}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I + invoke-static {v8, v7}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I .line 3112 :cond_b @@ -10458,31 +10588,31 @@ if-nez v5, :cond_f - const-string v5, "FragmentManager" - .line 3129 - new-instance v6, Ljava/lang/StringBuilder; + new-instance v5, Ljava/lang/StringBuilder; - invoke-direct {v6}, Ljava/lang/StringBuilder;->()V + invoke-direct {v5}, Ljava/lang/StringBuilder;->()V - const-string v7, "Re-attaching retained fragment " + const-string v6, "Re-attaching retained fragment " - invoke-virtual {v6, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v6, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + invoke-virtual {v5, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - const-string v7, " target no longer exists: " + const-string v6, " target no longer exists: " - invoke-virtual {v6, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; iget v4, v4, Landroid/support/v4/app/Fragment;->mTargetIndex:I - invoke-virtual {v6, v4}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; + invoke-virtual {v5, v4}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; - invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; move-result-object v4 + const-string v5, "FragmentManager" + invoke-static {v5, v4}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I :cond_f @@ -10562,29 +10692,29 @@ if-eqz v3, :cond_12 - const-string v3, "FragmentManager" + new-instance v3, Ljava/lang/StringBuilder; - new-instance v4, Ljava/lang/StringBuilder; + invoke-direct {v3}, Ljava/lang/StringBuilder;->()V - invoke-direct {v4}, Ljava/lang/StringBuilder;->()V + const-string v4, "restoreAllState: added #" - const-string v5, "restoreAllState: added #" + invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v3, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; - invoke-virtual {v4, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; + const-string v4, ": " - const-string v5, ": " + invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - invoke-virtual {v4, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + move-result-object v3 - move-result-object v4 + const-string v4, "FragmentManager" - invoke-static {v3, v4}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I + invoke-static {v4, v3}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I .line 3147 :cond_12 @@ -10674,38 +10804,38 @@ if-eqz v2, :cond_15 - const-string v2, "FragmentManager" - .line 3162 - new-instance v3, Ljava/lang/StringBuilder; + new-instance v2, Ljava/lang/StringBuilder; - invoke-direct {v3}, Ljava/lang/StringBuilder;->()V + invoke-direct {v2}, Ljava/lang/StringBuilder;->()V - const-string v4, "restoreAllState: back stack #" + const-string v3, "restoreAllState: back stack #" - invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v3, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; + invoke-virtual {v2, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; - const-string v4, " (index " + const-string v3, " (index " - invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - iget v4, v0, Landroid/support/v4/app/BackStackRecord;->mIndex:I + iget v3, v0, Landroid/support/v4/app/BackStackRecord;->mIndex:I - invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; + invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; - const-string v4, "): " + const-string v3, "): " - invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + invoke-virtual {v2, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v3 + move-result-object v2 + + const-string v3, "FragmentManager" - invoke-static {v2, v3}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I + invoke-static {v3, v2}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I .line 3164 new-instance v2, Landroid/support/v4/util/LogWriter; @@ -11092,6 +11222,9 @@ aput v6, v2, v5 + .line 3014 + aget v6, v2, v5 + if-gez v6, :cond_b .line 3015 @@ -11328,69 +11461,70 @@ .line 2914 iput-object v1, p0, Landroid/support/v4/app/FragmentManagerImpl;->mStateBundle:Landroid/os/Bundle; - move-object v1, v0 + goto :goto_0 - .line 2917 :cond_1 - iget-object v0, p1, Landroid/support/v4/app/Fragment;->mView:Landroid/view/View; + move-object v0, v1 - if-eqz v0, :cond_2 + .line 2917 + :goto_0 + iget-object v1, p1, Landroid/support/v4/app/Fragment;->mView:Landroid/view/View; + + if-eqz v1, :cond_2 .line 2918 invoke-virtual {p0, p1}, Landroid/support/v4/app/FragmentManagerImpl;->saveFragmentViewState(Landroid/support/v4/app/Fragment;)V .line 2920 :cond_2 - iget-object v0, p1, Landroid/support/v4/app/Fragment;->mSavedViewState:Landroid/util/SparseArray; + iget-object v1, p1, Landroid/support/v4/app/Fragment;->mSavedViewState:Landroid/util/SparseArray; - if-eqz v0, :cond_4 + if-eqz v1, :cond_4 - if-nez v1, :cond_3 + if-nez v0, :cond_3 .line 2922 new-instance v0, Landroid/os/Bundle; invoke-direct {v0}, Landroid/os/Bundle;->()V - move-object v1, v0 - .line 2924 :cond_3 - iget-object v0, p1, Landroid/support/v4/app/Fragment;->mSavedViewState:Landroid/util/SparseArray; + iget-object v1, p1, Landroid/support/v4/app/Fragment;->mSavedViewState:Landroid/util/SparseArray; const-string v2, "android:view_state" - invoke-virtual {v1, v2, v0}, Landroid/os/Bundle;->putSparseParcelableArray(Ljava/lang/String;Landroid/util/SparseArray;)V + invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->putSparseParcelableArray(Ljava/lang/String;Landroid/util/SparseArray;)V .line 2927 :cond_4 - iget-boolean v0, p1, Landroid/support/v4/app/Fragment;->mUserVisibleHint:Z + iget-boolean v1, p1, Landroid/support/v4/app/Fragment;->mUserVisibleHint:Z - if-nez v0, :cond_6 + if-nez v1, :cond_6 - if-nez v1, :cond_5 + if-nez v0, :cond_5 .line 2929 new-instance v0, Landroid/os/Bundle; invoke-direct {v0}, Landroid/os/Bundle;->()V - move-object v1, v0 - .line 2932 :cond_5 iget-boolean p1, p1, Landroid/support/v4/app/Fragment;->mUserVisibleHint:Z - const-string v0, "android:user_visible_hint" + const-string v1, "android:user_visible_hint" - invoke-virtual {v1, v0, p1}, Landroid/os/Bundle;->putBoolean(Ljava/lang/String;Z)V + invoke-virtual {v0, v1, p1}, Landroid/os/Bundle;->putBoolean(Ljava/lang/String;Z)V :cond_6 - return-object v1 + return-object v0 .end method .method public saveFragmentInstanceState(Landroid/support/v4/app/Fragment;)Landroid/support/v4/app/Fragment$SavedState; .locals 3 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 987 iget v0, p1, Landroid/support/v4/app/Fragment;->mIndex:I @@ -11750,6 +11884,8 @@ if-eqz v0, :cond_0 + iget-object v0, p0, Landroid/support/v4/app/FragmentManagerImpl;->mPostponedTransactions:Ljava/util/ArrayList; + .line 2134 invoke-virtual {v0}, Ljava/util/ArrayList;->isEmpty()Z @@ -11770,6 +11906,8 @@ if-eqz v3, :cond_1 + iget-object v3, p0, Landroid/support/v4/app/FragmentManagerImpl;->mPendingActions:Ljava/util/ArrayList; + invoke-virtual {v3}, Ljava/util/ArrayList;->size()I move-result v3 @@ -11998,13 +12136,9 @@ :try_end_0 .catchall {:try_start_0 .. :try_end_0} :catchall_0 - goto :goto_3 - - :goto_2 throw p1 - :goto_3 - goto :goto_2 + return-void .end method .method public setPrimaryNavigationFragment(Landroid/support/v4/app/Fragment;)V @@ -12287,11 +12421,7 @@ :try_end_0 .catchall {:try_start_0 .. :try_end_0} :catchall_0 - goto :goto_3 - - :goto_2 throw p1 - :goto_3 - goto :goto_2 + return-void .end method diff --git a/smali/android/support/v4/app/FragmentPagerAdapter.smali b/smali/android/support/v4/app/FragmentPagerAdapter.smali index cac5ce21..9dc085b4 100644 --- a/smali/android/support/v4/app/FragmentPagerAdapter.smali +++ b/smali/android/support/v4/app/FragmentPagerAdapter.smali @@ -69,6 +69,14 @@ # virtual methods .method public destroyItem(Landroid/view/ViewGroup;ILjava/lang/Object;)V .locals 0 + .param p1 # Landroid/view/ViewGroup; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 120 iget-object p1, p0, Landroid/support/v4/app/FragmentPagerAdapter;->mCurTransaction:Landroid/support/v4/app/FragmentTransaction; @@ -97,6 +105,10 @@ .method public finishUpdate(Landroid/view/ViewGroup;)V .locals 0 + .param p1 # Landroid/view/ViewGroup; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 145 iget-object p1, p0, Landroid/support/v4/app/FragmentPagerAdapter;->mCurTransaction:Landroid/support/v4/app/FragmentTransaction; @@ -128,6 +140,12 @@ .method public instantiateItem(Landroid/view/ViewGroup;I)Ljava/lang/Object; .locals 4 + .param p1 # Landroid/view/ViewGroup; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 92 iget-object v0, p0, Landroid/support/v4/app/FragmentPagerAdapter;->mCurTransaction:Landroid/support/v4/app/FragmentTransaction; @@ -219,6 +237,14 @@ .method public isViewFromObject(Landroid/view/View;Ljava/lang/Object;)Z .locals 0 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 153 check-cast p2, Landroid/support/v4/app/Fragment; @@ -256,6 +282,14 @@ .method public setPrimaryItem(Landroid/view/ViewGroup;ILjava/lang/Object;)V .locals 0 + .param p1 # Landroid/view/ViewGroup; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 131 check-cast p3, Landroid/support/v4/app/Fragment; @@ -295,6 +329,10 @@ .method public startUpdate(Landroid/view/ViewGroup;)V .locals 2 + .param p1 # Landroid/view/ViewGroup; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 82 invoke-virtual {p1}, Landroid/view/ViewGroup;->getId()I diff --git a/smali/android/support/v4/app/FragmentState.smali b/smali/android/support/v4/app/FragmentState.smali index 66f8bb2c..585a21d5 100644 --- a/smali/android/support/v4/app/FragmentState.smali +++ b/smali/android/support/v4/app/FragmentState.smali @@ -349,58 +349,42 @@ iput-boolean p3, p2, Landroid/support/v4/app/Fragment;->mFromLayout:Z - .line 91 - iget-object p2, p0, Landroid/support/v4/app/FragmentState;->mInstance:Landroid/support/v4/app/Fragment; - const/4 p3, 0x1 + .line 91 iput-boolean p3, p2, Landroid/support/v4/app/Fragment;->mRestored:Z .line 92 - iget-object p2, p0, Landroid/support/v4/app/FragmentState;->mInstance:Landroid/support/v4/app/Fragment; - iget p3, p0, Landroid/support/v4/app/FragmentState;->mFragmentId:I iput p3, p2, Landroid/support/v4/app/Fragment;->mFragmentId:I .line 93 - iget-object p2, p0, Landroid/support/v4/app/FragmentState;->mInstance:Landroid/support/v4/app/Fragment; - iget p3, p0, Landroid/support/v4/app/FragmentState;->mContainerId:I iput p3, p2, Landroid/support/v4/app/Fragment;->mContainerId:I .line 94 - iget-object p2, p0, Landroid/support/v4/app/FragmentState;->mInstance:Landroid/support/v4/app/Fragment; - iget-object p3, p0, Landroid/support/v4/app/FragmentState;->mTag:Ljava/lang/String; iput-object p3, p2, Landroid/support/v4/app/Fragment;->mTag:Ljava/lang/String; .line 95 - iget-object p2, p0, Landroid/support/v4/app/FragmentState;->mInstance:Landroid/support/v4/app/Fragment; - iget-boolean p3, p0, Landroid/support/v4/app/FragmentState;->mRetainInstance:Z iput-boolean p3, p2, Landroid/support/v4/app/Fragment;->mRetainInstance:Z .line 96 - iget-object p2, p0, Landroid/support/v4/app/FragmentState;->mInstance:Landroid/support/v4/app/Fragment; - iget-boolean p3, p0, Landroid/support/v4/app/FragmentState;->mDetached:Z iput-boolean p3, p2, Landroid/support/v4/app/Fragment;->mDetached:Z .line 97 - iget-object p2, p0, Landroid/support/v4/app/FragmentState;->mInstance:Landroid/support/v4/app/Fragment; - iget-boolean p3, p0, Landroid/support/v4/app/FragmentState;->mHidden:Z iput-boolean p3, p2, Landroid/support/v4/app/Fragment;->mHidden:Z .line 98 - iget-object p2, p0, Landroid/support/v4/app/FragmentState;->mInstance:Landroid/support/v4/app/Fragment; - iget-object p1, p1, Landroid/support/v4/app/FragmentHostCallback;->mFragmentManager:Landroid/support/v4/app/FragmentManagerImpl; iput-object p1, p2, Landroid/support/v4/app/Fragment;->mFragmentManager:Landroid/support/v4/app/FragmentManagerImpl; @@ -438,13 +422,8 @@ iput-object p4, p1, Landroid/support/v4/app/Fragment;->mChildNonConfig:Landroid/support/v4/app/FragmentManagerNonConfig; .line 105 - iget-object p1, p0, Landroid/support/v4/app/FragmentState;->mInstance:Landroid/support/v4/app/Fragment; - iput-object p5, p1, Landroid/support/v4/app/Fragment;->mViewModelStore:Landroid/arch/lifecycle/ViewModelStore; - .line 106 - iget-object p1, p0, Landroid/support/v4/app/FragmentState;->mInstance:Landroid/support/v4/app/Fragment; - return-object p1 .end method diff --git a/smali/android/support/v4/app/FragmentStatePagerAdapter.smali b/smali/android/support/v4/app/FragmentStatePagerAdapter.smali index 3be44233..50d2bb26 100644 --- a/smali/android/support/v4/app/FragmentStatePagerAdapter.smali +++ b/smali/android/support/v4/app/FragmentStatePagerAdapter.smali @@ -76,6 +76,14 @@ # virtual methods .method public destroyItem(Landroid/view/ViewGroup;ILjava/lang/Object;)V .locals 2 + .param p1 # Landroid/view/ViewGroup; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 133 check-cast p3, Landroid/support/v4/app/Fragment; @@ -155,6 +163,10 @@ .method public finishUpdate(Landroid/view/ViewGroup;)V .locals 0 + .param p1 # Landroid/view/ViewGroup; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 167 iget-object p1, p0, Landroid/support/v4/app/FragmentStatePagerAdapter;->mCurTransaction:Landroid/support/v4/app/FragmentTransaction; @@ -178,6 +190,12 @@ .method public instantiateItem(Landroid/view/ViewGroup;I)Ljava/lang/Object; .locals 3 + .param p1 # Landroid/view/ViewGroup; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 101 iget-object v0, p0, Landroid/support/v4/app/FragmentStatePagerAdapter;->mFragments:Ljava/util/ArrayList; @@ -293,6 +311,14 @@ .method public isViewFromObject(Landroid/view/View;Ljava/lang/Object;)Z .locals 0 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 175 check-cast p2, Landroid/support/v4/app/Fragment; @@ -588,6 +614,14 @@ .method public setPrimaryItem(Landroid/view/ViewGroup;ILjava/lang/Object;)V .locals 0 + .param p1 # Landroid/view/ViewGroup; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 153 check-cast p3, Landroid/support/v4/app/Fragment; @@ -627,6 +661,10 @@ .method public startUpdate(Landroid/view/ViewGroup;)V .locals 2 + .param p1 # Landroid/view/ViewGroup; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 88 invoke-virtual {p1}, Landroid/view/ViewGroup;->getId()I diff --git a/smali/android/support/v4/app/FragmentTabHost$TabInfo.smali b/smali/android/support/v4/app/FragmentTabHost$TabInfo.smali index a4a9fb7b..7be322a4 100644 --- a/smali/android/support/v4/app/FragmentTabHost$TabInfo.smali +++ b/smali/android/support/v4/app/FragmentTabHost$TabInfo.smali @@ -16,8 +16,14 @@ # instance fields .field final args:Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation +.end field .field final clss:Ljava/lang/Class; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "Ljava/lang/Class<", @@ -29,11 +35,26 @@ .field fragment:Landroid/support/v4/app/Fragment; .field final tag:Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation +.end field # direct methods .method constructor (Ljava/lang/String;Ljava/lang/Class;Landroid/os/Bundle;)V .locals 0 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/Class; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", diff --git a/smali/android/support/v4/app/FragmentTabHost.smali b/smali/android/support/v4/app/FragmentTabHost.smali index 343b03c4..c44be36d 100644 --- a/smali/android/support/v4/app/FragmentTabHost.smali +++ b/smali/android/support/v4/app/FragmentTabHost.smali @@ -85,6 +85,16 @@ .method private doTabChanged(Ljava/lang/String;Landroid/support/v4/app/FragmentTransaction;)Landroid/support/v4/app/FragmentTransaction; .locals 3 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p2 # Landroid/support/v4/app/FragmentTransaction; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 335 invoke-direct {p0, p1}, Landroid/support/v4/app/FragmentTabHost;->getTabInfoForTag(Ljava/lang/String;)Landroid/support/v4/app/FragmentTabHost$TabInfo; @@ -195,6 +205,9 @@ iput-object v0, p0, Landroid/support/v4/app/FragmentTabHost;->mRealTabContent:Landroid/widget/FrameLayout; + .line 220 + iget-object v0, p0, Landroid/support/v4/app/FragmentTabHost;->mRealTabContent:Landroid/widget/FrameLayout; + if-eqz v0, :cond_0 goto :goto_0 @@ -308,9 +321,11 @@ iput-object v2, p0, Landroid/support/v4/app/FragmentTabHost;->mRealTabContent:Landroid/widget/FrameLayout; .line 176 - iget p1, p0, Landroid/support/v4/app/FragmentTabHost;->mContainerId:I + iget-object p1, p0, Landroid/support/v4/app/FragmentTabHost;->mRealTabContent:Landroid/widget/FrameLayout; + + iget v4, p0, Landroid/support/v4/app/FragmentTabHost;->mContainerId:I - invoke-virtual {v2, p1}, Landroid/widget/FrameLayout;->setId(I)V + invoke-virtual {p1, v4}, Landroid/widget/FrameLayout;->setId(I)V .line 177 new-instance p1, Landroid/widget/LinearLayout$LayoutParams; @@ -327,6 +342,8 @@ .method private getTabInfoForTag(Ljava/lang/String;)Landroid/support/v4/app/FragmentTabHost$TabInfo; .locals 4 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 365 iget-object v0, p0, Landroid/support/v4/app/FragmentTabHost;->mTabs:Ljava/util/ArrayList; @@ -376,21 +393,21 @@ const/4 v0, 0x1 + .line 146 new-array v0, v0, [I - const v1, 0x10100f3 + const/4 v1, 0x0 - const/4 v2, 0x0 + const v2, 0x10100f3 - aput v1, v0, v2 + aput v2, v0, v1 - .line 146 - invoke-virtual {p1, p2, v0, v2, v2}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray; + invoke-virtual {p1, p2, v0, v1, v1}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray; move-result-object p1 .line 148 - invoke-virtual {p1, v2, v2}, Landroid/content/res/TypedArray;->getResourceId(II)I + invoke-virtual {p1, v1, v1}, Landroid/content/res/TypedArray;->getResourceId(II)I move-result p2 @@ -409,6 +426,18 @@ # virtual methods .method public addTab(Landroid/widget/TabHost$TabSpec;Ljava/lang/Class;Landroid/os/Bundle;)V .locals 2 + .param p1 # Landroid/widget/TabHost$TabSpec; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/Class; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", diff --git a/smali/android/support/v4/app/FragmentTransaction.smali b/smali/android/support/v4/app/FragmentTransaction.smali index 7bddc1da..f803272c 100644 --- a/smali/android/support/v4/app/FragmentTransaction.smali +++ b/smali/android/support/v4/app/FragmentTransaction.smali @@ -32,21 +32,77 @@ # virtual methods .method public abstract add(ILandroid/support/v4/app/Fragment;)Landroid/support/v4/app/FragmentTransaction; + .param p1 # I + .annotation build Landroid/support/annotation/IdRes; + .end annotation + .end param + .param p2 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract add(ILandroid/support/v4/app/Fragment;Ljava/lang/String;)Landroid/support/v4/app/FragmentTransaction; + .param p1 # I + .annotation build Landroid/support/annotation/IdRes; + .end annotation + .end param + .param p2 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract add(Landroid/support/v4/app/Fragment;Ljava/lang/String;)Landroid/support/v4/app/FragmentTransaction; + .param p1 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract addSharedElement(Landroid/view/View;Ljava/lang/String;)Landroid/support/v4/app/FragmentTransaction; + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract addToBackStack(Ljava/lang/String;)Landroid/support/v4/app/FragmentTransaction; + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract attach(Landroid/support/v4/app/Fragment;)Landroid/support/v4/app/FragmentTransaction; + .param p1 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract commit()I @@ -62,12 +118,26 @@ .end method .method public abstract detach(Landroid/support/v4/app/Fragment;)Landroid/support/v4/app/FragmentTransaction; + .param p1 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract disallowAddToBackStack()Landroid/support/v4/app/FragmentTransaction; + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract hide(Landroid/support/v4/app/Fragment;)Landroid/support/v4/app/FragmentTransaction; + .param p1 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract isAddToBackStackAllowed()Z @@ -77,15 +147,51 @@ .end method .method public abstract remove(Landroid/support/v4/app/Fragment;)Landroid/support/v4/app/FragmentTransaction; + .param p1 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract replace(ILandroid/support/v4/app/Fragment;)Landroid/support/v4/app/FragmentTransaction; + .param p1 # I + .annotation build Landroid/support/annotation/IdRes; + .end annotation + .end param + .param p2 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract replace(ILandroid/support/v4/app/Fragment;Ljava/lang/String;)Landroid/support/v4/app/FragmentTransaction; + .param p1 # I + .annotation build Landroid/support/annotation/IdRes; + .end annotation + .end param + .param p2 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract runOnCommit(Ljava/lang/Runnable;)Landroid/support/v4/app/FragmentTransaction; + .param p1 # Ljava/lang/Runnable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract setAllowOptimization(Z)Landroid/support/v4/app/FragmentTransaction; @@ -94,34 +200,126 @@ .end method .method public abstract setBreadCrumbShortTitle(I)Landroid/support/v4/app/FragmentTransaction; + .param p1 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract setBreadCrumbShortTitle(Ljava/lang/CharSequence;)Landroid/support/v4/app/FragmentTransaction; + .param p1 # Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract setBreadCrumbTitle(I)Landroid/support/v4/app/FragmentTransaction; + .param p1 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract setBreadCrumbTitle(Ljava/lang/CharSequence;)Landroid/support/v4/app/FragmentTransaction; + .param p1 # Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract setCustomAnimations(II)Landroid/support/v4/app/FragmentTransaction; + .param p1 # I + .annotation build Landroid/support/annotation/AnimRes; + .end annotation + + .annotation build Landroid/support/annotation/AnimatorRes; + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/AnimRes; + .end annotation + + .annotation build Landroid/support/annotation/AnimatorRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract setCustomAnimations(IIII)Landroid/support/v4/app/FragmentTransaction; + .param p1 # I + .annotation build Landroid/support/annotation/AnimRes; + .end annotation + + .annotation build Landroid/support/annotation/AnimatorRes; + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/AnimRes; + .end annotation + + .annotation build Landroid/support/annotation/AnimatorRes; + .end annotation + .end param + .param p3 # I + .annotation build Landroid/support/annotation/AnimRes; + .end annotation + + .annotation build Landroid/support/annotation/AnimatorRes; + .end annotation + .end param + .param p4 # I + .annotation build Landroid/support/annotation/AnimRes; + .end annotation + + .annotation build Landroid/support/annotation/AnimatorRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract setPrimaryNavigationFragment(Landroid/support/v4/app/Fragment;)Landroid/support/v4/app/FragmentTransaction; + .param p1 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract setReorderingAllowed(Z)Landroid/support/v4/app/FragmentTransaction; + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract setTransition(I)Landroid/support/v4/app/FragmentTransaction; + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract setTransitionStyle(I)Landroid/support/v4/app/FragmentTransaction; + .param p1 # I + .annotation build Landroid/support/annotation/StyleRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract show(Landroid/support/v4/app/Fragment;)Landroid/support/v4/app/FragmentTransaction; + .param p1 # Landroid/support/v4/app/Fragment; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method diff --git a/smali/android/support/v4/app/FragmentTransition.smali b/smali/android/support/v4/app/FragmentTransition.smali index 85ddfaf9..7e098ec2 100644 --- a/smali/android/support/v4/app/FragmentTransition.smali +++ b/smali/android/support/v4/app/FragmentTransition.smali @@ -25,9 +25,9 @@ const/16 v0, 0xa + .line 44 new-array v0, v0, [I - .line 44 fill-array-data v0, :array_0 sput-object v0, Landroid/support/v4/app/FragmentTransition;->INVERSE_OPS:[I @@ -1341,30 +1341,41 @@ invoke-static {p0, v0}, Landroid/support/v4/app/FragmentTransition;->canHandleAll(Landroid/support/v4/app/FragmentTransitionImpl;Ljava/util/List;)Z - move-result v1 + move-result p0 - if-eqz v1, :cond_7 + if-eqz p0, :cond_7 + + .line 457 + sget-object p0, Landroid/support/v4/app/FragmentTransition;->PLATFORM_IMPL:Landroid/support/v4/app/FragmentTransitionImpl; return-object p0 .line 459 :cond_7 - sget-object v1, Landroid/support/v4/app/FragmentTransition;->SUPPORT_IMPL:Landroid/support/v4/app/FragmentTransitionImpl; + sget-object p0, Landroid/support/v4/app/FragmentTransition;->SUPPORT_IMPL:Landroid/support/v4/app/FragmentTransitionImpl; - if-eqz v1, :cond_8 + if-eqz p0, :cond_8 + + invoke-static {p0, v0}, Landroid/support/v4/app/FragmentTransition;->canHandleAll(Landroid/support/v4/app/FragmentTransitionImpl;Ljava/util/List;)Z - invoke-static {v1, v0}, Landroid/support/v4/app/FragmentTransition;->canHandleAll(Landroid/support/v4/app/FragmentTransitionImpl;Ljava/util/List;)Z + move-result p0 - move-result v0 + if-eqz p0, :cond_8 - if-eqz v0, :cond_8 + .line 460 + sget-object p0, Landroid/support/v4/app/FragmentTransition;->SUPPORT_IMPL:Landroid/support/v4/app/FragmentTransitionImpl; - return-object v1 + return-object p0 + .line 462 :cond_8 + sget-object p0, Landroid/support/v4/app/FragmentTransition;->PLATFORM_IMPL:Landroid/support/v4/app/FragmentTransitionImpl; + if-nez p0, :cond_9 - if-nez v1, :cond_9 + sget-object p0, Landroid/support/v4/app/FragmentTransition;->SUPPORT_IMPL:Landroid/support/v4/app/FragmentTransitionImpl; + + if-nez p0, :cond_9 return-object p1 @@ -2765,9 +2776,9 @@ const/4 v1, 0x0 + .line 68 new-array v2, v1, [Ljava/lang/Class; - .line 68 invoke-virtual {v0, v2}, Ljava/lang/Class;->getDeclaredConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor; move-result-object v0 diff --git a/smali/android/support/v4/app/FragmentTransitionCompat21.smali b/smali/android/support/v4/app/FragmentTransitionCompat21.smali index 15701e0f..0cf6b69f 100644 --- a/smali/android/support/v4/app/FragmentTransitionCompat21.smali +++ b/smali/android/support/v4/app/FragmentTransitionCompat21.smali @@ -3,6 +3,12 @@ .source "FragmentTransitionCompat21.java" +# annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0x15 +.end annotation + + # direct methods .method constructor ()V .locals 0 diff --git a/smali/android/support/v4/app/FragmentTransitionImpl.smali b/smali/android/support/v4/app/FragmentTransitionImpl.smali index 7f8cea86..3e50144d 100644 --- a/smali/android/support/v4/app/FragmentTransitionImpl.smali +++ b/smali/android/support/v4/app/FragmentTransitionImpl.smali @@ -3,6 +3,14 @@ .source "FragmentTransitionImpl.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # direct methods .method public constructor ()V .locals 0 @@ -403,10 +411,11 @@ .end method .method protected getBoundsOnScreen(Landroid/view/View;Landroid/graphics/Rect;)V - .locals 5 + .locals 6 const/4 v0, 0x2 + .line 75 new-array v0, v0, [I .line 76 @@ -414,20 +423,22 @@ const/4 v1, 0x0 - aget v1, v0, v1 + .line 77 + aget v2, v0, v1 - const/4 v2, 0x1 + const/4 v3, 0x1 - aget v3, v0, v2 + aget v4, v0, v3 + + aget v1, v0, v1 - .line 77 invoke-virtual {p1}, Landroid/view/View;->getWidth()I - move-result v4 + move-result v5 - add-int/2addr v4, v1 + add-int/2addr v1, v5 - aget v0, v0, v2 + aget v0, v0, v3 invoke-virtual {p1}, Landroid/view/View;->getHeight()I @@ -435,7 +446,7 @@ add-int/2addr v0, p1 - invoke-virtual {p2, v1, v3, v4, v0}, Landroid/graphics/Rect;->set(IIII)V + invoke-virtual {p2, v2, v4, v1, v0}, Landroid/graphics/Rect;->set(IIII)V return-void .end method diff --git a/smali/android/support/v4/app/FrameMetricsAggregator$FrameMetricsApi24Impl.smali b/smali/android/support/v4/app/FrameMetricsAggregator$FrameMetricsApi24Impl.smali index 1ac3260e..5dbdd322 100644 --- a/smali/android/support/v4/app/FrameMetricsAggregator$FrameMetricsApi24Impl.smali +++ b/smali/android/support/v4/app/FrameMetricsAggregator$FrameMetricsApi24Impl.smali @@ -4,6 +4,10 @@ # annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0x18 +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/app/FrameMetricsAggregator; .end annotation @@ -58,9 +62,9 @@ const/16 v0, 0x9 + .line 342 new-array v0, v0, [Landroid/util/SparseIntArray; - .line 342 iput-object v0, p0, Landroid/support/v4/app/FrameMetricsAggregator$FrameMetricsApi24Impl;->mMetrics:[Landroid/util/SparseIntArray; .line 343 @@ -103,6 +107,8 @@ sput-object v0, Landroid/support/v4/app/FrameMetricsAggregator$FrameMetricsApi24Impl;->sHandlerThread:Landroid/os/HandlerThread; .line 416 + sget-object v0, Landroid/support/v4/app/FrameMetricsAggregator$FrameMetricsApi24Impl;->sHandlerThread:Landroid/os/HandlerThread; + invoke-virtual {v0}, Landroid/os/HandlerThread;->start()V .line 417 @@ -283,9 +289,9 @@ const/16 v1, 0x9 + .line 462 new-array v1, v1, [Landroid/util/SparseIntArray; - .line 462 iput-object v1, p0, Landroid/support/v4/app/FrameMetricsAggregator$FrameMetricsApi24Impl;->mMetrics:[Landroid/util/SparseIntArray; return-object v0 diff --git a/smali/android/support/v4/app/FrameMetricsAggregator$MetricType.smali b/smali/android/support/v4/app/FrameMetricsAggregator$MetricType.smali index 0ecb6c35..f2fca4d1 100644 --- a/smali/android/support/v4/app/FrameMetricsAggregator$MetricType.smali +++ b/smali/android/support/v4/app/FrameMetricsAggregator$MetricType.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/app/FrameMetricsAggregator; .end annotation diff --git a/smali/android/support/v4/app/FrameMetricsAggregator.smali b/smali/android/support/v4/app/FrameMetricsAggregator.smali index 7e1f5133..f588827f 100644 --- a/smali/android/support/v4/app/FrameMetricsAggregator.smali +++ b/smali/android/support/v4/app/FrameMetricsAggregator.smali @@ -113,6 +113,10 @@ # virtual methods .method public add(Landroid/app/Activity;)V .locals 1 + .param p1 # Landroid/app/Activity; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 229 iget-object v0, p0, Landroid/support/v4/app/FrameMetricsAggregator;->mInstance:Landroid/support/v4/app/FrameMetricsAggregator$FrameMetricsBaseImpl; @@ -124,6 +128,8 @@ .method public getMetrics()[Landroid/util/SparseIntArray; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 304 iget-object v0, p0, Landroid/support/v4/app/FrameMetricsAggregator;->mInstance:Landroid/support/v4/app/FrameMetricsAggregator$FrameMetricsBaseImpl; @@ -137,6 +143,12 @@ .method public remove(Landroid/app/Activity;)[Landroid/util/SparseIntArray; .locals 1 + .param p1 # Landroid/app/Activity; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 246 iget-object v0, p0, Landroid/support/v4/app/FrameMetricsAggregator;->mInstance:Landroid/support/v4/app/FrameMetricsAggregator$FrameMetricsBaseImpl; @@ -150,6 +162,8 @@ .method public reset()[Landroid/util/SparseIntArray; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 276 iget-object v0, p0, Landroid/support/v4/app/FrameMetricsAggregator;->mInstance:Landroid/support/v4/app/FrameMetricsAggregator$FrameMetricsBaseImpl; @@ -163,6 +177,8 @@ .method public stop()[Landroid/util/SparseIntArray; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 263 iget-object v0, p0, Landroid/support/v4/app/FrameMetricsAggregator;->mInstance:Landroid/support/v4/app/FrameMetricsAggregator$FrameMetricsBaseImpl; diff --git a/smali/android/support/v4/app/JobIntentService$CompatWorkEnqueuer.smali b/smali/android/support/v4/app/JobIntentService$CompatWorkEnqueuer.smali index 1d0b5b22..622c04b5 100644 --- a/smali/android/support/v4/app/JobIntentService$CompatWorkEnqueuer.smali +++ b/smali/android/support/v4/app/JobIntentService$CompatWorkEnqueuer.smali @@ -78,9 +78,11 @@ iput-object v0, p0, Landroid/support/v4/app/JobIntentService$CompatWorkEnqueuer;->mLaunchWakeLock:Landroid/os/PowerManager$WakeLock; + .line 171 + iget-object v0, p0, Landroid/support/v4/app/JobIntentService$CompatWorkEnqueuer;->mLaunchWakeLock:Landroid/os/PowerManager$WakeLock; + const/4 v2, 0x0 - .line 171 invoke-virtual {v0, v2}, Landroid/os/PowerManager$WakeLock;->setReferenceCounted(Z)V .line 172 @@ -111,6 +113,8 @@ iput-object p1, p0, Landroid/support/v4/app/JobIntentService$CompatWorkEnqueuer;->mRunWakeLock:Landroid/os/PowerManager$WakeLock; .line 174 + iget-object p1, p0, Landroid/support/v4/app/JobIntentService$CompatWorkEnqueuer;->mRunWakeLock:Landroid/os/PowerManager$WakeLock; + invoke-virtual {p1, v2}, Landroid/os/PowerManager$WakeLock;->setReferenceCounted(Z)V return-void diff --git a/smali/android/support/v4/app/JobIntentService$JobServiceEngineImpl.smali b/smali/android/support/v4/app/JobIntentService$JobServiceEngineImpl.smali index 2a289324..c1686cfe 100644 --- a/smali/android/support/v4/app/JobIntentService$JobServiceEngineImpl.smali +++ b/smali/android/support/v4/app/JobIntentService$JobServiceEngineImpl.smali @@ -7,6 +7,10 @@ # annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0x1a +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/app/JobIntentService; .end annotation @@ -93,6 +97,8 @@ .line 315 :cond_0 + iget-object v1, p0, Landroid/support/v4/app/JobIntentService$JobServiceEngineImpl;->mParams:Landroid/app/job/JobParameters; + invoke-virtual {v1}, Landroid/app/job/JobParameters;->dequeueWork()Landroid/app/job/JobWorkItem; move-result-object v1 diff --git a/smali/android/support/v4/app/JobIntentService$JobWorkEnqueuer.smali b/smali/android/support/v4/app/JobIntentService$JobWorkEnqueuer.smali index 7fdf61be..5c1da3ae 100644 --- a/smali/android/support/v4/app/JobIntentService$JobWorkEnqueuer.smali +++ b/smali/android/support/v4/app/JobIntentService$JobWorkEnqueuer.smali @@ -4,6 +4,10 @@ # annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0x1a +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/app/JobIntentService; .end annotation diff --git a/smali/android/support/v4/app/JobIntentService.smali b/smali/android/support/v4/app/JobIntentService.smali index c4798224..04ef6725 100644 --- a/smali/android/support/v4/app/JobIntentService.smali +++ b/smali/android/support/v4/app/JobIntentService.smali @@ -127,6 +127,18 @@ .method public static enqueueWork(Landroid/content/Context;Landroid/content/ComponentName;ILandroid/content/Intent;)V .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/content/ComponentName; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param if-eqz p3, :cond_0 @@ -176,6 +188,18 @@ .method public static enqueueWork(Landroid/content/Context;Ljava/lang/Class;ILandroid/content/Intent;)V .locals 1 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/lang/Class; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 501 new-instance v0, Landroid/content/ComponentName; @@ -188,25 +212,25 @@ .end method .method static getWorkEnqueuer(Landroid/content/Context;Landroid/content/ComponentName;ZI)Landroid/support/v4/app/JobIntentService$WorkEnqueuer; - .locals 3 + .locals 2 .line 529 sget-object v0, Landroid/support/v4/app/JobIntentService;->sClassWorkEnqueuer:Ljava/util/HashMap; invoke-virtual {v0, p1}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v1 + move-result-object v0 - check-cast v1, Landroid/support/v4/app/JobIntentService$WorkEnqueuer; + check-cast v0, Landroid/support/v4/app/JobIntentService$WorkEnqueuer; - if-nez v1, :cond_2 + if-nez v0, :cond_2 .line 531 - sget v1, Landroid/os/Build$VERSION;->SDK_INT:I + sget v0, Landroid/os/Build$VERSION;->SDK_INT:I - const/16 v2, 0x1a + const/16 v1, 0x1a - if-lt v1, v2, :cond_1 + if-lt v0, v1, :cond_1 if-eqz p2, :cond_0 @@ -234,13 +258,15 @@ invoke-direct {p2, p0, p1}, Landroid/support/v4/app/JobIntentService$CompatWorkEnqueuer;->(Landroid/content/Context;Landroid/content/ComponentName;)V :goto_0 - move-object v1, p2 + move-object v0, p2 .line 539 - invoke-virtual {v0, p1, v1}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + sget-object p0, Landroid/support/v4/app/JobIntentService;->sClassWorkEnqueuer:Ljava/util/HashMap; + + invoke-virtual {p0, p1, v0}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; :cond_2 - return-object v1 + return-object v0 .end method @@ -389,6 +415,10 @@ .method public onBind(Landroid/content/Intent;)Landroid/os/IBinder; .locals 0 + .param p1 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 465 iget-object p1, p0, Landroid/support/v4/app/JobIntentService;->mJobImpl:Landroid/support/v4/app/JobIntentService$CompatJobEngine; @@ -506,10 +536,18 @@ .end method .method protected abstract onHandleWork(Landroid/content/Intent;)V + .param p1 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method .method public onStartCommand(Landroid/content/Intent;II)I .locals 2 + .param p1 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 444 iget-object p2, p0, Landroid/support/v4/app/JobIntentService;->mCompatQueue:Ljava/util/ArrayList; @@ -603,6 +641,8 @@ if-eqz v1, :cond_0 + iget-object v1, p0, Landroid/support/v4/app/JobIntentService;->mCompatQueue:Ljava/util/ArrayList; + invoke-virtual {v1}, Ljava/util/ArrayList;->size()I move-result v1 diff --git a/smali/android/support/v4/app/ListFragment.smali b/smali/android/support/v4/app/ListFragment.smali index 35243547..611fdb11 100644 --- a/smali/android/support/v4/app/ListFragment.smali +++ b/smali/android/support/v4/app/ListFragment.smali @@ -108,6 +108,9 @@ iput-object v1, p0, Landroid/support/v4/app/ListFragment;->mStandardEmptyView:Landroid/widget/TextView; + .line 339 + iget-object v1, p0, Landroid/support/v4/app/ListFragment;->mStandardEmptyView:Landroid/widget/TextView; + if-nez v1, :cond_2 const v1, 0x1020004 @@ -186,12 +189,14 @@ iput-object v0, p0, Landroid/support/v4/app/ListFragment;->mList:Landroid/widget/ListView; .line 358 - iget-object v1, p0, Landroid/support/v4/app/ListFragment;->mEmptyView:Landroid/view/View; + iget-object v0, p0, Landroid/support/v4/app/ListFragment;->mEmptyView:Landroid/view/View; - if-eqz v1, :cond_5 + if-eqz v0, :cond_5 .line 359 - invoke-virtual {v0, v1}, Landroid/widget/ListView;->setEmptyView(Landroid/view/View;)V + iget-object v1, p0, Landroid/support/v4/app/ListFragment;->mList:Landroid/widget/ListView; + + invoke-virtual {v1, v0}, Landroid/widget/ListView;->setEmptyView(Landroid/view/View;)V goto :goto_1 @@ -659,6 +664,14 @@ .method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V .locals 0 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 149 invoke-super {p0, p1, p2}, Landroid/support/v4/app/Fragment;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V diff --git a/smali/android/support/v4/app/LoaderManager$LoaderCallbacks.smali b/smali/android/support/v4/app/LoaderManager$LoaderCallbacks.smali index 9007ed09..6ba64e4f 100644 --- a/smali/android/support/v4/app/LoaderManager$LoaderCallbacks.smali +++ b/smali/android/support/v4/app/LoaderManager$LoaderCallbacks.smali @@ -25,6 +25,16 @@ # virtual methods .method public abstract onCreateLoader(ILandroid/os/Bundle;)Landroid/support/v4/content/Loader; + .param p2 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/MainThread; + .end annotation + + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(I", @@ -37,6 +47,13 @@ .end method .method public abstract onLoadFinished(Landroid/support/v4/content/Loader;Ljava/lang/Object;)V + .param p1 # Landroid/support/v4/content/Loader; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/MainThread; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -47,6 +64,13 @@ .end method .method public abstract onLoaderReset(Landroid/support/v4/content/Loader;)V + .param p1 # Landroid/support/v4/content/Loader; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/MainThread; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", diff --git a/smali/android/support/v4/app/LoaderManager.smali b/smali/android/support/v4/app/LoaderManager.smali index e83eec0b..0978bd39 100644 --- a/smali/android/support/v4/app/LoaderManager.smali +++ b/smali/android/support/v4/app/LoaderManager.smali @@ -32,6 +32,13 @@ .method public static getInstance(Landroid/arch/lifecycle/LifecycleOwner;)Landroid/support/v4/app/LoaderManager; .locals 2 + .param p0 # Landroid/arch/lifecycle/LifecycleOwner; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(ILandroid/os/Bundle;Landroid/support/v4/content/Loader;Landroid/support/v4/content/Loader;)V .locals 0 + .param p2 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # Landroid/support/v4/content/Loader; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Landroid/support/v4/content/Loader; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(I", @@ -94,7 +112,9 @@ iput-object p4, p0, Landroid/support/v4/app/LoaderManagerImpl$LoaderInfo;->mPriorLoader:Landroid/support/v4/content/Loader; .line 66 - invoke-virtual {p3, p1, p0}, Landroid/support/v4/content/Loader;->registerListener(ILandroid/support/v4/content/Loader$OnLoadCompleteListener;)V + iget-object p2, p0, Landroid/support/v4/app/LoaderManagerImpl$LoaderInfo;->mLoader:Landroid/support/v4/content/Loader; + + invoke-virtual {p2, p1, p0}, Landroid/support/v4/content/Loader;->registerListener(ILandroid/support/v4/content/Loader$OnLoadCompleteListener;)V return-void .end method @@ -103,6 +123,9 @@ # virtual methods .method destroy(Z)Landroid/support/v4/content/Loader; .locals 2 + .annotation build Landroid/support/annotation/MainThread; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(Z)", @@ -324,6 +347,9 @@ .method getLoader()Landroid/support/v4/content/Loader; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "()", @@ -465,6 +491,14 @@ .method public onLoadComplete(Landroid/support/v4/content/Loader;Ljava/lang/Object;)V .locals 2 + .param p1 # Landroid/support/v4/content/Loader; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -534,6 +568,10 @@ .method public removeObserver(Landroid/arch/lifecycle/Observer;)V .locals 0 + .param p1 # Landroid/arch/lifecycle/Observer; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -558,6 +596,20 @@ .method setCallback(Landroid/arch/lifecycle/LifecycleOwner;Landroid/support/v4/app/LoaderManager$LoaderCallbacks;)Landroid/support/v4/content/Loader; .locals 2 + .param p1 # Landroid/arch/lifecycle/LifecycleOwner; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v4/app/LoaderManager$LoaderCallbacks; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/MainThread; + .end annotation + + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", diff --git a/smali/android/support/v4/app/LoaderManagerImpl$LoaderObserver.smali b/smali/android/support/v4/app/LoaderManagerImpl$LoaderObserver.smali index 0147dc17..e18a042f 100644 --- a/smali/android/support/v4/app/LoaderManagerImpl$LoaderObserver.smali +++ b/smali/android/support/v4/app/LoaderManagerImpl$LoaderObserver.smali @@ -30,6 +30,9 @@ # instance fields .field private final mCallback:Landroid/support/v4/app/LoaderManager$LoaderCallbacks; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "Landroid/support/v4/app/LoaderManager$LoaderCallbacks<", @@ -41,6 +44,9 @@ .field private mDeliveredData:Z .field private final mLoader:Landroid/support/v4/content/Loader; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "Landroid/support/v4/content/Loader<", @@ -53,6 +59,14 @@ # direct methods .method constructor (Landroid/support/v4/content/Loader;Landroid/support/v4/app/LoaderManager$LoaderCallbacks;)V .locals 1 + .param p1 # Landroid/support/v4/content/Loader; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v4/app/LoaderManager$LoaderCallbacks; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -110,6 +124,10 @@ .method public onChanged(Ljava/lang/Object;)V .locals 2 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(TD;)V" @@ -174,6 +192,8 @@ .method reset()V .locals 2 + .annotation build Landroid/support/annotation/MainThread; + .end annotation .line 260 iget-boolean v0, p0, Landroid/support/v4/app/LoaderManagerImpl$LoaderObserver;->mDeliveredData:Z diff --git a/smali/android/support/v4/app/LoaderManagerImpl$LoaderViewModel$1.smali b/smali/android/support/v4/app/LoaderManagerImpl$LoaderViewModel$1.smali index ea243e49..4e75f9e4 100644 --- a/smali/android/support/v4/app/LoaderManagerImpl$LoaderViewModel$1.smali +++ b/smali/android/support/v4/app/LoaderManagerImpl$LoaderViewModel$1.smali @@ -31,6 +31,13 @@ # virtual methods .method public create(Ljava/lang/Class;)Landroid/arch/lifecycle/ViewModel; .locals 0 + .param p1 # Ljava/lang/Class; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "mLoaders:Landroid/support/v4/util/SparseArrayCompat; diff --git a/smali/android/support/v4/app/LoaderManagerImpl.smali b/smali/android/support/v4/app/LoaderManagerImpl.smali index 5611ba5e..7ac325a2 100644 --- a/smali/android/support/v4/app/LoaderManagerImpl.smali +++ b/smali/android/support/v4/app/LoaderManagerImpl.smali @@ -21,8 +21,14 @@ # instance fields .field private final mLifecycleOwner:Landroid/arch/lifecycle/LifecycleOwner; + .annotation build Landroid/support/annotation/NonNull; + .end annotation +.end field .field private final mLoaderViewModel:Landroid/support/v4/app/LoaderManagerImpl$LoaderViewModel; + .annotation build Landroid/support/annotation/NonNull; + .end annotation +.end field # direct methods @@ -34,6 +40,14 @@ .method constructor (Landroid/arch/lifecycle/LifecycleOwner;Landroid/arch/lifecycle/ViewModelStore;)V .locals 0 + .param p1 # Landroid/arch/lifecycle/LifecycleOwner; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/arch/lifecycle/ViewModelStore; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 371 invoke-direct {p0}, Landroid/support/v4/app/LoaderManager;->()V @@ -53,6 +67,24 @@ .method private createAndInstallLoader(ILandroid/os/Bundle;Landroid/support/v4/app/LoaderManager$LoaderCallbacks;Landroid/support/v4/content/Loader;)Landroid/support/v4/content/Loader; .locals 2 + .param p2 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # Landroid/support/v4/app/LoaderManager$LoaderCallbacks; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Landroid/support/v4/content/Loader; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/MainThread; + .end annotation + + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "mLoaderViewModel:Landroid/support/v4/app/LoaderManagerImpl$LoaderViewModel; @@ -320,6 +354,9 @@ .method public getLoader(I)Landroid/support/v4/content/Loader; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "SDK_INT:I @@ -115,6 +121,17 @@ .method public static getParentActivityIntent(Landroid/content/Context;Landroid/content/ComponentName;)Landroid/content/Intent; .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/content/ComponentName; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Landroid/content/pm/PackageManager$NameNotFoundException; @@ -173,6 +190,17 @@ .method public static getParentActivityIntent(Landroid/content/Context;Ljava/lang/Class;)Landroid/content/Intent; .locals 1 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/lang/Class; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -240,6 +268,12 @@ .method public static getParentActivityName(Landroid/app/Activity;)Ljava/lang/String; .locals 1 + .param p0 # Landroid/app/Activity; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 220 :try_start_0 @@ -268,6 +302,17 @@ .method public static getParentActivityName(Landroid/content/Context;Landroid/content/ComponentName;)Ljava/lang/String; .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/content/ComponentName; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Landroid/content/pm/PackageManager$NameNotFoundException; @@ -359,6 +404,10 @@ .method public static navigateUpFromSameTask(Landroid/app/Activity;)V .locals 3 + .param p0 # Landroid/app/Activity; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 81 invoke-static {p0}, Landroid/support/v4/app/NavUtils;->getParentActivityIntent(Landroid/app/Activity;)Landroid/content/Intent; @@ -418,6 +467,14 @@ .method public static navigateUpTo(Landroid/app/Activity;Landroid/content/Intent;)V .locals 2 + .param p0 # Landroid/app/Activity; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 108 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -449,6 +506,14 @@ .method public static shouldUpRecreateTask(Landroid/app/Activity;Landroid/content/Intent;)Z .locals 2 + .param p0 # Landroid/app/Activity; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 60 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/app/NotificationBuilderWithBuilderAccessor.smali b/smali/android/support/v4/app/NotificationBuilderWithBuilderAccessor.smali index 398261f1..b6fd001c 100644 --- a/smali/android/support/v4/app/NotificationBuilderWithBuilderAccessor.smali +++ b/smali/android/support/v4/app/NotificationBuilderWithBuilderAccessor.smali @@ -3,6 +3,14 @@ .source "NotificationBuilderWithBuilderAccessor.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # virtual methods .method public abstract getBuilder()Landroid/app/Notification$Builder; .end method diff --git a/smali/android/support/v4/app/NotificationCompat$BadgeIconType.smali b/smali/android/support/v4/app/NotificationCompat$BadgeIconType.smali index e22ee29e..bea9b10c 100644 --- a/smali/android/support/v4/app/NotificationCompat$BadgeIconType.smali +++ b/smali/android/support/v4/app/NotificationCompat$BadgeIconType.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/app/NotificationCompat; .end annotation diff --git a/smali/android/support/v4/app/NotificationCompat$BigPictureStyle.smali b/smali/android/support/v4/app/NotificationCompat$BigPictureStyle.smali index 7fa8fd5d..6bf5518f 100644 --- a/smali/android/support/v4/app/NotificationCompat$BigPictureStyle.smali +++ b/smali/android/support/v4/app/NotificationCompat$BigPictureStyle.smali @@ -48,6 +48,11 @@ # virtual methods .method public apply(Landroid/support/v4/app/NotificationBuilderWithBuilderAccessor;)V .locals 2 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 2037 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/app/NotificationCompat$BigTextStyle.smali b/smali/android/support/v4/app/NotificationCompat$BigTextStyle.smali index c7d4b31c..3f4a4e4d 100644 --- a/smali/android/support/v4/app/NotificationCompat$BigTextStyle.smali +++ b/smali/android/support/v4/app/NotificationCompat$BigTextStyle.smali @@ -44,6 +44,11 @@ # virtual methods .method public apply(Landroid/support/v4/app/NotificationBuilderWithBuilderAccessor;)V .locals 2 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 2116 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/app/NotificationCompat$Builder.smali b/smali/android/support/v4/app/NotificationCompat$Builder.smali index edb5c590..4476090d 100644 --- a/smali/android/support/v4/app/NotificationCompat$Builder.smali +++ b/smali/android/support/v4/app/NotificationCompat$Builder.smali @@ -20,6 +20,12 @@ # instance fields .field public mActions:Ljava/util/ArrayList; + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "Ljava/util/ArrayList<", @@ -54,6 +60,12 @@ .field mContentView:Landroid/widget/RemoteViews; .field public mContext:Landroid/content/Context; + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field .field mExtras:Landroid/os/Bundle; @@ -144,7 +156,15 @@ .end method .method public constructor (Landroid/content/Context;Ljava/lang/String;)V - .locals 2 + .locals 3 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 734 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -199,11 +219,13 @@ iput-object p2, p0, Landroid/support/v4/app/NotificationCompat$Builder;->mChannelId:Ljava/lang/String; .line 739 + iget-object p1, p0, Landroid/support/v4/app/NotificationCompat$Builder;->mNotification:Landroid/app/Notification; + invoke-static {}, Ljava/lang/System;->currentTimeMillis()J - move-result-wide p1 + move-result-wide v1 - iput-wide p1, v1, Landroid/app/Notification;->when:J + iput-wide v1, p1, Landroid/app/Notification;->when:J .line 740 iget-object p1, p0, Landroid/support/v4/app/NotificationCompat$Builder;->mNotification:Landroid/app/Notification; @@ -486,6 +508,9 @@ .method public addInvisibleAction(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)Landroid/support/v4/app/NotificationCompat$Builder; .locals 1 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x15 + .end annotation .line 1390 new-instance v0, Landroid/support/v4/app/NotificationCompat$Action; @@ -501,6 +526,9 @@ .method public addInvisibleAction(Landroid/support/v4/app/NotificationCompat$Action;)Landroid/support/v4/app/NotificationCompat$Builder; .locals 1 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x15 + .end annotation .line 1403 iget-object v0, p0, Landroid/support/v4/app/NotificationCompat$Builder;->mInvisibleActions:Ljava/util/ArrayList; @@ -547,6 +575,11 @@ .method public getBigContentView()Landroid/widget/RemoteViews; .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 1609 iget-object v0, p0, Landroid/support/v4/app/NotificationCompat$Builder;->mBigContentView:Landroid/widget/RemoteViews; @@ -556,6 +589,11 @@ .method public getColor()I .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 1647 iget v0, p0, Landroid/support/v4/app/NotificationCompat$Builder;->mColor:I @@ -565,6 +603,11 @@ .method public getContentView()Landroid/widget/RemoteViews; .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 1601 iget-object v0, p0, Landroid/support/v4/app/NotificationCompat$Builder;->mContentView:Landroid/widget/RemoteViews; @@ -596,6 +639,11 @@ .method public getHeadsUpContentView()Landroid/widget/RemoteViews; .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 1617 iget-object v0, p0, Landroid/support/v4/app/NotificationCompat$Builder;->mHeadsUpContentView:Landroid/widget/RemoteViews; @@ -618,6 +666,11 @@ .method public getPriority()I .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 1637 iget v0, p0, Landroid/support/v4/app/NotificationCompat$Builder;->mPriority:I @@ -627,6 +680,11 @@ .method public getWhenIfShowing()J .locals 2 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 1627 iget-boolean v0, p0, Landroid/support/v4/app/NotificationCompat$Builder;->mShowWhen:Z @@ -677,6 +735,10 @@ .method public setChannelId(Ljava/lang/String;)Landroid/support/v4/app/NotificationCompat$Builder; .locals 0 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1505 iput-object p1, p0, Landroid/support/v4/app/NotificationCompat$Builder;->mChannelId:Ljava/lang/String; @@ -686,6 +748,10 @@ .method public setColor(I)Landroid/support/v4/app/NotificationCompat$Builder; .locals 0 + .param p1 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param .line 1433 iput p1, p0, Landroid/support/v4/app/NotificationCompat$Builder;->mColor:I @@ -806,13 +872,11 @@ if-eqz p1, :cond_0 .line 1179 - iget-object p1, p0, Landroid/support/v4/app/NotificationCompat$Builder;->mNotification:Landroid/app/Notification; - - iget v0, p1, Landroid/app/Notification;->flags:I + iget p1, v0, Landroid/app/Notification;->flags:I - or-int/lit8 v0, v0, 0x1 + or-int/lit8 p1, p1, 0x1 - iput v0, p1, Landroid/app/Notification;->flags:I + iput p1, v0, Landroid/app/Notification;->flags:I :cond_0 return-object p0 @@ -894,6 +958,10 @@ .method public setLights(III)Landroid/support/v4/app/NotificationCompat$Builder; .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param .line 1074 iget-object v0, p0, Landroid/support/v4/app/NotificationCompat$Builder;->mNotification:Landroid/app/Notification; @@ -901,19 +969,13 @@ iput p1, v0, Landroid/app/Notification;->ledARGB:I .line 1075 - iget-object p1, p0, Landroid/support/v4/app/NotificationCompat$Builder;->mNotification:Landroid/app/Notification; - - iput p2, p1, Landroid/app/Notification;->ledOnMS:I + iput p2, v0, Landroid/app/Notification;->ledOnMS:I .line 1076 - iget-object p1, p0, Landroid/support/v4/app/NotificationCompat$Builder;->mNotification:Landroid/app/Notification; - - iput p3, p1, Landroid/app/Notification;->ledOffMS:I + iput p3, v0, Landroid/app/Notification;->ledOffMS:I .line 1077 - iget-object p1, p0, Landroid/support/v4/app/NotificationCompat$Builder;->mNotification:Landroid/app/Notification; - - iget p1, p1, Landroid/app/Notification;->ledOnMS:I + iget p1, v0, Landroid/app/Notification;->ledOnMS:I if-eqz p1, :cond_0 @@ -1065,9 +1127,7 @@ iput p1, v0, Landroid/app/Notification;->icon:I .line 812 - iget-object p1, p0, Landroid/support/v4/app/NotificationCompat$Builder;->mNotification:Landroid/app/Notification; - - iput p2, p1, Landroid/app/Notification;->iconLevel:I + iput p2, v0, Landroid/app/Notification;->iconLevel:I return-object p0 .end method @@ -1089,12 +1149,10 @@ iput-object p1, v0, Landroid/app/Notification;->sound:Landroid/net/Uri; - .line 1019 - iget-object p1, p0, Landroid/support/v4/app/NotificationCompat$Builder;->mNotification:Landroid/app/Notification; - - const/4 v0, -0x1 + const/4 p1, -0x1 - iput v0, p1, Landroid/app/Notification;->audioStreamType:I + .line 1019 + iput p1, v0, Landroid/app/Notification;->audioStreamType:I .line 1020 sget p1, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1144,9 +1202,7 @@ iput-object p1, v0, Landroid/app/Notification;->sound:Landroid/net/Uri; .line 1042 - iget-object p1, p0, Landroid/support/v4/app/NotificationCompat$Builder;->mNotification:Landroid/app/Notification; - - iput p2, p1, Landroid/app/Notification;->audioStreamType:I + iput p2, v0, Landroid/app/Notification;->audioStreamType:I .line 1043 sget p1, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1196,6 +1252,9 @@ .line 1417 iput-object p1, p0, Landroid/support/v4/app/NotificationCompat$Builder;->mStyle:Landroid/support/v4/app/NotificationCompat$Style; + .line 1418 + iget-object p1, p0, Landroid/support/v4/app/NotificationCompat$Builder;->mStyle:Landroid/support/v4/app/NotificationCompat$Style; + if-eqz p1, :cond_0 .line 1419 diff --git a/smali/android/support/v4/app/NotificationCompat$CarExtender$UnreadConversation$Builder.smali b/smali/android/support/v4/app/NotificationCompat$CarExtender$UnreadConversation$Builder.smali index c2adbdd9..b39b40e2 100644 --- a/smali/android/support/v4/app/NotificationCompat$CarExtender$UnreadConversation$Builder.smali +++ b/smali/android/support/v4/app/NotificationCompat$CarExtender$UnreadConversation$Builder.smali @@ -91,9 +91,9 @@ const/4 v0, 0x1 + .line 5007 new-array v6, v0, [Ljava/lang/String; - .line 5007 iget-object v0, p0, Landroid/support/v4/app/NotificationCompat$CarExtender$UnreadConversation$Builder;->mParticipant:Ljava/lang/String; const/4 v1, 0x0 diff --git a/smali/android/support/v4/app/NotificationCompat$CarExtender.smali b/smali/android/support/v4/app/NotificationCompat$CarExtender.smali index 9f036a90..544a591e 100644 --- a/smali/android/support/v4/app/NotificationCompat$CarExtender.smali +++ b/smali/android/support/v4/app/NotificationCompat$CarExtender.smali @@ -25,12 +25,24 @@ # static fields .field static final EXTRA_CAR_EXTENDER:Ljava/lang/String; = "android.car.EXTENSIONS" + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field .field private static final EXTRA_COLOR:Ljava/lang/String; = "app_color" .field private static final EXTRA_CONVERSATION:Ljava/lang/String; = "car_conversation" .field static final EXTRA_INVISIBLE_ACTIONS:Ljava/lang/String; = "invisible_actions" + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field .field private static final EXTRA_LARGE_ICON:Ljava/lang/String; = "large_icon" @@ -160,7 +172,14 @@ .end method .method private static getBundleForUnreadConversation(Landroid/support/v4/app/NotificationCompat$CarExtender$UnreadConversation;)Landroid/os/Bundle; - .locals 8 + .locals 7 + .param p0 # Landroid/support/v4/app/NotificationCompat$CarExtender$UnreadConversation; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x15 + .end annotation .line 4720 new-instance v0, Landroid/os/Bundle; @@ -206,34 +225,37 @@ array-length v3, v3 - new-array v4, v3, [Landroid/os/Parcelable; + new-array v3, v3, [Landroid/os/Parcelable; + .line 4726 :goto_1 - if-ge v2, v3, :cond_1 + array-length v4, v3 + + if-ge v2, v4, :cond_1 .line 4727 - new-instance v5, Landroid/os/Bundle; + new-instance v4, Landroid/os/Bundle; - invoke-direct {v5}, Landroid/os/Bundle;->()V + invoke-direct {v4}, Landroid/os/Bundle;->()V .line 4728 invoke-virtual {p0}, Landroid/support/v4/app/NotificationCompat$CarExtender$UnreadConversation;->getMessages()[Ljava/lang/String; - move-result-object v6 + move-result-object v5 - aget-object v6, v6, v2 + aget-object v5, v5, v2 - const-string v7, "text" + const-string v6, "text" - invoke-virtual {v5, v7, v6}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V + invoke-virtual {v4, v6, v5}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V - const-string v6, "author" + const-string v5, "author" .line 4729 - invoke-virtual {v5, v6, v1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V + invoke-virtual {v4, v5, v1}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V .line 4730 - aput-object v5, v4, v2 + aput-object v4, v3, v2 add-int/lit8 v2, v2, 0x1 @@ -243,7 +265,7 @@ const-string v1, "messages" .line 4732 - invoke-virtual {v0, v1, v4}, Landroid/os/Bundle;->putParcelableArray(Ljava/lang/String;[Landroid/os/Parcelable;)V + invoke-virtual {v0, v1, v3}, Landroid/os/Bundle;->putParcelableArray(Ljava/lang/String;[Landroid/os/Parcelable;)V .line 4733 invoke-virtual {p0}, Landroid/support/v4/app/NotificationCompat$CarExtender$UnreadConversation;->getRemoteInput()Landroid/support/v4/app/RemoteInput; @@ -349,7 +371,14 @@ .end method .method private static getUnreadConversationFromBundle(Landroid/os/Bundle;)Landroid/support/v4/app/NotificationCompat$CarExtender$UnreadConversation; - .locals 20 + .locals 19 + .param p0 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x15 + .end annotation move-object/from16 v0, p0 @@ -374,52 +403,60 @@ .line 4675 array-length v4, v2 - new-array v5, v4, [Ljava/lang/String; + new-array v4, v4, [Ljava/lang/String; - const/4 v6, 0x0 + const/4 v5, 0x0 - const/4 v7, 0x0 + const/4 v6, 0x0 + .line 4677 :goto_0 - if-ge v7, v4, :cond_3 + array-length v7, v4 + + if-ge v6, v7, :cond_3 .line 4678 - aget-object v8, v2, v7 + aget-object v7, v2, v6 - instance-of v9, v8, Landroid/os/Bundle; + instance-of v7, v7, Landroid/os/Bundle; - if-nez v9, :cond_1 + if-nez v7, :cond_1 goto :goto_1 .line 4682 :cond_1 - check-cast v8, Landroid/os/Bundle; + aget-object v7, v2, v6 + + check-cast v7, Landroid/os/Bundle; - const-string v9, "text" + const-string v8, "text" - invoke-virtual {v8, v9}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String; + invoke-virtual {v7, v8}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String; - move-result-object v8 + move-result-object v7 - aput-object v8, v5, v7 + aput-object v7, v4, v6 - if-nez v8, :cond_2 + .line 4683 + aget-object v7, v4, v6 + + if-nez v7, :cond_2 goto :goto_1 :cond_2 - add-int/lit8 v7, v7, 0x1 + add-int/lit8 v6, v6, 0x1 goto :goto_0 :cond_3 - const/4 v6, 0x1 + const/4 v5, 0x1 :goto_1 - if-eqz v6, :cond_4 + if-eqz v5, :cond_4 - move-object v8, v5 + move-object v7, v4 goto :goto_2 @@ -427,7 +464,7 @@ return-object v1 :cond_5 - move-object v8, v1 + move-object v7, v1 :goto_2 const-string v2, "on_read" @@ -437,9 +474,9 @@ move-result-object v2 - move-object v11, v2 + move-object v10, v2 - check-cast v11, Landroid/app/PendingIntent; + check-cast v10, Landroid/app/PendingIntent; const-string v2, "on_reply" @@ -448,9 +485,9 @@ move-result-object v2 - move-object v10, v2 + move-object v9, v2 - check-cast v10, Landroid/app/PendingIntent; + check-cast v9, Landroid/app/PendingIntent; const-string v2, "remote_input" @@ -466,12 +503,12 @@ .line 4700 invoke-virtual {v0, v4}, Landroid/os/Bundle;->getStringArray(Ljava/lang/String;)[Ljava/lang/String; - move-result-object v12 + move-result-object v11 - if-eqz v12, :cond_8 + if-eqz v11, :cond_8 .line 4701 - array-length v4, v12 + array-length v4, v11 if-eq v4, v3, :cond_6 @@ -486,36 +523,36 @@ .line 4706 invoke-virtual {v2}, Landroid/app/RemoteInput;->getResultKey()Ljava/lang/String; - move-result-object v14 + move-result-object v13 .line 4707 invoke-virtual {v2}, Landroid/app/RemoteInput;->getLabel()Ljava/lang/CharSequence; - move-result-object v15 + move-result-object v14 .line 4708 invoke-virtual {v2}, Landroid/app/RemoteInput;->getChoices()[Ljava/lang/CharSequence; - move-result-object v16 + move-result-object v15 .line 4709 invoke-virtual {v2}, Landroid/app/RemoteInput;->getAllowFreeFormInput()Z - move-result v17 + move-result v16 .line 4710 invoke-virtual {v2}, Landroid/app/RemoteInput;->getExtras()Landroid/os/Bundle; - move-result-object v18 + move-result-object v17 - const/16 v19, 0x0 + const/16 v18, 0x0 - move-object v13, v1 + move-object v12, v1 - invoke-direct/range {v13 .. v19}, Landroid/support/v4/app/RemoteInput;->(Ljava/lang/String;Ljava/lang/CharSequence;[Ljava/lang/CharSequence;ZLandroid/os/Bundle;Ljava/util/Set;)V + invoke-direct/range {v12 .. v18}, Landroid/support/v4/app/RemoteInput;->(Ljava/lang/String;Ljava/lang/CharSequence;[Ljava/lang/CharSequence;ZLandroid/os/Bundle;Ljava/util/Set;)V :cond_7 - move-object v9, v1 + move-object v8, v1 .line 4714 new-instance v1, Landroid/support/v4/app/NotificationCompat$CarExtender$UnreadConversation; @@ -525,11 +562,11 @@ .line 4715 invoke-virtual {v0, v2}, Landroid/os/Bundle;->getLong(Ljava/lang/String;)J - move-result-wide v13 + move-result-wide v12 - move-object v7, v1 + move-object v6, v1 - invoke-direct/range {v7 .. v14}, Landroid/support/v4/app/NotificationCompat$CarExtender$UnreadConversation;->([Ljava/lang/String;Landroid/support/v4/app/RemoteInput;Landroid/app/PendingIntent;Landroid/app/PendingIntent;[Ljava/lang/String;J)V + invoke-direct/range {v6 .. v13}, Landroid/support/v4/app/NotificationCompat$CarExtender$UnreadConversation;->([Ljava/lang/String;Landroid/support/v4/app/RemoteInput;Landroid/app/PendingIntent;Landroid/app/PendingIntent;[Ljava/lang/String;J)V :cond_8 :goto_3 @@ -608,6 +645,8 @@ .method public getColor()I .locals 1 + .annotation build Landroid/support/annotation/ColorInt; + .end annotation .line 4800 iget v0, p0, Landroid/support/v4/app/NotificationCompat$CarExtender;->mColor:I @@ -635,6 +674,10 @@ .method public setColor(I)Landroid/support/v4/app/NotificationCompat$CarExtender; .locals 0 + .param p1 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param .line 4789 iput p1, p0, Landroid/support/v4/app/NotificationCompat$CarExtender;->mColor:I diff --git a/smali/android/support/v4/app/NotificationCompat$DecoratedCustomViewStyle.smali b/smali/android/support/v4/app/NotificationCompat$DecoratedCustomViewStyle.smali index 05e88a92..7701d470 100644 --- a/smali/android/support/v4/app/NotificationCompat$DecoratedCustomViewStyle.smali +++ b/smali/android/support/v4/app/NotificationCompat$DecoratedCustomViewStyle.smali @@ -239,6 +239,11 @@ # virtual methods .method public apply(Landroid/support/v4/app/NotificationBuilderWithBuilderAccessor;)V .locals 2 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 2944 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -264,6 +269,11 @@ .method public makeBigContentView(Landroid/support/v4/app/NotificationBuilderWithBuilderAccessor;)Landroid/widget/RemoteViews; .locals 2 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 2972 sget p1, Landroid/os/Build$VERSION;->SDK_INT:I @@ -315,6 +325,11 @@ .method public makeContentView(Landroid/support/v4/app/NotificationBuilderWithBuilderAccessor;)Landroid/widget/RemoteViews; .locals 2 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 2955 sget p1, Landroid/os/Build$VERSION;->SDK_INT:I @@ -358,6 +373,11 @@ .method public makeHeadsUpContentView(Landroid/support/v4/app/NotificationBuilderWithBuilderAccessor;)Landroid/widget/RemoteViews; .locals 2 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 2993 sget p1, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/app/NotificationCompat$GroupAlertBehavior.smali b/smali/android/support/v4/app/NotificationCompat$GroupAlertBehavior.smali index 09ce089a..9398c24a 100644 --- a/smali/android/support/v4/app/NotificationCompat$GroupAlertBehavior.smali +++ b/smali/android/support/v4/app/NotificationCompat$GroupAlertBehavior.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/app/NotificationCompat; .end annotation diff --git a/smali/android/support/v4/app/NotificationCompat$InboxStyle.smali b/smali/android/support/v4/app/NotificationCompat$InboxStyle.smali index f344696a..7da16474 100644 --- a/smali/android/support/v4/app/NotificationCompat$InboxStyle.smali +++ b/smali/android/support/v4/app/NotificationCompat$InboxStyle.smali @@ -81,6 +81,11 @@ .method public apply(Landroid/support/v4/app/NotificationBuilderWithBuilderAccessor;)V .locals 2 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 2889 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/app/NotificationCompat$MessagingStyle$Message.smali b/smali/android/support/v4/app/NotificationCompat$MessagingStyle$Message.smali index 04d55f78..0b9e9eef 100644 --- a/smali/android/support/v4/app/NotificationCompat$MessagingStyle$Message.smali +++ b/smali/android/support/v4/app/NotificationCompat$MessagingStyle$Message.smali @@ -34,12 +34,21 @@ # instance fields .field private mDataMimeType:Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation +.end field .field private mDataUri:Landroid/net/Uri; + .annotation build Landroid/support/annotation/Nullable; + .end annotation +.end field .field private mExtras:Landroid/os/Bundle; .field private final mPerson:Landroid/support/v4/app/Person; + .annotation build Landroid/support/annotation/Nullable; + .end annotation +.end field .field private final mText:Ljava/lang/CharSequence; @@ -49,6 +58,10 @@ # direct methods .method public constructor (Ljava/lang/CharSequence;JLandroid/support/v4/app/Person;)V .locals 1 + .param p4 # Landroid/support/v4/app/Person; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 2614 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -97,6 +110,9 @@ .method static getBundleArrayForMessages(Ljava/util/List;)[Landroid/os/Bundle; .locals 4 + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -147,6 +163,8 @@ .method static getMessageFromBundle(Landroid/os/Bundle;)Landroid/support/v4/app/NotificationCompat$MessagingStyle$Message; .locals 10 + .annotation build Landroid/support/annotation/Nullable; + .end annotation const-string v0, "uri" @@ -337,7 +355,10 @@ .end method .method static getMessagesFromBundleArray([Landroid/os/Parcelable;)Ljava/util/List; - .locals 4 + .locals 3 + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "([", @@ -367,11 +388,13 @@ .line 2769 aget-object v2, p0, v1 - instance-of v3, v2, Landroid/os/Bundle; + instance-of v2, v2, Landroid/os/Bundle; - if-eqz v3, :cond_0 + if-eqz v2, :cond_0 .line 2770 + aget-object v2, p0, v1 + check-cast v2, Landroid/os/Bundle; invoke-static {v2}, Landroid/support/v4/app/NotificationCompat$MessagingStyle$Message;->getMessageFromBundle(Landroid/os/Bundle;)Landroid/support/v4/app/NotificationCompat$MessagingStyle$Message; @@ -506,6 +529,8 @@ # virtual methods .method public getDataMimeType()Ljava/lang/String; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 2713 iget-object v0, p0, Landroid/support/v4/app/NotificationCompat$MessagingStyle$Message;->mDataMimeType:Ljava/lang/String; @@ -515,6 +540,8 @@ .method public getDataUri()Landroid/net/Uri; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 2722 iget-object v0, p0, Landroid/support/v4/app/NotificationCompat$MessagingStyle$Message;->mDataUri:Landroid/net/Uri; @@ -524,6 +551,8 @@ .method public getExtras()Landroid/os/Bundle; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 2690 iget-object v0, p0, Landroid/support/v4/app/NotificationCompat$MessagingStyle$Message;->mExtras:Landroid/os/Bundle; @@ -533,6 +562,8 @@ .method public getPerson()Landroid/support/v4/app/Person; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 2707 iget-object v0, p0, Landroid/support/v4/app/NotificationCompat$MessagingStyle$Message;->mPerson:Landroid/support/v4/app/Person; @@ -542,6 +573,9 @@ .method public getSender()Ljava/lang/CharSequence; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation runtime Ljava/lang/Deprecated; .end annotation @@ -565,6 +599,8 @@ .method public getText()Ljava/lang/CharSequence; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 2679 iget-object v0, p0, Landroid/support/v4/app/NotificationCompat$MessagingStyle$Message;->mText:Ljava/lang/CharSequence; diff --git a/smali/android/support/v4/app/NotificationCompat$MessagingStyle.smali b/smali/android/support/v4/app/NotificationCompat$MessagingStyle.smali index 4e5279db..1c5e563d 100644 --- a/smali/android/support/v4/app/NotificationCompat$MessagingStyle.smali +++ b/smali/android/support/v4/app/NotificationCompat$MessagingStyle.smali @@ -26,8 +26,14 @@ # instance fields .field private mConversationTitle:Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/Nullable; + .end annotation +.end field .field private mIsGroupConversation:Ljava/lang/Boolean; + .annotation build Landroid/support/annotation/Nullable; + .end annotation +.end field .field private final mMessages:Ljava/util/List; .annotation system Ldalvik/annotation/Signature; @@ -61,6 +67,10 @@ .method public constructor (Landroid/support/v4/app/Person;)V .locals 1 + .param p1 # Landroid/support/v4/app/Person; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2196 invoke-direct {p0}, Landroid/support/v4/app/NotificationCompat$Style;->()V @@ -101,6 +111,10 @@ .method public constructor (Ljava/lang/CharSequence;)V .locals 1 + .param p1 # Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation runtime Ljava/lang/Deprecated; .end annotation @@ -134,6 +148,8 @@ .method public static extractMessagingStyleFromNotification(Landroid/app/Notification;)Landroid/support/v4/app/NotificationCompat$MessagingStyle; .locals 2 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 2359 invoke-static {p0}, Landroid/support/v4/app/NotificationCompat;->getExtras(Landroid/app/Notification;)Landroid/os/Bundle; @@ -184,6 +200,8 @@ .method private findLatestIncomingMessage()Landroid/support/v4/app/NotificationCompat$MessagingStyle$Message; .locals 3 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 2481 iget-object v0, p0, Landroid/support/v4/app/NotificationCompat$MessagingStyle;->mMessages:Ljava/util/List; @@ -326,6 +344,8 @@ .method private makeFontColorSpan(I)Landroid/text/style/TextAppearanceSpan; .locals 7 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 2532 new-instance v6, Landroid/text/style/TextAppearanceSpan; @@ -704,6 +724,11 @@ .method public apply(Landroid/support/v4/app/NotificationBuilderWithBuilderAccessor;)V .locals 10 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 2385 invoke-virtual {p0}, Landroid/support/v4/app/NotificationCompat$MessagingStyle;->isGroupConversation()Z @@ -1144,6 +1169,8 @@ .method public getConversationTitle()Ljava/lang/CharSequence; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 2241 iget-object v0, p0, Landroid/support/v4/app/NotificationCompat$MessagingStyle;->mConversationTitle:Ljava/lang/CharSequence; @@ -1247,6 +1274,11 @@ .method protected restoreFromCompatExtras(Landroid/os/Bundle;)V .locals 2 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 2560 iget-object v0, p0, Landroid/support/v4/app/NotificationCompat$MessagingStyle;->mMessages:Ljava/util/List; @@ -1309,6 +1341,9 @@ iput-object v0, p0, Landroid/support/v4/app/NotificationCompat$MessagingStyle;->mConversationTitle:Ljava/lang/CharSequence; + .line 2573 + iget-object v0, p0, Landroid/support/v4/app/NotificationCompat$MessagingStyle;->mConversationTitle:Ljava/lang/CharSequence; + if-nez v0, :cond_1 const-string v0, "android.hiddenConversationTitle" @@ -1366,6 +1401,10 @@ .method public setConversationTitle(Ljava/lang/CharSequence;)Landroid/support/v4/app/NotificationCompat$MessagingStyle; .locals 0 + .param p1 # Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 2232 iput-object p1, p0, Landroid/support/v4/app/NotificationCompat$MessagingStyle;->mConversationTitle:Ljava/lang/CharSequence; diff --git a/smali/android/support/v4/app/NotificationCompat$NotificationVisibility.smali b/smali/android/support/v4/app/NotificationCompat$NotificationVisibility.smali index 87539cc7..83e09808 100644 --- a/smali/android/support/v4/app/NotificationCompat$NotificationVisibility.smali +++ b/smali/android/support/v4/app/NotificationCompat$NotificationVisibility.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/app/NotificationCompat; .end annotation diff --git a/smali/android/support/v4/app/NotificationCompat$StreamType.smali b/smali/android/support/v4/app/NotificationCompat$StreamType.smali index 23e83c3f..6b7531f3 100644 --- a/smali/android/support/v4/app/NotificationCompat$StreamType.smali +++ b/smali/android/support/v4/app/NotificationCompat$StreamType.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/app/NotificationCompat; .end annotation diff --git a/smali/android/support/v4/app/NotificationCompat$Style.smali b/smali/android/support/v4/app/NotificationCompat$Style.smali index 14069f08..f93f2d16 100644 --- a/smali/android/support/v4/app/NotificationCompat$Style.smali +++ b/smali/android/support/v4/app/NotificationCompat$Style.smali @@ -18,6 +18,12 @@ .field mBigContentTitle:Ljava/lang/CharSequence; .field protected mBuilder:Landroid/support/v4/app/NotificationCompat$Builder; + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field .field mSummaryText:Ljava/lang/CharSequence; @@ -302,18 +308,33 @@ # virtual methods .method public addCompatExtras(Landroid/os/Bundle;)V .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation return-void .end method .method public apply(Landroid/support/v4/app/NotificationBuilderWithBuilderAccessor;)V .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation return-void .end method .method public applyStandardTemplate(ZIZ)Landroid/widget/RemoteViews; .locals 12 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 1742 iget-object v0, p0, Landroid/support/v4/app/NotificationCompat$Style;->mBuilder:Landroid/support/v4/app/NotificationCompat$Builder; @@ -959,26 +980,24 @@ invoke-virtual {v7, p2, p3, v0, v1}, Landroid/widget/RemoteViews;->setLong(ILjava/lang/String;J)V - goto :goto_b - - :cond_13 - move v8, p2 + :goto_b + const/4 p2, 0x1 .line 1879 - :goto_b - sget p2, Landroid/support/compat/R$id;->right_side:I + :cond_13 + sget p3, Landroid/support/compat/R$id;->right_side:I - if-eqz v8, :cond_14 + if-eqz p2, :cond_14 - const/4 p3, 0x0 + const/4 p2, 0x0 goto :goto_c :cond_14 - const/16 p3, 0x8 + const/16 p2, 0x8 :goto_c - invoke-virtual {v7, p2, p3}, Landroid/widget/RemoteViews;->setViewVisibility(II)V + invoke-virtual {v7, p3, p2}, Landroid/widget/RemoteViews;->setViewVisibility(II)V .line 1880 sget p2, Landroid/support/compat/R$id;->line3:I @@ -1020,6 +1039,11 @@ .method public buildIntoRemoteViews(Landroid/widget/RemoteViews;Landroid/widget/RemoteViews;)V .locals 7 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 1929 invoke-direct {p0, p1}, Landroid/support/v4/app/NotificationCompat$Style;->hideNormalContent(Landroid/widget/RemoteViews;)V @@ -1077,6 +1101,11 @@ .method public createColoredBitmap(II)Landroid/graphics/Bitmap; .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation const/4 v0, 0x0 @@ -1090,6 +1119,11 @@ .method public makeBigContentView(Landroid/support/v4/app/NotificationBuilderWithBuilderAccessor;)Landroid/widget/RemoteViews; .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation const/4 p1, 0x0 @@ -1098,6 +1132,11 @@ .method public makeContentView(Landroid/support/v4/app/NotificationBuilderWithBuilderAccessor;)Landroid/widget/RemoteViews; .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation const/4 p1, 0x0 @@ -1106,6 +1145,11 @@ .method public makeHeadsUpContentView(Landroid/support/v4/app/NotificationBuilderWithBuilderAccessor;)Landroid/widget/RemoteViews; .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation const/4 p1, 0x0 @@ -1114,6 +1158,11 @@ .method protected restoreFromCompatExtras(Landroid/os/Bundle;)V .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation return-void .end method @@ -1129,6 +1178,9 @@ .line 1670 iput-object p1, p0, Landroid/support/v4/app/NotificationCompat$Style;->mBuilder:Landroid/support/v4/app/NotificationCompat$Builder; + .line 1671 + iget-object p1, p0, Landroid/support/v4/app/NotificationCompat$Style;->mBuilder:Landroid/support/v4/app/NotificationCompat$Builder; + if-eqz p1, :cond_0 .line 1672 diff --git a/smali/android/support/v4/app/NotificationCompat$WearableExtender.smali b/smali/android/support/v4/app/NotificationCompat$WearableExtender.smali index 4fe56ca6..29ac715b 100644 --- a/smali/android/support/v4/app/NotificationCompat$WearableExtender.smali +++ b/smali/android/support/v4/app/NotificationCompat$WearableExtender.smali @@ -183,7 +183,7 @@ .end method .method public constructor (Landroid/app/Notification;)V - .locals 12 + .locals 11 .line 3869 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -270,59 +270,62 @@ move-result v6 - new-array v8, v6, [Landroid/support/v4/app/NotificationCompat$Action; + new-array v6, v6, [Landroid/support/v4/app/NotificationCompat$Action; - const/4 v9, 0x0 + const/4 v8, 0x0 + .line 3878 :goto_1 - if-ge v9, v6, :cond_3 + array-length v9, v6 + + if-ge v8, v9, :cond_3 .line 3879 - sget v10, Landroid/os/Build$VERSION;->SDK_INT:I + sget v9, Landroid/os/Build$VERSION;->SDK_INT:I - const/16 v11, 0x14 + const/16 v10, 0x14 - if-lt v10, v11, :cond_1 + if-lt v9, v10, :cond_1 .line 3881 - invoke-virtual {v5, v9}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v5, v8}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; - move-result-object v10 + move-result-object v9 - check-cast v10, Landroid/app/Notification$Action; + check-cast v9, Landroid/app/Notification$Action; .line 3880 - invoke-static {v10}, Landroid/support/v4/app/NotificationCompat;->getActionCompatFromAction(Landroid/app/Notification$Action;)Landroid/support/v4/app/NotificationCompat$Action; + invoke-static {v9}, Landroid/support/v4/app/NotificationCompat;->getActionCompatFromAction(Landroid/app/Notification$Action;)Landroid/support/v4/app/NotificationCompat$Action; - move-result-object v10 + move-result-object v9 - aput-object v10, v8, v9 + aput-object v9, v6, v8 goto :goto_2 .line 3882 :cond_1 - sget v10, Landroid/os/Build$VERSION;->SDK_INT:I + sget v9, Landroid/os/Build$VERSION;->SDK_INT:I - if-lt v10, v7, :cond_2 + if-lt v9, v7, :cond_2 .line 3884 - invoke-virtual {v5, v9}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v5, v8}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; - move-result-object v10 + move-result-object v9 - check-cast v10, Landroid/os/Bundle; + check-cast v9, Landroid/os/Bundle; .line 3883 - invoke-static {v10}, Landroid/support/v4/app/NotificationCompatJellybean;->getActionFromBundle(Landroid/os/Bundle;)Landroid/support/v4/app/NotificationCompat$Action; + invoke-static {v9}, Landroid/support/v4/app/NotificationCompatJellybean;->getActionFromBundle(Landroid/os/Bundle;)Landroid/support/v4/app/NotificationCompat$Action; - move-result-object v10 + move-result-object v9 - aput-object v10, v8, v9 + aput-object v9, v6, v8 :cond_2 :goto_2 - add-int/lit8 v9, v9, 0x1 + add-int/lit8 v8, v8, 0x1 goto :goto_1 @@ -330,9 +333,9 @@ :cond_3 iget-object v5, p0, Landroid/support/v4/app/NotificationCompat$WearableExtender;->mActions:Ljava/util/ArrayList; - check-cast v8, [Landroid/support/v4/app/NotificationCompat$Action; + check-cast v6, [Landroid/support/v4/app/NotificationCompat$Action; - invoke-static {v5, v8}, Ljava/util/Collections;->addAll(Ljava/util/Collection;[Ljava/lang/Object;)Z + invoke-static {v5, v6}, Ljava/util/Collections;->addAll(Ljava/util/Collection;[Ljava/lang/Object;)Z :cond_4 const-string v5, "flags" @@ -468,6 +471,9 @@ .method private static getActionFromActionCompat(Landroid/support/v4/app/NotificationCompat$Action;)Landroid/app/Notification$Action; .locals 4 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x14 + .end annotation .line 3988 new-instance v0, Landroid/app/Notification$Action$Builder; diff --git a/smali/android/support/v4/app/NotificationCompat.smali b/smali/android/support/v4/app/NotificationCompat.smali index 6833974d..1a3baf6a 100644 --- a/smali/android/support/v4/app/NotificationCompat.smali +++ b/smali/android/support/v4/app/NotificationCompat.smali @@ -63,6 +63,9 @@ .field public static final CATEGORY_TRANSPORT:Ljava/lang/String; = "transport" .field public static final COLOR_DEFAULT:I = 0x0 + .annotation build Landroid/support/annotation/ColorInt; + .end annotation +.end field .field public static final DEFAULT_ALL:I = -0x1 @@ -283,6 +286,9 @@ .method static getActionCompatFromAction(Landroid/app/Notification$Action;)Landroid/support/v4/app/NotificationCompat$Action; .locals 14 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x14 + .end annotation .line 5093 invoke-virtual {p0}, Landroid/app/Notification$Action;->getRemoteInputs()[Landroid/app/RemoteInput; @@ -586,6 +592,9 @@ .method public static getContentTitle(Landroid/app/Notification;)Ljava/lang/CharSequence; .locals 1 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x13 + .end annotation .line 5154 iget-object p0, p0, Landroid/app/Notification;->extras:Landroid/os/Bundle; @@ -601,6 +610,8 @@ .method public static getExtras(Landroid/app/Notification;)Landroid/os/Bundle; .locals 2 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 5041 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -721,6 +732,10 @@ .method public static getInvisibleActions(Landroid/app/Notification;)Ljava/util/List; .locals 3 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x15 + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", diff --git a/smali/android/support/v4/app/NotificationCompatBuilder.smali b/smali/android/support/v4/app/NotificationCompatBuilder.smali index e78ed0c4..9a11d5f7 100644 --- a/smali/android/support/v4/app/NotificationCompatBuilder.smali +++ b/smali/android/support/v4/app/NotificationCompatBuilder.smali @@ -6,6 +6,14 @@ .implements Landroid/support/v4/app/NotificationBuilderWithBuilderAccessor; +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # instance fields .field private final mActionExtrasList:Ljava/util/List; .annotation system Ldalvik/annotation/Signature; diff --git a/smali/android/support/v4/app/NotificationCompatJellybean.smali b/smali/android/support/v4/app/NotificationCompatJellybean.smali index 932aa67e..1a372828 100644 --- a/smali/android/support/v4/app/NotificationCompatJellybean.smali +++ b/smali/android/support/v4/app/NotificationCompatJellybean.smali @@ -3,6 +3,12 @@ .source "NotificationCompatJellybean.java" +# annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0x10 +.end annotation + + # static fields .field static final EXTRA_ALLOW_GENERATED_REPLIES:Ljava/lang/String; = "android.support.allowGeneratedReplies" @@ -183,9 +189,11 @@ sput-object v3, Landroid/support/v4/app/NotificationCompatJellybean;->sActionClass:Ljava/lang/Class; + .line 214 + sget-object v3, Landroid/support/v4/app/NotificationCompatJellybean;->sActionClass:Ljava/lang/Class; + const-string v4, "icon" - .line 214 invoke-virtual {v3, v4}, Ljava/lang/Class;->getDeclaredField(Ljava/lang/String;)Ljava/lang/reflect/Field; move-result-object v3 @@ -226,6 +234,8 @@ sput-object v3, Landroid/support/v4/app/NotificationCompatJellybean;->sActionsField:Ljava/lang/reflect/Field; .line 218 + sget-object v3, Landroid/support/v4/app/NotificationCompatJellybean;->sActionsField:Ljava/lang/reflect/Field; + invoke-virtual {v3, v2}, Ljava/lang/reflect/Field;->setAccessible(Z)V :try_end_0 .catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_1 diff --git a/smali/android/support/v4/app/NotificationCompatSideChannelService.smali b/smali/android/support/v4/app/NotificationCompatSideChannelService.smali index f82cd18c..5fb978d0 100644 --- a/smali/android/support/v4/app/NotificationCompatSideChannelService.smali +++ b/smali/android/support/v4/app/NotificationCompatSideChannelService.smali @@ -90,13 +90,9 @@ invoke-direct {v0, p1}, Ljava/lang/SecurityException;->(Ljava/lang/String;)V - goto :goto_2 - - :goto_1 throw v0 - :goto_2 - goto :goto_1 + return-void .end method .method public abstract notify(Ljava/lang/String;ILjava/lang/String;Landroid/app/Notification;)V diff --git a/smali/android/support/v4/app/NotificationManagerCompat$SideChannelManager.smali b/smali/android/support/v4/app/NotificationManagerCompat$SideChannelManager.smali index e5467cf1..d162dabb 100644 --- a/smali/android/support/v4/app/NotificationManagerCompat$SideChannelManager.smali +++ b/smali/android/support/v4/app/NotificationManagerCompat$SideChannelManager.smali @@ -97,18 +97,22 @@ iput-object p1, p0, Landroid/support/v4/app/NotificationManagerCompat$SideChannelManager;->mHandlerThread:Landroid/os/HandlerThread; .line 325 + iget-object p1, p0, Landroid/support/v4/app/NotificationManagerCompat$SideChannelManager;->mHandlerThread:Landroid/os/HandlerThread; + invoke-virtual {p1}, Landroid/os/HandlerThread;->start()V .line 326 - new-instance v0, Landroid/os/Handler; + new-instance p1, Landroid/os/Handler; - invoke-virtual {p1}, Landroid/os/HandlerThread;->getLooper()Landroid/os/Looper; + iget-object v0, p0, Landroid/support/v4/app/NotificationManagerCompat$SideChannelManager;->mHandlerThread:Landroid/os/HandlerThread; - move-result-object p1 + invoke-virtual {v0}, Landroid/os/HandlerThread;->getLooper()Landroid/os/Looper; - invoke-direct {v0, p1, p0}, Landroid/os/Handler;->(Landroid/os/Looper;Landroid/os/Handler$Callback;)V + move-result-object v0 - iput-object v0, p0, Landroid/support/v4/app/NotificationManagerCompat$SideChannelManager;->mHandler:Landroid/os/Handler; + invoke-direct {p1, v0, p0}, Landroid/os/Handler;->(Landroid/os/Looper;Landroid/os/Handler$Callback;)V + + iput-object p1, p0, Landroid/support/v4/app/NotificationManagerCompat$SideChannelManager;->mHandler:Landroid/os/Handler; return-void .end method @@ -345,12 +349,12 @@ .method private processListenerQueue(Landroid/support/v4/app/NotificationManagerCompat$SideChannelManager$ListenerRecord;)V .locals 5 - const-string v0, "NotifManCompat" + const/4 v0, 0x3 - const/4 v1, 0x3 + const-string v1, "NotifManCompat" .line 517 - invoke-static {v0, v1}, Landroid/util/Log;->isLoggable(Ljava/lang/String;I)Z + invoke-static {v1, v0}, Landroid/util/Log;->isLoggable(Ljava/lang/String;I)Z move-result v2 @@ -391,7 +395,7 @@ move-result-object v2 .line 518 - invoke-static {v0, v2}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I + invoke-static {v1, v2}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I .line 521 :cond_0 @@ -417,7 +421,7 @@ if-nez v2, :cond_2 - goto :goto_2 + goto/16 :goto_4 .line 531 :cond_2 @@ -432,12 +436,12 @@ if-nez v2, :cond_3 - goto :goto_1 + goto :goto_3 .line 536 :cond_3 :try_start_0 - invoke-static {v0, v1}, Landroid/util/Log;->isLoggable(Ljava/lang/String;I)Z + invoke-static {v1, v0}, Landroid/util/Log;->isLoggable(Ljava/lang/String;I)Z move-result v3 @@ -458,7 +462,7 @@ move-result-object v3 - invoke-static {v0, v3}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I + invoke-static {v1, v3}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I .line 539 :cond_4 @@ -477,9 +481,17 @@ goto :goto_0 :catch_0 - move-exception v1 + move-exception v0 + + goto :goto_1 + + :catch_1 + nop + + goto :goto_2 .line 547 + :goto_1 new-instance v2, Ljava/lang/StringBuilder; invoke-direct {v2}, Ljava/lang/StringBuilder;->()V @@ -496,42 +508,40 @@ move-result-object v2 - invoke-static {v0, v2, v1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I + invoke-static {v1, v2, v0}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I - goto :goto_1 - - :catch_1 - nop + goto :goto_3 .line 542 - invoke-static {v0, v1}, Landroid/util/Log;->isLoggable(Ljava/lang/String;I)Z + :goto_2 + invoke-static {v1, v0}, Landroid/util/Log;->isLoggable(Ljava/lang/String;I)Z - move-result v1 + move-result v0 - if-eqz v1, :cond_5 + if-eqz v0, :cond_5 .line 543 - new-instance v1, Ljava/lang/StringBuilder; + new-instance v0, Ljava/lang/StringBuilder; - invoke-direct {v1}, Ljava/lang/StringBuilder;->()V + invoke-direct {v0}, Ljava/lang/StringBuilder;->()V const-string v2, "Remote service has died: " - invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; iget-object v2, p1, Landroid/support/v4/app/NotificationManagerCompat$SideChannelManager$ListenerRecord;->componentName:Landroid/content/ComponentName; - invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v1 + move-result-object v0 - invoke-static {v0, v1}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I + invoke-static {v1, v0}, Landroid/util/Log;->d(Ljava/lang/String;Ljava/lang/String;)I .line 551 :cond_5 - :goto_1 + :goto_3 iget-object v0, p1, Landroid/support/v4/app/NotificationManagerCompat$SideChannelManager$ListenerRecord;->taskQueue:Ljava/util/ArrayDeque; invoke-virtual {v0}, Ljava/util/ArrayDeque;->isEmpty()Z @@ -548,7 +558,7 @@ .line 526 :cond_7 - :goto_2 + :goto_4 invoke-direct {p0, p1}, Landroid/support/v4/app/NotificationManagerCompat$SideChannelManager;->scheduleListenerRetry(Landroid/support/v4/app/NotificationManagerCompat$SideChannelManager$ListenerRecord;)V return-void diff --git a/smali/android/support/v4/app/NotificationManagerCompat.smali b/smali/android/support/v4/app/NotificationManagerCompat.smali index 7d31ee76..78eba5b0 100644 --- a/smali/android/support/v4/app/NotificationManagerCompat.smali +++ b/smali/android/support/v4/app/NotificationManagerCompat.smali @@ -49,6 +49,10 @@ .field private static final TAG:Ljava/lang/String; = "NotifManCompat" .field private static sEnabledNotificationListenerPackages:Ljava/util/Set; + .annotation build Landroid/support/annotation/GuardedBy; + value = "sEnabledNotificationListenersLock" + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "Ljava/util/Set<", @@ -59,12 +63,20 @@ .end field .field private static sEnabledNotificationListeners:Ljava/lang/String; + .annotation build Landroid/support/annotation/GuardedBy; + value = "sEnabledNotificationListenersLock" + .end annotation +.end field .field private static final sEnabledNotificationListenersLock:Ljava/lang/Object; .field private static final sLock:Ljava/lang/Object; .field private static sSideChannelManager:Landroid/support/v4/app/NotificationManagerCompat$SideChannelManager; + .annotation build Landroid/support/annotation/GuardedBy; + value = "sLock" + .end annotation +.end field # instance fields @@ -110,9 +122,11 @@ .line 157 iput-object p1, p0, Landroid/support/v4/app/NotificationManagerCompat;->mContext:Landroid/content/Context; + .line 158 + iget-object p1, p0, Landroid/support/v4/app/NotificationManagerCompat;->mContext:Landroid/content/Context; + const-string v0, "notification" - .line 158 invoke-virtual {p1, v0}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object; move-result-object p1 @@ -126,6 +140,12 @@ .method public static from(Landroid/content/Context;)Landroid/support/v4/app/NotificationManagerCompat; .locals 1 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 153 new-instance v0, Landroid/support/v4/app/NotificationManagerCompat; @@ -137,6 +157,13 @@ .method public static getEnabledListenerPackages(Landroid/content/Context;)Ljava/util/Set; .locals 6 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -246,13 +273,9 @@ :try_end_0 .catchall {:try_start_0 .. :try_end_0} :catchall_0 - goto :goto_2 - - :goto_1 throw p0 - :goto_2 - goto :goto_1 + return-void .end method .method private pushSideChannelQueue(Landroid/support/v4/app/NotificationManagerCompat$Task;)V @@ -413,9 +436,9 @@ const/4 v6, 0x3 + .line 230 new-array v7, v6, [Ljava/lang/Class; - .line 230 sget-object v8, Ljava/lang/Integer;->TYPE:Ljava/lang/Class; const/4 v9, 0x0 @@ -456,9 +479,9 @@ move-result v4 + .line 234 new-array v6, v6, [Ljava/lang/Object; - .line 234 invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; move-result-object v4 @@ -516,6 +539,10 @@ .method public cancel(Ljava/lang/String;I)V .locals 2 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 176 iget-object v0, p0, Landroid/support/v4/app/NotificationManagerCompat;->mNotificationManager:Landroid/app/NotificationManager; @@ -605,6 +632,10 @@ .method public notify(ILandroid/app/Notification;)V .locals 1 + .param p2 # Landroid/app/Notification; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 v0, 0x0 @@ -616,6 +647,14 @@ .method public notify(Ljava/lang/String;ILandroid/app/Notification;)V .locals 2 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # Landroid/app/Notification; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 206 invoke-static {p3}, Landroid/support/v4/app/NotificationManagerCompat;->useSideChannelForNotification(Landroid/app/Notification;)Z diff --git a/smali/android/support/v4/app/Person$Builder.smali b/smali/android/support/v4/app/Person$Builder.smali index f0be873c..3e910ab2 100644 --- a/smali/android/support/v4/app/Person$Builder.smali +++ b/smali/android/support/v4/app/Person$Builder.smali @@ -16,16 +16,28 @@ # instance fields .field mIcon:Landroid/support/v4/graphics/drawable/IconCompat; + .annotation build Landroid/support/annotation/Nullable; + .end annotation +.end field .field mIsBot:Z .field mIsImportant:Z .field mKey:Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation +.end field .field mName:Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/Nullable; + .end annotation +.end field .field mUri:Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation +.end field # direct methods @@ -81,6 +93,8 @@ # virtual methods .method public build()Landroid/support/v4/app/Person; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 300 new-instance v0, Landroid/support/v4/app/Person; @@ -92,6 +106,8 @@ .method public setBot(Z)Landroid/support/v4/app/Person$Builder; .locals 0 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 281 iput-boolean p1, p0, Landroid/support/v4/app/Person$Builder;->mIsBot:Z @@ -101,6 +117,12 @@ .method public setIcon(Landroid/support/v4/graphics/drawable/IconCompat;)Landroid/support/v4/app/Person$Builder; .locals 0 + .param p1 # Landroid/support/v4/graphics/drawable/IconCompat; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 242 iput-object p1, p0, Landroid/support/v4/app/Person$Builder;->mIcon:Landroid/support/v4/graphics/drawable/IconCompat; @@ -110,6 +132,8 @@ .method public setImportant(Z)Landroid/support/v4/app/Person$Builder; .locals 0 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 293 iput-boolean p1, p0, Landroid/support/v4/app/Person$Builder;->mIsImportant:Z @@ -119,6 +143,12 @@ .method public setKey(Ljava/lang/String;)Landroid/support/v4/app/Person$Builder; .locals 0 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 271 iput-object p1, p0, Landroid/support/v4/app/Person$Builder;->mKey:Ljava/lang/String; @@ -128,6 +158,12 @@ .method public setName(Ljava/lang/CharSequence;)Landroid/support/v4/app/Person$Builder; .locals 0 + .param p1 # Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 230 iput-object p1, p0, Landroid/support/v4/app/Person$Builder;->mName:Ljava/lang/CharSequence; @@ -137,6 +173,12 @@ .method public setUri(Ljava/lang/String;)Landroid/support/v4/app/Person$Builder; .locals 0 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 260 iput-object p1, p0, Landroid/support/v4/app/Person$Builder;->mUri:Ljava/lang/String; diff --git a/smali/android/support/v4/app/Person.smali b/smali/android/support/v4/app/Person.smali index 3ada1756..117691ad 100644 --- a/smali/android/support/v4/app/Person.smali +++ b/smali/android/support/v4/app/Person.smali @@ -27,16 +27,28 @@ # instance fields .field mIcon:Landroid/support/v4/graphics/drawable/IconCompat; + .annotation build Landroid/support/annotation/Nullable; + .end annotation +.end field .field mIsBot:Z .field mIsImportant:Z .field mKey:Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation +.end field .field mName:Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/Nullable; + .end annotation +.end field .field mUri:Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation +.end field # direct methods @@ -81,6 +93,22 @@ .method public static fromAndroidPerson(Landroid/app/Person;)Landroid/support/v4/app/Person; .locals 2 + .param p0 # Landroid/app/Person; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x1c + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 68 new-instance v0, Landroid/support/v4/app/Person$Builder; @@ -169,6 +197,12 @@ .method public static fromBundle(Landroid/os/Bundle;)Landroid/support/v4/app/Person; .locals 3 + .param p0 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation const-string v0, "icon" @@ -266,6 +300,8 @@ # virtual methods .method public getIcon()Landroid/support/v4/graphics/drawable/IconCompat; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 157 iget-object v0, p0, Landroid/support/v4/app/Person;->mIcon:Landroid/support/v4/graphics/drawable/IconCompat; @@ -275,6 +311,8 @@ .method public getKey()Ljava/lang/String; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 184 iget-object v0, p0, Landroid/support/v4/app/Person;->mKey:Ljava/lang/String; @@ -284,6 +322,8 @@ .method public getName()Ljava/lang/CharSequence; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 151 iget-object v0, p0, Landroid/support/v4/app/Person;->mName:Ljava/lang/CharSequence; @@ -293,6 +333,8 @@ .method public getUri()Ljava/lang/String; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 175 iget-object v0, p0, Landroid/support/v4/app/Person;->mUri:Ljava/lang/String; @@ -320,6 +362,18 @@ .method public toAndroidPerson()Landroid/app/Person; .locals 2 + .annotation build Landroid/support/annotation/NonNull; + .end annotation + + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x1c + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 135 new-instance v0, Landroid/app/Person$Builder; @@ -406,6 +460,8 @@ .method public toBuilder()Landroid/support/v4/app/Person$Builder; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 123 new-instance v0, Landroid/support/v4/app/Person$Builder; @@ -417,6 +473,8 @@ .method public toBundle()Landroid/os/Bundle; .locals 3 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 110 new-instance v0, Landroid/os/Bundle; diff --git a/smali/android/support/v4/app/RemoteInput$Builder.smali b/smali/android/support/v4/app/RemoteInput$Builder.smali index 7a4ec92d..5758a7c3 100644 --- a/smali/android/support/v4/app/RemoteInput$Builder.smali +++ b/smali/android/support/v4/app/RemoteInput$Builder.smali @@ -39,6 +39,10 @@ # direct methods .method public constructor (Ljava/lang/String;)V .locals 1 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 140 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -84,6 +88,12 @@ # virtual methods .method public addExtras(Landroid/os/Bundle;)Landroid/support/v4/app/RemoteInput$Builder; .locals 1 + .param p1 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation if-eqz p1, :cond_0 @@ -98,6 +108,8 @@ .method public build()Landroid/support/v4/app/RemoteInput; .locals 8 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 244 new-instance v7, Landroid/support/v4/app/RemoteInput; @@ -123,6 +135,8 @@ .method public getExtras()Landroid/os/Bundle; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 235 iget-object v0, p0, Landroid/support/v4/app/RemoteInput$Builder;->mExtras:Landroid/os/Bundle; @@ -132,6 +146,12 @@ .method public setAllowDataType(Ljava/lang/String;Z)Landroid/support/v4/app/RemoteInput$Builder; .locals 0 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation if-eqz p2, :cond_0 @@ -154,6 +174,8 @@ .method public setAllowFreeFormInput(Z)Landroid/support/v4/app/RemoteInput$Builder; .locals 0 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 209 iput-boolean p1, p0, Landroid/support/v4/app/RemoteInput$Builder;->mAllowFreeFormTextInput:Z @@ -163,6 +185,12 @@ .method public setChoices([Ljava/lang/CharSequence;)Landroid/support/v4/app/RemoteInput$Builder; .locals 0 + .param p1 # [Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 173 iput-object p1, p0, Landroid/support/v4/app/RemoteInput$Builder;->mChoices:[Ljava/lang/CharSequence; @@ -172,6 +200,12 @@ .method public setLabel(Ljava/lang/CharSequence;)Landroid/support/v4/app/RemoteInput$Builder; .locals 0 + .param p1 # Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 155 iput-object p1, p0, Landroid/support/v4/app/RemoteInput$Builder;->mLabel:Ljava/lang/CharSequence; diff --git a/smali/android/support/v4/app/RemoteInput.smali b/smali/android/support/v4/app/RemoteInput.smali index 60addca7..cab1c4ce 100644 --- a/smali/android/support/v4/app/RemoteInput.smali +++ b/smali/android/support/v4/app/RemoteInput.smali @@ -305,6 +305,7 @@ const/4 v5, 0x1 + .line 356 new-array v5, v5, [Landroid/support/v4/app/RemoteInput; aput-object v3, v5, v2 @@ -430,6 +431,9 @@ .method static fromCompat(Landroid/support/v4/app/RemoteInput;)Landroid/app/RemoteInput; .locals 2 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x14 + .end annotation .line 442 new-instance v0, Landroid/app/RemoteInput$Builder; @@ -486,6 +490,9 @@ .method static fromCompat([Landroid/support/v4/app/RemoteInput;)[Landroid/app/RemoteInput; .locals 3 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x14 + .end annotation if-nez p0, :cond_0 @@ -526,6 +533,9 @@ .method private static getClipDataIntentFromIntent(Landroid/content/Intent;)Landroid/content/Intent; .locals 3 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x10 + .end annotation .line 452 invoke-virtual {p0}, Landroid/content/Intent;->getClipData()Landroid/content/ClipData; @@ -733,13 +743,10 @@ if-eqz p0, :cond_6 - goto :goto_1 + move-object v0, v2 :cond_6 - move-object v2, v0 - - :goto_1 - return-object v2 + return-object v0 :cond_7 const-string p0, "RemoteInput" diff --git a/smali/android/support/v4/app/ServiceCompat$StopForegroundFlags.smali b/smali/android/support/v4/app/ServiceCompat$StopForegroundFlags.smali index 14a78a85..219c9592 100644 --- a/smali/android/support/v4/app/ServiceCompat$StopForegroundFlags.smali +++ b/smali/android/support/v4/app/ServiceCompat$StopForegroundFlags.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/app/ServiceCompat; .end annotation diff --git a/smali/android/support/v4/app/ServiceCompat.smali b/smali/android/support/v4/app/ServiceCompat.smali index 8d6df8ce..4868ea32 100644 --- a/smali/android/support/v4/app/ServiceCompat.smali +++ b/smali/android/support/v4/app/ServiceCompat.smali @@ -31,6 +31,10 @@ .method public static stopForeground(Landroid/app/Service;I)V .locals 2 + .param p0 # Landroid/app/Service; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 98 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/app/ShareCompat$IntentBuilder.smali b/smali/android/support/v4/app/ShareCompat$IntentBuilder.smali index 64478aba..856660ca 100644 --- a/smali/android/support/v4/app/ShareCompat$IntentBuilder.smali +++ b/smali/android/support/v4/app/ShareCompat$IntentBuilder.smali @@ -86,6 +86,8 @@ iput-object v0, p0, Landroid/support/v4/app/ShareCompat$IntentBuilder;->mIntent:Landroid/content/Intent; .line 217 + iget-object v0, p0, Landroid/support/v4/app/ShareCompat$IntentBuilder;->mIntent:Landroid/content/Intent; + invoke-virtual {p1}, Landroid/app/Activity;->getPackageName()Ljava/lang/String; move-result-object v1 @@ -373,7 +375,10 @@ return-object p1 + .line 426 :cond_0 + iget-object v2, p0, Landroid/support/v4/app/ShareCompat$IntentBuilder;->mStreams:Ljava/util/ArrayList; + if-nez v2, :cond_1 .line 427 @@ -607,6 +612,10 @@ .method public setChooserTitle(I)Landroid/support/v4/app/ShareCompat$IntentBuilder; .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param .line 343 iget-object v0, p0, Landroid/support/v4/app/ShareCompat$IntentBuilder;->mActivity:Landroid/app/Activity; diff --git a/smali/android/support/v4/app/SharedElementCallback.smali b/smali/android/support/v4/app/SharedElementCallback.smali index f1f4890b..58126029 100644 --- a/smali/android/support/v4/app/SharedElementCallback.smali +++ b/smali/android/support/v4/app/SharedElementCallback.smali @@ -226,6 +226,7 @@ const/16 p3, 0x9 + .line 181 new-array p3, p3, [F .line 182 diff --git a/smali/android/support/v4/app/SupportActivity$ExtraData.smali b/smali/android/support/v4/app/SupportActivity$ExtraData.smali index 5d691fba..9433e205 100644 --- a/smali/android/support/v4/app/SupportActivity$ExtraData.smali +++ b/smali/android/support/v4/app/SupportActivity$ExtraData.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/app/SupportActivity; .end annotation diff --git a/smali/android/support/v4/app/SupportActivity.smali b/smali/android/support/v4/app/SupportActivity.smali index 7b17b11c..aec053de 100644 --- a/smali/android/support/v4/app/SupportActivity.smali +++ b/smali/android/support/v4/app/SupportActivity.smali @@ -8,6 +8,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v4/app/SupportActivity$ExtraData; @@ -129,6 +135,12 @@ .method public getExtraData(Ljava/lang/Class;)Landroid/support/v4/app/SupportActivity$ExtraData; .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "onCreate(Landroid/os/Bundle;)V @@ -174,6 +190,8 @@ .method protected onSaveInstanceState(Landroid/os/Bundle;)V .locals 2 + .annotation build Landroid/support/annotation/CallSuper; + .end annotation .line 82 iget-object v0, p0, Landroid/support/v4/app/SupportActivity;->mLifecycleRegistry:Landroid/arch/lifecycle/LifecycleRegistry; @@ -190,6 +208,11 @@ .method public putExtraData(Landroid/support/v4/app/SupportActivity$ExtraData;)V .locals 2 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 69 iget-object v0, p0, Landroid/support/v4/app/SupportActivity;->mExtraDataMap:Landroid/support/v4/util/SimpleArrayMap; @@ -205,6 +228,11 @@ .method public superDispatchKeyEvent(Landroid/view/KeyEvent;)Z .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 108 invoke-super {p0, p1}, Landroid/app/Activity;->dispatchKeyEvent(Landroid/view/KeyEvent;)Z diff --git a/smali/android/support/v4/app/TaskStackBuilder$SupportParentable.smali b/smali/android/support/v4/app/TaskStackBuilder$SupportParentable.smali index 9e30354e..32c0bc40 100644 --- a/smali/android/support/v4/app/TaskStackBuilder$SupportParentable.smali +++ b/smali/android/support/v4/app/TaskStackBuilder$SupportParentable.smali @@ -16,4 +16,6 @@ # virtual methods .method public abstract getSupportParentActivityIntent()Landroid/content/Intent; + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method diff --git a/smali/android/support/v4/app/TaskStackBuilder.smali b/smali/android/support/v4/app/TaskStackBuilder.smali index a99fd8b6..461f99a8 100644 --- a/smali/android/support/v4/app/TaskStackBuilder.smali +++ b/smali/android/support/v4/app/TaskStackBuilder.smali @@ -63,6 +63,12 @@ .method public static create(Landroid/content/Context;)Landroid/support/v4/app/TaskStackBuilder; .locals 1 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 95 new-instance v0, Landroid/support/v4/app/TaskStackBuilder; @@ -89,6 +95,12 @@ # virtual methods .method public addNextIntent(Landroid/content/Intent;)Landroid/support/v4/app/TaskStackBuilder; .locals 1 + .param p1 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 121 iget-object v0, p0, Landroid/support/v4/app/TaskStackBuilder;->mIntents:Ljava/util/ArrayList; @@ -100,6 +112,12 @@ .method public addNextIntentWithParentStack(Landroid/content/Intent;)Landroid/support/v4/app/TaskStackBuilder; .locals 1 + .param p1 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 139 invoke-virtual {p1}, Landroid/content/Intent;->getComponent()Landroid/content/ComponentName; @@ -134,6 +152,12 @@ .method public addParentStack(Landroid/app/Activity;)Landroid/support/v4/app/TaskStackBuilder; .locals 1 + .param p1 # Landroid/app/Activity; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 160 instance-of v0, p1, Landroid/support/v4/app/TaskStackBuilder$SupportParentable; @@ -253,17 +277,20 @@ invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;->(Ljava/lang/Throwable;)V - goto :goto_2 - - :goto_1 throw v0 - :goto_2 - goto :goto_1 + return-void .end method .method public addParentStack(Ljava/lang/Class;)Landroid/support/v4/app/TaskStackBuilder; .locals 2 + .param p1 # Ljava/lang/Class; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -289,6 +316,8 @@ .method public editIntentAt(I)Landroid/content/Intent; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 247 iget-object v0, p0, Landroid/support/v4/app/TaskStackBuilder;->mIntents:Ljava/util/ArrayList; @@ -329,7 +358,9 @@ .end method .method public getIntents()[Landroid/content/Intent; - .locals 5 + .locals 4 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 357 iget-object v0, p0, Landroid/support/v4/app/TaskStackBuilder;->mIntents:Ljava/util/ArrayList; @@ -338,66 +369,74 @@ move-result v0 - new-array v1, v0, [Landroid/content/Intent; + new-array v0, v0, [Landroid/content/Intent; - if-nez v0, :cond_0 + .line 358 + array-length v1, v0 - return-object v1 + if-nez v1, :cond_0 + + return-object v0 .line 360 :cond_0 - new-instance v2, Landroid/content/Intent; + new-instance v1, Landroid/content/Intent; - iget-object v3, p0, Landroid/support/v4/app/TaskStackBuilder;->mIntents:Ljava/util/ArrayList; + iget-object v2, p0, Landroid/support/v4/app/TaskStackBuilder;->mIntents:Ljava/util/ArrayList; - const/4 v4, 0x0 + const/4 v3, 0x0 - invoke-virtual {v3, v4}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v2, v3}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; - move-result-object v3 + move-result-object v2 - check-cast v3, Landroid/content/Intent; + check-cast v2, Landroid/content/Intent; - invoke-direct {v2, v3}, Landroid/content/Intent;->(Landroid/content/Intent;)V + invoke-direct {v1, v2}, Landroid/content/Intent;->(Landroid/content/Intent;)V - const v3, 0x1000c000 + const v2, 0x1000c000 - invoke-virtual {v2, v3}, Landroid/content/Intent;->addFlags(I)Landroid/content/Intent; + invoke-virtual {v1, v2}, Landroid/content/Intent;->addFlags(I)Landroid/content/Intent; - move-result-object v2 + move-result-object v1 - aput-object v2, v1, v4 + aput-object v1, v0, v3 - const/4 v2, 0x1 + const/4 v1, 0x1 + .line 362 :goto_0 - if-ge v2, v0, :cond_1 + array-length v2, v0 + + if-ge v1, v2, :cond_1 .line 363 - new-instance v3, Landroid/content/Intent; + new-instance v2, Landroid/content/Intent; - iget-object v4, p0, Landroid/support/v4/app/TaskStackBuilder;->mIntents:Ljava/util/ArrayList; + iget-object v3, p0, Landroid/support/v4/app/TaskStackBuilder;->mIntents:Ljava/util/ArrayList; - invoke-virtual {v4, v2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v3, v1}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; - move-result-object v4 + move-result-object v3 - check-cast v4, Landroid/content/Intent; + check-cast v3, Landroid/content/Intent; - invoke-direct {v3, v4}, Landroid/content/Intent;->(Landroid/content/Intent;)V + invoke-direct {v2, v3}, Landroid/content/Intent;->(Landroid/content/Intent;)V - aput-object v3, v1, v2 + aput-object v2, v0, v1 - add-int/lit8 v2, v2, 0x1 + add-int/lit8 v1, v1, 0x1 goto :goto_0 :cond_1 - return-object v1 + return-object v0 .end method .method public getPendingIntent(II)Landroid/app/PendingIntent; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation const/4 v0, 0x0 @@ -411,6 +450,12 @@ .method public getPendingIntent(IILandroid/os/Bundle;)Landroid/app/PendingIntent; .locals 4 + .param p3 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 331 iget-object v0, p0, Landroid/support/v4/app/TaskStackBuilder;->mIntents:Ljava/util/ArrayList; @@ -527,6 +572,10 @@ .method public startActivities(Landroid/os/Bundle;)V .locals 4 + .param p1 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 283 iget-object v0, p0, Landroid/support/v4/app/TaskStackBuilder;->mIntents:Ljava/util/ArrayList; diff --git a/smali/android/support/v4/content/AsyncTaskLoader.smali b/smali/android/support/v4/content/AsyncTaskLoader.smali index 0fca7da1..44e4bc50 100644 --- a/smali/android/support/v4/content/AsyncTaskLoader.smali +++ b/smali/android/support/v4/content/AsyncTaskLoader.smali @@ -60,6 +60,10 @@ # direct methods .method public constructor (Landroid/content/Context;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 128 sget-object v0, Landroid/support/v4/content/ModernAsyncTask;->THREAD_POOL_EXECUTOR:Ljava/util/concurrent/Executor; @@ -71,6 +75,14 @@ .method private constructor (Landroid/content/Context;Ljava/util/concurrent/Executor;)V .locals 2 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/util/concurrent/Executor; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 132 invoke-direct {p0, p1}, Landroid/support/v4/content/Loader;->(Landroid/content/Context;)V @@ -392,9 +404,7 @@ const/4 v2, 0x0 - move-object v3, v2 - - check-cast v3, [Ljava/lang/Void; + check-cast v2, [Ljava/lang/Void; invoke-virtual {v0, v1, v2}, Landroid/support/v4/content/AsyncTaskLoader$LoadTask;->executeOnExecutor(Ljava/util/concurrent/Executor;[Ljava/lang/Object;)Landroid/support/v4/content/ModernAsyncTask; @@ -422,6 +432,9 @@ .end method .method public abstract loadInBackground()Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "()TD;" @@ -537,6 +550,10 @@ .method public onCanceled(Ljava/lang/Object;)V .locals 0 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(TD;)V" @@ -570,6 +587,9 @@ .method protected onLoadInBackground()Ljava/lang/Object; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "()TD;" @@ -609,6 +629,11 @@ .method public waitForLoader()V .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 347 iget-object v0, p0, Landroid/support/v4/content/AsyncTaskLoader;->mTask:Landroid/support/v4/content/AsyncTaskLoader$LoadTask; diff --git a/smali/android/support/v4/content/ContentResolverCompat.smali b/smali/android/support/v4/content/ContentResolverCompat.smali index 4445bc31..7169ffa6 100644 --- a/smali/android/support/v4/content/ContentResolverCompat.smali +++ b/smali/android/support/v4/content/ContentResolverCompat.smali @@ -42,14 +42,12 @@ const/4 p6, 0x0 :goto_0 + check-cast p6, Landroid/os/CancellationSignal; + move-object v6, p6 check-cast v6, Landroid/os/CancellationSignal; - move-object p6, v6 - - check-cast p6, Landroid/os/CancellationSignal; - move-object v0, p0 move-object v1, p1 diff --git a/smali/android/support/v4/content/ContextCompat$LegacyServiceMapHolder.smali b/smali/android/support/v4/content/ContextCompat$LegacyServiceMapHolder.smali index ccb5d804..b78a4492 100644 --- a/smali/android/support/v4/content/ContextCompat$LegacyServiceMapHolder.smali +++ b/smali/android/support/v4/content/ContextCompat$LegacyServiceMapHolder.smali @@ -40,13 +40,15 @@ sput-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; .line 725 - sget v1, Landroid/os/Build$VERSION;->SDK_INT:I + sget v0, Landroid/os/Build$VERSION;->SDK_INT:I - const/16 v2, 0x16 + const/16 v1, 0x16 - if-le v1, v2, :cond_0 + if-le v0, v1, :cond_0 .line 726 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/telephony/SubscriptionManager; const-string v2, "telephony_subscription_service" @@ -54,6 +56,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 727 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/app/usage/UsageStatsManager; const-string v2, "usagestats" @@ -62,13 +66,15 @@ .line 729 :cond_0 - sget v1, Landroid/os/Build$VERSION;->SDK_INT:I + sget v0, Landroid/os/Build$VERSION;->SDK_INT:I - const/16 v2, 0x15 + const/16 v1, 0x15 - if-le v1, v2, :cond_1 + if-le v0, v1, :cond_1 .line 730 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/appwidget/AppWidgetManager; const-string v2, "appwidget" @@ -76,6 +82,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 731 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/os/BatteryManager; const-string v2, "batterymanager" @@ -83,6 +91,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 732 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/hardware/camera2/CameraManager; const-string v2, "camera" @@ -90,6 +100,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 733 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/app/job/JobScheduler; const-string v2, "jobscheduler" @@ -97,6 +109,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 734 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/content/pm/LauncherApps; const-string v2, "launcherapps" @@ -104,6 +118,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 735 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/media/projection/MediaProjectionManager; const-string v2, "media_projection" @@ -111,6 +127,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 736 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/media/session/MediaSessionManager; const-string v2, "media_session" @@ -118,6 +136,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 737 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/content/RestrictionsManager; const-string v2, "restrictions" @@ -125,6 +145,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 738 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/telecom/TelecomManager; const-string v2, "telecom" @@ -132,6 +154,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 739 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/media/tv/TvInputManager; const-string v2, "tv_input" @@ -140,13 +164,15 @@ .line 741 :cond_1 - sget v1, Landroid/os/Build$VERSION;->SDK_INT:I + sget v0, Landroid/os/Build$VERSION;->SDK_INT:I - const/16 v2, 0x13 + const/16 v1, 0x13 - if-le v1, v2, :cond_2 + if-le v0, v1, :cond_2 .line 742 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/app/AppOpsManager; const-string v2, "appops" @@ -154,6 +180,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 743 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/view/accessibility/CaptioningManager; const-string v2, "captioning" @@ -161,6 +189,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 744 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/hardware/ConsumerIrManager; const-string v2, "consumer_ir" @@ -168,6 +198,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 745 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/print/PrintManager; const-string v2, "print" @@ -176,13 +208,15 @@ .line 747 :cond_2 - sget v1, Landroid/os/Build$VERSION;->SDK_INT:I + sget v0, Landroid/os/Build$VERSION;->SDK_INT:I - const/16 v2, 0x12 + const/16 v1, 0x12 - if-le v1, v2, :cond_3 + if-le v0, v1, :cond_3 .line 748 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/bluetooth/BluetoothManager; const-string v2, "bluetooth" @@ -191,13 +225,15 @@ .line 750 :cond_3 - sget v1, Landroid/os/Build$VERSION;->SDK_INT:I + sget v0, Landroid/os/Build$VERSION;->SDK_INT:I - const/16 v2, 0x11 + const/16 v1, 0x11 - if-le v1, v2, :cond_4 + if-le v0, v1, :cond_4 .line 751 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/hardware/display/DisplayManager; const-string v2, "display" @@ -205,6 +241,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 752 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/os/UserManager; const-string v2, "user" @@ -213,13 +251,15 @@ .line 754 :cond_4 - sget v1, Landroid/os/Build$VERSION;->SDK_INT:I + sget v0, Landroid/os/Build$VERSION;->SDK_INT:I - const/16 v2, 0x10 + const/16 v1, 0x10 - if-le v1, v2, :cond_5 + if-le v0, v1, :cond_5 .line 755 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/hardware/input/InputManager; const-string v2, "input" @@ -227,6 +267,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 756 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/media/MediaRouter; const-string v2, "media_router" @@ -234,6 +276,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 757 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/net/nsd/NsdManager; const-string v2, "servicediscovery" @@ -242,6 +286,8 @@ .line 759 :cond_5 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/accessibilityservice/AccessibilityService; const-string v2, "accessibility" @@ -249,6 +295,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 760 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/accounts/AccountManager; const-string v2, "account" @@ -256,6 +304,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 761 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/app/ActivityManager; const-string v2, "activity" @@ -263,6 +313,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 762 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/app/AlarmManager; const-string v2, "alarm" @@ -270,6 +322,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 763 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/media/AudioManager; const-string v2, "audio" @@ -277,6 +331,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 764 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/content/ClipboardManager; const-string v2, "clipboard" @@ -284,6 +340,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 765 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/net/ConnectivityManager; const-string v2, "connectivity" @@ -291,6 +349,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 766 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/app/admin/DevicePolicyManager; const-string v2, "device_policy" @@ -298,6 +358,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 767 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/app/DownloadManager; const-string v2, "download" @@ -305,6 +367,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 768 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/os/DropBoxManager; const-string v2, "dropbox" @@ -312,6 +376,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 769 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/view/inputmethod/InputMethodManager; const-string v2, "input_method" @@ -319,6 +385,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 770 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/app/KeyguardManager; const-string v2, "keyguard" @@ -326,6 +394,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 771 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/view/LayoutInflater; const-string v2, "layout_inflater" @@ -333,6 +403,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 772 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/location/LocationManager; const-string v2, "location" @@ -340,6 +412,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 773 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/nfc/NfcManager; const-string v2, "nfc" @@ -347,6 +421,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 774 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/app/NotificationManager; const-string v2, "notification" @@ -354,6 +430,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 775 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/os/PowerManager; const-string v2, "power" @@ -361,6 +439,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 776 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/app/SearchManager; const-string v2, "search" @@ -368,6 +448,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 777 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/hardware/SensorManager; const-string v2, "sensor" @@ -375,6 +457,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 778 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/os/storage/StorageManager; const-string v2, "storage" @@ -382,6 +466,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 779 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/telephony/TelephonyManager; const-string v2, "phone" @@ -389,6 +475,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 780 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/view/textservice/TextServicesManager; const-string v2, "textservices" @@ -396,6 +484,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 781 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/app/UiModeManager; const-string v2, "uimode" @@ -403,6 +493,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 782 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/hardware/usb/UsbManager; const-string v2, "usb" @@ -410,6 +502,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 783 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/os/Vibrator; const-string v2, "vibrator" @@ -417,6 +511,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 784 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/app/WallpaperManager; const-string v2, "wallpaper" @@ -424,6 +520,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 785 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/net/wifi/p2p/WifiP2pManager; const-string v2, "wifip2p" @@ -431,6 +529,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 786 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/net/wifi/WifiManager; const-string v2, "wifi" @@ -438,6 +538,8 @@ invoke-virtual {v0, v1, v2}, Ljava/util/HashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 787 + sget-object v0, Landroid/support/v4/content/ContextCompat$LegacyServiceMapHolder;->SERVICES:Ljava/util/HashMap; + const-class v1, Landroid/view/WindowManager; const-string v2, "window" diff --git a/smali/android/support/v4/content/ContextCompat.smali b/smali/android/support/v4/content/ContextCompat.smali index d4306b36..a4152a8d 100644 --- a/smali/android/support/v4/content/ContextCompat.smali +++ b/smali/android/support/v4/content/ContextCompat.smali @@ -86,6 +86,14 @@ .method public static checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param if-eqz p1, :cond_0 @@ -117,6 +125,12 @@ .method public static createDeviceProtectedStorageContext(Landroid/content/Context;)Landroid/content/Context; .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 642 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -224,6 +238,10 @@ .method public static getCodeCacheDir(Landroid/content/Context;)Ljava/io/File; .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 587 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -263,6 +281,16 @@ .method public static getColor(Landroid/content/Context;I)I .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/ColorRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/ColorInt; + .end annotation .line 522 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -293,6 +321,16 @@ .method public static getColorStateList(Landroid/content/Context;I)Landroid/content/res/ColorStateList; .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/ColorRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 500 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -323,6 +361,12 @@ .method public static getDataDir(Landroid/content/Context;)Ljava/io/File; .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 271 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -364,6 +408,16 @@ .method public static getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable; .locals 4 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 462 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -464,6 +518,12 @@ .method public static getExternalCacheDirs(Landroid/content/Context;)[Ljava/io/File; .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 430 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -482,11 +542,11 @@ :cond_0 const/4 v0, 0x1 + .line 433 new-array v0, v0, [Ljava/io/File; const/4 v1, 0x0 - .line 433 invoke-virtual {p0}, Landroid/content/Context;->getExternalCacheDir()Ljava/io/File; move-result-object p0 @@ -498,6 +558,16 @@ .method public static getExternalFilesDirs(Landroid/content/Context;Ljava/lang/String;)[Ljava/io/File; .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 377 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -516,11 +586,11 @@ :cond_0 const/4 v0, 0x1 + .line 380 new-array v0, v0, [Ljava/io/File; const/4 v1, 0x0 - .line 380 invoke-virtual {p0, p1}, Landroid/content/Context;->getExternalFilesDir(Ljava/lang/String;)Ljava/io/File; move-result-object p0 @@ -532,6 +602,12 @@ .method public static getNoBackupFilesDir(Landroid/content/Context;)Ljava/io/File; .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 563 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -571,6 +647,12 @@ .method public static getObbDirs(Landroid/content/Context;)[Ljava/io/File; .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 324 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -589,11 +671,11 @@ :cond_0 const/4 v0, 0x1 + .line 327 new-array v0, v0, [Ljava/io/File; const/4 v1, 0x0 - .line 327 invoke-virtual {p0}, Landroid/content/Context;->getObbDir()Ljava/io/File; move-result-object p0 @@ -605,6 +687,17 @@ .method public static getSystemService(Landroid/content/Context;Ljava/lang/Class;)Ljava/lang/Object; .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/lang/Class; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "SDK_INT:I @@ -716,6 +824,14 @@ .method public static startActivities(Landroid/content/Context;[Landroid/content/Intent;)Z .locals 1 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # [Landroid/content/Intent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 v0, 0x0 @@ -729,6 +845,18 @@ .method public static startActivities(Landroid/content/Context;[Landroid/content/Intent;Landroid/os/Bundle;)Z .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # [Landroid/content/Intent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 220 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -754,6 +882,18 @@ .method public static startActivity(Landroid/content/Context;Landroid/content/Intent;Landroid/os/Bundle;)V .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 247 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -777,6 +917,14 @@ .method public static startForegroundService(Landroid/content/Context;Landroid/content/Intent;)V .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 674 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/content/CursorLoader.smali b/smali/android/support/v4/content/CursorLoader.smali index 80a8a50f..b46968d6 100644 --- a/smali/android/support/v4/content/CursorLoader.smali +++ b/smali/android/support/v4/content/CursorLoader.smali @@ -43,6 +43,10 @@ # direct methods .method public constructor (Landroid/content/Context;)V .locals 0 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 123 invoke-direct {p0, p1}, Landroid/support/v4/content/AsyncTaskLoader;->(Landroid/content/Context;)V @@ -59,6 +63,30 @@ .method public constructor (Landroid/content/Context;Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)V .locals 0 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/net/Uri; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # [Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p4 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p5 # [Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p6 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 136 invoke-direct {p0, p1}, Landroid/support/v4/content/AsyncTaskLoader;->(Landroid/content/Context;)V @@ -106,6 +134,8 @@ if-eqz v0, :cond_0 .line 90 + iget-object v0, p0, Landroid/support/v4/content/CursorLoader;->mCancellationSignal:Landroid/support/v4/os/CancellationSignal; + invoke-virtual {v0}, Landroid/support/v4/os/CancellationSignal;->cancel()V .line 92 @@ -289,6 +319,8 @@ .method public getProjection()[Ljava/lang/String; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 202 iget-object v0, p0, Landroid/support/v4/content/CursorLoader;->mProjection:[Ljava/lang/String; @@ -298,6 +330,8 @@ .method public getSelection()Ljava/lang/String; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 211 iget-object v0, p0, Landroid/support/v4/content/CursorLoader;->mSelection:Ljava/lang/String; @@ -307,6 +341,8 @@ .method public getSelectionArgs()[Ljava/lang/String; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 220 iget-object v0, p0, Landroid/support/v4/content/CursorLoader;->mSelectionArgs:[Ljava/lang/String; @@ -316,6 +352,8 @@ .method public getSortOrder()Ljava/lang/String; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 229 iget-object v0, p0, Landroid/support/v4/content/CursorLoader;->mSortOrder:Ljava/lang/String; @@ -325,6 +363,8 @@ .method public getUri()Landroid/net/Uri; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 193 iget-object v0, p0, Landroid/support/v4/content/CursorLoader;->mUri:Landroid/net/Uri; @@ -603,6 +643,10 @@ .method public setProjection([Ljava/lang/String;)V .locals 0 + .param p1 # [Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 206 iput-object p1, p0, Landroid/support/v4/content/CursorLoader;->mProjection:[Ljava/lang/String; @@ -612,6 +656,10 @@ .method public setSelection(Ljava/lang/String;)V .locals 0 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 215 iput-object p1, p0, Landroid/support/v4/content/CursorLoader;->mSelection:Ljava/lang/String; @@ -621,6 +669,10 @@ .method public setSelectionArgs([Ljava/lang/String;)V .locals 0 + .param p1 # [Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 224 iput-object p1, p0, Landroid/support/v4/content/CursorLoader;->mSelectionArgs:[Ljava/lang/String; @@ -630,6 +682,10 @@ .method public setSortOrder(Ljava/lang/String;)V .locals 0 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 233 iput-object p1, p0, Landroid/support/v4/content/CursorLoader;->mSortOrder:Ljava/lang/String; @@ -639,6 +695,10 @@ .method public setUri(Landroid/net/Uri;)V .locals 0 + .param p1 # Landroid/net/Uri; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 197 iput-object p1, p0, Landroid/support/v4/content/CursorLoader;->mUri:Landroid/net/Uri; diff --git a/smali/android/support/v4/content/FileProvider$SimplePathStrategy.smali b/smali/android/support/v4/content/FileProvider$SimplePathStrategy.smali index b4b8f732..ed24c0ec 100644 --- a/smali/android/support/v4/content/FileProvider$SimplePathStrategy.smali +++ b/smali/android/support/v4/content/FileProvider$SimplePathStrategy.smali @@ -122,17 +122,17 @@ move-result-object v0 - const/16 v1, 0x2f + const/4 v1, 0x1 - const/4 v2, 0x1 + const/16 v2, 0x2f .line 761 - invoke-virtual {v0, v1, v2}, Ljava/lang/String;->indexOf(II)I + invoke-virtual {v0, v2, v1}, Ljava/lang/String;->indexOf(II)I - move-result v1 + move-result v2 .line 762 - invoke-virtual {v0, v2, v1}, Ljava/lang/String;->substring(II)Ljava/lang/String; + invoke-virtual {v0, v1, v2}, Ljava/lang/String;->substring(II)Ljava/lang/String; move-result-object v3 @@ -140,10 +140,10 @@ move-result-object v3 - add-int/2addr v1, v2 + add-int/2addr v2, v1 .line 763 - invoke-virtual {v0, v1}, Ljava/lang/String;->substring(I)Ljava/lang/String; + invoke-virtual {v0, v2}, Ljava/lang/String;->substring(I)Ljava/lang/String; move-result-object v0 @@ -479,11 +479,7 @@ invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;->(Ljava/lang/String;)V - goto :goto_3 - - :goto_2 throw v0 - :goto_3 - goto :goto_2 + return-void .end method diff --git a/smali/android/support/v4/content/FileProvider.smali b/smali/android/support/v4/content/FileProvider.smali index fb97a146..a524454f 100644 --- a/smali/android/support/v4/content/FileProvider.smali +++ b/smali/android/support/v4/content/FileProvider.smali @@ -38,6 +38,10 @@ .field private static final TAG_ROOT_PATH:Ljava/lang/String; = "root-path" .field private static sCache:Ljava/util/HashMap; + .annotation build Landroid/support/annotation/GuardedBy; + value = "sCache" + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "Ljava/util/HashMap<", @@ -238,6 +242,18 @@ .method public static getUriForFile(Landroid/content/Context;Ljava/lang/String;Ljava/io/File;)Landroid/net/Uri; .locals 0 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/io/File; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 417 invoke-static {p0, p1}, Landroid/support/v4/content/FileProvider;->getPathStrategy(Landroid/content/Context;Ljava/lang/String;)Landroid/support/v4/content/FileProvider$PathStrategy; @@ -587,11 +603,11 @@ :goto_1 if-eqz v3, :cond_0 + .line 648 new-array v1, v2, [Ljava/lang/String; aput-object v5, v1, v7 - .line 648 invoke-static {v3, v1}, Landroid/support/v4/content/FileProvider;->buildPath(Ljava/io/File;[Ljava/lang/String;)Ljava/io/File; move-result-object v1 @@ -611,19 +627,23 @@ invoke-direct {p0, p1}, Ljava/lang/IllegalArgumentException;->(Ljava/lang/String;)V - goto :goto_3 - - :goto_2 throw p0 - :goto_3 - goto :goto_2 + return-void .end method # virtual methods .method public attachInfo(Landroid/content/Context;Landroid/content/pm/ProviderInfo;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/content/pm/ProviderInfo; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 382 invoke-super {p0, p1, p2}, Landroid/content/ContentProvider;->attachInfo(Landroid/content/Context;Landroid/content/pm/ProviderInfo;)V @@ -672,6 +692,18 @@ .method public delete(Landroid/net/Uri;Ljava/lang/String;[Ljava/lang/String;)I .locals 0 + .param p1 # Landroid/net/Uri; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # [Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 541 iget-object p2, p0, Landroid/support/v4/content/FileProvider;->mStrategy:Landroid/support/v4/content/FileProvider$PathStrategy; @@ -690,6 +722,10 @@ .method public getType(Landroid/net/Uri;)Ljava/lang/String; .locals 2 + .param p1 # Landroid/net/Uri; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 493 iget-object v0, p0, Landroid/support/v4/content/FileProvider;->mStrategy:Landroid/support/v4/content/FileProvider$PathStrategy; @@ -743,6 +779,10 @@ .method public insert(Landroid/net/Uri;Landroid/content/ContentValues;)Landroid/net/Uri; .locals 0 + .param p1 # Landroid/net/Uri; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 513 new-instance p1, Ljava/lang/UnsupportedOperationException; @@ -764,6 +804,14 @@ .method public openFile(Landroid/net/Uri;Ljava/lang/String;)Landroid/os/ParcelFileDescriptor; .locals 1 + .param p1 # Landroid/net/Uri; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Ljava/io/FileNotFoundException; @@ -792,6 +840,26 @@ .method public query(Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor; .locals 5 + .param p1 # Landroid/net/Uri; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # [Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p4 # [Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p5 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 454 iget-object p3, p0, Landroid/support/v4/content/FileProvider;->mStrategy:Landroid/support/v4/content/FileProvider$PathStrategy; @@ -914,6 +982,18 @@ .method public update(Landroid/net/Uri;Landroid/content/ContentValues;Ljava/lang/String;[Ljava/lang/String;)I .locals 0 + .param p1 # Landroid/net/Uri; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p4 # [Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 523 new-instance p1, Ljava/lang/UnsupportedOperationException; diff --git a/smali/android/support/v4/content/IntentCompat.smali b/smali/android/support/v4/content/IntentCompat.smali index 76b670dd..4c016464 100644 --- a/smali/android/support/v4/content/IntentCompat.smali +++ b/smali/android/support/v4/content/IntentCompat.smali @@ -23,6 +23,16 @@ .method public static makeMainSelectorActivity(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent; .locals 2 + .param p0 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 77 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/content/Loader$OnLoadCanceledListener.smali b/smali/android/support/v4/content/Loader$OnLoadCanceledListener.smali index 76830aaf..05def5ca 100644 --- a/smali/android/support/v4/content/Loader$OnLoadCanceledListener.smali +++ b/smali/android/support/v4/content/Loader$OnLoadCanceledListener.smali @@ -25,6 +25,10 @@ # virtual methods .method public abstract onLoadCanceled(Landroid/support/v4/content/Loader;)V + .param p1 # Landroid/support/v4/content/Loader; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", diff --git a/smali/android/support/v4/content/Loader$OnLoadCompleteListener.smali b/smali/android/support/v4/content/Loader$OnLoadCompleteListener.smali index fdb43ded..3e6c4a28 100644 --- a/smali/android/support/v4/content/Loader$OnLoadCompleteListener.smali +++ b/smali/android/support/v4/content/Loader$OnLoadCompleteListener.smali @@ -25,6 +25,14 @@ # virtual methods .method public abstract onLoadComplete(Landroid/support/v4/content/Loader;Ljava/lang/Object;)V + .param p1 # Landroid/support/v4/content/Loader; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", diff --git a/smali/android/support/v4/content/Loader.smali b/smali/android/support/v4/content/Loader.smali index 9a4a7d9f..33dfa368 100644 --- a/smali/android/support/v4/content/Loader.smali +++ b/smali/android/support/v4/content/Loader.smali @@ -59,6 +59,10 @@ # direct methods .method public constructor (Landroid/content/Context;)V .locals 2 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 118 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -96,6 +100,8 @@ # virtual methods .method public abandon()V .locals 1 + .annotation build Landroid/support/annotation/MainThread; + .end annotation const/4 v0, 0x1 @@ -110,6 +116,8 @@ .method public cancelLoad()Z .locals 1 + .annotation build Landroid/support/annotation/MainThread; + .end annotation .line 318 invoke-virtual {p0}, Landroid/support/v4/content/Loader;->onCancelLoad()Z @@ -132,6 +140,13 @@ .method public dataToString(Ljava/lang/Object;)Ljava/lang/String; .locals 2 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(TD;)", @@ -164,6 +179,8 @@ .method public deliverCancellation()V .locals 1 + .annotation build Landroid/support/annotation/MainThread; + .end annotation .line 144 iget-object v0, p0, Landroid/support/v4/content/Loader;->mOnLoadCanceledListener:Landroid/support/v4/content/Loader$OnLoadCanceledListener; @@ -179,6 +196,13 @@ .method public deliverResult(Ljava/lang/Object;)V .locals 1 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/MainThread; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(TD;)V" @@ -302,6 +326,8 @@ .method public forceLoad()V .locals 0 + .annotation build Landroid/support/annotation/MainThread; + .end annotation .line 347 invoke-virtual {p0}, Landroid/support/v4/content/Loader;->onForceLoad()V @@ -311,6 +337,8 @@ .method public getContext()Landroid/content/Context; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 154 iget-object v0, p0, Landroid/support/v4/content/Loader;->mContext:Landroid/content/Context; @@ -356,12 +384,16 @@ .method protected onAbandon()V .locals 0 + .annotation build Landroid/support/annotation/MainThread; + .end annotation return-void .end method .method protected onCancelLoad()Z .locals 1 + .annotation build Landroid/support/annotation/MainThread; + .end annotation const/4 v0, 0x0 @@ -370,6 +402,8 @@ .method public onContentChanged()V .locals 1 + .annotation build Landroid/support/annotation/MainThread; + .end annotation .line 511 iget-boolean v0, p0, Landroid/support/v4/content/Loader;->mStarted:Z @@ -393,30 +427,45 @@ .method protected onForceLoad()V .locals 0 + .annotation build Landroid/support/annotation/MainThread; + .end annotation return-void .end method .method protected onReset()V .locals 0 + .annotation build Landroid/support/annotation/MainThread; + .end annotation return-void .end method .method protected onStartLoading()V .locals 0 + .annotation build Landroid/support/annotation/MainThread; + .end annotation return-void .end method .method protected onStopLoading()V .locals 0 + .annotation build Landroid/support/annotation/MainThread; + .end annotation return-void .end method .method public registerListener(ILandroid/support/v4/content/Loader$OnLoadCompleteListener;)V .locals 1 + .param p2 # Landroid/support/v4/content/Loader$OnLoadCompleteListener; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/MainThread; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(I", @@ -451,6 +500,13 @@ .method public registerOnLoadCanceledListener(Landroid/support/v4/content/Loader$OnLoadCanceledListener;)V .locals 1 + .param p1 # Landroid/support/v4/content/Loader$OnLoadCanceledListener; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/MainThread; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -482,6 +538,8 @@ .method public reset()V .locals 1 + .annotation build Landroid/support/annotation/MainThread; + .end annotation .line 447 invoke-virtual {p0}, Landroid/support/v4/content/Loader;->onReset()V @@ -525,6 +583,8 @@ .method public final startLoading()V .locals 1 + .annotation build Landroid/support/annotation/MainThread; + .end annotation const/4 v0, 0x1 @@ -547,6 +607,8 @@ .method public stopLoading()V .locals 1 + .annotation build Landroid/support/annotation/MainThread; + .end annotation const/4 v0, 0x0 @@ -618,6 +680,13 @@ .method public unregisterListener(Landroid/support/v4/content/Loader$OnLoadCompleteListener;)V .locals 1 + .param p1 # Landroid/support/v4/content/Loader$OnLoadCompleteListener; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/MainThread; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -663,6 +732,13 @@ .method public unregisterOnLoadCanceledListener(Landroid/support/v4/content/Loader$OnLoadCanceledListener;)V .locals 1 + .param p1 # Landroid/support/v4/content/Loader$OnLoadCanceledListener; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/MainThread; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", diff --git a/smali/android/support/v4/content/LocalBroadcastManager.smali b/smali/android/support/v4/content/LocalBroadcastManager.smali index bb7361d8..7cf8a209 100644 --- a/smali/android/support/v4/content/LocalBroadcastManager.smali +++ b/smali/android/support/v4/content/LocalBroadcastManager.smali @@ -124,6 +124,12 @@ .method public static getInstance(Landroid/content/Context;)Landroid/support/v4/content/LocalBroadcastManager; .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 105 sget-object v0, Landroid/support/v4/content/LocalBroadcastManager;->mLock:Ljava/lang/Object; @@ -169,7 +175,7 @@ # virtual methods .method executePendingBroadcasts()V - .locals 10 + .locals 9 .line 298 :cond_0 @@ -194,17 +200,17 @@ .line 303 :cond_1 - new-array v2, v1, [Landroid/support/v4/content/LocalBroadcastManager$BroadcastRecord; + new-array v1, v1, [Landroid/support/v4/content/LocalBroadcastManager$BroadcastRecord; .line 304 - iget-object v3, p0, Landroid/support/v4/content/LocalBroadcastManager;->mPendingBroadcasts:Ljava/util/ArrayList; + iget-object v2, p0, Landroid/support/v4/content/LocalBroadcastManager;->mPendingBroadcasts:Ljava/util/ArrayList; - invoke-virtual {v3, v2}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object; + invoke-virtual {v2, v1}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object; .line 305 - iget-object v3, p0, Landroid/support/v4/content/LocalBroadcastManager;->mPendingBroadcasts:Ljava/util/ArrayList; + iget-object v2, p0, Landroid/support/v4/content/LocalBroadcastManager;->mPendingBroadcasts:Ljava/util/ArrayList; - invoke-virtual {v3}, Ljava/util/ArrayList;->clear()V + invoke-virtual {v2}, Ljava/util/ArrayList;->clear()V .line 306 monitor-exit v0 @@ -213,56 +219,59 @@ const/4 v0, 0x0 - const/4 v3, 0x0 + const/4 v2, 0x0 + .line 307 :goto_0 - if-ge v3, v1, :cond_0 + array-length v3, v1 + + if-ge v2, v3, :cond_0 .line 308 - aget-object v4, v2, v3 + aget-object v3, v1, v2 .line 309 - iget-object v5, v4, Landroid/support/v4/content/LocalBroadcastManager$BroadcastRecord;->receivers:Ljava/util/ArrayList; + iget-object v4, v3, Landroid/support/v4/content/LocalBroadcastManager$BroadcastRecord;->receivers:Ljava/util/ArrayList; - invoke-virtual {v5}, Ljava/util/ArrayList;->size()I + invoke-virtual {v4}, Ljava/util/ArrayList;->size()I - move-result v5 + move-result v4 - const/4 v6, 0x0 + const/4 v5, 0x0 :goto_1 - if-ge v6, v5, :cond_3 + if-ge v5, v4, :cond_3 .line 311 - iget-object v7, v4, Landroid/support/v4/content/LocalBroadcastManager$BroadcastRecord;->receivers:Ljava/util/ArrayList; + iget-object v6, v3, Landroid/support/v4/content/LocalBroadcastManager$BroadcastRecord;->receivers:Ljava/util/ArrayList; - invoke-virtual {v7, v6}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v6, v5}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; - move-result-object v7 + move-result-object v6 - check-cast v7, Landroid/support/v4/content/LocalBroadcastManager$ReceiverRecord; + check-cast v6, Landroid/support/v4/content/LocalBroadcastManager$ReceiverRecord; .line 312 - iget-boolean v8, v7, Landroid/support/v4/content/LocalBroadcastManager$ReceiverRecord;->dead:Z + iget-boolean v7, v6, Landroid/support/v4/content/LocalBroadcastManager$ReceiverRecord;->dead:Z - if-nez v8, :cond_2 + if-nez v7, :cond_2 .line 313 - iget-object v7, v7, Landroid/support/v4/content/LocalBroadcastManager$ReceiverRecord;->receiver:Landroid/content/BroadcastReceiver; + iget-object v6, v6, Landroid/support/v4/content/LocalBroadcastManager$ReceiverRecord;->receiver:Landroid/content/BroadcastReceiver; - iget-object v8, p0, Landroid/support/v4/content/LocalBroadcastManager;->mAppContext:Landroid/content/Context; + iget-object v7, p0, Landroid/support/v4/content/LocalBroadcastManager;->mAppContext:Landroid/content/Context; - iget-object v9, v4, Landroid/support/v4/content/LocalBroadcastManager$BroadcastRecord;->intent:Landroid/content/Intent; + iget-object v8, v3, Landroid/support/v4/content/LocalBroadcastManager$BroadcastRecord;->intent:Landroid/content/Intent; - invoke-virtual {v7, v8, v9}, Landroid/content/BroadcastReceiver;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V + invoke-virtual {v6, v7, v8}, Landroid/content/BroadcastReceiver;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V :cond_2 - add-int/lit8 v6, v6, 0x1 + add-int/lit8 v5, v5, 0x1 goto :goto_1 :cond_3 - add-int/lit8 v3, v3, 0x1 + add-int/lit8 v2, v2, 0x1 goto :goto_0 @@ -275,17 +284,21 @@ :try_end_1 .catchall {:try_start_1 .. :try_end_1} :catchall_0 - goto :goto_3 - - :goto_2 throw v1 - :goto_3 - goto :goto_2 + return-void .end method .method public registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)V .locals 6 + .param p1 # Landroid/content/BroadcastReceiver; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/content/IntentFilter; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 140 iget-object v0, p0, Landroid/support/v4/content/LocalBroadcastManager;->mReceivers:Ljava/util/HashMap; @@ -382,17 +395,17 @@ :try_end_0 .catchall {:try_start_0 .. :try_end_0} :catchall_0 - goto :goto_2 - - :goto_1 throw p1 - :goto_2 - goto :goto_1 + return-void .end method .method public sendBroadcast(Landroid/content/Intent;)Z .locals 21 + .param p1 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param move-object/from16 v1, p0 @@ -529,9 +542,9 @@ :cond_2 const/4 v3, 0x0 - move-object v7, v3 + move-object v6, v3 - const/4 v6, 0x0 + const/4 v7, 0x0 .line 232 :goto_1 @@ -539,10 +552,10 @@ move-result v3 - if-ge v6, v3, :cond_e + if-ge v7, v3, :cond_e .line 233 - invoke-virtual {v8, v6}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v8, v7}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; move-result-object v3 @@ -589,17 +602,17 @@ invoke-static {v3, v4}, Landroid/util/Log;->v(Ljava/lang/String;Ljava/lang/String;)I :cond_4 - move/from16 v17, v6 + move/from16 v18, v7 move-object/from16 v19, v8 - move-object/from16 v18, v10 + move-object/from16 v17, v10 move-object/from16 v20, v11 const/4 v11, 0x1 - move-object v10, v7 + move-object v10, v6 goto/16 :goto_4 @@ -615,13 +628,13 @@ move-object v5, v11 - move/from16 v17, v6 + move-object/from16 v17, v10 - move-object v6, v13 + move-object v10, v6 - move-object/from16 v18, v10 + move-object v6, v13 - move-object v10, v7 + move/from16 v18, v7 move-object v7, v12 @@ -670,18 +683,18 @@ if-nez v10, :cond_7 .line 249 - new-instance v7, Ljava/util/ArrayList; + new-instance v6, Ljava/util/ArrayList; - invoke-direct {v7}, Ljava/util/ArrayList;->()V + invoke-direct {v6}, Ljava/util/ArrayList;->()V goto :goto_2 :cond_7 - move-object v7, v10 + move-object v6, v10 .line 251 :goto_2 - invoke-virtual {v7, v15}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + invoke-virtual {v6, v15}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z .line 252 iput-boolean v11, v15, Landroid/support/v4/content/LocalBroadcastManager$ReceiverRecord;->broadcasting:Z @@ -751,12 +764,12 @@ :cond_d :goto_4 - move-object v7, v10 + move-object v6, v10 :goto_5 - add-int/lit8 v6, v17, 0x1 + add-int/lit8 v7, v18, 0x1 - move-object/from16 v10, v18 + move-object/from16 v10, v17 move-object/from16 v8, v19 @@ -765,7 +778,7 @@ goto/16 :goto_1 :cond_e - move-object v10, v7 + move-object v10, v6 const/4 v11, 0x1 @@ -841,17 +854,17 @@ :try_end_0 .catchall {:try_start_0 .. :try_end_0} :catchall_0 - goto :goto_8 - - :goto_7 throw v0 - :goto_8 - goto :goto_7 + return-void .end method .method public sendBroadcastSync(Landroid/content/Intent;)V .locals 0 + .param p1 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 289 invoke-virtual {p0, p1}, Landroid/support/v4/content/LocalBroadcastManager;->sendBroadcast(Landroid/content/Intent;)Z @@ -869,6 +882,10 @@ .method public unregisterReceiver(Landroid/content/BroadcastReceiver;)V .locals 11 + .param p1 # Landroid/content/BroadcastReceiver; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 170 iget-object v0, p0, Landroid/support/v4/content/LocalBroadcastManager;->mReceivers:Ljava/util/HashMap; @@ -1014,11 +1031,7 @@ :try_end_0 .catchall {:try_start_0 .. :try_end_0} :catchall_0 - goto :goto_4 - - :goto_3 throw p1 - :goto_4 - goto :goto_3 + return-void .end method diff --git a/smali/android/support/v4/content/MimeTypeFilter.smali b/smali/android/support/v4/content/MimeTypeFilter.smali index ad384358..be7ef851 100644 --- a/smali/android/support/v4/content/MimeTypeFilter.smali +++ b/smali/android/support/v4/content/MimeTypeFilter.smali @@ -15,6 +15,16 @@ .method public static matches(Ljava/lang/String;[Ljava/lang/String;)Ljava/lang/String; .locals 6 + .param p0 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p1 # [Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation const/4 v0, 0x0 @@ -65,6 +75,16 @@ .method public static matches([Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; .locals 6 + .param p0 # [Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation const/4 v0, 0x0 @@ -115,6 +135,14 @@ .method public static matches(Ljava/lang/String;Ljava/lang/String;)Z .locals 1 + .param p0 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param if-nez p0, :cond_0 @@ -145,11 +173,22 @@ .method public static matchesMany([Ljava/lang/String;Ljava/lang/String;)[Ljava/lang/String; .locals 6 + .param p0 # [Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation const/4 v0, 0x0 if-nez p0, :cond_0 + .line 138 new-array p0, v0, [Ljava/lang/String; return-object p0 @@ -214,6 +253,14 @@ .method private static mimeTypeAgainstFilter([Ljava/lang/String;[Ljava/lang/String;)Z .locals 5 + .param p0 # [Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # [Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 48 array-length v0, p1 diff --git a/smali/android/support/v4/content/ModernAsyncTask$2.smali b/smali/android/support/v4/content/ModernAsyncTask$2.smali index 6db7c6c4..86fa3641 100644 --- a/smali/android/support/v4/content/ModernAsyncTask$2.smali +++ b/smali/android/support/v4/content/ModernAsyncTask$2.smali @@ -82,6 +82,7 @@ .line 142 invoke-static {}, Landroid/os/Binder;->flushPendingCommands()V :try_end_0 + .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0 .catchall {:try_start_0 .. :try_end_0} :catchall_0 .line 147 @@ -94,6 +95,11 @@ :catchall_0 move-exception v0 + goto :goto_0 + + :catch_0 + move-exception v0 + .line 144 :try_start_1 iget-object v3, p0, Landroid/support/v4/content/ModernAsyncTask$2;->this$0:Landroid/support/v4/content/ModernAsyncTask; @@ -105,12 +111,10 @@ .line 145 throw v0 :try_end_1 - .catchall {:try_start_1 .. :try_end_1} :catchall_1 - - :catchall_1 - move-exception v0 + .catchall {:try_start_1 .. :try_end_1} :catchall_0 .line 147 + :goto_0 iget-object v1, p0, Landroid/support/v4/content/ModernAsyncTask$2;->this$0:Landroid/support/v4/content/ModernAsyncTask; invoke-virtual {v1, v2}, Landroid/support/v4/content/ModernAsyncTask;->postResult(Ljava/lang/Object;)Ljava/lang/Object; diff --git a/smali/android/support/v4/content/ModernAsyncTask$3.smali b/smali/android/support/v4/content/ModernAsyncTask$3.smali index d6cfdb03..a16add34 100644 --- a/smali/android/support/v4/content/ModernAsyncTask$3.smali +++ b/smali/android/support/v4/content/ModernAsyncTask$3.smali @@ -55,14 +55,14 @@ invoke-virtual {v2, v1}, Landroid/support/v4/content/ModernAsyncTask;->postResultIfNotInvoked(Ljava/lang/Object;)V :try_end_0 - .catch Ljava/lang/InterruptedException; {:try_start_0 .. :try_end_0} :catch_2 - .catch Ljava/util/concurrent/ExecutionException; {:try_start_0 .. :try_end_0} :catch_1 - .catch Ljava/util/concurrent/CancellationException; {:try_start_0 .. :try_end_0} :catch_0 - .catchall {:try_start_0 .. :try_end_0} :catchall_0 + .catch Ljava/lang/InterruptedException; {:try_start_0 .. :try_end_0} :catch_3 + .catch Ljava/util/concurrent/ExecutionException; {:try_start_0 .. :try_end_0} :catch_2 + .catch Ljava/util/concurrent/CancellationException; {:try_start_0 .. :try_end_0} :catch_1 + .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0 goto :goto_0 - :catchall_0 + :catch_0 move-exception v1 .line 168 @@ -73,7 +73,7 @@ throw v2 .line 166 - :catch_0 + :catch_1 iget-object v0, p0, Landroid/support/v4/content/ModernAsyncTask$3;->this$0:Landroid/support/v4/content/ModernAsyncTask; const/4 v1, 0x0 @@ -82,7 +82,7 @@ goto :goto_0 - :catch_1 + :catch_2 move-exception v1 .line 163 @@ -97,7 +97,7 @@ throw v2 - :catch_2 + :catch_3 move-exception v0 const-string v1, "AsyncTask" diff --git a/smali/android/support/v4/content/ModernAsyncTask$4.smali b/smali/android/support/v4/content/ModernAsyncTask$4.smali index ec8c7af5..73936dd6 100644 --- a/smali/android/support/v4/content/ModernAsyncTask$4.smali +++ b/smali/android/support/v4/content/ModernAsyncTask$4.smali @@ -34,6 +34,8 @@ sput-object v0, Landroid/support/v4/content/ModernAsyncTask$4;->$SwitchMap$androidx$loader$content$ModernAsyncTask$Status:[I :try_start_0 + sget-object v0, Landroid/support/v4/content/ModernAsyncTask$4;->$SwitchMap$androidx$loader$content$ModernAsyncTask$Status:[I + sget-object v1, Landroid/support/v4/content/ModernAsyncTask$Status;->RUNNING:Landroid/support/v4/content/ModernAsyncTask$Status; invoke-virtual {v1}, Landroid/support/v4/content/ModernAsyncTask$Status;->ordinal()I diff --git a/smali/android/support/v4/content/ModernAsyncTask$Status.smali b/smali/android/support/v4/content/ModernAsyncTask$Status.smali index 2489bc2d..c35b0dba 100644 --- a/smali/android/support/v4/content/ModernAsyncTask$Status.smali +++ b/smali/android/support/v4/content/ModernAsyncTask$Status.smali @@ -34,53 +34,59 @@ # direct methods .method static constructor ()V - .locals 7 + .locals 5 .line 103 new-instance v0, Landroid/support/v4/content/ModernAsyncTask$Status; - const-string v1, "PENDING" + const/4 v1, 0x0 - const/4 v2, 0x0 + const-string v2, "PENDING" - invoke-direct {v0, v1, v2}, Landroid/support/v4/content/ModernAsyncTask$Status;->(Ljava/lang/String;I)V + invoke-direct {v0, v2, v1}, Landroid/support/v4/content/ModernAsyncTask$Status;->(Ljava/lang/String;I)V sput-object v0, Landroid/support/v4/content/ModernAsyncTask$Status;->PENDING:Landroid/support/v4/content/ModernAsyncTask$Status; .line 107 - new-instance v1, Landroid/support/v4/content/ModernAsyncTask$Status; + new-instance v0, Landroid/support/v4/content/ModernAsyncTask$Status; - const-string v3, "RUNNING" + const/4 v2, 0x1 - const/4 v4, 0x1 + const-string v3, "RUNNING" - invoke-direct {v1, v3, v4}, Landroid/support/v4/content/ModernAsyncTask$Status;->(Ljava/lang/String;I)V + invoke-direct {v0, v3, v2}, Landroid/support/v4/content/ModernAsyncTask$Status;->(Ljava/lang/String;I)V - sput-object v1, Landroid/support/v4/content/ModernAsyncTask$Status;->RUNNING:Landroid/support/v4/content/ModernAsyncTask$Status; + sput-object v0, Landroid/support/v4/content/ModernAsyncTask$Status;->RUNNING:Landroid/support/v4/content/ModernAsyncTask$Status; .line 111 - new-instance v3, Landroid/support/v4/content/ModernAsyncTask$Status; + new-instance v0, Landroid/support/v4/content/ModernAsyncTask$Status; - const-string v5, "FINISHED" + const/4 v3, 0x2 - const/4 v6, 0x2 + const-string v4, "FINISHED" - invoke-direct {v3, v5, v6}, Landroid/support/v4/content/ModernAsyncTask$Status;->(Ljava/lang/String;I)V + invoke-direct {v0, v4, v3}, Landroid/support/v4/content/ModernAsyncTask$Status;->(Ljava/lang/String;I)V - sput-object v3, Landroid/support/v4/content/ModernAsyncTask$Status;->FINISHED:Landroid/support/v4/content/ModernAsyncTask$Status; + sput-object v0, Landroid/support/v4/content/ModernAsyncTask$Status;->FINISHED:Landroid/support/v4/content/ModernAsyncTask$Status; - const/4 v5, 0x3 + const/4 v0, 0x3 - new-array v5, v5, [Landroid/support/v4/content/ModernAsyncTask$Status; + .line 99 + new-array v0, v0, [Landroid/support/v4/content/ModernAsyncTask$Status; - aput-object v0, v5, v2 + sget-object v4, Landroid/support/v4/content/ModernAsyncTask$Status;->PENDING:Landroid/support/v4/content/ModernAsyncTask$Status; - aput-object v1, v5, v4 + aput-object v4, v0, v1 - aput-object v3, v5, v6 + sget-object v1, Landroid/support/v4/content/ModernAsyncTask$Status;->RUNNING:Landroid/support/v4/content/ModernAsyncTask$Status; - .line 99 - sput-object v5, Landroid/support/v4/content/ModernAsyncTask$Status;->$VALUES:[Landroid/support/v4/content/ModernAsyncTask$Status; + aput-object v1, v0, v2 + + sget-object v1, Landroid/support/v4/content/ModernAsyncTask$Status;->FINISHED:Landroid/support/v4/content/ModernAsyncTask$Status; + + aput-object v1, v0, v3 + + sput-object v0, Landroid/support/v4/content/ModernAsyncTask$Status;->$VALUES:[Landroid/support/v4/content/ModernAsyncTask$Status; return-void .end method diff --git a/smali/android/support/v4/content/ModernAsyncTask.smali b/smali/android/support/v4/content/ModernAsyncTask.smali index 89b697f1..21037c27 100644 --- a/smali/android/support/v4/content/ModernAsyncTask.smali +++ b/smali/android/support/v4/content/ModernAsyncTask.smali @@ -87,43 +87,49 @@ # direct methods .method static constructor ()V - .locals 9 + .locals 10 .line 60 - new-instance v7, Landroid/support/v4/content/ModernAsyncTask$1; + new-instance v0, Landroid/support/v4/content/ModernAsyncTask$1; - invoke-direct {v7}, Landroid/support/v4/content/ModernAsyncTask$1;->()V + invoke-direct {v0}, Landroid/support/v4/content/ModernAsyncTask$1;->()V - sput-object v7, Landroid/support/v4/content/ModernAsyncTask;->sThreadFactory:Ljava/util/concurrent/ThreadFactory; + sput-object v0, Landroid/support/v4/content/ModernAsyncTask;->sThreadFactory:Ljava/util/concurrent/ThreadFactory; .line 69 - new-instance v6, Ljava/util/concurrent/LinkedBlockingQueue; + new-instance v0, Ljava/util/concurrent/LinkedBlockingQueue; - const/16 v0, 0xa + const/16 v1, 0xa - invoke-direct {v6, v0}, Ljava/util/concurrent/LinkedBlockingQueue;->(I)V + invoke-direct {v0, v1}, Ljava/util/concurrent/LinkedBlockingQueue;->(I)V - sput-object v6, Landroid/support/v4/content/ModernAsyncTask;->sPoolWorkQueue:Ljava/util/concurrent/BlockingQueue; + sput-object v0, Landroid/support/v4/content/ModernAsyncTask;->sPoolWorkQueue:Ljava/util/concurrent/BlockingQueue; .line 75 - new-instance v8, Ljava/util/concurrent/ThreadPoolExecutor; + new-instance v0, Ljava/util/concurrent/ThreadPoolExecutor; - sget-object v5, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit; + sget-object v7, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit; - const/4 v1, 0x5 + sget-object v8, Landroid/support/v4/content/ModernAsyncTask;->sPoolWorkQueue:Ljava/util/concurrent/BlockingQueue; - const/16 v2, 0x80 + sget-object v9, Landroid/support/v4/content/ModernAsyncTask;->sThreadFactory:Ljava/util/concurrent/ThreadFactory; - const-wide/16 v3, 0x1 + const/4 v3, 0x5 - move-object v0, v8 + const/16 v4, 0x80 - invoke-direct/range {v0 .. v7}, Ljava/util/concurrent/ThreadPoolExecutor;->(IIJLjava/util/concurrent/TimeUnit;Ljava/util/concurrent/BlockingQueue;Ljava/util/concurrent/ThreadFactory;)V + const-wide/16 v5, 0x1 - sput-object v8, Landroid/support/v4/content/ModernAsyncTask;->THREAD_POOL_EXECUTOR:Ljava/util/concurrent/Executor; + move-object v2, v0 + + invoke-direct/range {v2 .. v9}, Ljava/util/concurrent/ThreadPoolExecutor;->(IIJLjava/util/concurrent/TimeUnit;Ljava/util/concurrent/BlockingQueue;Ljava/util/concurrent/ThreadFactory;)V + + sput-object v0, Landroid/support/v4/content/ModernAsyncTask;->THREAD_POOL_EXECUTOR:Ljava/util/concurrent/Executor; .line 84 - sput-object v8, Landroid/support/v4/content/ModernAsyncTask;->sDefaultExecutor:Ljava/util/concurrent/Executor; + sget-object v0, Landroid/support/v4/content/ModernAsyncTask;->THREAD_POOL_EXECUTOR:Ljava/util/concurrent/Executor; + + sput-object v0, Landroid/support/v4/content/ModernAsyncTask;->sDefaultExecutor:Ljava/util/concurrent/Executor; return-void .end method @@ -161,11 +167,13 @@ iput-object v0, p0, Landroid/support/v4/content/ModernAsyncTask;->mWorker:Landroid/support/v4/content/ModernAsyncTask$WorkerRunnable; .line 153 - new-instance v1, Landroid/support/v4/content/ModernAsyncTask$3; + new-instance v0, Landroid/support/v4/content/ModernAsyncTask$3; + + iget-object v1, p0, Landroid/support/v4/content/ModernAsyncTask;->mWorker:Landroid/support/v4/content/ModernAsyncTask$WorkerRunnable; - invoke-direct {v1, p0, v0}, Landroid/support/v4/content/ModernAsyncTask$3;->(Landroid/support/v4/content/ModernAsyncTask;Ljava/util/concurrent/Callable;)V + invoke-direct {v0, p0, v1}, Landroid/support/v4/content/ModernAsyncTask$3;->(Landroid/support/v4/content/ModernAsyncTask;Ljava/util/concurrent/Callable;)V - iput-object v1, p0, Landroid/support/v4/content/ModernAsyncTask;->mFuture:Ljava/util/concurrent/FutureTask; + iput-object v0, p0, Landroid/support/v4/content/ModernAsyncTask;->mFuture:Ljava/util/concurrent/FutureTask; return-void .end method @@ -223,6 +231,11 @@ .method public static setDefaultExecutor(Ljava/util/concurrent/Executor;)V .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 126 sput-object p0, Landroid/support/v4/content/ModernAsyncTask;->sDefaultExecutor:Ljava/util/concurrent/Executor; diff --git a/smali/android/support/v4/content/PermissionChecker$PermissionResult.smali b/smali/android/support/v4/content/PermissionChecker$PermissionResult.smali index ce90a050..062ad260 100644 --- a/smali/android/support/v4/content/PermissionChecker$PermissionResult.smali +++ b/smali/android/support/v4/content/PermissionChecker$PermissionResult.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/content/PermissionChecker; .end annotation diff --git a/smali/android/support/v4/content/PermissionChecker.smali b/smali/android/support/v4/content/PermissionChecker.smali index f72c2fea..4f7a4872 100644 --- a/smali/android/support/v4/content/PermissionChecker.smali +++ b/smali/android/support/v4/content/PermissionChecker.smali @@ -31,6 +31,14 @@ .method public static checkCallingOrSelfPermission(Landroid/content/Context;Ljava/lang/String;)I .locals 3 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 171 invoke-static {}, Landroid/os/Binder;->getCallingPid()I @@ -74,6 +82,18 @@ .method public static checkCallingPermission(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)I .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 152 invoke-static {}, Landroid/os/Binder;->getCallingPid()I @@ -111,6 +131,18 @@ .method public static checkPermission(Landroid/content/Context;Ljava/lang/String;IILjava/lang/String;)I .locals 1 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 97 invoke-virtual {p0, p1, p2, p3}, Landroid/content/Context;->checkPermission(Ljava/lang/String;II)I @@ -185,6 +217,14 @@ .method public static checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I .locals 3 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 134 invoke-static {}, Landroid/os/Process;->myPid()I diff --git a/smali/android/support/v4/content/SharedPreferencesCompat$EditorCompat$Helper.smali b/smali/android/support/v4/content/SharedPreferencesCompat$EditorCompat$Helper.smali index 44cc7598..83b0ad88 100644 --- a/smali/android/support/v4/content/SharedPreferencesCompat$EditorCompat$Helper.smali +++ b/smali/android/support/v4/content/SharedPreferencesCompat$EditorCompat$Helper.smali @@ -28,6 +28,10 @@ # virtual methods .method public apply(Landroid/content/SharedPreferences$Editor;)V .locals 0 + .param p1 # Landroid/content/SharedPreferences$Editor; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 45 :try_start_0 diff --git a/smali/android/support/v4/content/SharedPreferencesCompat$EditorCompat.smali b/smali/android/support/v4/content/SharedPreferencesCompat$EditorCompat.smali index 298af587..41a940ac 100644 --- a/smali/android/support/v4/content/SharedPreferencesCompat$EditorCompat.smali +++ b/smali/android/support/v4/content/SharedPreferencesCompat$EditorCompat.smali @@ -76,6 +76,10 @@ # virtual methods .method public apply(Landroid/content/SharedPreferences$Editor;)V .locals 1 + .param p1 # Landroid/content/SharedPreferences$Editor; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation runtime Ljava/lang/Deprecated; .end annotation diff --git a/smali/android/support/v4/content/WakefulBroadcastReceiver.smali b/smali/android/support/v4/content/WakefulBroadcastReceiver.smali index 34b54cbe..f04ad9c8 100644 --- a/smali/android/support/v4/content/WakefulBroadcastReceiver.smali +++ b/smali/android/support/v4/content/WakefulBroadcastReceiver.smali @@ -55,18 +55,18 @@ .method public static completeWakefulIntent(Landroid/content/Intent;)Z .locals 5 - const-string v0, "android.support.content.wakelockid" + const/4 v0, 0x0 - const/4 v1, 0x0 + const-string v1, "android.support.content.wakelockid" .line 126 - invoke-virtual {p0, v0, v1}, Landroid/content/Intent;->getIntExtra(Ljava/lang/String;I)I + invoke-virtual {p0, v1, v0}, Landroid/content/Intent;->getIntExtra(Ljava/lang/String;I)I move-result p0 if-nez p0, :cond_0 - return v1 + return v0 .line 130 :cond_0 @@ -76,7 +76,9 @@ .line 131 :try_start_0 - invoke-virtual {v0, p0}, Landroid/util/SparseArray;->get(I)Ljava/lang/Object; + sget-object v1, Landroid/support/v4/content/WakefulBroadcastReceiver;->sActiveWakeLocks:Landroid/util/SparseArray; + + invoke-virtual {v1, p0}, Landroid/util/SparseArray;->get(I)Ljava/lang/Object; move-result-object v1 @@ -90,7 +92,9 @@ invoke-virtual {v1}, Landroid/os/PowerManager$WakeLock;->release()V .line 134 - invoke-virtual {v0, p0}, Landroid/util/SparseArray;->remove(I)V + sget-object v1, Landroid/support/v4/content/WakefulBroadcastReceiver;->sActiveWakeLocks:Landroid/util/SparseArray; + + invoke-virtual {v1, p0}, Landroid/util/SparseArray;->remove(I)V .line 135 monitor-exit v0 @@ -145,13 +149,18 @@ :try_start_0 sget v1, Landroid/support/v4/content/WakefulBroadcastReceiver;->mNextId:I - add-int/lit8 v2, v1, 0x1 - .line 96 - sput v2, Landroid/support/v4/content/WakefulBroadcastReceiver;->mNextId:I + sget v2, Landroid/support/v4/content/WakefulBroadcastReceiver;->mNextId:I const/4 v3, 0x1 + add-int/2addr v2, v3 + + sput v2, Landroid/support/v4/content/WakefulBroadcastReceiver;->mNextId:I + + .line 97 + sget v2, Landroid/support/v4/content/WakefulBroadcastReceiver;->mNextId:I + if-gtz v2, :cond_0 .line 98 @@ -223,7 +232,9 @@ invoke-virtual {p0, v2, v3}, Landroid/os/PowerManager$WakeLock;->acquire(J)V .line 112 - invoke-virtual {v0, v1, p0}, Landroid/util/SparseArray;->put(ILjava/lang/Object;)V + sget-object v2, Landroid/support/v4/content/WakefulBroadcastReceiver;->sActiveWakeLocks:Landroid/util/SparseArray; + + invoke-virtual {v2, v1, p0}, Landroid/util/SparseArray;->put(ILjava/lang/Object;)V .line 113 monitor-exit v0 diff --git a/smali/android/support/v4/content/pm/PackageInfoCompat.smali b/smali/android/support/v4/content/pm/PackageInfoCompat.smali index 76b2eb10..e5dc7b66 100644 --- a/smali/android/support/v4/content/pm/PackageInfoCompat.smali +++ b/smali/android/support/v4/content/pm/PackageInfoCompat.smali @@ -15,6 +15,10 @@ .method public static getLongVersionCode(Landroid/content/pm/PackageInfo;)J .locals 2 + .param p0 # Landroid/content/pm/PackageInfo; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 34 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/content/pm/PermissionInfoCompat$Protection.smali b/smali/android/support/v4/content/pm/PermissionInfoCompat$Protection.smali index b7fc1a1d..2ce451dd 100644 --- a/smali/android/support/v4/content/pm/PermissionInfoCompat$Protection.smali +++ b/smali/android/support/v4/content/pm/PermissionInfoCompat$Protection.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/content/pm/PermissionInfoCompat; .end annotation diff --git a/smali/android/support/v4/content/pm/PermissionInfoCompat$ProtectionFlags.smali b/smali/android/support/v4/content/pm/PermissionInfoCompat$ProtectionFlags.smali index dab46607..b5ed638b 100644 --- a/smali/android/support/v4/content/pm/PermissionInfoCompat$ProtectionFlags.smali +++ b/smali/android/support/v4/content/pm/PermissionInfoCompat$ProtectionFlags.smali @@ -7,6 +7,18 @@ # annotations +.annotation build Landroid/annotation/SuppressLint; + value = { + "UniqueConstants" + } +.end annotation + +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/content/pm/PermissionInfoCompat; .end annotation diff --git a/smali/android/support/v4/content/pm/PermissionInfoCompat.smali b/smali/android/support/v4/content/pm/PermissionInfoCompat.smali index dcc3d0dc..8d8d0f83 100644 --- a/smali/android/support/v4/content/pm/PermissionInfoCompat.smali +++ b/smali/android/support/v4/content/pm/PermissionInfoCompat.smali @@ -24,6 +24,15 @@ .method public static getProtection(Landroid/content/pm/PermissionInfo;)I .locals 2 + .param p0 # Landroid/content/pm/PermissionInfo; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/annotation/SuppressLint; + value = { + "WrongConstant" + } + .end annotation .line 73 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -50,6 +59,15 @@ .method public static getProtectionFlags(Landroid/content/pm/PermissionInfo;)I .locals 2 + .param p0 # Landroid/content/pm/PermissionInfo; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/annotation/SuppressLint; + value = { + "WrongConstant" + } + .end annotation .line 87 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/content/pm/ShortcutInfoCompat$Builder.smali b/smali/android/support/v4/content/pm/ShortcutInfoCompat$Builder.smali index b8326792..00fe8040 100644 --- a/smali/android/support/v4/content/pm/ShortcutInfoCompat$Builder.smali +++ b/smali/android/support/v4/content/pm/ShortcutInfoCompat$Builder.smali @@ -21,6 +21,14 @@ # direct methods .method public constructor (Landroid/content/Context;Ljava/lang/String;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 184 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -33,6 +41,8 @@ iput-object v0, p0, Landroid/support/v4/content/pm/ShortcutInfoCompat$Builder;->mInfo:Landroid/support/v4/content/pm/ShortcutInfoCompat; .line 186 + iget-object v0, p0, Landroid/support/v4/content/pm/ShortcutInfoCompat$Builder;->mInfo:Landroid/support/v4/content/pm/ShortcutInfoCompat; + iput-object p1, v0, Landroid/support/v4/content/pm/ShortcutInfoCompat;->mContext:Landroid/content/Context; .line 187 @@ -45,6 +55,8 @@ # virtual methods .method public build()Landroid/support/v4/content/pm/ShortcutInfoCompat; .locals 2 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 302 iget-object v0, p0, Landroid/support/v4/content/pm/ShortcutInfoCompat$Builder;->mInfo:Landroid/support/v4/content/pm/ShortcutInfoCompat; @@ -100,6 +112,12 @@ .method public setActivity(Landroid/content/ComponentName;)Landroid/support/v4/content/pm/ShortcutInfoCompat$Builder; .locals 1 + .param p1 # Landroid/content/ComponentName; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 275 iget-object v0, p0, Landroid/support/v4/content/pm/ShortcutInfoCompat$Builder;->mInfo:Landroid/support/v4/content/pm/ShortcutInfoCompat; @@ -124,6 +142,12 @@ .method public setDisabledMessage(Ljava/lang/CharSequence;)Landroid/support/v4/content/pm/ShortcutInfoCompat$Builder; .locals 1 + .param p1 # Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 227 iget-object v0, p0, Landroid/support/v4/content/pm/ShortcutInfoCompat$Builder;->mInfo:Landroid/support/v4/content/pm/ShortcutInfoCompat; @@ -135,6 +159,8 @@ .method public setIcon(Landroid/support/v4/graphics/drawable/IconCompat;)Landroid/support/v4/content/pm/ShortcutInfoCompat$Builder; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 262 iget-object v0, p0, Landroid/support/v4/content/pm/ShortcutInfoCompat$Builder;->mInfo:Landroid/support/v4/content/pm/ShortcutInfoCompat; @@ -146,16 +172,22 @@ .method public setIntent(Landroid/content/Intent;)Landroid/support/v4/content/pm/ShortcutInfoCompat$Builder; .locals 2 + .param p1 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation const/4 v0, 0x1 + .line 242 new-array v0, v0, [Landroid/content/Intent; const/4 v1, 0x0 aput-object p1, v0, v1 - .line 242 invoke-virtual {p0, v0}, Landroid/support/v4/content/pm/ShortcutInfoCompat$Builder;->setIntents([Landroid/content/Intent;)Landroid/support/v4/content/pm/ShortcutInfoCompat$Builder; move-result-object p1 @@ -165,6 +197,12 @@ .method public setIntents([Landroid/content/Intent;)Landroid/support/v4/content/pm/ShortcutInfoCompat$Builder; .locals 1 + .param p1 # [Landroid/content/Intent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 253 iget-object v0, p0, Landroid/support/v4/content/pm/ShortcutInfoCompat$Builder;->mInfo:Landroid/support/v4/content/pm/ShortcutInfoCompat; @@ -176,6 +214,12 @@ .method public setLongLabel(Ljava/lang/CharSequence;)Landroid/support/v4/content/pm/ShortcutInfoCompat$Builder; .locals 1 + .param p1 # Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 215 iget-object v0, p0, Landroid/support/v4/content/pm/ShortcutInfoCompat$Builder;->mInfo:Landroid/support/v4/content/pm/ShortcutInfoCompat; @@ -187,6 +231,12 @@ .method public setShortLabel(Ljava/lang/CharSequence;)Landroid/support/v4/content/pm/ShortcutInfoCompat$Builder; .locals 1 + .param p1 # Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 201 iget-object v0, p0, Landroid/support/v4/content/pm/ShortcutInfoCompat$Builder;->mInfo:Landroid/support/v4/content/pm/ShortcutInfoCompat; diff --git a/smali/android/support/v4/content/pm/ShortcutInfoCompat.smali b/smali/android/support/v4/content/pm/ShortcutInfoCompat.smali index 6f19ed66..15c24611 100644 --- a/smali/android/support/v4/content/pm/ShortcutInfoCompat.smali +++ b/smali/android/support/v4/content/pm/ShortcutInfoCompat.smali @@ -104,13 +104,8 @@ :try_end_0 .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_0 - goto :goto_0 - :catch_0 - nop - :cond_0 - :goto_0 if-nez v0, :cond_1 .line 91 @@ -138,6 +133,8 @@ .method public getActivity()Landroid/content/ComponentName; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 122 iget-object v0, p0, Landroid/support/v4/content/pm/ShortcutInfoCompat;->mActivity:Landroid/content/ComponentName; @@ -147,6 +144,8 @@ .method public getDisabledMessage()Ljava/lang/CharSequence; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 153 iget-object v0, p0, Landroid/support/v4/content/pm/ShortcutInfoCompat;->mDisabledMessage:Ljava/lang/CharSequence; @@ -156,6 +155,8 @@ .method public getId()Ljava/lang/String; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 108 iget-object v0, p0, Landroid/support/v4/content/pm/ShortcutInfoCompat;->mId:Ljava/lang/String; @@ -165,6 +166,8 @@ .method public getIntent()Landroid/content/Intent; .locals 2 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 164 iget-object v0, p0, Landroid/support/v4/content/pm/ShortcutInfoCompat;->mIntents:[Landroid/content/Intent; @@ -180,6 +183,8 @@ .method public getIntents()[Landroid/content/Intent; .locals 2 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 174 iget-object v0, p0, Landroid/support/v4/content/pm/ShortcutInfoCompat;->mIntents:[Landroid/content/Intent; @@ -197,6 +202,8 @@ .method public getLongLabel()Ljava/lang/CharSequence; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 142 iget-object v0, p0, Landroid/support/v4/content/pm/ShortcutInfoCompat;->mLongLabel:Ljava/lang/CharSequence; @@ -206,6 +213,8 @@ .method public getShortLabel()Ljava/lang/CharSequence; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 132 iget-object v0, p0, Landroid/support/v4/content/pm/ShortcutInfoCompat;->mLabel:Ljava/lang/CharSequence; @@ -215,6 +224,9 @@ .method public toShortcutInfo()Landroid/content/pm/ShortcutInfo; .locals 3 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x19 + .end annotation .line 58 new-instance v0, Landroid/content/pm/ShortcutInfo$Builder; diff --git a/smali/android/support/v4/content/pm/ShortcutManagerCompat.smali b/smali/android/support/v4/content/pm/ShortcutManagerCompat.smali index f7922e7e..b4f66cc2 100644 --- a/smali/android/support/v4/content/pm/ShortcutManagerCompat.smali +++ b/smali/android/support/v4/content/pm/ShortcutManagerCompat.smali @@ -5,8 +5,14 @@ # static fields .field static final ACTION_INSTALL_SHORTCUT:Ljava/lang/String; = "com.android.launcher.action.INSTALL_SHORTCUT" + .annotation build Landroid/support/annotation/VisibleForTesting; + .end annotation +.end field .field static final INSTALL_SHORTCUT_PERMISSION:Ljava/lang/String; = "com.android.launcher.permission.INSTALL_SHORTCUT" + .annotation build Landroid/support/annotation/VisibleForTesting; + .end annotation +.end field # direct methods @@ -21,6 +27,16 @@ .method public static createShortcutResultIntent(Landroid/content/Context;Landroid/support/v4/content/pm/ShortcutInfoCompat;)Landroid/content/Intent; .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/support/v4/content/pm/ShortcutInfoCompat; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 135 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -71,6 +87,10 @@ .method public static isRequestPinShortcutSupported(Landroid/content/Context;)Z .locals 4 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 54 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -170,6 +190,18 @@ .method public static requestPinShortcut(Landroid/content/Context;Landroid/support/v4/content/pm/ShortcutInfoCompat;Landroid/content/IntentSender;)Z .locals 10 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/support/v4/content/pm/ShortcutInfoCompat; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/content/IntentSender; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 91 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/content/res/ColorStateListInflaterCompat.smali b/smali/android/support/v4/content/res/ColorStateListInflaterCompat.smali index d0481086..5fd7818d 100644 --- a/smali/android/support/v4/content/res/ColorStateListInflaterCompat.smali +++ b/smali/android/support/v4/content/res/ColorStateListInflaterCompat.smali @@ -3,6 +3,14 @@ .source "ColorStateListInflaterCompat.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field private static final DEFAULT_COLOR:I = -0x10000 @@ -19,6 +27,21 @@ .method public static createFromXml(Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;Landroid/content/res/Resources$Theme;)Landroid/content/res/ColorStateList; .locals 4 + .param p0 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Lorg/xmlpull/v1/XmlPullParser; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Lorg/xmlpull/v1/XmlPullParserException;, @@ -65,17 +88,32 @@ invoke-direct {p0, p1}, Lorg/xmlpull/v1/XmlPullParserException;->(Ljava/lang/String;)V - goto :goto_2 - - :goto_1 throw p0 - :goto_2 - goto :goto_1 + return-void .end method .method public static createFromXmlInner(Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/content/res/Resources$Theme;)Landroid/content/res/ColorStateList; .locals 2 + .param p0 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Lorg/xmlpull/v1/XmlPullParser; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Lorg/xmlpull/v1/XmlPullParserException;, @@ -136,6 +174,22 @@ .method private static inflate(Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/content/res/Resources$Theme;)Landroid/content/res/ColorStateList; .locals 17 + .param p0 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Lorg/xmlpull/v1/XmlPullParser; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Lorg/xmlpull/v1/XmlPullParserException;, @@ -156,9 +210,13 @@ const/16 v3, 0x14 - new-array v4, v3, [[I + .line 112 + new-array v3, v3, [[I + + .line 113 + array-length v4, v3 - new-array v3, v3, [I + new-array v4, v4, [I const/4 v5, 0x0 @@ -345,18 +403,18 @@ .line 159 :cond_7 - invoke-static {v3, v6, v7}, Landroid/support/v4/content/res/GrowingArrayUtils;->append([III)[I + invoke-static {v4, v6, v7}, Landroid/support/v4/content/res/GrowingArrayUtils;->append([III)[I - move-result-object v3 + move-result-object v4 .line 160 - invoke-static {v4, v6, v2}, Landroid/support/v4/content/res/GrowingArrayUtils;->append([Ljava/lang/Object;ILjava/lang/Object;)[Ljava/lang/Object; + invoke-static {v3, v6, v2}, Landroid/support/v4/content/res/GrowingArrayUtils;->append([Ljava/lang/Object;ILjava/lang/Object;)[Ljava/lang/Object; move-result-object v2 - move-object v4, v2 + move-object v3, v2 - check-cast v4, [[I + check-cast v3, [[I add-int/lit8 v6, v6, 0x1 @@ -381,10 +439,10 @@ new-array v1, v6, [[I .line 166 - invoke-static {v3, v5, v0, v5, v6}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V + invoke-static {v4, v5, v0, v5, v6}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V .line 167 - invoke-static {v4, v5, v1, v5, v6}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V + invoke-static {v3, v5, v1, v5, v6}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V .line 169 new-instance v2, Landroid/content/res/ColorStateList; @@ -396,6 +454,18 @@ .method private static modulateColorAlpha(IF)I .locals 1 + .param p0 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param + .param p1 # F + .annotation build Landroid/support/annotation/FloatRange; + from = 0.0 + to = 1.0 + .end annotation + .end param + .annotation build Landroid/support/annotation/ColorInt; + .end annotation .line 181 invoke-static {p0}, Landroid/graphics/Color;->alpha(I)I diff --git a/smali/android/support/v4/content/res/ComplexColorCompat.smali b/smali/android/support/v4/content/res/ComplexColorCompat.smali index 90afb8ae..f503eba5 100644 --- a/smali/android/support/v4/content/res/ComplexColorCompat.smali +++ b/smali/android/support/v4/content/res/ComplexColorCompat.smali @@ -3,6 +3,14 @@ .source "ComplexColorCompat.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field private static final LOG_TAG:Ljava/lang/String; = "ComplexColorCompat" @@ -18,6 +26,10 @@ # direct methods .method private constructor (Landroid/graphics/Shader;Landroid/content/res/ColorStateList;I)V .locals 0 + .param p3 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param .line 61 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -35,7 +47,22 @@ .end method .method private static createFromXml(Landroid/content/res/Resources;ILandroid/content/res/Resources$Theme;)Landroid/support/v4/content/res/ComplexColorCompat; - .locals 4 + .locals 6 + .param p0 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/ColorRes; + .end annotation + .end param + .param p2 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Ljava/io/IOException;, @@ -61,54 +88,82 @@ const/4 v2, 0x2 - if-eq v1, v2, :cond_0 - const/4 v3, 0x1 + if-eq v1, v2, :cond_0 + if-eq v1, v3, :cond_0 goto :goto_0 :cond_0 - if-ne v1, v2, :cond_3 + if-ne v1, v2, :cond_6 .line 162 invoke-interface {p1}, Lorg/xmlpull/v1/XmlPullParser;->getName()Ljava/lang/String; move-result-object v1 + const/4 v2, -0x1 + .line 163 invoke-virtual {v1}, Ljava/lang/String;->hashCode()I - const-string v2, "gradient" + move-result v4 - invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + const v5, 0x557f730 - move-result v2 + if-eq v4, v5, :cond_2 - if-nez v2, :cond_2 + const v5, 0x4705f3df - const-string v2, "selector" + if-eq v4, v5, :cond_1 - invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + goto :goto_1 - move-result v2 + :cond_1 + const-string v4, "selector" - if-eqz v2, :cond_1 + invoke-virtual {v1, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z - .line 165 - invoke-static {p0, p1, v0, p2}, Landroid/support/v4/content/res/ColorStateListInflaterCompat;->createFromXmlInner(Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/content/res/Resources$Theme;)Landroid/content/res/ColorStateList; + move-result v4 + + if-eqz v4, :cond_3 + + const/4 v2, 0x0 + + goto :goto_1 + + :cond_2 + const-string v4, "gradient" + + invoke-virtual {v1, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + + move-result v4 + + if-eqz v4, :cond_3 + + const/4 v2, 0x1 + + :cond_3 + :goto_1 + if-eqz v2, :cond_5 + + if-ne v2, v3, :cond_4 + + .line 168 + invoke-static {p0, p1, v0, p2}, Landroid/support/v4/content/res/GradientColorInflaterCompat;->createFromXmlInner(Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/content/res/Resources$Theme;)Landroid/graphics/Shader; move-result-object p0 - invoke-static {p0}, Landroid/support/v4/content/res/ComplexColorCompat;->from(Landroid/content/res/ColorStateList;)Landroid/support/v4/content/res/ComplexColorCompat; + invoke-static {p0}, Landroid/support/v4/content/res/ComplexColorCompat;->from(Landroid/graphics/Shader;)Landroid/support/v4/content/res/ComplexColorCompat; move-result-object p0 return-object p0 .line 171 - :cond_1 + :cond_4 new-instance p0, Lorg/xmlpull/v1/XmlPullParserException; new-instance p2, Ljava/lang/StringBuilder; @@ -135,37 +190,37 @@ throw p0 - .line 168 - :cond_2 - invoke-static {p0, p1, v0, p2}, Landroid/support/v4/content/res/GradientColorInflaterCompat;->createFromXmlInner(Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/content/res/Resources$Theme;)Landroid/graphics/Shader; + .line 165 + :cond_5 + invoke-static {p0, p1, v0, p2}, Landroid/support/v4/content/res/ColorStateListInflaterCompat;->createFromXmlInner(Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/content/res/Resources$Theme;)Landroid/content/res/ColorStateList; move-result-object p0 - invoke-static {p0}, Landroid/support/v4/content/res/ComplexColorCompat;->from(Landroid/graphics/Shader;)Landroid/support/v4/content/res/ComplexColorCompat; + invoke-static {p0}, Landroid/support/v4/content/res/ComplexColorCompat;->from(Landroid/content/res/ColorStateList;)Landroid/support/v4/content/res/ComplexColorCompat; move-result-object p0 return-object p0 .line 160 - :cond_3 + :cond_6 new-instance p0, Lorg/xmlpull/v1/XmlPullParserException; const-string p1, "No start tag found" invoke-direct {p0, p1}, Lorg/xmlpull/v1/XmlPullParserException;->(Ljava/lang/String;)V - goto :goto_2 - - :goto_1 throw p0 - :goto_2 - goto :goto_1 + return-void .end method .method static from(I)Landroid/support/v4/content/res/ComplexColorCompat; .locals 2 + .param p0 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param .line 76 new-instance v0, Landroid/support/v4/content/res/ComplexColorCompat; @@ -179,6 +234,10 @@ .method static from(Landroid/content/res/ColorStateList;)Landroid/support/v4/content/res/ComplexColorCompat; .locals 3 + .param p0 # Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 72 new-instance v0, Landroid/support/v4/content/res/ComplexColorCompat; @@ -196,6 +255,10 @@ .method static from(Landroid/graphics/Shader;)Landroid/support/v4/content/res/ComplexColorCompat; .locals 3 + .param p0 # Landroid/graphics/Shader; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 68 new-instance v0, Landroid/support/v4/content/res/ComplexColorCompat; @@ -211,6 +274,20 @@ .method public static inflate(Landroid/content/res/Resources;ILandroid/content/res/Resources$Theme;)Landroid/support/v4/content/res/ComplexColorCompat; .locals 0 + .param p0 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/ColorRes; + .end annotation + .end param + .param p2 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 140 :try_start_0 @@ -241,6 +318,8 @@ # virtual methods .method public getColor()I .locals 1 + .annotation build Landroid/support/annotation/ColorInt; + .end annotation .line 86 iget v0, p0, Landroid/support/v4/content/res/ComplexColorCompat;->mColor:I @@ -250,6 +329,8 @@ .method public getShader()Landroid/graphics/Shader; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 81 iget-object v0, p0, Landroid/support/v4/content/res/ComplexColorCompat;->mShader:Landroid/graphics/Shader; @@ -349,6 +430,10 @@ .method public setColor(I)V .locals 0 + .param p1 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param .line 90 iput p1, p0, Landroid/support/v4/content/res/ComplexColorCompat;->mColor:I diff --git a/smali/android/support/v4/content/res/ConfigurationHelper.smali b/smali/android/support/v4/content/res/ConfigurationHelper.smali index 8089a7c7..55c96e7f 100644 --- a/smali/android/support/v4/content/res/ConfigurationHelper.smali +++ b/smali/android/support/v4/content/res/ConfigurationHelper.smali @@ -15,6 +15,10 @@ .method public static getDensityDpi(Landroid/content/res/Resources;)I .locals 2 + .param p0 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 41 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/content/res/FontResourcesParserCompat$FontFamilyFilesResourceEntry.smali b/smali/android/support/v4/content/res/FontResourcesParserCompat$FontFamilyFilesResourceEntry.smali index e5bbbf5b..3d3c119b 100644 --- a/smali/android/support/v4/content/res/FontResourcesParserCompat$FontFamilyFilesResourceEntry.smali +++ b/smali/android/support/v4/content/res/FontResourcesParserCompat$FontFamilyFilesResourceEntry.smali @@ -19,11 +19,18 @@ # instance fields .field private final mEntries:[Landroid/support/v4/content/res/FontResourcesParserCompat$FontFileResourceEntry; + .annotation build Landroid/support/annotation/NonNull; + .end annotation +.end field # direct methods .method public constructor ([Landroid/support/v4/content/res/FontResourcesParserCompat$FontFileResourceEntry;)V .locals 0 + .param p1 # [Landroid/support/v4/content/res/FontResourcesParserCompat$FontFileResourceEntry; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 153 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -38,6 +45,8 @@ # virtual methods .method public getEntries()[Landroid/support/v4/content/res/FontResourcesParserCompat$FontFileResourceEntry; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 158 iget-object v0, p0, Landroid/support/v4/content/res/FontResourcesParserCompat$FontFamilyFilesResourceEntry;->mEntries:[Landroid/support/v4/content/res/FontResourcesParserCompat$FontFileResourceEntry; diff --git a/smali/android/support/v4/content/res/FontResourcesParserCompat$FontFileResourceEntry.smali b/smali/android/support/v4/content/res/FontResourcesParserCompat$FontFileResourceEntry.smali index a73ac5fc..54707d11 100644 --- a/smali/android/support/v4/content/res/FontResourcesParserCompat$FontFileResourceEntry.smali +++ b/smali/android/support/v4/content/res/FontResourcesParserCompat$FontFileResourceEntry.smali @@ -16,6 +16,9 @@ # instance fields .field private final mFileName:Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation +.end field .field private mItalic:Z @@ -31,6 +34,14 @@ # direct methods .method public constructor (Ljava/lang/String;IZLjava/lang/String;II)V .locals 0 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 113 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -60,6 +71,8 @@ # virtual methods .method public getFileName()Ljava/lang/String; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 123 iget-object v0, p0, Landroid/support/v4/content/res/FontResourcesParserCompat$FontFileResourceEntry;->mFileName:Ljava/lang/String; @@ -87,6 +100,8 @@ .method public getVariationSettings()Ljava/lang/String; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 135 iget-object v0, p0, Landroid/support/v4/content/res/FontResourcesParserCompat$FontFileResourceEntry;->mVariationSettings:Ljava/lang/String; diff --git a/smali/android/support/v4/content/res/FontResourcesParserCompat$ProviderResourceEntry.smali b/smali/android/support/v4/content/res/FontResourcesParserCompat$ProviderResourceEntry.smali index 0265616d..bc54a9f7 100644 --- a/smali/android/support/v4/content/res/FontResourcesParserCompat$ProviderResourceEntry.smali +++ b/smali/android/support/v4/content/res/FontResourcesParserCompat$ProviderResourceEntry.smali @@ -19,6 +19,9 @@ # instance fields .field private final mRequest:Landroid/support/v4/provider/FontRequest; + .annotation build Landroid/support/annotation/NonNull; + .end annotation +.end field .field private final mStrategy:I @@ -28,6 +31,10 @@ # direct methods .method public constructor (Landroid/support/v4/provider/FontRequest;II)V .locals 0 + .param p1 # Landroid/support/v4/provider/FontRequest; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 82 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -57,6 +64,8 @@ .method public getRequest()Landroid/support/v4/provider/FontRequest; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 89 iget-object v0, p0, Landroid/support/v4/content/res/FontResourcesParserCompat$ProviderResourceEntry;->mRequest:Landroid/support/v4/provider/FontRequest; diff --git a/smali/android/support/v4/content/res/FontResourcesParserCompat.smali b/smali/android/support/v4/content/res/FontResourcesParserCompat.smali index b42c1a84..0084170a 100644 --- a/smali/android/support/v4/content/res/FontResourcesParserCompat.smali +++ b/smali/android/support/v4/content/res/FontResourcesParserCompat.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v4/content/res/FontResourcesParserCompat$FontFamilyFilesResourceEntry;, @@ -73,6 +79,9 @@ .method public static parse(Lorg/xmlpull/v1/XmlPullParser;Landroid/content/res/Resources;)Landroid/support/v4/content/res/FontResourcesParserCompat$FamilyResourceEntry; .locals 3 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Lorg/xmlpull/v1/XmlPullParserException;, @@ -114,17 +123,17 @@ invoke-direct {p0, p1}, Lorg/xmlpull/v1/XmlPullParserException;->(Ljava/lang/String;)V - goto :goto_2 - - :goto_1 throw p0 - :goto_2 - goto :goto_1 + return-void .end method .method public static readCerts(Landroid/content/res/Resources;I)Ljava/util/List; .locals 5 + .param p1 # I + .annotation build Landroid/support/annotation/ArrayRes; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -247,17 +256,16 @@ invoke-virtual {v0}, Landroid/content/res/TypedArray;->recycle()V - goto :goto_2 - - :goto_1 throw p0 - :goto_2 - goto :goto_1 + return-void .end method .method private static readFamilies(Lorg/xmlpull/v1/XmlPullParser;Landroid/content/res/Resources;)Landroid/support/v4/content/res/FontResourcesParserCompat$FamilyResourceEntry; .locals 3 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Lorg/xmlpull/v1/XmlPullParserException;, @@ -265,22 +273,22 @@ } .end annotation - const/4 v0, 0x2 + const-string v0, "font-family" const/4 v1, 0x0 - const-string v2, "font-family" + const/4 v2, 0x2 .line 181 - invoke-interface {p0, v0, v1, v2}, Lorg/xmlpull/v1/XmlPullParser;->require(ILjava/lang/String;Ljava/lang/String;)V + invoke-interface {p0, v2, v1, v0}, Lorg/xmlpull/v1/XmlPullParser;->require(ILjava/lang/String;Ljava/lang/String;)V .line 182 invoke-interface {p0}, Lorg/xmlpull/v1/XmlPullParser;->getName()Ljava/lang/String; - move-result-object v0 + move-result-object v2 .line 183 - invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v2, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v0 @@ -302,6 +310,9 @@ .method private static readFamily(Lorg/xmlpull/v1/XmlPullParser;Landroid/content/res/Resources;)Landroid/support/v4/content/res/FontResourcesParserCompat$FamilyResourceEntry; .locals 8 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Lorg/xmlpull/v1/XmlPullParserException;, diff --git a/smali/android/support/v4/content/res/GradientColorInflaterCompat$ColorStops.smali b/smali/android/support/v4/content/res/GradientColorInflaterCompat$ColorStops.smali index cc27c371..5cadfdee 100644 --- a/smali/android/support/v4/content/res/GradientColorInflaterCompat$ColorStops.smali +++ b/smali/android/support/v4/content/res/GradientColorInflaterCompat$ColorStops.smali @@ -23,12 +23,21 @@ # direct methods .method constructor (II)V .locals 3 + .param p1 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param .line 227 invoke-direct {p0}, Ljava/lang/Object;->()V const/4 v0, 0x2 + .line 228 new-array v1, v0, [I const/4 v2, 0x0 @@ -39,12 +48,11 @@ aput p2, v1, p1 - .line 228 iput-object v1, p0, Landroid/support/v4/content/res/GradientColorInflaterCompat$ColorStops;->mColors:[I + .line 229 new-array p1, v0, [F - .line 229 fill-array-data p1, :array_0 iput-object p1, p0, Landroid/support/v4/content/res/GradientColorInflaterCompat$ColorStops;->mOffsets:[F @@ -60,12 +68,25 @@ .method constructor (III)V .locals 3 + .param p1 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param + .param p3 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param .line 232 invoke-direct {p0}, Ljava/lang/Object;->()V const/4 v0, 0x3 + .line 233 new-array v1, v0, [I const/4 v2, 0x0 @@ -80,12 +101,11 @@ aput p3, v1, p1 - .line 233 iput-object v1, p0, Landroid/support/v4/content/res/GradientColorInflaterCompat$ColorStops;->mColors:[I + .line 234 new-array p1, v0, [F - .line 234 fill-array-data p1, :array_0 iput-object p1, p0, Landroid/support/v4/content/res/GradientColorInflaterCompat$ColorStops;->mOffsets:[F @@ -104,6 +124,14 @@ .method constructor (Ljava/util/List;Ljava/util/List;)V .locals 4 + .param p1 # Ljava/util/List; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/util/List; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", diff --git a/smali/android/support/v4/content/res/GradientColorInflaterCompat.smali b/smali/android/support/v4/content/res/GradientColorInflaterCompat.smali index d9082072..39d34db4 100644 --- a/smali/android/support/v4/content/res/GradientColorInflaterCompat.smali +++ b/smali/android/support/v4/content/res/GradientColorInflaterCompat.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v4/content/res/GradientColorInflaterCompat$ColorStops; @@ -31,6 +37,22 @@ .method private static checkColors(Landroid/support/v4/content/res/GradientColorInflaterCompat$ColorStops;IIZI)Landroid/support/v4/content/res/GradientColorInflaterCompat$ColorStops; .locals 0 + .param p0 # Landroid/support/v4/content/res/GradientColorInflaterCompat$ColorStops; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param + .param p4 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param if-eqz p0, :cond_0 @@ -57,6 +79,18 @@ .method static createFromXml(Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;Landroid/content/res/Resources$Theme;)Landroid/graphics/Shader; .locals 4 + .param p0 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Lorg/xmlpull/v1/XmlPullParser; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Lorg/xmlpull/v1/XmlPullParserException;, @@ -103,17 +137,29 @@ invoke-direct {p0, p1}, Lorg/xmlpull/v1/XmlPullParserException;->(Ljava/lang/String;)V - goto :goto_2 - - :goto_1 throw p0 - :goto_2 - goto :goto_1 + return-void .end method .method static createFromXmlInner(Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/content/res/Resources$Theme;)Landroid/graphics/Shader; .locals 20 + .param p0 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Lorg/xmlpull/v1/XmlPullParser; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Ljava/io/IOException;, @@ -153,90 +199,90 @@ .line 98 sget v5, Landroid/support/compat/R$styleable;->GradientColor_android_startX:I - const-string v6, "startX" + const/4 v6, 0x0 - const/4 v7, 0x0 + const-string v7, "startX" - invoke-static {v1, v0, v6, v5, v7}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedFloat(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;IF)F + invoke-static {v1, v0, v7, v5, v6}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedFloat(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;IF)F move-result v9 .line 100 sget v5, Landroid/support/compat/R$styleable;->GradientColor_android_startY:I - const-string v6, "startY" + const-string v7, "startY" - invoke-static {v1, v0, v6, v5, v7}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedFloat(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;IF)F + invoke-static {v1, v0, v7, v5, v6}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedFloat(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;IF)F move-result v10 .line 102 sget v5, Landroid/support/compat/R$styleable;->GradientColor_android_endX:I - const-string v6, "endX" + const-string v7, "endX" - invoke-static {v1, v0, v6, v5, v7}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedFloat(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;IF)F + invoke-static {v1, v0, v7, v5, v6}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedFloat(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;IF)F move-result v11 .line 104 sget v5, Landroid/support/compat/R$styleable;->GradientColor_android_endY:I - const-string v6, "endY" + const-string v7, "endY" - invoke-static {v1, v0, v6, v5, v7}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedFloat(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;IF)F + invoke-static {v1, v0, v7, v5, v6}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedFloat(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;IF)F move-result v12 .line 106 sget v5, Landroid/support/compat/R$styleable;->GradientColor_android_centerX:I - const-string v6, "centerX" + const-string v7, "centerX" - invoke-static {v1, v0, v6, v5, v7}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedFloat(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;IF)F + invoke-static {v1, v0, v7, v5, v6}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedFloat(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;IF)F move-result v14 .line 108 sget v5, Landroid/support/compat/R$styleable;->GradientColor_android_centerY:I - const-string v6, "centerY" + const-string v7, "centerY" - invoke-static {v1, v0, v6, v5, v7}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedFloat(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;IF)F + invoke-static {v1, v0, v7, v5, v6}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedFloat(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;IF)F move-result v15 .line 110 sget v5, Landroid/support/compat/R$styleable;->GradientColor_android_type:I - const-string v6, "type" + const/4 v7, 0x0 - const/4 v8, 0x0 + const-string v8, "type" - invoke-static {v1, v0, v6, v5, v8}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedInt(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I + invoke-static {v1, v0, v8, v5, v7}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedInt(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I move-result v5 .line 112 - sget v6, Landroid/support/compat/R$styleable;->GradientColor_android_startColor:I + sget v8, Landroid/support/compat/R$styleable;->GradientColor_android_startColor:I const-string v13, "startColor" - invoke-static {v1, v0, v13, v6, v8}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedColor(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I + invoke-static {v1, v0, v13, v8, v7}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedColor(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I - move-result v6 + move-result v8 const-string v13, "centerColor" .line 114 invoke-static {v0, v13}, Landroid/support/v4/content/res/TypedArrayUtils;->hasAttribute(Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;)Z - move-result v7 + move-result v6 .line 115 sget v2, Landroid/support/compat/R$styleable;->GradientColor_android_centerColor:I - invoke-static {v1, v0, v13, v2, v8}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedColor(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I + invoke-static {v1, v0, v13, v2, v7}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedColor(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I move-result v2 @@ -245,7 +291,7 @@ const-string v3, "endColor" - invoke-static {v1, v0, v3, v13, v8}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedColor(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I + invoke-static {v1, v0, v3, v13, v7}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedColor(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I move-result v3 @@ -254,12 +300,12 @@ const-string v4, "tileMode" - invoke-static {v1, v0, v4, v13, v8}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedInt(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I + invoke-static {v1, v0, v4, v13, v7}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedInt(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I move-result v4 .line 121 - sget v8, Landroid/support/compat/R$styleable;->GradientColor_android_gradientRadius:I + sget v7, Landroid/support/compat/R$styleable;->GradientColor_android_gradientRadius:I const-string v13, "gradientRadius" @@ -267,9 +313,9 @@ const/4 v14, 0x0 - invoke-static {v1, v0, v13, v8, v14}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedFloat(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;IF)F + invoke-static {v1, v0, v13, v7, v14}, Landroid/support/v4/content/res/TypedArrayUtils;->getNamedFloat(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;IF)F - move-result v8 + move-result v7 .line 123 invoke-virtual {v1}, Landroid/content/res/TypedArray;->recycle()V @@ -280,7 +326,7 @@ move-result-object v0 .line 126 - invoke-static {v0, v6, v3, v7, v2}, Landroid/support/v4/content/res/GradientColorInflaterCompat;->checkColors(Landroid/support/v4/content/res/GradientColorInflaterCompat$ColorStops;IIZI)Landroid/support/v4/content/res/GradientColorInflaterCompat$ColorStops; + invoke-static {v0, v8, v3, v6, v2}, Landroid/support/v4/content/res/GradientColorInflaterCompat;->checkColors(Landroid/support/v4/content/res/GradientColorInflaterCompat$ColorStops;IIZI)Landroid/support/v4/content/res/GradientColorInflaterCompat$ColorStops; move-result-object v0 @@ -329,7 +375,7 @@ const/4 v1, 0x0 - cmpg-float v1, v8, v1 + cmpg-float v1, v7, v1 if-lez v1, :cond_2 @@ -349,7 +395,7 @@ move v14, v3 - move/from16 v16, v8 + move/from16 v16, v7 move-object/from16 v17, v2 @@ -401,6 +447,22 @@ .method private static inflateChildElements(Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/content/res/Resources$Theme;)Landroid/support/v4/content/res/GradientColorInflaterCompat$ColorStops; .locals 8 + .param p0 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Lorg/xmlpull/v1/XmlPullParser; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Lorg/xmlpull/v1/XmlPullParserException;, diff --git a/smali/android/support/v4/content/res/ResourcesCompat$FontCallback.smali b/smali/android/support/v4/content/res/ResourcesCompat$FontCallback.smali index e869640b..ebd72235 100644 --- a/smali/android/support/v4/content/res/ResourcesCompat$FontCallback.smali +++ b/smali/android/support/v4/content/res/ResourcesCompat$FontCallback.smali @@ -28,6 +28,15 @@ # virtual methods .method public final callbackFailAsync(ILandroid/os/Handler;)V .locals 1 + .param p2 # Landroid/os/Handler; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation if-nez p2, :cond_0 @@ -53,6 +62,15 @@ .method public final callbackSuccessAsync(Landroid/graphics/Typeface;Landroid/os/Handler;)V .locals 1 + .param p2 # Landroid/os/Handler; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation if-nez p2, :cond_0 @@ -80,4 +98,8 @@ .end method .method public abstract onFontRetrieved(Landroid/graphics/Typeface;)V + .param p1 # Landroid/graphics/Typeface; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method diff --git a/smali/android/support/v4/content/res/ResourcesCompat.smali b/smali/android/support/v4/content/res/ResourcesCompat.smali index f8806e40..63ab5b0b 100644 --- a/smali/android/support/v4/content/res/ResourcesCompat.smali +++ b/smali/android/support/v4/content/res/ResourcesCompat.smali @@ -27,6 +27,21 @@ .method public static getColor(Landroid/content/res/Resources;ILandroid/content/res/Resources$Theme;)I .locals 2 + .param p0 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/ColorRes; + .end annotation + .end param + .param p2 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Landroid/content/res/Resources$NotFoundException; @@ -58,6 +73,21 @@ .method public static getColorStateList(Landroid/content/res/Resources;ILandroid/content/res/Resources$Theme;)Landroid/content/res/ColorStateList; .locals 2 + .param p0 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/ColorRes; + .end annotation + .end param + .param p2 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Landroid/content/res/Resources$NotFoundException; @@ -89,6 +119,21 @@ .method public static getDrawable(Landroid/content/res/Resources;ILandroid/content/res/Resources$Theme;)Landroid/graphics/drawable/Drawable; .locals 2 + .param p0 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param + .param p2 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Landroid/content/res/Resources$NotFoundException; @@ -120,6 +165,21 @@ .method public static getDrawableForDensity(Landroid/content/res/Resources;IILandroid/content/res/Resources$Theme;)Landroid/graphics/drawable/Drawable; .locals 2 + .param p0 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param + .param p3 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Landroid/content/res/Resources$NotFoundException; @@ -166,6 +226,17 @@ .method public static getFont(Landroid/content/Context;I)Landroid/graphics/Typeface; .locals 7 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/FontRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Landroid/content/res/Resources$NotFoundException; @@ -210,6 +281,24 @@ .method public static getFont(Landroid/content/Context;ILandroid/util/TypedValue;ILandroid/support/v4/content/res/ResourcesCompat$FontCallback;)Landroid/graphics/Typeface; .locals 7 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/FontRes; + .end annotation + .end param + .param p4 # Landroid/support/v4/content/res/ResourcesCompat$FontCallback; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Landroid/content/res/Resources$NotFoundException; @@ -252,6 +341,22 @@ .method public static getFont(Landroid/content/Context;ILandroid/support/v4/content/res/ResourcesCompat$FontCallback;Landroid/os/Handler;)V .locals 7 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/FontRes; + .end annotation + .end param + .param p2 # Landroid/support/v4/content/res/ResourcesCompat$FontCallback; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/os/Handler; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Landroid/content/res/Resources$NotFoundException; @@ -300,6 +405,18 @@ .method private static loadFont(Landroid/content/Context;ILandroid/util/TypedValue;ILandroid/support/v4/content/res/ResourcesCompat$FontCallback;Landroid/os/Handler;Z)Landroid/graphics/Typeface; .locals 8 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Landroid/support/v4/content/res/ResourcesCompat$FontCallback; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p5 # Landroid/os/Handler; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 336 invoke-virtual {p0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources; @@ -374,6 +491,18 @@ .method private static loadFont(Landroid/content/Context;Landroid/content/res/Resources;Landroid/util/TypedValue;IILandroid/support/v4/content/res/ResourcesCompat$FontCallback;Landroid/os/Handler;Z)Landroid/graphics/Typeface; .locals 15 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p5 # Landroid/support/v4/content/res/ResourcesCompat$FontCallback; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p6 # Landroid/os/Handler; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param move-object/from16 v0, p1 diff --git a/smali/android/support/v4/content/res/TypedArrayUtils.smali b/smali/android/support/v4/content/res/TypedArrayUtils.smali index df1fa216..25fcb812 100644 --- a/smali/android/support/v4/content/res/TypedArrayUtils.smali +++ b/smali/android/support/v4/content/res/TypedArrayUtils.smali @@ -3,6 +3,14 @@ .source "TypedArrayUtils.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field private static final NAMESPACE:Ljava/lang/String; = "http://schemas.android.com/apk/res/android" @@ -19,6 +27,10 @@ .method public static getAttr(Landroid/content/Context;II)I .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 317 new-instance v0, Landroid/util/TypedValue; @@ -47,6 +59,18 @@ .method public static getBoolean(Landroid/content/res/TypedArray;IIZ)Z .locals 0 + .param p0 # Landroid/content/res/TypedArray; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/StyleableRes; + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/StyleableRes; + .end annotation + .end param .line 227 invoke-virtual {p0, p2, p3}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z @@ -63,6 +87,20 @@ .method public static getDrawable(Landroid/content/res/TypedArray;II)Landroid/graphics/drawable/Drawable; .locals 0 + .param p0 # Landroid/content/res/TypedArray; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/StyleableRes; + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/StyleableRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 238 invoke-virtual {p0, p1}, Landroid/content/res/TypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable; @@ -82,6 +120,18 @@ .method public static getInt(Landroid/content/res/TypedArray;III)I .locals 0 + .param p0 # Landroid/content/res/TypedArray; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/StyleableRes; + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/StyleableRes; + .end annotation + .end param .line 251 invoke-virtual {p0, p2, p3}, Landroid/content/res/TypedArray;->getInt(II)I @@ -98,6 +148,22 @@ .method public static getNamedBoolean(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;IZ)Z .locals 0 + .param p0 # Landroid/content/res/TypedArray; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Lorg/xmlpull/v1/XmlPullParser; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # I + .annotation build Landroid/support/annotation/StyleableRes; + .end annotation + .end param .line 86 invoke-static {p1, p2}, Landroid/support/v4/content/res/TypedArrayUtils;->hasAttribute(Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;)Z @@ -119,6 +185,28 @@ .method public static getNamedColor(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I .locals 0 + .param p0 # Landroid/content/res/TypedArray; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Lorg/xmlpull/v1/XmlPullParser; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # I + .annotation build Landroid/support/annotation/StyleableRes; + .end annotation + .end param + .param p4 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param + .annotation build Landroid/support/annotation/ColorInt; + .end annotation .line 121 invoke-static {p1, p2}, Landroid/support/v4/content/res/TypedArrayUtils;->hasAttribute(Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;)Z @@ -140,6 +228,30 @@ .method public static getNamedComplexColor(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Landroid/content/res/Resources$Theme;Ljava/lang/String;II)Landroid/support/v4/content/res/ComplexColorCompat; .locals 1 + .param p0 # Landroid/content/res/TypedArray; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Lorg/xmlpull/v1/XmlPullParser; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # I + .annotation build Landroid/support/annotation/StyleableRes; + .end annotation + .end param + .param p5 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param .line 139 invoke-static {p1, p3}, Landroid/support/v4/content/res/TypedArrayUtils;->hasAttribute(Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;)Z @@ -211,6 +323,22 @@ .method public static getNamedFloat(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;IF)F .locals 0 + .param p0 # Landroid/content/res/TypedArray; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Lorg/xmlpull/v1/XmlPullParser; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # I + .annotation build Landroid/support/annotation/StyleableRes; + .end annotation + .end param .line 69 invoke-static {p1, p2}, Landroid/support/v4/content/res/TypedArrayUtils;->hasAttribute(Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;)Z @@ -232,6 +360,22 @@ .method public static getNamedInt(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I .locals 0 + .param p0 # Landroid/content/res/TypedArray; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Lorg/xmlpull/v1/XmlPullParser; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # I + .annotation build Landroid/support/annotation/StyleableRes; + .end annotation + .end param .line 103 invoke-static {p1, p2}, Landroid/support/v4/content/res/TypedArrayUtils;->hasAttribute(Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;)Z @@ -253,6 +397,28 @@ .method public static getNamedResourceId(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;II)I .locals 0 + .param p0 # Landroid/content/res/TypedArray; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Lorg/xmlpull/v1/XmlPullParser; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # I + .annotation build Landroid/support/annotation/StyleableRes; + .end annotation + .end param + .param p4 # I + .annotation build Landroid/support/annotation/AnyRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/AnyRes; + .end annotation .line 166 invoke-static {p1, p2}, Landroid/support/v4/content/res/TypedArrayUtils;->hasAttribute(Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;)Z @@ -274,6 +440,24 @@ .method public static getNamedString(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;I)Ljava/lang/String; .locals 0 + .param p0 # Landroid/content/res/TypedArray; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Lorg/xmlpull/v1/XmlPullParser; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # I + .annotation build Landroid/support/annotation/StyleableRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 184 invoke-static {p1, p2}, Landroid/support/v4/content/res/TypedArrayUtils;->hasAttribute(Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;)Z @@ -297,6 +481,24 @@ .method public static getResourceId(Landroid/content/res/TypedArray;III)I .locals 0 + .param p0 # Landroid/content/res/TypedArray; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/StyleableRes; + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/StyleableRes; + .end annotation + .end param + .param p3 # I + .annotation build Landroid/support/annotation/AnyRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/AnyRes; + .end annotation .line 262 invoke-virtual {p0, p2, p3}, Landroid/content/res/TypedArray;->getResourceId(II)I @@ -313,6 +515,20 @@ .method public static getString(Landroid/content/res/TypedArray;II)Ljava/lang/String; .locals 0 + .param p0 # Landroid/content/res/TypedArray; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/StyleableRes; + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/StyleableRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 273 invoke-virtual {p0, p1}, Landroid/content/res/TypedArray;->getString(I)Ljava/lang/String; @@ -332,6 +548,20 @@ .method public static getText(Landroid/content/res/TypedArray;II)Ljava/lang/CharSequence; .locals 0 + .param p0 # Landroid/content/res/TypedArray; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/StyleableRes; + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/StyleableRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 289 invoke-virtual {p0, p1}, Landroid/content/res/TypedArray;->getText(I)Ljava/lang/CharSequence; @@ -351,6 +581,20 @@ .method public static getTextArray(Landroid/content/res/TypedArray;II)[Ljava/lang/CharSequence; .locals 0 + .param p0 # Landroid/content/res/TypedArray; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/StyleableRes; + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/StyleableRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 305 invoke-virtual {p0, p1}, Landroid/content/res/TypedArray;->getTextArray(I)[Ljava/lang/CharSequence; @@ -370,6 +614,14 @@ .method public static hasAttribute(Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;)Z .locals 1 + .param p0 # Lorg/xmlpull/v1/XmlPullParser; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const-string v0, "http://schemas.android.com/apk/res/android" @@ -393,6 +645,24 @@ .method public static obtainAttributes(Landroid/content/res/Resources;Landroid/content/res/Resources$Theme;Landroid/util/AttributeSet;[I)Landroid/content/res/TypedArray; .locals 0 + .param p0 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # [I + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation if-nez p1, :cond_0 @@ -416,6 +686,20 @@ .method public static peekNamedValue(Landroid/content/res/TypedArray;Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;I)Landroid/util/TypedValue; .locals 0 + .param p0 # Landroid/content/res/TypedArray; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Lorg/xmlpull/v1/XmlPullParser; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 200 invoke-static {p1, p2}, Landroid/support/v4/content/res/TypedArrayUtils;->hasAttribute(Lorg/xmlpull/v1/XmlPullParser;Ljava/lang/String;)Z diff --git a/smali/android/support/v4/database/CursorWindowCompat.smali b/smali/android/support/v4/database/CursorWindowCompat.smali index 40e10fdb..28fdcd2a 100644 --- a/smali/android/support/v4/database/CursorWindowCompat.smali +++ b/smali/android/support/v4/database/CursorWindowCompat.smali @@ -15,6 +15,12 @@ .method public static create(Ljava/lang/String;J)Landroid/database/CursorWindow; .locals 2 + .param p0 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 41 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/database/sqlite/SQLiteCursorCompat.smali b/smali/android/support/v4/database/sqlite/SQLiteCursorCompat.smali index 8b826c4d..50de4ab3 100644 --- a/smali/android/support/v4/database/sqlite/SQLiteCursorCompat.smali +++ b/smali/android/support/v4/database/sqlite/SQLiteCursorCompat.smali @@ -15,6 +15,10 @@ .method public static setFillWindowForwardOnly(Landroid/database/sqlite/SQLiteCursor;Z)V .locals 2 + .param p0 # Landroid/database/sqlite/SQLiteCursor; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 45 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/graphics/BitmapCompat.smali b/smali/android/support/v4/graphics/BitmapCompat.smali index 93fe03d5..ea85d90e 100644 --- a/smali/android/support/v4/graphics/BitmapCompat.smali +++ b/smali/android/support/v4/graphics/BitmapCompat.smali @@ -15,6 +15,10 @@ .method public static getAllocationByteCount(Landroid/graphics/Bitmap;)I .locals 2 + .param p0 # Landroid/graphics/Bitmap; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 48 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -41,6 +45,10 @@ .method public static hasMipMap(Landroid/graphics/Bitmap;)Z .locals 2 + .param p0 # Landroid/graphics/Bitmap; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 28 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -64,6 +72,10 @@ .method public static setHasMipMap(Landroid/graphics/Bitmap;Z)V .locals 2 + .param p0 # Landroid/graphics/Bitmap; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 35 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/graphics/ColorUtils.smali b/smali/android/support/v4/graphics/ColorUtils.smali index b7b0b0ed..3c209603 100644 --- a/smali/android/support/v4/graphics/ColorUtils.smali +++ b/smali/android/support/v4/graphics/ColorUtils.smali @@ -53,6 +53,12 @@ .method public static HSLToColor([F)I .locals 6 + .param p0 # [F + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/ColorInt; + .end annotation const/4 v0, 0x0 @@ -333,6 +339,26 @@ .method public static LABToColor(DDD)I .locals 8 + .param p0 # D + .annotation build Landroid/support/annotation/FloatRange; + from = 0.0 + to = 100.0 + .end annotation + .end param + .param p2 # D + .annotation build Landroid/support/annotation/FloatRange; + from = -128.0 + to = 127.0 + .end annotation + .end param + .param p4 # D + .annotation build Landroid/support/annotation/FloatRange; + from = -128.0 + to = 127.0 + .end annotation + .end param + .annotation build Landroid/support/annotation/ColorInt; + .end annotation .line 570 invoke-static {}, Landroid/support/v4/graphics/ColorUtils;->getTempDouble3Array()[D @@ -372,6 +398,28 @@ .method public static LABToXYZ(DDD[D)V .locals 19 + .param p0 # D + .annotation build Landroid/support/annotation/FloatRange; + from = 0.0 + to = 100.0 + .end annotation + .end param + .param p2 # D + .annotation build Landroid/support/annotation/FloatRange; + from = -128.0 + to = 127.0 + .end annotation + .end param + .param p4 # D + .annotation build Landroid/support/annotation/FloatRange; + from = -128.0 + to = 127.0 + .end annotation + .end param + .param p6 # [D + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const-wide/high16 v0, 0x4030000000000000L # 16.0 @@ -486,6 +534,28 @@ .method public static RGBToHSL(III[F)V .locals 7 + .param p0 # I + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + to = 0xffL + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + to = 0xffL + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + to = 0xffL + .end annotation + .end param + .param p3 # [F + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param int-to-float p0, p0 @@ -535,9 +605,9 @@ if-nez v1, :cond_0 - const/4 p1, 0x0 + const/4 p0, 0x0 - const/4 v2, 0x0 + const/4 p1, 0x0 goto :goto_1 @@ -554,6 +624,8 @@ rem-float/2addr p1, p0 + move p0, p1 + goto :goto_0 :cond_1 @@ -565,7 +637,9 @@ div-float/2addr p2, v2 - add-float p1, p2, v4 + add-float/2addr p2, v4 + + move p0, p2 goto :goto_0 @@ -576,7 +650,7 @@ const/high16 p1, 0x40800000 # 4.0f - add-float/2addr p1, p0 + add-float/2addr p0, p1 :goto_0 mul-float v4, v4, v3 @@ -586,41 +660,41 @@ .line 264 invoke-static {v4}, Ljava/lang/Math;->abs(F)F - move-result p0 + move-result p1 - sub-float p0, v5, p0 + sub-float p1, v5, p1 - div-float/2addr v2, p0 + div-float p1, v2, p1 :goto_1 - const/high16 p0, 0x42700000 # 60.0f + const/high16 p2, 0x42700000 # 60.0f - mul-float p1, p1, p0 + mul-float p0, p0, p2 - const/high16 p0, 0x43b40000 # 360.0f + const/high16 p2, 0x43b40000 # 360.0f - rem-float/2addr p1, p0 + rem-float/2addr p0, p2 - cmpg-float p2, p1, v6 + cmpg-float v0, p0, v6 - if-gez p2, :cond_3 + if-gez v0, :cond_3 - add-float/2addr p1, p0 + add-float/2addr p0, p2 :cond_3 - const/4 p2, 0x0 + const/4 v0, 0x0 .line 272 - invoke-static {p1, v6, p0}, Landroid/support/v4/graphics/ColorUtils;->constrain(FFF)F + invoke-static {p0, v6, p2}, Landroid/support/v4/graphics/ColorUtils;->constrain(FFF)F move-result p0 - aput p0, p3, p2 + aput p0, p3, v0 const/4 p0, 0x1 .line 273 - invoke-static {v2, v6, v5}, Landroid/support/v4/graphics/ColorUtils;->constrain(FFF)F + invoke-static {p1, v6, v5}, Landroid/support/v4/graphics/ColorUtils;->constrain(FFF)F move-result p1 @@ -640,6 +714,28 @@ .method public static RGBToLAB(III[D)V .locals 7 + .param p0 # I + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + to = 0xffL + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + to = 0xffL + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + to = 0xffL + .end annotation + .end param + .param p3 # [D + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 399 invoke-static {p0, p1, p2, p3}, Landroid/support/v4/graphics/ColorUtils;->RGBToXYZ(III[D)V @@ -665,7 +761,29 @@ .end method .method public static RGBToXYZ(III[D)V - .locals 16 + .locals 19 + .param p0 # I + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + to = 0xffL + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + to = 0xffL + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + to = 0xffL + .end annotation + .end param + .param p3 # [D + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param move-object/from16 v0, p3 @@ -716,89 +834,87 @@ move-result-wide v1 :goto_0 - move/from16 v15, p1 + move-wide v15, v1 - int-to-double v7, v15 + move/from16 v1, p1 + + int-to-double v1, v1 .line 450 - invoke-static {v7, v8}, Ljava/lang/Double;->isNaN(D)Z + invoke-static {v1, v2}, Ljava/lang/Double;->isNaN(D)Z - div-double/2addr v7, v3 + div-double/2addr v1, v3 - cmpg-double v15, v7, v13 + cmpg-double v17, v1, v13 - if-gez v15, :cond_1 + if-gez v17, :cond_1 - div-double/2addr v7, v5 + div-double/2addr v1, v5 goto :goto_1 :cond_1 - add-double/2addr v7, v11 - - div-double/2addr v7, v9 + add-double/2addr v1, v11 - const-wide v9, 0x4003333333333333L # 2.4 + div-double/2addr v1, v9 .line 451 - invoke-static {v7, v8, v9, v10}, Ljava/lang/Math;->pow(DD)D + invoke-static {v1, v2, v7, v8}, Ljava/lang/Math;->pow(DD)D - move-result-wide v7 + move-result-wide v1 :goto_1 - move/from16 v15, p2 + move-wide/from16 v17, v1 - int-to-double v9, v15 + move/from16 v1, p2 + + int-to-double v1, v1 .line 452 - invoke-static {v9, v10}, Ljava/lang/Double;->isNaN(D)Z + invoke-static {v1, v2}, Ljava/lang/Double;->isNaN(D)Z - div-double/2addr v9, v3 + div-double/2addr v1, v3 - cmpg-double v3, v9, v13 + cmpg-double v3, v1, v13 if-gez v3, :cond_2 - div-double/2addr v9, v5 + div-double/2addr v1, v5 goto :goto_2 :cond_2 - add-double/2addr v9, v11 - - const-wide v3, 0x3ff0e147ae147ae1L # 1.055 - - div-double/2addr v9, v3 + add-double/2addr v1, v11 - const-wide v3, 0x4003333333333333L # 2.4 + div-double/2addr v1, v9 .line 453 - invoke-static {v9, v10, v3, v4}, Ljava/lang/Math;->pow(DD)D + invoke-static {v1, v2, v7, v8}, Ljava/lang/Math;->pow(DD)D - move-result-wide v9 + move-result-wide v1 :goto_2 const/4 v3, 0x0 const-wide v4, 0x3fda64c2f837b4a2L # 0.4124 - mul-double v4, v4, v1 + mul-double v4, v4, v15 - const-wide v11, 0x3fd6e2eb1c432ca5L # 0.3576 + const-wide v6, 0x3fd6e2eb1c432ca5L # 0.3576 - mul-double v11, v11, v7 + mul-double v6, v6, v17 - add-double/2addr v4, v11 + add-double/2addr v4, v6 - const-wide v11, 0x3fc71a9fbe76c8b4L # 0.1805 + const-wide v6, 0x3fc71a9fbe76c8b4L # 0.1805 - mul-double v11, v11, v9 + mul-double v6, v6, v1 - add-double/2addr v4, v11 + add-double/2addr v4, v6 - const-wide/high16 v11, 0x4059000000000000L # 100.0 + const-wide/high16 v6, 0x4059000000000000L # 100.0 - mul-double v4, v4, v11 + mul-double v4, v4, v6 .line 455 aput-wide v4, v0, v3 @@ -807,21 +923,21 @@ const-wide v4, 0x3fcb367a0f9096bcL # 0.2126 - mul-double v4, v4, v1 + mul-double v4, v4, v15 - const-wide v13, 0x3fe6e2eb1c432ca5L # 0.7152 + const-wide v8, 0x3fe6e2eb1c432ca5L # 0.7152 - mul-double v13, v13, v7 + mul-double v8, v8, v17 - add-double/2addr v4, v13 + add-double/2addr v4, v8 - const-wide v13, 0x3fb27bb2fec56d5dL # 0.0722 + const-wide v8, 0x3fb27bb2fec56d5dL # 0.0722 - mul-double v13, v13, v9 + mul-double v8, v8, v1 - add-double/2addr v4, v13 + add-double/2addr v4, v8 - mul-double v4, v4, v11 + mul-double v4, v4, v6 .line 456 aput-wide v4, v0, v3 @@ -830,24 +946,24 @@ const-wide v4, 0x3f93c36113404ea5L # 0.0193 - mul-double v1, v1, v4 + mul-double v15, v15, v4 const-wide v4, 0x3fbe83e425aee632L # 0.1192 - mul-double v7, v7, v4 + mul-double v17, v17, v4 - add-double/2addr v1, v7 + add-double v15, v15, v17 const-wide v4, 0x3fee6a7ef9db22d1L # 0.9505 - mul-double v9, v9, v4 + mul-double v1, v1, v4 - add-double/2addr v1, v9 + add-double/2addr v15, v1 - mul-double v1, v1, v11 + mul-double v15, v15, v6 .line 457 - aput-wide v1, v0, v3 + aput-wide v15, v0, v3 return-void @@ -864,6 +980,26 @@ .method public static XYZToColor(DDD)I .locals 17 + .param p0 # D + .annotation build Landroid/support/annotation/FloatRange; + from = 0.0 + to = 95.047 + .end annotation + .end param + .param p2 # D + .annotation build Landroid/support/annotation/FloatRange; + from = 0.0 + to = 100.0 + .end annotation + .end param + .param p4 # D + .annotation build Landroid/support/annotation/FloatRange; + from = 0.0 + to = 108.883 + .end annotation + .end param + .annotation build Landroid/support/annotation/ColorInt; + .end annotation const-wide v0, 0x4009ecbfb15b573fL # 3.2406 @@ -999,11 +1135,11 @@ long-to-int v1, v0 - const/4 v0, 0x0 + const/16 v0, 0xff - const/16 v8, 0xff + const/4 v8, 0x0 - invoke-static {v1, v0, v8}, Landroid/support/v4/graphics/ColorUtils;->constrain(III)I + invoke-static {v1, v8, v0}, Landroid/support/v4/graphics/ColorUtils;->constrain(III)I move-result v1 @@ -1016,7 +1152,7 @@ long-to-int v5, v4 - invoke-static {v5, v0, v8}, Landroid/support/v4/graphics/ColorUtils;->constrain(III)I + invoke-static {v5, v8, v0}, Landroid/support/v4/graphics/ColorUtils;->constrain(III)I move-result v4 @@ -1029,7 +1165,7 @@ long-to-int v3, v2 - invoke-static {v3, v0, v8}, Landroid/support/v4/graphics/ColorUtils;->constrain(III)I + invoke-static {v3, v8, v0}, Landroid/support/v4/graphics/ColorUtils;->constrain(III)I move-result v0 @@ -1043,6 +1179,28 @@ .method public static XYZToLAB(DDD[D)V .locals 7 + .param p0 # D + .annotation build Landroid/support/annotation/FloatRange; + from = 0.0 + to = 95.047 + .end annotation + .end param + .param p2 # D + .annotation build Landroid/support/annotation/FloatRange; + from = 0.0 + to = 100.0 + .end annotation + .end param + .param p4 # D + .annotation build Landroid/support/annotation/FloatRange; + from = 0.0 + to = 108.883 + .end annotation + .end param + .param p6 # [D + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 481 array-length v0, p6 @@ -1134,6 +1292,22 @@ .method public static blendARGB(IIF)I .locals 5 + .param p0 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param + .param p2 # F + .annotation build Landroid/support/annotation/FloatRange; + from = 0.0 + to = 1.0 + .end annotation + .end param + .annotation build Landroid/support/annotation/ColorInt; + .end annotation const/high16 v0, 0x3f800000 # 1.0f @@ -1233,6 +1407,24 @@ .method public static blendHSL([F[FF[F)V .locals 4 + .param p0 # [F + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # [F + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # F + .annotation build Landroid/support/annotation/FloatRange; + from = 0.0 + to = 1.0 + .end annotation + .end param + .param p3 # [F + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 633 array-length v0, p3 @@ -1303,6 +1495,24 @@ .method public static blendLAB([D[DD[D)V .locals 7 + .param p0 # [D + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # [D + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # D + .annotation build Landroid/support/annotation/FloatRange; + from = 0.0 + to = 1.0 + .end annotation + .end param + .param p4 # [D + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 656 array-length v0, p4 @@ -1375,6 +1585,14 @@ .method public static calculateContrast(II)D .locals 4 + .param p0 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param .line 159 invoke-static {p1}, Landroid/graphics/Color;->alpha(I)I @@ -1457,6 +1675,14 @@ .method public static calculateLuminance(I)D .locals 5 + .param p0 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param + .annotation build Landroid/support/annotation/FloatRange; + from = 0.0 + to = 1.0 + .end annotation .line 145 invoke-static {}, Landroid/support/v4/graphics/ColorUtils;->getTempDouble3Array()[D @@ -1480,6 +1706,14 @@ .method public static calculateMinimumAlpha(IIF)I .locals 8 + .param p0 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param .line 187 invoke-static {p1}, Landroid/graphics/Color;->alpha(I)I @@ -1585,17 +1819,15 @@ invoke-direct {p0, p1}, Ljava/lang/IllegalArgumentException;->(Ljava/lang/String;)V - goto :goto_3 - - :goto_2 throw p0 - :goto_3 - goto :goto_2 + return-void .end method .method static circularInterpolate(FFF)F .locals 3 + .annotation build Landroid/support/annotation/VisibleForTesting; + .end annotation sub-float v0, p1, p0 @@ -1638,6 +1870,14 @@ .method public static colorToHSL(I[F)V .locals 2 + .param p0 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param + .param p1 # [F + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 289 invoke-static {p0}, Landroid/graphics/Color;->red(I)I @@ -1659,6 +1899,14 @@ .method public static colorToLAB(I[D)V .locals 2 + .param p0 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param + .param p1 # [D + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 378 invoke-static {p0}, Landroid/graphics/Color;->red(I)I @@ -1680,6 +1928,14 @@ .method public static colorToXYZ(I[D)V .locals 2 + .param p0 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param + .param p1 # [D + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 421 invoke-static {p0}, Landroid/graphics/Color;->red(I)I @@ -1718,6 +1974,14 @@ .method public static compositeColors(II)I .locals 6 + .param p0 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param .line 53 invoke-static {p1}, Landroid/graphics/Color;->alpha(I)I @@ -1789,6 +2053,20 @@ .method public static compositeColors(Landroid/graphics/Color;Landroid/graphics/Color;)Landroid/graphics/Color; .locals 7 + .param p0 # Landroid/graphics/Color; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/graphics/Color; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x1a + .end annotation .line 92 invoke-virtual {p0}, Landroid/graphics/Color;->getModel()Landroid/graphics/ColorSpace$Model; @@ -1871,14 +2149,23 @@ .line 114 aput v4, v1, v3 + .line 117 + aget v4, v1, v3 + const/4 v5, 0x0 - cmpl-float v5, v4, v5 + cmpl-float v4, v4, v5 - if-lez v5, :cond_1 + if-lez v4, :cond_1 + + .line 118 + aget v4, v1, v3 div-float/2addr p0, v4 + .line 119 + aget v4, v1, v3 + div-float/2addr v2, v4 :cond_1 @@ -1956,13 +2243,9 @@ invoke-direct {v0, p0}, Ljava/lang/IllegalArgumentException;->(Ljava/lang/String;)V - goto :goto_3 - - :goto_2 throw v0 - :goto_3 - goto :goto_2 + return-void .end method .method private static compositeComponent(IIIII)I @@ -2039,6 +2322,14 @@ .method public static distanceEuclidean([D[D)D .locals 9 + .param p0 # [D + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # [D + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 v0, 0x0 @@ -2101,21 +2392,24 @@ invoke-virtual {v0}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object; - move-result-object v1 + move-result-object v0 - check-cast v1, [D + check-cast v0, [D - if-nez v1, :cond_0 + if-nez v0, :cond_0 - const/4 v1, 0x3 + const/4 v0, 0x3 - new-array v1, v1, [D + .line 680 + new-array v0, v0, [D .line 681 - invoke-virtual {v0, v1}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V + sget-object v1, Landroid/support/v4/graphics/ColorUtils;->TEMP_ARRAY:Ljava/lang/ThreadLocal; + + invoke-virtual {v1, v0}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V :cond_0 - return-object v1 + return-object v0 .end method .method private static pivotXyzComponent(D)D @@ -2155,6 +2449,18 @@ .method public static setAlphaComponent(II)I .locals 1 + .param p0 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + to = 0xffL + .end annotation + .end param + .annotation build Landroid/support/annotation/ColorInt; + .end annotation if-ltz p1, :cond_0 diff --git a/smali/android/support/v4/graphics/PaintCompat.smali b/smali/android/support/v4/graphics/PaintCompat.smali index 8ffd068f..b6facfc0 100644 --- a/smali/android/support/v4/graphics/PaintCompat.smali +++ b/smali/android/support/v4/graphics/PaintCompat.smali @@ -46,6 +46,14 @@ .method public static hasGlyph(Landroid/graphics/Paint;Ljava/lang/String;)Z .locals 9 + .param p0 # Landroid/graphics/Paint; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 45 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -217,7 +225,7 @@ .end method .method private static obtainEmptyRects()Landroid/support/v4/util/Pair; - .locals 4 + .locals 3 .annotation system Ldalvik/annotation/Signature; value = { "()", @@ -233,45 +241,47 @@ invoke-virtual {v0}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object; - move-result-object v1 + move-result-object v0 - check-cast v1, Landroid/support/v4/util/Pair; + check-cast v0, Landroid/support/v4/util/Pair; - if-nez v1, :cond_0 + if-nez v0, :cond_0 .line 110 - new-instance v1, Landroid/support/v4/util/Pair; + new-instance v0, Landroid/support/v4/util/Pair; - new-instance v2, Landroid/graphics/Rect; + new-instance v1, Landroid/graphics/Rect; - invoke-direct {v2}, Landroid/graphics/Rect;->()V + invoke-direct {v1}, Landroid/graphics/Rect;->()V - new-instance v3, Landroid/graphics/Rect; + new-instance v2, Landroid/graphics/Rect; - invoke-direct {v3}, Landroid/graphics/Rect;->()V + invoke-direct {v2}, Landroid/graphics/Rect;->()V - invoke-direct {v1, v2, v3}, Landroid/support/v4/util/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V + invoke-direct {v0, v1, v2}, Landroid/support/v4/util/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V .line 111 - invoke-virtual {v0, v1}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V + sget-object v1, Landroid/support/v4/graphics/PaintCompat;->sRectThreadLocal:Ljava/lang/ThreadLocal; + + invoke-virtual {v1, v0}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V goto :goto_0 .line 113 :cond_0 - iget-object v0, v1, Landroid/support/v4/util/Pair;->first:Ljava/lang/Object; + iget-object v1, v0, Landroid/support/v4/util/Pair;->first:Ljava/lang/Object; - check-cast v0, Landroid/graphics/Rect; + check-cast v1, Landroid/graphics/Rect; - invoke-virtual {v0}, Landroid/graphics/Rect;->setEmpty()V + invoke-virtual {v1}, Landroid/graphics/Rect;->setEmpty()V .line 114 - iget-object v0, v1, Landroid/support/v4/util/Pair;->second:Ljava/lang/Object; + iget-object v1, v0, Landroid/support/v4/util/Pair;->second:Ljava/lang/Object; - check-cast v0, Landroid/graphics/Rect; + check-cast v1, Landroid/graphics/Rect; - invoke-virtual {v0}, Landroid/graphics/Rect;->setEmpty()V + invoke-virtual {v1}, Landroid/graphics/Rect;->setEmpty()V :goto_0 - return-object v1 + return-object v0 .end method diff --git a/smali/android/support/v4/graphics/PathParser$PathDataNode.smali b/smali/android/support/v4/graphics/PathParser$PathDataNode.smali index 63067f2f..54d17c47 100644 --- a/smali/android/support/v4/graphics/PathParser$PathDataNode.smali +++ b/smali/android/support/v4/graphics/PathParser$PathDataNode.smali @@ -16,8 +16,20 @@ # instance fields .field public mParams:[F + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field .field public mType:C + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field # direct methods @@ -64,7 +76,7 @@ .end method .method private static addCommand(Landroid/graphics/Path;[FCC[F)V - .locals 25 + .locals 24 move-object/from16 v10, p0 @@ -150,15 +162,15 @@ const/16 v19, 0x7 :goto_1 - move v9, v0 + move v8, v0 - move v8, v1 + move v7, v1 move/from16 v20, v4 move/from16 v21, v5 - const/4 v7, 0x0 + const/4 v9, 0x0 move/from16 v0, p2 @@ -166,7 +178,7 @@ :goto_2 array-length v1, v12 - if-ge v7, v1, :cond_20 + if-ge v9, v1, :cond_20 const/16 v1, 0x41 @@ -216,41 +228,43 @@ if-eq v11, v14, :cond_f - const/16 v14, 0x73 - - const/16 v13, 0x53 + const/16 v14, 0x53 const/high16 v22, 0x40000000 # 2.0f - if-eq v11, v13, :cond_c - - const/16 v4, 0x74 + if-eq v11, v14, :cond_c const/16 v13, 0x54 if-eq v11, v13, :cond_9 - const/16 v1, 0x6c + const/16 v4, 0x6c - if-eq v11, v1, :cond_8 + if-eq v11, v4, :cond_8 - const/16 v1, 0x6d + const/16 v4, 0x6d + + if-eq v11, v4, :cond_6 + + const/16 v4, 0x73 - if-eq v11, v1, :cond_6 + if-eq v11, v4, :cond_3 - if-eq v11, v14, :cond_3 + const/16 v1, 0x74 - if-eq v11, v4, :cond_0 + if-eq v11, v1, :cond_0 :goto_3 - move/from16 v24, v7 + move/from16 v22, v9 goto/16 :goto_11 :cond_0 if-eq v0, v15, :cond_2 - if-eq v0, v4, :cond_2 + const/16 v1, 0x74 + + if-eq v0, v1, :cond_2 if-eq v0, v5, :cond_2 @@ -267,35 +281,35 @@ :cond_2 :goto_4 - sub-float v4, v9, v2 + sub-float v4, v8, v2 - sub-float v0, v8, v3 + sub-float v0, v7, v3 :goto_5 - add-int/lit8 v1, v7, 0x0 + add-int/lit8 v1, v9, 0x0 .line 546 aget v2, v12, v1 - add-int/lit8 v3, v7, 0x1 + add-int/lit8 v3, v9, 0x1 aget v5, v12, v3 invoke-virtual {v10, v4, v0, v2, v5}, Landroid/graphics/Path;->rQuadTo(FFFF)V - add-float/2addr v4, v9 + add-float/2addr v4, v8 - add-float/2addr v0, v8 + add-float/2addr v0, v7 .line 550 aget v1, v12, v1 - add-float/2addr v9, v1 + add-float/2addr v8, v1 .line 551 aget v1, v12, v3 - add-float/2addr v8, v1 + add-float/2addr v7, v1 move v3, v0 @@ -306,15 +320,13 @@ :cond_3 if-eq v0, v6, :cond_5 - if-eq v0, v14, :cond_5 + const/16 v4, 0x73 - const/16 v1, 0x43 + if-eq v0, v4, :cond_5 if-eq v0, v1, :cond_5 - const/16 v1, 0x53 - - if-ne v0, v1, :cond_4 + if-ne v0, v14, :cond_4 goto :goto_6 @@ -327,29 +339,29 @@ :cond_5 :goto_6 - sub-float v0, v9, v2 + sub-float v0, v8, v2 - sub-float v1, v8, v3 + sub-float v1, v7, v3 move v2, v1 move v1, v0 :goto_7 - add-int/lit8 v13, v7, 0x0 + add-int/lit8 v13, v9, 0x0 .line 500 aget v3, v12, v13 - add-int/lit8 v14, v7, 0x1 + add-int/lit8 v14, v9, 0x1 aget v4, v12, v14 - add-int/lit8 v15, v7, 0x2 + add-int/lit8 v15, v9, 0x2 aget v5, v12, v15 - add-int/lit8 v22, v7, 0x3 + add-int/lit8 v22, v9, 0x3 aget v6, v12, v22 @@ -360,17 +372,17 @@ .line 504 aget v0, v12, v13 - add-float/2addr v0, v9 + add-float/2addr v0, v8 .line 505 aget v1, v12, v14 - add-float/2addr v1, v8 + add-float/2addr v1, v7 .line 506 aget v2, v12, v15 - add-float/2addr v9, v2 + add-float/2addr v8, v2 .line 507 aget v2, v12, v22 @@ -378,40 +390,48 @@ goto/16 :goto_a :cond_6 - add-int/lit8 v0, v7, 0x0 + add-int/lit8 v0, v9, 0x0 .line 421 - aget v0, v12, v0 + aget v1, v12, v0 - add-float/2addr v9, v0 + add-float/2addr v8, v1 - add-int/lit8 v1, v7, 0x1 + add-int/lit8 v1, v9, 0x1 .line 422 - aget v1, v12, v1 + aget v4, v12, v1 - add-float/2addr v8, v1 + add-float/2addr v7, v4 - if-lez v7, :cond_7 + if-lez v9, :cond_7 .line 427 + aget v0, v12, v0 + + aget v1, v12, v1 + invoke-virtual {v10, v0, v1}, Landroid/graphics/Path;->rLineTo(FF)V goto :goto_3 .line 429 :cond_7 + aget v0, v12, v0 + + aget v1, v12, v1 + invoke-virtual {v10, v0, v1}, Landroid/graphics/Path;->rMoveTo(FF)V goto/16 :goto_9 :cond_8 - add-int/lit8 v0, v7, 0x0 + add-int/lit8 v0, v9, 0x0 .line 449 aget v1, v12, v0 - add-int/lit8 v4, v7, 0x1 + add-int/lit8 v4, v9, 0x1 aget v5, v12, v4 @@ -420,45 +440,47 @@ .line 450 aget v0, v12, v0 - add-float/2addr v9, v0 + add-float/2addr v8, v0 .line 451 aget v0, v12, v4 :goto_8 - add-float/2addr v8, v0 + add-float/2addr v7, v0 goto/16 :goto_3 :cond_9 if-eq v0, v15, :cond_a - if-eq v0, v4, :cond_a + const/16 v1, 0x74 + + if-eq v0, v1, :cond_a if-eq v0, v5, :cond_a if-ne v0, v13, :cond_b :cond_a - mul-float v9, v9, v22 + mul-float v8, v8, v22 - sub-float/2addr v9, v2 + sub-float/2addr v8, v2 - mul-float v8, v8, v22 + mul-float v7, v7, v22 - sub-float/2addr v8, v3 + sub-float/2addr v7, v3 :cond_b - add-int/lit8 v0, v7, 0x0 + add-int/lit8 v0, v9, 0x0 .line 561 aget v1, v12, v0 - add-int/lit8 v2, v7, 0x1 + add-int/lit8 v2, v9, 0x1 aget v3, v12, v2 - invoke-virtual {v10, v9, v8, v1, v3}, Landroid/graphics/Path;->quadTo(FFFF)V + invoke-virtual {v10, v8, v7, v1, v3}, Landroid/graphics/Path;->quadTo(FFFF)V .line 565 aget v0, v12, v0 @@ -466,59 +488,57 @@ .line 566 aget v1, v12, v2 - move/from16 v24, v7 + move v3, v7 - move v3, v8 + move v2, v8 - move v2, v9 + move/from16 v22, v9 - move v9, v0 + move v8, v0 - move v8, v1 + move v7, v1 goto/16 :goto_11 :cond_c if-eq v0, v6, :cond_d - if-eq v0, v14, :cond_d + const/16 v4, 0x73 - const/16 v1, 0x43 + if-eq v0, v4, :cond_d if-eq v0, v1, :cond_d - const/16 v1, 0x53 - - if-ne v0, v1, :cond_e + if-ne v0, v14, :cond_e :cond_d - mul-float v9, v9, v22 + mul-float v8, v8, v22 - sub-float/2addr v9, v2 + sub-float/2addr v8, v2 - mul-float v8, v8, v22 + mul-float v7, v7, v22 - sub-float/2addr v8, v3 + sub-float/2addr v7, v3 :cond_e - move v2, v8 + move v2, v7 - move v1, v9 + move v1, v8 - add-int/lit8 v8, v7, 0x0 + add-int/lit8 v7, v9, 0x0 .line 517 - aget v3, v12, v8 + aget v3, v12, v7 - add-int/lit8 v9, v7, 0x1 + add-int/lit8 v8, v9, 0x1 - aget v4, v12, v9 + aget v4, v12, v8 - add-int/lit8 v13, v7, 0x2 + add-int/lit8 v13, v9, 0x2 aget v5, v12, v13 - add-int/lit8 v14, v7, 0x3 + add-int/lit8 v14, v9, 0x3 aget v6, v12, v14 @@ -527,72 +547,78 @@ invoke-virtual/range {v0 .. v6}, Landroid/graphics/Path;->cubicTo(FFFFFF)V .line 519 - aget v0, v12, v8 + aget v0, v12, v7 .line 520 - aget v1, v12, v9 + aget v1, v12, v8 .line 521 - aget v9, v12, v13 + aget v8, v12, v13 .line 522 - aget v8, v12, v14 + aget v7, v12, v14 goto/16 :goto_b :cond_f - add-int/lit8 v0, v7, 0x0 + add-int/lit8 v0, v9, 0x0 .line 435 - aget v9, v12, v0 + aget v8, v12, v0 - add-int/lit8 v0, v7, 0x1 + add-int/lit8 v1, v9, 0x1 .line 436 - aget v8, v12, v0 + aget v7, v12, v1 - if-lez v7, :cond_10 + if-lez v9, :cond_10 .line 441 - invoke-virtual {v10, v9, v8}, Landroid/graphics/Path;->lineTo(FF)V + aget v0, v12, v0 + + aget v1, v12, v1 + + invoke-virtual {v10, v0, v1}, Landroid/graphics/Path;->lineTo(FF)V goto/16 :goto_3 .line 443 :cond_10 - invoke-virtual {v10, v9, v8}, Landroid/graphics/Path;->moveTo(FF)V + aget v0, v12, v0 - :goto_9 - move/from16 v24, v7 + aget v1, v12, v1 - move/from16 v21, v8 + invoke-virtual {v10, v0, v1}, Landroid/graphics/Path;->moveTo(FF)V - move/from16 v20, v9 + :goto_9 + move/from16 v21, v7 - goto/16 :goto_11 + move/from16 v20, v8 + + goto/16 :goto_3 :cond_11 - add-int/lit8 v0, v7, 0x0 + add-int/lit8 v0, v9, 0x0 .line 454 aget v1, v12, v0 - add-int/lit8 v4, v7, 0x1 + add-int/lit8 v4, v9, 0x1 aget v5, v12, v4 invoke-virtual {v10, v1, v5}, Landroid/graphics/Path;->lineTo(FF)V .line 455 - aget v9, v12, v0 + aget v8, v12, v0 .line 456 - aget v8, v12, v4 + aget v7, v12, v4 goto/16 :goto_3 :cond_12 - add-int/lit8 v0, v7, 0x0 + add-int/lit8 v0, v9, 0x0 .line 467 aget v1, v12, v0 @@ -607,20 +633,20 @@ goto/16 :goto_8 :cond_13 - add-int/lit8 v0, v7, 0x0 + add-int/lit8 v0, v9, 0x0 .line 525 aget v1, v12, v0 - add-int/lit8 v2, v7, 0x1 + add-int/lit8 v2, v9, 0x1 aget v3, v12, v2 - add-int/lit8 v4, v7, 0x2 + add-int/lit8 v4, v9, 0x2 aget v5, v12, v4 - add-int/lit8 v6, v7, 0x3 + add-int/lit8 v6, v9, 0x3 aget v13, v12, v6 @@ -629,17 +655,17 @@ .line 526 aget v0, v12, v0 - add-float/2addr v0, v9 + add-float/2addr v0, v8 .line 527 aget v1, v12, v2 - add-float/2addr v1, v8 + add-float/2addr v1, v7 .line 528 aget v2, v12, v4 - add-float/2addr v9, v2 + add-float/2addr v8, v2 .line 529 aget v2, v12, v6 @@ -647,7 +673,7 @@ goto :goto_a :cond_14 - add-int/lit8 v0, v7, 0x0 + add-int/lit8 v0, v9, 0x0 .line 459 aget v1, v12, v0 @@ -659,33 +685,33 @@ .line 460 aget v0, v12, v0 - add-float/2addr v9, v0 + add-float/2addr v8, v0 goto/16 :goto_3 :cond_15 - add-int/lit8 v0, v7, 0x0 + add-int/lit8 v0, v9, 0x0 .line 475 aget v1, v12, v0 - add-int/lit8 v0, v7, 0x1 + add-int/lit8 v0, v9, 0x1 aget v2, v12, v0 - add-int/lit8 v13, v7, 0x2 + add-int/lit8 v13, v9, 0x2 aget v3, v12, v13 - add-int/lit8 v14, v7, 0x3 + add-int/lit8 v14, v9, 0x3 aget v4, v12, v14 - add-int/lit8 v15, v7, 0x4 + add-int/lit8 v15, v9, 0x4 aget v5, v12, v15 - add-int/lit8 v22, v7, 0x5 + add-int/lit8 v22, v9, 0x5 aget v6, v12, v22 @@ -696,23 +722,23 @@ .line 478 aget v0, v12, v13 - add-float/2addr v0, v9 + add-float/2addr v0, v8 .line 479 aget v1, v12, v14 - add-float/2addr v1, v8 + add-float/2addr v1, v7 .line 480 aget v2, v12, v15 - add-float/2addr v9, v2 + add-float/2addr v8, v2 .line 481 aget v2, v12, v22 :goto_a - add-float/2addr v8, v2 + add-float/2addr v7, v2 :goto_b move v2, v0 @@ -722,32 +748,32 @@ goto/16 :goto_3 :cond_16 - add-int/lit8 v13, v7, 0x5 + add-int/lit8 v13, v9, 0x5 .line 570 aget v0, v12, v13 - add-float v3, v0, v9 + add-float v3, v0, v8 - add-int/lit8 v14, v7, 0x6 + add-int/lit8 v14, v9, 0x6 aget v0, v12, v14 - add-float v4, v0, v8 + add-float v4, v0, v7 - add-int/lit8 v0, v7, 0x0 + add-int/lit8 v0, v9, 0x0 aget v5, v12, v0 - add-int/lit8 v0, v7, 0x1 + add-int/lit8 v0, v9, 0x1 aget v6, v12, v0 - add-int/lit8 v0, v7, 0x2 + add-int/lit8 v0, v9, 0x2 aget v15, v12, v0 - add-int/lit8 v0, v7, 0x3 + add-int/lit8 v0, v9, 0x3 aget v0, v12, v0 @@ -765,7 +791,7 @@ const/16 v22, 0x0 :goto_c - add-int/lit8 v0, v7, 0x4 + add-int/lit8 v0, v9, 0x4 aget v0, v12, v0 @@ -783,11 +809,11 @@ :goto_d move-object/from16 v0, p0 - move v1, v9 + move v1, v8 - move v2, v8 + move v2, v7 - move/from16 v24, v7 + move v11, v7 move v7, v15 @@ -795,7 +821,7 @@ move/from16 v8, v22 - move v11, v9 + move/from16 v22, v9 move/from16 v9, v23 @@ -804,65 +830,65 @@ .line 580 aget v0, v12, v13 - add-float v9, v11, v0 + add-float v8, v15, v0 .line 581 aget v0, v12, v14 - add-float v8, v15, v0 + add-float v7, v11, v0 goto/16 :goto_10 :cond_19 - move/from16 v24, v7 + move v15, v8 - move v11, v9 + move/from16 v22, v9 - add-int/lit8 v7, v24, 0x0 + add-int/lit8 v9, v22, 0x0 .line 471 - aget v0, v12, v7 + aget v0, v12, v9 - invoke-virtual {v10, v11, v0}, Landroid/graphics/Path;->lineTo(FF)V + invoke-virtual {v10, v15, v0}, Landroid/graphics/Path;->lineTo(FF)V .line 472 - aget v8, v12, v7 + aget v7, v12, v9 goto/16 :goto_11 :cond_1a - move/from16 v24, v7 + move/from16 v22, v9 - add-int/lit8 v7, v24, 0x0 + add-int/lit8 v9, v22, 0x0 .line 532 - aget v0, v12, v7 + aget v0, v12, v9 - add-int/lit8 v1, v24, 0x1 + add-int/lit8 v1, v22, 0x1 aget v2, v12, v1 - add-int/lit8 v3, v24, 0x2 + add-int/lit8 v3, v22, 0x2 aget v4, v12, v3 - add-int/lit8 v5, v24, 0x3 + add-int/lit8 v5, v22, 0x3 aget v6, v12, v5 invoke-virtual {v10, v0, v2, v4, v6}, Landroid/graphics/Path;->quadTo(FFFF)V .line 533 - aget v0, v12, v7 + aget v0, v12, v9 .line 534 aget v1, v12, v1 .line 535 - aget v9, v12, v3 + aget v8, v12, v3 .line 536 - aget v8, v12, v5 + aget v7, v12, v5 move v2, v0 @@ -871,47 +897,47 @@ goto/16 :goto_11 :cond_1b - move/from16 v24, v7 + move v11, v7 - move v15, v8 + move/from16 v22, v9 - add-int/lit8 v7, v24, 0x0 + add-int/lit8 v9, v22, 0x0 .line 463 - aget v0, v12, v7 + aget v0, v12, v9 - invoke-virtual {v10, v0, v15}, Landroid/graphics/Path;->lineTo(FF)V + invoke-virtual {v10, v0, v11}, Landroid/graphics/Path;->lineTo(FF)V .line 464 - aget v9, v12, v7 + aget v8, v12, v9 goto/16 :goto_11 :cond_1c - move/from16 v24, v7 + move/from16 v22, v9 - add-int/lit8 v7, v24, 0x0 + add-int/lit8 v9, v22, 0x0 .line 485 - aget v1, v12, v7 + aget v1, v12, v9 - add-int/lit8 v7, v24, 0x1 + add-int/lit8 v9, v22, 0x1 - aget v2, v12, v7 + aget v2, v12, v9 - add-int/lit8 v7, v24, 0x2 + add-int/lit8 v9, v22, 0x2 - aget v3, v12, v7 + aget v3, v12, v9 - add-int/lit8 v8, v24, 0x3 + add-int/lit8 v7, v22, 0x3 - aget v4, v12, v8 + aget v4, v12, v7 - add-int/lit8 v9, v24, 0x4 + add-int/lit8 v8, v22, 0x4 - aget v5, v12, v9 + aget v5, v12, v8 - add-int/lit8 v11, v24, 0x5 + add-int/lit8 v11, v22, 0x5 aget v6, v12, v11 @@ -920,18 +946,18 @@ invoke-virtual/range {v0 .. v6}, Landroid/graphics/Path;->cubicTo(FFFFFF)V .line 487 - aget v9, v12, v9 + aget v8, v12, v8 .line 488 aget v0, v12, v11 .line 489 - aget v1, v12, v7 + aget v1, v12, v9 .line 490 - aget v2, v12, v8 + aget v2, v12, v7 - move v8, v0 + move v7, v0 move v3, v2 @@ -940,36 +966,36 @@ goto :goto_11 :cond_1d - move/from16 v24, v7 + move v11, v7 move v15, v8 - move v11, v9 + move/from16 v22, v9 - add-int/lit8 v13, v24, 0x5 + add-int/lit8 v13, v22, 0x5 .line 586 aget v3, v12, v13 - add-int/lit8 v14, v24, 0x6 + add-int/lit8 v14, v22, 0x6 aget v4, v12, v14 - add-int/lit8 v7, v24, 0x0 + add-int/lit8 v9, v22, 0x0 - aget v5, v12, v7 + aget v5, v12, v9 - add-int/lit8 v7, v24, 0x1 + add-int/lit8 v9, v22, 0x1 - aget v6, v12, v7 + aget v6, v12, v9 - add-int/lit8 v7, v24, 0x2 + add-int/lit8 v9, v22, 0x2 - aget v7, v12, v7 + aget v7, v12, v9 - add-int/lit8 v0, v24, 0x3 + add-int/lit8 v9, v22, 0x3 - aget v0, v12, v0 + aget v0, v12, v9 const/4 v1, 0x0 @@ -985,9 +1011,9 @@ const/4 v8, 0x0 :goto_e - add-int/lit8 v0, v24, 0x4 + add-int/lit8 v9, v22, 0x4 - aget v0, v12, v0 + aget v0, v12, v9 cmpl-float v0, v0, v1 @@ -1003,25 +1029,25 @@ :goto_f move-object/from16 v0, p0 - move v1, v11 + move v1, v15 - move v2, v15 + move v2, v11 invoke-static/range {v0 .. v9}, Landroid/support/v4/graphics/PathParser$PathDataNode;->drawArc(Landroid/graphics/Path;FFFFFFFZZ)V .line 596 - aget v9, v12, v13 + aget v8, v12, v13 .line 597 - aget v8, v12, v14 + aget v7, v12, v14 :goto_10 - move v3, v8 + move v3, v7 - move v2, v9 + move v2, v8 :goto_11 - add-int v7, v24, v19 + add-int v9, v22, v19 move/from16 v0, p3 @@ -1036,19 +1062,19 @@ goto/16 :goto_2 :cond_20 - move v15, v8 + move v11, v7 - move v11, v9 + move v15, v8 const/4 v0, 0x0 .line 604 - aput v11, p1, v0 + aput v15, p1, v0 const/4 v0, 0x1 .line 605 - aput v15, p1, v0 + aput v11, p1, v0 const/4 v0, 0x2 @@ -1092,7 +1118,7 @@ .end method .method private static arcToBezier(Landroid/graphics/Path;DDDDDDDDD)V - .locals 49 + .locals 48 move-wide/from16 v0, p5 @@ -1166,22 +1192,22 @@ const/16 v23, 0x0 - move-wide/from16 v23, p15 + move-wide/from16 v23, p9 - move-wide/from16 v25, v11 + move-wide/from16 v27, p11 - move-wide/from16 v27, v17 + move-wide/from16 v29, v11 - const/4 v2, 0x0 + move-wide/from16 v25, v17 - move-wide/from16 v11, p9 + const/4 v11, 0x0 - move-wide/from16 v17, p11 + move-wide/from16 v17, p15 :goto_0 - if-ge v2, v4, :cond_0 + if-ge v11, v4, :cond_0 - add-double v31, v23, v9 + add-double v31, v17, v9 .line 730 invoke-static/range {v31 .. v32}, Ljava/lang/Math;->sin(D)D @@ -1201,9 +1227,7 @@ mul-double v39, v19, v33 - move/from16 v41, v4 - - sub-double v3, v37, v39 + sub-double v2, v37, v39 mul-double v37, v0, v7 @@ -1227,11 +1251,11 @@ add-double v33, v33, v35 - sub-double v23, v31, v23 + sub-double v17, v31, v17 const-wide/high16 v35, 0x4000000000000000L # 2.0 - div-double v35, v23, v35 + div-double v35, v17, v35 .line 736 invoke-static/range {v35 .. v36}, Ljava/lang/Math;->tan(D)D @@ -1239,115 +1263,121 @@ move-result-wide v35 .line 738 - invoke-static/range {v23 .. v24}, Ljava/lang/Math;->sin(D)D + invoke-static/range {v17 .. v18}, Ljava/lang/Math;->sin(D)D - move-result-wide v23 + move-result-wide v17 const-wide/high16 v39, 0x4008000000000000L # 3.0 - mul-double v42, v35, v39 - - mul-double v42, v42, v35 + mul-double v43, v35, v39 - const-wide/high16 v29, 0x4010000000000000L # 4.0 + mul-double v43, v43, v35 - add-double v42, v42, v29 + const-wide/high16 v35, 0x4010000000000000L # 4.0 - invoke-static/range {v42 .. v43}, Ljava/lang/Math;->sqrt(D)D + add-double v43, v43, v35 - move-result-wide v35 + invoke-static/range {v43 .. v44}, Ljava/lang/Math;->sqrt(D)D - const-wide/high16 v42, 0x3ff0000000000000L # 1.0 + move-result-wide v41 - sub-double v35, v35, v42 + const-wide/high16 v43, 0x3ff0000000000000L # 1.0 - mul-double v23, v23, v35 + sub-double v41, v41, v43 - div-double v23, v23, v39 + mul-double v17, v17, v41 - mul-double v27, v27, v23 + div-double v17, v17, v39 - add-double v11, v11, v27 + mul-double v25, v25, v17 - mul-double v25, v25, v23 + move v12, v4 - move-wide/from16 v27, v5 + move-wide/from16 v39, v5 - add-double v5, v17, v25 + add-double v4, v23, v25 - mul-double v17, v23, v37 + mul-double v29, v29, v17 move-wide/from16 p13, v7 - sub-double v7, v3, v17 + add-double v6, v27, v29 - mul-double v23, v23, v33 + mul-double v23, v17, v37 move-wide/from16 p7, v9 - sub-double v9, v0, v23 + sub-double v8, v2, v23 - move-wide/from16 v17, v13 + mul-double v17, v17, v33 - const/4 v13, 0x0 + move/from16 p9, v12 + + move-wide/from16 v23, v13 + + sub-double v12, v0, v17 + + const/4 v10, 0x0 move-object/from16 v14, p0 .line 745 - invoke-virtual {v14, v13, v13}, Landroid/graphics/Path;->rLineTo(FF)V + invoke-virtual {v14, v10, v10}, Landroid/graphics/Path;->rLineTo(FF)V - double-to-float v11, v11 + double-to-float v4, v4 - double-to-float v5, v5 + double-to-float v5, v6 - double-to-float v6, v7 + double-to-float v6, v8 - double-to-float v7, v9 + double-to-float v7, v12 - double-to-float v8, v3 + double-to-float v8, v2 double-to-float v9, v0 - move-object/from16 v42, p0 + move-object/from16 v41, p0 - move/from16 v43, v11 + move/from16 v42, v4 - move/from16 v44, v5 + move/from16 v43, v5 - move/from16 v45, v6 + move/from16 v44, v6 - move/from16 v46, v7 + move/from16 v45, v7 - move/from16 v47, v8 + move/from16 v46, v8 - move/from16 v48, v9 + move/from16 v47, v9 .line 747 - invoke-virtual/range {v42 .. v48}, Landroid/graphics/Path;->cubicTo(FFFFFF)V + invoke-virtual/range {v41 .. v47}, Landroid/graphics/Path;->cubicTo(FFFFFF)V - add-int/lit8 v2, v2, 0x1 + add-int/lit8 v11, v11, 0x1 move-wide/from16 v9, p7 + move/from16 v4, p9 + move-wide/from16 v7, p13 - move-wide v11, v3 + move-wide/from16 v27, v0 - move-wide/from16 v13, v17 + move-wide/from16 v13, v23 - move-wide/from16 v5, v27 + move-wide/from16 v17, v31 - move-wide/from16 v23, v31 + move-wide/from16 v29, v33 - move-wide/from16 v25, v33 + move-wide/from16 v25, v37 - move-wide/from16 v27, v37 + move-wide/from16 v5, v39 - move/from16 v4, v41 + move-wide/from16 v0, p5 - move-wide/from16 v17, v0 + move-wide/from16 v23, v2 - move-wide/from16 v0, p5 + move-wide/from16 v2, v35 goto/16 :goto_0 @@ -1710,6 +1740,7 @@ const/4 v0, 0x6 + .line 337 new-array v0, v0, [F const/16 v1, 0x6d @@ -1725,11 +1756,13 @@ .line 340 aget-object v3, p0, v2 - iget-char v4, v3, Landroid/support/v4/graphics/PathParser$PathDataNode;->mType:C + iget-char v3, v3, Landroid/support/v4/graphics/PathParser$PathDataNode;->mType:C + + aget-object v4, p0, v2 - iget-object v3, v3, Landroid/support/v4/graphics/PathParser$PathDataNode;->mParams:[F + iget-object v4, v4, Landroid/support/v4/graphics/PathParser$PathDataNode;->mParams:[F - invoke-static {p1, v0, v1, v4, v3}, Landroid/support/v4/graphics/PathParser$PathDataNode;->addCommand(Landroid/graphics/Path;[FCC[F)V + invoke-static {p1, v0, v1, v3, v4}, Landroid/support/v4/graphics/PathParser$PathDataNode;->addCommand(Landroid/graphics/Path;[FCC[F)V .line 341 aget-object v1, p0, v2 diff --git a/smali/android/support/v4/graphics/PathParser.smali b/smali/android/support/v4/graphics/PathParser.smali index 9b85a2a0..55527c3c 100644 --- a/smali/android/support/v4/graphics/PathParser.smali +++ b/smali/android/support/v4/graphics/PathParser.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v4/graphics/PathParser$PathDataNode;, @@ -619,6 +625,7 @@ throw v1 + .line 211 :cond_4 :goto_1 new-array p0, v0, [F diff --git a/smali/android/support/v4/graphics/PathSegment.smali b/smali/android/support/v4/graphics/PathSegment.smali index 89e895ff..b908b959 100644 --- a/smali/android/support/v4/graphics/PathSegment.smali +++ b/smali/android/support/v4/graphics/PathSegment.smali @@ -16,6 +16,14 @@ # direct methods .method public constructor (Landroid/graphics/PointF;FLandroid/graphics/PointF;F)V .locals 1 + .param p1 # Landroid/graphics/PointF; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/graphics/PointF; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 37 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -131,6 +139,8 @@ .method public getEnd()Landroid/graphics/PointF; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 60 iget-object v0, p0, Landroid/support/v4/graphics/PathSegment;->mEnd:Landroid/graphics/PointF; @@ -149,6 +159,8 @@ .method public getStart()Landroid/graphics/PointF; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 47 iget-object v0, p0, Landroid/support/v4/graphics/PathSegment;->mStart:Landroid/graphics/PointF; diff --git a/smali/android/support/v4/graphics/PathUtils.smali b/smali/android/support/v4/graphics/PathUtils.smali index 33c8641f..38b30338 100644 --- a/smali/android/support/v4/graphics/PathUtils.smali +++ b/smali/android/support/v4/graphics/PathUtils.smali @@ -15,6 +15,17 @@ .method public static flatten(Landroid/graphics/Path;)Ljava/util/Collection; .locals 1 + .param p0 # Landroid/graphics/Path; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x1a + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -38,6 +49,22 @@ .method public static flatten(Landroid/graphics/Path;F)Ljava/util/Collection; .locals 10 + .param p0 # Landroid/graphics/Path; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # F + .annotation build Landroid/support/annotation/FloatRange; + from = 0.0 + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x1a + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", diff --git a/smali/android/support/v4/graphics/TypefaceCompat.smali b/smali/android/support/v4/graphics/TypefaceCompat.smali index ae05798c..078b7fa7 100644 --- a/smali/android/support/v4/graphics/TypefaceCompat.smali +++ b/smali/android/support/v4/graphics/TypefaceCompat.smali @@ -3,6 +3,14 @@ .source "TypefaceCompat.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field private static final TAG:Ljava/lang/String; = "TypefaceCompat" @@ -130,6 +138,20 @@ .method public static createFromFontInfo(Landroid/content/Context;Landroid/os/CancellationSignal;[Landroid/support/v4/provider/FontsContractCompat$FontInfo;I)Landroid/graphics/Typeface; .locals 1 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/os/CancellationSignal; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p2 # [Landroid/support/v4/provider/FontsContractCompat$FontInfo; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 155 sget-object v0, Landroid/support/v4/graphics/TypefaceCompat;->sTypefaceCompatImpl:Landroid/support/v4/graphics/TypefaceCompatBaseImpl; @@ -143,6 +165,28 @@ .method public static createFromResourcesFamilyXml(Landroid/content/Context;Landroid/support/v4/content/res/FontResourcesParserCompat$FamilyResourceEntry;Landroid/content/res/Resources;IILandroid/support/v4/content/res/ResourcesCompat$FontCallback;Landroid/os/Handler;Z)Landroid/graphics/Typeface; .locals 7 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/support/v4/content/res/FontResourcesParserCompat$FamilyResourceEntry; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p5 # Landroid/support/v4/content/res/ResourcesCompat$FontCallback; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p6 # Landroid/os/Handler; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 104 instance-of v1, p1, Landroid/support/v4/content/res/FontResourcesParserCompat$ProviderResourceEntry; @@ -258,6 +302,16 @@ .method public static createFromResourcesFontFile(Landroid/content/Context;Landroid/content/res/Resources;ILjava/lang/String;I)Landroid/graphics/Typeface; .locals 6 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 140 sget-object v0, Landroid/support/v4/graphics/TypefaceCompat;->sTypefaceCompatImpl:Landroid/support/v4/graphics/TypefaceCompatBaseImpl; @@ -325,6 +379,12 @@ .method public static findFromCache(Landroid/content/res/Resources;II)Landroid/graphics/Typeface; .locals 1 + .param p0 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 77 sget-object v0, Landroid/support/v4/graphics/TypefaceCompat;->sTypefaceCache:Landroid/support/v4/util/LruCache; diff --git a/smali/android/support/v4/graphics/TypefaceCompatApi21Impl.smali b/smali/android/support/v4/graphics/TypefaceCompatApi21Impl.smali index 7b6c4477..9cc31fce 100644 --- a/smali/android/support/v4/graphics/TypefaceCompatApi21Impl.smali +++ b/smali/android/support/v4/graphics/TypefaceCompatApi21Impl.smali @@ -3,6 +3,18 @@ .source "TypefaceCompatApi21Impl.java" +# annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0x15 +.end annotation + +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field private static final TAG:Ljava/lang/String; = "TypefaceCompatApi21Impl" @@ -76,7 +88,11 @@ # virtual methods .method public createFromFontInfo(Landroid/content/Context;Landroid/os/CancellationSignal;[Landroid/support/v4/provider/FontsContractCompat$FontInfo;I)Landroid/graphics/Typeface; - .locals 3 + .locals 4 + .param p3 # [Landroid/support/v4/provider/FontsContractCompat$FontInfo; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 66 array-length v0, p3 @@ -112,7 +128,7 @@ move-result-object p2 :try_end_0 - .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0 + .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_4 .line 73 :try_start_1 @@ -137,7 +153,8 @@ move-result-object p1 :try_end_1 - .catchall {:try_start_1 .. :try_end_1} :catchall_3 + .catch Ljava/lang/Throwable; {:try_start_1 .. :try_end_1} :catch_2 + .catchall {:try_start_1 .. :try_end_1} :catchall_2 if-eqz p2, :cond_2 @@ -145,7 +162,7 @@ :try_start_2 invoke-virtual {p2}, Landroid/os/ParcelFileDescriptor;->close()V :try_end_2 - .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_0 + .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_4 :cond_2 return-object p1 @@ -162,7 +179,8 @@ invoke-direct {p3, p4}, Ljava/io/FileInputStream;->(Ljava/io/FileDescriptor;)V :try_end_3 - .catchall {:try_start_3 .. :try_end_3} :catchall_3 + .catch Ljava/lang/Throwable; {:try_start_3 .. :try_end_3} :catch_2 + .catchall {:try_start_3 .. :try_end_3} :catchall_2 .line 78 :try_start_4 @@ -170,13 +188,15 @@ move-result-object p1 :try_end_4 + .catch Ljava/lang/Throwable; {:try_start_4 .. :try_end_4} :catch_0 .catchall {:try_start_4 .. :try_end_4} :catchall_0 .line 79 :try_start_5 invoke-virtual {p3}, Ljava/io/FileInputStream;->close()V :try_end_5 - .catchall {:try_start_5 .. :try_end_5} :catchall_3 + .catch Ljava/lang/Throwable; {:try_start_5 .. :try_end_5} :catch_2 + .catchall {:try_start_5 .. :try_end_5} :catchall_2 if-eqz p2, :cond_4 @@ -184,7 +204,7 @@ :try_start_6 invoke-virtual {p2}, Landroid/os/ParcelFileDescriptor;->close()V :try_end_6 - .catch Ljava/io/IOException; {:try_start_6 .. :try_end_6} :catch_0 + .catch Ljava/io/IOException; {:try_start_6 .. :try_end_6} :catch_4 :cond_4 return-object p1 @@ -192,6 +212,13 @@ :catchall_0 move-exception p1 + move-object p4, v1 + + goto :goto_1 + + :catch_0 + move-exception p1 + .line 77 :try_start_7 throw p1 @@ -201,59 +228,97 @@ :catchall_1 move-exception p4 + move-object v3, p4 + + move-object p4, p1 + + move-object p1, v3 + + :goto_1 + if-eqz p4, :cond_5 + .line 79 :try_start_8 invoke-virtual {p3}, Ljava/io/FileInputStream;->close()V :try_end_8 + .catch Ljava/lang/Throwable; {:try_start_8 .. :try_end_8} :catch_1 .catchall {:try_start_8 .. :try_end_8} :catchall_2 - goto :goto_1 + goto :goto_2 - :catchall_2 + :catch_1 move-exception p3 :try_start_9 - invoke-virtual {p1, p3}, Ljava/lang/Throwable;->addSuppressed(Ljava/lang/Throwable;)V + invoke-virtual {p4, p3}, Ljava/lang/Throwable;->addSuppressed(Ljava/lang/Throwable;)V - :goto_1 - throw p4 + goto :goto_2 + + :cond_5 + invoke-virtual {p3}, Ljava/io/FileInputStream;->close()V + + :goto_2 + throw p1 :try_end_9 - .catchall {:try_start_9 .. :try_end_9} :catchall_3 + .catch Ljava/lang/Throwable; {:try_start_9 .. :try_end_9} :catch_2 + .catchall {:try_start_9 .. :try_end_9} :catchall_2 - :catchall_3 + :catchall_2 + move-exception p1 + + move-object p3, v1 + + goto :goto_3 + + :catch_2 move-exception p1 .line 71 :try_start_a throw p1 :try_end_a - .catchall {:try_start_a .. :try_end_a} :catchall_4 + .catchall {:try_start_a .. :try_end_a} :catchall_3 - :catchall_4 + :catchall_3 move-exception p3 - if-eqz p2, :cond_5 + move-object v3, p3 + + move-object p3, p1 + + move-object p1, v3 + + :goto_3 + if-eqz p2, :cond_7 + + if-eqz p3, :cond_6 .line 82 :try_start_b invoke-virtual {p2}, Landroid/os/ParcelFileDescriptor;->close()V :try_end_b - .catchall {:try_start_b .. :try_end_b} :catchall_5 + .catch Ljava/lang/Throwable; {:try_start_b .. :try_end_b} :catch_3 + .catch Ljava/io/IOException; {:try_start_b .. :try_end_b} :catch_4 - goto :goto_2 + goto :goto_4 - :catchall_5 + :catch_3 move-exception p2 :try_start_c - invoke-virtual {p1, p2}, Ljava/lang/Throwable;->addSuppressed(Ljava/lang/Throwable;)V + invoke-virtual {p3, p2}, Ljava/lang/Throwable;->addSuppressed(Ljava/lang/Throwable;)V - :cond_5 - :goto_2 - throw p3 + goto :goto_4 + + :cond_6 + invoke-virtual {p2}, Landroid/os/ParcelFileDescriptor;->close()V + + :cond_7 + :goto_4 + throw p1 :try_end_c - .catch Ljava/io/IOException; {:try_start_c .. :try_end_c} :catch_0 + .catch Ljava/io/IOException; {:try_start_c .. :try_end_c} :catch_4 - :catch_0 + :catch_4 return-object v1 .end method diff --git a/smali/android/support/v4/graphics/TypefaceCompatApi24Impl.smali b/smali/android/support/v4/graphics/TypefaceCompatApi24Impl.smali index a0f3fda3..018f282f 100644 --- a/smali/android/support/v4/graphics/TypefaceCompatApi24Impl.smali +++ b/smali/android/support/v4/graphics/TypefaceCompatApi24Impl.smali @@ -3,6 +3,18 @@ .source "TypefaceCompatApi24Impl.java" +# annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0x18 +.end annotation + +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field private static final ADD_FONT_WEIGHT_STYLE_METHOD:Ljava/lang/String; = "addFontWeightStyle" @@ -37,9 +49,9 @@ const/4 v2, 0x0 + .line 70 new-array v3, v2, [Ljava/lang/Class; - .line 70 invoke-virtual {v1, v3}, Ljava/lang/Class;->getConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor; move-result-object v3 @@ -48,9 +60,9 @@ const/4 v5, 0x5 + .line 71 new-array v5, v5, [Ljava/lang/Class; - .line 71 const-class v6, Ljava/nio/ByteBuffer; aput-object v6, v5, v2 @@ -305,21 +317,24 @@ .end method .method public static isUsable()Z - .locals 3 + .locals 2 .line 94 sget-object v0, Landroid/support/v4/graphics/TypefaceCompatApi24Impl;->sAddFontWeightStyle:Ljava/lang/reflect/Method; if-nez v0, :cond_0 - const-string v1, "TypefaceCompatApi24Impl" + const-string v0, "TypefaceCompatApi24Impl" - const-string v2, "Unable to collect necessary private methods.Fallback to legacy implementation." + const-string v1, "Unable to collect necessary private methods.Fallback to legacy implementation." .line 95 - invoke-static {v1, v2}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I + invoke-static {v0, v1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I + .line 98 :cond_0 + sget-object v0, Landroid/support/v4/graphics/TypefaceCompatApi24Impl;->sAddFontWeightStyle:Ljava/lang/reflect/Method; + if-eqz v0, :cond_1 const/4 v0, 0x1 @@ -453,6 +468,14 @@ .method public createFromFontInfo(Landroid/content/Context;Landroid/os/CancellationSignal;[Landroid/support/v4/provider/FontsContractCompat$FontInfo;I)Landroid/graphics/Typeface; .locals 8 + .param p2 # Landroid/os/CancellationSignal; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # [Landroid/support/v4/provider/FontsContractCompat$FontInfo; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 134 invoke-static {}, Landroid/support/v4/graphics/TypefaceCompatApi24Impl;->newFamily()Ljava/lang/Object; diff --git a/smali/android/support/v4/graphics/TypefaceCompatApi26Impl.smali b/smali/android/support/v4/graphics/TypefaceCompatApi26Impl.smali index 8c907acb..d5b61326 100644 --- a/smali/android/support/v4/graphics/TypefaceCompatApi26Impl.smali +++ b/smali/android/support/v4/graphics/TypefaceCompatApi26Impl.smali @@ -3,6 +3,18 @@ .source "TypefaceCompatApi26Impl.java" +# annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0x1a +.end annotation + +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field private static final ABORT_CREATION_METHOD:Ljava/lang/String; = "abortCreation" @@ -205,6 +217,10 @@ .method private addFontFromAssetManager(Landroid/content/Context;Ljava/lang/Object;Ljava/lang/String;III[Landroid/graphics/fonts/FontVariationAxis;)Z .locals 3 + .param p7 # [Landroid/graphics/fonts/FontVariationAxis; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 140 :try_start_0 @@ -693,7 +709,15 @@ .end method .method public createFromFontInfo(Landroid/content/Context;Landroid/os/CancellationSignal;[Landroid/support/v4/provider/FontsContractCompat$FontInfo;I)Landroid/graphics/Typeface; - .locals 10 + .locals 11 + .param p2 # Landroid/os/CancellationSignal; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # [Landroid/support/v4/provider/FontsContractCompat$FontInfo; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 228 array-length v0, p3 @@ -712,7 +736,7 @@ move-result v0 - if-nez v0, :cond_5 + if-nez v0, :cond_6 .line 234 invoke-virtual {p0, p3, p4}, Landroid/support/v4/graphics/TypefaceCompatApi26Impl;->findBestInfo([Landroid/support/v4/provider/FontsContractCompat$FontInfo;I)Landroid/support/v4/provider/FontsContractCompat$FontInfo; @@ -743,7 +767,7 @@ .line 245 invoke-virtual {p1}, Landroid/os/ParcelFileDescriptor;->close()V :try_end_0 - .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0 + .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_2 :cond_1 return-object v2 @@ -782,6 +806,7 @@ move-result-object p2 :try_end_1 + .catch Ljava/lang/Throwable; {:try_start_1 .. :try_end_1} :catch_0 .catchall {:try_start_1 .. :try_end_1} :catchall_0 if-eqz p1, :cond_3 @@ -790,7 +815,7 @@ :try_start_2 invoke-virtual {p1}, Landroid/os/ParcelFileDescriptor;->close()V :try_end_2 - .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_0 + .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_2 :cond_3 return-object p2 @@ -798,6 +823,13 @@ :catchall_0 move-exception p2 + move-object p3, v2 + + goto :goto_0 + + :catch_0 + move-exception p2 + .line 236 :try_start_3 throw p2 @@ -807,33 +839,48 @@ :catchall_1 move-exception p3 - if-eqz p1, :cond_4 + move-object v10, p3 + + move-object p3, p2 + + move-object p2, v10 + + :goto_0 + if-eqz p1, :cond_5 + + if-eqz p3, :cond_4 .line 245 :try_start_4 invoke-virtual {p1}, Landroid/os/ParcelFileDescriptor;->close()V :try_end_4 - .catchall {:try_start_4 .. :try_end_4} :catchall_2 + .catch Ljava/lang/Throwable; {:try_start_4 .. :try_end_4} :catch_1 + .catch Ljava/io/IOException; {:try_start_4 .. :try_end_4} :catch_2 - goto :goto_0 + goto :goto_1 - :catchall_2 + :catch_1 move-exception p1 :try_start_5 - invoke-virtual {p2, p1}, Ljava/lang/Throwable;->addSuppressed(Ljava/lang/Throwable;)V + invoke-virtual {p3, p1}, Ljava/lang/Throwable;->addSuppressed(Ljava/lang/Throwable;)V + + goto :goto_1 :cond_4 - :goto_0 - throw p3 + invoke-virtual {p1}, Landroid/os/ParcelFileDescriptor;->close()V + + :cond_5 + :goto_1 + throw p2 :try_end_5 - .catch Ljava/io/IOException; {:try_start_5 .. :try_end_5} :catch_0 + .catch Ljava/io/IOException; {:try_start_5 .. :try_end_5} :catch_2 - :catch_0 + :catch_2 return-object v2 .line 249 - :cond_5 + :cond_6 invoke-static {p1, p3, p2}, Landroid/support/v4/provider/FontsContractCompat;->prepareFontData(Landroid/content/Context;[Landroid/support/v4/provider/FontsContractCompat$FontInfo;Landroid/os/CancellationSignal;)Ljava/util/Map; move-result-object p1 @@ -850,8 +897,8 @@ const/4 v9, 0x0 - :goto_1 - if-ge v9, v0, :cond_8 + :goto_2 + if-ge v9, v0, :cond_9 aget-object v4, p3, v9 @@ -866,12 +913,12 @@ check-cast v5, Ljava/nio/ByteBuffer; - if-nez v5, :cond_6 + if-nez v5, :cond_7 - goto :goto_2 + goto :goto_3 .line 259 - :cond_6 + :cond_7 invoke-virtual {v4}, Landroid/support/v4/provider/FontsContractCompat$FontInfo;->getTtcIndex()I move-result v6 @@ -893,23 +940,23 @@ move-result v3 - if-nez v3, :cond_7 + if-nez v3, :cond_8 .line 261 invoke-direct {p0, p2}, Landroid/support/v4/graphics/TypefaceCompatApi26Impl;->abortCreation(Ljava/lang/Object;)V return-object v2 - :cond_7 + :cond_8 const/4 v3, 0x1 - :goto_2 + :goto_3 add-int/lit8 v9, v9, 0x1 - goto :goto_1 + goto :goto_2 - :cond_8 - if-nez v3, :cond_9 + :cond_9 + if-nez v3, :cond_a .line 267 invoke-direct {p0, p2}, Landroid/support/v4/graphics/TypefaceCompatApi26Impl;->abortCreation(Ljava/lang/Object;)V @@ -917,17 +964,17 @@ return-object v2 .line 270 - :cond_9 + :cond_a invoke-direct {p0, p2}, Landroid/support/v4/graphics/TypefaceCompatApi26Impl;->freeze(Ljava/lang/Object;)Z move-result p1 - if-nez p1, :cond_a + if-nez p1, :cond_b return-object v2 .line 273 - :cond_a + :cond_b invoke-virtual {p0, p2}, Landroid/support/v4/graphics/TypefaceCompatApi26Impl;->createFromFamiliesWithDefault(Ljava/lang/Object;)Landroid/graphics/Typeface; move-result-object p1 @@ -942,6 +989,8 @@ .method public createFromResourcesFontFile(Landroid/content/Context;Landroid/content/res/Resources;ILjava/lang/String;I)Landroid/graphics/Typeface; .locals 8 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 284 invoke-direct {p0}, Landroid/support/v4/graphics/TypefaceCompatApi26Impl;->isFontFamilyPrivateAPIAvailable()Z @@ -1022,11 +1071,11 @@ const/4 v0, 0x0 + .line 331 new-array v0, v0, [Ljava/lang/Class; const-string v1, "abortCreation" - .line 331 invoke-virtual {p1, v1, v0}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method; move-result-object p1 @@ -1044,20 +1093,20 @@ const/16 v0, 0x8 + .line 315 new-array v0, v0, [Ljava/lang/Class; - const/4 v1, 0x0 + const-class v1, Landroid/content/res/AssetManager; - .line 315 - const-class v2, Landroid/content/res/AssetManager; + const/4 v2, 0x0 - aput-object v2, v0, v1 + aput-object v1, v0, v2 - const/4 v1, 0x1 + const-class v1, Ljava/lang/String; - const-class v2, Ljava/lang/String; + const/4 v2, 0x1 - aput-object v2, v0, v1 + aput-object v1, v0, v2 sget-object v1, Ljava/lang/Integer;->TYPE:Ljava/lang/Class; @@ -1089,11 +1138,11 @@ aput-object v1, v0, v2 - const/4 v1, 0x7 + const-class v1, [Landroid/graphics/fonts/FontVariationAxis; - const-class v2, [Landroid/graphics/fonts/FontVariationAxis; + const/4 v2, 0x7 - aput-object v2, v0, v1 + aput-object v1, v0, v2 const-string v1, "addFontFromAssetManager" @@ -1114,14 +1163,14 @@ const/4 v0, 0x5 + .line 321 new-array v0, v0, [Ljava/lang/Class; - const/4 v1, 0x0 + const-class v1, Ljava/nio/ByteBuffer; - .line 321 - const-class v2, Ljava/nio/ByteBuffer; + const/4 v2, 0x0 - aput-object v2, v0, v1 + aput-object v1, v0, v2 sget-object v1, Ljava/lang/Integer;->TYPE:Ljava/lang/Class; @@ -1129,11 +1178,11 @@ aput-object v1, v0, v2 - const/4 v1, 0x2 + const-class v1, [Landroid/graphics/fonts/FontVariationAxis; - const-class v2, [Landroid/graphics/fonts/FontVariationAxis; + const/4 v2, 0x2 - aput-object v2, v0, v1 + aput-object v1, v0, v2 sget-object v1, Ljava/lang/Integer;->TYPE:Ljava/lang/Class; @@ -1238,9 +1287,9 @@ const/4 v0, 0x0 + .line 310 new-array v0, v0, [Ljava/lang/Class; - .line 310 invoke-virtual {p1, v0}, Ljava/lang/Class;->getConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor; move-result-object p1 @@ -1258,11 +1307,11 @@ const/4 v0, 0x0 + .line 327 new-array v0, v0, [Ljava/lang/Class; const-string v1, "freeze" - .line 327 invoke-virtual {p1, v1, v0}, Ljava/lang/Class;->getMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method; move-result-object p1 diff --git a/smali/android/support/v4/graphics/TypefaceCompatApi28Impl.smali b/smali/android/support/v4/graphics/TypefaceCompatApi28Impl.smali index 7c8555fc..cbd88465 100644 --- a/smali/android/support/v4/graphics/TypefaceCompatApi28Impl.smali +++ b/smali/android/support/v4/graphics/TypefaceCompatApi28Impl.smali @@ -3,6 +3,18 @@ .source "TypefaceCompatApi28Impl.java" +# annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0x1c +.end annotation + +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field private static final CREATE_FROM_FAMILIES_WITH_DEFAULT_METHOD:Ljava/lang/String; = "createFromFamiliesWithDefault" diff --git a/smali/android/support/v4/graphics/TypefaceCompatBaseImpl.smali b/smali/android/support/v4/graphics/TypefaceCompatBaseImpl.smali index 14763207..d1d0c709 100644 --- a/smali/android/support/v4/graphics/TypefaceCompatBaseImpl.smali +++ b/smali/android/support/v4/graphics/TypefaceCompatBaseImpl.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v4/graphics/TypefaceCompatBaseImpl$StyleExtractor; @@ -95,12 +101,16 @@ .line 58 array-length v5, p0 - const/4 v6, 0x0 + move-object v4, v3 + + const/4 v3, 0x0 + + const v6, 0x7fffffff :goto_2 - if-ge v6, v5, :cond_5 + if-ge v3, v5, :cond_5 - aget-object v7, p0, v6 + aget-object v7, p0, v3 .line 59 invoke-interface {p2, v7}, Landroid/support/v4/graphics/TypefaceCompatBaseImpl$StyleExtractor;->getWeight(Ljava/lang/Object;)I @@ -132,28 +142,30 @@ :goto_3 add-int/2addr v8, v9 - if-eqz v3, :cond_3 + if-eqz v4, :cond_3 - if-le v4, v8, :cond_4 + if-le v6, v8, :cond_4 :cond_3 - move-object v3, v7 + move-object v4, v7 - move v4, v8 + move v6, v8 :cond_4 - add-int/lit8 v6, v6, 0x1 + add-int/lit8 v3, v3, 0x1 goto :goto_2 :cond_5 - return-object v3 + return-object v4 .end method # virtual methods .method public createFromFontFamilyFilesResourceEntry(Landroid/content/Context;Landroid/support/v4/content/res/FontResourcesParserCompat$FontFamilyFilesResourceEntry;Landroid/content/res/Resources;I)Landroid/graphics/Typeface; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 140 invoke-direct {p0, p2, p4}, Landroid/support/v4/graphics/TypefaceCompatBaseImpl;->findBestEntry(Landroid/support/v4/content/res/FontResourcesParserCompat$FontFamilyFilesResourceEntry;I)Landroid/support/v4/content/res/FontResourcesParserCompat$FontFileResourceEntry; @@ -186,6 +198,14 @@ .method public createFromFontInfo(Landroid/content/Context;Landroid/os/CancellationSignal;[Landroid/support/v4/provider/FontsContractCompat$FontInfo;I)Landroid/graphics/Typeface; .locals 2 + .param p2 # Landroid/os/CancellationSignal; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # [Landroid/support/v4/provider/FontsContractCompat$FontInfo; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 108 array-length p2, p3 @@ -324,6 +344,8 @@ .method public createFromResourcesFontFile(Landroid/content/Context;Landroid/content/res/Resources;ILjava/lang/String;I)Landroid/graphics/Typeface; .locals 0 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 154 invoke-static {p1}, Landroid/support/v4/graphics/TypefaceCompatUtil;->getTempFile(Landroid/content/Context;)Ljava/io/File; diff --git a/smali/android/support/v4/graphics/TypefaceCompatUtil.smali b/smali/android/support/v4/graphics/TypefaceCompatUtil.smali index 4e223ebd..35531d00 100644 --- a/smali/android/support/v4/graphics/TypefaceCompatUtil.smali +++ b/smali/android/support/v4/graphics/TypefaceCompatUtil.smali @@ -3,6 +3,14 @@ .source "TypefaceCompatUtil.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field private static final CACHE_FILE_PREFIX:Ljava/lang/String; = ".font" @@ -37,6 +45,12 @@ .method public static copyToDirectBuffer(Landroid/content/Context;Landroid/content/res/Resources;I)Ljava/nio/ByteBuffer; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x13 + .end annotation .line 119 invoke-static {p0}, Landroid/support/v4/graphics/TypefaceCompatUtil;->getTempFile(Landroid/content/Context;)Ljava/io/File; @@ -150,6 +164,7 @@ const/16 p0, 0x400 + .line 141 :try_start_1 new-array p0, p0, [B @@ -246,17 +261,15 @@ .line 152 invoke-static {v0}, Landroid/os/StrictMode;->setThreadPolicy(Landroid/os/StrictMode$ThreadPolicy;)V - goto :goto_4 - - :goto_3 throw p0 - :goto_4 - goto :goto_3 + return-void .end method .method public static getTempFile(Landroid/content/Context;)Ljava/io/File; .locals 5 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 63 new-instance v0, Ljava/lang/StringBuilder; @@ -342,7 +355,13 @@ .end method .method public static mmap(Landroid/content/Context;Landroid/os/CancellationSignal;Landroid/net/Uri;)Ljava/nio/ByteBuffer; - .locals 7 + .locals 8 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x13 + .end annotation .line 98 invoke-virtual {p0}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver; @@ -366,7 +385,7 @@ .line 108 invoke-virtual {p0}, Landroid/os/ParcelFileDescriptor;->close()V :try_end_0 - .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0 + .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_4 :cond_0 return-object v0 @@ -382,7 +401,8 @@ invoke-direct {p1, p2}, Ljava/io/FileInputStream;->(Ljava/io/FileDescriptor;)V :try_end_1 - .catchall {:try_start_1 .. :try_end_1} :catchall_3 + .catch Ljava/lang/Throwable; {:try_start_1 .. :try_end_1} :catch_2 + .catchall {:try_start_1 .. :try_end_1} :catchall_2 .line 104 :try_start_2 @@ -404,13 +424,15 @@ move-result-object p2 :try_end_2 + .catch Ljava/lang/Throwable; {:try_start_2 .. :try_end_2} :catch_0 .catchall {:try_start_2 .. :try_end_2} :catchall_0 .line 107 :try_start_3 invoke-virtual {p1}, Ljava/io/FileInputStream;->close()V :try_end_3 - .catchall {:try_start_3 .. :try_end_3} :catchall_3 + .catch Ljava/lang/Throwable; {:try_start_3 .. :try_end_3} :catch_2 + .catchall {:try_start_3 .. :try_end_3} :catchall_2 if-eqz p0, :cond_2 @@ -418,7 +440,7 @@ :try_start_4 invoke-virtual {p0}, Landroid/os/ParcelFileDescriptor;->close()V :try_end_4 - .catch Ljava/io/IOException; {:try_start_4 .. :try_end_4} :catch_0 + .catch Ljava/io/IOException; {:try_start_4 .. :try_end_4} :catch_4 :cond_2 return-object p2 @@ -426,6 +448,13 @@ :catchall_0 move-exception p2 + move-object v1, v0 + + goto :goto_0 + + :catch_0 + move-exception p2 + .line 103 :try_start_5 throw p2 @@ -435,107 +464,161 @@ :catchall_1 move-exception v1 + move-object v7, v1 + + move-object v1, p2 + + move-object p2, v7 + + :goto_0 + if-eqz v1, :cond_3 + .line 107 :try_start_6 invoke-virtual {p1}, Ljava/io/FileInputStream;->close()V :try_end_6 + .catch Ljava/lang/Throwable; {:try_start_6 .. :try_end_6} :catch_1 .catchall {:try_start_6 .. :try_end_6} :catchall_2 - goto :goto_0 + goto :goto_1 - :catchall_2 + :catch_1 move-exception p1 :try_start_7 - invoke-virtual {p2, p1}, Ljava/lang/Throwable;->addSuppressed(Ljava/lang/Throwable;)V + invoke-virtual {v1, p1}, Ljava/lang/Throwable;->addSuppressed(Ljava/lang/Throwable;)V - :goto_0 - throw v1 + goto :goto_1 + + :cond_3 + invoke-virtual {p1}, Ljava/io/FileInputStream;->close()V + + :goto_1 + throw p2 :try_end_7 - .catchall {:try_start_7 .. :try_end_7} :catchall_3 + .catch Ljava/lang/Throwable; {:try_start_7 .. :try_end_7} :catch_2 + .catchall {:try_start_7 .. :try_end_7} :catchall_2 - :catchall_3 + :catchall_2 + move-exception p1 + + move-object p2, v0 + + goto :goto_2 + + :catch_2 move-exception p1 .line 99 :try_start_8 throw p1 :try_end_8 - .catchall {:try_start_8 .. :try_end_8} :catchall_4 + .catchall {:try_start_8 .. :try_end_8} :catchall_3 - :catchall_4 + :catchall_3 move-exception p2 - if-eqz p0, :cond_3 + move-object v7, p2 + + move-object p2, p1 + + move-object p1, v7 + + :goto_2 + if-eqz p0, :cond_5 + + if-eqz p2, :cond_4 .line 108 :try_start_9 invoke-virtual {p0}, Landroid/os/ParcelFileDescriptor;->close()V :try_end_9 - .catchall {:try_start_9 .. :try_end_9} :catchall_5 + .catch Ljava/lang/Throwable; {:try_start_9 .. :try_end_9} :catch_3 + .catch Ljava/io/IOException; {:try_start_9 .. :try_end_9} :catch_4 - goto :goto_1 + goto :goto_3 - :catchall_5 + :catch_3 move-exception p0 :try_start_a - invoke-virtual {p1, p0}, Ljava/lang/Throwable;->addSuppressed(Ljava/lang/Throwable;)V + invoke-virtual {p2, p0}, Ljava/lang/Throwable;->addSuppressed(Ljava/lang/Throwable;)V - :cond_3 - :goto_1 - throw p2 + goto :goto_3 + + :cond_4 + invoke-virtual {p0}, Landroid/os/ParcelFileDescriptor;->close()V + + :cond_5 + :goto_3 + throw p1 :try_end_a - .catch Ljava/io/IOException; {:try_start_a .. :try_end_a} :catch_0 + .catch Ljava/io/IOException; {:try_start_a .. :try_end_a} :catch_4 - :catch_0 + :catch_4 return-object v0 .end method .method private static mmap(Ljava/io/File;)Ljava/nio/ByteBuffer; - .locals 7 + .locals 9 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x13 + .end annotation + + const/4 v0, 0x0 .line 83 :try_start_0 - new-instance v0, Ljava/io/FileInputStream; + new-instance v1, Ljava/io/FileInputStream; - invoke-direct {v0, p0}, Ljava/io/FileInputStream;->(Ljava/io/File;)V + invoke-direct {v1, p0}, Ljava/io/FileInputStream;->(Ljava/io/File;)V :try_end_0 - .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0 + .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_2 .line 84 :try_start_1 - invoke-virtual {v0}, Ljava/io/FileInputStream;->getChannel()Ljava/nio/channels/FileChannel; + invoke-virtual {v1}, Ljava/io/FileInputStream;->getChannel()Ljava/nio/channels/FileChannel; - move-result-object v1 + move-result-object v2 .line 85 - invoke-virtual {v1}, Ljava/nio/channels/FileChannel;->size()J + invoke-virtual {v2}, Ljava/nio/channels/FileChannel;->size()J - move-result-wide v5 + move-result-wide v6 .line 86 - sget-object v2, Ljava/nio/channels/FileChannel$MapMode;->READ_ONLY:Ljava/nio/channels/FileChannel$MapMode; + sget-object v3, Ljava/nio/channels/FileChannel$MapMode;->READ_ONLY:Ljava/nio/channels/FileChannel$MapMode; - const-wide/16 v3, 0x0 + const-wide/16 v4, 0x0 - invoke-virtual/range {v1 .. v6}, Ljava/nio/channels/FileChannel;->map(Ljava/nio/channels/FileChannel$MapMode;JJ)Ljava/nio/MappedByteBuffer; + invoke-virtual/range {v2 .. v7}, Ljava/nio/channels/FileChannel;->map(Ljava/nio/channels/FileChannel$MapMode;JJ)Ljava/nio/MappedByteBuffer; move-result-object p0 :try_end_1 + .catch Ljava/lang/Throwable; {:try_start_1 .. :try_end_1} :catch_0 .catchall {:try_start_1 .. :try_end_1} :catchall_0 .line 87 :try_start_2 - invoke-virtual {v0}, Ljava/io/FileInputStream;->close()V + invoke-virtual {v1}, Ljava/io/FileInputStream;->close()V :try_end_2 - .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_0 + .catch Ljava/io/IOException; {:try_start_2 .. :try_end_2} :catch_2 return-object p0 :catchall_0 move-exception p0 + move-object v2, v0 + + goto :goto_0 + + :catch_0 + move-exception p0 + .line 83 :try_start_3 throw p0 @@ -543,29 +626,42 @@ .catchall {:try_start_3 .. :try_end_3} :catchall_1 :catchall_1 - move-exception v1 + move-exception v2 + + move-object v8, v2 + + move-object v2, p0 + + move-object p0, v8 + + :goto_0 + if-eqz v2, :cond_0 .line 87 :try_start_4 - invoke-virtual {v0}, Ljava/io/FileInputStream;->close()V + invoke-virtual {v1}, Ljava/io/FileInputStream;->close()V :try_end_4 - .catchall {:try_start_4 .. :try_end_4} :catchall_2 + .catch Ljava/lang/Throwable; {:try_start_4 .. :try_end_4} :catch_1 + .catch Ljava/io/IOException; {:try_start_4 .. :try_end_4} :catch_2 - goto :goto_0 + goto :goto_1 - :catchall_2 - move-exception v0 + :catch_1 + move-exception v1 :try_start_5 - invoke-virtual {p0, v0}, Ljava/lang/Throwable;->addSuppressed(Ljava/lang/Throwable;)V + invoke-virtual {v2, v1}, Ljava/lang/Throwable;->addSuppressed(Ljava/lang/Throwable;)V - :goto_0 - throw v1 - :try_end_5 - .catch Ljava/io/IOException; {:try_start_5 .. :try_end_5} :catch_0 + goto :goto_1 - :catch_0 - const/4 p0, 0x0 + :cond_0 + invoke-virtual {v1}, Ljava/io/FileInputStream;->close()V - return-object p0 + :goto_1 + throw p0 + :try_end_5 + .catch Ljava/io/IOException; {:try_start_5 .. :try_end_5} :catch_2 + + :catch_2 + return-object v0 .end method diff --git a/smali/android/support/v4/graphics/drawable/DrawableCompat.smali b/smali/android/support/v4/graphics/drawable/DrawableCompat.smali index f250f308..357b4be6 100644 --- a/smali/android/support/v4/graphics/drawable/DrawableCompat.smali +++ b/smali/android/support/v4/graphics/drawable/DrawableCompat.smali @@ -27,6 +27,14 @@ .method public static applyTheme(Landroid/graphics/drawable/Drawable;Landroid/content/res/Resources$Theme;)V .locals 2 + .param p0 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 188 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -44,6 +52,10 @@ .method public static canApplyTheme(Landroid/graphics/drawable/Drawable;)Z .locals 2 + .param p0 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 197 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -67,6 +79,10 @@ .method public static clearColorFilter(Landroid/graphics/drawable/Drawable;)V .locals 3 + .param p0 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 221 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -178,6 +194,10 @@ .method public static getAlpha(Landroid/graphics/drawable/Drawable;)I .locals 2 + .param p0 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 177 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -201,6 +221,10 @@ .method public static getColorFilter(Landroid/graphics/drawable/Drawable;)Landroid/graphics/ColorFilter; .locals 2 + .param p0 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 210 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -224,6 +248,10 @@ .method public static getLayoutDirection(Landroid/graphics/drawable/Drawable;)I .locals 6 + .param p0 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 391 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -274,6 +302,8 @@ sput-object v3, Landroid/support/v4/graphics/drawable/DrawableCompat;->sGetLayoutDirectionMethod:Ljava/lang/reflect/Method; .line 398 + sget-object v3, Landroid/support/v4/graphics/drawable/DrawableCompat;->sGetLayoutDirectionMethod:Ljava/lang/reflect/Method; + invoke-virtual {v3, v0}, Ljava/lang/reflect/Method;->setAccessible(Z)V :try_end_0 .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0 @@ -298,10 +328,10 @@ if-eqz v0, :cond_2 + .line 407 :try_start_1 new-array v3, v2, [Ljava/lang/Object; - .line 407 invoke-virtual {v0, p0, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; move-result-object p0 @@ -335,6 +365,26 @@ .method public static inflate(Landroid/graphics/drawable/Drawable;Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/content/res/Resources$Theme;)V .locals 2 + .param p0 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Lorg/xmlpull/v1/XmlPullParser; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Lorg/xmlpull/v1/XmlPullParserException;, @@ -364,6 +414,10 @@ .method public static isAutoMirrored(Landroid/graphics/drawable/Drawable;)Z .locals 2 + .param p0 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 95 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -387,6 +441,10 @@ .method public static jumpToCurrentState(Landroid/graphics/drawable/Drawable;)V .locals 0 + .param p0 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation runtime Ljava/lang/Deprecated; .end annotation @@ -398,6 +456,10 @@ .method public static setAutoMirrored(Landroid/graphics/drawable/Drawable;Z)V .locals 2 + .param p0 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 78 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -415,6 +477,10 @@ .method public static setHotspot(Landroid/graphics/drawable/Drawable;FF)V .locals 2 + .param p0 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 110 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -432,6 +498,10 @@ .method public static setHotspotBounds(Landroid/graphics/drawable/Drawable;IIII)V .locals 2 + .param p0 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 123 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -449,6 +519,10 @@ .method public static setLayoutDirection(Landroid/graphics/drawable/Drawable;I)Z .locals 7 + .param p0 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 354 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -503,6 +577,8 @@ sput-object v0, Landroid/support/v4/graphics/drawable/DrawableCompat;->sSetLayoutDirectionMethod:Ljava/lang/reflect/Method; .line 361 + sget-object v0, Landroid/support/v4/graphics/drawable/DrawableCompat;->sSetLayoutDirectionMethod:Ljava/lang/reflect/Method; + invoke-virtual {v0, v3}, Ljava/lang/reflect/Method;->setAccessible(Z)V :try_end_0 .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0 @@ -527,10 +603,10 @@ if-eqz v0, :cond_2 + .line 370 :try_start_1 new-array v4, v3, [Ljava/lang/Object; - .line 370 invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; move-result-object p1 @@ -562,6 +638,14 @@ .method public static setTint(Landroid/graphics/drawable/Drawable;I)V .locals 2 + .param p0 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param .line 135 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -593,6 +677,14 @@ .method public static setTintList(Landroid/graphics/drawable/Drawable;Landroid/content/res/ColorStateList;)V .locals 2 + .param p0 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 149 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -624,6 +716,14 @@ .method public static setTintMode(Landroid/graphics/drawable/Drawable;Landroid/graphics/PorterDuff$Mode;)V .locals 2 + .param p0 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/graphics/PorterDuff$Mode; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 163 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -655,6 +755,10 @@ .method public static unwrap(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; .locals 1 + .param p0 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "SDK_INT:I diff --git a/smali/android/support/v4/graphics/drawable/IconCompat$IconType.smali b/smali/android/support/v4/graphics/drawable/IconCompat$IconType.smali index aefec477..b83f5653 100644 --- a/smali/android/support/v4/graphics/drawable/IconCompat$IconType.smali +++ b/smali/android/support/v4/graphics/drawable/IconCompat$IconType.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/graphics/drawable/IconCompat; .end annotation diff --git a/smali/android/support/v4/graphics/drawable/IconCompat.smali b/smali/android/support/v4/graphics/drawable/IconCompat.smali index efba5fc6..354cd819 100644 --- a/smali/android/support/v4/graphics/drawable/IconCompat.smali +++ b/smali/android/support/v4/graphics/drawable/IconCompat.smali @@ -47,22 +47,64 @@ # instance fields .field public mData:[B + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field .field public mInt1:I + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field .field public mInt2:I + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field .field mObj1:Ljava/lang/Object; .field public mParcelable:Landroid/os/Parcelable; + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field .field public mTintList:Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field .field mTintMode:Landroid/graphics/PorterDuff$Mode; .field public mTintModeStr:Ljava/lang/String; + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field .field public mType:I + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field # direct methods @@ -79,6 +121,11 @@ .method public constructor ()V .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 307 invoke-direct {p0}, Landroidx/versionedparcelable/CustomVersionedParcelable;->()V @@ -120,6 +167,12 @@ .method public static createFromBundle(Landroid/os/Bundle;)Landroid/support/v4/graphics/drawable/IconCompat; .locals 4 + .param p0 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation const-string v0, "type" @@ -275,6 +328,20 @@ .method public static createFromIcon(Landroid/content/Context;Landroid/graphics/drawable/Icon;)Landroid/support/v4/graphics/drawable/IconCompat; .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/graphics/drawable/Icon; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x17 + .end annotation .line 840 invoke-static {p1}, Landroid/support/v4/util/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object; @@ -355,6 +422,22 @@ .method public static createFromIcon(Landroid/graphics/drawable/Icon;)Landroid/support/v4/graphics/drawable/IconCompat; .locals 2 + .param p0 # Landroid/graphics/drawable/Icon; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x17 + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 866 invoke-static {p0}, Landroid/support/v4/util/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object; @@ -417,6 +500,8 @@ .method static createLegacyIconFromAdaptiveIcon(Landroid/graphics/Bitmap;Z)Landroid/graphics/Bitmap; .locals 9 + .annotation build Landroid/support/annotation/VisibleForTesting; + .end annotation .line 999 invoke-virtual {p0}, Landroid/graphics/Bitmap;->getWidth()I @@ -719,6 +804,10 @@ .method public static createWithResource(Landroid/content/Context;I)Landroid/support/v4/graphics/drawable/IconCompat; .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param if-eqz p0, :cond_0 @@ -750,6 +839,15 @@ .method public static createWithResource(Landroid/content/res/Resources;Ljava/lang/String;I)Landroid/support/v4/graphics/drawable/IconCompat; .locals 2 + .param p2 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation if-eqz p1, :cond_2 @@ -819,6 +917,19 @@ .method private static getResId(Landroid/graphics/drawable/Icon;)I .locals 6 + .param p0 # Landroid/graphics/drawable/Icon; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + + .annotation build Landroid/support/annotation/IdRes; + .end annotation + + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x17 + .end annotation const-string v0, "Unable to get icon resource" @@ -900,6 +1011,16 @@ .method private static getResPackage(Landroid/graphics/drawable/Icon;)Ljava/lang/String; .locals 7 + .param p0 # Landroid/graphics/drawable/Icon; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x17 + .end annotation const-string v0, "Unable to get icon package" @@ -1031,6 +1152,7 @@ const/4 v0, 0x1 + .line 575 new-array v0, v0, [Ljava/lang/Object; const/4 v2, 0x0 @@ -1039,7 +1161,6 @@ const-string p1, "Unable to find pkg=%s for icon" - .line 575 invoke-static {p1, v0}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String; move-result-object p1 @@ -1053,6 +1174,13 @@ .method private static getType(Landroid/graphics/drawable/Icon;)I .locals 7 + .param p0 # Landroid/graphics/drawable/Icon; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x17 + .end annotation const-string v0, "Unable to get icon type " @@ -1172,6 +1300,16 @@ .method private static getUri(Landroid/graphics/drawable/Icon;)Landroid/net/Uri; .locals 7 + .param p0 # Landroid/graphics/drawable/Icon; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x17 + .end annotation const-string v0, "Unable to get icon uri" @@ -1356,6 +1494,8 @@ :try_end_0 .catch Ljava/io/FileNotFoundException; {:try_start_0 .. :try_end_0} :catch_0 + move-object v0, v1 + goto :goto_2 :catch_0 @@ -1390,7 +1530,7 @@ invoke-virtual {v1, v0}, Landroid/content/ContentResolver;->openInputStream(Landroid/net/Uri;)Ljava/io/InputStream; - move-result-object v1 + move-result-object v0 :try_end_1 .catch Ljava/lang/Exception; {:try_start_1 .. :try_end_1} :catch_1 @@ -1417,26 +1557,26 @@ invoke-static {v5, v0, v1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I :goto_1 - move-object v1, v3 + move-object v0, v3 :goto_2 - if-eqz v1, :cond_7 + if-eqz v0, :cond_7 .line 553 - new-instance v0, Landroid/graphics/drawable/BitmapDrawable; + new-instance v1, Landroid/graphics/drawable/BitmapDrawable; invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources; move-result-object p1 .line 554 - invoke-static {v1}, Landroid/graphics/BitmapFactory;->decodeStream(Ljava/io/InputStream;)Landroid/graphics/Bitmap; + invoke-static {v0}, Landroid/graphics/BitmapFactory;->decodeStream(Ljava/io/InputStream;)Landroid/graphics/Bitmap; - move-result-object v1 + move-result-object v0 - invoke-direct {v0, p1, v1}, Landroid/graphics/drawable/BitmapDrawable;->(Landroid/content/res/Resources;Landroid/graphics/Bitmap;)V + invoke-direct {v1, p1, v0}, Landroid/graphics/drawable/BitmapDrawable;->(Landroid/content/res/Resources;Landroid/graphics/Bitmap;)V - return-object v0 + return-object v1 .line 531 :cond_4 @@ -1508,9 +1648,9 @@ :catch_2 move-exception p1 + .line 524 new-array v0, v4, [Ljava/lang/Object; - .line 524 iget v4, p0, Landroid/support/v4/graphics/drawable/IconCompat;->mInt1:I .line 525 @@ -1611,6 +1751,23 @@ # virtual methods .method public addToShortcutIntent(Landroid/content/Intent;Landroid/graphics/drawable/Drawable;Landroid/content/Context;)V .locals 4 + .param p1 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 590 invoke-virtual {p0, p3}, Landroid/support/v4/graphics/drawable/IconCompat;->checkResource(Landroid/content/Context;)V @@ -1852,6 +2009,11 @@ .method public checkResource(Landroid/content/Context;)V .locals 8 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 461 iget v0, p0, Landroid/support/v4/graphics/drawable/IconCompat;->mType:I @@ -1960,6 +2122,8 @@ .method public getResId()I .locals 3 + .annotation build Landroid/support/annotation/IdRes; + .end annotation .line 356 iget v0, p0, Landroid/support/v4/graphics/drawable/IconCompat;->mType:I @@ -2023,6 +2187,8 @@ .method public getResPackage()Ljava/lang/String; .locals 3 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 338 iget v0, p0, Landroid/support/v4/graphics/drawable/IconCompat;->mType:I @@ -2132,6 +2298,8 @@ .method public getUri()Landroid/net/Uri; .locals 2 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 374 iget v0, p0, Landroid/support/v4/graphics/drawable/IconCompat;->mType:I @@ -2511,6 +2679,10 @@ .method public setTint(I)Landroid/support/v4/graphics/drawable/IconCompat; .locals 0 + .param p1 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param .line 387 invoke-static {p1}, Landroid/content/res/ColorStateList;->valueOf(I)Landroid/content/res/ColorStateList; @@ -2687,6 +2859,9 @@ .method public toIcon()Landroid/graphics/drawable/Icon; .locals 3 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x17 + .end annotation .line 420 iget v0, p0, Landroid/support/v4/graphics/drawable/IconCompat;->mType:I diff --git a/smali/android/support/v4/graphics/drawable/IconCompatParcelizer.smali b/smali/android/support/v4/graphics/drawable/IconCompatParcelizer.smali index fce31c8f..37762df5 100644 --- a/smali/android/support/v4/graphics/drawable/IconCompatParcelizer.smali +++ b/smali/android/support/v4/graphics/drawable/IconCompatParcelizer.smali @@ -3,6 +3,14 @@ .source "IconCompatParcelizer.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # direct methods .method public constructor ()V .locals 0 diff --git a/smali/android/support/v4/graphics/drawable/RoundedBitmapDrawable.smali b/smali/android/support/v4/graphics/drawable/RoundedBitmapDrawable.smali index ac2f7584..6836b197 100644 --- a/smali/android/support/v4/graphics/drawable/RoundedBitmapDrawable.smali +++ b/smali/android/support/v4/graphics/drawable/RoundedBitmapDrawable.smali @@ -102,7 +102,10 @@ :cond_0 iput-object p2, p0, Landroid/support/v4/graphics/drawable/RoundedBitmapDrawable;->mBitmap:Landroid/graphics/Bitmap; - if-eqz p2, :cond_1 + .line 388 + iget-object p1, p0, Landroid/support/v4/graphics/drawable/RoundedBitmapDrawable;->mBitmap:Landroid/graphics/Bitmap; + + if-eqz p1, :cond_1 .line 389 invoke-direct {p0}, Landroid/support/v4/graphics/drawable/RoundedBitmapDrawable;->computeBitmapSize()V @@ -110,6 +113,8 @@ .line 390 new-instance p1, Landroid/graphics/BitmapShader; + iget-object p2, p0, Landroid/support/v4/graphics/drawable/RoundedBitmapDrawable;->mBitmap:Landroid/graphics/Bitmap; + sget-object v0, Landroid/graphics/Shader$TileMode;->CLAMP:Landroid/graphics/Shader$TileMode; sget-object v1, Landroid/graphics/Shader$TileMode;->CLAMP:Landroid/graphics/Shader$TileMode; @@ -211,6 +216,10 @@ # virtual methods .method public draw(Landroid/graphics/Canvas;)V .locals 4 + .param p1 # Landroid/graphics/Canvas; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 260 iget-object v0, p0, Landroid/support/v4/graphics/drawable/RoundedBitmapDrawable;->mBitmap:Landroid/graphics/Bitmap; @@ -272,6 +281,8 @@ .method public final getBitmap()Landroid/graphics/Bitmap; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 80 iget-object v0, p0, Landroid/support/v4/graphics/drawable/RoundedBitmapDrawable;->mBitmap:Landroid/graphics/Bitmap; @@ -391,6 +402,8 @@ .method public final getPaint()Landroid/graphics/Paint; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 72 iget-object v0, p0, Landroid/support/v4/graphics/drawable/RoundedBitmapDrawable;->mPaint:Landroid/graphics/Paint; @@ -703,6 +716,10 @@ .method public setTargetDensity(Landroid/graphics/Canvas;)V .locals 0 + .param p1 # Landroid/graphics/Canvas; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 99 invoke-virtual {p1}, Landroid/graphics/Canvas;->getDensity()I @@ -716,6 +733,10 @@ .method public setTargetDensity(Landroid/util/DisplayMetrics;)V .locals 0 + .param p1 # Landroid/util/DisplayMetrics; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 111 iget p1, p1, Landroid/util/DisplayMetrics;->densityDpi:I diff --git a/smali/android/support/v4/graphics/drawable/RoundedBitmapDrawable21.smali b/smali/android/support/v4/graphics/drawable/RoundedBitmapDrawable21.smali index 44542b87..3ac5d019 100644 --- a/smali/android/support/v4/graphics/drawable/RoundedBitmapDrawable21.smali +++ b/smali/android/support/v4/graphics/drawable/RoundedBitmapDrawable21.smali @@ -3,6 +3,12 @@ .source "RoundedBitmapDrawable21.java" +# annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0x15 +.end annotation + + # direct methods .method protected constructor (Landroid/content/res/Resources;Landroid/graphics/Bitmap;)V .locals 0 diff --git a/smali/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.smali b/smali/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.smali index 964d5918..1237c8f6 100644 --- a/smali/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.smali +++ b/smali/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.smali @@ -27,6 +27,16 @@ .method public static create(Landroid/content/res/Resources;Landroid/graphics/Bitmap;)Landroid/support/v4/graphics/drawable/RoundedBitmapDrawable; .locals 2 + .param p0 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/graphics/Bitmap; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 73 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -53,6 +63,16 @@ .method public static create(Landroid/content/res/Resources;Ljava/io/InputStream;)Landroid/support/v4/graphics/drawable/RoundedBitmapDrawable; .locals 2 + .param p0 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/io/InputStream; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 97 invoke-static {p1}, Landroid/graphics/BitmapFactory;->decodeStream(Ljava/io/InputStream;)Landroid/graphics/Bitmap; @@ -95,6 +115,16 @@ .method public static create(Landroid/content/res/Resources;Ljava/lang/String;)Landroid/support/v4/graphics/drawable/RoundedBitmapDrawable; .locals 2 + .param p0 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 84 invoke-static {p1}, Landroid/graphics/BitmapFactory;->decodeFile(Ljava/lang/String;)Landroid/graphics/Bitmap; diff --git a/smali/android/support/v4/graphics/drawable/TintAwareDrawable.smali b/smali/android/support/v4/graphics/drawable/TintAwareDrawable.smali index 166a5179..2315e40a 100644 --- a/smali/android/support/v4/graphics/drawable/TintAwareDrawable.smali +++ b/smali/android/support/v4/graphics/drawable/TintAwareDrawable.smali @@ -3,8 +3,20 @@ .source "TintAwareDrawable.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # virtual methods .method public abstract setTint(I)V + .param p1 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param .end method .method public abstract setTintList(Landroid/content/res/ColorStateList;)V diff --git a/smali/android/support/v4/graphics/drawable/WrappedDrawable.smali b/smali/android/support/v4/graphics/drawable/WrappedDrawable.smali index ff573f29..20304fa8 100644 --- a/smali/android/support/v4/graphics/drawable/WrappedDrawable.smali +++ b/smali/android/support/v4/graphics/drawable/WrappedDrawable.smali @@ -3,6 +3,14 @@ .source "WrappedDrawable.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # virtual methods .method public abstract getWrappedDrawable()Landroid/graphics/drawable/Drawable; .end method diff --git a/smali/android/support/v4/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState.smali b/smali/android/support/v4/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState.smali index 7a2ba6f8..03ff0ed4 100644 --- a/smali/android/support/v4/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState.smali +++ b/smali/android/support/v4/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState.smali @@ -27,6 +27,14 @@ # direct methods .method constructor (Landroid/support/v4/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState;Landroid/content/res/Resources;)V .locals 0 + .param p1 # Landroid/support/v4/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p2 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 363 invoke-direct {p0}, Landroid/graphics/drawable/Drawable$ConstantState;->()V @@ -116,6 +124,8 @@ .method public newDrawable()Landroid/graphics/drawable/Drawable; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation const/4 v0, 0x0 @@ -128,4 +138,10 @@ .end method .method public abstract newDrawable(Landroid/content/res/Resources;)Landroid/graphics/drawable/Drawable; + .param p1 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method diff --git a/smali/android/support/v4/graphics/drawable/WrappedDrawableApi14$DrawableWrapperStateBase.smali b/smali/android/support/v4/graphics/drawable/WrappedDrawableApi14$DrawableWrapperStateBase.smali index 3754c723..5574fa69 100644 --- a/smali/android/support/v4/graphics/drawable/WrappedDrawableApi14$DrawableWrapperStateBase.smali +++ b/smali/android/support/v4/graphics/drawable/WrappedDrawableApi14$DrawableWrapperStateBase.smali @@ -17,6 +17,14 @@ # direct methods .method constructor (Landroid/support/v4/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState;Landroid/content/res/Resources;)V .locals 0 + .param p1 # Landroid/support/v4/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p2 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 396 invoke-direct {p0, p1, p2}, Landroid/support/v4/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState;->(Landroid/support/v4/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState;Landroid/content/res/Resources;)V @@ -28,6 +36,12 @@ # virtual methods .method public newDrawable(Landroid/content/res/Resources;)Landroid/graphics/drawable/Drawable; .locals 1 + .param p1 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 402 new-instance v0, Landroid/support/v4/graphics/drawable/WrappedDrawableApi14; diff --git a/smali/android/support/v4/graphics/drawable/WrappedDrawableApi14.smali b/smali/android/support/v4/graphics/drawable/WrappedDrawableApi14.smali index 942560c1..a1bbc6a6 100644 --- a/smali/android/support/v4/graphics/drawable/WrappedDrawableApi14.smali +++ b/smali/android/support/v4/graphics/drawable/WrappedDrawableApi14.smali @@ -49,6 +49,10 @@ .method constructor (Landroid/graphics/drawable/Drawable;)V .locals 1 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 62 invoke-direct {p0}, Landroid/graphics/drawable/Drawable;->()V @@ -68,6 +72,14 @@ .method constructor (Landroid/support/v4/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState;Landroid/content/res/Resources;)V .locals 0 + .param p1 # Landroid/support/v4/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 52 invoke-direct {p0}, Landroid/graphics/drawable/Drawable;->()V @@ -83,6 +95,10 @@ .method private updateLocalState(Landroid/content/res/Resources;)V .locals 1 + .param p1 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 74 iget-object v0, p0, Landroid/support/v4/graphics/drawable/WrappedDrawableApi14;->mState:Landroid/support/v4/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState; @@ -191,6 +207,10 @@ # virtual methods .method public draw(Landroid/graphics/Canvas;)V .locals 1 + .param p1 # Landroid/graphics/Canvas; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 86 iget-object v0, p0, Landroid/support/v4/graphics/drawable/WrappedDrawableApi14;->mDrawable:Landroid/graphics/drawable/Drawable; @@ -239,6 +259,8 @@ .method public getConstantState()Landroid/graphics/drawable/Drawable$ConstantState; .locals 2 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 210 iget-object v0, p0, Landroid/support/v4/graphics/drawable/WrappedDrawableApi14;->mState:Landroid/support/v4/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState; @@ -273,6 +295,8 @@ .method public getCurrent()Landroid/graphics/drawable/Drawable; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 152 iget-object v0, p0, Landroid/support/v4/graphics/drawable/WrappedDrawableApi14;->mDrawable:Landroid/graphics/drawable/Drawable; @@ -351,6 +375,10 @@ .method public getPadding(Landroid/graphics/Rect;)Z .locals 1 + .param p1 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 192 iget-object v0, p0, Landroid/support/v4/graphics/drawable/WrappedDrawableApi14;->mDrawable:Landroid/graphics/drawable/Drawable; @@ -364,6 +392,8 @@ .method public getState()[I .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 146 iget-object v0, p0, Landroid/support/v4/graphics/drawable/WrappedDrawableApi14;->mDrawable:Landroid/graphics/drawable/Drawable; @@ -399,6 +429,10 @@ .method public invalidateDrawable(Landroid/graphics/drawable/Drawable;)V .locals 0 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 251 invoke-virtual {p0}, Landroid/support/v4/graphics/drawable/WrappedDrawableApi14;->invalidateSelf()V @@ -408,6 +442,9 @@ .method public isAutoMirrored()Z .locals 1 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x13 + .end annotation .line 204 iget-object v0, p0, Landroid/support/v4/graphics/drawable/WrappedDrawableApi14;->mDrawable:Landroid/graphics/drawable/Drawable; @@ -492,6 +529,8 @@ .method public mutate()Landroid/graphics/drawable/Drawable; .locals 2 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 220 iget-boolean v0, p0, Landroid/support/v4/graphics/drawable/WrappedDrawableApi14;->mMutated:Z @@ -554,6 +593,8 @@ .method mutateConstantState()Landroid/support/v4/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState; .locals 3 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 243 new-instance v0, Landroid/support/v4/graphics/drawable/WrappedDrawableApi14$DrawableWrapperStateBase; @@ -597,6 +638,14 @@ .method public scheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;J)V .locals 0 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/Runnable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 259 invoke-virtual {p0, p2, p3, p4}, Landroid/support/v4/graphics/drawable/WrappedDrawableApi14;->scheduleSelf(Ljava/lang/Runnable;J)V @@ -617,6 +666,9 @@ .method public setAutoMirrored(Z)V .locals 1 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x13 + .end annotation .line 198 iget-object v0, p0, Landroid/support/v4/graphics/drawable/WrappedDrawableApi14;->mDrawable:Landroid/graphics/drawable/Drawable; @@ -672,6 +724,10 @@ .method public setState([I)Z .locals 1 + .param p1 # [I + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 138 iget-object v0, p0, Landroid/support/v4/graphics/drawable/WrappedDrawableApi14;->mDrawable:Landroid/graphics/drawable/Drawable; @@ -737,6 +793,10 @@ .method public setTintMode(Landroid/graphics/PorterDuff$Mode;)V .locals 1 + .param p1 # Landroid/graphics/PorterDuff$Mode; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 288 iget-object v0, p0, Landroid/support/v4/graphics/drawable/WrappedDrawableApi14;->mState:Landroid/support/v4/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState; @@ -859,6 +919,14 @@ .method public unscheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;)V .locals 0 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/Runnable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 267 invoke-virtual {p0, p2}, Landroid/support/v4/graphics/drawable/WrappedDrawableApi14;->unscheduleSelf(Ljava/lang/Runnable;)V diff --git a/smali/android/support/v4/graphics/drawable/WrappedDrawableApi21$DrawableWrapperStateLollipop.smali b/smali/android/support/v4/graphics/drawable/WrappedDrawableApi21$DrawableWrapperStateLollipop.smali index fca4cfe6..a4e989fa 100644 --- a/smali/android/support/v4/graphics/drawable/WrappedDrawableApi21$DrawableWrapperStateLollipop.smali +++ b/smali/android/support/v4/graphics/drawable/WrappedDrawableApi21$DrawableWrapperStateLollipop.smali @@ -17,6 +17,14 @@ # direct methods .method constructor (Landroid/support/v4/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState;Landroid/content/res/Resources;)V .locals 0 + .param p1 # Landroid/support/v4/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p2 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 149 invoke-direct {p0, p1, p2}, Landroid/support/v4/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState;->(Landroid/support/v4/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState;Landroid/content/res/Resources;)V @@ -28,6 +36,12 @@ # virtual methods .method public newDrawable(Landroid/content/res/Resources;)Landroid/graphics/drawable/Drawable; .locals 1 + .param p1 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 155 new-instance v0, Landroid/support/v4/graphics/drawable/WrappedDrawableApi21; diff --git a/smali/android/support/v4/graphics/drawable/WrappedDrawableApi21.smali b/smali/android/support/v4/graphics/drawable/WrappedDrawableApi21.smali index 354f8051..c3b96dab 100644 --- a/smali/android/support/v4/graphics/drawable/WrappedDrawableApi21.smali +++ b/smali/android/support/v4/graphics/drawable/WrappedDrawableApi21.smali @@ -4,6 +4,10 @@ # annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0x15 +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v4/graphics/drawable/WrappedDrawableApi21$DrawableWrapperStateLollipop; @@ -89,6 +93,8 @@ # virtual methods .method public getDirtyBounds()Landroid/graphics/Rect; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 71 iget-object v0, p0, Landroid/support/v4/graphics/drawable/WrappedDrawableApi21;->mDrawable:Landroid/graphics/drawable/Drawable; @@ -102,6 +108,10 @@ .method public getOutline(Landroid/graphics/Outline;)V .locals 1 + .param p1 # Landroid/graphics/Outline; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 65 iget-object v0, p0, Landroid/support/v4/graphics/drawable/WrappedDrawableApi21;->mDrawable:Landroid/graphics/drawable/Drawable; @@ -200,6 +210,8 @@ .method mutateConstantState()Landroid/support/v4/graphics/drawable/WrappedDrawableApi14$DrawableWrapperState; .locals 3 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 143 new-instance v0, Landroid/support/v4/graphics/drawable/WrappedDrawableApi21$DrawableWrapperStateLollipop; @@ -237,6 +249,10 @@ .method public setState([I)Z .locals 0 + .param p1 # [I + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 103 invoke-super {p0, p1}, Landroid/support/v4/graphics/drawable/WrappedDrawableApi14;->setState([I)Z diff --git a/smali/android/support/v4/hardware/display/DisplayManagerCompat.smali b/smali/android/support/v4/hardware/display/DisplayManagerCompat.smali index d8c77371..c2a875a4 100644 --- a/smali/android/support/v4/hardware/display/DisplayManagerCompat.smali +++ b/smali/android/support/v4/hardware/display/DisplayManagerCompat.smali @@ -49,7 +49,13 @@ .end method .method public static getInstance(Landroid/content/Context;)Landroid/support/v4/hardware/display/DisplayManagerCompat; - .locals 2 + .locals 3 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 62 sget-object v0, Landroid/support/v4/hardware/display/DisplayManagerCompat;->sInstances:Ljava/util/WeakHashMap; @@ -58,7 +64,9 @@ .line 63 :try_start_0 - invoke-virtual {v0, p0}, Ljava/util/WeakHashMap;->get(Ljava/lang/Object;)Ljava/lang/Object; + sget-object v1, Landroid/support/v4/hardware/display/DisplayManagerCompat;->sInstances:Ljava/util/WeakHashMap; + + invoke-virtual {v1, p0}, Ljava/util/WeakHashMap;->get(Ljava/lang/Object;)Ljava/lang/Object; move-result-object v1 @@ -72,7 +80,9 @@ invoke-direct {v1, p0}, Landroid/support/v4/hardware/display/DisplayManagerCompat;->(Landroid/content/Context;)V .line 66 - invoke-virtual {v0, p0, v1}, Ljava/util/WeakHashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + sget-object v2, Landroid/support/v4/hardware/display/DisplayManagerCompat;->sInstances:Ljava/util/WeakHashMap; + + invoke-virtual {v2, p0, v1}, Ljava/util/WeakHashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 68 :cond_0 @@ -95,6 +105,8 @@ # virtual methods .method public getDisplay(I)Landroid/view/Display; .locals 2 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 83 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -155,6 +167,8 @@ .method public getDisplays()[Landroid/view/Display; .locals 3 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 103 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -200,6 +214,7 @@ const/4 v1, 0x1 + .line 110 new-array v1, v1, [Landroid/view/Display; const/4 v2, 0x0 @@ -211,6 +226,12 @@ .method public getDisplays(Ljava/lang/String;)[Landroid/view/Display; .locals 2 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 131 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -242,6 +263,7 @@ if-nez p1, :cond_1 + .line 136 new-array p1, v0, [Landroid/view/Display; return-object p1 @@ -265,6 +287,7 @@ const/4 v1, 0x1 + .line 141 new-array v1, v1, [Landroid/view/Display; aput-object p1, v1, v0 diff --git a/smali/android/support/v4/hardware/fingerprint/FingerprintManagerCompat$CryptoObject.smali b/smali/android/support/v4/hardware/fingerprint/FingerprintManagerCompat$CryptoObject.smali index 68ddc6d7..bc25ee2f 100644 --- a/smali/android/support/v4/hardware/fingerprint/FingerprintManagerCompat$CryptoObject.smali +++ b/smali/android/support/v4/hardware/fingerprint/FingerprintManagerCompat$CryptoObject.smali @@ -25,6 +25,10 @@ # direct methods .method public constructor (Ljava/security/Signature;)V .locals 0 + .param p1 # Ljava/security/Signature; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 197 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -45,6 +49,10 @@ .method public constructor (Ljavax/crypto/Cipher;)V .locals 0 + .param p1 # Ljavax/crypto/Cipher; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 204 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -65,6 +73,10 @@ .method public constructor (Ljavax/crypto/Mac;)V .locals 0 + .param p1 # Ljavax/crypto/Mac; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 210 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -87,6 +99,8 @@ # virtual methods .method public getCipher()Ljavax/crypto/Cipher; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 228 iget-object v0, p0, Landroid/support/v4/hardware/fingerprint/FingerprintManagerCompat$CryptoObject;->mCipher:Ljavax/crypto/Cipher; @@ -96,6 +110,8 @@ .method public getMac()Ljavax/crypto/Mac; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 235 iget-object v0, p0, Landroid/support/v4/hardware/fingerprint/FingerprintManagerCompat$CryptoObject;->mMac:Ljavax/crypto/Mac; @@ -105,6 +121,8 @@ .method public getSignature()Ljava/security/Signature; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 221 iget-object v0, p0, Landroid/support/v4/hardware/fingerprint/FingerprintManagerCompat$CryptoObject;->mSignature:Ljava/security/Signature; diff --git a/smali/android/support/v4/hardware/fingerprint/FingerprintManagerCompat.smali b/smali/android/support/v4/hardware/fingerprint/FingerprintManagerCompat.smali index ddbb08e7..19571d64 100644 --- a/smali/android/support/v4/hardware/fingerprint/FingerprintManagerCompat.smali +++ b/smali/android/support/v4/hardware/fingerprint/FingerprintManagerCompat.smali @@ -32,6 +32,12 @@ .method public static from(Landroid/content/Context;)Landroid/support/v4/hardware/fingerprint/FingerprintManagerCompat; .locals 1 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 49 new-instance v0, Landroid/support/v4/hardware/fingerprint/FingerprintManagerCompat; @@ -43,6 +49,16 @@ .method private static getFingerprintManagerOrNull(Landroid/content/Context;)Landroid/hardware/fingerprint/FingerprintManager; .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x17 + .end annotation .line 123 invoke-virtual {p0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager; @@ -76,6 +92,9 @@ .method static unwrapCryptoObject(Landroid/hardware/fingerprint/FingerprintManager$CryptoObject;)Landroid/support/v4/hardware/fingerprint/FingerprintManagerCompat$CryptoObject; .locals 2 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x17 + .end annotation const/4 v0, 0x0 @@ -144,6 +163,9 @@ .method private static wrapCallback(Landroid/support/v4/hardware/fingerprint/FingerprintManagerCompat$AuthenticationCallback;)Landroid/hardware/fingerprint/FingerprintManager$AuthenticationCallback; .locals 1 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x17 + .end annotation .line 163 new-instance v0, Landroid/support/v4/hardware/fingerprint/FingerprintManagerCompat$1; @@ -155,6 +177,9 @@ .method private static wrapCryptoObject(Landroid/support/v4/hardware/fingerprint/FingerprintManagerCompat$CryptoObject;)Landroid/hardware/fingerprint/FingerprintManager$CryptoObject; .locals 2 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x17 + .end annotation const/4 v0, 0x0 @@ -225,6 +250,25 @@ # virtual methods .method public authenticate(Landroid/support/v4/hardware/fingerprint/FingerprintManagerCompat$CryptoObject;ILandroid/support/v4/os/CancellationSignal;Landroid/support/v4/hardware/fingerprint/FingerprintManagerCompat$AuthenticationCallback;Landroid/os/Handler;)V .locals 7 + .param p1 # Landroid/support/v4/hardware/fingerprint/FingerprintManagerCompat$CryptoObject; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # Landroid/support/v4/os/CancellationSignal; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p4 # Landroid/support/v4/hardware/fingerprint/FingerprintManagerCompat$AuthenticationCallback; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p5 # Landroid/os/Handler; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RequiresPermission; + value = "android.permission.USE_FINGERPRINT" + .end annotation .line 104 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -282,6 +326,9 @@ .method public hasEnrolledFingerprints()Z .locals 3 + .annotation build Landroid/support/annotation/RequiresPermission; + value = "android.permission.USE_FINGERPRINT" + .end annotation .line 63 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -316,6 +363,9 @@ .method public isHardwareDetected()Z .locals 3 + .annotation build Landroid/support/annotation/RequiresPermission; + value = "android.permission.USE_FINGERPRINT" + .end annotation .line 78 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/internal/view/SupportMenu.smali b/smali/android/support/v4/internal/view/SupportMenu.smali index 2867d7bb..978bd8f5 100644 --- a/smali/android/support/v4/internal/view/SupportMenu.smali +++ b/smali/android/support/v4/internal/view/SupportMenu.smali @@ -6,6 +6,14 @@ .implements Landroid/view/Menu; +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field public static final CATEGORY_MASK:I = -0x10000 diff --git a/smali/android/support/v4/internal/view/SupportMenuItem.smali b/smali/android/support/v4/internal/view/SupportMenuItem.smali index 2fd539c3..b82f861b 100644 --- a/smali/android/support/v4/internal/view/SupportMenuItem.smali +++ b/smali/android/support/v4/internal/view/SupportMenuItem.smali @@ -6,6 +6,14 @@ .implements Landroid/view/MenuItem; +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field public static final SHOW_AS_ACTION_ALWAYS:I = 0x2 diff --git a/smali/android/support/v4/internal/view/SupportSubMenu.smali b/smali/android/support/v4/internal/view/SupportSubMenu.smali index abbb016c..3c77e17c 100644 --- a/smali/android/support/v4/internal/view/SupportSubMenu.smali +++ b/smali/android/support/v4/internal/view/SupportSubMenu.smali @@ -5,3 +5,11 @@ # interfaces .implements Landroid/support/v4/internal/view/SupportMenu; .implements Landroid/view/SubMenu; + + +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation diff --git a/smali/android/support/v4/net/ConnectivityManagerCompat$RestrictBackgroundStatus.smali b/smali/android/support/v4/net/ConnectivityManagerCompat$RestrictBackgroundStatus.smali index 75d6ebfd..79d96246 100644 --- a/smali/android/support/v4/net/ConnectivityManagerCompat$RestrictBackgroundStatus.smali +++ b/smali/android/support/v4/net/ConnectivityManagerCompat$RestrictBackgroundStatus.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/net/ConnectivityManagerCompat; .end annotation diff --git a/smali/android/support/v4/net/ConnectivityManagerCompat.smali b/smali/android/support/v4/net/ConnectivityManagerCompat.smali index fc82d544..3de1a34d 100644 --- a/smali/android/support/v4/net/ConnectivityManagerCompat.smali +++ b/smali/android/support/v4/net/ConnectivityManagerCompat.smali @@ -31,6 +31,20 @@ .method public static getNetworkInfoFromBroadcast(Landroid/net/ConnectivityManager;Landroid/content/Intent;)Landroid/net/NetworkInfo; .locals 1 + .param p0 # Landroid/net/ConnectivityManager; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RequiresPermission; + value = "android.permission.ACCESS_NETWORK_STATE" + .end annotation const-string v0, "networkInfo" @@ -62,6 +76,10 @@ .method public static getRestrictBackgroundStatus(Landroid/net/ConnectivityManager;)I .locals 2 + .param p0 # Landroid/net/ConnectivityManager; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 157 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -85,6 +103,13 @@ .method public static isActiveNetworkMetered(Landroid/net/ConnectivityManager;)Z .locals 2 + .param p0 # Landroid/net/ConnectivityManager; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/RequiresPermission; + value = "android.permission.ACCESS_NETWORK_STATE" + .end annotation .line 99 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -118,20 +143,30 @@ move-result p0 - if-eq p0, v0, :cond_2 - - const/4 v1, 0x7 - - if-eq p0, v1, :cond_2 - - const/16 v1, 0x9 - - if-eq p0, v1, :cond_2 + packed-switch p0, :pswitch_data_0 + :pswitch_0 return v0 - :cond_2 + :pswitch_1 const/4 p0, 0x0 return p0 + + :pswitch_2 + return v0 + + :pswitch_data_0 + .packed-switch 0x0 + :pswitch_2 + :pswitch_1 + :pswitch_2 + :pswitch_2 + :pswitch_2 + :pswitch_2 + :pswitch_2 + :pswitch_1 + :pswitch_0 + :pswitch_1 + .end packed-switch .end method diff --git a/smali/android/support/v4/net/TrafficStatsCompat.smali b/smali/android/support/v4/net/TrafficStatsCompat.smali index cb3f396c..925ddbce 100644 --- a/smali/android/support/v4/net/TrafficStatsCompat.smali +++ b/smali/android/support/v4/net/TrafficStatsCompat.smali @@ -72,6 +72,10 @@ .method public static tagDatagramSocket(Ljava/net/DatagramSocket;)V .locals 3 + .param p0 # Ljava/net/DatagramSocket; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Ljava/net/SocketException; @@ -133,6 +137,10 @@ .method public static untagDatagramSocket(Ljava/net/DatagramSocket;)V .locals 3 + .param p0 # Ljava/net/DatagramSocket; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Ljava/net/SocketException; diff --git a/smali/android/support/v4/os/CancellationSignal.smali b/smali/android/support/v4/os/CancellationSignal.smali index f38d5756..cd9c1143 100644 --- a/smali/android/support/v4/os/CancellationSignal.smali +++ b/smali/android/support/v4/os/CancellationSignal.smali @@ -229,14 +229,14 @@ iput-object v0, p0, Landroid/support/v4/os/CancellationSignal;->mCancellationSignalObj:Ljava/lang/Object; .line 141 - iget-boolean v1, p0, Landroid/support/v4/os/CancellationSignal;->mIsCanceled:Z + iget-boolean v0, p0, Landroid/support/v4/os/CancellationSignal;->mIsCanceled:Z - if-eqz v1, :cond_1 + if-eqz v0, :cond_1 .line 142 - move-object v1, v0 + iget-object v0, p0, Landroid/support/v4/os/CancellationSignal;->mCancellationSignalObj:Ljava/lang/Object; - check-cast v1, Landroid/os/CancellationSignal; + check-cast v0, Landroid/os/CancellationSignal; invoke-virtual {v0}, Landroid/os/CancellationSignal;->cancel()V diff --git a/smali/android/support/v4/os/ConfigurationCompat.smali b/smali/android/support/v4/os/ConfigurationCompat.smali index 10d6cd0e..e4d014f6 100644 --- a/smali/android/support/v4/os/ConfigurationCompat.smali +++ b/smali/android/support/v4/os/ConfigurationCompat.smali @@ -37,11 +37,11 @@ :cond_0 const/4 v0, 0x1 + .line 40 new-array v0, v0, [Ljava/util/Locale; const/4 v1, 0x0 - .line 40 iget-object p0, p0, Landroid/content/res/Configuration;->locale:Ljava/util/Locale; aput-object p0, v0, v1 diff --git a/smali/android/support/v4/os/HandlerCompat.smali b/smali/android/support/v4/os/HandlerCompat.smali index c119e216..d828a993 100644 --- a/smali/android/support/v4/os/HandlerCompat.smali +++ b/smali/android/support/v4/os/HandlerCompat.smali @@ -15,6 +15,18 @@ .method public static postDelayed(Landroid/os/Handler;Ljava/lang/Runnable;Ljava/lang/Object;J)Z .locals 2 + .param p0 # Landroid/os/Handler; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/lang/Runnable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 55 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/os/LocaleHelper.smali b/smali/android/support/v4/os/LocaleHelper.smali index 68c6d17b..9f444026 100644 --- a/smali/android/support/v4/os/LocaleHelper.smali +++ b/smali/android/support/v4/os/LocaleHelper.smali @@ -3,6 +3,14 @@ .source "LocaleHelper.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # direct methods .method private constructor ()V .locals 0 diff --git a/smali/android/support/v4/os/LocaleListCompat$LocaleListCompatApi24Impl.smali b/smali/android/support/v4/os/LocaleListCompat$LocaleListCompatApi24Impl.smali index 2982aab0..f74e3333 100644 --- a/smali/android/support/v4/os/LocaleListCompat$LocaleListCompatApi24Impl.smali +++ b/smali/android/support/v4/os/LocaleListCompat$LocaleListCompatApi24Impl.smali @@ -7,6 +7,10 @@ # annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0x18 +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/os/LocaleListCompat; .end annotation @@ -78,6 +82,8 @@ .method public getFirstMatch([Ljava/lang/String;)Ljava/util/Locale; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 162 iget-object v0, p0, Landroid/support/v4/os/LocaleListCompat$LocaleListCompatApi24Impl;->mLocaleList:Landroid/os/LocaleList; @@ -121,6 +127,9 @@ .method public indexOf(Ljava/util/Locale;)I .locals 1 + .annotation build Landroid/support/annotation/IntRange; + from = -0x1L + .end annotation .line 136 iget-object v0, p0, Landroid/support/v4/os/LocaleListCompat$LocaleListCompatApi24Impl;->mLocaleList:Landroid/os/LocaleList; @@ -147,6 +156,10 @@ .method public varargs setLocaleList([Ljava/util/Locale;)V .locals 1 + .param p1 # [Ljava/util/Locale; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 109 new-instance v0, Landroid/os/LocaleList; @@ -160,6 +173,9 @@ .method public size()I .locals 1 + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + .end annotation .line 130 iget-object v0, p0, Landroid/support/v4/os/LocaleListCompat$LocaleListCompatApi24Impl;->mLocaleList:Landroid/os/LocaleList; diff --git a/smali/android/support/v4/os/LocaleListCompat$LocaleListCompatBaseImpl.smali b/smali/android/support/v4/os/LocaleListCompat$LocaleListCompatBaseImpl.smali index 8cf10562..7bdb36db 100644 --- a/smali/android/support/v4/os/LocaleListCompat$LocaleListCompatBaseImpl.smali +++ b/smali/android/support/v4/os/LocaleListCompat$LocaleListCompatBaseImpl.smali @@ -78,6 +78,8 @@ .method public getFirstMatch([Ljava/lang/String;)Ljava/util/Locale; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 96 iget-object v0, p0, Landroid/support/v4/os/LocaleListCompat$LocaleListCompatBaseImpl;->mLocaleList:Landroid/support/v4/os/LocaleListHelper; @@ -121,6 +123,9 @@ .method public indexOf(Ljava/util/Locale;)I .locals 1 + .annotation build Landroid/support/annotation/IntRange; + from = -0x1L + .end annotation .line 70 iget-object v0, p0, Landroid/support/v4/os/LocaleListCompat$LocaleListCompatBaseImpl;->mLocaleList:Landroid/support/v4/os/LocaleListHelper; @@ -147,6 +152,10 @@ .method public varargs setLocaleList([Ljava/util/Locale;)V .locals 1 + .param p1 # [Ljava/util/Locale; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 43 new-instance v0, Landroid/support/v4/os/LocaleListHelper; @@ -160,6 +169,9 @@ .method public size()I .locals 1 + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + .end annotation .line 64 iget-object v0, p0, Landroid/support/v4/os/LocaleListCompat$LocaleListCompatBaseImpl;->mLocaleList:Landroid/support/v4/os/LocaleListHelper; diff --git a/smali/android/support/v4/os/LocaleListCompat.smali b/smali/android/support/v4/os/LocaleListCompat.smali index f6dd1fed..9131d7a6 100644 --- a/smali/android/support/v4/os/LocaleListCompat.smali +++ b/smali/android/support/v4/os/LocaleListCompat.smali @@ -68,6 +68,10 @@ .method public static varargs create([Ljava/util/Locale;)Landroid/support/v4/os/LocaleListCompat; .locals 1 + .param p0 # [Ljava/util/Locale; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 206 new-instance v0, Landroid/support/v4/os/LocaleListCompat; @@ -81,7 +85,13 @@ .end method .method public static forLanguageTags(Ljava/lang/String;)Landroid/support/v4/os/LocaleListCompat; - .locals 5 + .locals 4 + .param p0 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation if-eqz p0, :cond_3 @@ -107,41 +117,44 @@ .line 293 array-length v0, p0 - new-array v1, v0, [Ljava/util/Locale; + new-array v0, v0, [Ljava/util/Locale; - const/4 v2, 0x0 + const/4 v1, 0x0 + .line 294 :goto_0 - if-ge v2, v0, :cond_2 + array-length v2, v0 + + if-ge v1, v2, :cond_2 .line 295 - sget v3, Landroid/os/Build$VERSION;->SDK_INT:I + sget v2, Landroid/os/Build$VERSION;->SDK_INT:I - const/16 v4, 0x15 + const/16 v3, 0x15 - if-lt v3, v4, :cond_1 + if-lt v2, v3, :cond_1 - aget-object v3, p0, v2 + aget-object v2, p0, v1 .line 296 - invoke-static {v3}, Ljava/util/Locale;->forLanguageTag(Ljava/lang/String;)Ljava/util/Locale; + invoke-static {v2}, Ljava/util/Locale;->forLanguageTag(Ljava/lang/String;)Ljava/util/Locale; - move-result-object v3 + move-result-object v2 goto :goto_1 :cond_1 - aget-object v3, p0, v2 + aget-object v2, p0, v1 .line 297 - invoke-static {v3}, Landroid/support/v4/os/LocaleHelper;->forLanguageTag(Ljava/lang/String;)Ljava/util/Locale; + invoke-static {v2}, Landroid/support/v4/os/LocaleHelper;->forLanguageTag(Ljava/lang/String;)Ljava/util/Locale; - move-result-object v3 + move-result-object v2 :goto_1 - aput-object v3, v1, v2 + aput-object v2, v0, v1 - add-int/lit8 v2, v2, 0x1 + add-int/lit8 v1, v1, 0x1 goto :goto_0 @@ -152,7 +165,7 @@ invoke-direct {p0}, Landroid/support/v4/os/LocaleListCompat;->()V .line 300 - invoke-direct {p0, v1}, Landroid/support/v4/os/LocaleListCompat;->setLocaleListArray([Ljava/util/Locale;)V + invoke-direct {p0, v0}, Landroid/support/v4/os/LocaleListCompat;->setLocaleListArray([Ljava/util/Locale;)V return-object p0 @@ -168,6 +181,12 @@ .method public static getAdjustedDefault()Landroid/support/v4/os/LocaleListCompat; .locals 3 + .annotation build Landroid/support/annotation/NonNull; + .end annotation + + .annotation build Landroid/support/annotation/Size; + min = 0x1L + .end annotation .line 311 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -190,11 +209,11 @@ :cond_0 const/4 v0, 0x1 + .line 314 new-array v0, v0, [Ljava/util/Locale; const/4 v1, 0x0 - .line 314 invoke-static {}, Ljava/util/Locale;->getDefault()Ljava/util/Locale; move-result-object v2 @@ -210,6 +229,12 @@ .method public static getDefault()Landroid/support/v4/os/LocaleListCompat; .locals 3 + .annotation build Landroid/support/annotation/NonNull; + .end annotation + + .annotation build Landroid/support/annotation/Size; + min = 0x1L + .end annotation .line 331 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -232,11 +257,11 @@ :cond_0 const/4 v0, 0x1 + .line 334 new-array v0, v0, [Ljava/util/Locale; const/4 v1, 0x0 - .line 334 invoke-static {}, Ljava/util/Locale;->getDefault()Ljava/util/Locale; move-result-object v2 @@ -252,6 +277,8 @@ .method public static getEmptyLocaleList()Landroid/support/v4/os/LocaleListCompat; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 276 sget-object v0, Landroid/support/v4/os/LocaleListCompat;->sEmptyLocaleList:Landroid/support/v4/os/LocaleListCompat; @@ -261,6 +288,9 @@ .method private setLocaleList(Landroid/os/LocaleList;)V .locals 4 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x18 + .end annotation .line 355 invoke-virtual {p1}, Landroid/os/LocaleList;->size()I @@ -311,6 +341,9 @@ .method public static wrap(Ljava/lang/Object;)Landroid/support/v4/os/LocaleListCompat; .locals 2 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x18 + .end annotation .line 184 new-instance v0, Landroid/support/v4/os/LocaleListCompat; @@ -387,6 +420,9 @@ .method public indexOf(Ljava/util/Locale;)I .locals 1 + .annotation build Landroid/support/annotation/IntRange; + from = -0x1L + .end annotation .line 249 sget-object v0, Landroid/support/v4/os/LocaleListCompat;->IMPL:Landroid/support/v4/os/LocaleListInterface; @@ -413,6 +449,9 @@ .method public size()I .locals 1 + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + .end annotation .line 236 sget-object v0, Landroid/support/v4/os/LocaleListCompat;->IMPL:Landroid/support/v4/os/LocaleListInterface; @@ -426,6 +465,8 @@ .method public toLanguageTags()Ljava/lang/String; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 257 sget-object v0, Landroid/support/v4/os/LocaleListCompat;->IMPL:Landroid/support/v4/os/LocaleListInterface; @@ -452,6 +493,8 @@ .method public unwrap()Ljava/lang/Object; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 199 sget-object v0, Landroid/support/v4/os/LocaleListCompat;->IMPL:Landroid/support/v4/os/LocaleListInterface; diff --git a/smali/android/support/v4/os/LocaleListHelper.smali b/smali/android/support/v4/os/LocaleListHelper.smali index cfd06436..46c3248d 100644 --- a/smali/android/support/v4/os/LocaleListHelper.smali +++ b/smali/android/support/v4/os/LocaleListHelper.smali @@ -3,6 +3,14 @@ .source "LocaleListHelper.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field private static final EN_LATN:Ljava/util/Locale; @@ -17,16 +25,32 @@ .field private static final STRING_EN_XA:Ljava/lang/String; = "en-XA" .field private static sDefaultAdjustedLocaleList:Landroid/support/v4/os/LocaleListHelper; + .annotation build Landroid/support/annotation/GuardedBy; + value = "sLock" + .end annotation +.end field .field private static sDefaultLocaleList:Landroid/support/v4/os/LocaleListHelper; + .annotation build Landroid/support/annotation/GuardedBy; + value = "sLock" + .end annotation +.end field .field private static final sEmptyList:[Ljava/util/Locale; .field private static final sEmptyLocaleList:Landroid/support/v4/os/LocaleListHelper; .field private static sLastDefaultLocale:Ljava/util/Locale; + .annotation build Landroid/support/annotation/GuardedBy; + value = "sLock" + .end annotation +.end field .field private static sLastExplicitlySetLocaleList:Landroid/support/v4/os/LocaleListHelper; + .annotation build Landroid/support/annotation/GuardedBy; + value = "sLock" + .end annotation +.end field .field private static final sLock:Ljava/lang/Object; @@ -35,6 +59,9 @@ .field private final mList:[Ljava/util/Locale; .field private final mStringRepresentation:Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation +.end field # direct methods @@ -43,9 +70,9 @@ const/4 v0, 0x0 + .line 50 new-array v1, v0, [Ljava/util/Locale; - .line 50 sput-object v1, Landroid/support/v4/os/LocaleListHelper;->sEmptyList:[Ljava/util/Locale; .line 51 @@ -114,6 +141,15 @@ .method constructor (Ljava/util/Locale;Landroid/support/v4/os/LocaleListHelper;)V .locals 8 + .param p1 # Ljava/util/Locale; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 208 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -317,17 +353,22 @@ invoke-direct {p1, p2}, Ljava/lang/NullPointerException;->(Ljava/lang/String;)V - goto :goto_9 - - :goto_8 throw p1 - :goto_9 - goto :goto_8 + return-void .end method .method varargs constructor ([Ljava/util/Locale;)V .locals 7 + .param p1 # [Ljava/util/Locale; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 172 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -666,7 +707,19 @@ .end method .method static forLanguageTags(Ljava/lang/String;)Landroid/support/v4/os/LocaleListHelper; - .locals 4 + .locals 3 + .param p0 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation if-eqz p0, :cond_2 @@ -692,23 +745,26 @@ .line 277 array-length v0, p0 - new-array v1, v0, [Ljava/util/Locale; + new-array v0, v0, [Ljava/util/Locale; - const/4 v2, 0x0 + const/4 v1, 0x0 + .line 278 :goto_0 - if-ge v2, v0, :cond_1 + array-length v2, v0 + + if-ge v1, v2, :cond_1 .line 279 - aget-object v3, p0, v2 + aget-object v2, p0, v1 - invoke-static {v3}, Landroid/support/v4/os/LocaleHelper;->forLanguageTag(Ljava/lang/String;)Ljava/util/Locale; + invoke-static {v2}, Landroid/support/v4/os/LocaleHelper;->forLanguageTag(Ljava/lang/String;)Ljava/util/Locale; - move-result-object v3 + move-result-object v2 - aput-object v3, v1, v2 + aput-object v2, v0, v1 - add-int/lit8 v2, v2, 0x1 + add-int/lit8 v1, v1, 0x1 goto :goto_0 @@ -716,7 +772,7 @@ :cond_1 new-instance p0, Landroid/support/v4/os/LocaleListHelper; - invoke-direct {p0, v1}, Landroid/support/v4/os/LocaleListHelper;->([Ljava/util/Locale;)V + invoke-direct {p0, v0}, Landroid/support/v4/os/LocaleListHelper;->([Ljava/util/Locale;)V return-object p0 @@ -732,6 +788,12 @@ .method static getAdjustedDefault()Landroid/support/v4/os/LocaleListHelper; .locals 2 + .annotation build Landroid/support/annotation/NonNull; + .end annotation + + .annotation build Landroid/support/annotation/Size; + min = 0x1L + .end annotation .line 533 invoke-static {}, Landroid/support/v4/os/LocaleListHelper;->getDefault()Landroid/support/v4/os/LocaleListHelper; @@ -762,6 +824,18 @@ .method static getDefault()Landroid/support/v4/os/LocaleListHelper; .locals 4 + .annotation build Landroid/support/annotation/NonNull; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation + + .annotation build Landroid/support/annotation/Size; + min = 0x1L + .end annotation .line 502 invoke-static {}, Ljava/util/Locale;->getDefault()Ljava/util/Locale; @@ -791,6 +865,8 @@ if-eqz v2, :cond_0 + sget-object v2, Landroid/support/v4/os/LocaleListHelper;->sDefaultLocaleList:Landroid/support/v4/os/LocaleListHelper; + const/4 v3, 0x0 .line 510 @@ -822,7 +898,9 @@ sput-object v2, Landroid/support/v4/os/LocaleListHelper;->sDefaultLocaleList:Landroid/support/v4/os/LocaleListHelper; .line 517 - sput-object v2, Landroid/support/v4/os/LocaleListHelper;->sDefaultAdjustedLocaleList:Landroid/support/v4/os/LocaleListHelper; + sget-object v0, Landroid/support/v4/os/LocaleListHelper;->sDefaultLocaleList:Landroid/support/v4/os/LocaleListHelper; + + sput-object v0, Landroid/support/v4/os/LocaleListHelper;->sDefaultAdjustedLocaleList:Landroid/support/v4/os/LocaleListHelper; .line 523 :cond_1 @@ -845,6 +923,14 @@ .method static getEmptyLocaleList()Landroid/support/v4/os/LocaleListHelper; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 259 sget-object v0, Landroid/support/v4/os/LocaleListHelper;->sEmptyLocaleList:Landroid/support/v4/os/LocaleListHelper; @@ -954,6 +1040,15 @@ .method static isPseudoLocalesOnly([Ljava/lang/String;)Z .locals 6 + .param p0 # [Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation const/4 v0, 0x1 @@ -1010,6 +1105,10 @@ .method private static matchScore(Ljava/util/Locale;Ljava/util/Locale;)I .locals 4 + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + to = 0x1L + .end annotation .line 313 invoke-virtual {p0, p1}, Ljava/util/Locale;->equals(Ljava/lang/Object;)Z @@ -1122,6 +1221,19 @@ .method static setDefault(Landroid/support/v4/os/LocaleListHelper;)V .locals 1 + .param p0 # Landroid/support/v4/os/LocaleListHelper; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + + .annotation build Landroid/support/annotation/Size; + min = 0x1L + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation const/4 v0, 0x0 @@ -1133,6 +1245,19 @@ .method static setDefault(Landroid/support/v4/os/LocaleListHelper;I)V .locals 2 + .param p0 # Landroid/support/v4/os/LocaleListHelper; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + + .annotation build Landroid/support/annotation/Size; + min = 0x1L + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation if-eqz p0, :cond_2 @@ -1157,6 +1282,8 @@ sput-object v1, Landroid/support/v4/os/LocaleListHelper;->sLastDefaultLocale:Ljava/util/Locale; .line 572 + sget-object v1, Landroid/support/v4/os/LocaleListHelper;->sLastDefaultLocale:Ljava/util/Locale; + invoke-static {v1}, Ljava/util/Locale;->setDefault(Ljava/util/Locale;)V .line 573 @@ -1168,19 +1295,23 @@ if-nez p1, :cond_0 .line 576 + sget-object p0, Landroid/support/v4/os/LocaleListHelper;->sDefaultLocaleList:Landroid/support/v4/os/LocaleListHelper; + sput-object p0, Landroid/support/v4/os/LocaleListHelper;->sDefaultAdjustedLocaleList:Landroid/support/v4/os/LocaleListHelper; goto :goto_0 .line 578 :cond_0 - new-instance p1, Landroid/support/v4/os/LocaleListHelper; + new-instance p0, Landroid/support/v4/os/LocaleListHelper; - sget-object v1, Landroid/support/v4/os/LocaleListHelper;->sLastDefaultLocale:Ljava/util/Locale; + sget-object p1, Landroid/support/v4/os/LocaleListHelper;->sLastDefaultLocale:Ljava/util/Locale; + + sget-object v1, Landroid/support/v4/os/LocaleListHelper;->sDefaultLocaleList:Landroid/support/v4/os/LocaleListHelper; - invoke-direct {p1, v1, p0}, Landroid/support/v4/os/LocaleListHelper;->(Ljava/util/Locale;Landroid/support/v4/os/LocaleListHelper;)V + invoke-direct {p0, p1, v1}, Landroid/support/v4/os/LocaleListHelper;->(Ljava/util/Locale;Landroid/support/v4/os/LocaleListHelper;)V - sput-object p1, Landroid/support/v4/os/LocaleListHelper;->sDefaultAdjustedLocaleList:Landroid/support/v4/os/LocaleListHelper; + sput-object p0, Landroid/support/v4/os/LocaleListHelper;->sDefaultAdjustedLocaleList:Landroid/support/v4/os/LocaleListHelper; .line 581 :goto_0 @@ -1291,6 +1422,11 @@ .method get(I)Ljava/util/Locale; .locals 2 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation if-ltz p1, :cond_0 @@ -1314,6 +1450,14 @@ .method getFirstMatch([Ljava/lang/String;)Ljava/util/Locale; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 408 invoke-static {p1}, Ljava/util/Arrays;->asList([Ljava/lang/Object;)Ljava/util/List; @@ -1331,6 +1475,11 @@ .method getFirstMatchIndex([Ljava/lang/String;)I .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 417 invoke-static {p1}, Ljava/util/Arrays;->asList([Ljava/lang/Object;)Ljava/util/List; @@ -1348,6 +1497,12 @@ .method getFirstMatchIndexWithEnglishSupported(Ljava/util/Collection;)I .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -1369,6 +1524,11 @@ .method getFirstMatchIndexWithEnglishSupported([Ljava/lang/String;)I .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 445 invoke-static {p1}, Ljava/util/Arrays;->asList([Ljava/lang/Object;)Ljava/util/List; @@ -1384,6 +1544,14 @@ .method getFirstMatchWithEnglishSupported([Ljava/lang/String;)Ljava/util/Locale; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 428 invoke-static {p1}, Ljava/util/Arrays;->asList([Ljava/lang/Object;)Ljava/util/List; @@ -1435,6 +1603,15 @@ .method indexOf(Ljava/util/Locale;)I .locals 3 + .annotation build Landroid/support/annotation/IntRange; + from = -0x1L + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation const/4 v0, 0x0 @@ -1470,6 +1647,11 @@ .method isEmpty()Z .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 74 iget-object v0, p0, Landroid/support/v4/os/LocaleListHelper;->mList:[Ljava/util/Locale; @@ -1491,6 +1673,15 @@ .method size()I .locals 1 + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 84 iget-object v0, p0, Landroid/support/v4/os/LocaleListHelper;->mList:[Ljava/util/Locale; @@ -1502,6 +1693,14 @@ .method toLanguageTags()Ljava/lang/String; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 157 iget-object v0, p0, Landroid/support/v4/os/LocaleListHelper;->mStringRepresentation:Ljava/lang/String; diff --git a/smali/android/support/v4/os/LocaleListInterface.smali b/smali/android/support/v4/os/LocaleListInterface.smali index 599bbcac..707af54a 100644 --- a/smali/android/support/v4/os/LocaleListInterface.smali +++ b/smali/android/support/v4/os/LocaleListInterface.smali @@ -3,6 +3,14 @@ .source "LocaleListInterface.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # virtual methods .method public abstract equals(Ljava/lang/Object;)Z .end method @@ -11,6 +19,8 @@ .end method .method public abstract getFirstMatch([Ljava/lang/String;)Ljava/util/Locale; + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method .method public abstract getLocaleList()Ljava/lang/Object; @@ -20,15 +30,25 @@ .end method .method public abstract indexOf(Ljava/util/Locale;)I + .annotation build Landroid/support/annotation/IntRange; + from = -0x1L + .end annotation .end method .method public abstract isEmpty()Z .end method .method public varargs abstract setLocaleList([Ljava/util/Locale;)V + .param p1 # [Ljava/util/Locale; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method .method public abstract size()I + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + .end annotation .end method .method public abstract toLanguageTags()Ljava/lang/String; diff --git a/smali/android/support/v4/os/ResultReceiver.smali b/smali/android/support/v4/os/ResultReceiver.smali index b94096d1..a5a8c0ad 100644 --- a/smali/android/support/v4/os/ResultReceiver.smali +++ b/smali/android/support/v4/os/ResultReceiver.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v4/os/ResultReceiver$MyResultReceiver;, diff --git a/smali/android/support/v4/print/PrintHelper$1.smali b/smali/android/support/v4/print/PrintHelper$1.smali index ed471f89..ea6b5268 100644 --- a/smali/android/support/v4/print/PrintHelper$1.smali +++ b/smali/android/support/v4/print/PrintHelper$1.smali @@ -134,7 +134,7 @@ move-result v2 :try_end_0 - .catchall {:try_start_0 .. :try_end_0} :catchall_1 + .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_3 if-eqz v2, :cond_1 @@ -275,16 +275,18 @@ .line 702 iget-object p1, p0, Landroid/support/v4/print/PrintHelper$1;->val$fileDescriptor:Landroid/os/ParcelFileDescriptor; :try_end_2 - .catchall {:try_start_2 .. :try_end_2} :catchall_1 + .catch Ljava/lang/Throwable; {:try_start_2 .. :try_end_2} :catch_3 if-eqz p1, :cond_4 .line 704 :try_start_3 + iget-object p1, p0, Landroid/support/v4/print/PrintHelper$1;->val$fileDescriptor:Landroid/os/ParcelFileDescriptor; + invoke-virtual {p1}, Landroid/os/ParcelFileDescriptor;->close()V :try_end_3 .catch Ljava/io/IOException; {:try_start_3 .. :try_end_3} :catch_0 - .catchall {:try_start_3 .. :try_end_3} :catchall_1 + .catch Ljava/lang/Throwable; {:try_start_3 .. :try_end_3} :catch_3 .line 710 :catch_0 @@ -297,7 +299,7 @@ .line 711 invoke-virtual {v1}, Landroid/graphics/Bitmap;->recycle()V :try_end_4 - .catchall {:try_start_4 .. :try_end_4} :catchall_1 + .catch Ljava/lang/Throwable; {:try_start_4 .. :try_end_4} :catch_3 :cond_5 return-object v0 @@ -328,16 +330,18 @@ .line 702 iget-object p1, p0, Landroid/support/v4/print/PrintHelper$1;->val$fileDescriptor:Landroid/os/ParcelFileDescriptor; :try_end_6 - .catchall {:try_start_6 .. :try_end_6} :catchall_1 + .catch Ljava/lang/Throwable; {:try_start_6 .. :try_end_6} :catch_3 if-eqz p1, :cond_7 .line 704 :try_start_7 + iget-object p1, p0, Landroid/support/v4/print/PrintHelper$1;->val$fileDescriptor:Landroid/os/ParcelFileDescriptor; + invoke-virtual {p1}, Landroid/os/ParcelFileDescriptor;->close()V :try_end_7 .catch Ljava/io/IOException; {:try_start_7 .. :try_end_7} :catch_1 - .catchall {:try_start_7 .. :try_end_7} :catchall_1 + .catch Ljava/lang/Throwable; {:try_start_7 .. :try_end_7} :catch_3 .line 710 :catch_1 @@ -362,16 +366,18 @@ .line 702 iget-object p1, p0, Landroid/support/v4/print/PrintHelper$1;->val$fileDescriptor:Landroid/os/ParcelFileDescriptor; :try_end_8 - .catchall {:try_start_8 .. :try_end_8} :catchall_1 + .catch Ljava/lang/Throwable; {:try_start_8 .. :try_end_8} :catch_3 if-eqz p1, :cond_9 .line 704 :try_start_9 + iget-object p1, p0, Landroid/support/v4/print/PrintHelper$1;->val$fileDescriptor:Landroid/os/ParcelFileDescriptor; + invoke-virtual {p1}, Landroid/os/ParcelFileDescriptor;->close()V :try_end_9 .catch Ljava/io/IOException; {:try_start_9 .. :try_end_9} :catch_2 - .catchall {:try_start_9 .. :try_end_9} :catchall_1 + .catch Ljava/lang/Throwable; {:try_start_9 .. :try_end_9} :catch_3 .line 710 :catch_2 @@ -387,9 +393,9 @@ :cond_a throw v0 :try_end_a - .catchall {:try_start_a .. :try_end_a} :catchall_1 + .catch Ljava/lang/Throwable; {:try_start_a .. :try_end_a} :catch_3 - :catchall_1 + :catch_3 move-exception p1 return-object p1 diff --git a/smali/android/support/v4/print/PrintHelper$PrintBitmapAdapter.smali b/smali/android/support/v4/print/PrintHelper$PrintBitmapAdapter.smali index 7a5775e6..5c245712 100644 --- a/smali/android/support/v4/print/PrintHelper$PrintBitmapAdapter.smali +++ b/smali/android/support/v4/print/PrintHelper$PrintBitmapAdapter.smali @@ -4,6 +4,10 @@ # annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0x13 +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/print/PrintHelper; .end annotation diff --git a/smali/android/support/v4/print/PrintHelper$PrintUriAdapter$1.smali b/smali/android/support/v4/print/PrintHelper$PrintUriAdapter$1.smali index b9b425bb..b3f4e87d 100644 --- a/smali/android/support/v4/print/PrintHelper$PrintUriAdapter$1.smali +++ b/smali/android/support/v4/print/PrintHelper$PrintUriAdapter$1.smali @@ -232,28 +232,26 @@ iput-object p1, v0, Landroid/support/v4/print/PrintHelper$PrintUriAdapter;->mBitmap:Landroid/graphics/Bitmap; - const/4 v0, 0x0 + const/4 v1, 0x0 if-eqz p1, :cond_2 .line 476 new-instance p1, Landroid/print/PrintDocumentInfo$Builder; - iget-object v1, p0, Landroid/support/v4/print/PrintHelper$PrintUriAdapter$1;->this$1:Landroid/support/v4/print/PrintHelper$PrintUriAdapter; - - iget-object v1, v1, Landroid/support/v4/print/PrintHelper$PrintUriAdapter;->mJobName:Ljava/lang/String; + iget-object v0, v0, Landroid/support/v4/print/PrintHelper$PrintUriAdapter;->mJobName:Ljava/lang/String; - invoke-direct {p1, v1}, Landroid/print/PrintDocumentInfo$Builder;->(Ljava/lang/String;)V + invoke-direct {p1, v0}, Landroid/print/PrintDocumentInfo$Builder;->(Ljava/lang/String;)V - const/4 v1, 0x1 + const/4 v0, 0x1 .line 477 - invoke-virtual {p1, v1}, Landroid/print/PrintDocumentInfo$Builder;->setContentType(I)Landroid/print/PrintDocumentInfo$Builder; + invoke-virtual {p1, v0}, Landroid/print/PrintDocumentInfo$Builder;->setContentType(I)Landroid/print/PrintDocumentInfo$Builder; move-result-object p1 .line 478 - invoke-virtual {p1, v1}, Landroid/print/PrintDocumentInfo$Builder;->setPageCount(I)Landroid/print/PrintDocumentInfo$Builder; + invoke-virtual {p1, v0}, Landroid/print/PrintDocumentInfo$Builder;->setPageCount(I)Landroid/print/PrintDocumentInfo$Builder; move-result-object p1 @@ -271,12 +269,12 @@ move-result v2 - xor-int/2addr v1, v2 + xor-int/2addr v0, v2 .line 483 iget-object v2, p0, Landroid/support/v4/print/PrintHelper$PrintUriAdapter$1;->val$layoutResultCallback:Landroid/print/PrintDocumentAdapter$LayoutResultCallback; - invoke-virtual {v2, p1, v1}, Landroid/print/PrintDocumentAdapter$LayoutResultCallback;->onLayoutFinished(Landroid/print/PrintDocumentInfo;Z)V + invoke-virtual {v2, p1, v0}, Landroid/print/PrintDocumentAdapter$LayoutResultCallback;->onLayoutFinished(Landroid/print/PrintDocumentInfo;Z)V goto :goto_1 @@ -284,13 +282,13 @@ :cond_2 iget-object p1, p0, Landroid/support/v4/print/PrintHelper$PrintUriAdapter$1;->val$layoutResultCallback:Landroid/print/PrintDocumentAdapter$LayoutResultCallback; - invoke-virtual {p1, v0}, Landroid/print/PrintDocumentAdapter$LayoutResultCallback;->onLayoutFailed(Ljava/lang/CharSequence;)V + invoke-virtual {p1, v1}, Landroid/print/PrintDocumentAdapter$LayoutResultCallback;->onLayoutFailed(Ljava/lang/CharSequence;)V .line 488 :goto_1 iget-object p1, p0, Landroid/support/v4/print/PrintHelper$PrintUriAdapter$1;->this$1:Landroid/support/v4/print/PrintHelper$PrintUriAdapter; - iput-object v0, p1, Landroid/support/v4/print/PrintHelper$PrintUriAdapter;->mLoadBitmap:Landroid/os/AsyncTask; + iput-object v1, p1, Landroid/support/v4/print/PrintHelper$PrintUriAdapter;->mLoadBitmap:Landroid/os/AsyncTask; return-void .end method diff --git a/smali/android/support/v4/print/PrintHelper$PrintUriAdapter.smali b/smali/android/support/v4/print/PrintHelper$PrintUriAdapter.smali index 1fa7599f..a24151d5 100644 --- a/smali/android/support/v4/print/PrintHelper$PrintUriAdapter.smali +++ b/smali/android/support/v4/print/PrintHelper$PrintUriAdapter.smali @@ -4,6 +4,10 @@ # annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0x13 +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/print/PrintHelper; .end annotation diff --git a/smali/android/support/v4/print/PrintHelper.smali b/smali/android/support/v4/print/PrintHelper.smali index 57c88cf1..3bdf1642 100644 --- a/smali/android/support/v4/print/PrintHelper.smali +++ b/smali/android/support/v4/print/PrintHelper.smali @@ -15,8 +15,20 @@ # static fields .field public static final COLOR_MODE_COLOR:I = 0x2 + .annotation build Landroid/annotation/SuppressLint; + value = { + "InlinedApi" + } + .end annotation +.end field .field public static final COLOR_MODE_MONOCHROME:I = 0x1 + .annotation build Landroid/annotation/SuppressLint; + value = { + "InlinedApi" + } + .end annotation +.end field .field static final IS_MIN_MARGINS_HANDLING_CORRECT:Z @@ -99,6 +111,10 @@ .method public constructor (Landroid/content/Context;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 162 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -200,6 +216,9 @@ .method private static copyAttributes(Landroid/print/PrintAttributes;)Landroid/print/PrintAttributes$Builder; .locals 3 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x13 + .end annotation .line 558 new-instance v0, Landroid/print/PrintAttributes$Builder; @@ -644,6 +663,8 @@ iput-object v2, p0, Landroid/support/v4/print/PrintHelper;->mDecodeOptions:Landroid/graphics/BitmapFactory$Options; .line 778 + iget-object v2, p0, Landroid/support/v4/print/PrintHelper;->mDecodeOptions:Landroid/graphics/BitmapFactory$Options; + iput-boolean v1, v2, Landroid/graphics/BitmapFactory$Options;->inMutable:Z .line 779 @@ -742,17 +763,21 @@ invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;->(Ljava/lang/String;)V - goto :goto_3 - - :goto_2 throw p1 - :goto_3 - goto :goto_2 + return-void .end method .method public printBitmap(Ljava/lang/String;Landroid/graphics/Bitmap;)V .locals 1 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/graphics/Bitmap; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 v0, 0x0 @@ -764,6 +789,18 @@ .method public printBitmap(Ljava/lang/String;Landroid/graphics/Bitmap;Landroid/support/v4/print/PrintHelper$OnPrintFinishCallback;)V .locals 9 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/graphics/Bitmap; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/support/v4/print/PrintHelper$OnPrintFinishCallback; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 258 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -854,6 +891,14 @@ .method public printBitmap(Ljava/lang/String;Landroid/net/Uri;)V .locals 1 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/net/Uri; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Ljava/io/FileNotFoundException; @@ -870,6 +915,18 @@ .method public printBitmap(Ljava/lang/String;Landroid/net/Uri;Landroid/support/v4/print/PrintHelper$OnPrintFinishCallback;)V .locals 8 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/net/Uri; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/support/v4/print/PrintHelper$OnPrintFinishCallback; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Ljava/io/FileNotFoundException; @@ -997,6 +1054,9 @@ .method writeBitmap(Landroid/print/PrintAttributes;ILandroid/graphics/Bitmap;Landroid/os/ParcelFileDescriptor;Landroid/os/CancellationSignal;Landroid/print/PrintDocumentAdapter$WriteResultCallback;)V .locals 11 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x13 + .end annotation .line 626 sget-boolean v0, Landroid/support/v4/print/PrintHelper;->IS_MIN_MARGINS_HANDLING_CORRECT:Z diff --git a/smali/android/support/v4/provider/DocumentFile.smali b/smali/android/support/v4/provider/DocumentFile.smali index bd73c8e9..e07b94ee 100644 --- a/smali/android/support/v4/provider/DocumentFile.smali +++ b/smali/android/support/v4/provider/DocumentFile.smali @@ -9,11 +9,18 @@ # instance fields .field private final mParent:Landroid/support/v4/provider/DocumentFile; + .annotation build Landroid/support/annotation/Nullable; + .end annotation +.end field # direct methods .method constructor (Landroid/support/v4/provider/DocumentFile;)V .locals 0 + .param p1 # Landroid/support/v4/provider/DocumentFile; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 88 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -26,6 +33,12 @@ .method public static fromFile(Ljava/io/File;)Landroid/support/v4/provider/DocumentFile; .locals 2 + .param p0 # Ljava/io/File; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 102 new-instance v0, Landroid/support/v4/provider/RawDocumentFile; @@ -39,6 +52,16 @@ .method public static fromSingleUri(Landroid/content/Context;Landroid/net/Uri;)Landroid/support/v4/provider/DocumentFile; .locals 3 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/net/Uri; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 117 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -62,6 +85,16 @@ .method public static fromTreeUri(Landroid/content/Context;Landroid/net/Uri;)Landroid/support/v4/provider/DocumentFile; .locals 3 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/net/Uri; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 135 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -95,6 +128,14 @@ .method public static isDocumentUri(Landroid/content/Context;Landroid/net/Uri;)Z .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/net/Uri; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 149 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -125,9 +166,25 @@ .end method .method public abstract createDirectory(Ljava/lang/String;)Landroid/support/v4/provider/DocumentFile; + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method .method public abstract createFile(Ljava/lang/String;Ljava/lang/String;)Landroid/support/v4/provider/DocumentFile; + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method .method public abstract delete()Z @@ -138,6 +195,12 @@ .method public findFile(Ljava/lang/String;)Landroid/support/v4/provider/DocumentFile; .locals 5 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 338 invoke-virtual {p0}, Landroid/support/v4/provider/DocumentFile;->listFiles()[Landroid/support/v4/provider/DocumentFile; @@ -178,10 +241,14 @@ .end method .method public abstract getName()Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method .method public getParentFile()Landroid/support/v4/provider/DocumentFile; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 229 iget-object v0, p0, Landroid/support/v4/provider/DocumentFile;->mParent:Landroid/support/v4/provider/DocumentFile; @@ -190,9 +257,13 @@ .end method .method public abstract getType()Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method .method public abstract getUri()Landroid/net/Uri; + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract isDirectory()Z @@ -211,7 +282,13 @@ .end method .method public abstract listFiles()[Landroid/support/v4/provider/DocumentFile; + .annotation build Landroid/support/annotation/NonNull; + .end annotation .end method .method public abstract renameTo(Ljava/lang/String;)Z + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method diff --git a/smali/android/support/v4/provider/DocumentsContractApi19.smali b/smali/android/support/v4/provider/DocumentsContractApi19.smali index 8a8a13c5..62db804e 100644 --- a/smali/android/support/v4/provider/DocumentsContractApi19.smali +++ b/smali/android/support/v4/provider/DocumentsContractApi19.smali @@ -3,6 +3,12 @@ .source "DocumentsContractApi19.java" +# annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0x13 +.end annotation + + # static fields .field private static final FLAG_VIRTUAL_DOCUMENT:I = 0x200 @@ -136,6 +142,10 @@ .method private static closeQuietly(Ljava/lang/AutoCloseable;)V .locals 0 + .param p0 # Ljava/lang/AutoCloseable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param if-eqz p0, :cond_0 @@ -268,6 +278,8 @@ .method public static getName(Landroid/content/Context;Landroid/net/Uri;)Ljava/lang/String; .locals 2 + .annotation build Landroid/support/annotation/Nullable; + .end annotation const-string v0, "_display_name" @@ -283,6 +295,8 @@ .method private static getRawType(Landroid/content/Context;Landroid/net/Uri;)Ljava/lang/String; .locals 2 + .annotation build Landroid/support/annotation/Nullable; + .end annotation const-string v0, "mime_type" @@ -298,6 +312,8 @@ .method public static getType(Landroid/content/Context;Landroid/net/Uri;)Ljava/lang/String; .locals 0 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 59 invoke-static {p0, p1}, Landroid/support/v4/provider/DocumentsContractApi19;->getRawType(Landroid/content/Context;Landroid/net/Uri;)Ljava/lang/String; @@ -466,6 +482,7 @@ const/4 v6, 0x0 + .line 188 :try_start_0 new-array v2, p0, [Ljava/lang/String; @@ -481,7 +498,6 @@ move-object v1, p1 - .line 188 invoke-virtual/range {v0 .. v5}, Landroid/content/ContentResolver;->query(Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor; move-result-object v6 @@ -560,6 +576,12 @@ .method private static queryForString(Landroid/content/Context;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; .locals 7 + .param p3 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 159 invoke-virtual {p0}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver; @@ -570,6 +592,7 @@ const/4 v6, 0x0 + .line 163 :try_start_0 new-array v2, p0, [Ljava/lang/String; @@ -585,7 +608,6 @@ move-object v1, p1 - .line 163 invoke-virtual/range {v0 .. v5}, Landroid/content/ContentResolver;->query(Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor; move-result-object v6 diff --git a/smali/android/support/v4/provider/FontRequest.smali b/smali/android/support/v4/provider/FontRequest.smali index bcf35caa..89cbf6de 100644 --- a/smali/android/support/v4/provider/FontRequest.smali +++ b/smali/android/support/v4/provider/FontRequest.smali @@ -27,7 +27,23 @@ # direct methods .method public constructor (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V - .locals 1 + .locals 0 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # I + .annotation build Landroid/support/annotation/ArrayRes; + .end annotation + .end param .line 78 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -44,59 +60,65 @@ .line 80 invoke-static {p2}, Landroid/support/v4/util/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object p2 + move-result-object p1 - check-cast p2, Ljava/lang/String; + check-cast p1, Ljava/lang/String; - iput-object p2, p0, Landroid/support/v4/provider/FontRequest;->mProviderPackage:Ljava/lang/String; + iput-object p1, p0, Landroid/support/v4/provider/FontRequest;->mProviderPackage:Ljava/lang/String; .line 81 invoke-static {p3}, Landroid/support/v4/util/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object p3 + move-result-object p1 - check-cast p3, Ljava/lang/String; + check-cast p1, Ljava/lang/String; - iput-object p3, p0, Landroid/support/v4/provider/FontRequest;->mQuery:Ljava/lang/String; + iput-object p1, p0, Landroid/support/v4/provider/FontRequest;->mQuery:Ljava/lang/String; - const/4 v0, 0x0 + const/4 p1, 0x0 .line 82 - iput-object v0, p0, Landroid/support/v4/provider/FontRequest;->mCertificates:Ljava/util/List; + iput-object p1, p0, Landroid/support/v4/provider/FontRequest;->mCertificates:Ljava/util/List; if-eqz p4, :cond_0 - const/4 v0, 0x1 + const/4 p1, 0x1 goto :goto_0 :cond_0 - const/4 v0, 0x0 + const/4 p1, 0x0 .line 83 :goto_0 - invoke-static {v0}, Landroid/support/v4/util/Preconditions;->checkArgument(Z)V + invoke-static {p1}, Landroid/support/v4/util/Preconditions;->checkArgument(Z)V .line 84 iput p4, p0, Landroid/support/v4/provider/FontRequest;->mCertificatesArray:I .line 85 - new-instance p4, Ljava/lang/StringBuilder; + new-instance p1, Ljava/lang/StringBuilder; + + iget-object p2, p0, Landroid/support/v4/provider/FontRequest;->mProviderAuthority:Ljava/lang/String; - invoke-direct {p4, p1}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V + invoke-direct {p1, p2}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V - const-string p1, "-" + const-string p2, "-" - invoke-virtual {p4, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {p4, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + iget-object p3, p0, Landroid/support/v4/provider/FontRequest;->mProviderPackage:Ljava/lang/String; + + invoke-virtual {p1, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; .line 86 - invoke-virtual {p4, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + iget-object p2, p0, Landroid/support/v4/provider/FontRequest;->mQuery:Ljava/lang/String; - invoke-virtual {p4, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {p4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; move-result-object p1 @@ -107,6 +129,22 @@ .method public constructor (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;)V .locals 0 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Ljava/util/List; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -134,52 +172,58 @@ .line 58 invoke-static {p2}, Landroid/support/v4/util/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object p2 + move-result-object p1 - check-cast p2, Ljava/lang/String; + check-cast p1, Ljava/lang/String; - iput-object p2, p0, Landroid/support/v4/provider/FontRequest;->mProviderPackage:Ljava/lang/String; + iput-object p1, p0, Landroid/support/v4/provider/FontRequest;->mProviderPackage:Ljava/lang/String; .line 59 invoke-static {p3}, Landroid/support/v4/util/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object p3 + move-result-object p1 - check-cast p3, Ljava/lang/String; + check-cast p1, Ljava/lang/String; - iput-object p3, p0, Landroid/support/v4/provider/FontRequest;->mQuery:Ljava/lang/String; + iput-object p1, p0, Landroid/support/v4/provider/FontRequest;->mQuery:Ljava/lang/String; .line 60 invoke-static {p4}, Landroid/support/v4/util/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object p4 + move-result-object p1 - check-cast p4, Ljava/util/List; + check-cast p1, Ljava/util/List; - iput-object p4, p0, Landroid/support/v4/provider/FontRequest;->mCertificates:Ljava/util/List; + iput-object p1, p0, Landroid/support/v4/provider/FontRequest;->mCertificates:Ljava/util/List; - const/4 p4, 0x0 + const/4 p1, 0x0 .line 61 - iput p4, p0, Landroid/support/v4/provider/FontRequest;->mCertificatesArray:I + iput p1, p0, Landroid/support/v4/provider/FontRequest;->mCertificatesArray:I .line 62 - new-instance p4, Ljava/lang/StringBuilder; + new-instance p1, Ljava/lang/StringBuilder; + + iget-object p2, p0, Landroid/support/v4/provider/FontRequest;->mProviderAuthority:Ljava/lang/String; - invoke-direct {p4, p1}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V + invoke-direct {p1, p2}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V - const-string p1, "-" + const-string p2, "-" - invoke-virtual {p4, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {p4, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + iget-object p3, p0, Landroid/support/v4/provider/FontRequest;->mProviderPackage:Ljava/lang/String; + + invoke-virtual {p1, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; .line 63 - invoke-virtual {p4, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + iget-object p2, p0, Landroid/support/v4/provider/FontRequest;->mQuery:Ljava/lang/String; - invoke-virtual {p4, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {p1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {p4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; move-result-object p1 @@ -192,6 +236,9 @@ # virtual methods .method public getCertificates()Ljava/util/List; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "()", @@ -209,6 +256,8 @@ .method public getCertificatesArrayResId()I .locals 1 + .annotation build Landroid/support/annotation/ArrayRes; + .end annotation .line 137 iget v0, p0, Landroid/support/v4/provider/FontRequest;->mCertificatesArray:I @@ -218,6 +267,11 @@ .method public getIdentifier()Ljava/lang/String; .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 143 iget-object v0, p0, Landroid/support/v4/provider/FontRequest;->mIdentifier:Ljava/lang/String; @@ -227,6 +281,8 @@ .method public getProviderAuthority()Ljava/lang/String; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 95 iget-object v0, p0, Landroid/support/v4/provider/FontRequest;->mProviderAuthority:Ljava/lang/String; @@ -236,6 +292,8 @@ .method public getProviderPackage()Ljava/lang/String; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 104 iget-object v0, p0, Landroid/support/v4/provider/FontRequest;->mProviderPackage:Ljava/lang/String; @@ -245,6 +303,8 @@ .method public getQuery()Ljava/lang/String; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 113 iget-object v0, p0, Landroid/support/v4/provider/FontRequest;->mQuery:Ljava/lang/String; diff --git a/smali/android/support/v4/provider/FontsContractCompat$3.smali b/smali/android/support/v4/provider/FontsContractCompat$3.smali index ddb5e16c..5fd081a4 100644 --- a/smali/android/support/v4/provider/FontsContractCompat$3.smali +++ b/smali/android/support/v4/provider/FontsContractCompat$3.smali @@ -119,13 +119,9 @@ :try_end_1 .catchall {:try_start_1 .. :try_end_1} :catchall_0 - goto :goto_2 - - :goto_1 throw p1 - :goto_2 - goto :goto_1 + return-void .end method .method public bridge synthetic onReply(Ljava/lang/Object;)V diff --git a/smali/android/support/v4/provider/FontsContractCompat$5.smali b/smali/android/support/v4/provider/FontsContractCompat$5.smali index e72ed705..84beb233 100644 --- a/smali/android/support/v4/provider/FontsContractCompat$5.smali +++ b/smali/android/support/v4/provider/FontsContractCompat$5.smali @@ -67,6 +67,7 @@ array-length p2, p2 + :goto_0 sub-int/2addr p1, p2 return p1 @@ -77,7 +78,7 @@ const/4 v1, 0x0 .line 782 - :goto_0 + :goto_1 array-length v2, p1 if-ge v1, v2, :cond_2 @@ -89,14 +90,17 @@ if-eq v2, v3, :cond_1 - sub-int/2addr v2, v3 + .line 784 + aget-byte p1, p1, v1 - return v2 + aget-byte p2, p2, v1 + + goto :goto_0 :cond_1 add-int/lit8 v1, v1, 0x1 - goto :goto_0 + goto :goto_1 :cond_2 return v0 diff --git a/smali/android/support/v4/provider/FontsContractCompat$FontFamilyResult.smali b/smali/android/support/v4/provider/FontsContractCompat$FontFamilyResult.smali index 725d646e..42634bf4 100644 --- a/smali/android/support/v4/provider/FontsContractCompat$FontFamilyResult.smali +++ b/smali/android/support/v4/provider/FontsContractCompat$FontFamilyResult.smali @@ -31,6 +31,15 @@ # direct methods .method public constructor (I[Landroid/support/v4/provider/FontsContractCompat$FontInfo;)V .locals 0 + .param p2 # [Landroid/support/v4/provider/FontsContractCompat$FontInfo; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 428 invoke-direct {p0}, Ljava/lang/Object;->()V diff --git a/smali/android/support/v4/provider/FontsContractCompat$FontInfo.smali b/smali/android/support/v4/provider/FontsContractCompat$FontInfo.smali index 6855f507..533c7ed3 100644 --- a/smali/android/support/v4/provider/FontsContractCompat$FontInfo.smali +++ b/smali/android/support/v4/provider/FontsContractCompat$FontInfo.smali @@ -29,6 +29,26 @@ # direct methods .method public constructor (Landroid/net/Uri;IIZI)V .locals 0 + .param p1 # Landroid/net/Uri; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + .end annotation + .end param + .param p3 # I + .annotation build Landroid/support/annotation/IntRange; + from = 0x1L + to = 0x3e8L + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 347 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -70,6 +90,9 @@ .method public getTtcIndex()I .locals 1 + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + .end annotation .line 366 iget v0, p0, Landroid/support/v4/provider/FontsContractCompat$FontInfo;->mTtcIndex:I @@ -79,6 +102,8 @@ .method public getUri()Landroid/net/Uri; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 359 iget-object v0, p0, Landroid/support/v4/provider/FontsContractCompat$FontInfo;->mUri:Landroid/net/Uri; @@ -88,6 +113,10 @@ .method public getWeight()I .locals 1 + .annotation build Landroid/support/annotation/IntRange; + from = 0x1L + to = 0x3e8L + .end annotation .line 373 iget v0, p0, Landroid/support/v4/provider/FontsContractCompat$FontInfo;->mWeight:I diff --git a/smali/android/support/v4/provider/FontsContractCompat$FontRequestCallback$FontRequestFailReason.smali b/smali/android/support/v4/provider/FontsContractCompat$FontRequestCallback$FontRequestFailReason.smali index 4140d04e..b4bbc561 100644 --- a/smali/android/support/v4/provider/FontsContractCompat$FontRequestCallback$FontRequestFailReason.smali +++ b/smali/android/support/v4/provider/FontsContractCompat$FontRequestCallback$FontRequestFailReason.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/provider/FontsContractCompat$FontRequestCallback; .end annotation diff --git a/smali/android/support/v4/provider/FontsContractCompat$FontRequestCallback.smali b/smali/android/support/v4/provider/FontsContractCompat$FontRequestCallback.smali index c7c85b50..28543015 100644 --- a/smali/android/support/v4/provider/FontsContractCompat$FontRequestCallback.smali +++ b/smali/android/support/v4/provider/FontsContractCompat$FontRequestCallback.smali @@ -36,6 +36,12 @@ .field public static final FAIL_REASON_WRONG_CERTIFICATES:I = -0x2 .field public static final RESULT_OK:I + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field # direct methods diff --git a/smali/android/support/v4/provider/FontsContractCompat$TypefaceResult.smali b/smali/android/support/v4/provider/FontsContractCompat$TypefaceResult.smali index 42047931..65127a3e 100644 --- a/smali/android/support/v4/provider/FontsContractCompat$TypefaceResult.smali +++ b/smali/android/support/v4/provider/FontsContractCompat$TypefaceResult.smali @@ -23,6 +23,10 @@ # direct methods .method constructor (Landroid/graphics/Typeface;I)V .locals 0 + .param p1 # Landroid/graphics/Typeface; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 213 invoke-direct {p0}, Ljava/lang/Object;->()V diff --git a/smali/android/support/v4/provider/FontsContractCompat.smali b/smali/android/support/v4/provider/FontsContractCompat.smali index 0763f46e..c62676e9 100644 --- a/smali/android/support/v4/provider/FontsContractCompat.smali +++ b/smali/android/support/v4/provider/FontsContractCompat.smali @@ -19,10 +19,28 @@ .field private static final BACKGROUND_THREAD_KEEP_ALIVE_DURATION_MS:I = 0x2710 .field public static final PARCEL_FONT_RESULTS:Ljava/lang/String; = "font_results" + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field .field static final RESULT_CODE_PROVIDER_NOT_FOUND:I = -0x1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field .field static final RESULT_CODE_WRONG_CERTIFICATES:I = -0x2 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field .field private static final TAG:Ljava/lang/String; = "FontsContractCompat" @@ -40,6 +58,10 @@ .field static final sLock:Ljava/lang/Object; .field static final sPendingReplies:Landroid/support/v4/util/SimpleArrayMap; + .annotation build Landroid/support/annotation/GuardedBy; + value = "sLock" + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "Landroid/support/v4/util/SimpleArrayMap<", @@ -125,6 +147,20 @@ .method public static buildTypeface(Landroid/content/Context;Landroid/os/CancellationSignal;[Landroid/support/v4/provider/FontsContractCompat$FontInfo;)Landroid/graphics/Typeface; .locals 1 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/os/CancellationSignal; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p2 # [Landroid/support/v4/provider/FontsContractCompat$FontInfo; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation const/4 v0, 0x0 @@ -250,6 +286,21 @@ .method public static fetchFonts(Landroid/content/Context;Landroid/os/CancellationSignal;Landroid/support/v4/provider/FontRequest;)Landroid/support/v4/provider/FontsContractCompat$FontFamilyResult; .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/os/CancellationSignal; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p2 # Landroid/support/v4/provider/FontRequest; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Landroid/content/pm/PackageManager$NameNotFoundException; @@ -345,6 +396,11 @@ .method static getFontFromProvider(Landroid/content/Context;Landroid/support/v4/provider/FontRequest;Ljava/lang/String;Landroid/os/CancellationSignal;)[Landroid/support/v4/provider/FontsContractCompat$FontInfo; .locals 20 + .annotation build Landroid/support/annotation/NonNull; + .end annotation + + .annotation build Landroid/support/annotation/VisibleForTesting; + .end annotation move-object/from16 v0, p2 @@ -686,10 +742,10 @@ .line 870 invoke-interface {v3}, Landroid/database/Cursor;->close()V + .line 873 :cond_8 new-array v0, v12, [Landroid/support/v4/provider/FontsContractCompat$FontInfo; - .line 873 invoke-virtual {v1, v0}, Ljava/util/ArrayList;->toArray([Ljava/lang/Object;)[Ljava/lang/Object; move-result-object v0 @@ -707,17 +763,15 @@ invoke-interface {v3}, Landroid/database/Cursor;->close()V :cond_9 - goto :goto_8 - - :goto_7 throw v0 - :goto_8 - goto :goto_7 + return-void .end method .method static getFontInternal(Landroid/content/Context;Landroid/support/v4/provider/FontRequest;I)Landroid/support/v4/provider/FontsContractCompat$TypefaceResult; .locals 3 + .annotation build Landroid/support/annotation/NonNull; + .end annotation const/4 v0, 0x0 @@ -793,6 +847,19 @@ .method public static getFontSync(Landroid/content/Context;Landroid/support/v4/provider/FontRequest;Landroid/support/v4/content/res/ResourcesCompat$FontCallback;Landroid/os/Handler;ZII)Landroid/graphics/Typeface; .locals 2 + .param p2 # Landroid/support/v4/content/res/ResourcesCompat$FontCallback; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # Landroid/os/Handler; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 234 new-instance v0, Ljava/lang/StringBuilder; @@ -925,13 +992,15 @@ invoke-virtual {p3, v0}, Landroid/support/v4/util/SimpleArrayMap;->containsKey(Ljava/lang/Object;)Z - move-result p4 + move-result p3 - if-eqz p4, :cond_8 + if-eqz p3, :cond_8 if-eqz p1, :cond_7 .line 294 + sget-object p3, Landroid/support/v4/provider/FontsContractCompat;->sPendingReplies:Landroid/support/v4/util/SimpleArrayMap; + invoke-virtual {p3, v0}, Landroid/support/v4/util/SimpleArrayMap;->get(Ljava/lang/Object;)Ljava/lang/Object; move-result-object p3 @@ -950,15 +1019,17 @@ if-eqz p1, :cond_9 .line 299 - new-instance p4, Ljava/util/ArrayList; + new-instance p3, Ljava/util/ArrayList; - invoke-direct {p4}, Ljava/util/ArrayList;->()V + invoke-direct {p3}, Ljava/util/ArrayList;->()V .line 300 - invoke-virtual {p4, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + invoke-virtual {p3, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z .line 301 - invoke-virtual {p3, v0, p4}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + sget-object p1, Landroid/support/v4/provider/FontsContractCompat;->sPendingReplies:Landroid/support/v4/util/SimpleArrayMap; + + invoke-virtual {p1, v0, p3}, Landroid/support/v4/util/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 303 :cond_9 @@ -991,6 +1062,30 @@ .method public static getProvider(Landroid/content/pm/PackageManager;Landroid/support/v4/provider/FontRequest;Landroid/content/res/Resources;)Landroid/content/pm/ProviderInfo; .locals 5 + .param p0 # Landroid/content/pm/PackageManager; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/support/v4/provider/FontRequest; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation + + .annotation build Landroid/support/annotation/VisibleForTesting; + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Landroid/content/pm/PackageManager$NameNotFoundException; @@ -1146,17 +1241,23 @@ invoke-direct {p0, p1}, Landroid/content/pm/PackageManager$NameNotFoundException;->(Ljava/lang/String;)V - goto :goto_2 - - :goto_1 throw p0 - :goto_2 - goto :goto_1 + return-void .end method .method public static prepareFontData(Landroid/content/Context;[Landroid/support/v4/provider/FontsContractCompat$FontInfo;Landroid/os/CancellationSignal;)Ljava/util/Map; .locals 5 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x13 + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -1236,6 +1337,22 @@ .method public static requestFont(Landroid/content/Context;Landroid/support/v4/provider/FontRequest;Landroid/support/v4/provider/FontsContractCompat$FontRequestCallback;Landroid/os/Handler;)V .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/support/v4/provider/FontRequest; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v4/provider/FontsContractCompat$FontRequestCallback; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/os/Handler; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 532 new-instance v0, Landroid/os/Handler; @@ -1254,6 +1371,11 @@ .method public static resetCache()V .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 225 sget-object v0, Landroid/support/v4/provider/FontsContractCompat;->sTypefaceCache:Landroid/support/v4/util/LruCache; diff --git a/smali/android/support/v4/provider/RawDocumentFile.smali b/smali/android/support/v4/provider/RawDocumentFile.smali index 2fc6245d..e13f6e1d 100644 --- a/smali/android/support/v4/provider/RawDocumentFile.smali +++ b/smali/android/support/v4/provider/RawDocumentFile.smali @@ -10,6 +10,10 @@ # direct methods .method constructor (Landroid/support/v4/provider/DocumentFile;Ljava/io/File;)V .locals 0 + .param p1 # Landroid/support/v4/provider/DocumentFile; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 33 invoke-direct {p0, p1}, Landroid/support/v4/provider/DocumentFile;->(Landroid/support/v4/provider/DocumentFile;)V @@ -30,19 +34,21 @@ const/4 v0, 0x1 - if-eqz p0, :cond_2 + if-eqz p0, :cond_3 .line 172 array-length v1, p0 const/4 v2, 0x0 - const/4 v3, 0x0 + const/4 v0, 0x0 + + const/4 v3, 0x1 :goto_0 - if-ge v3, v1, :cond_2 + if-ge v0, v1, :cond_2 - aget-object v4, p0, v3 + aget-object v4, p0, v0 .line 173 invoke-virtual {v4}, Ljava/io/File;->isDirectory()Z @@ -56,7 +62,7 @@ move-result v5 - and-int/2addr v0, v5 + and-int/2addr v3, v5 .line 176 :cond_0 @@ -67,32 +73,35 @@ if-nez v5, :cond_1 .line 177 - new-instance v0, Ljava/lang/StringBuilder; + new-instance v3, Ljava/lang/StringBuilder; - invoke-direct {v0}, Ljava/lang/StringBuilder;->()V + invoke-direct {v3}, Ljava/lang/StringBuilder;->()V const-string v5, "Failed to delete " - invoke-virtual {v0, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v3, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v0 + move-result-object v3 const-string v4, "DocumentFile" - invoke-static {v4, v0}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I + invoke-static {v4, v3}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I - const/4 v0, 0x0 + const/4 v3, 0x0 :cond_1 - add-int/lit8 v3, v3, 0x1 + add-int/lit8 v0, v0, 0x1 goto :goto_0 :cond_2 + move v0, v3 + + :cond_3 return v0 .end method @@ -168,6 +177,8 @@ .method public createDirectory(Ljava/lang/String;)Landroid/support/v4/provider/DocumentFile; .locals 2 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 58 new-instance v0, Ljava/io/File; @@ -208,6 +219,8 @@ .method public createFile(Ljava/lang/String;Ljava/lang/String;)Landroid/support/v4/provider/DocumentFile; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 41 invoke-static {}, Landroid/webkit/MimeTypeMap;->getSingleton()Landroid/webkit/MimeTypeMap; @@ -331,6 +344,8 @@ .method public getType()Ljava/lang/String; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 79 iget-object v0, p0, Landroid/support/v4/provider/RawDocumentFile;->mFile:Ljava/io/File; diff --git a/smali/android/support/v4/provider/SelfDestructiveThread.smali b/smali/android/support/v4/provider/SelfDestructiveThread.smali index b45d6ce8..ee332a25 100644 --- a/smali/android/support/v4/provider/SelfDestructiveThread.smali +++ b/smali/android/support/v4/provider/SelfDestructiveThread.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v4/provider/SelfDestructiveThread$ReplyCallback; @@ -23,14 +29,26 @@ .field private final mDestructAfterMillisec:I .field private mGeneration:I + .annotation build Landroid/support/annotation/GuardedBy; + value = "mLock" + .end annotation +.end field .field private mHandler:Landroid/os/Handler; + .annotation build Landroid/support/annotation/GuardedBy; + value = "mLock" + .end annotation +.end field .field private final mLock:Ljava/lang/Object; .field private final mPriority:I .field private mThread:Landroid/os/HandlerThread; + .annotation build Landroid/support/annotation/GuardedBy; + value = "mLock" + .end annotation +.end field .field private final mThreadName:Ljava/lang/String; @@ -101,6 +119,8 @@ iput-object v1, p0, Landroid/support/v4/provider/SelfDestructiveThread;->mThread:Landroid/os/HandlerThread; .line 110 + iget-object v1, p0, Landroid/support/v4/provider/SelfDestructiveThread;->mThread:Landroid/os/HandlerThread; + invoke-virtual {v1}, Landroid/os/HandlerThread;->start()V .line 111 @@ -136,7 +156,9 @@ .line 115 iget-object v1, p0, Landroid/support/v4/provider/SelfDestructiveThread;->mHandler:Landroid/os/Handler; - invoke-virtual {v1, v2, p1}, Landroid/os/Handler;->obtainMessage(ILjava/lang/Object;)Landroid/os/Message; + iget-object v3, p0, Landroid/support/v4/provider/SelfDestructiveThread;->mHandler:Landroid/os/Handler; + + invoke-virtual {v3, v2, p1}, Landroid/os/Handler;->obtainMessage(ILjava/lang/Object;)Landroid/os/Message; move-result-object p1 @@ -161,6 +183,8 @@ # virtual methods .method public getGeneration()I .locals 2 + .annotation build Landroid/support/annotation/VisibleForTesting; + .end annotation .line 101 iget-object v0, p0, Landroid/support/v4/provider/SelfDestructiveThread;->mLock:Ljava/lang/Object; @@ -188,6 +212,8 @@ .method public isRunning()Z .locals 2 + .annotation build Landroid/support/annotation/VisibleForTesting; + .end annotation .line 91 iget-object v0, p0, Landroid/support/v4/provider/SelfDestructiveThread;->mLock:Ljava/lang/Object; @@ -299,7 +325,9 @@ .line 217 iget-object v0, p0, Landroid/support/v4/provider/SelfDestructiveThread;->mHandler:Landroid/os/Handler; - invoke-virtual {v0, v1}, Landroid/os/Handler;->obtainMessage(I)Landroid/os/Message; + iget-object v2, p0, Landroid/support/v4/provider/SelfDestructiveThread;->mHandler:Landroid/os/Handler; + + invoke-virtual {v2, v1}, Landroid/os/Handler;->obtainMessage(I)Landroid/os/Message; move-result-object v1 @@ -509,11 +537,7 @@ .line 209 invoke-virtual {v7}, Ljava/util/concurrent/locks/ReentrantLock;->unlock()V - goto :goto_2 - - :goto_1 throw p1 - :goto_2 - goto :goto_1 + return-void .end method diff --git a/smali/android/support/v4/provider/SingleDocumentFile.smali b/smali/android/support/v4/provider/SingleDocumentFile.smali index b450f29d..92d55cef 100644 --- a/smali/android/support/v4/provider/SingleDocumentFile.smali +++ b/smali/android/support/v4/provider/SingleDocumentFile.smali @@ -3,6 +3,12 @@ .source "SingleDocumentFile.java" +# annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0x13 +.end annotation + + # instance fields .field private mContext:Landroid/content/Context; @@ -12,6 +18,10 @@ # direct methods .method constructor (Landroid/support/v4/provider/DocumentFile;Landroid/content/Context;Landroid/net/Uri;)V .locals 0 + .param p1 # Landroid/support/v4/provider/DocumentFile; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 32 invoke-direct {p0, p1}, Landroid/support/v4/provider/DocumentFile;->(Landroid/support/v4/provider/DocumentFile;)V @@ -123,6 +133,8 @@ .method public getName()Ljava/lang/String; .locals 2 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 55 iget-object v0, p0, Landroid/support/v4/provider/SingleDocumentFile;->mContext:Landroid/content/Context; @@ -138,6 +150,8 @@ .method public getType()Ljava/lang/String; .locals 2 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 61 iget-object v0, p0, Landroid/support/v4/provider/SingleDocumentFile;->mContext:Landroid/content/Context; diff --git a/smali/android/support/v4/provider/TreeDocumentFile.smali b/smali/android/support/v4/provider/TreeDocumentFile.smali index 19b0775b..5c5d2c3f 100644 --- a/smali/android/support/v4/provider/TreeDocumentFile.smali +++ b/smali/android/support/v4/provider/TreeDocumentFile.smali @@ -3,6 +3,12 @@ .source "TreeDocumentFile.java" +# annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0x15 +.end annotation + + # instance fields .field private mContext:Landroid/content/Context; @@ -12,6 +18,10 @@ # direct methods .method constructor (Landroid/support/v4/provider/DocumentFile;Landroid/content/Context;Landroid/net/Uri;)V .locals 0 + .param p1 # Landroid/support/v4/provider/DocumentFile; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 37 invoke-direct {p0, p1}, Landroid/support/v4/provider/DocumentFile;->(Landroid/support/v4/provider/DocumentFile;)V @@ -27,6 +37,10 @@ .method private static closeQuietly(Ljava/lang/AutoCloseable;)V .locals 0 + .param p0 # Ljava/lang/AutoCloseable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param if-eqz p0, :cond_0 @@ -53,6 +67,8 @@ .method private static createFile(Landroid/content/Context;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;)Landroid/net/Uri; .locals 0 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 53 :try_start_0 @@ -108,6 +124,8 @@ .method public createDirectory(Ljava/lang/String;)Landroid/support/v4/provider/DocumentFile; .locals 3 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 63 iget-object v0, p0, Landroid/support/v4/provider/TreeDocumentFile;->mContext:Landroid/content/Context; @@ -140,6 +158,8 @@ .method public createFile(Ljava/lang/String;Ljava/lang/String;)Landroid/support/v4/provider/DocumentFile; .locals 2 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 45 iget-object v0, p0, Landroid/support/v4/provider/TreeDocumentFile;->mContext:Landroid/content/Context; @@ -212,6 +232,8 @@ .method public getName()Ljava/lang/String; .locals 2 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 76 iget-object v0, p0, Landroid/support/v4/provider/TreeDocumentFile;->mContext:Landroid/content/Context; @@ -227,6 +249,8 @@ .method public getType()Ljava/lang/String; .locals 2 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 82 iget-object v0, p0, Landroid/support/v4/provider/TreeDocumentFile;->mContext:Landroid/content/Context; @@ -488,13 +512,9 @@ :goto_4 invoke-static {v8}, Landroid/support/v4/provider/TreeDocumentFile;->closeQuietly(Ljava/lang/AutoCloseable;)V - goto :goto_6 - - :goto_5 throw v0 - :goto_6 - goto :goto_5 + return-void .end method .method public renameTo(Ljava/lang/String;)Z diff --git a/smali/android/support/v4/text/BidiFormatter$DirectionalityEstimator.smali b/smali/android/support/v4/text/BidiFormatter$DirectionalityEstimator.smali index 9045c3ad..1f551f0f 100644 --- a/smali/android/support/v4/text/BidiFormatter$DirectionalityEstimator.smali +++ b/smali/android/support/v4/text/BidiFormatter$DirectionalityEstimator.smali @@ -38,9 +38,9 @@ const/16 v0, 0x700 + .line 584 new-array v1, v0, [B - .line 584 sput-object v1, Landroid/support/v4/text/BidiFormatter$DirectionalityEstimator;->DIR_TYPE_CACHE:[B const/4 v1, 0x0 @@ -137,6 +137,9 @@ iput-char v1, p0, Landroid/support/v4/text/BidiFormatter$DirectionalityEstimator;->lastChar:C + .line 947 + iget-char v1, p0, Landroid/support/v4/text/BidiFormatter$DirectionalityEstimator;->lastChar:C + const/16 v3, 0x26 if-ne v1, v3, :cond_1 @@ -222,6 +225,9 @@ iput-char v1, p0, Landroid/support/v4/text/BidiFormatter$DirectionalityEstimator;->lastChar:C + .line 904 + iget-char v1, p0, Landroid/support/v4/text/BidiFormatter$DirectionalityEstimator;->lastChar:C + const/16 v3, 0x3c if-ne v1, v3, :cond_1 @@ -244,8 +250,11 @@ if-ne v1, v2, :cond_0 - .line 914 + .line 913 :cond_3 + iget-char v1, p0, Landroid/support/v4/text/BidiFormatter$DirectionalityEstimator;->lastChar:C + + .line 914 :goto_0 iget v2, p0, Landroid/support/v4/text/BidiFormatter$DirectionalityEstimator;->charIndex:I @@ -307,6 +316,9 @@ iput-char v1, p0, Landroid/support/v4/text/BidiFormatter$DirectionalityEstimator;->lastChar:C + .line 875 + iget-char v1, p0, Landroid/support/v4/text/BidiFormatter$DirectionalityEstimator;->lastChar:C + const/16 v2, 0x3e if-ne v1, v2, :cond_1 @@ -324,8 +336,11 @@ if-ne v1, v2, :cond_0 - .line 882 + .line 881 :cond_2 + iget-char v1, p0, Landroid/support/v4/text/BidiFormatter$DirectionalityEstimator;->lastChar:C + + .line 882 :goto_0 iget v2, p0, Landroid/support/v4/text/BidiFormatter$DirectionalityEstimator;->charIndex:I @@ -382,6 +397,8 @@ iput-char v0, p0, Landroid/support/v4/text/BidiFormatter$DirectionalityEstimator;->lastChar:C .line 847 + iget-char v0, p0, Landroid/support/v4/text/BidiFormatter$DirectionalityEstimator;->lastChar:C + invoke-static {v0}, Ljava/lang/Character;->isLowSurrogate(C)Z move-result v0 @@ -479,6 +496,8 @@ iput-char v0, p0, Landroid/support/v4/text/BidiFormatter$DirectionalityEstimator;->lastChar:C .line 817 + iget-char v0, p0, Landroid/support/v4/text/BidiFormatter$DirectionalityEstimator;->lastChar:C + invoke-static {v0}, Ljava/lang/Character;->isHighSurrogate(C)Z move-result v0 @@ -760,50 +779,50 @@ packed-switch v3, :pswitch_data_0 - if-nez v2, :cond_0 + if-nez v1, :cond_0 goto :goto_1 :pswitch_0 - add-int/lit8 v1, v1, 0x1 + add-int/lit8 v2, v2, 0x1 goto :goto_0 :pswitch_1 - if-ne v2, v1, :cond_1 + if-ne v1, v2, :cond_1 return v5 :pswitch_2 - if-ne v2, v1, :cond_1 + if-ne v1, v2, :cond_1 return v4 :cond_1 - add-int/lit8 v1, v1, -0x1 + add-int/lit8 v2, v2, -0x1 goto :goto_0 :cond_2 - if-nez v1, :cond_3 + if-nez v2, :cond_3 return v5 :cond_3 - if-nez v2, :cond_0 + if-nez v1, :cond_0 goto :goto_1 :cond_4 - if-nez v1, :cond_5 + if-nez v2, :cond_5 return v4 :cond_5 - if-nez v2, :cond_0 + if-nez v1, :cond_0 :goto_1 - move v2, v1 + move v1, v2 goto :goto_0 diff --git a/smali/android/support/v4/text/BidiFormatter.smali b/smali/android/support/v4/text/BidiFormatter.smali index 99051bec..1ce23a4f 100644 --- a/smali/android/support/v4/text/BidiFormatter.smali +++ b/smali/android/support/v4/text/BidiFormatter.smali @@ -63,43 +63,47 @@ sput-object v0, Landroid/support/v4/text/BidiFormatter;->DEFAULT_TEXT_DIRECTION_HEURISTIC:Landroid/support/v4/text/TextDirectionHeuristicCompat; - const/16 v1, 0x200e + const/16 v0, 0x200e .line 115 - invoke-static {v1}, Ljava/lang/Character;->toString(C)Ljava/lang/String; + invoke-static {v0}, Ljava/lang/Character;->toString(C)Ljava/lang/String; - move-result-object v1 + move-result-object v0 - sput-object v1, Landroid/support/v4/text/BidiFormatter;->LRM_STRING:Ljava/lang/String; + sput-object v0, Landroid/support/v4/text/BidiFormatter;->LRM_STRING:Ljava/lang/String; - const/16 v1, 0x200f + const/16 v0, 0x200f .line 120 - invoke-static {v1}, Ljava/lang/Character;->toString(C)Ljava/lang/String; + invoke-static {v0}, Ljava/lang/Character;->toString(C)Ljava/lang/String; - move-result-object v1 + move-result-object v0 - sput-object v1, Landroid/support/v4/text/BidiFormatter;->RLM_STRING:Ljava/lang/String; + sput-object v0, Landroid/support/v4/text/BidiFormatter;->RLM_STRING:Ljava/lang/String; .line 217 - new-instance v1, Landroid/support/v4/text/BidiFormatter; + new-instance v0, Landroid/support/v4/text/BidiFormatter; - const/4 v2, 0x0 + sget-object v1, Landroid/support/v4/text/BidiFormatter;->DEFAULT_TEXT_DIRECTION_HEURISTIC:Landroid/support/v4/text/TextDirectionHeuristicCompat; + + const/4 v2, 0x2 - const/4 v3, 0x2 + const/4 v3, 0x0 - invoke-direct {v1, v2, v3, v0}, Landroid/support/v4/text/BidiFormatter;->(ZILandroid/support/v4/text/TextDirectionHeuristicCompat;)V + invoke-direct {v0, v3, v2, v1}, Landroid/support/v4/text/BidiFormatter;->(ZILandroid/support/v4/text/TextDirectionHeuristicCompat;)V - sput-object v1, Landroid/support/v4/text/BidiFormatter;->DEFAULT_LTR_INSTANCE:Landroid/support/v4/text/BidiFormatter; + sput-object v0, Landroid/support/v4/text/BidiFormatter;->DEFAULT_LTR_INSTANCE:Landroid/support/v4/text/BidiFormatter; .line 222 - new-instance v1, Landroid/support/v4/text/BidiFormatter; + new-instance v0, Landroid/support/v4/text/BidiFormatter; + + sget-object v1, Landroid/support/v4/text/BidiFormatter;->DEFAULT_TEXT_DIRECTION_HEURISTIC:Landroid/support/v4/text/TextDirectionHeuristicCompat; - const/4 v2, 0x1 + const/4 v3, 0x1 - invoke-direct {v1, v2, v3, v0}, Landroid/support/v4/text/BidiFormatter;->(ZILandroid/support/v4/text/TextDirectionHeuristicCompat;)V + invoke-direct {v0, v3, v2, v1}, Landroid/support/v4/text/BidiFormatter;->(ZILandroid/support/v4/text/TextDirectionHeuristicCompat;)V - sput-object v1, Landroid/support/v4/text/BidiFormatter;->DEFAULT_RTL_INSTANCE:Landroid/support/v4/text/BidiFormatter; + sput-object v0, Landroid/support/v4/text/BidiFormatter;->DEFAULT_RTL_INSTANCE:Landroid/support/v4/text/BidiFormatter; return-void .end method diff --git a/smali/android/support/v4/text/HtmlCompat.smali b/smali/android/support/v4/text/HtmlCompat.smali index e5518f66..c1c3bddb 100644 --- a/smali/android/support/v4/text/HtmlCompat.smali +++ b/smali/android/support/v4/text/HtmlCompat.smali @@ -3,6 +3,14 @@ .source "HtmlCompat.java" +# annotations +.annotation build Landroid/annotation/SuppressLint; + value = { + "InlinedApi" + } +.end annotation + + # static fields .field public static final FROM_HTML_MODE_COMPACT:I = 0x3f @@ -39,6 +47,12 @@ .method public static fromHtml(Ljava/lang/String;I)Landroid/text/Spanned; .locals 2 + .param p0 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 146 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -65,6 +79,20 @@ .method public static fromHtml(Ljava/lang/String;ILandroid/text/Html$ImageGetter;Landroid/text/Html$TagHandler;)Landroid/text/Spanned; .locals 2 + .param p0 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/text/Html$ImageGetter; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # Landroid/text/Html$TagHandler; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 161 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -91,6 +119,12 @@ .method public static toHtml(Landroid/text/Spanned;I)Ljava/lang/String; .locals 2 + .param p0 # Landroid/text/Spanned; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 174 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/text/ICUCompat.smali b/smali/android/support/v4/text/ICUCompat.smali index 97c44097..6d16c6d6 100644 --- a/smali/android/support/v4/text/ICUCompat.smali +++ b/smali/android/support/v4/text/ICUCompat.smali @@ -36,9 +36,9 @@ move-result-object v0 + .line 39 new-array v2, v4, [Ljava/lang/Class; - .line 39 const-class v4, Ljava/util/Locale; aput-object v4, v2, v3 @@ -74,9 +74,9 @@ const-string v2, "getScript" + .line 48 new-array v5, v4, [Ljava/lang/Class; - .line 48 const-class v6, Ljava/lang/String; aput-object v6, v5, v3 @@ -87,9 +87,9 @@ sput-object v2, Landroid/support/v4/text/ICUCompat;->sGetScriptMethod:Ljava/lang/reflect/Method; + .line 50 new-array v2, v4, [Ljava/lang/Class; - .line 50 const-class v4, Ljava/lang/String; aput-object v4, v2, v3 @@ -150,18 +150,21 @@ if-eqz v1, :cond_0 - const/4 v2, 0x1 + const/4 v1, 0x1 - new-array v2, v2, [Ljava/lang/Object; + .line 128 + new-array v1, v1, [Ljava/lang/Object; - const/4 v3, 0x0 + const/4 v2, 0x0 - aput-object p0, v2, v3 + aput-object p0, v1, v2 + + .line 129 + sget-object v2, Landroid/support/v4/text/ICUCompat;->sAddLikelySubtagsMethod:Ljava/lang/reflect/Method; const/4 v3, 0x0 - .line 129 - invoke-virtual {v1, v3, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; + invoke-virtual {v2, v3, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; move-result-object v1 @@ -192,7 +195,7 @@ .end method .method private static getScript(Ljava/lang/String;)Ljava/lang/String; - .locals 5 + .locals 4 const-string v0, "ICUCompat" @@ -204,16 +207,19 @@ if-eqz v2, :cond_0 - const/4 v3, 0x1 + const/4 v2, 0x1 - new-array v3, v3, [Ljava/lang/Object; + .line 111 + new-array v2, v2, [Ljava/lang/Object; - const/4 v4, 0x0 + const/4 v3, 0x0 - aput-object p0, v3, v4 + aput-object p0, v2, v3 .line 112 - invoke-virtual {v2, v1, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; + sget-object p0, Landroid/support/v4/text/ICUCompat;->sGetScriptMethod:Ljava/lang/reflect/Method; + + invoke-virtual {p0, v1, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; move-result-object p0 @@ -245,6 +251,8 @@ .method public static maximizeAndGetScript(Ljava/util/Locale;)Ljava/lang/String; .locals 4 + .annotation build Landroid/support/annotation/Nullable; + .end annotation const-string v0, "ICUCompat" @@ -259,6 +267,7 @@ const/4 v1, 0x1 + .line 90 :try_start_0 new-array v1, v1, [Ljava/lang/Object; diff --git a/smali/android/support/v4/text/PrecomputedTextCompat$Params$Builder.smali b/smali/android/support/v4/text/PrecomputedTextCompat$Params$Builder.smali index b6320af2..ed03c1c1 100644 --- a/smali/android/support/v4/text/PrecomputedTextCompat$Params$Builder.smali +++ b/smali/android/support/v4/text/PrecomputedTextCompat$Params$Builder.smali @@ -20,6 +20,9 @@ .field private mHyphenationFrequency:I .field private final mPaint:Landroid/text/TextPaint; + .annotation build Landroid/support/annotation/NonNull; + .end annotation +.end field .field private mTextDir:Landroid/text/TextDirectionHeuristic; @@ -27,6 +30,10 @@ # direct methods .method public constructor (Landroid/text/TextPaint;)V .locals 1 + .param p1 # Landroid/text/TextPaint; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 115 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -88,6 +95,8 @@ # virtual methods .method public build()Landroid/support/v4/text/PrecomputedTextCompat$Params; .locals 5 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 190 new-instance v0, Landroid/support/v4/text/PrecomputedTextCompat$Params; @@ -107,6 +116,9 @@ .method public setBreakStrategy(I)Landroid/support/v4/text/PrecomputedTextCompat$Params$Builder; .locals 0 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x17 + .end annotation .line 144 iput p1, p0, Landroid/support/v4/text/PrecomputedTextCompat$Params$Builder;->mBreakStrategy:I @@ -116,6 +128,9 @@ .method public setHyphenationFrequency(I)Landroid/support/v4/text/PrecomputedTextCompat$Params$Builder; .locals 0 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x17 + .end annotation .line 162 iput p1, p0, Landroid/support/v4/text/PrecomputedTextCompat$Params$Builder;->mHyphenationFrequency:I @@ -125,6 +140,13 @@ .method public setTextDirection(Landroid/text/TextDirectionHeuristic;)Landroid/support/v4/text/PrecomputedTextCompat$Params$Builder; .locals 0 + .param p1 # Landroid/text/TextDirectionHeuristic; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x12 + .end annotation .line 180 iput-object p1, p0, Landroid/support/v4/text/PrecomputedTextCompat$Params$Builder;->mTextDir:Landroid/text/TextDirectionHeuristic; diff --git a/smali/android/support/v4/text/PrecomputedTextCompat$Params.smali b/smali/android/support/v4/text/PrecomputedTextCompat$Params.smali index f8bcb21e..5fe8bd61 100644 --- a/smali/android/support/v4/text/PrecomputedTextCompat$Params.smali +++ b/smali/android/support/v4/text/PrecomputedTextCompat$Params.smali @@ -26,8 +26,14 @@ .field private final mHyphenationFrequency:I .field private final mPaint:Landroid/text/TextPaint; + .annotation build Landroid/support/annotation/NonNull; + .end annotation +.end field .field private final mTextDir:Landroid/text/TextDirectionHeuristic; + .annotation build Landroid/support/annotation/Nullable; + .end annotation +.end field .field final mWrapped:Landroid/text/PrecomputedText$Params; @@ -35,6 +41,13 @@ # direct methods .method public constructor (Landroid/text/PrecomputedText$Params;)V .locals 1 + .param p1 # Landroid/text/PrecomputedText$Params; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x1c + .end annotation .line 209 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -75,6 +88,14 @@ .method constructor (Landroid/text/TextPaint;Landroid/text/TextDirectionHeuristic;II)V .locals 2 + .param p1 # Landroid/text/TextPaint; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/text/TextDirectionHeuristic; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 195 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -138,6 +159,10 @@ # virtual methods .method public equals(Ljava/lang/Object;)Z .locals 4 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param const/4 v0, 0x1 @@ -485,6 +510,9 @@ .method public getBreakStrategy()I .locals 1 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x17 + .end annotation .line 249 iget v0, p0, Landroid/support/v4/text/PrecomputedTextCompat$Params;->mBreakStrategy:I @@ -494,6 +522,9 @@ .method public getHyphenationFrequency()I .locals 1 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x17 + .end annotation .line 261 iget v0, p0, Landroid/support/v4/text/PrecomputedTextCompat$Params;->mHyphenationFrequency:I @@ -503,6 +534,12 @@ .method public getTextDirection()Landroid/text/TextDirectionHeuristic; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x12 + .end annotation .line 237 iget-object v0, p0, Landroid/support/v4/text/PrecomputedTextCompat$Params;->mTextDir:Landroid/text/TextDirectionHeuristic; @@ -512,6 +549,8 @@ .method public getTextPaint()Landroid/text/TextPaint; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 224 iget-object v0, p0, Landroid/support/v4/text/PrecomputedTextCompat$Params;->mPaint:Landroid/text/TextPaint; @@ -553,9 +592,9 @@ if-lt v0, v13, :cond_0 + .line 341 new-array v0, v2, [Ljava/lang/Object; - .line 341 iget-object v2, p0, Landroid/support/v4/text/PrecomputedTextCompat$Params;->mPaint:Landroid/text/TextPaint; invoke-virtual {v2}, Landroid/text/TextPaint;->getTextSize()F @@ -682,9 +721,9 @@ if-lt v0, v13, :cond_1 + .line 346 new-array v0, v2, [Ljava/lang/Object; - .line 346 iget-object v2, p0, Landroid/support/v4/text/PrecomputedTextCompat$Params;->mPaint:Landroid/text/TextPaint; invoke-virtual {v2}, Landroid/text/TextPaint;->getTextSize()F @@ -811,9 +850,9 @@ if-lt v0, v1, :cond_2 + .line 351 new-array v0, v3, [Ljava/lang/Object; - .line 351 iget-object v1, p0, Landroid/support/v4/text/PrecomputedTextCompat$Params;->mPaint:Landroid/text/TextPaint; invoke-virtual {v1}, Landroid/text/TextPaint;->getTextSize()F @@ -915,9 +954,9 @@ if-lt v0, v1, :cond_3 + .line 355 new-array v0, v3, [Ljava/lang/Object; - .line 355 iget-object v1, p0, Landroid/support/v4/text/PrecomputedTextCompat$Params;->mPaint:Landroid/text/TextPaint; invoke-virtual {v1}, Landroid/text/TextPaint;->getTextSize()F @@ -1011,10 +1050,10 @@ return v0 + .line 359 :cond_3 new-array v0, v4, [Ljava/lang/Object; - .line 359 iget-object v1, p0, Landroid/support/v4/text/PrecomputedTextCompat$Params;->mPaint:Landroid/text/TextPaint; invoke-virtual {v1}, Landroid/text/TextPaint;->getTextSize()F diff --git a/smali/android/support/v4/text/PrecomputedTextCompat$PrecomputedTextFutureTask$PrecomputedTextCallback.smali b/smali/android/support/v4/text/PrecomputedTextCompat$PrecomputedTextFutureTask$PrecomputedTextCallback.smali index 195090cb..8c6b2dce 100644 --- a/smali/android/support/v4/text/PrecomputedTextCompat$PrecomputedTextFutureTask$PrecomputedTextCallback.smali +++ b/smali/android/support/v4/text/PrecomputedTextCompat$PrecomputedTextFutureTask$PrecomputedTextCallback.smali @@ -35,6 +35,14 @@ # direct methods .method constructor (Landroid/support/v4/text/PrecomputedTextCompat$Params;Ljava/lang/CharSequence;)V .locals 0 + .param p1 # Landroid/support/v4/text/PrecomputedTextCompat$Params; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 569 invoke-direct {p0}, Ljava/lang/Object;->()V diff --git a/smali/android/support/v4/text/PrecomputedTextCompat$PrecomputedTextFutureTask.smali b/smali/android/support/v4/text/PrecomputedTextCompat$PrecomputedTextFutureTask.smali index dad2bd6c..9ea607ab 100644 --- a/smali/android/support/v4/text/PrecomputedTextCompat$PrecomputedTextFutureTask.smali +++ b/smali/android/support/v4/text/PrecomputedTextCompat$PrecomputedTextFutureTask.smali @@ -31,6 +31,14 @@ # direct methods .method constructor (Landroid/support/v4/text/PrecomputedTextCompat$Params;Ljava/lang/CharSequence;)V .locals 1 + .param p1 # Landroid/support/v4/text/PrecomputedTextCompat$Params; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 582 new-instance v0, Landroid/support/v4/text/PrecomputedTextCompat$PrecomputedTextFutureTask$PrecomputedTextCallback; diff --git a/smali/android/support/v4/text/PrecomputedTextCompat.smali b/smali/android/support/v4/text/PrecomputedTextCompat.smali index 2976bd01..0a4dc98c 100644 --- a/smali/android/support/v4/text/PrecomputedTextCompat.smali +++ b/smali/android/support/v4/text/PrecomputedTextCompat.smali @@ -19,18 +19,37 @@ .field private static final LINE_FEED:C = '\n' .field private static sExecutor:Ljava/util/concurrent/Executor; + .annotation build Landroid/support/annotation/GuardedBy; + value = "sLock" + .end annotation + + .annotation build Landroid/support/annotation/NonNull; + .end annotation +.end field .field private static final sLock:Ljava/lang/Object; # instance fields .field private final mParagraphEnds:[I + .annotation build Landroid/support/annotation/NonNull; + .end annotation +.end field .field private final mParams:Landroid/support/v4/text/PrecomputedTextCompat$Params; + .annotation build Landroid/support/annotation/NonNull; + .end annotation +.end field .field private final mText:Landroid/text/Spannable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation +.end field .field private final mWrapped:Landroid/text/PrecomputedText; + .annotation build Landroid/support/annotation/Nullable; + .end annotation +.end field # direct methods @@ -44,11 +63,27 @@ sput-object v0, Landroid/support/v4/text/PrecomputedTextCompat;->sLock:Ljava/lang/Object; + const/4 v0, 0x0 + + .line 73 + sput-object v0, Landroid/support/v4/text/PrecomputedTextCompat;->sExecutor:Ljava/util/concurrent/Executor; + return-void .end method .method private constructor (Landroid/text/PrecomputedText;Landroid/support/v4/text/PrecomputedTextCompat$Params;)V .locals 0 + .param p1 # Landroid/text/PrecomputedText; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v4/text/PrecomputedTextCompat$Params; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x1c + .end annotation .line 485 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -72,6 +107,18 @@ .method private constructor (Ljava/lang/CharSequence;Landroid/support/v4/text/PrecomputedTextCompat$Params;[I)V .locals 1 + .param p1 # Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v4/text/PrecomputedTextCompat$Params; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # [I + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 477 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -99,6 +146,14 @@ .method public static create(Ljava/lang/CharSequence;Landroid/support/v4/text/PrecomputedTextCompat$Params;)Landroid/support/v4/text/PrecomputedTextCompat; .locals 11 + .param p0 # Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/support/v4/text/PrecomputedTextCompat$Params; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 419 invoke-static {p0}, Landroid/support/v4/util/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object; @@ -325,17 +380,18 @@ invoke-static {}, Landroid/support/v4/os/TraceCompat;->endSection()V - goto :goto_5 - - :goto_4 throw p0 - :goto_5 - goto :goto_4 + return-void .end method .method private findParaIndex(I)I .locals 4 + .param p1 # I + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + .end annotation + .end param const/4 v0, 0x0 @@ -393,17 +449,28 @@ invoke-direct {v0, p1}, Ljava/lang/IndexOutOfBoundsException;->(Ljava/lang/String;)V - goto :goto_2 - - :goto_1 throw v0 - :goto_2 - goto :goto_1 + return-void .end method .method public static getTextFuture(Ljava/lang/CharSequence;Landroid/support/v4/text/PrecomputedTextCompat$Params;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/Future; .locals 1 + .param p0 # Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/support/v4/text/PrecomputedTextCompat$Params; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/util/concurrent/Executor; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/UiThread; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -487,6 +554,9 @@ .method public getParagraphCount()I .locals 2 + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + .end annotation .line 517 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -515,6 +585,14 @@ .method public getParagraphEnd(I)I .locals 3 + .param p1 # I + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + .end annotation + .end param + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + .end annotation .line 540 invoke-virtual {p0}, Landroid/support/v4/text/PrecomputedTextCompat;->getParagraphCount()I @@ -554,6 +632,14 @@ .method public getParagraphStart(I)I .locals 3 + .param p1 # I + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + .end annotation + .end param + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + .end annotation .line 528 invoke-virtual {p0}, Landroid/support/v4/text/PrecomputedTextCompat;->getParagraphCount()I @@ -601,6 +687,8 @@ .method public getParams()Landroid/support/v4/text/PrecomputedTextCompat$Params; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 510 iget-object v0, p0, Landroid/support/v4/text/PrecomputedTextCompat;->mParams:Landroid/support/v4/text/PrecomputedTextCompat$Params; @@ -610,6 +698,18 @@ .method public getPrecomputedText()Landroid/text/PrecomputedText; .locals 2 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x1c + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 499 iget-object v0, p0, Landroid/support/v4/text/PrecomputedTextCompat;->mText:Landroid/text/Spannable; diff --git a/smali/android/support/v4/text/TextUtilsCompat.smali b/smali/android/support/v4/text/TextUtilsCompat.smali index 5684cfed..b5b777fe 100644 --- a/smali/android/support/v4/text/TextUtilsCompat.smali +++ b/smali/android/support/v4/text/TextUtilsCompat.smali @@ -38,6 +38,10 @@ .method private static getLayoutDirectionFromFirstChar(Ljava/util/Locale;)I .locals 3 + .param p0 # Ljava/util/Locale; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 119 invoke-virtual {p0, p0}, Ljava/util/Locale;->getDisplayName(Ljava/util/Locale;)Ljava/lang/String; @@ -70,6 +74,10 @@ .method public static getLayoutDirectionFromLocale(Ljava/util/Locale;)I .locals 2 + .param p0 # Ljava/util/Locale; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 90 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -143,6 +151,12 @@ .method public static htmlEncode(Ljava/lang/String;)Ljava/lang/String; .locals 4 + .param p0 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 45 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/text/util/FindAddress.smali b/smali/android/support/v4/text/util/FindAddress.smali index 38eb6cae..82de5382 100644 --- a/smali/android/support/v4/text/util/FindAddress.smali +++ b/smali/android/support/v4/text/util/FindAddress.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v4/text/util/FindAddress$ZipRange; @@ -61,9 +67,9 @@ const/16 v0, 0x3b + .line 72 new-array v0, v0, [Landroid/support/v4/text/util/FindAddress$ZipRange; - .line 72 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; const/16 v2, 0x63 @@ -90,153 +96,153 @@ new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - const/16 v6, 0x47 + const/16 v5, 0x47 - const/16 v7, 0x48 + const/16 v6, 0x48 - invoke-direct {v1, v6, v7, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v5, v6, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/4 v6, 0x2 + const/4 v5, 0x2 - aput-object v1, v0, v6 + aput-object v1, v0, v5 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - const/16 v7, 0x60 + const/16 v6, 0x60 - invoke-direct {v1, v7, v7, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v6, v6, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/4 v8, 0x3 + const/4 v7, 0x3 - aput-object v1, v0, v8 + aput-object v1, v0, v7 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - const/16 v9, 0x55 + const/16 v8, 0x55 - const/16 v10, 0x56 + const/16 v9, 0x56 - invoke-direct {v1, v9, v10, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v8, v9, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/4 v9, 0x4 + const/4 v8, 0x4 - aput-object v1, v0, v9 + aput-object v1, v0, v8 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - const/16 v10, 0x5a + const/16 v9, 0x5a - invoke-direct {v1, v10, v7, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v9, v6, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/4 v10, 0x5 + const/4 v9, 0x5 - aput-object v1, v0, v10 + aput-object v1, v0, v9 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - const/16 v11, 0x50 + const/16 v10, 0x50 - const/16 v12, 0x51 + const/16 v11, 0x51 - invoke-direct {v1, v11, v12, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v10, v11, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/4 v11, 0x6 + const/4 v10, 0x6 - aput-object v1, v0, v11 + aput-object v1, v0, v10 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - invoke-direct {v1, v11, v11, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v10, v10, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/4 v12, 0x7 + const/4 v11, 0x7 - aput-object v1, v0, v12 + aput-object v1, v0, v11 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - const/16 v12, 0x14 + const/16 v11, 0x14 - invoke-direct {v1, v12, v12, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v11, v11, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/16 v13, 0x8 + const/16 v12, 0x8 - aput-object v1, v0, v13 + aput-object v1, v0, v12 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - const/16 v13, 0x13 + const/16 v12, 0x13 - invoke-direct {v1, v13, v13, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v12, v12, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/16 v14, 0x9 + const/16 v13, 0x9 - aput-object v1, v0, v14 + aput-object v1, v0, v13 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - const/16 v15, 0x20 + const/16 v14, 0x20 - const/16 v2, 0x22 + const/16 v15, 0x22 - invoke-direct {v1, v15, v2, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v14, v15, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/16 v2, 0xa + const/16 v14, 0xa - aput-object v1, v0, v2 + aput-object v1, v0, v14 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - invoke-direct {v1, v7, v7, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v6, v6, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/16 v2, 0xb + const/16 v14, 0xb - aput-object v1, v0, v2 + aput-object v1, v0, v14 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - const/16 v2, 0x1e + const/16 v14, 0x1e const/16 v15, 0x1f - invoke-direct {v1, v2, v15, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v14, v15, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/16 v2, 0xc + const/16 v14, 0xc - aput-object v1, v0, v2 + aput-object v1, v0, v14 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - invoke-direct {v1, v7, v7, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v6, v6, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/16 v2, 0xd + const/16 v14, 0xd - aput-object v1, v0, v2 + aput-object v1, v0, v14 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - invoke-direct {v1, v7, v7, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v6, v6, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/16 v2, 0xe + const/16 v14, 0xe - aput-object v1, v0, v2 + aput-object v1, v0, v14 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - const/16 v2, 0x32 + const/16 v14, 0x32 const/16 v15, 0x34 - invoke-direct {v1, v2, v15, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v14, v15, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/16 v2, 0xf + const/16 v14, 0xf - aput-object v1, v0, v2 + aput-object v1, v0, v14 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - const/16 v2, 0x53 + const/16 v14, 0x53 - invoke-direct {v1, v2, v2, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v14, v14, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V const/16 v15, 0x10 @@ -246,55 +252,55 @@ const/16 v15, 0x3c - const/16 v2, 0x3e + const/16 v14, 0x3e - invoke-direct {v1, v15, v2, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v15, v14, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/16 v2, 0x11 + const/16 v14, 0x11 - aput-object v1, v0, v2 + aput-object v1, v0, v14 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - const/16 v2, 0x2e + const/16 v14, 0x2e const/16 v15, 0x2f - invoke-direct {v1, v2, v15, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v14, v15, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/16 v2, 0x12 + const/16 v14, 0x12 - aput-object v1, v0, v2 + aput-object v1, v0, v14 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - const/16 v2, 0x42 + const/16 v14, 0x42 const/16 v15, 0x43 - const/16 v10, 0x49 + const/16 v2, 0x49 - invoke-direct {v1, v2, v15, v10, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v14, v15, v2, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - aput-object v1, v0, v13 + aput-object v1, v0, v12 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; const/16 v2, 0x28 - const/16 v10, 0x2a + const/16 v14, 0x2a - invoke-direct {v1, v2, v10, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v2, v14, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - aput-object v1, v0, v12 + aput-object v1, v0, v11 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; const/16 v2, 0x46 - const/16 v10, 0x47 + const/16 v14, 0x47 - invoke-direct {v1, v2, v10, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v2, v14, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V const/16 v2, 0x15 @@ -302,7 +308,9 @@ new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - invoke-direct {v1, v5, v6, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + const/4 v2, 0x1 + + invoke-direct {v1, v2, v5, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V const/16 v2, 0x16 @@ -312,7 +320,7 @@ const/16 v2, 0x15 - invoke-direct {v1, v12, v2, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v11, v2, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V const/16 v2, 0x17 @@ -320,7 +328,7 @@ new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - invoke-direct {v1, v8, v9, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v7, v8, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V const/16 v2, 0x18 @@ -328,31 +336,31 @@ new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - invoke-direct {v1, v7, v7, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v6, v6, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/16 v5, 0x19 + const/16 v14, 0x19 - aput-object v1, v0, v5 + aput-object v1, v0, v14 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - const/16 v5, 0x30 + const/16 v14, 0x30 - const/16 v10, 0x31 + const/16 v15, 0x31 - invoke-direct {v1, v5, v10, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v14, v15, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/16 v5, 0x1a + const/16 v14, 0x1a - aput-object v1, v0, v5 + aput-object v1, v0, v14 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - const/16 v5, 0x37 + const/16 v14, 0x37 - const/16 v10, 0x38 + const/16 v15, 0x38 - invoke-direct {v1, v5, v10, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v14, v15, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V const/16 v15, 0x1b @@ -362,179 +370,187 @@ const/16 v15, 0x3f - const/16 v2, 0x41 + const/16 v9, 0x41 - invoke-direct {v1, v15, v2, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v15, v9, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/16 v2, 0x1c + const/16 v9, 0x1c - aput-object v1, v0, v2 + aput-object v1, v0, v9 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - invoke-direct {v1, v7, v7, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v6, v6, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/16 v2, 0x1d + const/16 v9, 0x1d - aput-object v1, v0, v2 + aput-object v1, v0, v9 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - const/16 v15, 0x26 + const/16 v9, 0x26 - const/16 v12, 0x27 + const/16 v15, 0x27 - invoke-direct {v1, v15, v12, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v9, v15, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/16 v12, 0x1e + const/16 v9, 0x1e - aput-object v1, v0, v12 + aput-object v1, v0, v9 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - invoke-direct {v1, v5, v10, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + const/16 v9, 0x38 - const/16 v12, 0x1f + invoke-direct {v1, v14, v9, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - aput-object v1, v0, v12 + const/16 v9, 0x1f + + aput-object v1, v0, v9 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - const/16 v12, 0x1b + const/16 v9, 0x1b - const/16 v10, 0x1c + const/16 v15, 0x1c - invoke-direct {v1, v12, v10, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v9, v15, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/16 v10, 0x20 + const/16 v9, 0x20 - aput-object v1, v0, v10 + aput-object v1, v0, v9 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - const/16 v10, 0x3a + const/16 v9, 0x3a - invoke-direct {v1, v10, v10, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + const/16 v15, 0x3a - const/16 v12, 0x21 + invoke-direct {v1, v9, v15, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - aput-object v1, v0, v12 + const/16 v9, 0x21 + + aput-object v1, v0, v9 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - const/16 v12, 0x44 + const/16 v9, 0x44 - const/16 v10, 0x45 + const/16 v15, 0x45 - invoke-direct {v1, v12, v10, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v9, v15, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/16 v10, 0x22 + const/16 v9, 0x22 - aput-object v1, v0, v10 + aput-object v1, v0, v9 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - invoke-direct {v1, v8, v9, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v7, v8, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/16 v8, 0x23 + const/16 v7, 0x23 - aput-object v1, v0, v8 + aput-object v1, v0, v7 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - const/4 v8, 0x7 + const/4 v7, 0x7 - const/16 v9, 0x8 + const/16 v8, 0x8 - invoke-direct {v1, v8, v9, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v7, v8, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/16 v8, 0x24 + const/16 v7, 0x24 - aput-object v1, v0, v8 + aput-object v1, v0, v7 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - const/16 v8, 0x57 + const/16 v7, 0x57 - const/16 v9, 0x58 + const/16 v8, 0x58 - const/16 v10, 0x56 + const/16 v9, 0x56 - invoke-direct {v1, v8, v9, v10, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v7, v8, v9, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/16 v8, 0x25 + const/16 v7, 0x25 - aput-object v1, v0, v8 + aput-object v1, v0, v7 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; + const/16 v7, 0x58 + const/16 v8, 0x59 - invoke-direct {v1, v9, v8, v7, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v7, v8, v6, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - aput-object v1, v0, v15 + const/16 v7, 0x26 + + aput-object v1, v0, v7 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - const/16 v8, 0xa + const/16 v7, 0xa - const/16 v10, 0xe + const/16 v8, 0xe - invoke-direct {v1, v8, v10, v4, v11}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v7, v8, v4, v10}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/16 v8, 0x27 + const/16 v7, 0x27 - aput-object v1, v0, v8 + aput-object v1, v0, v7 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - const/16 v8, 0x2b + const/16 v7, 0x2b - const/16 v10, 0x2d + const/16 v8, 0x2d - invoke-direct {v1, v8, v10, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v7, v8, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/16 v8, 0x28 + const/16 v7, 0x28 - aput-object v1, v0, v8 + aput-object v1, v0, v7 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - const/16 v8, 0x49 + const/16 v7, 0x49 - const/16 v10, 0x4a + const/16 v8, 0x4a - invoke-direct {v1, v8, v10, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v7, v8, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/16 v8, 0x29 + const/16 v7, 0x29 - aput-object v1, v0, v8 + aput-object v1, v0, v7 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - const/16 v8, 0x61 + const/16 v7, 0x61 - const/16 v10, 0x61 + const/16 v8, 0x61 - invoke-direct {v1, v8, v10, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v7, v8, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/16 v8, 0x2a + const/16 v7, 0x2a - aput-object v1, v0, v8 + aput-object v1, v0, v7 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - const/16 v8, 0xf + const/16 v7, 0xf - invoke-direct {v1, v8, v13, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v7, v12, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - const/16 v8, 0x2b + const/16 v7, 0x2b - aput-object v1, v0, v8 + aput-object v1, v0, v7 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - invoke-direct {v1, v11, v11, v4, v14}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v10, v10, v4, v13}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V const/16 v4, 0x2c @@ -542,7 +558,7 @@ new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - invoke-direct {v1, v7, v7, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v6, v6, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V const/16 v4, 0x2d @@ -550,7 +566,7 @@ new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - invoke-direct {v1, v6, v6, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v5, v5, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V const/16 v4, 0x2e @@ -558,17 +574,23 @@ new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - invoke-direct {v1, v2, v2, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + const/16 v4, 0x1d - const/16 v2, 0x2f + const/16 v6, 0x1d - aput-object v1, v0, v2 + invoke-direct {v1, v4, v6, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + + const/16 v4, 0x2f + + aput-object v1, v0, v4 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - const/16 v2, 0x39 + const/16 v4, 0x39 - invoke-direct {v1, v2, v2, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + const/16 v6, 0x39 + + invoke-direct {v1, v4, v6, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V const/16 v4, 0x30 @@ -578,7 +600,9 @@ const/16 v4, 0x25 - invoke-direct {v1, v4, v15, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + const/16 v6, 0x26 + + invoke-direct {v1, v4, v6, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V const/16 v4, 0x31 @@ -588,11 +612,13 @@ const/16 v4, 0x4b - const/16 v7, 0x4f + const/16 v6, 0x4f - const/16 v8, 0x57 + const/16 v7, 0x57 - invoke-direct {v1, v4, v7, v8, v9}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + const/16 v8, 0x58 + + invoke-direct {v1, v4, v6, v7, v8}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V const/16 v4, 0x32 @@ -602,9 +628,9 @@ const/16 v4, 0x54 - const/16 v7, 0x54 + const/16 v6, 0x54 - invoke-direct {v1, v4, v7, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v4, v6, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V const/16 v4, 0x33 @@ -614,11 +640,7 @@ const/16 v4, 0x16 - const/16 v7, 0x18 - - const/16 v8, 0x14 - - invoke-direct {v1, v4, v7, v8, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v4, v2, v11, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V const/16 v4, 0x34 @@ -626,7 +648,7 @@ new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; - invoke-direct {v1, v11, v14, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v10, v13, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V const/16 v4, 0x35 @@ -646,19 +668,19 @@ const/16 v4, 0x62 - const/16 v7, 0x63 + const/16 v6, 0x63 - invoke-direct {v1, v4, v7, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v4, v6, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - aput-object v1, v0, v5 + aput-object v1, v0, v14 new-instance v1, Landroid/support/v4/text/util/FindAddress$ZipRange; const/16 v4, 0x35 - const/16 v5, 0x36 + const/16 v6, 0x36 - invoke-direct {v1, v4, v5, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + invoke-direct {v1, v4, v6, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V const/16 v4, 0x38 @@ -668,9 +690,9 @@ const/16 v4, 0x1a - const/16 v5, 0x18 + invoke-direct {v1, v2, v4, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V - invoke-direct {v1, v5, v4, v3, v3}, Landroid/support/v4/text/util/FindAddress$ZipRange;->(IIII)V + const/16 v2, 0x39 aput-object v1, v0, v2 @@ -691,7 +713,7 @@ const-string v0, "[^,*\u2022\t \u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\n\u000b\u000c\r\u0085\u2028\u2029]+(?=[,*\u2022\t \u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\n\u000b\u000c\r\u0085\u2028\u2029]|$)" .line 153 - invoke-static {v0, v6}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern; + invoke-static {v0, v5}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern; move-result-object v0 @@ -700,7 +722,7 @@ const-string v0, "(?:one|\\d+([a-z](?=[^a-z]|$)|st|nd|rd|th)?)(?:-(?:one|\\d+([a-z](?=[^a-z]|$)|st|nd|rd|th)?))*(?=[,\"\'\t \u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\n\u000b\u000c\r\u0085\u2028\u2029]|$)" .line 171 - invoke-static {v0, v6}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern; + invoke-static {v0, v5}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern; move-result-object v0 @@ -709,7 +731,7 @@ const-string v0, "(?:(ak|alaska)|(al|alabama)|(ar|arkansas)|(as|american[\t \u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000]+samoa)|(az|arizona)|(ca|california)|(co|colorado)|(ct|connecticut)|(dc|district[\t \u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000]+of[\t \u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000]+columbia)|(de|delaware)|(fl|florida)|(fm|federated[\t \u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000]+states[\t \u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000]+of[\t \u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000]+micronesia)|(ga|georgia)|(gu|guam)|(hi|hawaii)|(ia|iowa)|(id|idaho)|(il|illinois)|(in|indiana)|(ks|kansas)|(ky|kentucky)|(la|louisiana)|(ma|massachusetts)|(md|maryland)|(me|maine)|(mh|marshall[\t \u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000]+islands)|(mi|michigan)|(mn|minnesota)|(mo|missouri)|(mp|northern[\t \u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000]+mariana[\t \u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000]+islands)|(ms|mississippi)|(mt|montana)|(nc|north[\t \u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000]+carolina)|(nd|north[\t \u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000]+dakota)|(ne|nebraska)|(nh|new[\t \u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000]+hampshire)|(nj|new[\t \u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000]+jersey)|(nm|new[\t \u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000]+mexico)|(nv|nevada)|(ny|new[\t \u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000]+york)|(oh|ohio)|(ok|oklahoma)|(or|oregon)|(pa|pennsylvania)|(pr|puerto[\t \u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000]+rico)|(pw|palau)|(ri|rhode[\t \u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000]+island)|(sc|south[\t \u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000]+carolina)|(sd|south[\t \u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000]+dakota)|(tn|tennessee)|(tx|texas)|(ut|utah)|(va|virginia)|(vi|virgin[\t \u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000]+islands)|(vt|vermont)|(wa|washington)|(wi|wisconsin)|(wv|west[\t \u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000]+virginia)|(wy|wyoming))(?=[,*\u2022\t \u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\n\u000b\u000c\r\u0085\u2028\u2029]|$)" .line 175 - invoke-static {v0, v6}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern; + invoke-static {v0, v5}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern; move-result-object v0 @@ -718,7 +740,7 @@ const-string v0, "(?:alley|annex|arcade|ave[.]?|avenue|alameda|bayou|beach|bend|bluffs?|bottom|boulevard|branch|bridge|brooks?|burgs?|bypass|broadway|camino|camp|canyon|cape|causeway|centers?|circles?|cliffs?|club|common|corners?|course|courts?|coves?|creek|crescent|crest|crossing|crossroad|curve|circulo|dale|dam|divide|drives?|estates?|expressway|extensions?|falls?|ferry|fields?|flats?|fords?|forest|forges?|forks?|fort|freeway|gardens?|gateway|glens?|greens?|groves?|harbors?|haven|heights|highway|hills?|hollow|inlet|islands?|isle|junctions?|keys?|knolls?|lakes?|land|landing|lane|lights?|loaf|locks?|lodge|loop|mall|manors?|meadows?|mews|mills?|mission|motorway|mount|mountains?|neck|orchard|oval|overpass|parks?|parkways?|pass|passage|path|pike|pines?|plains?|plaza|points?|ports?|prairie|privada|radial|ramp|ranch|rapids?|rd[.]?|rest|ridges?|river|roads?|route|row|rue|run|shoals?|shores?|skyway|springs?|spurs?|squares?|station|stravenue|stream|st[.]?|streets?|summit|speedway|terrace|throughway|trace|track|trafficway|trail|tunnel|turnpike|underpass|unions?|valleys?|viaduct|views?|villages?|ville|vista|walks?|wall|ways?|wells?|xing|xrd)(?=[,*\u2022\t \u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\n\u000b\u000c\r\u0085\u2028\u2029]|$)" .line 238 - invoke-static {v0, v6}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern; + invoke-static {v0, v5}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern; move-result-object v0 @@ -727,7 +749,7 @@ const-string v0, "(\\d+)(st|nd|rd|th)" .line 265 - invoke-static {v0, v6}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern; + invoke-static {v0, v5}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern; move-result-object v0 @@ -736,7 +758,7 @@ const-string v0, "(?:\\d{5}(?:-\\d{4})?)(?=[,*\u2022\t \u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\n\u000b\u000c\r\u0085\u2028\u2029]|$)" .line 268 - invoke-static {v0, v6}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern; + invoke-static {v0, v5}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;I)Ljava/util/regex/Pattern; move-result-object v0 @@ -777,15 +799,17 @@ const-string v4, "" + move-object v9, v4 + + const/4 v4, 0x1 + const/4 v5, 0x1 const/4 v6, 0x1 - const/4 v7, 0x1 - - const/4 v8, 0x0 + const/4 v7, 0x0 - const/4 v9, -0x1 + const/4 v8, -0x1 const/4 v10, -0x1 @@ -861,7 +885,7 @@ if-eq p1, v1, :cond_2 - add-int/lit8 v5, v5, 0x1 + add-int/lit8 v4, v4, 0x1 :cond_2 move p1, v11 @@ -871,16 +895,16 @@ :cond_3 const/4 v11, 0x5 - if-le v5, v11, :cond_4 + if-le v4, v11, :cond_4 goto/16 :goto_4 :cond_4 - add-int/2addr v6, v3 + add-int/2addr v5, v3 const/16 v12, 0xe - if-le v6, v12, :cond_5 + if-le v5, v12, :cond_5 goto/16 :goto_4 @@ -892,18 +916,18 @@ if-eqz v12, :cond_7 - if-eqz v7, :cond_6 + if-eqz v6, :cond_6 - if-le v5, v3, :cond_6 + if-le v4, v3, :cond_6 neg-int p0, p1 return p0 :cond_6 - if-ne v9, v1, :cond_d + if-ne v8, v1, :cond_d - move v9, p1 + move v8, p1 goto :goto_3 @@ -911,24 +935,24 @@ :cond_7 invoke-virtual {v0, v2}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String; - move-result-object v7 + move-result-object v6 - invoke-static {v7}, Landroid/support/v4/text/util/FindAddress;->isValidLocationName(Ljava/lang/String;)Z + invoke-static {v6}, Landroid/support/v4/text/util/FindAddress;->isValidLocationName(Ljava/lang/String;)Z - move-result v7 + move-result v6 - if-eqz v7, :cond_8 + if-eqz v6, :cond_8 - const/4 v7, 0x0 + const/4 v6, 0x0 - const/4 v8, 0x1 + const/4 v7, 0x1 goto :goto_3 :cond_8 - if-ne v6, v11, :cond_9 + if-ne v5, v11, :cond_9 - if-nez v8, :cond_9 + if-nez v7, :cond_9 .line 453 invoke-virtual {v0}, Ljava/util/regex/Matcher;->end()I @@ -938,11 +962,11 @@ goto :goto_4 :cond_9 - if-eqz v8, :cond_c + if-eqz v7, :cond_c - const/4 v7, 0x4 + const/4 v6, 0x4 - if-le v6, v7, :cond_c + if-le v5, v6, :cond_c .line 459 invoke-static {p0, p1}, Landroid/support/v4/text/util/FindAddress;->matchState(Ljava/lang/String;I)Ljava/util/regex/MatchResult; @@ -951,26 +975,26 @@ if-eqz p1, :cond_c - const-string v7, "et" + const-string v6, "et" .line 461 - invoke-virtual {v4, v7}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v9, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z - move-result v4 + move-result v6 - if-eqz v4, :cond_a + if-eqz v6, :cond_a invoke-interface {p1, v2}, Ljava/util/regex/MatchResult;->group(I)Ljava/lang/String; - move-result-object v4 + move-result-object v6 - const-string v7, "al" + const-string v9, "al" - invoke-virtual {v4, v7}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v6, v9}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z - move-result v4 + move-result v6 - if-eqz v4, :cond_a + if-eqz v6, :cond_a .line 463 invoke-interface {p1}, Ljava/util/regex/MatchResult;->end()I @@ -981,36 +1005,36 @@ .line 468 :cond_a - sget-object v4, Landroid/support/v4/text/util/FindAddress;->sWordRe:Ljava/util/regex/Pattern; + sget-object v6, Landroid/support/v4/text/util/FindAddress;->sWordRe:Ljava/util/regex/Pattern; - invoke-virtual {v4, p0}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher; + invoke-virtual {v6, p0}, Ljava/util/regex/Pattern;->matcher(Ljava/lang/CharSequence;)Ljava/util/regex/Matcher; - move-result-object v4 + move-result-object v6 .line 469 invoke-interface {p1}, Ljava/util/regex/MatchResult;->end()I - move-result v7 + move-result v9 - invoke-virtual {v4, v7}, Ljava/util/regex/Matcher;->find(I)Z + invoke-virtual {v6, v9}, Ljava/util/regex/Matcher;->find(I)Z - move-result v7 + move-result v9 - if-eqz v7, :cond_b + if-eqz v9, :cond_b .line 470 - invoke-virtual {v4, v2}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String; + invoke-virtual {v6, v2}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String; - move-result-object v7 + move-result-object v9 - invoke-static {v7, p1}, Landroid/support/v4/text/util/FindAddress;->isValidZipCode(Ljava/lang/String;Ljava/util/regex/MatchResult;)Z + invoke-static {v9, p1}, Landroid/support/v4/text/util/FindAddress;->isValidZipCode(Ljava/lang/String;Ljava/util/regex/MatchResult;)Z move-result p1 if-eqz p1, :cond_c .line 471 - invoke-virtual {v4}, Ljava/util/regex/Matcher;->end()I + invoke-virtual {v6}, Ljava/util/regex/Matcher;->end()I move-result p0 @@ -1020,17 +1044,19 @@ :cond_b invoke-interface {p1}, Ljava/util/regex/MatchResult;->end()I - move-result v10 + move-result p1 + + move v10, p1 :cond_c - const/4 v7, 0x0 + const/4 v6, 0x0 .line 412 :cond_d :goto_3 invoke-virtual {v0, v2}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String; - move-result-object v4 + move-result-object v9 invoke-virtual {v0}, Ljava/util/regex/Matcher;->end()I @@ -1045,15 +1071,12 @@ return v10 :cond_f - if-lez v9, :cond_10 + if-lez v8, :cond_10 - goto :goto_5 + move p1, v8 :cond_10 - move v9, p1 - - :goto_5 - neg-int p0, v9 + neg-int p0, p1 return p0 .end method @@ -1303,6 +1326,8 @@ .method public static isValidLocationName(Ljava/lang/String;)Z .locals 1 + .annotation build Landroid/support/annotation/VisibleForTesting; + .end annotation .line 388 sget-object v0, Landroid/support/v4/text/util/FindAddress;->sLocationNameRe:Ljava/util/regex/Pattern; @@ -1320,6 +1345,8 @@ .method public static isValidZipCode(Ljava/lang/String;)Z .locals 1 + .annotation build Landroid/support/annotation/VisibleForTesting; + .end annotation .line 377 sget-object v0, Landroid/support/v4/text/util/FindAddress;->sZipCodeRe:Ljava/util/regex/Pattern; @@ -1337,6 +1364,8 @@ .method public static isValidZipCode(Ljava/lang/String;Ljava/lang/String;)Z .locals 1 + .annotation build Landroid/support/annotation/VisibleForTesting; + .end annotation const/4 v0, 0x0 @@ -1422,6 +1451,8 @@ .method public static matchHouseNumber(Ljava/lang/String;I)Ljava/util/regex/MatchResult; .locals 3 + .annotation build Landroid/support/annotation/VisibleForTesting; + .end annotation const/4 v0, 0x0 @@ -1495,6 +1526,8 @@ .method public static matchState(Ljava/lang/String;I)Ljava/util/regex/MatchResult; .locals 3 + .annotation build Landroid/support/annotation/VisibleForTesting; + .end annotation const/4 v0, 0x0 diff --git a/smali/android/support/v4/text/util/LinkifyCompat$LinkifyMask.smali b/smali/android/support/v4/text/util/LinkifyCompat$LinkifyMask.smali index d0c35ffc..8339b066 100644 --- a/smali/android/support/v4/text/util/LinkifyCompat$LinkifyMask.smali +++ b/smali/android/support/v4/text/util/LinkifyCompat$LinkifyMask.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/text/util/LinkifyCompat; .end annotation diff --git a/smali/android/support/v4/text/util/LinkifyCompat.smali b/smali/android/support/v4/text/util/LinkifyCompat.smali index 38e2cdee..17261e82 100644 --- a/smali/android/support/v4/text/util/LinkifyCompat.smali +++ b/smali/android/support/v4/text/util/LinkifyCompat.smali @@ -32,9 +32,9 @@ const/4 v0, 0x0 + .line 57 new-array v0, v0, [Ljava/lang/String; - .line 57 sput-object v0, Landroid/support/v4/text/util/LinkifyCompat;->EMPTY_STRING:[Ljava/lang/String; .line 59 @@ -58,6 +58,10 @@ .method private static addLinkMovementMethod(Landroid/widget/TextView;)V .locals 1 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 380 invoke-virtual {p0}, Landroid/widget/TextView;->getMovementMethod()Landroid/text/method/MovementMethod; @@ -92,6 +96,18 @@ .method public static addLinks(Landroid/widget/TextView;Ljava/util/regex/Pattern;Ljava/lang/String;)V .locals 7 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/util/regex/Pattern; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 207 invoke-static {}, Landroid/support/v4/text/util/LinkifyCompat;->shouldAddLinksFallbackToFramework()Z @@ -126,6 +142,26 @@ .method public static addLinks(Landroid/widget/TextView;Ljava/util/regex/Pattern;Ljava/lang/String;Landroid/text/util/Linkify$MatchFilter;Landroid/text/util/Linkify$TransformFilter;)V .locals 7 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/util/regex/Pattern; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # Landroid/text/util/Linkify$MatchFilter; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p4 # Landroid/text/util/Linkify$TransformFilter; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 231 invoke-static {}, Landroid/support/v4/text/util/LinkifyCompat;->shouldAddLinksFallbackToFramework()Z @@ -160,6 +196,35 @@ .method public static addLinks(Landroid/widget/TextView;Ljava/util/regex/Pattern;Ljava/lang/String;[Ljava/lang/String;Landroid/text/util/Linkify$MatchFilter;Landroid/text/util/Linkify$TransformFilter;)V .locals 7 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/util/regex/Pattern; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # [Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p4 # Landroid/text/util/Linkify$MatchFilter; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p5 # Landroid/text/util/Linkify$TransformFilter; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/annotation/SuppressLint; + value = { + "NewApi" + } + .end annotation .line 259 invoke-static {}, Landroid/support/v4/text/util/LinkifyCompat;->shouldAddLinksFallbackToFramework()Z @@ -214,6 +279,10 @@ .method public static addLinks(Landroid/text/Spannable;I)Z .locals 10 + .param p0 # Landroid/text/Spannable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 102 invoke-static {}, Landroid/support/v4/text/util/LinkifyCompat;->shouldAddLinksFallbackToFramework()Z @@ -399,6 +468,18 @@ .method public static addLinks(Landroid/text/Spannable;Ljava/util/regex/Pattern;Ljava/lang/String;)Z .locals 6 + .param p0 # Landroid/text/Spannable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/util/regex/Pattern; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 284 invoke-static {}, Landroid/support/v4/text/util/LinkifyCompat;->shouldAddLinksFallbackToFramework()Z @@ -437,6 +518,26 @@ .method public static addLinks(Landroid/text/Spannable;Ljava/util/regex/Pattern;Ljava/lang/String;Landroid/text/util/Linkify$MatchFilter;Landroid/text/util/Linkify$TransformFilter;)Z .locals 6 + .param p0 # Landroid/text/Spannable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/util/regex/Pattern; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # Landroid/text/util/Linkify$MatchFilter; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p4 # Landroid/text/util/Linkify$TransformFilter; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 308 invoke-static {}, Landroid/support/v4/text/util/LinkifyCompat;->shouldAddLinksFallbackToFramework()Z @@ -475,6 +576,35 @@ .method public static addLinks(Landroid/text/Spannable;Ljava/util/regex/Pattern;Ljava/lang/String;[Ljava/lang/String;Landroid/text/util/Linkify$MatchFilter;Landroid/text/util/Linkify$TransformFilter;)Z .locals 6 + .param p0 # Landroid/text/Spannable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/util/regex/Pattern; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # [Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p4 # Landroid/text/util/Linkify$MatchFilter; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p5 # Landroid/text/util/Linkify$TransformFilter; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/annotation/SuppressLint; + value = { + "NewApi" + } + .end annotation .line 335 invoke-static {}, Landroid/support/v4/text/util/LinkifyCompat;->shouldAddLinksFallbackToFramework()Z @@ -626,6 +756,10 @@ .method public static addLinks(Landroid/widget/TextView;I)Z .locals 4 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 164 invoke-static {}, Landroid/support/v4/text/util/LinkifyCompat;->shouldAddLinksFallbackToFramework()Z @@ -944,6 +1078,18 @@ .method private static makeUrl(Ljava/lang/String;[Ljava/lang/String;Ljava/util/regex/Matcher;Landroid/text/util/Linkify$TransformFilter;)Ljava/lang/String; .locals 7 + .param p0 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # [Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/text/util/Linkify$TransformFilter; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param if-eqz p3, :cond_0 @@ -974,7 +1120,9 @@ const/4 v4, 0x0 - invoke-virtual {v3}, Ljava/lang/String;->length()I + aget-object v0, p1, p3 + + invoke-virtual {v0}, Ljava/lang/String;->length()I move-result v5 @@ -995,7 +1143,9 @@ const/4 v4, 0x0 - invoke-virtual {v3}, Ljava/lang/String;->length()I + aget-object v0, p1, p3 + + invoke-virtual {v0}, Ljava/lang/String;->length()I move-result v5 diff --git a/smali/android/support/v4/util/ArrayMap.smali b/smali/android/support/v4/util/ArrayMap.smali index a6b500c8..a85585a3 100644 --- a/smali/android/support/v4/util/ArrayMap.smali +++ b/smali/android/support/v4/util/ArrayMap.smali @@ -24,6 +24,9 @@ # instance fields .field mCollections:Landroid/support/v4/util/MapCollections; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "Landroid/support/v4/util/MapCollections<", @@ -94,6 +97,10 @@ # virtual methods .method public containsAll(Ljava/util/Collection;)Z .locals 0 + .param p1 # Ljava/util/Collection; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -217,6 +224,10 @@ .method public removeAll(Ljava/util/Collection;)Z .locals 0 + .param p1 # Ljava/util/Collection; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -235,6 +246,10 @@ .method public retainAll(Ljava/util/Collection;)Z .locals 0 + .param p1 # Ljava/util/Collection; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", diff --git a/smali/android/support/v4/util/ArraySet.smali b/smali/android/support/v4/util/ArraySet.smali index 150c4918..f93b4ea7 100644 --- a/smali/android/support/v4/util/ArraySet.smali +++ b/smali/android/support/v4/util/ArraySet.smali @@ -36,10 +36,16 @@ .field private static final TAG:Ljava/lang/String; = "ArraySet" .field private static sBaseCache:[Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation +.end field .field private static sBaseCacheSize:I .field private static sTwiceBaseCache:[Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation +.end field .field private static sTwiceBaseCacheSize:I @@ -67,14 +73,14 @@ const/4 v0, 0x0 + .line 53 new-array v1, v0, [I - .line 53 sput-object v1, Landroid/support/v4/util/ArraySet;->INT:[I + .line 54 new-array v0, v0, [Ljava/lang/Object; - .line 54 sput-object v0, Landroid/support/v4/util/ArraySet;->OBJECT:[Ljava/lang/Object; return-void @@ -126,6 +132,10 @@ .method public constructor (Landroid/support/v4/util/ArraySet;)V .locals 0 + .param p1 # Landroid/support/v4/util/ArraySet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -148,6 +158,10 @@ .method public constructor (Ljava/util/Collection;)V .locals 0 + .param p1 # Ljava/util/Collection; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -171,21 +185,20 @@ .method private allocArrays(I)V .locals 5 - .line 163 - const-class v0, Landroid/support/v4/util/ArraySet; + const/4 v0, 0x0 const/4 v1, 0x0 - const/4 v2, 0x0 - - const/4 v3, 0x1 + const/4 v2, 0x1 - const/16 v4, 0x8 + const/16 v3, 0x8 - if-ne p1, v4, :cond_1 + if-ne p1, v3, :cond_1 .line 164 - monitor-enter v0 + const-class v3, Landroid/support/v4/util/ArraySet; + + monitor-enter v3 .line 165 :try_start_0 @@ -193,66 +206,71 @@ if-eqz v4, :cond_0 + .line 166 + sget-object p1, Landroid/support/v4/util/ArraySet;->sTwiceBaseCache:[Ljava/lang/Object; + .line 167 - iput-object v4, p0, Landroid/support/v4/util/ArraySet;->mArray:[Ljava/lang/Object; + iput-object p1, p0, Landroid/support/v4/util/ArraySet;->mArray:[Ljava/lang/Object; .line 168 - aget-object p1, v4, v2 + aget-object v4, p1, v1 - check-cast p1, [Ljava/lang/Object; + check-cast v4, [Ljava/lang/Object; - check-cast p1, [Ljava/lang/Object; + check-cast v4, [Ljava/lang/Object; - sput-object p1, Landroid/support/v4/util/ArraySet;->sTwiceBaseCache:[Ljava/lang/Object; + sput-object v4, Landroid/support/v4/util/ArraySet;->sTwiceBaseCache:[Ljava/lang/Object; .line 169 - aget-object p1, v4, v3 + aget-object v4, p1, v2 - check-cast p1, [I + check-cast v4, [I - check-cast p1, [I + check-cast v4, [I - iput-object p1, p0, Landroid/support/v4/util/ArraySet;->mHashes:[I + iput-object v4, p0, Landroid/support/v4/util/ArraySet;->mHashes:[I .line 170 - aput-object v1, v4, v3 + aput-object v0, p1, v2 - aput-object v1, v4, v2 + aput-object v0, p1, v1 .line 171 sget p1, Landroid/support/v4/util/ArraySet;->sTwiceBaseCacheSize:I - sub-int/2addr p1, v3 + sub-int/2addr p1, v2 sput p1, Landroid/support/v4/util/ArraySet;->sTwiceBaseCacheSize:I .line 176 - monitor-exit v0 + monitor-exit v3 return-void .line 178 :cond_0 - monitor-exit v0 + monitor-exit v3 goto :goto_0 :catchall_0 move-exception p1 - monitor-exit v0 + monitor-exit v3 :try_end_0 .catchall {:try_start_0 .. :try_end_0} :catchall_0 throw p1 :cond_1 - const/4 v4, 0x4 + const/4 v3, 0x4 - if-ne p1, v4, :cond_3 + if-ne p1, v3, :cond_3 .line 180 - monitor-enter v0 + const-class v3, Landroid/support/v4/util/ArraySet; + + monitor-enter v3 .line 181 :try_start_1 @@ -260,54 +278,57 @@ if-eqz v4, :cond_2 + .line 182 + sget-object p1, Landroid/support/v4/util/ArraySet;->sBaseCache:[Ljava/lang/Object; + .line 183 - iput-object v4, p0, Landroid/support/v4/util/ArraySet;->mArray:[Ljava/lang/Object; + iput-object p1, p0, Landroid/support/v4/util/ArraySet;->mArray:[Ljava/lang/Object; .line 184 - aget-object p1, v4, v2 + aget-object v4, p1, v1 - check-cast p1, [Ljava/lang/Object; + check-cast v4, [Ljava/lang/Object; - check-cast p1, [Ljava/lang/Object; + check-cast v4, [Ljava/lang/Object; - sput-object p1, Landroid/support/v4/util/ArraySet;->sBaseCache:[Ljava/lang/Object; + sput-object v4, Landroid/support/v4/util/ArraySet;->sBaseCache:[Ljava/lang/Object; .line 185 - aget-object p1, v4, v3 + aget-object v4, p1, v2 - check-cast p1, [I + check-cast v4, [I - check-cast p1, [I + check-cast v4, [I - iput-object p1, p0, Landroid/support/v4/util/ArraySet;->mHashes:[I + iput-object v4, p0, Landroid/support/v4/util/ArraySet;->mHashes:[I .line 186 - aput-object v1, v4, v3 + aput-object v0, p1, v2 - aput-object v1, v4, v2 + aput-object v0, p1, v1 .line 187 sget p1, Landroid/support/v4/util/ArraySet;->sBaseCacheSize:I - sub-int/2addr p1, v3 + sub-int/2addr p1, v2 sput p1, Landroid/support/v4/util/ArraySet;->sBaseCacheSize:I .line 192 - monitor-exit v0 + monitor-exit v3 return-void .line 194 :cond_2 - monitor-exit v0 + monitor-exit v3 goto :goto_0 :catchall_1 move-exception p1 - monitor-exit v0 + monitor-exit v3 :try_end_1 .catchall {:try_start_1 .. :try_end_1} :catchall_1 @@ -329,51 +350,51 @@ .end method .method private static freeArrays([I[Ljava/lang/Object;I)V - .locals 8 + .locals 7 .line 203 - const-class v0, Landroid/support/v4/util/ArraySet; + array-length v0, p0 - array-length v1, p0 - - const/4 v2, 0x0 + const/4 v1, 0x0 - const/4 v3, 0x2 + const/4 v2, 0x2 - const/4 v4, 0x0 + const/4 v3, 0x0 - const/16 v5, 0xa + const/16 v4, 0xa - const/4 v6, 0x1 + const/4 v5, 0x1 - const/16 v7, 0x8 + const/16 v6, 0x8 - if-ne v1, v7, :cond_2 + if-ne v0, v6, :cond_2 .line 204 + const-class v0, Landroid/support/v4/util/ArraySet; + monitor-enter v0 .line 205 :try_start_0 - sget v1, Landroid/support/v4/util/ArraySet;->sTwiceBaseCacheSize:I + sget v6, Landroid/support/v4/util/ArraySet;->sTwiceBaseCacheSize:I - if-ge v1, v5, :cond_1 + if-ge v6, v4, :cond_1 .line 206 - sget-object v1, Landroid/support/v4/util/ArraySet;->sTwiceBaseCache:[Ljava/lang/Object; + sget-object v4, Landroid/support/v4/util/ArraySet;->sTwiceBaseCache:[Ljava/lang/Object; - aput-object v1, p1, v4 + aput-object v4, p1, v3 .line 207 - aput-object p0, p1, v6 + aput-object p0, p1, v5 - sub-int/2addr p2, v6 + sub-int/2addr p2, v5 :goto_0 - if-lt p2, v3, :cond_0 + if-lt p2, v2, :cond_0 .line 209 - aput-object v2, p1, p2 + aput-object v1, p1, p2 add-int/lit8 p2, p2, -0x1 @@ -386,7 +407,7 @@ .line 212 sget p0, Landroid/support/v4/util/ArraySet;->sTwiceBaseCacheSize:I - add-int/2addr p0, v6 + add-int/2addr p0, v5 sput p0, Landroid/support/v4/util/ArraySet;->sTwiceBaseCacheSize:I @@ -407,36 +428,38 @@ .line 219 :cond_2 - array-length v1, p0 + array-length v0, p0 - const/4 v7, 0x4 + const/4 v6, 0x4 - if-ne v1, v7, :cond_5 + if-ne v0, v6, :cond_5 .line 220 + const-class v0, Landroid/support/v4/util/ArraySet; + monitor-enter v0 .line 221 :try_start_1 - sget v1, Landroid/support/v4/util/ArraySet;->sBaseCacheSize:I + sget v6, Landroid/support/v4/util/ArraySet;->sBaseCacheSize:I - if-ge v1, v5, :cond_4 + if-ge v6, v4, :cond_4 .line 222 - sget-object v1, Landroid/support/v4/util/ArraySet;->sBaseCache:[Ljava/lang/Object; + sget-object v4, Landroid/support/v4/util/ArraySet;->sBaseCache:[Ljava/lang/Object; - aput-object v1, p1, v4 + aput-object v4, p1, v3 .line 223 - aput-object p0, p1, v6 + aput-object p0, p1, v5 - sub-int/2addr p2, v6 + sub-int/2addr p2, v5 :goto_1 - if-lt p2, v3, :cond_3 + if-lt p2, v2, :cond_3 .line 225 - aput-object v2, p1, p2 + aput-object v1, p1, p2 add-int/lit8 p2, p2, -0x1 @@ -449,7 +472,7 @@ .line 228 sget p0, Landroid/support/v4/util/ArraySet;->sBaseCacheSize:I - add-int/2addr p0, v6 + add-int/2addr p0, v5 sput p0, Landroid/support/v4/util/ArraySet;->sBaseCacheSize:I @@ -708,6 +731,10 @@ # virtual methods .method public add(Ljava/lang/Object;)Z .locals 8 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(TE;)Z" @@ -757,59 +784,62 @@ iget-object v4, p0, Landroid/support/v4/util/ArraySet;->mHashes:[I - array-length v5, v4 + array-length v4, v4 - if-lt v3, v5, :cond_5 + if-lt v3, v4, :cond_5 - const/4 v5, 0x4 + const/4 v4, 0x4 - const/16 v6, 0x8 + const/16 v5, 0x8 - if-lt v3, v6, :cond_2 + if-lt v3, v5, :cond_2 - shr-int/lit8 v5, v3, 0x1 + shr-int/lit8 v4, v3, 0x1 - add-int/2addr v5, v3 + add-int/2addr v4, v3 goto :goto_1 :cond_2 - if-lt v3, v5, :cond_3 + if-lt v3, v4, :cond_3 - const/16 v5, 0x8 + const/16 v4, 0x8 - .line 381 + .line 380 :cond_3 :goto_1 - iget-object v3, p0, Landroid/support/v4/util/ArraySet;->mArray:[Ljava/lang/Object; + iget-object v3, p0, Landroid/support/v4/util/ArraySet;->mHashes:[I + + .line 381 + iget-object v5, p0, Landroid/support/v4/util/ArraySet;->mArray:[Ljava/lang/Object; .line 382 - invoke-direct {p0, v5}, Landroid/support/v4/util/ArraySet;->allocArrays(I)V + invoke-direct {p0, v4}, Landroid/support/v4/util/ArraySet;->allocArrays(I)V .line 384 - iget-object v5, p0, Landroid/support/v4/util/ArraySet;->mHashes:[I + iget-object v4, p0, Landroid/support/v4/util/ArraySet;->mHashes:[I - array-length v6, v5 + array-length v6, v4 if-lez v6, :cond_4 .line 386 - array-length v6, v4 + array-length v6, v3 - invoke-static {v4, v0, v5, v0, v6}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V + invoke-static {v3, v0, v4, v0, v6}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V .line 387 - iget-object v5, p0, Landroid/support/v4/util/ArraySet;->mArray:[Ljava/lang/Object; + iget-object v4, p0, Landroid/support/v4/util/ArraySet;->mArray:[Ljava/lang/Object; - array-length v6, v3 + array-length v6, v5 - invoke-static {v3, v0, v5, v0, v6}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V + invoke-static {v5, v0, v4, v0, v6}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V .line 390 :cond_4 iget v0, p0, Landroid/support/v4/util/ArraySet;->mSize:I - invoke-static {v4, v3, v0}, Landroid/support/v4/util/ArraySet;->freeArrays([I[Ljava/lang/Object;I)V + invoke-static {v3, v5, v0}, Landroid/support/v4/util/ArraySet;->freeArrays([I[Ljava/lang/Object;I)V .line 393 :cond_5 @@ -860,6 +890,10 @@ .method public addAll(Landroid/support/v4/util/ArraySet;)V .locals 4 + .param p1 # Landroid/support/v4/util/ArraySet; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -928,6 +962,10 @@ .method public addAll(Ljava/util/Collection;)Z .locals 2 + .param p1 # Ljava/util/Collection; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -980,6 +1018,12 @@ .method public append(Ljava/lang/Object;)V .locals 4 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(TE;)V" @@ -1014,9 +1058,9 @@ add-int/lit8 v3, v0, -0x1 .line 420 - aget v3, v2, v3 + aget v2, v2, v3 - if-le v3, v1, :cond_1 + if-le v2, v1, :cond_1 .line 429 invoke-virtual {p0, p1}, Landroid/support/v4/util/ArraySet;->add(Ljava/lang/Object;)Z @@ -1024,12 +1068,14 @@ return-void :cond_1 - add-int/lit8 v3, v0, 0x1 + add-int/lit8 v2, v0, 0x1 .line 432 - iput v3, p0, Landroid/support/v4/util/ArraySet;->mSize:I + iput v2, p0, Landroid/support/v4/util/ArraySet;->mSize:I .line 433 + iget-object v2, p0, Landroid/support/v4/util/ArraySet;->mHashes:[I + aput v1, v2, v0 .line 434 @@ -1086,6 +1132,10 @@ .method public contains(Ljava/lang/Object;)Z .locals 0 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 318 invoke-virtual {p0, p1}, Landroid/support/v4/util/ArraySet;->indexOf(Ljava/lang/Object;)I @@ -1107,6 +1157,10 @@ .method public containsAll(Ljava/util/Collection;)Z .locals 1 + .param p1 # Ljava/util/Collection; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -1298,6 +1352,10 @@ .method public indexOf(Ljava/lang/Object;)I .locals 1 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param if-nez p1, :cond_0 @@ -1368,6 +1426,10 @@ .method public remove(Ljava/lang/Object;)Z .locals 0 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 465 invoke-virtual {p0, p1}, Landroid/support/v4/util/ArraySet;->indexOf(Ljava/lang/Object;)I @@ -1391,6 +1453,10 @@ .method public removeAll(Landroid/support/v4/util/ArraySet;)Z .locals 5 + .param p1 # Landroid/support/v4/util/ArraySet; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -1437,6 +1503,10 @@ .method public removeAll(Ljava/util/Collection;)Z .locals 2 + .param p1 # Ljava/util/Collection; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -1477,7 +1547,7 @@ .end method .method public removeAt(I)Ljava/lang/Object; - .locals 8 + .locals 7 .annotation system Ldalvik/annotation/Signature; value = { "(I)TE;" @@ -1520,98 +1590,111 @@ .line 488 :cond_0 - iget-object v5, p0, Landroid/support/v4/util/ArraySet;->mHashes:[I + iget-object v0, p0, Landroid/support/v4/util/ArraySet;->mHashes:[I - array-length v6, v5 + array-length v5, v0 - const/16 v7, 0x8 + const/16 v6, 0x8 - if-le v6, v7, :cond_3 + if-le v5, v6, :cond_3 - array-length v6, v5 + array-length v0, v0 - div-int/lit8 v6, v6, 0x3 + div-int/lit8 v0, v0, 0x3 - if-ge v2, v6, :cond_3 + if-ge v2, v0, :cond_3 - if-le v2, v7, :cond_1 + if-le v2, v6, :cond_1 - shr-int/lit8 v6, v2, 0x1 + shr-int/lit8 v0, v2, 0x1 - add-int v7, v2, v6 + add-int v6, v2, v0 - .line 498 + .line 496 :cond_1 - invoke-direct {p0, v7}, Landroid/support/v4/util/ArraySet;->allocArrays(I)V + iget-object v0, p0, Landroid/support/v4/util/ArraySet;->mHashes:[I + + .line 497 + iget-object v2, p0, Landroid/support/v4/util/ArraySet;->mArray:[Ljava/lang/Object; + + .line 498 + invoke-direct {p0, v6}, Landroid/support/v4/util/ArraySet;->allocArrays(I)V .line 500 - iget v2, p0, Landroid/support/v4/util/ArraySet;->mSize:I + iget v5, p0, Landroid/support/v4/util/ArraySet;->mSize:I - sub-int/2addr v2, v4 + sub-int/2addr v5, v4 - iput v2, p0, Landroid/support/v4/util/ArraySet;->mSize:I + iput v5, p0, Landroid/support/v4/util/ArraySet;->mSize:I if-lez p1, :cond_2 .line 503 - iget-object v2, p0, Landroid/support/v4/util/ArraySet;->mHashes:[I + iget-object v4, p0, Landroid/support/v4/util/ArraySet;->mHashes:[I - invoke-static {v5, v3, v2, v3, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V + invoke-static {v0, v3, v4, v3, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V .line 504 - iget-object v2, p0, Landroid/support/v4/util/ArraySet;->mArray:[Ljava/lang/Object; + iget-object v4, p0, Landroid/support/v4/util/ArraySet;->mArray:[Ljava/lang/Object; - invoke-static {v0, v3, v2, v3, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V + invoke-static {v2, v3, v4, v3, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V .line 506 :cond_2 - iget v2, p0, Landroid/support/v4/util/ArraySet;->mSize:I + iget v3, p0, Landroid/support/v4/util/ArraySet;->mSize:I - if-ge p1, v2, :cond_5 + if-ge p1, v3, :cond_5 - add-int/lit8 v3, p1, 0x1 + add-int/lit8 v4, p1, 0x1 .line 511 - iget-object v4, p0, Landroid/support/v4/util/ArraySet;->mHashes:[I + iget-object v5, p0, Landroid/support/v4/util/ArraySet;->mHashes:[I - sub-int/2addr v2, p1 + sub-int/2addr v3, p1 - invoke-static {v5, v3, v4, p1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V + invoke-static {v0, v4, v5, p1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V .line 512 - iget-object v2, p0, Landroid/support/v4/util/ArraySet;->mArray:[Ljava/lang/Object; + iget-object v0, p0, Landroid/support/v4/util/ArraySet;->mArray:[Ljava/lang/Object; - iget v4, p0, Landroid/support/v4/util/ArraySet;->mSize:I + iget v3, p0, Landroid/support/v4/util/ArraySet;->mSize:I - sub-int/2addr v4, p1 + sub-int/2addr v3, p1 - invoke-static {v0, v3, v2, p1, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V + invoke-static {v2, v4, v0, p1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V goto :goto_0 + .line 515 :cond_3 - sub-int/2addr v2, v4 + iget v0, p0, Landroid/support/v4/util/ArraySet;->mSize:I - .line 515 - iput v2, p0, Landroid/support/v4/util/ArraySet;->mSize:I + sub-int/2addr v0, v4 - if-ge p1, v2, :cond_4 + iput v0, p0, Landroid/support/v4/util/ArraySet;->mSize:I - add-int/lit8 v0, p1, 0x1 + .line 516 + iget v0, p0, Landroid/support/v4/util/ArraySet;->mSize:I - sub-int/2addr v2, p1 + if-ge p1, v0, :cond_4 .line 520 - invoke-static {v5, v0, v5, p1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V + iget-object v2, p0, Landroid/support/v4/util/ArraySet;->mHashes:[I + + add-int/lit8 v3, p1, 0x1 + + sub-int/2addr v0, p1 + + invoke-static {v2, v3, v2, p1, v0}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V .line 521 - iget-object v2, p0, Landroid/support/v4/util/ArraySet;->mArray:[Ljava/lang/Object; + iget-object v0, p0, Landroid/support/v4/util/ArraySet;->mArray:[Ljava/lang/Object; - iget v3, p0, Landroid/support/v4/util/ArraySet;->mSize:I + iget v2, p0, Landroid/support/v4/util/ArraySet;->mSize:I - sub-int/2addr v3, p1 + sub-int/2addr v2, p1 - invoke-static {v2, v0, v2, p1, v3}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V + invoke-static {v0, v3, v0, p1, v2}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V .line 523 :cond_4 @@ -1630,6 +1713,10 @@ .method public retainAll(Ljava/util/Collection;)Z .locals 4 + .param p1 # Ljava/util/Collection; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -1686,6 +1773,8 @@ .method public toArray()[Ljava/lang/Object; .locals 4 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 560 iget v0, p0, Landroid/support/v4/util/ArraySet;->mSize:I @@ -1704,6 +1793,13 @@ .method public toArray([Ljava/lang/Object;)[Ljava/lang/Object; .locals 3 + .param p1 # [Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(Ljava/io/File;)V .locals 2 + .param p1 # Ljava/io/File; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 54 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -49,6 +53,10 @@ .method private static sync(Ljava/io/FileOutputStream;)Z .locals 0 + .param p0 # Ljava/io/FileOutputStream; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 212 :try_start_0 @@ -90,6 +98,10 @@ .method public failWrite(Ljava/io/FileOutputStream;)V .locals 2 + .param p1 # Ljava/io/FileOutputStream; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param if-eqz p1, :cond_0 @@ -133,6 +145,10 @@ .method public finishWrite(Ljava/io/FileOutputStream;)V .locals 2 + .param p1 # Ljava/io/FileOutputStream; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param if-eqz p1, :cond_0 @@ -169,6 +185,8 @@ .method public getBaseFile()Ljava/io/File; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 65 iget-object v0, p0, Landroid/support/v4/util/AtomicFile;->mBaseName:Ljava/io/File; @@ -178,6 +196,9 @@ .method public openRead()Ljava/io/FileInputStream; .locals 2 + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Ljava/io/FileNotFoundException; @@ -218,6 +239,9 @@ .method public readFully()[B .locals 6 + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Ljava/io/IOException; @@ -298,17 +322,16 @@ .line 206 invoke-virtual {v0}, Ljava/io/FileInputStream;->close()V - goto :goto_2 - - :goto_1 throw v1 - :goto_2 - goto :goto_1 + return-void .end method .method public startWrite()Ljava/io/FileOutputStream; .locals 3 + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Ljava/io/IOException; diff --git a/smali/android/support/v4/util/CircularArray.smali b/smali/android/support/v4/util/CircularArray.smali index 9a435b5c..3dda62d1 100644 --- a/smali/android/support/v4/util/CircularArray.smali +++ b/smali/android/support/v4/util/CircularArray.smali @@ -191,14 +191,16 @@ iput v0, p0, Landroid/support/v4/util/CircularArray;->mHead:I .line 85 - iget-object v1, p0, Landroid/support/v4/util/CircularArray;->mElements:[Ljava/lang/Object; + iget-object v0, p0, Landroid/support/v4/util/CircularArray;->mElements:[Ljava/lang/Object; + + iget v1, p0, Landroid/support/v4/util/CircularArray;->mHead:I - aput-object p1, v1, v0 + aput-object p1, v0, v1 .line 86 iget p1, p0, Landroid/support/v4/util/CircularArray;->mTail:I - if-ne v0, p1, :cond_0 + if-ne v1, p1, :cond_0 .line 87 invoke-direct {p0}, Landroid/support/v4/util/CircularArray;->doubleCapacity()V @@ -232,6 +234,8 @@ iput p1, p0, Landroid/support/v4/util/CircularArray;->mTail:I .line 98 + iget p1, p0, Landroid/support/v4/util/CircularArray;->mTail:I + iget v0, p0, Landroid/support/v4/util/CircularArray;->mHead:I if-ne p1, v0, :cond_0 @@ -540,6 +544,9 @@ iput v0, p0, Landroid/support/v4/util/CircularArray;->mTail:I + .line 201 + iget v0, p0, Landroid/support/v4/util/CircularArray;->mTail:I + sub-int/2addr v0, p1 move p1, v0 @@ -572,13 +579,9 @@ invoke-direct {p1}, Ljava/lang/ArrayIndexOutOfBoundsException;->()V - goto :goto_3 - - :goto_2 throw p1 - :goto_3 - goto :goto_2 + return-void .end method .method public removeFromStart(I)V @@ -610,7 +613,10 @@ add-int v0, v1, p1 + .line 159 :cond_1 + iget v1, p0, Landroid/support/v4/util/CircularArray;->mHead:I + :goto_0 const/4 v2, 0x0 @@ -671,13 +677,9 @@ invoke-direct {p1}, Ljava/lang/ArrayIndexOutOfBoundsException;->()V - goto :goto_3 - - :goto_2 throw p1 - :goto_3 - goto :goto_2 + return-void .end method .method public size()I diff --git a/smali/android/support/v4/util/CircularIntArray.smali b/smali/android/support/v4/util/CircularIntArray.smali index 3e43dbdc..a69bcc4b 100644 --- a/smali/android/support/v4/util/CircularIntArray.smali +++ b/smali/android/support/v4/util/CircularIntArray.smali @@ -165,14 +165,16 @@ iput v0, p0, Landroid/support/v4/util/CircularIntArray;->mHead:I .line 86 - iget-object v1, p0, Landroid/support/v4/util/CircularIntArray;->mElements:[I + iget-object v0, p0, Landroid/support/v4/util/CircularIntArray;->mElements:[I - aput p1, v1, v0 + iget v1, p0, Landroid/support/v4/util/CircularIntArray;->mHead:I + + aput p1, v0, v1 .line 87 iget p1, p0, Landroid/support/v4/util/CircularIntArray;->mTail:I - if-ne v0, p1, :cond_0 + if-ne v1, p1, :cond_0 .line 88 invoke-direct {p0}, Landroid/support/v4/util/CircularIntArray;->doubleCapacity()V @@ -201,6 +203,8 @@ iput p1, p0, Landroid/support/v4/util/CircularIntArray;->mTail:I .line 99 + iget p1, p0, Landroid/support/v4/util/CircularIntArray;->mTail:I + iget v0, p0, Landroid/support/v4/util/CircularIntArray;->mHead:I if-ne p1, v0, :cond_0 diff --git a/smali/android/support/v4/util/ContainerHelpers.smali b/smali/android/support/v4/util/ContainerHelpers.smali index 3860d07a..386c46d3 100644 --- a/smali/android/support/v4/util/ContainerHelpers.smali +++ b/smali/android/support/v4/util/ContainerHelpers.smali @@ -17,19 +17,19 @@ const/4 v0, 0x0 + .line 20 new-array v1, v0, [I - .line 20 sput-object v1, Landroid/support/v4/util/ContainerHelpers;->EMPTY_INTS:[I + .line 21 new-array v1, v0, [J - .line 21 sput-object v1, Landroid/support/v4/util/ContainerHelpers;->EMPTY_LONGS:[J + .line 22 new-array v0, v0, [Ljava/lang/Object; - .line 22 sput-object v0, Landroid/support/v4/util/ContainerHelpers;->EMPTY_OBJECTS:[Ljava/lang/Object; return-void diff --git a/smali/android/support/v4/util/DebugUtils.smali b/smali/android/support/v4/util/DebugUtils.smali index 6b53367b..005c2c29 100644 --- a/smali/android/support/v4/util/DebugUtils.smali +++ b/smali/android/support/v4/util/DebugUtils.smali @@ -3,6 +3,14 @@ .source "DebugUtils.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # direct methods .method private constructor ()V .locals 0 diff --git a/smali/android/support/v4/util/LogWriter.smali b/smali/android/support/v4/util/LogWriter.smali index 2092101f..8cecbf30 100644 --- a/smali/android/support/v4/util/LogWriter.smali +++ b/smali/android/support/v4/util/LogWriter.smali @@ -3,6 +3,14 @@ .source "LogWriter.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # instance fields .field private mBuilder:Ljava/lang/StringBuilder; diff --git a/smali/android/support/v4/util/LongSparseArray.smali b/smali/android/support/v4/util/LongSparseArray.smali index 0fff16ac..dc9df24e 100644 --- a/smali/android/support/v4/util/LongSparseArray.smali +++ b/smali/android/support/v4/util/LongSparseArray.smali @@ -184,13 +184,13 @@ iget-object v1, p0, Landroid/support/v4/util/LongSparseArray;->mKeys:[J - add-int/lit8 v2, v0, -0x1 + add-int/lit8 v0, v0, -0x1 - aget-wide v2, v1, v2 + aget-wide v0, v1, v0 - cmp-long v1, p1, v2 + cmp-long v2, p1, v0 - if-gtz v1, :cond_0 + if-gtz v2, :cond_0 .line 370 invoke-virtual {p0, p1, p2, p3}, Landroid/support/v4/util/LongSparseArray;->put(JLjava/lang/Object;)V @@ -199,9 +199,11 @@ .line 374 :cond_0 - iget-boolean v1, p0, Landroid/support/v4/util/LongSparseArray;->mGarbage:Z + iget-boolean v0, p0, Landroid/support/v4/util/LongSparseArray;->mGarbage:Z - if-eqz v1, :cond_1 + if-eqz v0, :cond_1 + + iget v0, p0, Landroid/support/v4/util/LongSparseArray;->mSize:I iget-object v1, p0, Landroid/support/v4/util/LongSparseArray;->mKeys:[J @@ -467,6 +469,9 @@ .method public get(J)Ljava/lang/Object; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(J)TE;" @@ -505,15 +510,18 @@ .line 117 iget-object p2, p0, Landroid/support/v4/util/LongSparseArray;->mValues:[Ljava/lang/Object; - aget-object p1, p2, p1 + aget-object v0, p2, p1 - sget-object p2, Landroid/support/v4/util/LongSparseArray;->DELETED:Ljava/lang/Object; + sget-object v1, Landroid/support/v4/util/LongSparseArray;->DELETED:Ljava/lang/Object; - if-ne p1, p2, :cond_0 + if-ne v0, v1, :cond_0 goto :goto_0 + .line 120 :cond_0 + aget-object p1, p2, p1 + return-object p1 :cond_1 @@ -665,29 +673,31 @@ if-ge v0, v1, :cond_1 - iget-object v2, p0, Landroid/support/v4/util/LongSparseArray;->mValues:[Ljava/lang/Object; + iget-object v1, p0, Landroid/support/v4/util/LongSparseArray;->mValues:[Ljava/lang/Object; - aget-object v3, v2, v0 + aget-object v2, v1, v0 - sget-object v4, Landroid/support/v4/util/LongSparseArray;->DELETED:Ljava/lang/Object; + sget-object v3, Landroid/support/v4/util/LongSparseArray;->DELETED:Ljava/lang/Object; - if-ne v3, v4, :cond_1 + if-ne v2, v3, :cond_1 .line 197 - iget-object v1, p0, Landroid/support/v4/util/LongSparseArray;->mKeys:[J + iget-object v2, p0, Landroid/support/v4/util/LongSparseArray;->mKeys:[J - aput-wide p1, v1, v0 + aput-wide p1, v2, v0 .line 198 - aput-object p3, v2, v0 + aput-object p3, v1, v0 return-void .line 202 :cond_1 - iget-boolean v2, p0, Landroid/support/v4/util/LongSparseArray;->mGarbage:Z + iget-boolean v1, p0, Landroid/support/v4/util/LongSparseArray;->mGarbage:Z - if-eqz v2, :cond_2 + if-eqz v1, :cond_2 + + iget v1, p0, Landroid/support/v4/util/LongSparseArray;->mSize:I iget-object v2, p0, Landroid/support/v4/util/LongSparseArray;->mKeys:[J @@ -804,6 +814,10 @@ .method public putAll(Landroid/support/v4/util/LongSparseArray;)V .locals 5 + .param p1 # Landroid/support/v4/util/LongSparseArray; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", diff --git a/smali/android/support/v4/util/LruCache.smali b/smali/android/support/v4/util/LruCache.smali index 1a9deb0d..88e007fc 100644 --- a/smali/android/support/v4/util/LruCache.smali +++ b/smali/android/support/v4/util/LruCache.smali @@ -129,6 +129,13 @@ # virtual methods .method protected create(Ljava/lang/Object;)Ljava/lang/Object; .locals 0 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(TK;)TV;" @@ -165,6 +172,18 @@ .method protected entryRemoved(ZLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V .locals 0 + .param p2 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(ZTK;TV;TV;)V" @@ -210,6 +229,13 @@ .method public final get(Ljava/lang/Object;)Ljava/lang/Object; .locals 4 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(TK;)TV;" @@ -434,6 +460,17 @@ .method public final put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .locals 3 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(TK;TV;)TV;" @@ -554,6 +591,13 @@ .method public final remove(Ljava/lang/Object;)Ljava/lang/Object; .locals 3 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(TK;)TV;" @@ -695,6 +739,14 @@ .method protected sizeOf(Ljava/lang/Object;Ljava/lang/Object;)I .locals 0 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(TK;TV;)I" @@ -751,16 +803,18 @@ iget v1, p0, Landroid/support/v4/util/LruCache;->missCount:I - add-int/2addr v1, v0 - - const/4 v2, 0x0 + add-int/2addr v0, v1 - if-eqz v1, :cond_0 + const/4 v1, 0x0 - mul-int/lit8 v0, v0, 0x64 + if-eqz v0, :cond_0 .line 349 - div-int/2addr v0, v1 + iget v2, p0, Landroid/support/v4/util/LruCache;->hitCount:I + + mul-int/lit8 v2, v2, 0x64 + + div-int v0, v2, v0 goto :goto_0 @@ -769,7 +823,7 @@ .line 350 :goto_0 - sget-object v1, Ljava/util/Locale;->US:Ljava/util/Locale; + sget-object v2, Ljava/util/Locale;->US:Ljava/util/Locale; const-string v3, "LruCache[maxSize=%d,hits=%d,misses=%d,hitRate=%d%%]" @@ -784,9 +838,9 @@ move-result-object v5 - aput-object v5, v4, v2 + aput-object v5, v4, v1 - const/4 v2, 0x1 + const/4 v1, 0x1 iget v5, p0, Landroid/support/v4/util/LruCache;->hitCount:I @@ -794,9 +848,9 @@ move-result-object v5 - aput-object v5, v4, v2 + aput-object v5, v4, v1 - const/4 v2, 0x2 + const/4 v1, 0x2 iget v5, p0, Landroid/support/v4/util/LruCache;->missCount:I @@ -804,18 +858,18 @@ move-result-object v5 - aput-object v5, v4, v2 + aput-object v5, v4, v1 - const/4 v2, 0x3 + const/4 v1, 0x3 invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; move-result-object v0 - aput-object v0, v4, v2 + aput-object v0, v4, v1 .line 350 - invoke-static {v1, v3, v4}, Ljava/lang/String;->format(Ljava/util/Locale;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String; + invoke-static {v2, v3, v4}, Ljava/lang/String;->format(Ljava/util/Locale;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String; move-result-object v0 :try_end_0 @@ -985,11 +1039,7 @@ :try_end_1 .catchall {:try_start_1 .. :try_end_1} :catchall_0 - goto :goto_3 - - :goto_2 throw p1 - :goto_3 - goto :goto_2 + return-void .end method diff --git a/smali/android/support/v4/util/MapCollections$ArrayIterator.smali b/smali/android/support/v4/util/MapCollections$ArrayIterator.smali index c38cb5df..cff58a97 100644 --- a/smali/android/support/v4/util/MapCollections$ArrayIterator.smali +++ b/smali/android/support/v4/util/MapCollections$ArrayIterator.smali @@ -155,21 +155,23 @@ iput v0, p0, Landroid/support/v4/util/MapCollections$ArrayIterator;->mIndex:I .line 68 - iget v1, p0, Landroid/support/v4/util/MapCollections$ArrayIterator;->mSize:I + iget v0, p0, Landroid/support/v4/util/MapCollections$ArrayIterator;->mSize:I - add-int/lit8 v1, v1, -0x1 + add-int/lit8 v0, v0, -0x1 - iput v1, p0, Landroid/support/v4/util/MapCollections$ArrayIterator;->mSize:I + iput v0, p0, Landroid/support/v4/util/MapCollections$ArrayIterator;->mSize:I - const/4 v1, 0x0 + const/4 v0, 0x0 .line 69 - iput-boolean v1, p0, Landroid/support/v4/util/MapCollections$ArrayIterator;->mCanRemove:Z + iput-boolean v0, p0, Landroid/support/v4/util/MapCollections$ArrayIterator;->mCanRemove:Z .line 70 - iget-object v1, p0, Landroid/support/v4/util/MapCollections$ArrayIterator;->this$0:Landroid/support/v4/util/MapCollections; + iget-object v0, p0, Landroid/support/v4/util/MapCollections$ArrayIterator;->this$0:Landroid/support/v4/util/MapCollections; + + iget v1, p0, Landroid/support/v4/util/MapCollections$ArrayIterator;->mIndex:I - invoke-virtual {v1, v0}, Landroid/support/v4/util/MapCollections;->colRemoveAt(I)V + invoke-virtual {v0, v1}, Landroid/support/v4/util/MapCollections;->colRemoveAt(I)V return-void diff --git a/smali/android/support/v4/util/MapCollections.smali b/smali/android/support/v4/util/MapCollections.smali index aca9319a..09bc5083 100644 --- a/smali/android/support/v4/util/MapCollections.smali +++ b/smali/android/support/v4/util/MapCollections.smali @@ -28,6 +28,9 @@ # instance fields .field mEntrySet:Landroid/support/v4/util/MapCollections$EntrySet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "Landroid/support/v4/util/MapCollections<", @@ -37,6 +40,9 @@ .end field .field mKeySet:Landroid/support/v4/util/MapCollections$KeySet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "Landroid/support/v4/util/MapCollections<", @@ -46,6 +52,9 @@ .end field .field mValues:Landroid/support/v4/util/MapCollections$ValuesCollection; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "Landroid/support/v4/util/MapCollections<", diff --git a/smali/android/support/v4/util/ObjectsCompat.smali b/smali/android/support/v4/util/ObjectsCompat.smali index 7dcb0003..8afecd1a 100644 --- a/smali/android/support/v4/util/ObjectsCompat.smali +++ b/smali/android/support/v4/util/ObjectsCompat.smali @@ -15,6 +15,14 @@ .method public static equals(Ljava/lang/Object;Ljava/lang/Object;)Z .locals 2 + .param p0 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 50 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -59,6 +67,10 @@ .method public static varargs hash([Ljava/lang/Object;)I .locals 2 + .param p0 # [Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 92 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -85,6 +97,10 @@ .method public static hashCode(Ljava/lang/Object;)I .locals 0 + .param p0 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param if-eqz p0, :cond_0 diff --git a/smali/android/support/v4/util/Pair.smali b/smali/android/support/v4/util/Pair.smali index de0aae7b..fbb18159 100644 --- a/smali/android/support/v4/util/Pair.smali +++ b/smali/android/support/v4/util/Pair.smali @@ -18,6 +18,9 @@ # instance fields .field public final first:Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "TF;" @@ -26,6 +29,9 @@ .end field .field public final second:Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "TS;" @@ -37,6 +43,14 @@ # direct methods .method public constructor (Ljava/lang/Object;Ljava/lang/Object;)V .locals 0 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p2 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(TF;TS;)V" @@ -57,6 +71,17 @@ .method public static create(Ljava/lang/Object;Ljava/lang/Object;)Landroid/support/v4/util/Pair; .locals 1 + .param p0 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field .field public static final AUTOLINK_WEB_URL:Ljava/util/regex/Pattern; + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field .field public static final DOMAIN_NAME:Ljava/util/regex/Pattern; @@ -63,7 +75,7 @@ # direct methods .method static constructor ()V - .locals 11 + .locals 9 const-string v0, "((25[0-5]|2[0-4][0-9]|[0-1][0-9]{2}|[1-9][0-9]|[1-9])\\.(25[0-5]|2[0-4][0-9]|[0-1][0-9]{2}|[1-9][0-9]|[1-9]|0)\\.(25[0-5]|2[0-4][0-9]|[0-1][0-9]{2}|[1-9][0-9]|[1-9]|0)\\.(25[0-5]|2[0-4][0-9]|[0-1][0-9]{2}|[1-9][0-9]|[0-9]))" @@ -75,219 +87,235 @@ sput-object v0, Landroid/support/v4/util/PatternsCompat;->IP_ADDRESS:Ljava/util/regex/Pattern; .line 208 - new-instance v1, Ljava/lang/StringBuilder; + new-instance v0, Ljava/lang/StringBuilder; - invoke-direct {v1}, Ljava/lang/StringBuilder;->()V + invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - const-string v2, "(([a-zA-Z0-9[\u00a0-\ud7ff\uf900-\ufdcf\ufdf0-\uffef\ud800\udc00-\ud83f\udffd\ud840\udc00-\ud87f\udffd\ud880\udc00-\ud8bf\udffd\ud8c0\udc00-\ud8ff\udffd\ud900\udc00-\ud93f\udffd\ud940\udc00-\ud97f\udffd\ud980\udc00-\ud9bf\udffd\ud9c0\udc00-\ud9ff\udffd\uda00\udc00-\uda3f\udffd\uda40\udc00-\uda7f\udffd\uda80\udc00-\udabf\udffd\udac0\udc00-\udaff\udffd\udb00\udc00-\udb3f\udffd\udb44\udc00-\udb7f\udffd&&[^\u00a0[\u2000-\u200a]\u2028\u2029\u202f\u3000]]](?:[a-zA-Z0-9[\u00a0-\ud7ff\uf900-\ufdcf\ufdf0-\uffef\ud800\udc00-\ud83f\udffd\ud840\udc00-\ud87f\udffd\ud880\udc00-\ud8bf\udffd\ud8c0\udc00-\ud8ff\udffd\ud900\udc00-\ud93f\udffd\ud940\udc00-\ud97f\udffd\ud980\udc00-\ud9bf\udffd\ud9c0\udc00-\ud9ff\udffd\uda00\udc00-\uda3f\udffd\uda40\udc00-\uda7f\udffd\uda80\udc00-\udabf\udffd\udac0\udc00-\udaff\udffd\udb00\udc00-\udb3f\udffd\udb44\udc00-\udb7f\udffd&&[^\u00a0[\u2000-\u200a]\u2028\u2029\u202f\u3000]]_\\-]{0,61}[a-zA-Z0-9[\u00a0-\ud7ff\uf900-\ufdcf\ufdf0-\uffef\ud800\udc00-\ud83f\udffd\ud840\udc00-\ud87f\udffd\ud880\udc00-\ud8bf\udffd\ud8c0\udc00-\ud8ff\udffd\ud900\udc00-\ud93f\udffd\ud940\udc00-\ud97f\udffd\ud980\udc00-\ud9bf\udffd\ud9c0\udc00-\ud9ff\udffd\uda00\udc00-\uda3f\udffd\uda40\udc00-\uda7f\udffd\uda80\udc00-\udabf\udffd\udac0\udc00-\udaff\udffd\udb00\udc00-\udb3f\udffd\udb44\udc00-\udb7f\udffd&&[^\u00a0[\u2000-\u200a]\u2028\u2029\u202f\u3000]]]){0,1}\\.)+(xn\\-\\-[\\w\\-]{0,58}\\w|[a-zA-Z[\u00a0-\ud7ff\uf900-\ufdcf\ufdf0-\uffef\ud800\udc00-\ud83f\udffd\ud840\udc00-\ud87f\udffd\ud880\udc00-\ud8bf\udffd\ud8c0\udc00-\ud8ff\udffd\ud900\udc00-\ud93f\udffd\ud940\udc00-\ud97f\udffd\ud980\udc00-\ud9bf\udffd\ud9c0\udc00-\ud9ff\udffd\uda00\udc00-\uda3f\udffd\uda40\udc00-\uda7f\udffd\uda80\udc00-\udabf\udffd\udac0\udc00-\udaff\udffd\udb00\udc00-\udb3f\udffd\udb44\udc00-\udb7f\udffd&&[^\u00a0[\u2000-\u200a]\u2028\u2029\u202f\u3000]]]{2,63})|" + const-string v1, "(([a-zA-Z0-9[\u00a0-\ud7ff\uf900-\ufdcf\ufdf0-\uffef\ud800\udc00-\ud83f\udffd\ud840\udc00-\ud87f\udffd\ud880\udc00-\ud8bf\udffd\ud8c0\udc00-\ud8ff\udffd\ud900\udc00-\ud93f\udffd\ud940\udc00-\ud97f\udffd\ud980\udc00-\ud9bf\udffd\ud9c0\udc00-\ud9ff\udffd\uda00\udc00-\uda3f\udffd\uda40\udc00-\uda7f\udffd\uda80\udc00-\udabf\udffd\udac0\udc00-\udaff\udffd\udb00\udc00-\udb3f\udffd\udb44\udc00-\udb7f\udffd&&[^\u00a0[\u2000-\u200a]\u2028\u2029\u202f\u3000]]](?:[a-zA-Z0-9[\u00a0-\ud7ff\uf900-\ufdcf\ufdf0-\uffef\ud800\udc00-\ud83f\udffd\ud840\udc00-\ud87f\udffd\ud880\udc00-\ud8bf\udffd\ud8c0\udc00-\ud8ff\udffd\ud900\udc00-\ud93f\udffd\ud940\udc00-\ud97f\udffd\ud980\udc00-\ud9bf\udffd\ud9c0\udc00-\ud9ff\udffd\uda00\udc00-\uda3f\udffd\uda40\udc00-\uda7f\udffd\uda80\udc00-\udabf\udffd\udac0\udc00-\udaff\udffd\udb00\udc00-\udb3f\udffd\udb44\udc00-\udb7f\udffd&&[^\u00a0[\u2000-\u200a]\u2028\u2029\u202f\u3000]]_\\-]{0,61}[a-zA-Z0-9[\u00a0-\ud7ff\uf900-\ufdcf\ufdf0-\uffef\ud800\udc00-\ud83f\udffd\ud840\udc00-\ud87f\udffd\ud880\udc00-\ud8bf\udffd\ud8c0\udc00-\ud8ff\udffd\ud900\udc00-\ud93f\udffd\ud940\udc00-\ud97f\udffd\ud980\udc00-\ud9bf\udffd\ud9c0\udc00-\ud9ff\udffd\uda00\udc00-\uda3f\udffd\uda40\udc00-\uda7f\udffd\uda80\udc00-\udabf\udffd\udac0\udc00-\udaff\udffd\udb00\udc00-\udb3f\udffd\udb44\udc00-\udb7f\udffd&&[^\u00a0[\u2000-\u200a]\u2028\u2029\u202f\u3000]]]){0,1}\\.)+(xn\\-\\-[\\w\\-]{0,58}\\w|[a-zA-Z[\u00a0-\ud7ff\uf900-\ufdcf\ufdf0-\uffef\ud800\udc00-\ud83f\udffd\ud840\udc00-\ud87f\udffd\ud880\udc00-\ud8bf\udffd\ud8c0\udc00-\ud8ff\udffd\ud900\udc00-\ud93f\udffd\ud940\udc00-\ud97f\udffd\ud980\udc00-\ud9bf\udffd\ud9c0\udc00-\ud9ff\udffd\uda00\udc00-\uda3f\udffd\uda40\udc00-\uda7f\udffd\uda80\udc00-\udabf\udffd\udac0\udc00-\udaff\udffd\udb00\udc00-\udb3f\udffd\udb44\udc00-\udb7f\udffd&&[^\u00a0[\u2000-\u200a]\u2028\u2029\u202f\u3000]]]{2,63})|" - invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + sget-object v1, Landroid/support/v4/util/PatternsCompat;->IP_ADDRESS:Ljava/util/regex/Pattern; - const-string v2, ")" + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + const-string v1, ")" - invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - move-result-object v1 + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + + move-result-object v0 .line 209 - invoke-static {v1}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;)Ljava/util/regex/Pattern; + invoke-static {v0}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;)Ljava/util/regex/Pattern; - move-result-object v1 + move-result-object v0 - sput-object v1, Landroid/support/v4/util/PatternsCompat;->DOMAIN_NAME:Ljava/util/regex/Pattern; + sput-object v0, Landroid/support/v4/util/PatternsCompat;->DOMAIN_NAME:Ljava/util/regex/Pattern; .line 230 - new-instance v3, Ljava/lang/StringBuilder; + new-instance v0, Ljava/lang/StringBuilder; - invoke-direct {v3}, Ljava/lang/StringBuilder;->()V + invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - const-string v4, "(((?:(?i:http|https|rtsp)://(?:(?:[a-zA-Z0-9\\$\\-\\_\\.\\+\\!\\*\\\'\\(\\)\\,\\;\\?\\&\\=]|(?:\\%[a-fA-F0-9]{2})){1,64}(?:\\:(?:[a-zA-Z0-9\\$\\-\\_\\.\\+\\!\\*\\\'\\(\\)\\,\\;\\?\\&\\=]|(?:\\%[a-fA-F0-9]{2})){1,25})?\\@)?)?(?:" + const-string v2, "(((?:(?i:http|https|rtsp)://(?:(?:[a-zA-Z0-9\\$\\-\\_\\.\\+\\!\\*\\\'\\(\\)\\,\\;\\?\\&\\=]|(?:\\%[a-fA-F0-9]{2})){1,64}(?:\\:(?:[a-zA-Z0-9\\$\\-\\_\\.\\+\\!\\*\\\'\\(\\)\\,\\;\\?\\&\\=]|(?:\\%[a-fA-F0-9]{2})){1,25})?\\@)?)?(?:" - invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + sget-object v2, Landroid/support/v4/util/PatternsCompat;->DOMAIN_NAME:Ljava/util/regex/Pattern; - invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - const-string v1, "(?:" + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + const-string v2, "(?:" - const-string v4, "\\:\\d{1,5}" + invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + const-string v3, "\\:\\d{1,5}" - const-string v5, ")?" + invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v3, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + const-string v4, ")?" - invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v6, "(" + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v3, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + const-string v5, "(" - const-string v7, "[/\\?](?:(?:[a-zA-Z0-9[\u00a0-\ud7ff\uf900-\ufdcf\ufdf0-\uffef\ud800\udc00-\ud83f\udffd\ud840\udc00-\ud87f\udffd\ud880\udc00-\ud8bf\udffd\ud8c0\udc00-\ud8ff\udffd\ud900\udc00-\ud93f\udffd\ud940\udc00-\ud97f\udffd\ud980\udc00-\ud9bf\udffd\ud9c0\udc00-\ud9ff\udffd\uda00\udc00-\uda3f\udffd\uda40\udc00-\uda7f\udffd\uda80\udc00-\udabf\udffd\udac0\udc00-\udaff\udffd\udb00\udc00-\udb3f\udffd\udb44\udc00-\udb7f\udffd&&[^\u00a0[\u2000-\u200a]\u2028\u2029\u202f\u3000]];/\\?:@&=#~\\-\\.\\+!\\*\'\\(\\),_\\$])|(?:%[a-fA-F0-9]{2}))*" + invoke-virtual {v0, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v3, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + const-string v6, "[/\\?](?:(?:[a-zA-Z0-9[\u00a0-\ud7ff\uf900-\ufdcf\ufdf0-\uffef\ud800\udc00-\ud83f\udffd\ud840\udc00-\ud87f\udffd\ud880\udc00-\ud8bf\udffd\ud8c0\udc00-\ud8ff\udffd\ud900\udc00-\ud93f\udffd\ud940\udc00-\ud97f\udffd\ud980\udc00-\ud9bf\udffd\ud9c0\udc00-\ud9ff\udffd\uda00\udc00-\uda3f\udffd\uda40\udc00-\uda7f\udffd\uda80\udc00-\udabf\udffd\udac0\udc00-\udaff\udffd\udb00\udc00-\udb3f\udffd\udb44\udc00-\udb7f\udffd&&[^\u00a0[\u2000-\u200a]\u2028\u2029\u202f\u3000]];/\\?:@&=#~\\-\\.\\+!\\*\'\\(\\),_\\$])|(?:%[a-fA-F0-9]{2}))*" - invoke-virtual {v3, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v8, "(?:\\b|$|^)" + invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v3, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + const-string v7, "(?:\\b|$|^)" - invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - move-result-object v3 + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - invoke-static {v3}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;)Ljava/util/regex/Pattern; + move-result-object v0 - move-result-object v3 + invoke-static {v0}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;)Ljava/util/regex/Pattern; + + move-result-object v0 - sput-object v3, Landroid/support/v4/util/PatternsCompat;->WEB_URL:Ljava/util/regex/Pattern; + sput-object v0, Landroid/support/v4/util/PatternsCompat;->WEB_URL:Ljava/util/regex/Pattern; .line 256 - new-instance v3, Ljava/lang/StringBuilder; + new-instance v0, Ljava/lang/StringBuilder; + + invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - invoke-direct {v3}, Ljava/lang/StringBuilder;->()V + const-string v8, "(?:(?:(?:[a-zA-Z0-9[\u00a0-\ud7ff\uf900-\ufdcf\ufdf0-\uffef\ud800\udc00-\ud83f\udffd\ud840\udc00-\ud87f\udffd\ud880\udc00-\ud8bf\udffd\ud8c0\udc00-\ud8ff\udffd\ud900\udc00-\ud93f\udffd\ud940\udc00-\ud97f\udffd\ud980\udc00-\ud9bf\udffd\ud9c0\udc00-\ud9ff\udffd\uda00\udc00-\uda3f\udffd\uda40\udc00-\uda7f\udffd\uda80\udc00-\udabf\udffd\udac0\udc00-\udaff\udffd\udb00\udc00-\udb3f\udffd\udb44\udc00-\udb7f\udffd&&[^\u00a0[\u2000-\u200a]\u2028\u2029\u202f\u3000]]](?:[a-zA-Z0-9[\u00a0-\ud7ff\uf900-\ufdcf\ufdf0-\uffef\ud800\udc00-\ud83f\udffd\ud840\udc00-\ud87f\udffd\ud880\udc00-\ud8bf\udffd\ud8c0\udc00-\ud8ff\udffd\ud900\udc00-\ud93f\udffd\ud940\udc00-\ud97f\udffd\ud980\udc00-\ud9bf\udffd\ud9c0\udc00-\ud9ff\udffd\uda00\udc00-\uda3f\udffd\uda40\udc00-\uda7f\udffd\uda80\udc00-\udabf\udffd\udac0\udc00-\udaff\udffd\udb00\udc00-\udb3f\udffd\udb44\udc00-\udb7f\udffd&&[^\u00a0[\u2000-\u200a]\u2028\u2029\u202f\u3000]]_\\-]{0,61}[a-zA-Z0-9[\u00a0-\ud7ff\uf900-\ufdcf\ufdf0-\uffef\ud800\udc00-\ud83f\udffd\ud840\udc00-\ud87f\udffd\ud880\udc00-\ud8bf\udffd\ud8c0\udc00-\ud8ff\udffd\ud900\udc00-\ud93f\udffd\ud940\udc00-\ud97f\udffd\ud980\udc00-\ud9bf\udffd\ud9c0\udc00-\ud9ff\udffd\uda00\udc00-\uda3f\udffd\uda40\udc00-\uda7f\udffd\uda80\udc00-\udabf\udffd\udac0\udc00-\udaff\udffd\udb00\udc00-\udb3f\udffd\udb44\udc00-\udb7f\udffd&&[^\u00a0[\u2000-\u200a]\u2028\u2029\u202f\u3000]]]){0,1}\\.)+(?:(?:(?:aaa|aarp|abb|abbott|abogado|academy|accenture|accountant|accountants|aco|active|actor|ads|adult|aeg|aero|afl|agency|aig|airforce|airtel|allfinanz|alsace|amica|amsterdam|android|apartments|app|apple|aquarelle|aramco|archi|army|arpa|arte|asia|associates|attorney|auction|audio|auto|autos|axa|azure|a[cdefgilmoqrstuwxz])|(?:band|bank|bar|barcelona|barclaycard|barclays|bargains|bauhaus|bayern|bbc|bbva|bcn|beats|beer|bentley|berlin|best|bet|bharti|bible|bid|bike|bing|bingo|bio|biz|black|blackfriday|bloomberg|blue|bms|bmw|bnl|bnpparibas|boats|bom|bond|boo|boots|boutique|bradesco|bridgestone|broadway|broker|brother|brussels|budapest|build|builders|business|buzz|bzh|b[abdefghijmnorstvwyz])|(?:cab|cafe|cal|camera|camp|cancerresearch|canon|capetown|capital|car|caravan|cards|care|career|careers|cars|cartier|casa|cash|casino|cat|catering|cba|cbn|ceb|center|ceo|cern|cfa|cfd|chanel|channel|chat|cheap|chloe|christmas|chrome|church|cipriani|cisco|citic|city|cityeats|claims|cleaning|click|clinic|clothing|cloud|club|clubmed|coach|codes|coffee|college|cologne|com|commbank|community|company|computer|comsec|condos|construction|consulting|contractors|cooking|cool|coop|corsica|country|coupons|courses|credit|creditcard|creditunion|cricket|crown|crs|cruises|csc|cuisinella|cymru|cyou|c[acdfghiklmnoruvwxyz])|(?:dabur|dad|dance|date|dating|datsun|day|dclk|deals|degree|delivery|dell|delta|democrat|dental|dentist|desi|design|dev|diamonds|diet|digital|direct|directory|discount|dnp|docs|dog|doha|domains|doosan|download|drive|durban|dvag|d[ejkmoz])|(?:earth|eat|edu|education|email|emerck|energy|engineer|engineering|enterprises|epson|equipment|erni|esq|estate|eurovision|eus|events|everbank|exchange|expert|exposed|express|e[cegrstu])|(?:fage|fail|fairwinds|faith|family|fan|fans|farm|fashion|feedback|ferrero|film|final|finance|financial|firmdale|fish|fishing|fit|fitness|flights|florist|flowers|flsmidth|fly|foo|football|forex|forsale|forum|foundation|frl|frogans|fund|furniture|futbol|fyi|f[ijkmor])|(?:gal|gallery|game|garden|gbiz|gdn|gea|gent|genting|ggee|gift|gifts|gives|giving|glass|gle|global|globo|gmail|gmo|gmx|gold|goldpoint|golf|goo|goog|google|gop|gov|grainger|graphics|gratis|green|gripe|group|gucci|guge|guide|guitars|guru|g[abdefghilmnpqrstuwy])|(?:hamburg|hangout|haus|healthcare|help|here|hermes|hiphop|hitachi|hiv|hockey|holdings|holiday|homedepot|homes|honda|horse|host|hosting|hoteles|hotmail|house|how|hsbc|hyundai|h[kmnrtu])|(?:ibm|icbc|ice|icu|ifm|iinet|immo|immobilien|industries|infiniti|info|ing|ink|institute|insure|int|international|investments|ipiranga|irish|ist|istanbul|itau|iwc|i[delmnoqrst])|(?:jaguar|java|jcb|jetzt|jewelry|jlc|jll|jobs|joburg|jprs|juegos|j[emop])|(?:kaufen|kddi|kia|kim|kinder|kitchen|kiwi|koeln|komatsu|krd|kred|kyoto|k[eghimnprwyz])|(?:lacaixa|lancaster|land|landrover|lasalle|lat|latrobe|law|lawyer|lds|lease|leclerc|legal|lexus|lgbt|liaison|lidl|life|lifestyle|lighting|limited|limo|linde|link|live|lixil|loan|loans|lol|london|lotte|lotto|love|ltd|ltda|lupin|luxe|luxury|l[abcikrstuvy])|(?:madrid|maif|maison|man|management|mango|market|marketing|markets|marriott|mba|media|meet|melbourne|meme|memorial|men|menu|meo|miami|microsoft|mil|mini|mma|mobi|moda|moe|moi|mom|monash|money|montblanc|mormon|mortgage|moscow|motorcycles|mov|movie|movistar|mtn|mtpc|mtr|museum|mutuelle|m[acdeghklmnopqrstuvwxyz])|(?:nadex|nagoya|name|navy|nec|net|netbank|network|neustar|new|news|nexus|ngo|nhk|nico|ninja|nissan|nokia|nra|nrw|ntt|nyc|n[acefgilopruz])|(?:obi|office|okinawa|omega|one|ong|onl|online|ooo|oracle|orange|org|organic|osaka|otsuka|ovh|om)|(?:page|panerai|paris|partners|parts|party|pet|pharmacy|philips|photo|photography|photos|physio|piaget|pics|pictet|pictures|ping|pink|pizza|place|play|playstation|plumbing|plus|pohl|poker|porn|post|praxi|press|pro|prod|productions|prof|properties|property|protection|pub|p[aefghklmnrstwy])|(?:qpon|quebec|qa)|(?:racing|realtor|realty|recipes|red|redstone|rehab|reise|reisen|reit|ren|rent|rentals|repair|report|republican|rest|restaurant|review|reviews|rich|ricoh|rio|rip|rocher|rocks|rodeo|rsvp|ruhr|run|rwe|ryukyu|r[eosuw])|(?:saarland|sakura|sale|samsung|sandvik|sandvikcoromant|sanofi|sap|sapo|sarl|saxo|sbs|sca|scb|schmidt|scholarships|school|schule|schwarz|science|scor|scot|seat|security|seek|sener|services|seven|sew|sex|sexy|shiksha|shoes|show|shriram|singles|site|ski|sky|skype|sncf|soccer|social|software|sohu|solar|solutions|sony|soy|space|spiegel|spreadbetting|srl|stada|starhub|statoil|stc|stcgroup|stockholm|studio|study|style|sucks|supplies|supply|support|surf|surgery|suzuki|swatch|swiss|sydney|systems|s[abcdeghijklmnortuvxyz])|(?:tab|taipei|tatamotors|tatar|tattoo|tax|taxi|team|tech|technology|tel|telefonica|temasek|tennis|thd|theater|theatre|tickets|tienda|tips|tires|tirol|today|tokyo|tools|top|toray|toshiba|tours|town|toyota|toys|trade|trading|training|travel|trust|tui|t[cdfghjklmnortvwz])|(?:ubs|university|uno|uol|u[agksyz])|(?:vacations|vana|vegas|ventures|versicherung|vet|viajes|video|villas|vin|virgin|vision|vista|vistaprint|viva|vlaanderen|vodka|vote|voting|voto|voyage|v[aceginu])|(?:wales|walter|wang|watch|webcam|website|wed|wedding|weir|whoswho|wien|wiki|williamhill|win|windows|wine|wme|work|works|world|wtc|wtf|w[fs])|(?:\u03b5\u03bb|\u0431\u0435\u043b|\u0434\u0435\u0442\u0438|\u043a\u043e\u043c|\u043c\u043a\u0434|\u043c\u043e\u043d|\u043c\u043e\u0441\u043a\u0432\u0430|\u043e\u043d\u043b\u0430\u0439\u043d|\u043e\u0440\u0433|\u0440\u0443\u0441|\u0440\u0444|\u0441\u0430\u0439\u0442|\u0441\u0440\u0431|\u0443\u043a\u0440|\u049b\u0430\u0437|\u0570\u0561\u0575|\u05e7\u05d5\u05dd|\u0627\u0631\u0627\u0645\u0643\u0648|\u0627\u0644\u0627\u0631\u062f\u0646|\u0627\u0644\u062c\u0632\u0627\u0626\u0631|\u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629|\u0627\u0644\u0645\u063a\u0631\u0628|\u0627\u0645\u0627\u0631\u0627\u062a|\u0627\u06cc\u0631\u0627\u0646|\u0628\u0627\u0632\u0627\u0631|\u0628\u06be\u0627\u0631\u062a|\u062a\u0648\u0646\u0633|\u0633\u0648\u062f\u0627\u0646|\u0633\u0648\u0631\u064a\u0629|\u0634\u0628\u0643\u0629|\u0639\u0631\u0627\u0642|\u0639\u0645\u0627\u0646|\u0641\u0644\u0633\u0637\u064a\u0646|\u0642\u0637\u0631|\u0643\u0648\u0645|\u0645\u0635\u0631|\u0645\u0644\u064a\u0633\u064a\u0627|\u0645\u0648\u0642\u0639|\u0915\u0949\u092e|\u0928\u0947\u091f|\u092d\u093e\u0930\u0924|\u0938\u0902\u0917\u0920\u0928|\u09ad\u09be\u09b0\u09a4|\u0a2d\u0a3e\u0a30\u0a24|\u0aad\u0abe\u0ab0\u0aa4|\u0b87\u0ba8\u0bcd\u0ba4\u0bbf\u0baf\u0bbe|\u0b87\u0bb2\u0b99\u0bcd\u0b95\u0bc8|\u0b9a\u0bbf\u0b99\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0bc2\u0bb0\u0bcd|\u0c2d\u0c3e\u0c30\u0c24\u0c4d|\u0dbd\u0d82\u0d9a\u0dcf|\u0e04\u0e2d\u0e21|\u0e44\u0e17\u0e22|\u10d2\u10d4|\u307f\u3093\u306a|\u30b0\u30fc\u30b0\u30eb|\u30b3\u30e0|\u4e16\u754c|\u4e2d\u4fe1|\u4e2d\u56fd|\u4e2d\u570b|\u4e2d\u6587\u7f51|\u4f01\u4e1a|\u4f5b\u5c71|\u4fe1\u606f|\u5065\u5eb7|\u516b\u5366|\u516c\u53f8|\u516c\u76ca|\u53f0\u6e7e|\u53f0\u7063|\u5546\u57ce|\u5546\u5e97|\u5546\u6807|\u5728\u7ebf|\u5927\u62ff|\u5a31\u4e50|\u5de5\u884c|\u5e7f\u4e1c|\u6148\u5584|\u6211\u7231\u4f60|\u624b\u673a|\u653f\u52a1|\u653f\u5e9c|\u65b0\u52a0\u5761|\u65b0\u95fb|\u65f6\u5c1a|\u673a\u6784|\u6de1\u9a6c\u9521|\u6e38\u620f|\u70b9\u770b|\u79fb\u52a8|\u7ec4\u7ec7\u673a\u6784|\u7f51\u5740|\u7f51\u5e97|\u7f51\u7edc|\u8c37\u6b4c|\u96c6\u56e2|\u98de\u5229\u6d66|\u9910\u5385|\u9999\u6e2f|\ub2f7\ub137|\ub2f7\ucef4|\uc0bc\uc131|\ud55c\uad6d|xbox|xerox|xin|xn\\-\\-11b4c3d|xn\\-\\-1qqw23a|xn\\-\\-30rr7y|xn\\-\\-3bst00m|xn\\-\\-3ds443g|xn\\-\\-3e0b707e|xn\\-\\-3pxu8k|xn\\-\\-42c2d9a|xn\\-\\-45brj9c|xn\\-\\-45q11c|xn\\-\\-4gbrim|xn\\-\\-55qw42g|xn\\-\\-55qx5d|xn\\-\\-6frz82g|xn\\-\\-6qq986b3xl|xn\\-\\-80adxhks|xn\\-\\-80ao21a|xn\\-\\-80asehdb|xn\\-\\-80aswg|xn\\-\\-90a3ac|xn\\-\\-90ais|xn\\-\\-9dbq2a|xn\\-\\-9et52u|xn\\-\\-b4w605ferd|xn\\-\\-c1avg|xn\\-\\-c2br7g|xn\\-\\-cg4bki|xn\\-\\-clchc0ea0b2g2a9gcd|xn\\-\\-czr694b|xn\\-\\-czrs0t|xn\\-\\-czru2d|xn\\-\\-d1acj3b|xn\\-\\-d1alf|xn\\-\\-efvy88h|xn\\-\\-estv75g|xn\\-\\-fhbei|xn\\-\\-fiq228c5hs|xn\\-\\-fiq64b|xn\\-\\-fiqs8s|xn\\-\\-fiqz9s|xn\\-\\-fjq720a|xn\\-\\-flw351e|xn\\-\\-fpcrj9c3d|xn\\-\\-fzc2c9e2c|xn\\-\\-gecrj9c|xn\\-\\-h2brj9c|xn\\-\\-hxt814e|xn\\-\\-i1b6b1a6a2e|xn\\-\\-imr513n|xn\\-\\-io0a7i|xn\\-\\-j1aef|xn\\-\\-j1amh|xn\\-\\-j6w193g|xn\\-\\-kcrx77d1x4a|xn\\-\\-kprw13d|xn\\-\\-kpry57d|xn\\-\\-kput3i|xn\\-\\-l1acc|xn\\-\\-lgbbat1ad8j|xn\\-\\-mgb9awbf|xn\\-\\-mgba3a3ejt|xn\\-\\-mgba3a4f16a|xn\\-\\-mgbaam7a8h|xn\\-\\-mgbab2bd|xn\\-\\-mgbayh7gpa|xn\\-\\-mgbbh1a71e|xn\\-\\-mgbc0a9azcg|xn\\-\\-mgberp4a5d4ar|xn\\-\\-mgbpl2fh|xn\\-\\-mgbtx2b|xn\\-\\-mgbx4cd0ab|xn\\-\\-mk1bu44c|xn\\-\\-mxtq1m|xn\\-\\-ngbc5azd|xn\\-\\-node|xn\\-\\-nqv7f|xn\\-\\-nqv7fs00ema|xn\\-\\-nyqy26a|xn\\-\\-o3cw4h|xn\\-\\-ogbpf8fl|xn\\-\\-p1acf|xn\\-\\-p1ai|xn\\-\\-pgbs0dh|xn\\-\\-pssy2u|xn\\-\\-q9jyb4c|xn\\-\\-qcka1pmc|xn\\-\\-qxam|xn\\-\\-rhqv96g|xn\\-\\-s9brj9c|xn\\-\\-ses554g|xn\\-\\-t60b56a|xn\\-\\-tckwe|xn\\-\\-unup4y|xn\\-\\-vermgensberater\\-ctb|xn\\-\\-vermgensberatung\\-pwb|xn\\-\\-vhquv|xn\\-\\-vuq861b|xn\\-\\-wgbh1c|xn\\-\\-wgbl6a|xn\\-\\-xhq521b|xn\\-\\-xkc2al3hye2a|xn\\-\\-xkc2dl3a5ee0h|xn\\-\\-y9a3aq|xn\\-\\-yfro4i67o|xn\\-\\-ygbi2ammx|xn\\-\\-zfr164b|xperia|xxx|xyz)|(?:yachts|yamaxun|yandex|yodobashi|yoga|yokohama|youtube|y[et])|(?:zara|zip|zone|zuerich|z[amw]))|xn\\-\\-[\\w\\-]{0,58}\\w))|" - const-string v9, "(?:(?:(?:[a-zA-Z0-9[\u00a0-\ud7ff\uf900-\ufdcf\ufdf0-\uffef\ud800\udc00-\ud83f\udffd\ud840\udc00-\ud87f\udffd\ud880\udc00-\ud8bf\udffd\ud8c0\udc00-\ud8ff\udffd\ud900\udc00-\ud93f\udffd\ud940\udc00-\ud97f\udffd\ud980\udc00-\ud9bf\udffd\ud9c0\udc00-\ud9ff\udffd\uda00\udc00-\uda3f\udffd\uda40\udc00-\uda7f\udffd\uda80\udc00-\udabf\udffd\udac0\udc00-\udaff\udffd\udb00\udc00-\udb3f\udffd\udb44\udc00-\udb7f\udffd&&[^\u00a0[\u2000-\u200a]\u2028\u2029\u202f\u3000]]](?:[a-zA-Z0-9[\u00a0-\ud7ff\uf900-\ufdcf\ufdf0-\uffef\ud800\udc00-\ud83f\udffd\ud840\udc00-\ud87f\udffd\ud880\udc00-\ud8bf\udffd\ud8c0\udc00-\ud8ff\udffd\ud900\udc00-\ud93f\udffd\ud940\udc00-\ud97f\udffd\ud980\udc00-\ud9bf\udffd\ud9c0\udc00-\ud9ff\udffd\uda00\udc00-\uda3f\udffd\uda40\udc00-\uda7f\udffd\uda80\udc00-\udabf\udffd\udac0\udc00-\udaff\udffd\udb00\udc00-\udb3f\udffd\udb44\udc00-\udb7f\udffd&&[^\u00a0[\u2000-\u200a]\u2028\u2029\u202f\u3000]]_\\-]{0,61}[a-zA-Z0-9[\u00a0-\ud7ff\uf900-\ufdcf\ufdf0-\uffef\ud800\udc00-\ud83f\udffd\ud840\udc00-\ud87f\udffd\ud880\udc00-\ud8bf\udffd\ud8c0\udc00-\ud8ff\udffd\ud900\udc00-\ud93f\udffd\ud940\udc00-\ud97f\udffd\ud980\udc00-\ud9bf\udffd\ud9c0\udc00-\ud9ff\udffd\uda00\udc00-\uda3f\udffd\uda40\udc00-\uda7f\udffd\uda80\udc00-\udabf\udffd\udac0\udc00-\udaff\udffd\udb00\udc00-\udb3f\udffd\udb44\udc00-\udb7f\udffd&&[^\u00a0[\u2000-\u200a]\u2028\u2029\u202f\u3000]]]){0,1}\\.)+(?:(?:(?:aaa|aarp|abb|abbott|abogado|academy|accenture|accountant|accountants|aco|active|actor|ads|adult|aeg|aero|afl|agency|aig|airforce|airtel|allfinanz|alsace|amica|amsterdam|android|apartments|app|apple|aquarelle|aramco|archi|army|arpa|arte|asia|associates|attorney|auction|audio|auto|autos|axa|azure|a[cdefgilmoqrstuwxz])|(?:band|bank|bar|barcelona|barclaycard|barclays|bargains|bauhaus|bayern|bbc|bbva|bcn|beats|beer|bentley|berlin|best|bet|bharti|bible|bid|bike|bing|bingo|bio|biz|black|blackfriday|bloomberg|blue|bms|bmw|bnl|bnpparibas|boats|bom|bond|boo|boots|boutique|bradesco|bridgestone|broadway|broker|brother|brussels|budapest|build|builders|business|buzz|bzh|b[abdefghijmnorstvwyz])|(?:cab|cafe|cal|camera|camp|cancerresearch|canon|capetown|capital|car|caravan|cards|care|career|careers|cars|cartier|casa|cash|casino|cat|catering|cba|cbn|ceb|center|ceo|cern|cfa|cfd|chanel|channel|chat|cheap|chloe|christmas|chrome|church|cipriani|cisco|citic|city|cityeats|claims|cleaning|click|clinic|clothing|cloud|club|clubmed|coach|codes|coffee|college|cologne|com|commbank|community|company|computer|comsec|condos|construction|consulting|contractors|cooking|cool|coop|corsica|country|coupons|courses|credit|creditcard|creditunion|cricket|crown|crs|cruises|csc|cuisinella|cymru|cyou|c[acdfghiklmnoruvwxyz])|(?:dabur|dad|dance|date|dating|datsun|day|dclk|deals|degree|delivery|dell|delta|democrat|dental|dentist|desi|design|dev|diamonds|diet|digital|direct|directory|discount|dnp|docs|dog|doha|domains|doosan|download|drive|durban|dvag|d[ejkmoz])|(?:earth|eat|edu|education|email|emerck|energy|engineer|engineering|enterprises|epson|equipment|erni|esq|estate|eurovision|eus|events|everbank|exchange|expert|exposed|express|e[cegrstu])|(?:fage|fail|fairwinds|faith|family|fan|fans|farm|fashion|feedback|ferrero|film|final|finance|financial|firmdale|fish|fishing|fit|fitness|flights|florist|flowers|flsmidth|fly|foo|football|forex|forsale|forum|foundation|frl|frogans|fund|furniture|futbol|fyi|f[ijkmor])|(?:gal|gallery|game|garden|gbiz|gdn|gea|gent|genting|ggee|gift|gifts|gives|giving|glass|gle|global|globo|gmail|gmo|gmx|gold|goldpoint|golf|goo|goog|google|gop|gov|grainger|graphics|gratis|green|gripe|group|gucci|guge|guide|guitars|guru|g[abdefghilmnpqrstuwy])|(?:hamburg|hangout|haus|healthcare|help|here|hermes|hiphop|hitachi|hiv|hockey|holdings|holiday|homedepot|homes|honda|horse|host|hosting|hoteles|hotmail|house|how|hsbc|hyundai|h[kmnrtu])|(?:ibm|icbc|ice|icu|ifm|iinet|immo|immobilien|industries|infiniti|info|ing|ink|institute|insure|int|international|investments|ipiranga|irish|ist|istanbul|itau|iwc|i[delmnoqrst])|(?:jaguar|java|jcb|jetzt|jewelry|jlc|jll|jobs|joburg|jprs|juegos|j[emop])|(?:kaufen|kddi|kia|kim|kinder|kitchen|kiwi|koeln|komatsu|krd|kred|kyoto|k[eghimnprwyz])|(?:lacaixa|lancaster|land|landrover|lasalle|lat|latrobe|law|lawyer|lds|lease|leclerc|legal|lexus|lgbt|liaison|lidl|life|lifestyle|lighting|limited|limo|linde|link|live|lixil|loan|loans|lol|london|lotte|lotto|love|ltd|ltda|lupin|luxe|luxury|l[abcikrstuvy])|(?:madrid|maif|maison|man|management|mango|market|marketing|markets|marriott|mba|media|meet|melbourne|meme|memorial|men|menu|meo|miami|microsoft|mil|mini|mma|mobi|moda|moe|moi|mom|monash|money|montblanc|mormon|mortgage|moscow|motorcycles|mov|movie|movistar|mtn|mtpc|mtr|museum|mutuelle|m[acdeghklmnopqrstuvwxyz])|(?:nadex|nagoya|name|navy|nec|net|netbank|network|neustar|new|news|nexus|ngo|nhk|nico|ninja|nissan|nokia|nra|nrw|ntt|nyc|n[acefgilopruz])|(?:obi|office|okinawa|omega|one|ong|onl|online|ooo|oracle|orange|org|organic|osaka|otsuka|ovh|om)|(?:page|panerai|paris|partners|parts|party|pet|pharmacy|philips|photo|photography|photos|physio|piaget|pics|pictet|pictures|ping|pink|pizza|place|play|playstation|plumbing|plus|pohl|poker|porn|post|praxi|press|pro|prod|productions|prof|properties|property|protection|pub|p[aefghklmnrstwy])|(?:qpon|quebec|qa)|(?:racing|realtor|realty|recipes|red|redstone|rehab|reise|reisen|reit|ren|rent|rentals|repair|report|republican|rest|restaurant|review|reviews|rich|ricoh|rio|rip|rocher|rocks|rodeo|rsvp|ruhr|run|rwe|ryukyu|r[eosuw])|(?:saarland|sakura|sale|samsung|sandvik|sandvikcoromant|sanofi|sap|sapo|sarl|saxo|sbs|sca|scb|schmidt|scholarships|school|schule|schwarz|science|scor|scot|seat|security|seek|sener|services|seven|sew|sex|sexy|shiksha|shoes|show|shriram|singles|site|ski|sky|skype|sncf|soccer|social|software|sohu|solar|solutions|sony|soy|space|spiegel|spreadbetting|srl|stada|starhub|statoil|stc|stcgroup|stockholm|studio|study|style|sucks|supplies|supply|support|surf|surgery|suzuki|swatch|swiss|sydney|systems|s[abcdeghijklmnortuvxyz])|(?:tab|taipei|tatamotors|tatar|tattoo|tax|taxi|team|tech|technology|tel|telefonica|temasek|tennis|thd|theater|theatre|tickets|tienda|tips|tires|tirol|today|tokyo|tools|top|toray|toshiba|tours|town|toyota|toys|trade|trading|training|travel|trust|tui|t[cdfghjklmnortvwz])|(?:ubs|university|uno|uol|u[agksyz])|(?:vacations|vana|vegas|ventures|versicherung|vet|viajes|video|villas|vin|virgin|vision|vista|vistaprint|viva|vlaanderen|vodka|vote|voting|voto|voyage|v[aceginu])|(?:wales|walter|wang|watch|webcam|website|wed|wedding|weir|whoswho|wien|wiki|williamhill|win|windows|wine|wme|work|works|world|wtc|wtf|w[fs])|(?:\u03b5\u03bb|\u0431\u0435\u043b|\u0434\u0435\u0442\u0438|\u043a\u043e\u043c|\u043c\u043a\u0434|\u043c\u043e\u043d|\u043c\u043e\u0441\u043a\u0432\u0430|\u043e\u043d\u043b\u0430\u0439\u043d|\u043e\u0440\u0433|\u0440\u0443\u0441|\u0440\u0444|\u0441\u0430\u0439\u0442|\u0441\u0440\u0431|\u0443\u043a\u0440|\u049b\u0430\u0437|\u0570\u0561\u0575|\u05e7\u05d5\u05dd|\u0627\u0631\u0627\u0645\u0643\u0648|\u0627\u0644\u0627\u0631\u062f\u0646|\u0627\u0644\u062c\u0632\u0627\u0626\u0631|\u0627\u0644\u0633\u0639\u0648\u062f\u064a\u0629|\u0627\u0644\u0645\u063a\u0631\u0628|\u0627\u0645\u0627\u0631\u0627\u062a|\u0627\u06cc\u0631\u0627\u0646|\u0628\u0627\u0632\u0627\u0631|\u0628\u06be\u0627\u0631\u062a|\u062a\u0648\u0646\u0633|\u0633\u0648\u062f\u0627\u0646|\u0633\u0648\u0631\u064a\u0629|\u0634\u0628\u0643\u0629|\u0639\u0631\u0627\u0642|\u0639\u0645\u0627\u0646|\u0641\u0644\u0633\u0637\u064a\u0646|\u0642\u0637\u0631|\u0643\u0648\u0645|\u0645\u0635\u0631|\u0645\u0644\u064a\u0633\u064a\u0627|\u0645\u0648\u0642\u0639|\u0915\u0949\u092e|\u0928\u0947\u091f|\u092d\u093e\u0930\u0924|\u0938\u0902\u0917\u0920\u0928|\u09ad\u09be\u09b0\u09a4|\u0a2d\u0a3e\u0a30\u0a24|\u0aad\u0abe\u0ab0\u0aa4|\u0b87\u0ba8\u0bcd\u0ba4\u0bbf\u0baf\u0bbe|\u0b87\u0bb2\u0b99\u0bcd\u0b95\u0bc8|\u0b9a\u0bbf\u0b99\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0bc2\u0bb0\u0bcd|\u0c2d\u0c3e\u0c30\u0c24\u0c4d|\u0dbd\u0d82\u0d9a\u0dcf|\u0e04\u0e2d\u0e21|\u0e44\u0e17\u0e22|\u10d2\u10d4|\u307f\u3093\u306a|\u30b0\u30fc\u30b0\u30eb|\u30b3\u30e0|\u4e16\u754c|\u4e2d\u4fe1|\u4e2d\u56fd|\u4e2d\u570b|\u4e2d\u6587\u7f51|\u4f01\u4e1a|\u4f5b\u5c71|\u4fe1\u606f|\u5065\u5eb7|\u516b\u5366|\u516c\u53f8|\u516c\u76ca|\u53f0\u6e7e|\u53f0\u7063|\u5546\u57ce|\u5546\u5e97|\u5546\u6807|\u5728\u7ebf|\u5927\u62ff|\u5a31\u4e50|\u5de5\u884c|\u5e7f\u4e1c|\u6148\u5584|\u6211\u7231\u4f60|\u624b\u673a|\u653f\u52a1|\u653f\u5e9c|\u65b0\u52a0\u5761|\u65b0\u95fb|\u65f6\u5c1a|\u673a\u6784|\u6de1\u9a6c\u9521|\u6e38\u620f|\u70b9\u770b|\u79fb\u52a8|\u7ec4\u7ec7\u673a\u6784|\u7f51\u5740|\u7f51\u5e97|\u7f51\u7edc|\u8c37\u6b4c|\u96c6\u56e2|\u98de\u5229\u6d66|\u9910\u5385|\u9999\u6e2f|\ub2f7\ub137|\ub2f7\ucef4|\uc0bc\uc131|\ud55c\uad6d|xbox|xerox|xin|xn\\-\\-11b4c3d|xn\\-\\-1qqw23a|xn\\-\\-30rr7y|xn\\-\\-3bst00m|xn\\-\\-3ds443g|xn\\-\\-3e0b707e|xn\\-\\-3pxu8k|xn\\-\\-42c2d9a|xn\\-\\-45brj9c|xn\\-\\-45q11c|xn\\-\\-4gbrim|xn\\-\\-55qw42g|xn\\-\\-55qx5d|xn\\-\\-6frz82g|xn\\-\\-6qq986b3xl|xn\\-\\-80adxhks|xn\\-\\-80ao21a|xn\\-\\-80asehdb|xn\\-\\-80aswg|xn\\-\\-90a3ac|xn\\-\\-90ais|xn\\-\\-9dbq2a|xn\\-\\-9et52u|xn\\-\\-b4w605ferd|xn\\-\\-c1avg|xn\\-\\-c2br7g|xn\\-\\-cg4bki|xn\\-\\-clchc0ea0b2g2a9gcd|xn\\-\\-czr694b|xn\\-\\-czrs0t|xn\\-\\-czru2d|xn\\-\\-d1acj3b|xn\\-\\-d1alf|xn\\-\\-efvy88h|xn\\-\\-estv75g|xn\\-\\-fhbei|xn\\-\\-fiq228c5hs|xn\\-\\-fiq64b|xn\\-\\-fiqs8s|xn\\-\\-fiqz9s|xn\\-\\-fjq720a|xn\\-\\-flw351e|xn\\-\\-fpcrj9c3d|xn\\-\\-fzc2c9e2c|xn\\-\\-gecrj9c|xn\\-\\-h2brj9c|xn\\-\\-hxt814e|xn\\-\\-i1b6b1a6a2e|xn\\-\\-imr513n|xn\\-\\-io0a7i|xn\\-\\-j1aef|xn\\-\\-j1amh|xn\\-\\-j6w193g|xn\\-\\-kcrx77d1x4a|xn\\-\\-kprw13d|xn\\-\\-kpry57d|xn\\-\\-kput3i|xn\\-\\-l1acc|xn\\-\\-lgbbat1ad8j|xn\\-\\-mgb9awbf|xn\\-\\-mgba3a3ejt|xn\\-\\-mgba3a4f16a|xn\\-\\-mgbaam7a8h|xn\\-\\-mgbab2bd|xn\\-\\-mgbayh7gpa|xn\\-\\-mgbbh1a71e|xn\\-\\-mgbc0a9azcg|xn\\-\\-mgberp4a5d4ar|xn\\-\\-mgbpl2fh|xn\\-\\-mgbtx2b|xn\\-\\-mgbx4cd0ab|xn\\-\\-mk1bu44c|xn\\-\\-mxtq1m|xn\\-\\-ngbc5azd|xn\\-\\-node|xn\\-\\-nqv7f|xn\\-\\-nqv7fs00ema|xn\\-\\-nyqy26a|xn\\-\\-o3cw4h|xn\\-\\-ogbpf8fl|xn\\-\\-p1acf|xn\\-\\-p1ai|xn\\-\\-pgbs0dh|xn\\-\\-pssy2u|xn\\-\\-q9jyb4c|xn\\-\\-qcka1pmc|xn\\-\\-qxam|xn\\-\\-rhqv96g|xn\\-\\-s9brj9c|xn\\-\\-ses554g|xn\\-\\-t60b56a|xn\\-\\-tckwe|xn\\-\\-unup4y|xn\\-\\-vermgensberater\\-ctb|xn\\-\\-vermgensberatung\\-pwb|xn\\-\\-vhquv|xn\\-\\-vuq861b|xn\\-\\-wgbh1c|xn\\-\\-wgbl6a|xn\\-\\-xhq521b|xn\\-\\-xkc2al3hye2a|xn\\-\\-xkc2dl3a5ee0h|xn\\-\\-y9a3aq|xn\\-\\-yfro4i67o|xn\\-\\-ygbi2ammx|xn\\-\\-zfr164b|xperia|xxx|xyz)|(?:yachts|yamaxun|yandex|yodobashi|yoga|yokohama|youtube|y[et])|(?:zara|zip|zone|zuerich|z[amw]))|xn\\-\\-[\\w\\-]{0,58}\\w))|" + invoke-virtual {v0, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v3, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + sget-object v8, Landroid/support/v4/util/PatternsCompat;->IP_ADDRESS:Ljava/util/regex/Pattern; - invoke-virtual {v3, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v3 + move-result-object v0 .line 257 - invoke-static {v3}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;)Ljava/util/regex/Pattern; + invoke-static {v0}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;)Ljava/util/regex/Pattern; - move-result-object v3 + move-result-object v0 - sput-object v3, Landroid/support/v4/util/PatternsCompat;->STRICT_DOMAIN_NAME:Ljava/util/regex/Pattern; + sput-object v0, Landroid/support/v4/util/PatternsCompat;->STRICT_DOMAIN_NAME:Ljava/util/regex/Pattern; .line 262 - new-instance v9, Ljava/lang/StringBuilder; + new-instance v0, Ljava/lang/StringBuilder; - invoke-direct {v9}, Ljava/lang/StringBuilder;->()V + invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - const-string v10, "(?:(?:[a-zA-Z0-9[\u00a0-\ud7ff\uf900-\ufdcf\ufdf0-\uffef\ud800\udc00-\ud83f\udffd\ud840\udc00-\ud87f\udffd\ud880\udc00-\ud8bf\udffd\ud8c0\udc00-\ud8ff\udffd\ud900\udc00-\ud93f\udffd\ud940\udc00-\ud97f\udffd\ud980\udc00-\ud9bf\udffd\ud9c0\udc00-\ud9ff\udffd\uda00\udc00-\uda3f\udffd\uda40\udc00-\uda7f\udffd\uda80\udc00-\udabf\udffd\udac0\udc00-\udaff\udffd\udb00\udc00-\udb3f\udffd\udb44\udc00-\udb7f\udffd&&[^\u00a0[\u2000-\u200a]\u2028\u2029\u202f\u3000]]](?:[a-zA-Z0-9[\u00a0-\ud7ff\uf900-\ufdcf\ufdf0-\uffef\ud800\udc00-\ud83f\udffd\ud840\udc00-\ud87f\udffd\ud880\udc00-\ud8bf\udffd\ud8c0\udc00-\ud8ff\udffd\ud900\udc00-\ud93f\udffd\ud940\udc00-\ud97f\udffd\ud980\udc00-\ud9bf\udffd\ud9c0\udc00-\ud9ff\udffd\uda00\udc00-\uda3f\udffd\uda40\udc00-\uda7f\udffd\uda80\udc00-\udabf\udffd\udac0\udc00-\udaff\udffd\udb00\udc00-\udb3f\udffd\udb44\udc00-\udb7f\udffd&&[^\u00a0[\u2000-\u200a]\u2028\u2029\u202f\u3000]]_\\-]{0,61}[a-zA-Z0-9[\u00a0-\ud7ff\uf900-\ufdcf\ufdf0-\uffef\ud800\udc00-\ud83f\udffd\ud840\udc00-\ud87f\udffd\ud880\udc00-\ud8bf\udffd\ud8c0\udc00-\ud8ff\udffd\ud900\udc00-\ud93f\udffd\ud940\udc00-\ud97f\udffd\ud980\udc00-\ud9bf\udffd\ud9c0\udc00-\ud9ff\udffd\uda00\udc00-\uda3f\udffd\uda40\udc00-\uda7f\udffd\uda80\udc00-\udabf\udffd\udac0\udc00-\udaff\udffd\udb00\udc00-\udb3f\udffd\udb44\udc00-\udb7f\udffd&&[^\u00a0[\u2000-\u200a]\u2028\u2029\u202f\u3000]]]){0,1}(?:\\.(?=\\S))?)+|" + const-string v8, "(?:(?:[a-zA-Z0-9[\u00a0-\ud7ff\uf900-\ufdcf\ufdf0-\uffef\ud800\udc00-\ud83f\udffd\ud840\udc00-\ud87f\udffd\ud880\udc00-\ud8bf\udffd\ud8c0\udc00-\ud8ff\udffd\ud900\udc00-\ud93f\udffd\ud940\udc00-\ud97f\udffd\ud980\udc00-\ud9bf\udffd\ud9c0\udc00-\ud9ff\udffd\uda00\udc00-\uda3f\udffd\uda40\udc00-\uda7f\udffd\uda80\udc00-\udabf\udffd\udac0\udc00-\udaff\udffd\udb00\udc00-\udb3f\udffd\udb44\udc00-\udb7f\udffd&&[^\u00a0[\u2000-\u200a]\u2028\u2029\u202f\u3000]]](?:[a-zA-Z0-9[\u00a0-\ud7ff\uf900-\ufdcf\ufdf0-\uffef\ud800\udc00-\ud83f\udffd\ud840\udc00-\ud87f\udffd\ud880\udc00-\ud8bf\udffd\ud8c0\udc00-\ud8ff\udffd\ud900\udc00-\ud93f\udffd\ud940\udc00-\ud97f\udffd\ud980\udc00-\ud9bf\udffd\ud9c0\udc00-\ud9ff\udffd\uda00\udc00-\uda3f\udffd\uda40\udc00-\uda7f\udffd\uda80\udc00-\udabf\udffd\udac0\udc00-\udaff\udffd\udb00\udc00-\udb3f\udffd\udb44\udc00-\udb7f\udffd&&[^\u00a0[\u2000-\u200a]\u2028\u2029\u202f\u3000]]_\\-]{0,61}[a-zA-Z0-9[\u00a0-\ud7ff\uf900-\ufdcf\ufdf0-\uffef\ud800\udc00-\ud83f\udffd\ud840\udc00-\ud87f\udffd\ud880\udc00-\ud8bf\udffd\ud8c0\udc00-\ud8ff\udffd\ud900\udc00-\ud93f\udffd\ud940\udc00-\ud97f\udffd\ud980\udc00-\ud9bf\udffd\ud9c0\udc00-\ud9ff\udffd\uda00\udc00-\uda3f\udffd\uda40\udc00-\uda7f\udffd\uda80\udc00-\udabf\udffd\udac0\udc00-\udaff\udffd\udb00\udc00-\udb3f\udffd\udb44\udc00-\udb7f\udffd&&[^\u00a0[\u2000-\u200a]\u2028\u2029\u202f\u3000]]]){0,1}(?:\\.(?=\\S))?)+|" - invoke-virtual {v9, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v9, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + sget-object v8, Landroid/support/v4/util/PatternsCompat;->IP_ADDRESS:Ljava/util/regex/Pattern; - invoke-virtual {v9, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - invoke-virtual {v9}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; move-result-object v0 sput-object v0, Landroid/support/v4/util/PatternsCompat;->RELAXED_DOMAIN_NAME:Ljava/lang/String; .line 269 - new-instance v9, Ljava/lang/StringBuilder; + new-instance v0, Ljava/lang/StringBuilder; - invoke-direct {v9}, Ljava/lang/StringBuilder;->()V + invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - const-string v10, "((?:\\b|$|^)(?append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v9, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + sget-object v8, Landroid/support/v4/util/PatternsCompat;->STRICT_DOMAIN_NAME:Ljava/util/regex/Pattern; - invoke-virtual {v9, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - invoke-virtual {v9, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v9, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v9, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v9, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v9, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v9, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v9, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v9, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v9, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v9}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - move-result-object v3 + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - sput-object v3, Landroid/support/v4/util/PatternsCompat;->WEB_URL_WITHOUT_PROTOCOL:Ljava/lang/String; + move-result-object v0 + + sput-object v0, Landroid/support/v4/util/PatternsCompat;->WEB_URL_WITHOUT_PROTOCOL:Ljava/lang/String; .line 284 - new-instance v9, Ljava/lang/StringBuilder; + new-instance v0, Ljava/lang/StringBuilder; + + invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - invoke-direct {v9}, Ljava/lang/StringBuilder;->()V + const-string v8, "((?:\\b|$|^)(?:(?:(?i:http|https|rtsp)://(?:(?:[a-zA-Z0-9\\$\\-\\_\\.\\+\\!\\*\\\'\\(\\)\\,\\;\\?\\&\\=]|(?:\\%[a-fA-F0-9]{2})){1,64}(?:\\:(?:[a-zA-Z0-9\\$\\-\\_\\.\\+\\!\\*\\\'\\(\\)\\,\\;\\?\\&\\=]|(?:\\%[a-fA-F0-9]{2})){1,25})?\\@)?)(?:" - const-string v10, "((?:\\b|$|^)(?:(?:(?i:http|https|rtsp)://(?:(?:[a-zA-Z0-9\\$\\-\\_\\.\\+\\!\\*\\\'\\(\\)\\,\\;\\?\\&\\=]|(?:\\%[a-fA-F0-9]{2})){1,64}(?:\\:(?:[a-zA-Z0-9\\$\\-\\_\\.\\+\\!\\*\\\'\\(\\)\\,\\;\\?\\&\\=]|(?:\\%[a-fA-F0-9]{2})){1,25})?\\@)?)(?:" + invoke-virtual {v0, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v9, v10}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + sget-object v8, Landroid/support/v4/util/PatternsCompat;->RELAXED_DOMAIN_NAME:Ljava/lang/String; - invoke-virtual {v9, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v9, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v9, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v9, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v9, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v9, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v9, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v9, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v9, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v9, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v9, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v9}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; move-result-object v0 sput-object v0, Landroid/support/v4/util/PatternsCompat;->WEB_URL_WITH_PROTOCOL:Ljava/lang/String; .line 303 - new-instance v1, Ljava/lang/StringBuilder; + new-instance v0, Ljava/lang/StringBuilder; + + invoke-direct {v0}, Ljava/lang/StringBuilder;->()V + + invoke-virtual {v0, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-direct {v1}, Ljava/lang/StringBuilder;->()V + sget-object v2, Landroid/support/v4/util/PatternsCompat;->WEB_URL_WITH_PROTOCOL:Ljava/lang/String; - invoke-virtual {v1, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + const-string v2, "|" - const-string v0, "|" + invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + sget-object v2, Landroid/support/v4/util/PatternsCompat;->WEB_URL_WITHOUT_PROTOCOL:Ljava/lang/String; - invoke-virtual {v1, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; move-result-object v0 diff --git a/smali/android/support/v4/util/Pools$Pool.smali b/smali/android/support/v4/util/Pools$Pool.smali index 28448b79..85062ee6 100644 --- a/smali/android/support/v4/util/Pools$Pool.smali +++ b/smali/android/support/v4/util/Pools$Pool.smali @@ -25,6 +25,9 @@ # virtual methods .method public abstract acquire()Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "()TT;" @@ -33,6 +36,10 @@ .end method .method public abstract release(Ljava/lang/Object;)Z + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(TT;)Z" diff --git a/smali/android/support/v4/util/Pools$SimplePool.smali b/smali/android/support/v4/util/Pools$SimplePool.smali index e7e31d4e..2a79eded 100644 --- a/smali/android/support/v4/util/Pools$SimplePool.smali +++ b/smali/android/support/v4/util/Pools$SimplePool.smali @@ -63,6 +63,10 @@ .method private isInPool(Ljava/lang/Object;)Z .locals 3 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(TT;)Z" @@ -139,6 +143,10 @@ .method public release(Ljava/lang/Object;)Z .locals 3 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(TT;)Z" diff --git a/smali/android/support/v4/util/Pools$SynchronizedPool.smali b/smali/android/support/v4/util/Pools$SynchronizedPool.smali index 17428e51..5d120e6f 100644 --- a/smali/android/support/v4/util/Pools$SynchronizedPool.smali +++ b/smali/android/support/v4/util/Pools$SynchronizedPool.smali @@ -83,6 +83,10 @@ .method public release(Ljava/lang/Object;)Z .locals 1 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(TT;)Z" diff --git a/smali/android/support/v4/util/Preconditions.smali b/smali/android/support/v4/util/Preconditions.smali index ab3faa9a..97cc4b20 100644 --- a/smali/android/support/v4/util/Preconditions.smali +++ b/smali/android/support/v4/util/Preconditions.smali @@ -3,6 +3,14 @@ .source "Preconditions.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # direct methods .method private constructor ()V .locals 0 @@ -410,6 +418,9 @@ .method public static checkArgumentNonnegative(I)I .locals 0 + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + .end annotation if-ltz p0, :cond_0 @@ -426,6 +437,9 @@ .method public static checkArgumentNonnegative(ILjava/lang/String;)I .locals 0 + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + .end annotation if-ltz p0, :cond_0 @@ -755,17 +769,16 @@ invoke-direct {p0, p1}, Ljava/lang/NullPointerException;->(Ljava/lang/String;)V - goto :goto_2 - - :goto_1 throw p0 - :goto_2 - goto :goto_1 + return-void .end method .method public static checkCollectionElementsNotNull(Ljava/util/Collection;Ljava/lang/String;)Ljava/util/Collection; .locals 5 + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(Ljava/lang/String;)V - goto :goto_2 - - :goto_1 throw p0 - :goto_2 - goto :goto_1 + return-void .end method .method public static checkCollectionNotEmpty(Ljava/util/Collection;Ljava/lang/String;)Ljava/util/Collection; @@ -997,6 +1006,9 @@ .method public static checkNotNull(Ljava/lang/Object;)Ljava/lang/Object; .locals 0 + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "getClass()Ljava/lang/Class; + if-eqz p0, :cond_0 return-object p0 + + .line 99 + :cond_0 + new-instance p0, Ljava/lang/NullPointerException; + + invoke-direct {p0}, Ljava/lang/NullPointerException;->()V + + throw p0 .end method .method public static checkNotNull(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .locals 0 + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "mTwiceBaseCache:[Ljava/lang/Object; + .line 169 - iput-object v4, p0, Landroid/support/v4/util/SimpleArrayMap;->mArray:[Ljava/lang/Object; + iput-object p1, p0, Landroid/support/v4/util/SimpleArrayMap;->mArray:[Ljava/lang/Object; .line 170 - aget-object p1, v4, v1 + aget-object v4, p1, v1 - check-cast p1, [Ljava/lang/Object; + check-cast v4, [Ljava/lang/Object; - check-cast p1, [Ljava/lang/Object; + check-cast v4, [Ljava/lang/Object; - sput-object p1, Landroid/support/v4/util/SimpleArrayMap;->mTwiceBaseCache:[Ljava/lang/Object; + sput-object v4, Landroid/support/v4/util/SimpleArrayMap;->mTwiceBaseCache:[Ljava/lang/Object; .line 171 - aget-object p1, v4, v2 + aget-object v4, p1, v2 - check-cast p1, [I + check-cast v4, [I - check-cast p1, [I + check-cast v4, [I - iput-object p1, p0, Landroid/support/v4/util/SimpleArrayMap;->mHashes:[I + iput-object v4, p0, Landroid/support/v4/util/SimpleArrayMap;->mHashes:[I .line 172 - aput-object v0, v4, v2 + aput-object v0, p1, v2 - aput-object v0, v4, v1 + aput-object v0, p1, v1 .line 173 sget p1, Landroid/support/v4/util/SimpleArrayMap;->mTwiceBaseCacheSize:I @@ -217,31 +226,34 @@ if-eqz v4, :cond_2 + .line 182 + sget-object p1, Landroid/support/v4/util/SimpleArrayMap;->mBaseCache:[Ljava/lang/Object; + .line 183 - iput-object v4, p0, Landroid/support/v4/util/SimpleArrayMap;->mArray:[Ljava/lang/Object; + iput-object p1, p0, Landroid/support/v4/util/SimpleArrayMap;->mArray:[Ljava/lang/Object; .line 184 - aget-object p1, v4, v1 + aget-object v4, p1, v1 - check-cast p1, [Ljava/lang/Object; + check-cast v4, [Ljava/lang/Object; - check-cast p1, [Ljava/lang/Object; + check-cast v4, [Ljava/lang/Object; - sput-object p1, Landroid/support/v4/util/SimpleArrayMap;->mBaseCache:[Ljava/lang/Object; + sput-object v4, Landroid/support/v4/util/SimpleArrayMap;->mBaseCache:[Ljava/lang/Object; .line 185 - aget-object p1, v4, v2 + aget-object v4, p1, v2 - check-cast p1, [I + check-cast v4, [I - check-cast p1, [I + check-cast v4, [I - iput-object p1, p0, Landroid/support/v4/util/SimpleArrayMap;->mHashes:[I + iput-object v4, p0, Landroid/support/v4/util/SimpleArrayMap;->mHashes:[I .line 186 - aput-object v0, v4, v2 + aput-object v0, p1, v2 - aput-object v0, v4, v1 + aput-object v0, p1, v1 .line 187 sget p1, Landroid/support/v4/util/SimpleArrayMap;->mBaseCacheSize:I @@ -513,6 +525,10 @@ .method public containsKey(Ljava/lang/Object;)Z .locals 0 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 312 invoke-virtual {p0, p1}, Landroid/support/v4/util/SimpleArrayMap;->indexOfKey(Ljava/lang/Object;)I @@ -797,6 +813,9 @@ .method public get(Ljava/lang/Object;)Ljava/lang/Object; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -846,18 +865,20 @@ const/4 v4, 0x0 + const/4 v3, 0x0 + const/4 v5, 0x0 - const/4 v6, 0x0 + const/4 v6, 0x1 :goto_0 - if-ge v5, v2, :cond_1 + if-ge v3, v2, :cond_1 .line 660 - aget-object v7, v1, v3 + aget-object v7, v1, v6 .line 661 - aget v8, v0, v5 + aget v8, v0, v3 if-nez v7, :cond_0 @@ -873,16 +894,16 @@ :goto_1 xor-int/2addr v7, v8 - add-int/2addr v6, v7 + add-int/2addr v5, v7 - add-int/lit8 v5, v5, 0x1 + add-int/lit8 v3, v3, 0x1 - add-int/lit8 v3, v3, 0x2 + add-int/lit8 v6, v6, 0x2 goto :goto_0 :cond_1 - return v6 + return v5 .end method .method indexOf(Ljava/lang/Object;I)I @@ -999,6 +1020,10 @@ .method public indexOfKey(Ljava/lang/Object;)I .locals 1 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param if-nez p1, :cond_0 @@ -1227,6 +1252,9 @@ .method public put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .locals 9 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(TK;TV;)TV;" @@ -1289,62 +1317,65 @@ .line 433 iget-object v4, p0, Landroid/support/v4/util/SimpleArrayMap;->mHashes:[I - array-length v5, v4 + array-length v4, v4 - if-lt v0, v5, :cond_6 + if-lt v0, v4, :cond_6 - const/4 v5, 0x4 + const/4 v4, 0x4 - const/16 v6, 0x8 + const/16 v5, 0x8 - if-lt v0, v6, :cond_2 + if-lt v0, v5, :cond_2 - shr-int/lit8 v5, v0, 0x1 + shr-int/lit8 v4, v0, 0x1 - add-int/2addr v5, v0 + add-int/2addr v4, v0 goto :goto_1 :cond_2 - if-lt v0, v5, :cond_3 + if-lt v0, v4, :cond_3 - const/16 v5, 0x8 + const/16 v4, 0x8 - .line 440 + .line 439 :cond_3 :goto_1 + iget-object v5, p0, Landroid/support/v4/util/SimpleArrayMap;->mHashes:[I + + .line 440 iget-object v6, p0, Landroid/support/v4/util/SimpleArrayMap;->mArray:[Ljava/lang/Object; .line 441 - invoke-direct {p0, v5}, Landroid/support/v4/util/SimpleArrayMap;->allocArrays(I)V + invoke-direct {p0, v4}, Landroid/support/v4/util/SimpleArrayMap;->allocArrays(I)V .line 443 - iget v5, p0, Landroid/support/v4/util/SimpleArrayMap;->mSize:I + iget v4, p0, Landroid/support/v4/util/SimpleArrayMap;->mSize:I - if-ne v0, v5, :cond_5 + if-ne v0, v4, :cond_5 .line 447 - iget-object v5, p0, Landroid/support/v4/util/SimpleArrayMap;->mHashes:[I + iget-object v4, p0, Landroid/support/v4/util/SimpleArrayMap;->mHashes:[I - array-length v7, v5 + array-length v7, v4 if-lez v7, :cond_4 .line 449 - array-length v7, v4 + array-length v7, v5 - invoke-static {v4, v1, v5, v1, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V + invoke-static {v5, v1, v4, v1, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V .line 450 - iget-object v5, p0, Landroid/support/v4/util/SimpleArrayMap;->mArray:[Ljava/lang/Object; + iget-object v4, p0, Landroid/support/v4/util/SimpleArrayMap;->mArray:[Ljava/lang/Object; array-length v7, v6 - invoke-static {v6, v1, v5, v1, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V + invoke-static {v6, v1, v4, v1, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V .line 453 :cond_4 - invoke-static {v4, v6, v0}, Landroid/support/v4/util/SimpleArrayMap;->freeArrays([I[Ljava/lang/Object;I)V + invoke-static {v5, v6, v0}, Landroid/support/v4/util/SimpleArrayMap;->freeArrays([I[Ljava/lang/Object;I)V goto :goto_2 @@ -1431,6 +1462,10 @@ .method public putAll(Landroid/support/v4/util/SimpleArrayMap;)V .locals 4 + .param p1 # Landroid/support/v4/util/SimpleArrayMap; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -1505,6 +1540,9 @@ .method public remove(Ljava/lang/Object;)Ljava/lang/Object; .locals 0 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -1574,35 +1612,43 @@ iput-object p1, p0, Landroid/support/v4/util/SimpleArrayMap;->mArray:[Ljava/lang/Object; - goto :goto_1 + const/4 v0, 0x0 + + goto :goto_0 :cond_0 - add-int/lit8 v6, v3, -0x1 + add-int/lit8 v0, v3, -0x1 .line 530 - iget-object v7, p0, Landroid/support/v4/util/SimpleArrayMap;->mHashes:[I + iget-object v6, p0, Landroid/support/v4/util/SimpleArrayMap;->mHashes:[I - array-length v8, v7 + array-length v7, v6 - const/16 v9, 0x8 + const/16 v8, 0x8 - if-le v8, v9, :cond_4 + if-le v7, v8, :cond_4 - array-length v8, v7 + array-length v6, v6 - div-int/lit8 v8, v8, 0x3 + div-int/lit8 v6, v6, 0x3 - if-ge v3, v8, :cond_4 + if-ge v3, v6, :cond_4 - if-le v3, v9, :cond_1 + if-le v3, v8, :cond_1 - shr-int/lit8 v8, v3, 0x1 + shr-int/lit8 v6, v3, 0x1 - add-int v9, v3, v8 + add-int v8, v3, v6 - .line 540 + .line 538 :cond_1 - invoke-direct {p0, v9}, Landroid/support/v4/util/SimpleArrayMap;->allocArrays(I)V + iget-object v6, p0, Landroid/support/v4/util/SimpleArrayMap;->mHashes:[I + + .line 539 + iget-object v7, p0, Landroid/support/v4/util/SimpleArrayMap;->mArray:[Ljava/lang/Object; + + .line 540 + invoke-direct {p0, v8}, Landroid/support/v4/util/SimpleArrayMap;->allocArrays(I)V .line 542 iget v8, p0, Landroid/support/v4/util/SimpleArrayMap;->mSize:I @@ -1614,24 +1660,24 @@ .line 548 iget-object v8, p0, Landroid/support/v4/util/SimpleArrayMap;->mHashes:[I - invoke-static {v7, v4, v8, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V + invoke-static {v6, v4, v8, v4, p1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V .line 549 iget-object v8, p0, Landroid/support/v4/util/SimpleArrayMap;->mArray:[Ljava/lang/Object; - invoke-static {v0, v4, v8, v4, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V + invoke-static {v7, v4, v8, v4, v1}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V :cond_2 - if-ge p1, v6, :cond_6 + if-ge p1, v0, :cond_6 add-int/lit8 v4, p1, 0x1 .line 554 iget-object v8, p0, Landroid/support/v4/util/SimpleArrayMap;->mHashes:[I - sub-int v9, v6, p1 + sub-int v9, v0, p1 - invoke-static {v7, v4, v8, p1, v9}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V + invoke-static {v6, v4, v8, p1, v9}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V shl-int/lit8 p1, v4, 0x1 @@ -1640,7 +1686,7 @@ shl-int/lit8 v5, v9, 0x1 - invoke-static {v0, p1, v4, v1, v5}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V + invoke-static {v7, p1, v4, v1, v5}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V goto :goto_0 @@ -1653,51 +1699,50 @@ throw p1 :cond_4 - if-ge p1, v6, :cond_5 + if-ge p1, v0, :cond_5 - add-int/lit8 v0, p1, 0x1 + .line 562 + iget-object v4, p0, Landroid/support/v4/util/SimpleArrayMap;->mHashes:[I - sub-int v4, v6, p1 + add-int/lit8 v6, p1, 0x1 - .line 562 - invoke-static {v7, v0, v7, p1, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V + sub-int v7, v0, p1 + + invoke-static {v4, v6, v4, p1, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V .line 563 iget-object p1, p0, Landroid/support/v4/util/SimpleArrayMap;->mArray:[Ljava/lang/Object; - shl-int/2addr v0, v5 + shl-int/lit8 v4, v6, 0x1 - shl-int/2addr v4, v5 + shl-int/lit8 v6, v7, 0x1 - invoke-static {p1, v0, p1, v1, v4}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V + invoke-static {p1, v4, p1, v1, v6}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V .line 566 :cond_5 iget-object p1, p0, Landroid/support/v4/util/SimpleArrayMap;->mArray:[Ljava/lang/Object; - shl-int/lit8 v0, v6, 0x1 + shl-int/lit8 v1, v0, 0x1 - const/4 v1, 0x0 + const/4 v4, 0x0 - aput-object v1, p1, v0 + aput-object v4, p1, v1 - add-int/2addr v0, v5 + add-int/2addr v1, v5 .line 567 - aput-object v1, p1, v0 + aput-object v4, p1, v1 + .line 570 :cond_6 :goto_0 - move v4, v6 - - .line 570 - :goto_1 iget p1, p0, Landroid/support/v4/util/SimpleArrayMap;->mSize:I if-ne v3, p1, :cond_7 .line 573 - iput v4, p0, Landroid/support/v4/util/SimpleArrayMap;->mSize:I + iput v0, p0, Landroid/support/v4/util/SimpleArrayMap;->mSize:I return-object v2 diff --git a/smali/android/support/v4/util/SparseArrayCompat.smali b/smali/android/support/v4/util/SparseArrayCompat.smali index 2e3d6453..eff3e5b4 100644 --- a/smali/android/support/v4/util/SparseArrayCompat.smali +++ b/smali/android/support/v4/util/SparseArrayCompat.smali @@ -184,11 +184,11 @@ iget-object v1, p0, Landroid/support/v4/util/SparseArrayCompat;->mKeys:[I - add-int/lit8 v2, v0, -0x1 + add-int/lit8 v0, v0, -0x1 - aget v1, v1, v2 + aget v0, v1, v0 - if-gt p1, v1, :cond_0 + if-gt p1, v0, :cond_0 .line 389 invoke-virtual {p0, p1, p2}, Landroid/support/v4/util/SparseArrayCompat;->put(ILjava/lang/Object;)V @@ -197,9 +197,11 @@ .line 393 :cond_0 - iget-boolean v1, p0, Landroid/support/v4/util/SparseArrayCompat;->mGarbage:Z + iget-boolean v0, p0, Landroid/support/v4/util/SparseArrayCompat;->mGarbage:Z + + if-eqz v0, :cond_1 - if-eqz v1, :cond_1 + iget v0, p0, Landroid/support/v4/util/SparseArrayCompat;->mSize:I iget-object v1, p0, Landroid/support/v4/util/SparseArrayCompat;->mKeys:[I @@ -465,6 +467,9 @@ .method public get(I)Ljava/lang/Object; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(I)TE;" @@ -482,7 +487,7 @@ .end method .method public get(ILjava/lang/Object;)Ljava/lang/Object; - .locals 2 + .locals 3 .annotation system Ldalvik/annotation/Signature; value = { "(ITE;)TE;" @@ -503,15 +508,18 @@ .line 121 iget-object v0, p0, Landroid/support/v4/util/SparseArrayCompat;->mValues:[Ljava/lang/Object; - aget-object p1, v0, p1 + aget-object v1, v0, p1 - sget-object v0, Landroid/support/v4/util/SparseArrayCompat;->DELETED:Ljava/lang/Object; + sget-object v2, Landroid/support/v4/util/SparseArrayCompat;->DELETED:Ljava/lang/Object; - if-ne p1, v0, :cond_0 + if-ne v1, v2, :cond_0 goto :goto_0 + .line 124 :cond_0 + aget-object p1, v0, p1 + return-object p1 :cond_1 @@ -663,29 +671,31 @@ if-ge v0, v1, :cond_1 - iget-object v2, p0, Landroid/support/v4/util/SparseArrayCompat;->mValues:[Ljava/lang/Object; + iget-object v1, p0, Landroid/support/v4/util/SparseArrayCompat;->mValues:[Ljava/lang/Object; - aget-object v3, v2, v0 + aget-object v2, v1, v0 - sget-object v4, Landroid/support/v4/util/SparseArrayCompat;->DELETED:Ljava/lang/Object; + sget-object v3, Landroid/support/v4/util/SparseArrayCompat;->DELETED:Ljava/lang/Object; - if-ne v3, v4, :cond_1 + if-ne v2, v3, :cond_1 .line 214 - iget-object v1, p0, Landroid/support/v4/util/SparseArrayCompat;->mKeys:[I + iget-object v2, p0, Landroid/support/v4/util/SparseArrayCompat;->mKeys:[I - aput p1, v1, v0 + aput p1, v2, v0 .line 215 - aput-object p2, v2, v0 + aput-object p2, v1, v0 return-void .line 219 :cond_1 - iget-boolean v2, p0, Landroid/support/v4/util/SparseArrayCompat;->mGarbage:Z + iget-boolean v1, p0, Landroid/support/v4/util/SparseArrayCompat;->mGarbage:Z - if-eqz v2, :cond_2 + if-eqz v1, :cond_2 + + iget v1, p0, Landroid/support/v4/util/SparseArrayCompat;->mSize:I iget-object v2, p0, Landroid/support/v4/util/SparseArrayCompat;->mKeys:[I @@ -802,6 +812,10 @@ .method public putAll(Landroid/support/v4/util/SparseArrayCompat;)V .locals 4 + .param p1 # Landroid/support/v4/util/SparseArrayCompat; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", diff --git a/smali/android/support/v4/util/TimeUtils.smali b/smali/android/support/v4/util/TimeUtils.smali index 867eeb4c..a9dd67c7 100644 --- a/smali/android/support/v4/util/TimeUtils.smali +++ b/smali/android/support/v4/util/TimeUtils.smali @@ -3,8 +3,22 @@ .source "TimeUtils.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field public static final HUNDRED_DAY_FIELD_LEN:I = 0x13 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field .field private static final SECONDS_PER_DAY:I = 0x15180 @@ -30,9 +44,9 @@ const/16 v0, 0x18 + .line 41 new-array v0, v0, [C - .line 41 sput-object v0, Landroid/support/v4/util/TimeUtils;->sFormatStr:[C return-void @@ -108,6 +122,11 @@ .method public static formatDuration(JJLjava/io/PrintWriter;)V .locals 3 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation const-wide/16 v0, 0x0 @@ -135,6 +154,11 @@ .method public static formatDuration(JLjava/io/PrintWriter;)V .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation const/4 v0, 0x0 @@ -146,6 +170,11 @@ .method public static formatDuration(JLjava/io/PrintWriter;I)V .locals 2 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 163 sget-object v0, Landroid/support/v4/util/TimeUtils;->sFormatSync:Ljava/lang/Object; @@ -186,6 +215,11 @@ .method public static formatDuration(JLjava/lang/StringBuilder;)V .locals 2 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 154 sget-object v0, Landroid/support/v4/util/TimeUtils;->sFormatSync:Ljava/lang/Object; diff --git a/smali/android/support/v4/view/AbsSavedState.smali b/smali/android/support/v4/view/AbsSavedState.smali index c2cf7b3b..98d4a80f 100644 --- a/smali/android/support/v4/view/AbsSavedState.smali +++ b/smali/android/support/v4/view/AbsSavedState.smali @@ -61,6 +61,10 @@ .method protected constructor (Landroid/os/Parcel;)V .locals 1 + .param p1 # Landroid/os/Parcel; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 v0, 0x0 @@ -72,6 +76,14 @@ .method protected constructor (Landroid/os/Parcel;Ljava/lang/ClassLoader;)V .locals 0 + .param p1 # Landroid/os/Parcel; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/ClassLoader; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 68 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -97,6 +109,10 @@ .method protected constructor (Landroid/os/Parcelable;)V .locals 1 + .param p1 # Landroid/os/Parcelable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 46 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -150,6 +166,8 @@ .method public final getSuperState()Landroid/os/Parcelable; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 75 iget-object v0, p0, Landroid/support/v4/view/AbsSavedState;->mSuperState:Landroid/os/Parcelable; diff --git a/smali/android/support/v4/view/AccessibilityDelegateCompat$AccessibilityDelegateAdapter.smali b/smali/android/support/v4/view/AccessibilityDelegateCompat$AccessibilityDelegateAdapter.smali index b432ffeb..18af8d3b 100644 --- a/smali/android/support/v4/view/AccessibilityDelegateCompat$AccessibilityDelegateAdapter.smali +++ b/smali/android/support/v4/view/AccessibilityDelegateCompat$AccessibilityDelegateAdapter.smali @@ -48,6 +48,9 @@ .method public getAccessibilityNodeProvider(Landroid/view/View;)Landroid/view/accessibility/AccessibilityNodeProvider; .locals 1 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x10 + .end annotation .line 98 iget-object v0, p0, Landroid/support/v4/view/AccessibilityDelegateCompat$AccessibilityDelegateAdapter;->mCompat:Landroid/support/v4/view/AccessibilityDelegateCompat; diff --git a/smali/android/support/v4/view/ActionProvider$SubUiVisibilityListener.smali b/smali/android/support/v4/view/ActionProvider$SubUiVisibilityListener.smali index c3b8157c..e68f3f43 100644 --- a/smali/android/support/v4/view/ActionProvider$SubUiVisibilityListener.smali +++ b/smali/android/support/v4/view/ActionProvider$SubUiVisibilityListener.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/view/ActionProvider; .end annotation diff --git a/smali/android/support/v4/view/ActionProvider.smali b/smali/android/support/v4/view/ActionProvider.smali index 740a8351..1f597ca2 100644 --- a/smali/android/support/v4/view/ActionProvider.smali +++ b/smali/android/support/v4/view/ActionProvider.smali @@ -129,6 +129,11 @@ .method public reset()V .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation const/4 v0, 0x0 @@ -143,6 +148,11 @@ .method public setSubUiVisibilityListener(Landroid/support/v4/view/ActionProvider$SubUiVisibilityListener;)V .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 289 iput-object p1, p0, Landroid/support/v4/view/ActionProvider;->mSubUiVisibilityListener:Landroid/support/v4/view/ActionProvider$SubUiVisibilityListener; @@ -202,6 +212,11 @@ .method public subUiVisibilityChanged(Z)V .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 279 iget-object v0, p0, Landroid/support/v4/view/ActionProvider;->mSubUiVisibilityListener:Landroid/support/v4/view/ActionProvider$SubUiVisibilityListener; diff --git a/smali/android/support/v4/view/AsyncLayoutInflater$InflateThread.smali b/smali/android/support/v4/view/AsyncLayoutInflater$InflateThread.smali index 0c0397be..5482b340 100644 --- a/smali/android/support/v4/view/AsyncLayoutInflater$InflateThread.smali +++ b/smali/android/support/v4/view/AsyncLayoutInflater$InflateThread.smali @@ -52,6 +52,8 @@ sput-object v0, Landroid/support/v4/view/AsyncLayoutInflater$InflateThread;->sInstance:Landroid/support/v4/view/AsyncLayoutInflater$InflateThread; .line 164 + sget-object v0, Landroid/support/v4/view/AsyncLayoutInflater$InflateThread;->sInstance:Landroid/support/v4/view/AsyncLayoutInflater$InflateThread; + invoke-virtual {v0}, Landroid/support/v4/view/AsyncLayoutInflater$InflateThread;->start()V return-void diff --git a/smali/android/support/v4/view/AsyncLayoutInflater$OnInflateFinishedListener.smali b/smali/android/support/v4/view/AsyncLayoutInflater$OnInflateFinishedListener.smali index 10db5668..44a41fe2 100644 --- a/smali/android/support/v4/view/AsyncLayoutInflater$OnInflateFinishedListener.smali +++ b/smali/android/support/v4/view/AsyncLayoutInflater$OnInflateFinishedListener.smali @@ -16,4 +16,16 @@ # virtual methods .method public abstract onInflateFinished(Landroid/view/View;ILandroid/view/ViewGroup;)V + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/LayoutRes; + .end annotation + .end param + .param p3 # Landroid/view/ViewGroup; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .end method diff --git a/smali/android/support/v4/view/AsyncLayoutInflater.smali b/smali/android/support/v4/view/AsyncLayoutInflater.smali index 9fb1d14c..1042ab71 100644 --- a/smali/android/support/v4/view/AsyncLayoutInflater.smali +++ b/smali/android/support/v4/view/AsyncLayoutInflater.smali @@ -31,6 +31,10 @@ # direct methods .method public constructor (Landroid/content/Context;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 75 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -72,6 +76,20 @@ # virtual methods .method public inflate(ILandroid/view/ViewGroup;Landroid/support/v4/view/AsyncLayoutInflater$OnInflateFinishedListener;)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/LayoutRes; + .end annotation + .end param + .param p2 # Landroid/view/ViewGroup; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # Landroid/support/v4/view/AsyncLayoutInflater$OnInflateFinishedListener; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/UiThread; + .end annotation if-eqz p3, :cond_0 diff --git a/smali/android/support/v4/view/DisplayCutoutCompat.smali b/smali/android/support/v4/view/DisplayCutoutCompat.smali index 0433ff02..b6411207 100644 --- a/smali/android/support/v4/view/DisplayCutoutCompat.smali +++ b/smali/android/support/v4/view/DisplayCutoutCompat.smali @@ -111,10 +111,10 @@ .line 115 iget-object v2, p0, Landroid/support/v4/view/DisplayCutoutCompat;->mDisplayCutout:Ljava/lang/Object; - iget-object p1, p1, Landroid/support/v4/view/DisplayCutoutCompat;->mDisplayCutout:Ljava/lang/Object; - if-nez v2, :cond_3 + iget-object p1, p1, Landroid/support/v4/view/DisplayCutoutCompat;->mDisplayCutout:Ljava/lang/Object; + if-nez p1, :cond_2 goto :goto_0 @@ -124,8 +124,10 @@ goto :goto_0 - .line 116 :cond_3 + iget-object p1, p1, Landroid/support/v4/view/DisplayCutoutCompat;->mDisplayCutout:Ljava/lang/Object; + + .line 116 invoke-virtual {v2, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z move-result v0 diff --git a/smali/android/support/v4/view/KeyEventDispatcher.smali b/smali/android/support/v4/view/KeyEventDispatcher.smali index d19fc415..4b4447a0 100644 --- a/smali/android/support/v4/view/KeyEventDispatcher.smali +++ b/smali/android/support/v4/view/KeyEventDispatcher.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v4/view/KeyEventDispatcher$Component; @@ -81,12 +87,12 @@ if-eqz v0, :cond_1 + .line 106 :try_start_1 new-array v1, v1, [Ljava/lang/Object; aput-object p1, v1, v2 - .line 106 invoke-virtual {v0, p0, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; move-result-object p0 @@ -280,6 +286,14 @@ .method public static dispatchBeforeHierarchy(Landroid/view/View;Landroid/view/KeyEvent;)Z .locals 0 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/view/KeyEvent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 63 invoke-static {p0, p1}, Landroid/support/v4/view/ViewCompat;->dispatchUnhandledKeyEventBeforeHierarchy(Landroid/view/View;Landroid/view/KeyEvent;)Z @@ -291,6 +305,22 @@ .method public static dispatchKeyEvent(Landroid/support/v4/view/KeyEventDispatcher$Component;Landroid/view/View;Landroid/view/Window$Callback;Landroid/view/KeyEvent;)Z .locals 3 + .param p0 # Landroid/support/v4/view/KeyEventDispatcher$Component; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p2 # Landroid/view/Window$Callback; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # Landroid/view/KeyEvent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 v0, 0x0 @@ -391,6 +421,8 @@ sput-object v1, Landroid/support/v4/view/KeyEventDispatcher;->sDialogKeyListenerField:Ljava/lang/reflect/Field; .line 145 + sget-object v1, Landroid/support/v4/view/KeyEventDispatcher;->sDialogKeyListenerField:Ljava/lang/reflect/Field; + invoke-virtual {v1, v0}, Ljava/lang/reflect/Field;->setAccessible(Z)V :try_end_0 .catch Ljava/lang/NoSuchFieldException; {:try_start_0 .. :try_end_0} :catch_0 diff --git a/smali/android/support/v4/view/LayoutInflaterCompat.smali b/smali/android/support/v4/view/LayoutInflaterCompat.smali index 50a72a0e..0d2322e1 100644 --- a/smali/android/support/v4/view/LayoutInflaterCompat.smali +++ b/smali/android/support/v4/view/LayoutInflaterCompat.smali @@ -56,6 +56,8 @@ sput-object v3, Landroid/support/v4/view/LayoutInflaterCompat;->sLayoutInflaterFactory2Field:Ljava/lang/reflect/Field; .line 74 + sget-object v3, Landroid/support/v4/view/LayoutInflaterCompat;->sLayoutInflaterFactory2Field:Ljava/lang/reflect/Field; + invoke-virtual {v3, v0}, Ljava/lang/reflect/Field;->setAccessible(Z)V :try_end_0 .catch Ljava/lang/NoSuchFieldException; {:try_start_0 .. :try_end_0} :catch_0 @@ -167,6 +169,14 @@ .method public static setFactory(Landroid/view/LayoutInflater;Landroid/support/v4/view/LayoutInflaterFactory;)V .locals 3 + .param p0 # Landroid/view/LayoutInflater; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/support/v4/view/LayoutInflaterFactory; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation runtime Ljava/lang/Deprecated; .end annotation @@ -230,6 +240,14 @@ .method public static setFactory2(Landroid/view/LayoutInflater;Landroid/view/LayoutInflater$Factory2;)V .locals 2 + .param p0 # Landroid/view/LayoutInflater; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/view/LayoutInflater$Factory2; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 139 invoke-virtual {p0, p1}, Landroid/view/LayoutInflater;->setFactory2(Landroid/view/LayoutInflater$Factory2;)V diff --git a/smali/android/support/v4/view/MarginLayoutParamsCompat.smali b/smali/android/support/v4/view/MarginLayoutParamsCompat.smali index 9e676f32..0b8cf3db 100644 --- a/smali/android/support/v4/view/MarginLayoutParamsCompat.smali +++ b/smali/android/support/v4/view/MarginLayoutParamsCompat.smali @@ -42,13 +42,10 @@ if-eq p0, v0, :cond_1 - goto :goto_1 + const/4 p0, 0x0 :cond_1 - move v1, p0 - - :goto_1 - return v1 + return p0 .end method .method public static getMarginEnd(Landroid/view/ViewGroup$MarginLayoutParams;)I diff --git a/smali/android/support/v4/view/MenuCompat.smali b/smali/android/support/v4/view/MenuCompat.smali index be5ba89a..c691b96f 100644 --- a/smali/android/support/v4/view/MenuCompat.smali +++ b/smali/android/support/v4/view/MenuCompat.smali @@ -15,6 +15,11 @@ .method public static setGroupDividerEnabled(Landroid/view/Menu;Z)V .locals 2 + .annotation build Landroid/annotation/SuppressLint; + value = { + "NewApi" + } + .end annotation .line 48 instance-of v0, p0, Landroid/support/v4/internal/view/SupportMenu; diff --git a/smali/android/support/v4/view/NestedScrollingChild.smali b/smali/android/support/v4/view/NestedScrollingChild.smali index f24342c3..74b7c474 100644 --- a/smali/android/support/v4/view/NestedScrollingChild.smali +++ b/smali/android/support/v4/view/NestedScrollingChild.smali @@ -11,9 +11,21 @@ .end method .method public abstract dispatchNestedPreScroll(II[I[I)Z + .param p3 # [I + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p4 # [I + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .end method .method public abstract dispatchNestedScroll(IIII[I)Z + .param p5 # [I + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .end method .method public abstract hasNestedScrollingParent()Z diff --git a/smali/android/support/v4/view/NestedScrollingChild2.smali b/smali/android/support/v4/view/NestedScrollingChild2.smali index 8e4a347e..01d8637a 100644 --- a/smali/android/support/v4/view/NestedScrollingChild2.smali +++ b/smali/android/support/v4/view/NestedScrollingChild2.smali @@ -8,9 +8,21 @@ # virtual methods .method public abstract dispatchNestedPreScroll(II[I[II)Z + .param p3 # [I + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p4 # [I + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .end method .method public abstract dispatchNestedScroll(IIII[II)Z + .param p5 # [I + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .end method .method public abstract hasNestedScrollingParent(I)Z diff --git a/smali/android/support/v4/view/NestedScrollingChildHelper.smali b/smali/android/support/v4/view/NestedScrollingChildHelper.smali index d1cde222..463ad8be 100644 --- a/smali/android/support/v4/view/NestedScrollingChildHelper.smali +++ b/smali/android/support/v4/view/NestedScrollingChildHelper.smali @@ -18,6 +18,10 @@ # direct methods .method public constructor (Landroid/view/View;)V .locals 0 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 56 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -147,6 +151,14 @@ .method public dispatchNestedPreScroll(II[I[I)Z .locals 6 + .param p3 # [I + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p4 # [I + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param const/4 v5, 0x0 @@ -170,6 +182,14 @@ .method public dispatchNestedPreScroll(II[I[II)Z .locals 10 + .param p3 # [I + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p4 # [I + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 278 invoke-virtual {p0}, Landroid/support/v4/view/NestedScrollingChildHelper;->isNestedScrollingEnabled()Z @@ -178,7 +198,7 @@ const/4 v1, 0x0 - if-eqz v0, :cond_8 + if-eqz v0, :cond_9 .line 279 invoke-direct {p0, p5}, Landroid/support/v4/view/NestedScrollingChildHelper;->getNestedScrollingParentForType(I)Landroid/view/ViewParent; @@ -199,7 +219,7 @@ goto :goto_0 :cond_1 - if-eqz p4, :cond_8 + if-eqz p4, :cond_9 .line 310 aput v1, p4, v1 @@ -207,7 +227,7 @@ .line 311 aput v1, p4, v0 - goto :goto_2 + goto :goto_3 :cond_2 :goto_0 @@ -245,9 +265,9 @@ const/4 p3, 0x2 + .line 295 new-array p3, p3, [I - .line 295 iput-object p3, p0, Landroid/support/v4/view/NestedScrollingChildHelper;->mTempNestedScrollConsumed:[I .line 297 @@ -299,22 +319,32 @@ :cond_6 aget p1, p3, v1 - if-nez p1, :cond_7 + if-nez p1, :cond_8 aget p1, p3, v0 - if-eqz p1, :cond_8 + if-eqz p1, :cond_7 + + goto :goto_2 :cond_7 - const/4 v1, 0x1 + const/4 v0, 0x0 :cond_8 :goto_2 + return v0 + + :cond_9 + :goto_3 return v1 .end method .method public dispatchNestedScroll(IIII[I)Z .locals 7 + .param p5 # [I + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param const/4 v6, 0x0 @@ -340,6 +370,10 @@ .method public dispatchNestedScroll(IIII[II)Z .locals 14 + .param p5 # [I + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param move-object v0, p0 @@ -516,6 +550,10 @@ .method public onStopNestedScroll(Landroid/view/View;)V .locals 0 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 379 iget-object p1, p0, Landroid/support/v4/view/NestedScrollingChildHelper;->mView:Landroid/view/View; diff --git a/smali/android/support/v4/view/NestedScrollingParent.smali b/smali/android/support/v4/view/NestedScrollingParent.smali index 6224efe3..b28d65dd 100644 --- a/smali/android/support/v4/view/NestedScrollingParent.smali +++ b/smali/android/support/v4/view/NestedScrollingParent.smali @@ -8,22 +8,62 @@ .end method .method public abstract onNestedFling(Landroid/view/View;FFZ)Z + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method .method public abstract onNestedPreFling(Landroid/view/View;FF)Z + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method .method public abstract onNestedPreScroll(Landroid/view/View;II[I)V + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # [I + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method .method public abstract onNestedScroll(Landroid/view/View;IIII)V + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method .method public abstract onNestedScrollAccepted(Landroid/view/View;Landroid/view/View;I)V + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method .method public abstract onStartNestedScroll(Landroid/view/View;Landroid/view/View;I)Z + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method .method public abstract onStopNestedScroll(Landroid/view/View;)V + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method diff --git a/smali/android/support/v4/view/NestedScrollingParent2.smali b/smali/android/support/v4/view/NestedScrollingParent2.smali index 0b3ff07f..145128f8 100644 --- a/smali/android/support/v4/view/NestedScrollingParent2.smali +++ b/smali/android/support/v4/view/NestedScrollingParent2.smali @@ -8,16 +8,48 @@ # virtual methods .method public abstract onNestedPreScroll(Landroid/view/View;II[II)V + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # [I + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method .method public abstract onNestedScroll(Landroid/view/View;IIIII)V + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method .method public abstract onNestedScrollAccepted(Landroid/view/View;Landroid/view/View;II)V + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method .method public abstract onStartNestedScroll(Landroid/view/View;Landroid/view/View;II)Z + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method .method public abstract onStopNestedScroll(Landroid/view/View;I)V + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method diff --git a/smali/android/support/v4/view/NestedScrollingParentHelper.smali b/smali/android/support/v4/view/NestedScrollingParentHelper.smali index 9bcae974..477456ad 100644 --- a/smali/android/support/v4/view/NestedScrollingParentHelper.smali +++ b/smali/android/support/v4/view/NestedScrollingParentHelper.smali @@ -12,6 +12,10 @@ # direct methods .method public constructor (Landroid/view/ViewGroup;)V .locals 0 + .param p1 # Landroid/view/ViewGroup; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 50 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -35,6 +39,14 @@ .method public onNestedScrollAccepted(Landroid/view/View;Landroid/view/View;I)V .locals 1 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 v0, 0x0 @@ -46,6 +58,14 @@ .method public onNestedScrollAccepted(Landroid/view/View;Landroid/view/View;II)V .locals 0 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 77 iput p3, p0, Landroid/support/v4/view/NestedScrollingParentHelper;->mNestedScrollAxes:I @@ -55,6 +75,10 @@ .method public onStopNestedScroll(Landroid/view/View;)V .locals 1 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 v0, 0x0 @@ -66,6 +90,10 @@ .method public onStopNestedScroll(Landroid/view/View;I)V .locals 0 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 p1, 0x0 diff --git a/smali/android/support/v4/view/PagerAdapter.smali b/smali/android/support/v4/view/PagerAdapter.smali index aefea593..21bad6ff 100644 --- a/smali/android/support/v4/view/PagerAdapter.smali +++ b/smali/android/support/v4/view/PagerAdapter.smali @@ -36,6 +36,14 @@ # virtual methods .method public destroyItem(Landroid/view/View;ILjava/lang/Object;)V .locals 0 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation runtime Ljava/lang/Deprecated; .end annotation @@ -51,6 +59,14 @@ .method public destroyItem(Landroid/view/ViewGroup;ILjava/lang/Object;)V .locals 0 + .param p1 # Landroid/view/ViewGroup; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 129 invoke-virtual {p0, p1, p2, p3}, Landroid/support/v4/view/PagerAdapter;->destroyItem(Landroid/view/View;ILjava/lang/Object;)V @@ -60,6 +76,10 @@ .method public finishUpdate(Landroid/view/View;)V .locals 0 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation runtime Ljava/lang/Deprecated; .end annotation @@ -68,6 +88,10 @@ .method public finishUpdate(Landroid/view/ViewGroup;)V .locals 0 + .param p1 # Landroid/view/ViewGroup; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 154 invoke-virtual {p0, p1}, Landroid/support/v4/view/PagerAdapter;->finishUpdate(Landroid/view/View;)V @@ -80,6 +104,10 @@ .method public getItemPosition(Ljava/lang/Object;)I .locals 0 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 p1, -0x1 @@ -88,6 +116,8 @@ .method public getPageTitle(I)Ljava/lang/CharSequence; .locals 0 + .annotation build Landroid/support/annotation/Nullable; + .end annotation const/4 p1, 0x0 @@ -104,6 +134,13 @@ .method public instantiateItem(Landroid/view/View;I)Ljava/lang/Object; .locals 0 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation runtime Ljava/lang/Deprecated; .end annotation @@ -119,6 +156,12 @@ .method public instantiateItem(Landroid/view/ViewGroup;I)Ljava/lang/Object; .locals 0 + .param p1 # Landroid/view/ViewGroup; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 115 invoke-virtual {p0, p1, p2}, Landroid/support/v4/view/PagerAdapter;->instantiateItem(Landroid/view/View;I)Ljava/lang/Object; @@ -129,6 +172,14 @@ .end method .method public abstract isViewFromObject(Landroid/view/View;Ljava/lang/Object;)Z + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method .method public notifyDataSetChanged()V @@ -144,6 +195,8 @@ if-eqz v0, :cond_0 .line 291 + iget-object v0, p0, Landroid/support/v4/view/PagerAdapter;->mViewPagerObserver:Landroid/database/DataSetObserver; + invoke-virtual {v0}, Landroid/database/DataSetObserver;->onChanged()V .line 293 @@ -173,6 +226,10 @@ .method public registerDataSetObserver(Landroid/database/DataSetObserver;)V .locals 1 + .param p1 # Landroid/database/DataSetObserver; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 303 iget-object v0, p0, Landroid/support/v4/view/PagerAdapter;->mObservable:Landroid/database/DataSetObservable; @@ -184,12 +241,22 @@ .method public restoreState(Landroid/os/Parcelable;Ljava/lang/ClassLoader;)V .locals 0 + .param p1 # Landroid/os/Parcelable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p2 # Ljava/lang/ClassLoader; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param return-void .end method .method public saveState()Landroid/os/Parcelable; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation const/4 v0, 0x0 @@ -198,6 +265,14 @@ .method public setPrimaryItem(Landroid/view/View;ILjava/lang/Object;)V .locals 0 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation runtime Ljava/lang/Deprecated; .end annotation @@ -206,6 +281,14 @@ .method public setPrimaryItem(Landroid/view/ViewGroup;ILjava/lang/Object;)V .locals 0 + .param p1 # Landroid/view/ViewGroup; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 143 invoke-virtual {p0, p1, p2, p3}, Landroid/support/v4/view/PagerAdapter;->setPrimaryItem(Landroid/view/View;ILjava/lang/Object;)V @@ -240,6 +323,10 @@ .method public startUpdate(Landroid/view/View;)V .locals 0 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation runtime Ljava/lang/Deprecated; .end annotation @@ -248,6 +335,10 @@ .method public startUpdate(Landroid/view/ViewGroup;)V .locals 0 + .param p1 # Landroid/view/ViewGroup; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 99 invoke-virtual {p0, p1}, Landroid/support/v4/view/PagerAdapter;->startUpdate(Landroid/view/View;)V @@ -257,6 +348,10 @@ .method public unregisterDataSetObserver(Landroid/database/DataSetObserver;)V .locals 1 + .param p1 # Landroid/database/DataSetObserver; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 312 iget-object v0, p0, Landroid/support/v4/view/PagerAdapter;->mObservable:Landroid/database/DataSetObservable; diff --git a/smali/android/support/v4/view/PagerTabStrip.smali b/smali/android/support/v4/view/PagerTabStrip.smali index 459ce3b6..9c94694b 100644 --- a/smali/android/support/v4/view/PagerTabStrip.smali +++ b/smali/android/support/v4/view/PagerTabStrip.smali @@ -58,6 +58,10 @@ # direct methods .method public constructor (Landroid/content/Context;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 v0, 0x0 @@ -69,6 +73,14 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V .locals 3 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 87 invoke-direct {p0, p1, p2}, Landroid/support/v4/view/PagerTitleStrip;->(Landroid/content/Context;Landroid/util/AttributeSet;)V @@ -81,47 +93,51 @@ iput-object p2, p0, Landroid/support/v4/view/PagerTabStrip;->mTabPaint:Landroid/graphics/Paint; .line 69 - new-instance v0, Landroid/graphics/Rect; + new-instance p2, Landroid/graphics/Rect; - invoke-direct {v0}, Landroid/graphics/Rect;->()V + invoke-direct {p2}, Landroid/graphics/Rect;->()V - iput-object v0, p0, Landroid/support/v4/view/PagerTabStrip;->mTempRect:Landroid/graphics/Rect; + iput-object p2, p0, Landroid/support/v4/view/PagerTabStrip;->mTempRect:Landroid/graphics/Rect; - const/16 v0, 0xff + const/16 p2, 0xff .line 71 - iput v0, p0, Landroid/support/v4/view/PagerTabStrip;->mTabAlpha:I + iput p2, p0, Landroid/support/v4/view/PagerTabStrip;->mTabAlpha:I - const/4 v0, 0x0 + const/4 p2, 0x0 .line 73 - iput-boolean v0, p0, Landroid/support/v4/view/PagerTabStrip;->mDrawFullUnderline:Z + iput-boolean p2, p0, Landroid/support/v4/view/PagerTabStrip;->mDrawFullUnderline:Z .line 74 - iput-boolean v0, p0, Landroid/support/v4/view/PagerTabStrip;->mDrawFullUnderlineSet:Z + iput-boolean p2, p0, Landroid/support/v4/view/PagerTabStrip;->mDrawFullUnderlineSet:Z .line 89 - iget v1, p0, Landroid/support/v4/view/PagerTabStrip;->mTextColor:I + iget v0, p0, Landroid/support/v4/view/PagerTabStrip;->mTextColor:I - iput v1, p0, Landroid/support/v4/view/PagerTabStrip;->mIndicatorColor:I + iput v0, p0, Landroid/support/v4/view/PagerTabStrip;->mIndicatorColor:I .line 90 - invoke-virtual {p2, v1}, Landroid/graphics/Paint;->setColor(I)V + iget-object v0, p0, Landroid/support/v4/view/PagerTabStrip;->mTabPaint:Landroid/graphics/Paint; + + iget v1, p0, Landroid/support/v4/view/PagerTabStrip;->mIndicatorColor:I + + invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setColor(I)V .line 94 invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources; - move-result-object p2 + move-result-object v0 - invoke-virtual {p2}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics; + invoke-virtual {v0}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics; - move-result-object p2 + move-result-object v0 - iget p2, p2, Landroid/util/DisplayMetrics;->density:F + iget v0, v0, Landroid/util/DisplayMetrics;->density:F const/high16 v1, 0x40400000 # 3.0f - mul-float v1, v1, p2 + mul-float v1, v1, v0 const/high16 v2, 0x3f000000 # 0.5f @@ -134,7 +150,7 @@ const/high16 v1, 0x40c00000 # 6.0f - mul-float v1, v1, p2 + mul-float v1, v1, v0 add-float/2addr v1, v2 @@ -145,7 +161,7 @@ const/high16 v1, 0x42800000 # 64.0f - mul-float v1, v1, p2 + mul-float v1, v1, v0 float-to-int v1, v1 @@ -154,7 +170,7 @@ const/high16 v1, 0x41800000 # 16.0f - mul-float v1, v1, p2 + mul-float v1, v1, v0 add-float/2addr v1, v2 @@ -165,7 +181,7 @@ const/high16 v1, 0x3f800000 # 1.0f - mul-float v1, v1, p2 + mul-float v1, v1, v0 add-float/2addr v1, v2 @@ -176,14 +192,14 @@ const/high16 v1, 0x42000000 # 32.0f - mul-float p2, p2, v1 + mul-float v0, v0, v1 - add-float/2addr p2, v2 + add-float/2addr v0, v2 - float-to-int p2, p2 + float-to-int v0, v0 .line 100 - iput p2, p0, Landroid/support/v4/view/PagerTabStrip;->mMinStripHeight:I + iput v0, p0, Landroid/support/v4/view/PagerTabStrip;->mMinStripHeight:I .line 101 invoke-static {p1}, Landroid/view/ViewConfiguration;->get(Landroid/content/Context;)Landroid/view/ViewConfiguration; @@ -203,7 +219,7 @@ invoke-virtual {p0}, Landroid/support/v4/view/PagerTabStrip;->getPaddingTop()I - move-result p2 + move-result v0 invoke-virtual {p0}, Landroid/support/v4/view/PagerTabStrip;->getPaddingRight()I @@ -213,7 +229,7 @@ move-result v2 - invoke-virtual {p0, p1, p2, v1, v2}, Landroid/support/v4/view/PagerTabStrip;->setPadding(IIII)V + invoke-virtual {p0, p1, v0, v1, v2}, Landroid/support/v4/view/PagerTabStrip;->setPadding(IIII)V .line 105 invoke-virtual {p0}, Landroid/support/v4/view/PagerTabStrip;->getTextSpacing()I @@ -223,7 +239,7 @@ invoke-virtual {p0, p1}, Landroid/support/v4/view/PagerTabStrip;->setTextSpacing(I)V .line 107 - invoke-virtual {p0, v0}, Landroid/support/v4/view/PagerTabStrip;->setWillNotDraw(Z)V + invoke-virtual {p0, p2}, Landroid/support/v4/view/PagerTabStrip;->setWillNotDraw(Z)V .line 109 iget-object p1, p0, Landroid/support/v4/view/PagerTabStrip;->mPrevText:Landroid/widget/TextView; @@ -299,6 +315,8 @@ .method public getTabIndicatorColor()I .locals 1 + .annotation build Landroid/support/annotation/ColorInt; + .end annotation .line 155 iget v0, p0, Landroid/support/v4/view/PagerTabStrip;->mIndicatorColor:I @@ -599,6 +617,10 @@ .method public setBackgroundColor(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param .line 184 invoke-super {p0, p1}, Landroid/support/v4/view/PagerTitleStrip;->setBackgroundColor(I)V @@ -659,6 +681,10 @@ .method public setBackgroundResource(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .line 192 invoke-super {p0, p1}, Landroid/support/v4/view/PagerTitleStrip;->setBackgroundResource(I)V @@ -721,14 +747,20 @@ .method public setTabIndicatorColor(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param .line 136 iput p1, p0, Landroid/support/v4/view/PagerTabStrip;->mIndicatorColor:I .line 137 - iget-object v0, p0, Landroid/support/v4/view/PagerTabStrip;->mTabPaint:Landroid/graphics/Paint; + iget-object p1, p0, Landroid/support/v4/view/PagerTabStrip;->mTabPaint:Landroid/graphics/Paint; + + iget v0, p0, Landroid/support/v4/view/PagerTabStrip;->mIndicatorColor:I - invoke-virtual {v0, p1}, Landroid/graphics/Paint;->setColor(I)V + invoke-virtual {p1, v0}, Landroid/graphics/Paint;->setColor(I)V .line 138 invoke-virtual {p0}, Landroid/support/v4/view/PagerTabStrip;->invalidate()V @@ -738,6 +770,10 @@ .method public setTabIndicatorColorResource(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/ColorRes; + .end annotation + .end param .line 147 invoke-virtual {p0}, Landroid/support/v4/view/PagerTabStrip;->getContext()Landroid/content/Context; diff --git a/smali/android/support/v4/view/PagerTitleStrip.smali b/smali/android/support/v4/view/PagerTitleStrip.smali index 2dfd5e51..7db69653 100644 --- a/smali/android/support/v4/view/PagerTitleStrip.smali +++ b/smali/android/support/v4/view/PagerTitleStrip.smali @@ -69,15 +69,16 @@ const/4 v0, 0x4 + .line 73 new-array v0, v0, [I - .line 73 fill-array-data v0, :array_0 sput-object v0, Landroid/support/v4/view/PagerTitleStrip;->ATTRS:[I const/4 v0, 0x1 + .line 80 new-array v0, v0, [I const/4 v1, 0x0 @@ -86,7 +87,6 @@ aput v2, v0, v1 - .line 80 sput-object v0, Landroid/support/v4/view/PagerTitleStrip;->TEXT_ATTRS:[I return-void @@ -102,6 +102,10 @@ .method public constructor (Landroid/content/Context;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 v0, 0x0 @@ -113,6 +117,14 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V .locals 4 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 113 invoke-direct {p0, p1, p2}, Landroid/view/ViewGroup;->(Landroid/content/Context;Landroid/util/AttributeSet;)V @@ -719,6 +731,12 @@ .method public setNonPrimaryAlpha(F)V .locals 2 + .param p1 # F + .annotation build Landroid/support/annotation/FloatRange; + from = 0.0 + to = 1.0 + .end annotation + .end param const/high16 v0, 0x437f0000 # 255.0f @@ -731,9 +749,11 @@ .line 190 iput p1, p0, Landroid/support/v4/view/PagerTitleStrip;->mNonPrimaryAlpha:I + .line 191 + iget p1, p0, Landroid/support/v4/view/PagerTitleStrip;->mNonPrimaryAlpha:I + shl-int/lit8 p1, p1, 0x18 - .line 191 iget v0, p0, Landroid/support/v4/view/PagerTitleStrip;->mTextColor:I const v1, 0xffffff @@ -757,6 +777,10 @@ .method public setTextColor(I)V .locals 2 + .param p1 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param .line 203 iput p1, p0, Landroid/support/v4/view/PagerTitleStrip;->mTextColor:I diff --git a/smali/android/support/v4/view/PointerIconCompat.smali b/smali/android/support/v4/view/PointerIconCompat.smali index e017c8b6..a2284f4e 100644 --- a/smali/android/support/v4/view/PointerIconCompat.smali +++ b/smali/android/support/v4/view/PointerIconCompat.smali @@ -168,6 +168,11 @@ # virtual methods .method public getPointerIcon()Ljava/lang/Object; .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 116 iget-object v0, p0, Landroid/support/v4/view/PointerIconCompat;->mPointerIcon:Ljava/lang/Object; diff --git a/smali/android/support/v4/view/TintableBackgroundView.smali b/smali/android/support/v4/view/TintableBackgroundView.smali index c9a745fd..92809bd6 100644 --- a/smali/android/support/v4/view/TintableBackgroundView.smali +++ b/smali/android/support/v4/view/TintableBackgroundView.smali @@ -5,13 +5,25 @@ # virtual methods .method public abstract getSupportBackgroundTintList()Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method .method public abstract getSupportBackgroundTintMode()Landroid/graphics/PorterDuff$Mode; + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method .method public abstract setSupportBackgroundTintList(Landroid/content/res/ColorStateList;)V + .param p1 # Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .end method .method public abstract setSupportBackgroundTintMode(Landroid/graphics/PorterDuff$Mode;)V + .param p1 # Landroid/graphics/PorterDuff$Mode; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .end method diff --git a/smali/android/support/v4/view/ViewCompat$FocusDirection.smali b/smali/android/support/v4/view/ViewCompat$FocusDirection.smali index 80d5ada6..5f8a0abf 100644 --- a/smali/android/support/v4/view/ViewCompat$FocusDirection.smali +++ b/smali/android/support/v4/view/ViewCompat$FocusDirection.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/view/ViewCompat; .end annotation diff --git a/smali/android/support/v4/view/ViewCompat$FocusRealDirection.smali b/smali/android/support/v4/view/ViewCompat$FocusRealDirection.smali index bc7eab1b..4e4aeb18 100644 --- a/smali/android/support/v4/view/ViewCompat$FocusRealDirection.smali +++ b/smali/android/support/v4/view/ViewCompat$FocusRealDirection.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/view/ViewCompat; .end annotation diff --git a/smali/android/support/v4/view/ViewCompat$FocusRelativeDirection.smali b/smali/android/support/v4/view/ViewCompat$FocusRelativeDirection.smali index bb9b2a02..02364df3 100644 --- a/smali/android/support/v4/view/ViewCompat$FocusRelativeDirection.smali +++ b/smali/android/support/v4/view/ViewCompat$FocusRelativeDirection.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/view/ViewCompat; .end annotation diff --git a/smali/android/support/v4/view/ViewCompat$NestedScrollType.smali b/smali/android/support/v4/view/ViewCompat$NestedScrollType.smali index 10df5684..c10ee082 100644 --- a/smali/android/support/v4/view/ViewCompat$NestedScrollType.smali +++ b/smali/android/support/v4/view/ViewCompat$NestedScrollType.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/view/ViewCompat; .end annotation diff --git a/smali/android/support/v4/view/ViewCompat$OnUnhandledKeyEventListenerWrapper.smali b/smali/android/support/v4/view/ViewCompat$OnUnhandledKeyEventListenerWrapper.smali index 087eb808..87ef5221 100644 --- a/smali/android/support/v4/view/ViewCompat$OnUnhandledKeyEventListenerWrapper.smali +++ b/smali/android/support/v4/view/ViewCompat$OnUnhandledKeyEventListenerWrapper.smali @@ -7,6 +7,10 @@ # annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0x1c +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/view/ViewCompat; .end annotation diff --git a/smali/android/support/v4/view/ViewCompat$ScrollAxis.smali b/smali/android/support/v4/view/ViewCompat$ScrollAxis.smali index 42903e74..7b6edaf2 100644 --- a/smali/android/support/v4/view/ViewCompat$ScrollAxis.smali +++ b/smali/android/support/v4/view/ViewCompat$ScrollAxis.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/view/ViewCompat; .end annotation diff --git a/smali/android/support/v4/view/ViewCompat$ScrollIndicators.smali b/smali/android/support/v4/view/ViewCompat$ScrollIndicators.smali index ec3aeb81..28bd03a9 100644 --- a/smali/android/support/v4/view/ViewCompat$ScrollIndicators.smali +++ b/smali/android/support/v4/view/ViewCompat$ScrollIndicators.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/view/ViewCompat; .end annotation diff --git a/smali/android/support/v4/view/ViewCompat$UnhandledKeyEventManager.smali b/smali/android/support/v4/view/ViewCompat$UnhandledKeyEventManager.smali index 06fac12f..fe9e54c6 100644 --- a/smali/android/support/v4/view/ViewCompat$UnhandledKeyEventManager.smali +++ b/smali/android/support/v4/view/ViewCompat$UnhandledKeyEventManager.smali @@ -50,6 +50,9 @@ .end field .field private mViewsContainingListeners:Ljava/util/WeakHashMap; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "Ljava/util/WeakHashMap<", @@ -126,6 +129,8 @@ .method private dispatchInOrder(Landroid/view/View;Landroid/view/KeyEvent;)Landroid/view/View; .locals 4 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 3569 iget-object v0, p0, Landroid/support/v4/view/ViewCompat$UnhandledKeyEventManager;->mViewsContainingListeners:Ljava/util/WeakHashMap; @@ -230,6 +235,14 @@ .method private onUnhandledKeyEvent(Landroid/view/View;Landroid/view/KeyEvent;)Z .locals 4 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/KeyEvent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3628 sget v0, Landroid/support/compat/R$id;->tag_unhandled_key_listeners:I @@ -298,14 +311,16 @@ invoke-virtual {v0}, Ljava/util/ArrayList;->isEmpty()Z - move-result v1 + move-result v0 - if-eqz v1, :cond_1 + if-eqz v0, :cond_1 return-void .line 3674 :cond_1 + sget-object v0, Landroid/support/v4/view/ViewCompat$UnhandledKeyEventManager;->sViewsWithListeners:Ljava/util/ArrayList; + monitor-enter v0 .line 3675 @@ -323,7 +338,9 @@ .line 3678 :cond_2 - invoke-virtual {v0}, Ljava/util/ArrayList;->size()I + sget-object v1, Landroid/support/v4/view/ViewCompat$UnhandledKeyEventManager;->sViewsWithListeners:Ljava/util/ArrayList; + + invoke-virtual {v1}, Ljava/util/ArrayList;->size()I move-result v1 @@ -337,34 +354,36 @@ invoke-virtual {v2, v1}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; - move-result-object v3 + move-result-object v2 - check-cast v3, Ljava/lang/ref/WeakReference; + check-cast v2, Ljava/lang/ref/WeakReference; .line 3680 - invoke-virtual {v3}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object; + invoke-virtual {v2}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object; - move-result-object v3 + move-result-object v2 - check-cast v3, Landroid/view/View; + check-cast v2, Landroid/view/View; - if-nez v3, :cond_3 + if-nez v2, :cond_3 .line 3682 + sget-object v2, Landroid/support/v4/view/ViewCompat$UnhandledKeyEventManager;->sViewsWithListeners:Ljava/util/ArrayList; + invoke-virtual {v2, v1}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object; goto :goto_2 .line 3684 :cond_3 - iget-object v2, p0, Landroid/support/v4/view/ViewCompat$UnhandledKeyEventManager;->mViewsContainingListeners:Ljava/util/WeakHashMap; + iget-object v3, p0, Landroid/support/v4/view/ViewCompat$UnhandledKeyEventManager;->mViewsContainingListeners:Ljava/util/WeakHashMap; sget-object v4, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean; - invoke-virtual {v2, v3, v4}, Ljava/util/WeakHashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + invoke-virtual {v3, v2, v4}, Ljava/util/WeakHashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 3685 - invoke-virtual {v3}, Landroid/view/View;->getParent()Landroid/view/ViewParent; + invoke-virtual {v2}, Landroid/view/View;->getParent()Landroid/view/ViewParent; move-result-object v2 @@ -411,13 +430,9 @@ :try_end_0 .catchall {:try_start_0 .. :try_end_0} :catchall_0 - goto :goto_4 - - :goto_3 throw v1 - :goto_4 - goto :goto_3 + return-void .end method .method static registerListeningView(Landroid/view/View;)V @@ -430,7 +445,9 @@ .line 3647 :try_start_0 - invoke-virtual {v0}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator; + sget-object v1, Landroid/support/v4/view/ViewCompat$UnhandledKeyEventManager;->sViewsWithListeners:Ljava/util/ArrayList; + + invoke-virtual {v1}, Ljava/util/ArrayList;->iterator()Ljava/util/Iterator; move-result-object v1 @@ -481,17 +498,13 @@ :try_end_0 .catchall {:try_start_0 .. :try_end_0} :catchall_0 - goto :goto_1 - - :goto_0 throw p0 - :goto_1 - goto :goto_0 + return-void .end method .method static unregisterListeningView(Landroid/view/View;)V - .locals 4 + .locals 3 .line 3657 sget-object v0, Landroid/support/v4/view/ViewCompat$UnhandledKeyEventManager;->sViewsWithListeners:Ljava/util/ArrayList; @@ -507,25 +520,29 @@ invoke-virtual {v2}, Ljava/util/ArrayList;->size()I - move-result v3 + move-result v2 - if-ge v1, v3, :cond_1 + if-ge v1, v2, :cond_1 .line 3659 + sget-object v2, Landroid/support/v4/view/ViewCompat$UnhandledKeyEventManager;->sViewsWithListeners:Ljava/util/ArrayList; + invoke-virtual {v2, v1}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; - move-result-object v3 + move-result-object v2 - check-cast v3, Ljava/lang/ref/WeakReference; + check-cast v2, Ljava/lang/ref/WeakReference; - invoke-virtual {v3}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object; + invoke-virtual {v2}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object; - move-result-object v3 + move-result-object v2 - if-ne v3, p0, :cond_0 + if-ne v2, p0, :cond_0 .line 3660 - invoke-virtual {v2, v1}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object; + sget-object p0, Landroid/support/v4/view/ViewCompat$UnhandledKeyEventManager;->sViewsWithListeners:Ljava/util/ArrayList; + + invoke-virtual {p0, v1}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object; .line 3661 monitor-exit v0 @@ -550,13 +567,9 @@ :try_end_0 .catchall {:try_start_0 .. :try_end_0} :catchall_0 - goto :goto_2 - - :goto_1 throw p0 - :goto_2 - goto :goto_1 + return-void .end method diff --git a/smali/android/support/v4/view/ViewCompat.smali b/smali/android/support/v4/view/ViewCompat.smali index 1b85182c..6e5c9dc8 100644 --- a/smali/android/support/v4/view/ViewCompat.smali +++ b/smali/android/support/v4/view/ViewCompat.smali @@ -208,6 +208,14 @@ .method public static addKeyboardNavigationClusters(Landroid/view/View;Ljava/util/Collection;I)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/util/Collection; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -234,6 +242,14 @@ .method public static addOnUnhandledKeyEventListener(Landroid/view/View;Landroid/support/v4/view/ViewCompat$OnUnhandledKeyEventListenerCompat;)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/support/v4/view/ViewCompat$OnUnhandledKeyEventListenerCompat; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3402 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -323,6 +339,12 @@ .method public static animate(Landroid/view/View;)Landroid/support/v4/view/ViewPropertyAnimatorCompat; .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 1754 sget-object v0, Landroid/support/v4/view/ViewCompat;->sViewPropertyAnimatorMap:Ljava/util/WeakHashMap; @@ -445,6 +467,10 @@ .method public static cancelDragAndDrop(Landroid/view/View;)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3201 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -545,6 +571,10 @@ .method public static dispatchApplyWindowInsets(Landroid/view/View;Landroid/support/v4/view/WindowInsetsCompat;)Landroid/support/v4/view/WindowInsetsCompat; .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2259 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -586,6 +616,10 @@ .method public static dispatchFinishTemporaryDetach(Landroid/view/View;)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1609 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -616,10 +650,10 @@ const/4 v1, 0x0 + .line 1617 :try_start_0 new-array v1, v1, [Ljava/lang/Object; - .line 1617 invoke-virtual {v0, p0, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; :try_end_0 .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0 @@ -648,6 +682,10 @@ .method public static dispatchNestedFling(Landroid/view/View;FFZ)Z .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2779 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -686,6 +724,10 @@ .method public static dispatchNestedPreFling(Landroid/view/View;FF)Z .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2822 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -724,6 +766,18 @@ .method public static dispatchNestedPreScroll(Landroid/view/View;II[I[I)Z .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # [I + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p4 # [I + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 2597 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -762,6 +816,18 @@ .method public static dispatchNestedPreScroll(Landroid/view/View;II[I[II)Z .locals 7 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # [I + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p4 # [I + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 2749 instance-of v0, p0, Landroid/support/v4/view/NestedScrollingChild2; @@ -807,6 +873,14 @@ .method public static dispatchNestedScroll(Landroid/view/View;IIII[I)Z .locals 7 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p5 # [I + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 2566 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -857,6 +931,14 @@ .method public static dispatchNestedScroll(Landroid/view/View;IIII[II)Z .locals 8 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p5 # [I + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 2717 instance-of v0, p0, Landroid/support/v4/view/NestedScrollingChild2; @@ -904,6 +986,10 @@ .method public static dispatchStartTemporaryDetach(Landroid/view/View;)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1586 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -934,10 +1020,10 @@ const/4 v1, 0x0 + .line 1594 :try_start_0 new-array v1, v1, [Ljava/lang/Object; - .line 1594 invoke-virtual {v0, p0, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; :try_end_0 .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0 @@ -966,6 +1052,8 @@ .method static dispatchUnhandledKeyEventBeforeCallback(Landroid/view/View;Landroid/view/KeyEvent;)Z .locals 2 + .annotation build Landroid/support/annotation/UiThread; + .end annotation .line 3505 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -993,6 +1081,8 @@ .method static dispatchUnhandledKeyEventBeforeHierarchy(Landroid/view/View;Landroid/view/KeyEvent;)Z .locals 2 + .annotation build Landroid/support/annotation/UiThread; + .end annotation .line 3497 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1019,7 +1109,7 @@ .end method .method public static generateViewId()I - .locals 4 + .locals 3 .line 3379 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1041,29 +1131,35 @@ invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I - move-result v1 + move-result v0 - add-int/lit8 v2, v1, 0x1 + add-int/lit8 v1, v0, 0x1 - const v3, 0xffffff + const v2, 0xffffff - if-le v2, v3, :cond_1 + if-le v1, v2, :cond_1 - const/4 v2, 0x1 + const/4 v1, 0x1 .line 3387 :cond_1 - invoke-virtual {v0, v1, v2}, Ljava/util/concurrent/atomic/AtomicInteger;->compareAndSet(II)Z + sget-object v2, Landroid/support/v4/view/ViewCompat;->sNextGeneratedId:Ljava/util/concurrent/atomic/AtomicInteger; - move-result v0 + invoke-virtual {v2, v0, v1}, Ljava/util/concurrent/atomic/AtomicInteger;->compareAndSet(II)Z - if-eqz v0, :cond_0 + move-result v1 - return v1 + if-eqz v1, :cond_0 + + return v0 .end method .method public static getAccessibilityLiveRegion(Landroid/view/View;)I .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1475 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1087,6 +1183,10 @@ .method public static getAccessibilityNodeProvider(Landroid/view/View;)Landroid/support/v4/view/accessibility/AccessibilityNodeProviderCompat; .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1129 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1130,6 +1230,10 @@ .method public static getBackgroundTintList(Landroid/view/View;)Landroid/content/res/ColorStateList; .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2355 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1169,6 +1273,10 @@ .method public static getBackgroundTintMode(Landroid/view/View;)Landroid/graphics/PorterDuff$Mode; .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2400 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1208,6 +1316,12 @@ .method public static getClipBounds(Landroid/view/View;)Landroid/graphics/Rect; .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 3039 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1231,6 +1345,12 @@ .method public static getDisplay(Landroid/view/View;)Landroid/view/Display; .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 3160 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1282,6 +1402,10 @@ .method public static getElevation(Landroid/view/View;)F .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2038 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1349,6 +1473,10 @@ .method public static getFitsSystemWindows(Landroid/view/View;)Z .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2164 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1372,6 +1500,10 @@ .method public static getImportantForAccessibility(Landroid/view/View;)I .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 999 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1395,6 +1527,15 @@ .method public static getImportantForAutofill(Landroid/view/View;)I .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/annotation/SuppressLint; + value = { + "InlinedApi" + } + .end annotation .line 730 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1418,6 +1559,10 @@ .method public static getLabelFor(Landroid/view/View;)I .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1224 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1454,6 +1599,10 @@ .method public static getLayoutDirection(Landroid/view/View;)I .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1297 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1477,6 +1626,9 @@ .method public static getMatrix(Landroid/view/View;)Landroid/graphics/Matrix; .locals 0 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation runtime Ljava/lang/Deprecated; .end annotation @@ -1529,6 +1681,10 @@ .method public static getMinimumHeight(Landroid/view/View;)I .locals 3 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1720 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1565,6 +1721,8 @@ sput-object v1, Landroid/support/v4/view/ViewCompat;->sMinHeightField:Ljava/lang/reflect/Field; .line 1727 + sget-object v1, Landroid/support/v4/view/ViewCompat;->sMinHeightField:Ljava/lang/reflect/Field; + invoke-virtual {v1, v0}, Ljava/lang/reflect/Field;->setAccessible(Z)V :try_end_0 .catch Ljava/lang/NoSuchFieldException; {:try_start_0 .. :try_end_0} :catch_0 @@ -1604,6 +1762,10 @@ .method public static getMinimumWidth(Landroid/view/View;)I .locals 3 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1686 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1640,6 +1802,8 @@ sput-object v1, Landroid/support/v4/view/ViewCompat;->sMinWidthField:Ljava/lang/reflect/Field; .line 1693 + sget-object v1, Landroid/support/v4/view/ViewCompat;->sMinWidthField:Ljava/lang/reflect/Field; + invoke-virtual {v1, v0}, Ljava/lang/reflect/Field;->setAccessible(Z)V :try_end_0 .catch Ljava/lang/NoSuchFieldException; {:try_start_0 .. :try_end_0} :catch_0 @@ -1679,6 +1843,10 @@ .method public static getNextClusterForwardId(Landroid/view/View;)I .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3222 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1715,6 +1883,12 @@ .method public static getPaddingEnd(Landroid/view/View;)I .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Px; + .end annotation .line 1542 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1741,6 +1915,12 @@ .method public static getPaddingStart(Landroid/view/View;)I .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Px; + .end annotation .line 1526 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1767,6 +1947,10 @@ .method public static getParentForAccessibility(Landroid/view/View;)Landroid/view/ViewParent; .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1335 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1884,6 +2068,10 @@ .method public static getScrollIndicators(Landroid/view/View;)I .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3131 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1907,6 +2095,12 @@ .method public static getTransitionName(Landroid/view/View;)Ljava/lang/String; .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 2095 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1971,6 +2165,10 @@ .method public static getTranslationZ(Landroid/view/View;)F .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2059 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1994,6 +2192,10 @@ .method public static getWindowSystemUiVisibility(Landroid/view/View;)I .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2108 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -2043,6 +2245,10 @@ .method public static getZ(Landroid/view/View;)F .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2886 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -2066,6 +2272,10 @@ .method public static hasAccessibilityDelegate(Landroid/view/View;)Z .locals 4 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 856 sget-boolean v0, Landroid/support/v4/view/ViewCompat;->sAccessibilityDelegateCheckFailed:Z @@ -2098,14 +2308,16 @@ sput-object v0, Landroid/support/v4/view/ViewCompat;->sAccessibilityDelegateField:Ljava/lang/reflect/Field; .line 863 + sget-object v0, Landroid/support/v4/view/ViewCompat;->sAccessibilityDelegateField:Ljava/lang/reflect/Field; + invoke-virtual {v0, v2}, Ljava/lang/reflect/Field;->setAccessible(Z)V :try_end_0 - .catchall {:try_start_0 .. :try_end_0} :catchall_0 + .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0 goto :goto_0 .line 865 - :catchall_0 + :catch_0 sput-boolean v2, Landroid/support/v4/view/ViewCompat;->sAccessibilityDelegateCheckFailed:Z return v1 @@ -2120,7 +2332,7 @@ move-result-object p0 :try_end_1 - .catchall {:try_start_1 .. :try_end_1} :catchall_1 + .catch Ljava/lang/Throwable; {:try_start_1 .. :try_end_1} :catch_1 if-eqz p0, :cond_2 @@ -2130,7 +2342,7 @@ return v1 .line 872 - :catchall_1 + :catch_1 sput-boolean v2, Landroid/support/v4/view/ViewCompat;->sAccessibilityDelegateCheckFailed:Z return v1 @@ -2138,6 +2350,10 @@ .method public static hasExplicitFocusable(Landroid/view/View;)Z .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3366 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -2164,6 +2380,10 @@ .method public static hasNestedScrollingParent(Landroid/view/View;)Z .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2537 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -2202,6 +2422,10 @@ .method public static hasNestedScrollingParent(Landroid/view/View;I)Z .locals 1 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2682 instance-of v0, p0, Landroid/support/v4/view/NestedScrollingChild2; @@ -2234,6 +2458,10 @@ .method public static hasOnClickListeners(Landroid/view/View;)Z .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3061 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -2257,6 +2485,10 @@ .method public static hasOverlappingRendering(Landroid/view/View;)Z .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2315 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -2280,6 +2512,10 @@ .method public static hasTransientState(Landroid/view/View;)Z .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 886 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -2303,6 +2539,10 @@ .method public static isAttachedToWindow(Landroid/view/View;)Z .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3049 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -2339,6 +2579,10 @@ .method public static isFocusedByDefault(Landroid/view/View;)Z .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3277 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -2362,6 +2606,10 @@ .method public static isImportantForAccessibility(Landroid/view/View;)Z .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1077 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -2385,6 +2633,10 @@ .method public static isImportantForAutofill(Landroid/view/View;)Z .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 843 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -2408,6 +2660,10 @@ .method public static isInLayout(Landroid/view/View;)Z .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2844 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -2431,6 +2687,10 @@ .method public static isKeyboardNavigationCluster(Landroid/view/View;)Z .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3248 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -2454,6 +2714,10 @@ .method public static isLaidOut(Landroid/view/View;)Z .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2855 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -2496,6 +2760,10 @@ .method public static isLayoutDirectionResolved(Landroid/view/View;)Z .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2872 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -2519,6 +2787,10 @@ .method public static isNestedScrollingEnabled(Landroid/view/View;)Z .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2479 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -2570,6 +2842,10 @@ .method public static isPaddingRelative(Landroid/view/View;)Z .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2328 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -2604,6 +2880,10 @@ .method public static keyboardNavigationClusterSearch(Landroid/view/View;Landroid/view/View;I)Landroid/view/View; .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3314 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -2627,6 +2907,10 @@ .method public static offsetLeftAndRight(Landroid/view/View;I)V .locals 6 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2964 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -2763,6 +3047,10 @@ .method public static offsetTopAndBottom(Landroid/view/View;I)V .locals 6 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2916 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -2899,6 +3187,10 @@ .method public static onApplyWindowInsets(Landroid/view/View;Landroid/support/v4/view/WindowInsetsCompat;)Landroid/support/v4/view/WindowInsetsCompat; .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2234 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -2951,6 +3243,10 @@ .method public static onInitializeAccessibilityNodeInfo(Landroid/view/View;Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;)V .locals 0 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 650 invoke-virtual {p1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->unwrap()Landroid/view/accessibility/AccessibilityNodeInfo; @@ -2975,6 +3271,10 @@ .method public static performAccessibilityAction(Landroid/view/View;ILandroid/os/Bundle;)Z .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1099 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -2998,6 +3298,10 @@ .method public static postInvalidateOnAnimation(Landroid/view/View;)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 915 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -3021,6 +3325,10 @@ .method public static postInvalidateOnAnimation(Landroid/view/View;IIII)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 937 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -3044,6 +3352,10 @@ .method public static postOnAnimation(Landroid/view/View;Ljava/lang/Runnable;)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 955 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -3071,6 +3383,10 @@ .method public static postOnAnimationDelayed(Landroid/view/View;Ljava/lang/Runnable;J)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 977 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -3100,6 +3416,14 @@ .method public static removeOnUnhandledKeyEventListener(Landroid/view/View;Landroid/support/v4/view/ViewCompat$OnUnhandledKeyEventListenerCompat;)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/support/v4/view/ViewCompat$OnUnhandledKeyEventListenerCompat; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3439 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -3170,6 +3494,10 @@ .method public static requestApplyInsets(Landroid/view/View;)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2119 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -3201,6 +3529,17 @@ .method public static requireViewById(Landroid/view/View;I)Landroid/view/View; .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/IdRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "SDK_INT:I @@ -3287,6 +3630,10 @@ .method public static setAccessibilityDelegate(Landroid/view/View;Landroid/support/v4/view/AccessibilityDelegateCompat;)V .locals 0 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param if-nez p1, :cond_0 @@ -3308,6 +3655,10 @@ .method public static setAccessibilityLiveRegion(Landroid/view/View;I)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1511 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -3336,6 +3687,12 @@ .method public static setAlpha(Landroid/view/View;F)V .locals 0 + .param p1 # F + .annotation build Landroid/support/annotation/FloatRange; + from = 0.0 + to = 1.0 + .end annotation + .end param .annotation runtime Ljava/lang/Deprecated; .end annotation @@ -3347,6 +3704,14 @@ .method public static varargs setAutofillHints(Landroid/view/View;[Ljava/lang/String;)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # [Ljava/lang/String; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 709 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -3364,6 +3729,14 @@ .method public static setBackground(Landroid/view/View;Landroid/graphics/drawable/Drawable;)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 2341 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -3387,6 +3760,10 @@ .method public static setBackgroundTintList(Landroid/view/View;Landroid/content/res/ColorStateList;)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2371 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -3476,6 +3853,10 @@ .method public static setBackgroundTintMode(Landroid/view/View;Landroid/graphics/PorterDuff$Mode;)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2418 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -3667,6 +4048,10 @@ .method public static setClipBounds(Landroid/view/View;Landroid/graphics/Rect;)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3024 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -3684,6 +4069,10 @@ .method public static setElevation(Landroid/view/View;F)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2027 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -3712,6 +4101,10 @@ .method public static setFocusedByDefault(Landroid/view/View;Z)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3296 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -3729,6 +4122,10 @@ .method public static setHasTransientState(Landroid/view/View;Z)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 900 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -3746,6 +4143,10 @@ .method public static setImportantForAccessibility(Landroid/view/View;I)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1026 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -3784,6 +4185,10 @@ .method public static setImportantForAutofill(Landroid/view/View;I)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 774 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -3801,6 +4206,10 @@ .method public static setKeyboardNavigationCluster(Landroid/view/View;Z)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3262 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -3818,6 +4227,14 @@ .method public static setLabelFor(Landroid/view/View;I)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/IdRes; + .end annotation + .end param .line 1238 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -3835,6 +4252,10 @@ .method public static setLayerPaint(Landroid/view/View;Landroid/graphics/Paint;)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1274 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -3876,6 +4297,10 @@ .method public static setLayoutDirection(Landroid/view/View;I)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1321 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -3893,6 +4318,10 @@ .method public static setNestedScrollingEnabled(Landroid/view/View;Z)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2456 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -3924,6 +4353,10 @@ .method public static setNextClusterForwardId(Landroid/view/View;I)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3236 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -3941,6 +4374,10 @@ .method public static setOnApplyWindowInsetsListener(Landroid/view/View;Landroid/support/v4/view/OnApplyWindowInsetsListener;)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2203 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -3983,6 +4420,26 @@ .method public static setPaddingRelative(Landroid/view/View;IIII)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/Px; + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/Px; + .end annotation + .end param + .param p3 # I + .annotation build Landroid/support/annotation/Px; + .end annotation + .end param + .param p4 # I + .annotation build Landroid/support/annotation/Px; + .end annotation + .end param .line 1563 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -4028,6 +4485,10 @@ .method public static setPointerIcon(Landroid/view/View;Landroid/support/v4/view/PointerIconCompat;)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3142 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -4051,9 +4512,7 @@ :goto_0 check-cast p1, Landroid/view/PointerIcon; - move-object v0, p1 - - check-cast v0, Landroid/view/PointerIcon; + check-cast p1, Landroid/view/PointerIcon; .line 3143 invoke-virtual {p0, p1}, Landroid/view/View;->setPointerIcon(Landroid/view/PointerIcon;)V @@ -4130,6 +4589,10 @@ .method public static setScrollIndicators(Landroid/view/View;I)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3079 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -4147,6 +4610,10 @@ .method public static setScrollIndicators(Landroid/view/View;II)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3113 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -4164,6 +4631,14 @@ .method public static setTooltipText(Landroid/view/View;Ljava/lang/CharSequence;)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 3180 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -4181,6 +4656,10 @@ .method public static setTransitionName(Landroid/view/View;Ljava/lang/String;)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2073 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -4241,6 +4720,10 @@ .method public static setTranslationZ(Landroid/view/View;F)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2048 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -4280,6 +4763,10 @@ .method public static setZ(Landroid/view/View;F)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2905 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -4297,6 +4784,10 @@ .method public static startDragAndDrop(Landroid/view/View;Landroid/content/ClipData;Landroid/view/View$DragShadowBuilder;Ljava/lang/Object;I)Z .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3190 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -4323,6 +4814,10 @@ .method public static startNestedScroll(Landroid/view/View;I)Z .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2501 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -4361,6 +4856,10 @@ .method public static startNestedScroll(Landroid/view/View;II)Z .locals 1 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2648 instance-of v0, p0, Landroid/support/v4/view/NestedScrollingChild2; @@ -4394,6 +4893,10 @@ .method public static stopNestedScroll(Landroid/view/View;)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2520 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -4425,6 +4928,10 @@ .method public static stopNestedScroll(Landroid/view/View;I)V .locals 1 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2665 instance-of v0, p0, Landroid/support/v4/view/NestedScrollingChild2; @@ -4472,6 +4979,10 @@ .method public static updateDragShadow(Landroid/view/View;Landroid/view/View$DragShadowBuilder;)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 3210 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/view/ViewConfigurationCompat.smali b/smali/android/support/v4/view/ViewConfigurationCompat.smali index 52493901..aff9b05f 100644 --- a/smali/android/support/v4/view/ViewConfigurationCompat.smali +++ b/smali/android/support/v4/view/ViewConfigurationCompat.smali @@ -79,10 +79,10 @@ const/4 v1, 0x0 + .line 108 :try_start_0 new-array v1, v1, [Ljava/lang/Object; - .line 108 invoke-virtual {v0, p0, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; move-result-object p0 @@ -151,6 +151,14 @@ .method public static getScaledHorizontalScrollFactor(Landroid/view/ViewConfiguration;Landroid/content/Context;)F .locals 2 + .param p0 # Landroid/view/ViewConfiguration; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 81 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -218,6 +226,14 @@ .method public static getScaledVerticalScrollFactor(Landroid/view/ViewConfiguration;Landroid/content/Context;)F .locals 2 + .param p0 # Landroid/view/ViewConfiguration; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 98 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -257,6 +273,10 @@ .method public static shouldShowMenuShortcutsWhenKeyboardPresent(Landroid/view/ViewConfiguration;Landroid/content/Context;)Z .locals 2 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 141 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/view/ViewGroupCompat.smali b/smali/android/support/v4/view/ViewGroupCompat.smali index fe85e05c..c699dc17 100644 --- a/smali/android/support/v4/view/ViewGroupCompat.smali +++ b/smali/android/support/v4/view/ViewGroupCompat.smali @@ -21,6 +21,10 @@ .method public static getLayoutMode(Landroid/view/ViewGroup;)I .locals 2 + .param p0 # Landroid/view/ViewGroup; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 114 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -44,6 +48,10 @@ .method public static getNestedScrollAxes(Landroid/view/ViewGroup;)I .locals 2 + .param p0 # Landroid/view/ViewGroup; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 181 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -82,6 +90,10 @@ .method public static isTransitionGroup(Landroid/view/ViewGroup;)Z .locals 2 + .param p0 # Landroid/view/ViewGroup; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 157 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -161,6 +173,10 @@ .method public static setLayoutMode(Landroid/view/ViewGroup;I)V .locals 2 + .param p0 # Landroid/view/ViewGroup; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 130 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -189,6 +205,10 @@ .method public static setTransitionGroup(Landroid/view/ViewGroup;Z)V .locals 2 + .param p0 # Landroid/view/ViewGroup; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 144 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/view/ViewPager$OnAdapterChangeListener.smali b/smali/android/support/v4/view/ViewPager$OnAdapterChangeListener.smali index 3cc7e35a..fc8e50b0 100644 --- a/smali/android/support/v4/view/ViewPager$OnAdapterChangeListener.smali +++ b/smali/android/support/v4/view/ViewPager$OnAdapterChangeListener.smali @@ -16,4 +16,16 @@ # virtual methods .method public abstract onAdapterChanged(Landroid/support/v4/view/ViewPager;Landroid/support/v4/view/PagerAdapter;Landroid/support/v4/view/PagerAdapter;)V + .param p1 # Landroid/support/v4/view/ViewPager; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v4/view/PagerAdapter; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # Landroid/support/v4/view/PagerAdapter; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .end method diff --git a/smali/android/support/v4/view/ViewPager$OnPageChangeListener.smali b/smali/android/support/v4/view/ViewPager$OnPageChangeListener.smali index e2cee79c..4b803713 100644 --- a/smali/android/support/v4/view/ViewPager$OnPageChangeListener.smali +++ b/smali/android/support/v4/view/ViewPager$OnPageChangeListener.smali @@ -19,6 +19,10 @@ .end method .method public abstract onPageScrolled(IFI)V + .param p3 # I + .annotation build Landroid/support/annotation/Px; + .end annotation + .end param .end method .method public abstract onPageSelected(I)V diff --git a/smali/android/support/v4/view/ViewPager$PageTransformer.smali b/smali/android/support/v4/view/ViewPager$PageTransformer.smali index 71290677..390868df 100644 --- a/smali/android/support/v4/view/ViewPager$PageTransformer.smali +++ b/smali/android/support/v4/view/ViewPager$PageTransformer.smali @@ -16,4 +16,8 @@ # virtual methods .method public abstract transformPage(Landroid/view/View;F)V + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method diff --git a/smali/android/support/v4/view/ViewPager$SavedState.smali b/smali/android/support/v4/view/ViewPager$SavedState.smali index 164bdc0f..05c9dad7 100644 --- a/smali/android/support/v4/view/ViewPager$SavedState.smali +++ b/smali/android/support/v4/view/ViewPager$SavedState.smali @@ -88,6 +88,10 @@ .method public constructor (Landroid/os/Parcelable;)V .locals 0 + .param p1 # Landroid/os/Parcelable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1395 invoke-direct {p0, p1}, Landroid/support/v4/view/AbsSavedState;->(Landroid/os/Parcelable;)V diff --git a/smali/android/support/v4/view/ViewPager.smali b/smali/android/support/v4/view/ViewPager.smali index 85ec62c2..ec1fc969 100644 --- a/smali/android/support/v4/view/ViewPager.smali +++ b/smali/android/support/v4/view/ViewPager.smali @@ -225,6 +225,7 @@ const/4 v0, 0x1 + .line 122 new-array v0, v0, [I const/4 v1, 0x0 @@ -233,7 +234,6 @@ aput v2, v0, v1 - .line 122 sput-object v0, Landroid/support/v4/view/ViewPager;->LAYOUT_ATTRS:[I .line 140 @@ -262,6 +262,10 @@ .method public constructor (Landroid/content/Context;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 391 invoke-direct {p0, p1}, Landroid/view/ViewGroup;->(Landroid/content/Context;)V @@ -344,6 +348,14 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V .locals 0 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 396 invoke-direct {p0, p1, p2}, Landroid/view/ViewGroup;->(Landroid/content/Context;Landroid/util/AttributeSet;)V @@ -958,7 +970,9 @@ :cond_2 iput-boolean v2, p0, Landroid/support/v4/view/ViewPager;->mPopulatePending:Z - const/4 v3, 0x0 + move v3, v0 + + const/4 v0, 0x0 .line 1994 :goto_1 @@ -968,12 +982,12 @@ move-result v4 - if-ge v3, v4, :cond_4 + if-ge v0, v4, :cond_4 .line 1995 iget-object v4, p0, Landroid/support/v4/view/ViewPager;->mItems:Ljava/util/ArrayList; - invoke-virtual {v4, v3}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v4, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; move-result-object v4 @@ -987,15 +1001,15 @@ .line 1998 iput-boolean v2, v4, Landroid/support/v4/view/ViewPager$ItemInfo;->scrolling:Z - const/4 v0, 0x1 + const/4 v3, 0x1 :cond_3 - add-int/lit8 v3, v3, 0x1 + add-int/lit8 v0, v0, 0x1 goto :goto_1 :cond_4 - if-eqz v0, :cond_6 + if-eqz v3, :cond_6 if-eqz p1, :cond_5 @@ -1548,15 +1562,15 @@ int-to-float v0, v0 - div-float/2addr v3, v0 + div-float v0, v3, v0 goto :goto_1 :cond_1 - const/4 v3, 0x0 + const/4 v0, 0x0 :goto_1 - const/4 v0, 0x0 + const/4 v3, 0x0 const/4 v4, 0x0 @@ -1564,13 +1578,15 @@ const/4 v6, 0x1 - const/4 v5, 0x0 + const/4 v1, 0x0 + + const/4 v5, 0x1 const/4 v7, -0x1 const/4 v8, 0x0 - const/4 v9, 0x1 + const/4 v9, 0x0 .line 2372 :goto_2 @@ -1580,18 +1596,18 @@ move-result v10 - if-ge v8, v10, :cond_7 + if-ge v1, v10, :cond_7 .line 2373 iget-object v10, p0, Landroid/support/v4/view/ViewPager;->mItems:Ljava/util/ArrayList; - invoke-virtual {v10, v8}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v10, v1}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; move-result-object v10 check-cast v10, Landroid/support/v4/view/ViewPager$ItemInfo; - if-nez v9, :cond_2 + if-nez v5, :cond_2 .line 2375 iget v11, v10, Landroid/support/v4/view/ViewPager$ItemInfo;->position:I @@ -1603,67 +1619,67 @@ .line 2377 iget-object v10, p0, Landroid/support/v4/view/ViewPager;->mTempItem:Landroid/support/v4/view/ViewPager$ItemInfo; - add-float/2addr v1, v5 + add-float/2addr v8, v9 - add-float/2addr v1, v3 + add-float/2addr v8, v0 .line 2378 - iput v1, v10, Landroid/support/v4/view/ViewPager$ItemInfo;->offset:F + iput v8, v10, Landroid/support/v4/view/ViewPager$ItemInfo;->offset:F .line 2379 iput v7, v10, Landroid/support/v4/view/ViewPager$ItemInfo;->position:I .line 2380 - iget-object v1, p0, Landroid/support/v4/view/ViewPager;->mAdapter:Landroid/support/v4/view/PagerAdapter; + iget-object v7, p0, Landroid/support/v4/view/ViewPager;->mAdapter:Landroid/support/v4/view/PagerAdapter; - iget v5, v10, Landroid/support/v4/view/ViewPager$ItemInfo;->position:I + iget v8, v10, Landroid/support/v4/view/ViewPager$ItemInfo;->position:I - invoke-virtual {v1, v5}, Landroid/support/v4/view/PagerAdapter;->getPageWidth(I)F + invoke-virtual {v7, v8}, Landroid/support/v4/view/PagerAdapter;->getPageWidth(I)F - move-result v1 + move-result v7 - iput v1, v10, Landroid/support/v4/view/ViewPager$ItemInfo;->widthFactor:F + iput v7, v10, Landroid/support/v4/view/ViewPager$ItemInfo;->widthFactor:F - add-int/lit8 v8, v8, -0x1 + add-int/lit8 v1, v1, -0x1 .line 2383 :cond_2 - iget v1, v10, Landroid/support/v4/view/ViewPager$ItemInfo;->offset:F + iget v8, v10, Landroid/support/v4/view/ViewPager$ItemInfo;->offset:F .line 2386 - iget v5, v10, Landroid/support/v4/view/ViewPager$ItemInfo;->widthFactor:F + iget v7, v10, Landroid/support/v4/view/ViewPager$ItemInfo;->widthFactor:F - add-float/2addr v5, v1 + add-float/2addr v7, v8 - add-float/2addr v5, v3 + add-float/2addr v7, v0 - if-nez v9, :cond_4 + if-nez v5, :cond_4 - cmpl-float v7, v2, v1 + cmpl-float v5, v2, v8 - if-ltz v7, :cond_3 + if-ltz v5, :cond_3 goto :goto_3 :cond_3 - return-object v0 + return-object v3 :cond_4 :goto_3 - cmpg-float v0, v2, v5 + cmpg-float v3, v2, v7 - if-ltz v0, :cond_6 + if-ltz v3, :cond_6 .line 2388 - iget-object v0, p0, Landroid/support/v4/view/ViewPager;->mItems:Ljava/util/ArrayList; + iget-object v3, p0, Landroid/support/v4/view/ViewPager;->mItems:Ljava/util/ArrayList; - invoke-virtual {v0}, Ljava/util/ArrayList;->size()I + invoke-virtual {v3}, Ljava/util/ArrayList;->size()I - move-result v0 + move-result v3 - sub-int/2addr v0, v6 + sub-int/2addr v3, v6 - if-ne v8, v0, :cond_5 + if-ne v1, v3, :cond_5 goto :goto_4 @@ -1672,13 +1688,13 @@ iget v7, v10, Landroid/support/v4/view/ViewPager$ItemInfo;->position:I .line 2397 - iget v5, v10, Landroid/support/v4/view/ViewPager$ItemInfo;->widthFactor:F + iget v9, v10, Landroid/support/v4/view/ViewPager$ItemInfo;->widthFactor:F - add-int/lit8 v8, v8, 0x1 + add-int/lit8 v1, v1, 0x1 - move-object v0, v10 + move-object v3, v10 - const/4 v9, 0x0 + const/4 v5, 0x0 goto :goto_2 @@ -1687,11 +1703,15 @@ return-object v10 :cond_7 - return-object v0 + return-object v3 .end method .method private static isDecorView(Landroid/view/View;)Z .locals 1 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1498 invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class; @@ -2750,6 +2770,10 @@ .method public addOnAdapterChangeListener(Landroid/support/v4/view/ViewPager$OnAdapterChangeListener;)V .locals 1 + .param p1 # Landroid/support/v4/view/ViewPager$OnAdapterChangeListener; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 581 iget-object v0, p0, Landroid/support/v4/view/ViewPager;->mAdapterChangeListeners:Ljava/util/List; @@ -2774,6 +2798,10 @@ .method public addOnPageChangeListener(Landroid/support/v4/view/ViewPager$OnPageChangeListener;)V .locals 1 + .param p1 # Landroid/support/v4/view/ViewPager$OnPageChangeListener; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 723 iget-object v0, p0, Landroid/support/v4/view/ViewPager;->mOnPageChangeListeners:Ljava/util/List; @@ -2947,10 +2975,7 @@ if-ne v0, p0, :cond_0 - :goto_0 - move-object v0, v3 - - goto :goto_4 + goto :goto_3 :cond_0 if-eqz v0, :cond_4 @@ -2960,7 +2985,7 @@ move-result-object v4 - :goto_1 + :goto_0 instance-of v5, v4, Landroid/view/ViewGroup; if-eqz v5, :cond_2 @@ -2969,7 +2994,7 @@ const/4 v4, 0x1 - goto :goto_2 + goto :goto_1 .line 2799 :cond_1 @@ -2977,12 +3002,12 @@ move-result-object v4 - goto :goto_1 + goto :goto_0 :cond_2 const/4 v4, 0x0 - :goto_2 + :goto_1 if-nez v4, :cond_4 .line 2807 @@ -3006,7 +3031,7 @@ move-result-object v0 - :goto_3 + :goto_2 instance-of v5, v0, Landroid/view/ViewGroup; if-eqz v5, :cond_3 @@ -3031,7 +3056,7 @@ move-result-object v0 - goto :goto_3 + goto :goto_2 .line 2813 :cond_3 @@ -3059,33 +3084,35 @@ .line 2813 invoke-static {v4, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I - goto :goto_0 + goto :goto_3 - .line 2821 :cond_4 - :goto_4 + move-object v3, v0 + + .line 2821 + :goto_3 invoke-static {}, Landroid/view/FocusFinder;->getInstance()Landroid/view/FocusFinder; - move-result-object v3 + move-result-object v0 - invoke-virtual {v3, p0, v0, p1}, Landroid/view/FocusFinder;->findNextFocus(Landroid/view/ViewGroup;Landroid/view/View;I)Landroid/view/View; + invoke-virtual {v0, p0, v3, p1}, Landroid/view/FocusFinder;->findNextFocus(Landroid/view/ViewGroup;Landroid/view/View;I)Landroid/view/View; - move-result-object v3 + move-result-object v0 const/16 v4, 0x42 const/16 v5, 0x11 - if-eqz v3, :cond_8 + if-eqz v0, :cond_8 - if-eq v3, v0, :cond_8 + if-eq v0, v3, :cond_8 if-ne p1, v5, :cond_6 .line 2827 iget-object v1, p0, Landroid/support/v4/view/ViewPager;->mTempRect:Landroid/graphics/Rect; - invoke-direct {p0, v1, v3}, Landroid/support/v4/view/ViewPager;->getChildRectInPagerCoordinates(Landroid/graphics/Rect;Landroid/view/View;)Landroid/graphics/Rect; + invoke-direct {p0, v1, v0}, Landroid/support/v4/view/ViewPager;->getChildRectInPagerCoordinates(Landroid/graphics/Rect;Landroid/view/View;)Landroid/graphics/Rect; move-result-object v1 @@ -3094,13 +3121,13 @@ .line 2828 iget-object v2, p0, Landroid/support/v4/view/ViewPager;->mTempRect:Landroid/graphics/Rect; - invoke-direct {p0, v2, v0}, Landroid/support/v4/view/ViewPager;->getChildRectInPagerCoordinates(Landroid/graphics/Rect;Landroid/view/View;)Landroid/graphics/Rect; + invoke-direct {p0, v2, v3}, Landroid/support/v4/view/ViewPager;->getChildRectInPagerCoordinates(Landroid/graphics/Rect;Landroid/view/View;)Landroid/graphics/Rect; move-result-object v2 iget v2, v2, Landroid/graphics/Rect;->left:I - if-eqz v0, :cond_5 + if-eqz v3, :cond_5 if-lt v1, v2, :cond_5 @@ -3109,18 +3136,18 @@ move-result v0 - goto :goto_5 + goto :goto_4 .line 2832 :cond_5 - invoke-virtual {v3}, Landroid/view/View;->requestFocus()Z + invoke-virtual {v0}, Landroid/view/View;->requestFocus()Z move-result v0 - :goto_5 + :goto_4 move v2, v0 - goto :goto_7 + goto :goto_6 :cond_6 if-ne p1, v4, :cond_c @@ -3128,7 +3155,7 @@ .line 2837 iget-object v1, p0, Landroid/support/v4/view/ViewPager;->mTempRect:Landroid/graphics/Rect; - invoke-direct {p0, v1, v3}, Landroid/support/v4/view/ViewPager;->getChildRectInPagerCoordinates(Landroid/graphics/Rect;Landroid/view/View;)Landroid/graphics/Rect; + invoke-direct {p0, v1, v0}, Landroid/support/v4/view/ViewPager;->getChildRectInPagerCoordinates(Landroid/graphics/Rect;Landroid/view/View;)Landroid/graphics/Rect; move-result-object v1 @@ -3137,13 +3164,13 @@ .line 2838 iget-object v2, p0, Landroid/support/v4/view/ViewPager;->mTempRect:Landroid/graphics/Rect; - invoke-direct {p0, v2, v0}, Landroid/support/v4/view/ViewPager;->getChildRectInPagerCoordinates(Landroid/graphics/Rect;Landroid/view/View;)Landroid/graphics/Rect; + invoke-direct {p0, v2, v3}, Landroid/support/v4/view/ViewPager;->getChildRectInPagerCoordinates(Landroid/graphics/Rect;Landroid/view/View;)Landroid/graphics/Rect; move-result-object v2 iget v2, v2, Landroid/graphics/Rect;->left:I - if-eqz v0, :cond_7 + if-eqz v3, :cond_7 if-gt v1, v2, :cond_7 @@ -3152,22 +3179,22 @@ move-result v0 - goto :goto_5 + goto :goto_4 .line 2842 :cond_7 - invoke-virtual {v3}, Landroid/view/View;->requestFocus()Z + invoke-virtual {v0}, Landroid/view/View;->requestFocus()Z move-result v0 - goto :goto_5 + goto :goto_4 :cond_8 if-eq p1, v5, :cond_b if-ne p1, v1, :cond_9 - goto :goto_6 + goto :goto_5 :cond_9 if-eq p1, v4, :cond_a @@ -3182,17 +3209,17 @@ move-result v2 - goto :goto_7 + goto :goto_6 .line 2847 :cond_b - :goto_6 + :goto_5 invoke-virtual {p0}, Landroid/support/v4/view/ViewPager;->pageLeft()Z move-result v2 :cond_c - :goto_7 + :goto_6 if-eqz v2, :cond_d .line 2853 @@ -3662,9 +3689,13 @@ :goto_0 iget v2, p0, Landroid/support/v4/view/ViewPager;->mCurItem:I - const/4 v5, 0x0 + move v5, v1 - const/4 v6, 0x0 + move v6, v2 + + const/4 v1, 0x0 + + const/4 v2, 0x0 .line 1030 :goto_1 @@ -3674,12 +3705,12 @@ move-result v7 - if-ge v5, v7, :cond_7 + if-ge v1, v7, :cond_7 .line 1031 iget-object v7, p0, Landroid/support/v4/view/ViewPager;->mItems:Ljava/util/ArrayList; - invoke-virtual {v7, v5}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v7, v1}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; move-result-object v7 @@ -3706,56 +3737,56 @@ if-ne v8, v9, :cond_4 .line 1039 - iget-object v1, p0, Landroid/support/v4/view/ViewPager;->mItems:Ljava/util/ArrayList; + iget-object v5, p0, Landroid/support/v4/view/ViewPager;->mItems:Ljava/util/ArrayList; - invoke-virtual {v1, v5}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object; + invoke-virtual {v5, v1}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object; - add-int/lit8 v5, v5, -0x1 + add-int/lit8 v1, v1, -0x1 - if-nez v6, :cond_2 + if-nez v2, :cond_2 .line 1043 - iget-object v1, p0, Landroid/support/v4/view/ViewPager;->mAdapter:Landroid/support/v4/view/PagerAdapter; + iget-object v2, p0, Landroid/support/v4/view/ViewPager;->mAdapter:Landroid/support/v4/view/PagerAdapter; - invoke-virtual {v1, p0}, Landroid/support/v4/view/PagerAdapter;->startUpdate(Landroid/view/ViewGroup;)V + invoke-virtual {v2, p0}, Landroid/support/v4/view/PagerAdapter;->startUpdate(Landroid/view/ViewGroup;)V - const/4 v6, 0x1 + const/4 v2, 0x1 .line 1047 :cond_2 - iget-object v1, p0, Landroid/support/v4/view/ViewPager;->mAdapter:Landroid/support/v4/view/PagerAdapter; + iget-object v5, p0, Landroid/support/v4/view/ViewPager;->mAdapter:Landroid/support/v4/view/PagerAdapter; iget v8, v7, Landroid/support/v4/view/ViewPager$ItemInfo;->position:I iget-object v9, v7, Landroid/support/v4/view/ViewPager$ItemInfo;->object:Ljava/lang/Object; - invoke-virtual {v1, p0, v8, v9}, Landroid/support/v4/view/PagerAdapter;->destroyItem(Landroid/view/ViewGroup;ILjava/lang/Object;)V + invoke-virtual {v5, p0, v8, v9}, Landroid/support/v4/view/PagerAdapter;->destroyItem(Landroid/view/ViewGroup;ILjava/lang/Object;)V .line 1050 - iget v1, p0, Landroid/support/v4/view/ViewPager;->mCurItem:I + iget v5, p0, Landroid/support/v4/view/ViewPager;->mCurItem:I iget v7, v7, Landroid/support/v4/view/ViewPager$ItemInfo;->position:I - if-ne v1, v7, :cond_3 + if-ne v5, v7, :cond_3 .line 1052 - iget v1, p0, Landroid/support/v4/view/ViewPager;->mCurItem:I + iget v5, p0, Landroid/support/v4/view/ViewPager;->mCurItem:I - add-int/lit8 v2, v0, -0x1 + add-int/lit8 v6, v0, -0x1 - invoke-static {v1, v2}, Ljava/lang/Math;->min(II)I + invoke-static {v5, v6}, Ljava/lang/Math;->min(II)I - move-result v1 + move-result v5 - invoke-static {v4, v1}, Ljava/lang/Math;->max(II)I + invoke-static {v4, v5}, Ljava/lang/Math;->max(II)I - move-result v1 + move-result v5 - move v2, v1 + move v6, v5 :cond_3 :goto_2 - const/4 v1, 0x1 + const/4 v5, 0x1 goto :goto_3 @@ -3766,13 +3797,13 @@ if-eq v9, v8, :cond_6 .line 1059 - iget v1, v7, Landroid/support/v4/view/ViewPager$ItemInfo;->position:I + iget v5, v7, Landroid/support/v4/view/ViewPager$ItemInfo;->position:I iget v9, p0, Landroid/support/v4/view/ViewPager;->mCurItem:I - if-ne v1, v9, :cond_5 + if-ne v5, v9, :cond_5 - move v2, v8 + move v6, v8 .line 1064 :cond_5 @@ -3782,12 +3813,12 @@ :cond_6 :goto_3 - add-int/2addr v5, v3 + add-int/2addr v1, v3 goto :goto_1 :cond_7 - if-eqz v6, :cond_8 + if-eqz v2, :cond_8 .line 1070 iget-object v0, p0, Landroid/support/v4/view/ViewPager;->mAdapter:Landroid/support/v4/view/PagerAdapter; @@ -3798,11 +3829,11 @@ :cond_8 iget-object v0, p0, Landroid/support/v4/view/ViewPager;->mItems:Ljava/util/ArrayList; - sget-object v5, Landroid/support/v4/view/ViewPager;->COMPARATOR:Ljava/util/Comparator; + sget-object v1, Landroid/support/v4/view/ViewPager;->COMPARATOR:Ljava/util/Comparator; - invoke-static {v0, v5}, Ljava/util/Collections;->sort(Ljava/util/List;Ljava/util/Comparator;)V + invoke-static {v0, v1}, Ljava/util/Collections;->sort(Ljava/util/List;Ljava/util/Comparator;)V - if-eqz v1, :cond_b + if-eqz v5, :cond_b .line 1077 invoke-virtual {p0}, Landroid/support/v4/view/ViewPager;->getChildCount()I @@ -3817,24 +3848,24 @@ .line 1079 invoke-virtual {p0, v1}, Landroid/support/v4/view/ViewPager;->getChildAt(I)Landroid/view/View; - move-result-object v5 + move-result-object v2 .line 1080 - invoke-virtual {v5}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams; + invoke-virtual {v2}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams; - move-result-object v5 + move-result-object v2 - check-cast v5, Landroid/support/v4/view/ViewPager$LayoutParams; + check-cast v2, Landroid/support/v4/view/ViewPager$LayoutParams; .line 1081 - iget-boolean v6, v5, Landroid/support/v4/view/ViewPager$LayoutParams;->isDecor:Z + iget-boolean v5, v2, Landroid/support/v4/view/ViewPager$LayoutParams;->isDecor:Z - if-nez v6, :cond_9 + if-nez v5, :cond_9 - const/4 v6, 0x0 + const/4 v5, 0x0 .line 1082 - iput v6, v5, Landroid/support/v4/view/ViewPager$LayoutParams;->widthFactor:F + iput v5, v2, Landroid/support/v4/view/ViewPager$LayoutParams;->widthFactor:F :cond_9 add-int/lit8 v1, v1, 0x1 @@ -3843,7 +3874,7 @@ .line 1086 :cond_a - invoke-virtual {p0, v2, v4, v3}, Landroid/support/v4/view/ViewPager;->setCurrentItemInternal(IZZ)V + invoke-virtual {p0, v6, v4, v3}, Landroid/support/v4/view/ViewPager;->setCurrentItemInternal(IZZ)V .line 1087 invoke-virtual {p0}, Landroid/support/v4/view/ViewPager;->requestLayout()V @@ -4344,6 +4375,10 @@ .method public executeKeyEvent(Landroid/view/KeyEvent;)Z .locals 3 + .param p1 # Landroid/view/KeyEvent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2757 invoke-virtual {p1}, Landroid/view/KeyEvent;->getAction()I @@ -4688,6 +4723,8 @@ .method public getAdapter()Landroid/support/v4/view/PagerAdapter; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 572 iget-object v0, p0, Landroid/support/v4/view/ViewPager;->mAdapter:Landroid/support/v4/view/PagerAdapter; @@ -5477,19 +5514,19 @@ :cond_6 iget v0, v6, Landroid/support/v4/view/ViewPager;->mTouchSlop:I - int-to-float v1, v0 + int-to-float v0, v0 - cmpl-float v1, v12, v1 + cmpl-float v0, v12, v0 - if-lez v1, :cond_8 + if-lez v0, :cond_8 - const/high16 v1, 0x3f000000 # 0.5f + const/high16 v0, 0x3f000000 # 0.5f - mul-float v12, v12, v1 + mul-float v12, v12, v0 - cmpl-float v1, v12, v14 + cmpl-float v0, v12, v14 - if-lez v1, :cond_8 + if-lez v0, :cond_8 .line 2089 iput-boolean v9, v6, Landroid/support/v4/view/ViewPager;->mIsBeingDragged:Z @@ -5535,7 +5572,10 @@ goto :goto_1 + .line 2096 :cond_8 + iget v0, v6, Landroid/support/v4/view/ViewPager;->mTouchSlop:I + int-to-float v0, v0 cmpl-float v0, v14, v0 @@ -5730,17 +5770,23 @@ move-result v8 - const/4 v10, 0x0 + move v10, v7 const/4 v11, 0x0 + move v7, v5 + + move v5, v4 + + const/4 v4, 0x0 + :goto_0 const/16 v12, 0x8 - if-ge v10, v1, :cond_7 + if-ge v4, v1, :cond_7 .line 1696 - invoke-virtual {v0, v10}, Landroid/support/v4/view/ViewPager;->getChildAt(I)Landroid/view/View; + invoke-virtual {v0, v4}, Landroid/support/v4/view/ViewPager;->getChildAt(I)Landroid/view/View; move-result-object v13 @@ -5785,9 +5831,9 @@ if-eq v14, v15, :cond_0 - move v14, v4 + move v14, v5 - goto :goto_2 + goto :goto_1 :cond_0 sub-int v14, v2, v6 @@ -5814,9 +5860,15 @@ move-result v14 - add-int/2addr v14, v4 + add-int/2addr v14, v5 - goto :goto_2 + move/from16 v17, v14 + + move v14, v5 + + move/from16 v5, v17 + + goto :goto_1 .line 1713 :cond_2 @@ -5828,18 +5880,11 @@ div-int/lit8 v14, v14, 0x2 - invoke-static {v14, v4}, Ljava/lang/Math;->max(II)I + invoke-static {v14, v5}, Ljava/lang/Math;->max(II)I move-result v14 :goto_1 - move/from16 v17, v14 - - move v14, v4 - - move/from16 v4, v17 - - :goto_2 const/16 v15, 0x10 if-eq v12, v15, :cond_5 @@ -5852,12 +5897,12 @@ if-eq v12, v15, :cond_3 - move v12, v5 + move v12, v7 - goto :goto_4 + goto :goto_2 :cond_3 - sub-int v12, v3, v7 + sub-int v12, v3, v10 .line 1734 invoke-virtual {v13}, Landroid/view/View;->getMeasuredHeight()I @@ -5871,9 +5916,9 @@ move-result v15 - add-int/2addr v7, v15 + add-int/2addr v10, v15 - goto :goto_3 + goto :goto_2 .line 1727 :cond_4 @@ -5881,9 +5926,15 @@ move-result v12 - add-int/2addr v12, v5 + add-int/2addr v12, v7 - goto :goto_4 + move/from16 v17, v12 + + move v12, v7 + + move/from16 v7, v17 + + goto :goto_2 .line 1730 :cond_5 @@ -5895,125 +5946,114 @@ div-int/lit8 v12, v12, 0x2 - invoke-static {v12, v5}, Ljava/lang/Math;->max(II)I + invoke-static {v12, v7}, Ljava/lang/Math;->max(II)I move-result v12 - :goto_3 - move/from16 v17, v12 - - move v12, v5 - - move/from16 v5, v17 - - :goto_4 - add-int/2addr v4, v8 + :goto_2 + add-int/2addr v14, v8 .line 1740 invoke-virtual {v13}, Landroid/view/View;->getMeasuredWidth()I move-result v15 - add-int/2addr v15, v4 + add-int/2addr v15, v14 .line 1741 invoke-virtual {v13}, Landroid/view/View;->getMeasuredHeight()I move-result v16 - add-int v9, v5, v16 + add-int v9, v12, v16 .line 1739 - invoke-virtual {v13, v4, v5, v15, v9}, Landroid/view/View;->layout(IIII)V + invoke-virtual {v13, v14, v12, v15, v9}, Landroid/view/View;->layout(IIII)V add-int/lit8 v11, v11, 0x1 - move v5, v12 - - move v4, v14 - :cond_6 - add-int/lit8 v10, v10, 0x1 + add-int/lit8 v4, v4, 0x1 goto/16 :goto_0 :cond_7 - sub-int/2addr v2, v4 + sub-int/2addr v2, v5 sub-int/2addr v2, v6 - const/4 v6, 0x0 + const/4 v4, 0x0 - :goto_5 - if-ge v6, v1, :cond_a + :goto_3 + if-ge v4, v1, :cond_a .line 1750 - invoke-virtual {v0, v6}, Landroid/support/v4/view/ViewPager;->getChildAt(I)Landroid/view/View; + invoke-virtual {v0, v4}, Landroid/support/v4/view/ViewPager;->getChildAt(I)Landroid/view/View; - move-result-object v8 + move-result-object v6 .line 1751 - invoke-virtual {v8}, Landroid/view/View;->getVisibility()I + invoke-virtual {v6}, Landroid/view/View;->getVisibility()I - move-result v9 + move-result v8 - if-eq v9, v12, :cond_9 + if-eq v8, v12, :cond_9 .line 1752 - invoke-virtual {v8}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams; + invoke-virtual {v6}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams; - move-result-object v9 + move-result-object v8 - check-cast v9, Landroid/support/v4/view/ViewPager$LayoutParams; + check-cast v8, Landroid/support/v4/view/ViewPager$LayoutParams; .line 1754 - iget-boolean v10, v9, Landroid/support/v4/view/ViewPager$LayoutParams;->isDecor:Z + iget-boolean v9, v8, Landroid/support/v4/view/ViewPager$LayoutParams;->isDecor:Z - if-nez v10, :cond_9 + if-nez v9, :cond_9 - invoke-virtual {v0, v8}, Landroid/support/v4/view/ViewPager;->infoForChild(Landroid/view/View;)Landroid/support/v4/view/ViewPager$ItemInfo; + invoke-virtual {v0, v6}, Landroid/support/v4/view/ViewPager;->infoForChild(Landroid/view/View;)Landroid/support/v4/view/ViewPager$ItemInfo; - move-result-object v10 + move-result-object v9 - if-eqz v10, :cond_9 + if-eqz v9, :cond_9 int-to-float v13, v2 .line 1755 - iget v10, v10, Landroid/support/v4/view/ViewPager$ItemInfo;->offset:F + iget v9, v9, Landroid/support/v4/view/ViewPager$ItemInfo;->offset:F - mul-float v10, v10, v13 + mul-float v9, v9, v13 - float-to-int v10, v10 + float-to-int v9, v9 - add-int/2addr v10, v4 + add-int/2addr v9, v5 .line 1758 - iget-boolean v14, v9, Landroid/support/v4/view/ViewPager$LayoutParams;->needsMeasure:Z + iget-boolean v14, v8, Landroid/support/v4/view/ViewPager$LayoutParams;->needsMeasure:Z if-eqz v14, :cond_8 const/4 v14, 0x0 .line 1761 - iput-boolean v14, v9, Landroid/support/v4/view/ViewPager$LayoutParams;->needsMeasure:Z + iput-boolean v14, v8, Landroid/support/v4/view/ViewPager$LayoutParams;->needsMeasure:Z .line 1762 - iget v9, v9, Landroid/support/v4/view/ViewPager$LayoutParams;->widthFactor:F + iget v8, v8, Landroid/support/v4/view/ViewPager$LayoutParams;->widthFactor:F - mul-float v13, v13, v9 + mul-float v13, v13, v8 - float-to-int v9, v13 + float-to-int v8, v13 const/high16 v13, 0x40000000 # 2.0f - invoke-static {v9, v13}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I + invoke-static {v8, v13}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I - move-result v9 + move-result v8 - sub-int v14, v3, v5 + sub-int v14, v3, v7 - sub-int/2addr v14, v7 + sub-int/2addr v14, v10 .line 1765 invoke-static {v14, v13}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I @@ -6021,36 +6061,36 @@ move-result v13 .line 1768 - invoke-virtual {v8, v9, v13}, Landroid/view/View;->measure(II)V + invoke-virtual {v6, v8, v13}, Landroid/view/View;->measure(II)V .line 1776 :cond_8 - invoke-virtual {v8}, Landroid/view/View;->getMeasuredWidth()I + invoke-virtual {v6}, Landroid/view/View;->getMeasuredWidth()I - move-result v9 + move-result v8 - add-int/2addr v9, v10 + add-int/2addr v8, v9 .line 1777 - invoke-virtual {v8}, Landroid/view/View;->getMeasuredHeight()I + invoke-virtual {v6}, Landroid/view/View;->getMeasuredHeight()I move-result v13 - add-int/2addr v13, v5 + add-int/2addr v13, v7 .line 1775 - invoke-virtual {v8, v10, v5, v9, v13}, Landroid/view/View;->layout(IIII)V + invoke-virtual {v6, v9, v7, v8, v13}, Landroid/view/View;->layout(IIII)V :cond_9 - add-int/lit8 v6, v6, 0x1 + add-int/lit8 v4, v4, 0x1 - goto :goto_5 + goto :goto_3 .line 1781 :cond_a - iput v5, v0, Landroid/support/v4/view/ViewPager;->mTopPageBounds:I + iput v7, v0, Landroid/support/v4/view/ViewPager;->mTopPageBounds:I - sub-int/2addr v3, v7 + sub-int/2addr v3, v10 .line 1782 iput v3, v0, Landroid/support/v4/view/ViewPager;->mBottomPageBounds:I @@ -6070,13 +6110,13 @@ invoke-direct {v0, v1, v2, v2, v2}, Landroid/support/v4/view/ViewPager;->scrollToItem(IZIZ)V - goto :goto_6 + goto :goto_4 :cond_b const/4 v2, 0x0 .line 1788 - :goto_6 + :goto_4 iput-boolean v2, v0, Landroid/support/v4/view/ViewPager;->mFirstLayout:Z return-void @@ -6158,7 +6198,11 @@ move-result v4 - const/4 v5, 0x0 + move v5, v3 + + move v3, v2 + + const/4 v2, 0x0 :goto_0 const/16 v6, 0x8 @@ -6167,10 +6211,10 @@ const/high16 v8, 0x40000000 # 2.0f - if-ge v5, v4, :cond_c + if-ge v2, v4, :cond_c .line 1573 - invoke-virtual {v0, v5}, Landroid/support/v4/view/ViewPager;->getChildAt(I)Landroid/view/View; + invoke-virtual {v0, v2}, Landroid/support/v4/view/ViewPager;->getChildAt(I)Landroid/view/View; move-result-object v9 @@ -6277,20 +6321,20 @@ .line 1595 iget v10, v6, Landroid/support/v4/view/ViewPager$LayoutParams;->width:I + move v13, v10 + goto :goto_6 :cond_6 - move v10, v2 + move v13, v3 :goto_6 - const/high16 v13, 0x40000000 # 2.0f + const/high16 v10, 0x40000000 # 2.0f goto :goto_7 :cond_7 - move v13, v10 - - move v10, v2 + move v13, v3 .line 1598 :goto_7 @@ -6309,18 +6353,18 @@ goto :goto_8 :cond_8 - move v1, v3 + move v1, v5 goto :goto_8 :cond_9 - move v1, v3 + move v1, v5 move v8, v12 .line 1604 :goto_8 - invoke-static {v10, v13}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I + invoke-static {v13, v10}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I move-result v6 @@ -6339,7 +6383,7 @@ move-result v1 - sub-int/2addr v3, v1 + sub-int/2addr v5, v1 goto :goto_9 @@ -6351,11 +6395,11 @@ move-result v1 - sub-int/2addr v2, v1 + sub-int/2addr v3, v1 :cond_b :goto_9 - add-int/lit8 v5, v5, 0x1 + add-int/lit8 v2, v2, 0x1 const/4 v1, 0x0 @@ -6363,14 +6407,14 @@ .line 1617 :cond_c - invoke-static {v2, v8}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I + invoke-static {v3, v8}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I move-result v1 iput v1, v0, Landroid/support/v4/view/ViewPager;->mChildWidthMeasureSpec:I .line 1618 - invoke-static {v3, v8}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I + invoke-static {v5, v8}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I move-result v1 @@ -6390,10 +6434,10 @@ .line 1626 invoke-virtual/range {p0 .. p0}, Landroid/support/v4/view/ViewPager;->getChildCount()I - move-result v3 + move-result v2 :goto_a - if-ge v1, v3, :cond_f + if-ge v1, v2, :cond_f .line 1628 invoke-virtual {v0, v1}, Landroid/support/v4/view/ViewPager;->getChildAt(I)Landroid/view/View; @@ -6422,7 +6466,7 @@ if-nez v7, :cond_e :cond_d - int-to-float v7, v2 + int-to-float v7, v3 .line 1636 iget v5, v5, Landroid/support/v4/view/ViewPager$LayoutParams;->widthFactor:F @@ -6451,6 +6495,8 @@ .method protected onPageScrolled(IFI)V .locals 12 + .annotation build Landroid/support/annotation/CallSuper; + .end annotation .line 1865 iget v0, p0, Landroid/support/v4/view/ViewPager;->mDecorChildCount:I @@ -6486,13 +6532,17 @@ move-result v6 - const/4 v7, 0x0 + move v7, v4 + + move v4, v3 + + const/4 v3, 0x0 :goto_0 - if-ge v7, v6, :cond_5 + if-ge v3, v6, :cond_5 .line 1872 - invoke-virtual {p0, v7}, Landroid/support/v4/view/ViewPager;->getChildAt(I)Landroid/view/View; + invoke-virtual {p0, v3}, Landroid/support/v4/view/ViewPager;->getChildAt(I)Landroid/view/View; move-result-object v8 @@ -6526,12 +6576,12 @@ if-eq v9, v10, :cond_1 - move v9, v3 + move v9, v4 goto :goto_2 :cond_1 - sub-int v9, v5, v4 + sub-int v9, v5, v7 .line 1891 invoke-virtual {v8}, Landroid/view/View;->getMeasuredWidth()I @@ -6545,7 +6595,7 @@ move-result v10 - add-int/2addr v4, v10 + add-int/2addr v7, v10 goto :goto_1 @@ -6555,7 +6605,7 @@ move-result v9 - add-int/2addr v9, v3 + add-int/2addr v9, v4 goto :goto_2 @@ -6569,37 +6619,37 @@ div-int/lit8 v9, v9, 0x2 - invoke-static {v9, v3}, Ljava/lang/Math;->max(II)I + invoke-static {v9, v4}, Ljava/lang/Math;->max(II)I move-result v9 :goto_1 move v11, v9 - move v9, v3 + move v9, v4 - move v3, v11 + move v4, v11 :goto_2 - add-int/2addr v3, v0 + add-int/2addr v4, v0 .line 1897 invoke-virtual {v8}, Landroid/view/View;->getLeft()I move-result v10 - sub-int/2addr v3, v10 + sub-int/2addr v4, v10 - if-eqz v3, :cond_4 + if-eqz v4, :cond_4 .line 1899 - invoke-virtual {v8, v3}, Landroid/view/View;->offsetLeftAndRight(I)V + invoke-virtual {v8, v4}, Landroid/view/View;->offsetLeftAndRight(I)V :cond_4 - move v3, v9 + move v4, v9 :goto_3 - add-int/lit8 v7, v7, 0x1 + add-int/lit8 v3, v3, 0x1 goto :goto_0 @@ -7591,7 +7641,7 @@ if-gtz v12, :cond_8 - const/4 v14, 0x0 + const/4 v3, 0x0 goto :goto_4 @@ -7612,24 +7662,28 @@ div-float/2addr v15, v3 - add-float/2addr v14, v15 + add-float v3, v14, v15 .line 1171 :goto_4 - iget v3, v0, Landroid/support/v4/view/ViewPager;->mCurItem:I + iget v14, v0, Landroid/support/v4/view/ViewPager;->mCurItem:I - add-int/lit8 v3, v3, -0x1 + add-int/lit8 v14, v14, -0x1 - const/4 v15, 0x0 + move v15, v10 + + move v10, v7 + + const/4 v7, 0x0 :goto_5 - if-ltz v3, :cond_e + if-ltz v14, :cond_e - cmpl-float v16, v15, v14 + cmpl-float v16, v7, v3 if-ltz v16, :cond_a - if-ge v3, v4, :cond_a + if-ge v14, v4, :cond_a if-nez v11, :cond_9 @@ -7639,7 +7693,7 @@ :cond_9 iget v5, v11, Landroid/support/v4/view/ViewPager$ItemInfo;->position:I - if-ne v3, v5, :cond_d + if-ne v14, v5, :cond_d iget-boolean v5, v11, Landroid/support/v4/view/ViewPager$ItemInfo;->scrolling:Z @@ -7648,25 +7702,25 @@ .line 1177 iget-object v5, v0, Landroid/support/v4/view/ViewPager;->mItems:Ljava/util/ArrayList; - invoke-virtual {v5, v10}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object; + invoke-virtual {v5, v15}, Ljava/util/ArrayList;->remove(I)Ljava/lang/Object; .line 1178 iget-object v5, v0, Landroid/support/v4/view/ViewPager;->mAdapter:Landroid/support/v4/view/PagerAdapter; iget-object v11, v11, Landroid/support/v4/view/ViewPager$ItemInfo;->object:Ljava/lang/Object; - invoke-virtual {v5, v0, v3, v11}, Landroid/support/v4/view/PagerAdapter;->destroyItem(Landroid/view/ViewGroup;ILjava/lang/Object;)V + invoke-virtual {v5, v0, v14, v11}, Landroid/support/v4/view/PagerAdapter;->destroyItem(Landroid/view/ViewGroup;ILjava/lang/Object;)V - add-int/lit8 v10, v10, -0x1 + add-int/lit8 v15, v15, -0x1 - add-int/lit8 v7, v7, -0x1 + add-int/lit8 v10, v10, -0x1 - if-ltz v10, :cond_c + if-ltz v15, :cond_c .line 1185 iget-object v5, v0, Landroid/support/v4/view/ViewPager;->mItems:Ljava/util/ArrayList; - invoke-virtual {v5, v10}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v5, v15}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; move-result-object v5 @@ -7680,21 +7734,21 @@ .line 1187 iget v5, v11, Landroid/support/v4/view/ViewPager$ItemInfo;->position:I - if-ne v3, v5, :cond_b + if-ne v14, v5, :cond_b .line 1188 iget v5, v11, Landroid/support/v4/view/ViewPager$ItemInfo;->widthFactor:F - add-float/2addr v15, v5 + add-float/2addr v7, v5 - add-int/lit8 v10, v10, -0x1 + add-int/lit8 v15, v15, -0x1 - if-ltz v10, :cond_c + if-ltz v15, :cond_c .line 1190 iget-object v5, v0, Landroid/support/v4/view/ViewPager;->mItems:Ljava/util/ArrayList; - invoke-virtual {v5, v10}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v5, v15}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; move-result-object v5 @@ -7703,26 +7757,26 @@ goto :goto_6 :cond_b - add-int/lit8 v5, v10, 0x1 + add-int/lit8 v5, v15, 0x1 .line 1192 - invoke-virtual {v0, v3, v5}, Landroid/support/v4/view/ViewPager;->addNewItem(II)Landroid/support/v4/view/ViewPager$ItemInfo; + invoke-virtual {v0, v14, v5}, Landroid/support/v4/view/ViewPager;->addNewItem(II)Landroid/support/v4/view/ViewPager$ItemInfo; move-result-object v5 .line 1193 iget v5, v5, Landroid/support/v4/view/ViewPager$ItemInfo;->widthFactor:F - add-float/2addr v15, v5 + add-float/2addr v7, v5 - add-int/lit8 v7, v7, 0x1 + add-int/lit8 v10, v10, 0x1 - if-ltz v10, :cond_c + if-ltz v15, :cond_c .line 1195 iget-object v5, v0, Landroid/support/v4/view/ViewPager;->mItems:Ljava/util/ArrayList; - invoke-virtual {v5, v10}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v5, v15}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; move-result-object v5 @@ -7737,7 +7791,7 @@ move-object v11, v5 :cond_d - add-int/lit8 v3, v3, -0x1 + add-int/lit8 v14, v14, -0x1 const/4 v5, 0x0 @@ -7748,7 +7802,7 @@ :goto_7 iget v3, v8, Landroid/support/v4/view/ViewPager$ItemInfo;->widthFactor:F - add-int/lit8 v4, v7, 0x1 + add-int/lit8 v4, v10, 0x1 cmpg-float v5, v3, v13 @@ -7779,7 +7833,7 @@ :goto_8 if-gtz v12, :cond_10 - const/4 v10, 0x0 + const/4 v7, 0x0 goto :goto_9 @@ -7787,15 +7841,15 @@ :cond_10 invoke-virtual/range {p0 .. p0}, Landroid/support/v4/view/ViewPager;->getPaddingRight()I - move-result v10 + move-result v7 - int-to-float v10, v10 + int-to-float v7, v7 int-to-float v11, v12 - div-float/2addr v10, v11 + div-float/2addr v7, v11 - add-float/2addr v10, v13 + add-float/2addr v7, v13 .line 1205 :goto_9 @@ -7806,7 +7860,7 @@ if-ge v11, v6, :cond_16 - cmpl-float v12, v3, v10 + cmpl-float v12, v3, v7 if-ltz v12, :cond_13 @@ -7933,7 +7987,7 @@ .line 1232 :cond_16 :goto_c - invoke-direct {v0, v8, v7, v2}, Landroid/support/v4/view/ViewPager;->calculatePageOffsets(Landroid/support/v4/view/ViewPager$ItemInfo;ILandroid/support/v4/view/ViewPager$ItemInfo;)V + invoke-direct {v0, v8, v10, v2}, Landroid/support/v4/view/ViewPager;->calculatePageOffsets(Landroid/support/v4/view/ViewPager$ItemInfo;ILandroid/support/v4/view/ViewPager$ItemInfo;)V .line 1234 iget-object v1, v0, Landroid/support/v4/view/ViewPager;->mAdapter:Landroid/support/v4/view/PagerAdapter; @@ -8047,48 +8101,48 @@ if-eq v1, v2, :cond_1d :cond_1b - const/4 v5, 0x0 + const/4 v1, 0x0 .line 1268 :goto_f invoke-virtual/range {p0 .. p0}, Landroid/support/v4/view/ViewPager;->getChildCount()I - move-result v1 + move-result v2 - if-ge v5, v1, :cond_1d + if-ge v1, v2, :cond_1d .line 1269 - invoke-virtual {v0, v5}, Landroid/support/v4/view/ViewPager;->getChildAt(I)Landroid/view/View; + invoke-virtual {v0, v1}, Landroid/support/v4/view/ViewPager;->getChildAt(I)Landroid/view/View; - move-result-object v1 + move-result-object v2 .line 1270 - invoke-virtual {v0, v1}, Landroid/support/v4/view/ViewPager;->infoForChild(Landroid/view/View;)Landroid/support/v4/view/ViewPager$ItemInfo; + invoke-virtual {v0, v2}, Landroid/support/v4/view/ViewPager;->infoForChild(Landroid/view/View;)Landroid/support/v4/view/ViewPager$ItemInfo; - move-result-object v2 + move-result-object v3 - if-eqz v2, :cond_1c + if-eqz v3, :cond_1c .line 1271 - iget v2, v2, Landroid/support/v4/view/ViewPager$ItemInfo;->position:I + iget v3, v3, Landroid/support/v4/view/ViewPager$ItemInfo;->position:I - iget v3, v0, Landroid/support/v4/view/ViewPager;->mCurItem:I + iget v4, v0, Landroid/support/v4/view/ViewPager;->mCurItem:I - if-ne v2, v3, :cond_1c + if-ne v3, v4, :cond_1c - const/4 v2, 0x2 + const/4 v3, 0x2 .line 1272 - invoke-virtual {v1, v2}, Landroid/view/View;->requestFocus(I)Z + invoke-virtual {v2, v3}, Landroid/view/View;->requestFocus(I)Z - move-result v1 + move-result v2 - if-eqz v1, :cond_1c + if-eqz v2, :cond_1c goto :goto_10 :cond_1c - add-int/lit8 v5, v5, 0x1 + add-int/lit8 v1, v1, 0x1 goto :goto_f @@ -8183,17 +8237,17 @@ invoke-direct {v2, v1}, Ljava/lang/IllegalStateException;->(Ljava/lang/String;)V - goto :goto_13 - - :goto_12 throw v2 - :goto_13 - goto :goto_12 + return-void .end method .method public removeOnAdapterChangeListener(Landroid/support/v4/view/ViewPager$OnAdapterChangeListener;)V .locals 1 + .param p1 # Landroid/support/v4/view/ViewPager$OnAdapterChangeListener; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 594 iget-object v0, p0, Landroid/support/v4/view/ViewPager;->mAdapterChangeListeners:Ljava/util/List; @@ -8209,6 +8263,10 @@ .method public removeOnPageChangeListener(Landroid/support/v4/view/ViewPager$OnPageChangeListener;)V .locals 1 + .param p1 # Landroid/support/v4/view/ViewPager$OnPageChangeListener; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 736 iget-object v0, p0, Landroid/support/v4/view/ViewPager;->mOnPageChangeListeners:Ljava/util/List; @@ -8245,6 +8303,10 @@ .method public setAdapter(Landroid/support/v4/view/PagerAdapter;)V .locals 7 + .param p1 # Landroid/support/v4/view/PagerAdapter; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 506 iget-object v0, p0, Landroid/support/v4/view/ViewPager;->mAdapter:Landroid/support/v4/view/PagerAdapter; @@ -8327,7 +8389,10 @@ .line 522 iput v2, p0, Landroid/support/v4/view/ViewPager;->mExpectedAdapterCount:I - if-eqz p1, :cond_5 + .line 524 + iget-object v3, p0, Landroid/support/v4/view/ViewPager;->mAdapter:Landroid/support/v4/view/PagerAdapter; + + if-eqz v3, :cond_5 .line 525 iget-object v3, p0, Landroid/support/v4/view/ViewPager;->mObserver:Landroid/support/v4/view/ViewPager$PagerObserver; @@ -8514,7 +8579,7 @@ if-gtz v0, :cond_0 - goto :goto_3 + goto :goto_4 :cond_0 if-nez p3, :cond_1 @@ -8615,18 +8680,21 @@ if-eq v0, p1, :cond_6 - const/4 v1, 0x1 + goto :goto_2 - .line 660 :cond_6 - iget-boolean p3, p0, Landroid/support/v4/view/ViewPager;->mFirstLayout:Z + const/4 p3, 0x0 - if-eqz p3, :cond_8 + .line 660 + :goto_2 + iget-boolean v0, p0, Landroid/support/v4/view/ViewPager;->mFirstLayout:Z + + if-eqz v0, :cond_8 .line 663 iput p1, p0, Landroid/support/v4/view/ViewPager;->mCurItem:I - if-eqz v1, :cond_7 + if-eqz p3, :cond_7 .line 665 invoke-direct {p0, p1}, Landroid/support/v4/view/ViewPager;->dispatchOnPageSelected(I)V @@ -8635,21 +8703,21 @@ :cond_7 invoke-virtual {p0}, Landroid/support/v4/view/ViewPager;->requestLayout()V - goto :goto_2 + goto :goto_3 .line 669 :cond_8 invoke-virtual {p0, p1}, Landroid/support/v4/view/ViewPager;->populate(I)V .line 670 - invoke-direct {p0, p1, p2, p4, v1}, Landroid/support/v4/view/ViewPager;->scrollToItem(IZIZ)V + invoke-direct {p0, p1, p2, p4, p3}, Landroid/support/v4/view/ViewPager;->scrollToItem(IZIZ)V - :goto_2 + :goto_3 return-void .line 636 :cond_9 - :goto_3 + :goto_4 invoke-direct {p0, v1}, Landroid/support/v4/view/ViewPager;->setScrollingCacheEnabled(Z)V return-void @@ -8753,6 +8821,10 @@ .method public setPageMarginDrawable(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .line 905 invoke-virtual {p0}, Landroid/support/v4/view/ViewPager;->getContext()Landroid/content/Context; @@ -8770,6 +8842,10 @@ .method public setPageMarginDrawable(Landroid/graphics/drawable/Drawable;)V .locals 0 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 893 iput-object p1, p0, Landroid/support/v4/view/ViewPager;->mMarginDrawable:Landroid/graphics/drawable/Drawable; @@ -8801,6 +8877,10 @@ .method public setPageTransformer(ZLandroid/support/v4/view/ViewPager$PageTransformer;)V .locals 1 + .param p2 # Landroid/support/v4/view/ViewPager$PageTransformer; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param const/4 v0, 0x2 @@ -8812,6 +8892,10 @@ .method public setPageTransformer(ZLandroid/support/v4/view/ViewPager$PageTransformer;I)V .locals 4 + .param p2 # Landroid/support/v4/view/ViewPager$PageTransformer; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param const/4 v0, 0x1 diff --git a/smali/android/support/v4/view/WindowCompat.smali b/smali/android/support/v4/view/WindowCompat.smali index 0b77bb2a..05762092 100644 --- a/smali/android/support/v4/view/WindowCompat.smali +++ b/smali/android/support/v4/view/WindowCompat.smali @@ -23,6 +23,17 @@ .method public static requireViewById(Landroid/view/Window;I)Landroid/view/View; .locals 2 + .param p0 # Landroid/view/Window; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/IdRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "mInsets:Ljava/lang/Object; - iget-object p1, p1, Landroid/support/v4/view/WindowInsetsCompat;->mInsets:Ljava/lang/Object; - if-nez v2, :cond_3 + iget-object p1, p1, Landroid/support/v4/view/WindowInsetsCompat;->mInsets:Ljava/lang/Object; + if-nez p1, :cond_2 goto :goto_0 @@ -241,6 +241,8 @@ goto :goto_0 :cond_3 + iget-object p1, p1, Landroid/support/v4/view/WindowInsetsCompat;->mInsets:Ljava/lang/Object; + invoke-virtual {v2, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z move-result v0 @@ -255,6 +257,8 @@ .method public getDisplayCutout()Landroid/support/v4/view/DisplayCutoutCompat; .locals 2 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 355 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/view/accessibility/AccessibilityManagerCompat$AccessibilityStateChangeListenerWrapper.smali b/smali/android/support/v4/view/accessibility/AccessibilityManagerCompat$AccessibilityStateChangeListenerWrapper.smali index e3f46e5d..6f64aeb6 100644 --- a/smali/android/support/v4/view/accessibility/AccessibilityManagerCompat$AccessibilityStateChangeListenerWrapper.smali +++ b/smali/android/support/v4/view/accessibility/AccessibilityManagerCompat$AccessibilityStateChangeListenerWrapper.smali @@ -24,6 +24,10 @@ # direct methods .method constructor (Landroid/support/v4/view/accessibility/AccessibilityManagerCompat$AccessibilityStateChangeListener;)V .locals 0 + .param p1 # Landroid/support/v4/view/accessibility/AccessibilityManagerCompat$AccessibilityStateChangeListener; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 78 invoke-direct {p0}, Ljava/lang/Object;->()V diff --git a/smali/android/support/v4/view/accessibility/AccessibilityManagerCompat$TouchExplorationStateChangeListenerWrapper.smali b/smali/android/support/v4/view/accessibility/AccessibilityManagerCompat$TouchExplorationStateChangeListenerWrapper.smali index d284c501..a0f5396e 100644 --- a/smali/android/support/v4/view/accessibility/AccessibilityManagerCompat$TouchExplorationStateChangeListenerWrapper.smali +++ b/smali/android/support/v4/view/accessibility/AccessibilityManagerCompat$TouchExplorationStateChangeListenerWrapper.smali @@ -7,6 +7,10 @@ # annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0x13 +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/view/accessibility/AccessibilityManagerCompat; .end annotation @@ -24,6 +28,10 @@ # direct methods .method constructor (Landroid/support/v4/view/accessibility/AccessibilityManagerCompat$TouchExplorationStateChangeListener;)V .locals 0 + .param p1 # Landroid/support/v4/view/accessibility/AccessibilityManagerCompat$TouchExplorationStateChangeListener; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 201 invoke-direct {p0}, Ljava/lang/Object;->()V diff --git a/smali/android/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat.smali b/smali/android/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat.smali index bc6fbd93..30cc6de9 100644 --- a/smali/android/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat.smali +++ b/smali/android/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat.smali @@ -93,412 +93,412 @@ .line 49 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - const/4 v1, 0x1 + const/4 v1, 0x0 - const/4 v2, 0x0 + const/4 v2, 0x1 - invoke-direct {v0, v1, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V + invoke-direct {v0, v2, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_FOCUS:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 56 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - const/4 v1, 0x2 + const/4 v2, 0x2 - invoke-direct {v0, v1, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V + invoke-direct {v0, v2, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_CLEAR_FOCUS:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 63 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - const/4 v1, 0x4 + const/4 v2, 0x4 - invoke-direct {v0, v1, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V + invoke-direct {v0, v2, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_SELECT:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 70 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - const/16 v1, 0x8 + const/16 v2, 0x8 - invoke-direct {v0, v1, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V + invoke-direct {v0, v2, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_CLEAR_SELECTION:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 77 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - const/16 v1, 0x10 + const/16 v2, 0x10 - invoke-direct {v0, v1, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V + invoke-direct {v0, v2, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_CLICK:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 84 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - const/16 v1, 0x20 + const/16 v2, 0x20 - invoke-direct {v0, v1, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V + invoke-direct {v0, v2, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_LONG_CLICK:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 91 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - const/16 v1, 0x40 + const/16 v2, 0x40 - invoke-direct {v0, v1, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V + invoke-direct {v0, v2, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_ACCESSIBILITY_FOCUS:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 98 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - const/16 v1, 0x80 + const/16 v2, 0x80 - invoke-direct {v0, v1, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V + invoke-direct {v0, v2, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_CLEAR_ACCESSIBILITY_FOCUS:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 146 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - const/16 v1, 0x100 + const/16 v2, 0x100 - invoke-direct {v0, v1, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V + invoke-direct {v0, v2, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_NEXT_AT_MOVEMENT_GRANULARITY:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 194 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - const/16 v1, 0x200 + const/16 v2, 0x200 - invoke-direct {v0, v1, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V + invoke-direct {v0, v2, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 215 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - const/16 v1, 0x400 + const/16 v2, 0x400 - invoke-direct {v0, v1, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V + invoke-direct {v0, v2, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_NEXT_HTML_ELEMENT:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 236 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - const/16 v1, 0x800 + const/16 v2, 0x800 - invoke-direct {v0, v1, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V + invoke-direct {v0, v2, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_PREVIOUS_HTML_ELEMENT:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 243 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - const/16 v1, 0x1000 + const/16 v2, 0x1000 - invoke-direct {v0, v1, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V + invoke-direct {v0, v2, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_SCROLL_FORWARD:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 250 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - const/16 v1, 0x2000 + const/16 v2, 0x2000 - invoke-direct {v0, v1, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V + invoke-direct {v0, v2, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_SCROLL_BACKWARD:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 257 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - const/16 v1, 0x4000 + const/16 v2, 0x4000 - invoke-direct {v0, v1, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V + invoke-direct {v0, v2, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_COPY:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 264 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - const v1, 0x8000 + const v2, 0x8000 - invoke-direct {v0, v1, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V + invoke-direct {v0, v2, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_PASTE:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 271 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - const/high16 v1, 0x10000 + const/high16 v2, 0x10000 - invoke-direct {v0, v1, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V + invoke-direct {v0, v2, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_CUT:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 298 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - const/high16 v1, 0x20000 + const/high16 v2, 0x20000 - invoke-direct {v0, v1, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V + invoke-direct {v0, v2, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_SET_SELECTION:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 305 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - const/high16 v1, 0x40000 + const/high16 v2, 0x40000 - invoke-direct {v0, v1, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V + invoke-direct {v0, v2, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_EXPAND:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 312 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - const/high16 v1, 0x80000 + const/high16 v2, 0x80000 - invoke-direct {v0, v1, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V + invoke-direct {v0, v2, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_COLLAPSE:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 319 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - const/high16 v1, 0x100000 + const/high16 v2, 0x100000 - invoke-direct {v0, v1, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V + invoke-direct {v0, v2, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_DISMISS:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 339 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - const/high16 v1, 0x200000 + const/high16 v2, 0x200000 - invoke-direct {v0, v1, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V + invoke-direct {v0, v2, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(ILjava/lang/CharSequence;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_SET_TEXT:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 349 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - sget v1, Landroid/os/Build$VERSION;->SDK_INT:I + sget v2, Landroid/os/Build$VERSION;->SDK_INT:I const/16 v3, 0x17 - if-lt v1, v3, :cond_0 + if-lt v2, v3, :cond_0 - sget-object v1, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_SHOW_ON_SCREEN:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction; + sget-object v2, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_SHOW_ON_SCREEN:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction; goto :goto_0 :cond_0 - move-object v1, v2 + move-object v2, v1 :goto_0 - invoke-direct {v0, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(Ljava/lang/Object;)V + invoke-direct {v0, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(Ljava/lang/Object;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_SHOW_ON_SCREEN:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 365 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - sget v1, Landroid/os/Build$VERSION;->SDK_INT:I + sget v2, Landroid/os/Build$VERSION;->SDK_INT:I - if-lt v1, v3, :cond_1 + if-lt v2, v3, :cond_1 - sget-object v1, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_SCROLL_TO_POSITION:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction; + sget-object v2, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_SCROLL_TO_POSITION:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction; goto :goto_1 :cond_1 - move-object v1, v2 + move-object v2, v1 :goto_1 - invoke-direct {v0, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(Ljava/lang/Object;)V + invoke-direct {v0, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(Ljava/lang/Object;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_SCROLL_TO_POSITION:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 373 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - sget v1, Landroid/os/Build$VERSION;->SDK_INT:I + sget v2, Landroid/os/Build$VERSION;->SDK_INT:I - if-lt v1, v3, :cond_2 + if-lt v2, v3, :cond_2 - sget-object v1, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_SCROLL_UP:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction; + sget-object v2, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_SCROLL_UP:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction; goto :goto_2 :cond_2 - move-object v1, v2 + move-object v2, v1 :goto_2 - invoke-direct {v0, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(Ljava/lang/Object;)V + invoke-direct {v0, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(Ljava/lang/Object;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_SCROLL_UP:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 380 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - sget v1, Landroid/os/Build$VERSION;->SDK_INT:I + sget v2, Landroid/os/Build$VERSION;->SDK_INT:I - if-lt v1, v3, :cond_3 + if-lt v2, v3, :cond_3 - sget-object v1, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_SCROLL_LEFT:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction; + sget-object v2, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_SCROLL_LEFT:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction; goto :goto_3 :cond_3 - move-object v1, v2 + move-object v2, v1 :goto_3 - invoke-direct {v0, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(Ljava/lang/Object;)V + invoke-direct {v0, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(Ljava/lang/Object;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_SCROLL_LEFT:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 387 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - sget v1, Landroid/os/Build$VERSION;->SDK_INT:I + sget v2, Landroid/os/Build$VERSION;->SDK_INT:I - if-lt v1, v3, :cond_4 + if-lt v2, v3, :cond_4 - sget-object v1, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_SCROLL_DOWN:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction; + sget-object v2, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_SCROLL_DOWN:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction; goto :goto_4 :cond_4 - move-object v1, v2 + move-object v2, v1 :goto_4 - invoke-direct {v0, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(Ljava/lang/Object;)V + invoke-direct {v0, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(Ljava/lang/Object;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_SCROLL_DOWN:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 394 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - sget v1, Landroid/os/Build$VERSION;->SDK_INT:I + sget v2, Landroid/os/Build$VERSION;->SDK_INT:I - if-lt v1, v3, :cond_5 + if-lt v2, v3, :cond_5 - sget-object v1, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_SCROLL_RIGHT:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction; + sget-object v2, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_SCROLL_RIGHT:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction; goto :goto_5 :cond_5 - move-object v1, v2 + move-object v2, v1 :goto_5 - invoke-direct {v0, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(Ljava/lang/Object;)V + invoke-direct {v0, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(Ljava/lang/Object;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_SCROLL_RIGHT:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 401 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - sget v1, Landroid/os/Build$VERSION;->SDK_INT:I + sget v2, Landroid/os/Build$VERSION;->SDK_INT:I - if-lt v1, v3, :cond_6 + if-lt v2, v3, :cond_6 - sget-object v1, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_CONTEXT_CLICK:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction; + sget-object v2, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_CONTEXT_CLICK:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction; goto :goto_6 :cond_6 - move-object v1, v2 + move-object v2, v1 :goto_6 - invoke-direct {v0, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(Ljava/lang/Object;)V + invoke-direct {v0, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(Ljava/lang/Object;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_CONTEXT_CLICK:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 415 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - sget v1, Landroid/os/Build$VERSION;->SDK_INT:I + sget v2, Landroid/os/Build$VERSION;->SDK_INT:I const/16 v3, 0x18 - if-lt v1, v3, :cond_7 + if-lt v2, v3, :cond_7 - sget-object v1, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_SET_PROGRESS:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction; + sget-object v2, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_SET_PROGRESS:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction; goto :goto_7 :cond_7 - move-object v1, v2 + move-object v2, v1 :goto_7 - invoke-direct {v0, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(Ljava/lang/Object;)V + invoke-direct {v0, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(Ljava/lang/Object;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_SET_PROGRESS:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 426 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - sget v1, Landroid/os/Build$VERSION;->SDK_INT:I + sget v2, Landroid/os/Build$VERSION;->SDK_INT:I const/16 v3, 0x1a - if-lt v1, v3, :cond_8 + if-lt v2, v3, :cond_8 - sget-object v1, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_MOVE_WINDOW:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction; + sget-object v2, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_MOVE_WINDOW:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction; goto :goto_8 :cond_8 - move-object v1, v2 + move-object v2, v1 :goto_8 - invoke-direct {v0, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(Ljava/lang/Object;)V + invoke-direct {v0, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(Ljava/lang/Object;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_MOVE_WINDOW:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 433 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - sget v1, Landroid/os/Build$VERSION;->SDK_INT:I + sget v2, Landroid/os/Build$VERSION;->SDK_INT:I const/16 v3, 0x1c - if-lt v1, v3, :cond_9 + if-lt v2, v3, :cond_9 - sget-object v1, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_SHOW_TOOLTIP:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction; + sget-object v2, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_SHOW_TOOLTIP:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction; goto :goto_9 :cond_9 - move-object v1, v2 + move-object v2, v1 :goto_9 - invoke-direct {v0, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(Ljava/lang/Object;)V + invoke-direct {v0, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(Ljava/lang/Object;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_SHOW_TOOLTIP:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; .line 441 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; - sget v1, Landroid/os/Build$VERSION;->SDK_INT:I + sget v2, Landroid/os/Build$VERSION;->SDK_INT:I - if-lt v1, v3, :cond_a + if-lt v2, v3, :cond_a - sget-object v2, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_HIDE_TOOLTIP:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction; + sget-object v1, Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction;->ACTION_HIDE_TOOLTIP:Landroid/view/accessibility/AccessibilityNodeInfo$AccessibilityAction; :cond_a - invoke-direct {v0, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(Ljava/lang/Object;)V + invoke-direct {v0, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->(Ljava/lang/Object;)V sput-object v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat;->ACTION_HIDE_TOOLTIP:Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat$AccessibilityActionCompat; diff --git a/smali/android/support/v4/view/accessibility/AccessibilityNodeInfoCompat.smali b/smali/android/support/v4/view/accessibility/AccessibilityNodeInfoCompat.smali index f39bc682..aac7bc75 100644 --- a/smali/android/support/v4/view/accessibility/AccessibilityNodeInfoCompat.smali +++ b/smali/android/support/v4/view/accessibility/AccessibilityNodeInfoCompat.smali @@ -116,6 +116,12 @@ .field private final mInfo:Landroid/view/accessibility/AccessibilityNodeInfo; .field public mParentVirtualDescendantId:I + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field # direct methods @@ -402,12 +408,12 @@ if-eqz v0, :cond_1 - const-string v1, "androidx.view.accessibility.AccessibilityNodeInfoCompat.BOOLEAN_PROPERTY_KEY" + const/4 v1, 0x0 - const/4 v2, 0x0 + const-string v2, "androidx.view.accessibility.AccessibilityNodeInfoCompat.BOOLEAN_PROPERTY_KEY" .line 3486 - invoke-virtual {v0, v1, v2}, Landroid/os/Bundle;->getInt(Ljava/lang/String;I)I + invoke-virtual {v0, v2, v1}, Landroid/os/Bundle;->getInt(Ljava/lang/String;I)I move-result v3 @@ -426,7 +432,7 @@ or-int/2addr p1, v3 .line 3489 - invoke-virtual {v0, v1, p1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V + invoke-virtual {v0, v2, p1}, Landroid/os/Bundle;->putInt(Ljava/lang/String;I)V :cond_1 return-void @@ -434,6 +440,10 @@ .method public static wrap(Landroid/view/accessibility/AccessibilityNodeInfo;)Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat; .locals 1 + .param p0 # Landroid/view/accessibility/AccessibilityNodeInfo; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1330 new-instance v0, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat; @@ -1111,6 +1121,8 @@ .method public getHintText()Ljava/lang/CharSequence; .locals 2 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 2577 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1341,6 +1353,8 @@ .method public getPaneTitle()Ljava/lang/CharSequence; .locals 2 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 3237 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1438,6 +1452,8 @@ .method public getRoleDescription()Ljava/lang/CharSequence; .locals 2 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 3375 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1532,6 +1548,8 @@ .method public getTooltipText()Ljava/lang/CharSequence; .locals 2 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 3181 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -2681,6 +2699,10 @@ .method public setHintText(Ljava/lang/CharSequence;)V .locals 2 + .param p1 # Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 2599 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -2934,6 +2956,10 @@ .method public setPaneTitle(Ljava/lang/CharSequence;)V .locals 2 + .param p1 # Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 3223 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -3042,6 +3068,10 @@ .method public setRoleDescription(Ljava/lang/CharSequence;)V .locals 2 + .param p1 # Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 3407 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -3203,6 +3233,10 @@ .method public setTooltipText(Ljava/lang/CharSequence;)V .locals 2 + .param p1 # Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 3203 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/view/accessibility/AccessibilityNodeProviderCompat$AccessibilityNodeProviderApi16.smali b/smali/android/support/v4/view/accessibility/AccessibilityNodeProviderCompat$AccessibilityNodeProviderApi16.smali index 71cc4758..5d90e9a0 100644 --- a/smali/android/support/v4/view/accessibility/AccessibilityNodeProviderCompat$AccessibilityNodeProviderApi16.smali +++ b/smali/android/support/v4/view/accessibility/AccessibilityNodeProviderCompat$AccessibilityNodeProviderApi16.smali @@ -4,6 +4,10 @@ # annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0x10 +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/view/accessibility/AccessibilityNodeProviderCompat; .end annotation diff --git a/smali/android/support/v4/view/accessibility/AccessibilityNodeProviderCompat$AccessibilityNodeProviderApi19.smali b/smali/android/support/v4/view/accessibility/AccessibilityNodeProviderCompat$AccessibilityNodeProviderApi19.smali index 38d1737e..fdf89958 100644 --- a/smali/android/support/v4/view/accessibility/AccessibilityNodeProviderCompat$AccessibilityNodeProviderApi19.smali +++ b/smali/android/support/v4/view/accessibility/AccessibilityNodeProviderCompat$AccessibilityNodeProviderApi19.smali @@ -4,6 +4,10 @@ # annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0x13 +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/view/accessibility/AccessibilityNodeProviderCompat; .end annotation diff --git a/smali/android/support/v4/view/accessibility/AccessibilityNodeProviderCompat.smali b/smali/android/support/v4/view/accessibility/AccessibilityNodeProviderCompat.smali index 1258e147..33735a62 100644 --- a/smali/android/support/v4/view/accessibility/AccessibilityNodeProviderCompat.smali +++ b/smali/android/support/v4/view/accessibility/AccessibilityNodeProviderCompat.smali @@ -86,6 +86,8 @@ # virtual methods .method public createAccessibilityNodeInfo(I)Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat; .locals 0 + .annotation build Landroid/support/annotation/Nullable; + .end annotation const/4 p1, 0x0 @@ -94,6 +96,9 @@ .method public findAccessibilityNodeInfosByText(Ljava/lang/String;I)Ljava/util/List; .locals 0 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -112,6 +117,8 @@ .method public findFocus(I)Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat; .locals 0 + .annotation build Landroid/support/annotation/Nullable; + .end annotation const/4 p1, 0x0 diff --git a/smali/android/support/v4/view/accessibility/AccessibilityRecordCompat.smali b/smali/android/support/v4/view/accessibility/AccessibilityRecordCompat.smali index dc5650c8..bfb94aeb 100644 --- a/smali/android/support/v4/view/accessibility/AccessibilityRecordCompat.smali +++ b/smali/android/support/v4/view/accessibility/AccessibilityRecordCompat.smali @@ -142,6 +142,10 @@ .method public static setSource(Landroid/view/accessibility/AccessibilityRecord;Landroid/view/View;I)V .locals 2 + .param p0 # Landroid/view/accessibility/AccessibilityRecord; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 137 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/view/animation/FastOutLinearInInterpolator.smali b/smali/android/support/v4/view/animation/FastOutLinearInInterpolator.smali index 7fbd0f8d..92102ef5 100644 --- a/smali/android/support/v4/view/animation/FastOutLinearInInterpolator.smali +++ b/smali/android/support/v4/view/animation/FastOutLinearInInterpolator.smali @@ -13,9 +13,9 @@ const/16 v0, 0xc9 + .line 34 new-array v0, v0, [F - .line 34 fill-array-data v0, :array_0 sput-object v0, Landroid/support/v4/view/animation/FastOutLinearInInterpolator;->VALUES:[F diff --git a/smali/android/support/v4/view/animation/FastOutSlowInInterpolator.smali b/smali/android/support/v4/view/animation/FastOutSlowInInterpolator.smali index 074f4ee3..81873e44 100644 --- a/smali/android/support/v4/view/animation/FastOutSlowInInterpolator.smali +++ b/smali/android/support/v4/view/animation/FastOutSlowInInterpolator.smali @@ -13,9 +13,9 @@ const/16 v0, 0xc9 + .line 34 new-array v0, v0, [F - .line 34 fill-array-data v0, :array_0 sput-object v0, Landroid/support/v4/view/animation/FastOutSlowInInterpolator;->VALUES:[F diff --git a/smali/android/support/v4/view/animation/LinearOutSlowInInterpolator.smali b/smali/android/support/v4/view/animation/LinearOutSlowInInterpolator.smali index 2ed7ccf3..135245e5 100644 --- a/smali/android/support/v4/view/animation/LinearOutSlowInInterpolator.smali +++ b/smali/android/support/v4/view/animation/LinearOutSlowInInterpolator.smali @@ -13,9 +13,9 @@ const/16 v0, 0xc9 + .line 34 new-array v0, v0, [F - .line 34 fill-array-data v0, :array_0 sput-object v0, Landroid/support/v4/view/animation/LinearOutSlowInInterpolator;->VALUES:[F diff --git a/smali/android/support/v4/view/animation/LookupTableInterpolator.smali b/smali/android/support/v4/view/animation/LookupTableInterpolator.smali index 376c7252..31447ed4 100644 --- a/smali/android/support/v4/view/animation/LookupTableInterpolator.smali +++ b/smali/android/support/v4/view/animation/LookupTableInterpolator.smali @@ -23,6 +23,8 @@ iput-object p1, p0, Landroid/support/v4/view/animation/LookupTableInterpolator;->mValues:[F .line 32 + iget-object p1, p0, Landroid/support/v4/view/animation/LookupTableInterpolator;->mValues:[F + array-length p1, p1 add-int/lit8 p1, p1, -0x1 @@ -41,7 +43,7 @@ # virtual methods .method public getInterpolation(F)F - .locals 3 + .locals 4 const/high16 v0, 0x3f800000 # 1.0f @@ -98,13 +100,15 @@ aget v2, v1, v0 - add-int/lit8 v0, v0, 0x1 + add-int/lit8 v3, v0, 0x1 + + aget v3, v1, v3 aget v0, v1, v0 - sub-float/2addr v0, v2 + sub-float/2addr v3, v0 - mul-float p1, p1, v0 + mul-float p1, p1, v3 add-float/2addr v2, p1 diff --git a/smali/android/support/v4/view/animation/PathInterpolatorApi14.smali b/smali/android/support/v4/view/animation/PathInterpolatorApi14.smali index 82f14215..2df60600 100644 --- a/smali/android/support/v4/view/animation/PathInterpolatorApi14.smali +++ b/smali/android/support/v4/view/animation/PathInterpolatorApi14.smali @@ -83,6 +83,7 @@ const/4 v4, 0x2 + .line 45 new-array v4, v4, [F const/4 v5, 0x0 @@ -249,9 +250,9 @@ aget v4, v3, v2 - aget v3, v3, v1 + aget v5, v3, v1 - sub-float/2addr v4, v3 + sub-float/2addr v4, v5 cmpl-float v0, v4, v0 @@ -264,8 +265,11 @@ return p1 + .line 89 :cond_4 - sub-float/2addr p1, v3 + aget v0, v3, v1 + + sub-float/2addr p1, v0 div-float/2addr p1, v4 diff --git a/smali/android/support/v4/widget/AutoScrollHelper$ClampedScroller.smali b/smali/android/support/v4/widget/AutoScrollHelper$ClampedScroller.smali index 436edfd7..2053863b 100644 --- a/smali/android/support/v4/widget/AutoScrollHelper$ClampedScroller.smali +++ b/smali/android/support/v4/widget/AutoScrollHelper$ClampedScroller.smali @@ -72,7 +72,7 @@ .end method .method private getValueAt(J)F - .locals 9 + .locals 7 .line 800 iget-wide v0, p0, Landroid/support/v4/widget/AutoScrollHelper$ClampedScroller;->mStartTime:J @@ -87,29 +87,29 @@ .line 802 :cond_0 - iget-wide v3, p0, Landroid/support/v4/widget/AutoScrollHelper$ClampedScroller;->mStopTime:J + iget-wide v0, p0, Landroid/support/v4/widget/AutoScrollHelper$ClampedScroller;->mStopTime:J - const-wide/16 v5, 0x0 + const-wide/16 v3, 0x0 - const/high16 v7, 0x3f800000 # 1.0f + const/high16 v5, 0x3f800000 # 1.0f - cmp-long v8, v3, v5 + cmp-long v6, v0, v3 - if-ltz v8, :cond_2 + if-ltz v6, :cond_2 - cmp-long v5, p1, v3 + cmp-long v3, p1, v0 - if-gez v5, :cond_1 + if-gez v3, :cond_1 goto :goto_0 :cond_1 - sub-long/2addr p1, v3 + sub-long/2addr p1, v0 .line 807 iget v0, p0, Landroid/support/v4/widget/AutoScrollHelper$ClampedScroller;->mStopValue:F - sub-float v1, v7, v0 + sub-float v1, v5, v0 long-to-float p1, p1 @@ -120,7 +120,7 @@ div-float/2addr p1, p2 .line 808 - invoke-static {p1, v2, v7}, Landroid/support/v4/widget/AutoScrollHelper;->constrain(FFF)F + invoke-static {p1, v2, v5}, Landroid/support/v4/widget/AutoScrollHelper;->constrain(FFF)F move-result p1 @@ -130,8 +130,11 @@ return v1 + .line 803 :cond_2 :goto_0 + iget-wide v0, p0, Landroid/support/v4/widget/AutoScrollHelper$ClampedScroller;->mStartTime:J + sub-long/2addr p1, v0 const/high16 v0, 0x3f000000 # 0.5f @@ -145,7 +148,7 @@ div-float/2addr p1, p2 - invoke-static {p1, v2, v7}, Landroid/support/v4/widget/AutoScrollHelper;->constrain(FFF)F + invoke-static {p1, v2, v5}, Landroid/support/v4/widget/AutoScrollHelper;->constrain(FFF)F move-result p1 @@ -405,7 +408,7 @@ .end method .method public start()V - .locals 4 + .locals 2 .line 776 invoke-static {}, Landroid/view/animation/AnimationUtils;->currentAnimationTimeMillis()J @@ -414,12 +417,14 @@ iput-wide v0, p0, Landroid/support/v4/widget/AutoScrollHelper$ClampedScroller;->mStartTime:J - const-wide/16 v2, -0x1 + const-wide/16 v0, -0x1 .line 777 - iput-wide v2, p0, Landroid/support/v4/widget/AutoScrollHelper$ClampedScroller;->mStopTime:J + iput-wide v0, p0, Landroid/support/v4/widget/AutoScrollHelper$ClampedScroller;->mStopTime:J .line 778 + iget-wide v0, p0, Landroid/support/v4/widget/AutoScrollHelper$ClampedScroller;->mStartTime:J + iput-wide v0, p0, Landroid/support/v4/widget/AutoScrollHelper$ClampedScroller;->mDeltaTime:J const/high16 v0, 0x3f000000 # 0.5f diff --git a/smali/android/support/v4/widget/AutoScrollHelper$ScrollAnimationRunnable.smali b/smali/android/support/v4/widget/AutoScrollHelper$ScrollAnimationRunnable.smali index aa8b0cab..22adf0a5 100644 --- a/smali/android/support/v4/widget/AutoScrollHelper$ScrollAnimationRunnable.smali +++ b/smali/android/support/v4/widget/AutoScrollHelper$ScrollAnimationRunnable.smali @@ -63,8 +63,6 @@ iput-boolean v1, v0, Landroid/support/v4/widget/AutoScrollHelper;->mNeedsReset:Z .line 706 - iget-object v0, p0, Landroid/support/v4/widget/AutoScrollHelper$ScrollAnimationRunnable;->this$0:Landroid/support/v4/widget/AutoScrollHelper; - iget-object v0, v0, Landroid/support/v4/widget/AutoScrollHelper;->mScroller:Landroid/support/v4/widget/AutoScrollHelper$ClampedScroller; invoke-virtual {v0}, Landroid/support/v4/widget/AutoScrollHelper$ClampedScroller;->start()V @@ -106,9 +104,7 @@ iput-boolean v1, v2, Landroid/support/v4/widget/AutoScrollHelper;->mNeedsCancel:Z .line 717 - iget-object v1, p0, Landroid/support/v4/widget/AutoScrollHelper$ScrollAnimationRunnable;->this$0:Landroid/support/v4/widget/AutoScrollHelper; - - invoke-virtual {v1}, Landroid/support/v4/widget/AutoScrollHelper;->cancelTargetTouch()V + invoke-virtual {v2}, Landroid/support/v4/widget/AutoScrollHelper;->cancelTargetTouch()V .line 720 :cond_3 diff --git a/smali/android/support/v4/widget/AutoScrollHelper.smali b/smali/android/support/v4/widget/AutoScrollHelper.smali index 332a8bb6..6c4f5336 100644 --- a/smali/android/support/v4/widget/AutoScrollHelper.smali +++ b/smali/android/support/v4/widget/AutoScrollHelper.smali @@ -103,6 +103,10 @@ .method public constructor (Landroid/view/View;)V .locals 3 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 210 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -123,37 +127,37 @@ const/4 v0, 0x2 + .line 150 new-array v1, v0, [F - .line 150 fill-array-data v1, :array_0 iput-object v1, p0, Landroid/support/v4/widget/AutoScrollHelper;->mRelativeEdges:[F + .line 153 new-array v1, v0, [F - .line 153 fill-array-data v1, :array_1 iput-object v1, p0, Landroid/support/v4/widget/AutoScrollHelper;->mMaximumEdges:[F + .line 162 new-array v1, v0, [F - .line 162 fill-array-data v1, :array_2 iput-object v1, p0, Landroid/support/v4/widget/AutoScrollHelper;->mRelativeVelocity:[F + .line 165 new-array v1, v0, [F - .line 165 fill-array-data v1, :array_3 iput-object v1, p0, Landroid/support/v4/widget/AutoScrollHelper;->mMinimumVelocity:[F + .line 168 new-array v0, v0, [F - .line 168 fill-array-data v0, :array_4 iput-object v0, p0, Landroid/support/v4/widget/AutoScrollHelper;->mMaximumVelocity:[F @@ -379,7 +383,7 @@ .end method .method private constrainEdgeValue(FF)F - .locals 5 + .locals 4 const/4 v0, 0x0 @@ -417,21 +421,21 @@ return p1 :cond_2 - cmpg-float v3, p1, p2 + cmpg-float v1, p1, p2 - if-gez v3, :cond_4 + if-gez v1, :cond_4 - const/high16 v3, 0x3f800000 # 1.0f + const/high16 v1, 0x3f800000 # 1.0f - cmpl-float v4, p1, v0 + cmpl-float v3, p1, v0 - if-ltz v4, :cond_3 + if-ltz v3, :cond_3 div-float/2addr p1, p2 - sub-float/2addr v3, p1 + sub-float/2addr v1, p1 - return v3 + return v1 .line 645 :cond_3 @@ -439,9 +443,11 @@ if-eqz p1, :cond_4 - if-ne v1, v2, :cond_4 + iget p1, p0, Landroid/support/v4/widget/AutoScrollHelper;->mEdgeType:I + + if-ne p1, v2, :cond_4 - return v3 + return v1 :cond_4 :goto_0 @@ -798,6 +804,8 @@ .method public setActivationDelay(I)Landroid/support/v4/widget/AutoScrollHelper; .locals 0 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 420 iput p1, p0, Landroid/support/v4/widget/AutoScrollHelper;->mActivationDelay:I @@ -807,6 +815,8 @@ .method public setEdgeType(I)Landroid/support/v4/widget/AutoScrollHelper; .locals 0 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 359 iput p1, p0, Landroid/support/v4/widget/AutoScrollHelper;->mEdgeType:I @@ -845,6 +855,8 @@ .method public setMaximumEdges(FF)Landroid/support/v4/widget/AutoScrollHelper; .locals 2 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 402 iget-object v0, p0, Landroid/support/v4/widget/AutoScrollHelper;->mMaximumEdges:[F @@ -863,6 +875,8 @@ .method public setMaximumVelocity(FF)Landroid/support/v4/widget/AutoScrollHelper; .locals 3 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 296 iget-object v0, p0, Landroid/support/v4/widget/AutoScrollHelper;->mMaximumVelocity:[F @@ -887,6 +901,8 @@ .method public setMinimumVelocity(FF)Landroid/support/v4/widget/AutoScrollHelper; .locals 3 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 315 iget-object v0, p0, Landroid/support/v4/widget/AutoScrollHelper;->mMinimumVelocity:[F @@ -911,6 +927,8 @@ .method public setRampDownDuration(I)Landroid/support/v4/widget/AutoScrollHelper; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 452 iget-object v0, p0, Landroid/support/v4/widget/AutoScrollHelper;->mScroller:Landroid/support/v4/widget/AutoScrollHelper$ClampedScroller; @@ -922,6 +940,8 @@ .method public setRampUpDuration(I)Landroid/support/v4/widget/AutoScrollHelper; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 436 iget-object v0, p0, Landroid/support/v4/widget/AutoScrollHelper;->mScroller:Landroid/support/v4/widget/AutoScrollHelper$ClampedScroller; @@ -933,6 +953,8 @@ .method public setRelativeEdges(FF)Landroid/support/v4/widget/AutoScrollHelper; .locals 2 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 379 iget-object v0, p0, Landroid/support/v4/widget/AutoScrollHelper;->mRelativeEdges:[F @@ -951,6 +973,8 @@ .method public setRelativeVelocity(FF)Landroid/support/v4/widget/AutoScrollHelper; .locals 3 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 337 iget-object v0, p0, Landroid/support/v4/widget/AutoScrollHelper;->mRelativeVelocity:[F diff --git a/smali/android/support/v4/widget/AutoSizeableTextView.smali b/smali/android/support/v4/widget/AutoSizeableTextView.smali index d04d1658..8bb45224 100644 --- a/smali/android/support/v4/widget/AutoSizeableTextView.smali +++ b/smali/android/support/v4/widget/AutoSizeableTextView.smali @@ -3,8 +3,22 @@ .source "AutoSizeableTextView.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field public static final PLATFORM_SUPPORTS_AUTOSIZE:Z + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field # direct methods @@ -57,6 +71,10 @@ .end method .method public abstract setAutoSizeTextTypeUniformWithPresetSizes([II)V + .param p1 # [I + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Ljava/lang/IllegalArgumentException; diff --git a/smali/android/support/v4/widget/CircleImageView$OvalShadow.smali b/smali/android/support/v4/widget/CircleImageView$OvalShadow.smali index 37006ab5..9596598f 100644 --- a/smali/android/support/v4/widget/CircleImageView$OvalShadow.smali +++ b/smali/android/support/v4/widget/CircleImageView$OvalShadow.smali @@ -95,7 +95,9 @@ .line 156 iget-object p1, p0, Landroid/support/v4/widget/CircleImageView$OvalShadow;->mShadowPaint:Landroid/graphics/Paint; - invoke-virtual {p1, v7}, Landroid/graphics/Paint;->setShader(Landroid/graphics/Shader;)Landroid/graphics/Shader; + iget-object v0, p0, Landroid/support/v4/widget/CircleImageView$OvalShadow;->mRadialGradient:Landroid/graphics/RadialGradient; + + invoke-virtual {p1, v0}, Landroid/graphics/Paint;->setShader(Landroid/graphics/Shader;)Landroid/graphics/Shader; return-void diff --git a/smali/android/support/v4/widget/CircularProgressDrawable$ProgressDrawableSize.smali b/smali/android/support/v4/widget/CircularProgressDrawable$ProgressDrawableSize.smali index 92b06868..8085f0be 100644 --- a/smali/android/support/v4/widget/CircularProgressDrawable$ProgressDrawableSize.smali +++ b/smali/android/support/v4/widget/CircularProgressDrawable$ProgressDrawableSize.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/widget/CircularProgressDrawable; .end annotation diff --git a/smali/android/support/v4/widget/CircularProgressDrawable$Ring.smali b/smali/android/support/v4/widget/CircularProgressDrawable$Ring.smali index c2352629..5f25bc0f 100644 --- a/smali/android/support/v4/widget/CircularProgressDrawable$Ring.smali +++ b/smali/android/support/v4/widget/CircularProgressDrawable$Ring.smali @@ -60,7 +60,7 @@ # direct methods .method constructor ()V - .locals 5 + .locals 3 .line 650 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -80,72 +80,84 @@ iput-object v0, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mPaint:Landroid/graphics/Paint; .line 625 - new-instance v1, Landroid/graphics/Paint; + new-instance v0, Landroid/graphics/Paint; - invoke-direct {v1}, Landroid/graphics/Paint;->()V + invoke-direct {v0}, Landroid/graphics/Paint;->()V - iput-object v1, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mArrowPaint:Landroid/graphics/Paint; + iput-object v0, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mArrowPaint:Landroid/graphics/Paint; .line 626 - new-instance v2, Landroid/graphics/Paint; + new-instance v0, Landroid/graphics/Paint; - invoke-direct {v2}, Landroid/graphics/Paint;->()V + invoke-direct {v0}, Landroid/graphics/Paint;->()V - iput-object v2, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mCirclePaint:Landroid/graphics/Paint; + iput-object v0, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mCirclePaint:Landroid/graphics/Paint; - const/4 v3, 0x0 + const/4 v0, 0x0 .line 628 - iput v3, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mStartTrim:F + iput v0, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mStartTrim:F .line 629 - iput v3, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mEndTrim:F + iput v0, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mEndTrim:F .line 630 - iput v3, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mRotation:F + iput v0, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mRotation:F - const/high16 v3, 0x40a00000 # 5.0f + const/high16 v0, 0x40a00000 # 5.0f .line 631 - iput v3, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mStrokeWidth:F + iput v0, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mStrokeWidth:F - const/high16 v3, 0x3f800000 # 1.0f + const/high16 v0, 0x3f800000 # 1.0f .line 643 - iput v3, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mArrowScale:F + iput v0, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mArrowScale:F - const/16 v3, 0xff + const/16 v0, 0xff .line 647 - iput v3, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mAlpha:I + iput v0, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mAlpha:I .line 651 - sget-object v3, Landroid/graphics/Paint$Cap;->SQUARE:Landroid/graphics/Paint$Cap; + iget-object v0, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mPaint:Landroid/graphics/Paint; - invoke-virtual {v0, v3}, Landroid/graphics/Paint;->setStrokeCap(Landroid/graphics/Paint$Cap;)V + sget-object v1, Landroid/graphics/Paint$Cap;->SQUARE:Landroid/graphics/Paint$Cap; - const/4 v3, 0x1 + invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setStrokeCap(Landroid/graphics/Paint$Cap;)V .line 652 - invoke-virtual {v0, v3}, Landroid/graphics/Paint;->setAntiAlias(Z)V + iget-object v0, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mPaint:Landroid/graphics/Paint; + + const/4 v1, 0x1 + + invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setAntiAlias(Z)V .line 653 - sget-object v4, Landroid/graphics/Paint$Style;->STROKE:Landroid/graphics/Paint$Style; + iget-object v0, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mPaint:Landroid/graphics/Paint; + + sget-object v2, Landroid/graphics/Paint$Style;->STROKE:Landroid/graphics/Paint$Style; - invoke-virtual {v0, v4}, Landroid/graphics/Paint;->setStyle(Landroid/graphics/Paint$Style;)V + invoke-virtual {v0, v2}, Landroid/graphics/Paint;->setStyle(Landroid/graphics/Paint$Style;)V .line 655 - sget-object v0, Landroid/graphics/Paint$Style;->FILL:Landroid/graphics/Paint$Style; + iget-object v0, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mArrowPaint:Landroid/graphics/Paint; - invoke-virtual {v1, v0}, Landroid/graphics/Paint;->setStyle(Landroid/graphics/Paint$Style;)V + sget-object v2, Landroid/graphics/Paint$Style;->FILL:Landroid/graphics/Paint$Style; + + invoke-virtual {v0, v2}, Landroid/graphics/Paint;->setStyle(Landroid/graphics/Paint$Style;)V .line 656 - invoke-virtual {v1, v3}, Landroid/graphics/Paint;->setAntiAlias(Z)V + iget-object v0, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mArrowPaint:Landroid/graphics/Paint; - const/4 v0, 0x0 + invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setAntiAlias(Z)V .line 658 - invoke-virtual {v2, v0}, Landroid/graphics/Paint;->setColor(I)V + iget-object v0, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mCirclePaint:Landroid/graphics/Paint; + + const/4 v1, 0x0 + + invoke-virtual {v0, v1}, Landroid/graphics/Paint;->setColor(I)V return-void .end method @@ -360,6 +372,8 @@ iput-object v0, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mArrow:Landroid/graphics/Path; .line 727 + iget-object v0, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mArrow:Landroid/graphics/Path; + sget-object v1, Landroid/graphics/Path$FillType;->EVEN_ODD:Landroid/graphics/Path$FillType; invoke-virtual {v0, v1}, Landroid/graphics/Path;->setFillType(Landroid/graphics/Path$FillType;)V @@ -845,9 +859,11 @@ iput p1, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mColorIndex:I .line 798 - iget-object v0, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mColors:[I + iget-object p1, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mColors:[I + + iget v0, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mColorIndex:I - aget p1, v0, p1 + aget p1, p1, v0 iput p1, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mCurrentColor:I @@ -856,6 +872,10 @@ .method setColors([I)V .locals 0 + .param p1 # [I + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 761 iput-object p1, p0, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->mColors:[I diff --git a/smali/android/support/v4/widget/CircularProgressDrawable.smali b/smali/android/support/v4/widget/CircularProgressDrawable.smali index 459243ff..4f467eff 100644 --- a/smali/android/support/v4/widget/CircularProgressDrawable.smali +++ b/smali/android/support/v4/widget/CircularProgressDrawable.smali @@ -91,6 +91,7 @@ const/4 v0, 0x1 + .line 97 new-array v0, v0, [I const/4 v1, 0x0 @@ -99,7 +100,6 @@ aput v2, v0, v1 - .line 97 sput-object v0, Landroid/support/v4/widget/CircularProgressDrawable;->COLORS:[I return-void @@ -107,6 +107,10 @@ .method public constructor (Landroid/content/Context;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 138 invoke-direct {p0}, Landroid/graphics/drawable/Drawable;->()V @@ -132,6 +136,8 @@ iput-object p1, p0, Landroid/support/v4/widget/CircularProgressDrawable;->mRing:Landroid/support/v4/widget/CircularProgressDrawable$Ring; .line 142 + iget-object p1, p0, Landroid/support/v4/widget/CircularProgressDrawable;->mRing:Landroid/support/v4/widget/CircularProgressDrawable$Ring; + sget-object v0, Landroid/support/v4/widget/CircularProgressDrawable;->COLORS:[I invoke-virtual {p1, v0}, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->setColors([I)V @@ -383,9 +389,9 @@ const/4 v1, 0x2 + .line 567 new-array v1, v1, [F - .line 567 fill-array-data v1, :array_0 invoke-static {v1}, Landroid/animation/ValueAnimator;->ofFloat([F)Landroid/animation/ValueAnimator; @@ -494,6 +500,12 @@ add-float/2addr v0, v3 + move v6, v3 + + move v3, v0 + + move v0, v6 + goto :goto_0 :cond_2 @@ -524,12 +536,6 @@ sub-float v0, v3, v0 - move v6, v3 - - move v3, v0 - - move v0, v6 - :goto_0 const v1, 0x3e570a3c # 0.20999998f @@ -547,10 +553,10 @@ mul-float p1, p1, v1 .line 558 - invoke-virtual {p2, v3}, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->setStartTrim(F)V + invoke-virtual {p2, v0}, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->setStartTrim(F)V .line 559 - invoke-virtual {p2, v0}, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->setEndTrim(F)V + invoke-virtual {p2, v3}, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->setEndTrim(F)V .line 560 invoke-virtual {p2, p3}, Landroid/support/v4/widget/CircularProgressDrawable$Ring;->setRotation(F)V @@ -691,6 +697,8 @@ .method public getColorSchemeColors()[I .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 382 iget-object v0, p0, Landroid/support/v4/widget/CircularProgressDrawable;->mRing:Landroid/support/v4/widget/CircularProgressDrawable$Ring; @@ -751,6 +759,8 @@ .method public getStrokeCap()Landroid/graphics/Paint$Cap; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 233 iget-object v0, p0, Landroid/support/v4/widget/CircularProgressDrawable;->mRing:Landroid/support/v4/widget/CircularProgressDrawable$Ring; @@ -888,6 +898,10 @@ .method public varargs setColorSchemeColors([I)V .locals 1 + .param p1 # [I + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 392 iget-object v0, p0, Landroid/support/v4/widget/CircularProgressDrawable;->mRing:Landroid/support/v4/widget/CircularProgressDrawable$Ring; @@ -942,6 +956,10 @@ .method public setStrokeCap(Landroid/graphics/Paint$Cap;)V .locals 1 + .param p1 # Landroid/graphics/Paint$Cap; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 222 iget-object v0, p0, Landroid/support/v4/widget/CircularProgressDrawable;->mRing:Landroid/support/v4/widget/CircularProgressDrawable$Ring; diff --git a/smali/android/support/v4/widget/CompoundButtonCompat.smali b/smali/android/support/v4/widget/CompoundButtonCompat.smali index 088f2fb6..a6768fe8 100644 --- a/smali/android/support/v4/widget/CompoundButtonCompat.smali +++ b/smali/android/support/v4/widget/CompoundButtonCompat.smali @@ -23,6 +23,12 @@ .method public static getButtonDrawable(Landroid/widget/CompoundButton;)Landroid/graphics/drawable/Drawable; .locals 4 + .param p0 # Landroid/widget/CompoundButton; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 123 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -61,6 +67,8 @@ sput-object v2, Landroid/support/v4/widget/CompoundButtonCompat;->sButtonDrawableField:Ljava/lang/reflect/Field; .line 130 + sget-object v2, Landroid/support/v4/widget/CompoundButtonCompat;->sButtonDrawableField:Ljava/lang/reflect/Field; + invoke-virtual {v2, v0}, Ljava/lang/reflect/Field;->setAccessible(Z)V :try_end_0 .catch Ljava/lang/NoSuchFieldException; {:try_start_0 .. :try_end_0} :catch_0 @@ -116,6 +124,12 @@ .method public static getButtonTintList(Landroid/widget/CompoundButton;)Landroid/content/res/ColorStateList; .locals 2 + .param p0 # Landroid/widget/CompoundButton; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 71 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -154,6 +168,12 @@ .method public static getButtonTintMode(Landroid/widget/CompoundButton;)Landroid/graphics/PorterDuff$Mode; .locals 2 + .param p0 # Landroid/widget/CompoundButton; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 107 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -192,6 +212,14 @@ .method public static setButtonTintList(Landroid/widget/CompoundButton;Landroid/content/res/ColorStateList;)V .locals 2 + .param p0 # Landroid/widget/CompoundButton; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 57 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -223,6 +251,14 @@ .method public static setButtonTintMode(Landroid/widget/CompoundButton;Landroid/graphics/PorterDuff$Mode;)V .locals 2 + .param p0 # Landroid/widget/CompoundButton; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/graphics/PorterDuff$Mode; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 93 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/widget/ContentLoadingProgressBar$1.smali b/smali/android/support/v4/widget/ContentLoadingProgressBar$1.smali index af8d78bf..7ad70bf3 100644 --- a/smali/android/support/v4/widget/ContentLoadingProgressBar$1.smali +++ b/smali/android/support/v4/widget/ContentLoadingProgressBar$1.smali @@ -45,18 +45,14 @@ iput-boolean v1, v0, Landroid/support/v4/widget/ContentLoadingProgressBar;->mPostedHide:Z - .line 50 - iget-object v0, p0, Landroid/support/v4/widget/ContentLoadingProgressBar$1;->this$0:Landroid/support/v4/widget/ContentLoadingProgressBar; - const-wide/16 v1, -0x1 + .line 50 iput-wide v1, v0, Landroid/support/v4/widget/ContentLoadingProgressBar;->mStartTime:J - .line 51 - iget-object v0, p0, Landroid/support/v4/widget/ContentLoadingProgressBar$1;->this$0:Landroid/support/v4/widget/ContentLoadingProgressBar; - const/16 v1, 0x8 + .line 51 invoke-virtual {v0, v1}, Landroid/support/v4/widget/ContentLoadingProgressBar;->setVisibility(I)V return-void diff --git a/smali/android/support/v4/widget/ContentLoadingProgressBar$2.smali b/smali/android/support/v4/widget/ContentLoadingProgressBar$2.smali index 1f9c9a08..fa7f4818 100644 --- a/smali/android/support/v4/widget/ContentLoadingProgressBar$2.smali +++ b/smali/android/support/v4/widget/ContentLoadingProgressBar$2.smali @@ -46,8 +46,6 @@ iput-boolean v1, v0, Landroid/support/v4/widget/ContentLoadingProgressBar;->mPostedShow:Z .line 60 - iget-object v0, p0, Landroid/support/v4/widget/ContentLoadingProgressBar$2;->this$0:Landroid/support/v4/widget/ContentLoadingProgressBar; - iget-boolean v0, v0, Landroid/support/v4/widget/ContentLoadingProgressBar;->mDismissed:Z if-nez v0, :cond_0 diff --git a/smali/android/support/v4/widget/ContentLoadingProgressBar.smali b/smali/android/support/v4/widget/ContentLoadingProgressBar.smali index d1ed1607..f9242483 100644 --- a/smali/android/support/v4/widget/ContentLoadingProgressBar.smali +++ b/smali/android/support/v4/widget/ContentLoadingProgressBar.smali @@ -26,6 +26,10 @@ # direct methods .method public constructor (Landroid/content/Context;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 v0, 0x0 @@ -37,6 +41,14 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param const/4 v0, 0x0 @@ -122,15 +134,18 @@ sub-long/2addr v1, v3 - const-wide/16 v5, 0x1f4 + const-wide/16 v3, 0x1f4 - cmp-long v7, v1, v5 + cmp-long v5, v1, v3 - if-gez v7, :cond_1 + if-gez v5, :cond_1 + + .line 102 + iget-wide v5, p0, Landroid/support/v4/widget/ContentLoadingProgressBar;->mStartTime:J const-wide/16 v7, -0x1 - cmp-long v9, v3, v7 + cmp-long v9, v5, v7 if-nez v9, :cond_0 @@ -138,16 +153,16 @@ .line 111 :cond_0 - iget-boolean v3, p0, Landroid/support/v4/widget/ContentLoadingProgressBar;->mPostedHide:Z + iget-boolean v5, p0, Landroid/support/v4/widget/ContentLoadingProgressBar;->mPostedHide:Z - if-nez v3, :cond_2 + if-nez v5, :cond_2 .line 112 - iget-object v3, p0, Landroid/support/v4/widget/ContentLoadingProgressBar;->mDelayedHide:Ljava/lang/Runnable; + iget-object v5, p0, Landroid/support/v4/widget/ContentLoadingProgressBar;->mDelayedHide:Ljava/lang/Runnable; - sub-long/2addr v5, v1 + sub-long/2addr v3, v1 - invoke-virtual {p0, v3, v5, v6}, Landroid/support/v4/widget/ContentLoadingProgressBar;->postDelayed(Ljava/lang/Runnable;J)Z + invoke-virtual {p0, v5, v3, v4}, Landroid/support/v4/widget/ContentLoadingProgressBar;->postDelayed(Ljava/lang/Runnable;J)Z .line 113 iput-boolean v0, p0, Landroid/support/v4/widget/ContentLoadingProgressBar;->mPostedHide:Z diff --git a/smali/android/support/v4/widget/CursorAdapter$MyDataSetObserver.smali b/smali/android/support/v4/widget/CursorAdapter$MyDataSetObserver.smali index 9b4e52c7..b7746a17 100644 --- a/smali/android/support/v4/widget/CursorAdapter$MyDataSetObserver.smali +++ b/smali/android/support/v4/widget/CursorAdapter$MyDataSetObserver.smali @@ -43,8 +43,6 @@ iput-boolean v1, v0, Landroid/support/v4/widget/CursorAdapter;->mDataValid:Z .line 498 - iget-object v0, p0, Landroid/support/v4/widget/CursorAdapter$MyDataSetObserver;->this$0:Landroid/support/v4/widget/CursorAdapter; - invoke-virtual {v0}, Landroid/support/v4/widget/CursorAdapter;->notifyDataSetChanged()V return-void @@ -61,8 +59,6 @@ iput-boolean v1, v0, Landroid/support/v4/widget/CursorAdapter;->mDataValid:Z .line 504 - iget-object v0, p0, Landroid/support/v4/widget/CursorAdapter$MyDataSetObserver;->this$0:Landroid/support/v4/widget/CursorAdapter; - invoke-virtual {v0}, Landroid/support/v4/widget/CursorAdapter;->notifyDataSetInvalidated()V return-void diff --git a/smali/android/support/v4/widget/CursorAdapter.smali b/smali/android/support/v4/widget/CursorAdapter.smali index 978bcd1a..7704c303 100644 --- a/smali/android/support/v4/widget/CursorAdapter.smali +++ b/smali/android/support/v4/widget/CursorAdapter.smali @@ -27,22 +27,76 @@ # instance fields .field protected mAutoRequery:Z + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field .field protected mChangeObserver:Landroid/support/v4/widget/CursorAdapter$ChangeObserver; + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field .field protected mContext:Landroid/content/Context; + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field .field protected mCursor:Landroid/database/Cursor; + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field .field protected mCursorFilter:Landroid/support/v4/widget/CursorFilter; + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field .field protected mDataSetObserver:Landroid/database/DataSetObserver; + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field .field protected mDataValid:Z + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field .field protected mFilterQueryProvider:Landroid/widget/FilterQueryProvider; + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field .field protected mRowIDColumn:I + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field # direct methods diff --git a/smali/android/support/v4/widget/DirectedAcyclicGraph.smali b/smali/android/support/v4/widget/DirectedAcyclicGraph.smali index d5258ebb..760b26a6 100644 --- a/smali/android/support/v4/widget/DirectedAcyclicGraph.smali +++ b/smali/android/support/v4/widget/DirectedAcyclicGraph.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(Ljava/lang/String;)V - goto :goto_2 - - :goto_1 throw p1 - :goto_2 - goto :goto_1 + return-void .end method .method private getEmptyList()Ljava/util/ArrayList; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "()", @@ -217,6 +222,10 @@ .method private poolList(Ljava/util/ArrayList;)V .locals 1 + .param p1 # Ljava/util/ArrayList; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -240,6 +249,14 @@ # virtual methods .method public addEdge(Ljava/lang/Object;Ljava/lang/Object;)V .locals 2 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(TT;TT;)V" @@ -303,6 +320,10 @@ .method public addNode(Ljava/lang/Object;)V .locals 2 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(TT;)V" @@ -374,6 +395,10 @@ .method public contains(Ljava/lang/Object;)Z .locals 1 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(TT;)Z" @@ -392,6 +417,13 @@ .method public getIncomingEdges(Ljava/lang/Object;)Ljava/util/List; .locals 1 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(TT;)", @@ -413,6 +445,13 @@ .method public getOutgoingEdges(Ljava/lang/Object;)Ljava/util/List; .locals 4 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(TT;)", @@ -481,6 +520,9 @@ .method public getSortedList()Ljava/util/ArrayList; .locals 5 + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "()", @@ -537,6 +579,10 @@ .method public hasOutgoingEdges(Ljava/lang/Object;)Z .locals 4 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(TT;)Z" diff --git a/smali/android/support/v4/widget/DrawerLayout$DrawerListener.smali b/smali/android/support/v4/widget/DrawerLayout$DrawerListener.smali index e1a56d96..970e6ab5 100644 --- a/smali/android/support/v4/widget/DrawerLayout$DrawerListener.smali +++ b/smali/android/support/v4/widget/DrawerLayout$DrawerListener.smali @@ -16,12 +16,24 @@ # virtual methods .method public abstract onDrawerClosed(Landroid/view/View;)V + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method .method public abstract onDrawerOpened(Landroid/view/View;)V + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method .method public abstract onDrawerSlide(Landroid/view/View;F)V + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method .method public abstract onDrawerStateChanged(I)V diff --git a/smali/android/support/v4/widget/DrawerLayout$LayoutParams.smali b/smali/android/support/v4/widget/DrawerLayout$LayoutParams.smali index 1a4ee613..66ec5a0f 100644 --- a/smali/android/support/v4/widget/DrawerLayout$LayoutParams.smali +++ b/smali/android/support/v4/widget/DrawerLayout$LayoutParams.smali @@ -61,6 +61,14 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V .locals 2 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 2319 invoke-direct {p0, p1, p2}, Landroid/view/ViewGroup$MarginLayoutParams;->(Landroid/content/Context;Landroid/util/AttributeSet;)V @@ -92,6 +100,10 @@ .method public constructor (Landroid/support/v4/widget/DrawerLayout$LayoutParams;)V .locals 1 + .param p1 # Landroid/support/v4/widget/DrawerLayout$LayoutParams; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2336 invoke-direct {p0, p1}, Landroid/view/ViewGroup$MarginLayoutParams;->(Landroid/view/ViewGroup$MarginLayoutParams;)V @@ -111,6 +123,10 @@ .method public constructor (Landroid/view/ViewGroup$LayoutParams;)V .locals 0 + .param p1 # Landroid/view/ViewGroup$LayoutParams; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2341 invoke-direct {p0, p1}, Landroid/view/ViewGroup$MarginLayoutParams;->(Landroid/view/ViewGroup$LayoutParams;)V @@ -125,6 +141,10 @@ .method public constructor (Landroid/view/ViewGroup$MarginLayoutParams;)V .locals 0 + .param p1 # Landroid/view/ViewGroup$MarginLayoutParams; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2345 invoke-direct {p0, p1}, Landroid/view/ViewGroup$MarginLayoutParams;->(Landroid/view/ViewGroup$MarginLayoutParams;)V diff --git a/smali/android/support/v4/widget/DrawerLayout$SavedState.smali b/smali/android/support/v4/widget/DrawerLayout$SavedState.smali index 3d797ed9..1e06bd48 100644 --- a/smali/android/support/v4/widget/DrawerLayout$SavedState.smali +++ b/smali/android/support/v4/widget/DrawerLayout$SavedState.smali @@ -54,6 +54,14 @@ .method public constructor (Landroid/os/Parcel;Ljava/lang/ClassLoader;)V .locals 0 + .param p1 # Landroid/os/Parcel; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/ClassLoader; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 2102 invoke-direct {p0, p1, p2}, Landroid/support/v4/view/AbsSavedState;->(Landroid/os/Parcel;Ljava/lang/ClassLoader;)V @@ -103,6 +111,10 @@ .method public constructor (Landroid/os/Parcelable;)V .locals 0 + .param p1 # Landroid/os/Parcelable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2111 invoke-direct {p0, p1}, Landroid/support/v4/view/AbsSavedState;->(Landroid/os/Parcelable;)V diff --git a/smali/android/support/v4/widget/DrawerLayout.smali b/smali/android/support/v4/widget/DrawerLayout.smali index ab49ea96..44090233 100644 --- a/smali/android/support/v4/widget/DrawerLayout.smali +++ b/smali/android/support/v4/widget/DrawerLayout.smali @@ -91,6 +91,9 @@ .field private final mLeftDragger:Landroid/support/v4/widget/ViewDragHelper; .field private mListener:Landroid/support/v4/widget/DrawerLayout$DrawerListener; + .annotation build Landroid/support/annotation/Nullable; + .end annotation +.end field .field private mListeners:Ljava/util/List; .annotation system Ldalvik/annotation/Signature; @@ -157,32 +160,32 @@ const/4 v0, 0x1 + .line 104 new-array v1, v0, [I - const v2, 0x1010434 + const/4 v2, 0x0 - const/4 v3, 0x0 + const v3, 0x1010434 - aput v2, v1, v3 + aput v3, v1, v2 - .line 104 sput-object v1, Landroid/support/v4/widget/DrawerLayout;->THEME_ATTRS:[I + .line 184 new-array v1, v0, [I - const v2, 0x10100b3 + const v3, 0x10100b3 - aput v2, v1, v3 + aput v3, v1, v2 - .line 184 sput-object v1, Landroid/support/v4/widget/DrawerLayout;->LAYOUT_ATTRS:[I .line 189 sget v1, Landroid/os/Build$VERSION;->SDK_INT:I - const/16 v2, 0x13 + const/16 v3, 0x13 - if-lt v1, v2, :cond_0 + if-lt v1, v3, :cond_0 const/4 v1, 0x1 @@ -197,9 +200,9 @@ .line 192 sget v1, Landroid/os/Build$VERSION;->SDK_INT:I - const/16 v2, 0x15 + const/16 v3, 0x15 - if-lt v1, v2, :cond_1 + if-lt v1, v3, :cond_1 goto :goto_1 @@ -214,6 +217,10 @@ .method public constructor (Landroid/content/Context;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 v0, 0x0 @@ -225,6 +232,14 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param const/4 v0, 0x0 @@ -235,7 +250,15 @@ .end method .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;I)V - .locals 6 + .locals 5 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 314 invoke-direct {p0, p1, p2, p3}, Landroid/view/ViewGroup;->(Landroid/content/Context;Landroid/util/AttributeSet;I)V @@ -335,47 +358,67 @@ .line 321 new-instance p3, Landroid/support/v4/widget/DrawerLayout$ViewDragCallback; - const/4 v4, 0x5 + const/4 v3, 0x5 - invoke-direct {p3, p0, v4}, Landroid/support/v4/widget/DrawerLayout$ViewDragCallback;->(Landroid/support/v4/widget/DrawerLayout;I)V + invoke-direct {p3, p0, v3}, Landroid/support/v4/widget/DrawerLayout$ViewDragCallback;->(Landroid/support/v4/widget/DrawerLayout;I)V iput-object p3, p0, Landroid/support/v4/widget/DrawerLayout;->mRightCallback:Landroid/support/v4/widget/DrawerLayout$ViewDragCallback; - const/high16 v4, 0x3f800000 # 1.0f - .line 323 - invoke-static {p0, v4, v3}, Landroid/support/v4/widget/ViewDragHelper;->create(Landroid/view/ViewGroup;FLandroid/support/v4/widget/ViewDragHelper$Callback;)Landroid/support/v4/widget/ViewDragHelper; + iget-object p3, p0, Landroid/support/v4/widget/DrawerLayout;->mLeftCallback:Landroid/support/v4/widget/DrawerLayout$ViewDragCallback; - move-result-object v5 + const/high16 v3, 0x3f800000 # 1.0f + + invoke-static {p0, v3, p3}, Landroid/support/v4/widget/ViewDragHelper;->create(Landroid/view/ViewGroup;FLandroid/support/v4/widget/ViewDragHelper$Callback;)Landroid/support/v4/widget/ViewDragHelper; + + move-result-object p3 - iput-object v5, p0, Landroid/support/v4/widget/DrawerLayout;->mLeftDragger:Landroid/support/v4/widget/ViewDragHelper; + iput-object p3, p0, Landroid/support/v4/widget/DrawerLayout;->mLeftDragger:Landroid/support/v4/widget/ViewDragHelper; .line 324 - invoke-virtual {v5, p2}, Landroid/support/v4/widget/ViewDragHelper;->setEdgeTrackingEnabled(I)V + iget-object p3, p0, Landroid/support/v4/widget/DrawerLayout;->mLeftDragger:Landroid/support/v4/widget/ViewDragHelper; + + invoke-virtual {p3, p2}, Landroid/support/v4/widget/ViewDragHelper;->setEdgeTrackingEnabled(I)V .line 325 - invoke-virtual {v5, v2}, Landroid/support/v4/widget/ViewDragHelper;->setMinVelocity(F)V + iget-object p3, p0, Landroid/support/v4/widget/DrawerLayout;->mLeftDragger:Landroid/support/v4/widget/ViewDragHelper; + + invoke-virtual {p3, v2}, Landroid/support/v4/widget/ViewDragHelper;->setMinVelocity(F)V .line 326 - invoke-virtual {v3, v5}, Landroid/support/v4/widget/DrawerLayout$ViewDragCallback;->setDragger(Landroid/support/v4/widget/ViewDragHelper;)V + iget-object p3, p0, Landroid/support/v4/widget/DrawerLayout;->mLeftCallback:Landroid/support/v4/widget/DrawerLayout$ViewDragCallback; + + iget-object v4, p0, Landroid/support/v4/widget/DrawerLayout;->mLeftDragger:Landroid/support/v4/widget/ViewDragHelper; + + invoke-virtual {p3, v4}, Landroid/support/v4/widget/DrawerLayout$ViewDragCallback;->setDragger(Landroid/support/v4/widget/ViewDragHelper;)V .line 328 - invoke-static {p0, v4, p3}, Landroid/support/v4/widget/ViewDragHelper;->create(Landroid/view/ViewGroup;FLandroid/support/v4/widget/ViewDragHelper$Callback;)Landroid/support/v4/widget/ViewDragHelper; + iget-object p3, p0, Landroid/support/v4/widget/DrawerLayout;->mRightCallback:Landroid/support/v4/widget/DrawerLayout$ViewDragCallback; - move-result-object v3 + invoke-static {p0, v3, p3}, Landroid/support/v4/widget/ViewDragHelper;->create(Landroid/view/ViewGroup;FLandroid/support/v4/widget/ViewDragHelper$Callback;)Landroid/support/v4/widget/ViewDragHelper; - iput-object v3, p0, Landroid/support/v4/widget/DrawerLayout;->mRightDragger:Landroid/support/v4/widget/ViewDragHelper; + move-result-object p3 - const/4 v4, 0x2 + iput-object p3, p0, Landroid/support/v4/widget/DrawerLayout;->mRightDragger:Landroid/support/v4/widget/ViewDragHelper; .line 329 - invoke-virtual {v3, v4}, Landroid/support/v4/widget/ViewDragHelper;->setEdgeTrackingEnabled(I)V + iget-object p3, p0, Landroid/support/v4/widget/DrawerLayout;->mRightDragger:Landroid/support/v4/widget/ViewDragHelper; + + const/4 v3, 0x2 + + invoke-virtual {p3, v3}, Landroid/support/v4/widget/ViewDragHelper;->setEdgeTrackingEnabled(I)V .line 330 - invoke-virtual {v3, v2}, Landroid/support/v4/widget/ViewDragHelper;->setMinVelocity(F)V + iget-object p3, p0, Landroid/support/v4/widget/DrawerLayout;->mRightDragger:Landroid/support/v4/widget/ViewDragHelper; + + invoke-virtual {p3, v2}, Landroid/support/v4/widget/ViewDragHelper;->setMinVelocity(F)V .line 331 - invoke-virtual {p3, v3}, Landroid/support/v4/widget/DrawerLayout$ViewDragCallback;->setDragger(Landroid/support/v4/widget/ViewDragHelper;)V + iget-object p3, p0, Landroid/support/v4/widget/DrawerLayout;->mRightCallback:Landroid/support/v4/widget/DrawerLayout$ViewDragCallback; + + iget-object v2, p0, Landroid/support/v4/widget/DrawerLayout;->mRightDragger:Landroid/support/v4/widget/ViewDragHelper; + + invoke-virtual {p3, v2}, Landroid/support/v4/widget/DrawerLayout$ViewDragCallback;->setDragger(Landroid/support/v4/widget/ViewDragHelper;)V .line 334 invoke-virtual {p0, p2}, Landroid/support/v4/widget/DrawerLayout;->setFocusableInTouchMode(Z)V @@ -1021,6 +1064,10 @@ # virtual methods .method public addDrawerListener(Landroid/support/v4/widget/DrawerLayout$DrawerListener;)V .locals 1 + .param p1 # Landroid/support/v4/widget/DrawerLayout$DrawerListener; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param if-nez p1, :cond_0 @@ -1387,6 +1434,10 @@ .method public closeDrawer(Landroid/view/View;)V .locals 1 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 v0, 0x1 @@ -1398,6 +1449,10 @@ .method public closeDrawer(Landroid/view/View;Z)V .locals 4 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1757 invoke-virtual {p0, p1}, Landroid/support/v4/widget/DrawerLayout;->isDrawerView(Landroid/view/View;)Z @@ -2074,15 +2129,17 @@ move-result v9 - const/4 v10, 0x0 + move v11, v5 - const/4 v11, 0x0 + const/4 v5, 0x0 + + const/4 v10, 0x0 :goto_0 - if-ge v10, v9, :cond_3 + if-ge v5, v9, :cond_3 .line 1409 - invoke-virtual {p0, v10}, Landroid/support/v4/widget/DrawerLayout;->getChildAt(I)Landroid/view/View; + invoke-virtual {p0, v5}, Landroid/support/v4/widget/DrawerLayout;->getChildAt(I)Landroid/view/View; move-result-object v12 @@ -2130,9 +2187,9 @@ move-result v12 - if-le v12, v11, :cond_2 + if-le v12, v10, :cond_2 - move v11, v12 + move v10, v12 goto :goto_1 @@ -2142,13 +2199,13 @@ move-result v12 - if-ge v12, v5, :cond_2 + if-ge v12, v11, :cond_2 - move v5, v12 + move v11, v12 :cond_2 :goto_1 - add-int/lit8 v10, v10, 0x1 + add-int/lit8 v5, v5, 0x1 goto :goto_0 @@ -2158,12 +2215,17 @@ move-result v3 - invoke-virtual {p1, v11, v8, v5, v3}, Landroid/graphics/Canvas;->clipRect(IIII)Z + invoke-virtual {p1, v10, v8, v11, v3}, Landroid/graphics/Canvas;->clipRect(IIII)Z - move v8, v11 + move v8, v10 + + goto :goto_2 - .line 1426 :cond_4 + move v11, v5 + + .line 1426 + :goto_2 invoke-super/range {p0 .. p4}, Landroid/view/ViewGroup;->drawChild(Landroid/graphics/Canvas;Landroid/view/View;J)Z move-result v9 @@ -2174,11 +2236,11 @@ .line 1429 iget v3, v0, Landroid/support/v4/widget/DrawerLayout;->mScrimOpacity:F - const/4 v6, 0x0 + const/4 v5, 0x0 - cmpl-float v10, v3, v6 + cmpl-float v6, v3, v5 - if-lez v10, :cond_5 + if-lez v6, :cond_5 if-eqz v4, :cond_5 @@ -2214,7 +2276,7 @@ const/4 v3, 0x0 - int-to-float v4, v5 + int-to-float v4, v11 .line 1435 invoke-virtual {p0}, Landroid/support/v4/widget/DrawerLayout;->getHeight()I @@ -2229,7 +2291,7 @@ invoke-virtual/range {v1 .. v6}, Landroid/graphics/Canvas;->drawRect(FFFFLandroid/graphics/Paint;)V - goto/16 :goto_2 + goto/16 :goto_3 .line 1436 :cond_5 @@ -2237,7 +2299,7 @@ const/high16 v4, 0x437f0000 # 255.0f - const/high16 v5, 0x3f800000 # 1.0f + const/high16 v6, 0x3f800000 # 1.0f if-eqz v3, :cond_6 @@ -2274,11 +2336,11 @@ div-float/2addr v10, v8 .line 1442 - invoke-static {v10, v5}, Ljava/lang/Math;->min(FF)F + invoke-static {v10, v6}, Ljava/lang/Math;->min(FF)F - move-result v5 + move-result v6 - invoke-static {v6, v5}, Ljava/lang/Math;->max(FF)F + invoke-static {v5, v6}, Ljava/lang/Math;->max(FF)F move-result v5 @@ -2313,7 +2375,7 @@ invoke-virtual {v2, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V - goto :goto_2 + goto :goto_3 .line 1447 :cond_6 @@ -2363,11 +2425,11 @@ div-float/2addr v8, v10 .line 1454 - invoke-static {v8, v5}, Ljava/lang/Math;->min(FF)F + invoke-static {v8, v6}, Ljava/lang/Math;->min(FF)F - move-result v5 + move-result v6 - invoke-static {v6, v5}, Ljava/lang/Math;->max(FF)F + invoke-static {v5, v6}, Ljava/lang/Math;->max(FF)F move-result v5 @@ -2403,7 +2465,7 @@ invoke-virtual {v2, p1}, Landroid/graphics/drawable/Drawable;->draw(Landroid/graphics/Canvas;)V :cond_7 - :goto_2 + :goto_3 return v9 .end method @@ -2766,6 +2828,10 @@ .method public getDrawerLockMode(Landroid/view/View;)I .locals 3 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 709 invoke-virtual {p0, p1}, Landroid/support/v4/widget/DrawerLayout;->isDrawerView(Landroid/view/View;)Z @@ -2819,6 +2885,8 @@ .method public getDrawerTitle(I)Ljava/lang/CharSequence; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 747 invoke-static {p0}, Landroid/support/v4/view/ViewCompat;->getLayoutDirection(Landroid/view/View;)I @@ -2896,6 +2964,8 @@ .method public getStatusBarBackgroundDrawable()Landroid/graphics/drawable/Drawable; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 1350 iget-object v0, p0, Landroid/support/v4/widget/DrawerLayout;->mStatusBarBackground:Landroid/graphics/drawable/Drawable; @@ -2953,6 +3023,10 @@ .method public isDrawerOpen(Landroid/view/View;)Z .locals 3 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1819 invoke-virtual {p0, p1}, Landroid/support/v4/widget/DrawerLayout;->isDrawerView(Landroid/view/View;)Z @@ -3080,6 +3154,10 @@ .method public isDrawerVisible(Landroid/view/View;)Z .locals 3 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1852 invoke-virtual {p0, p1}, Landroid/support/v4/widget/DrawerLayout;->isDrawerView(Landroid/view/View;)Z @@ -3831,6 +3909,11 @@ .method protected onMeasure(II)V .locals 17 + .annotation build Landroid/annotation/SuppressLint; + value = { + "WrongConstant" + } + .end annotation move-object/from16 v0, p0 @@ -4392,13 +4475,9 @@ invoke-direct {v1, v2}, Ljava/lang/IllegalArgumentException;->(Ljava/lang/String;)V - goto :goto_d - - :goto_c throw v1 - :goto_d - goto :goto_c + return-void .end method .method protected onRestoreInstanceState(Landroid/os/Parcelable;)V @@ -4841,6 +4920,10 @@ .method public openDrawer(Landroid/view/View;)V .locals 1 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 v0, 0x1 @@ -4852,6 +4935,10 @@ .method public openDrawer(Landroid/view/View;Z)V .locals 3 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1688 invoke-virtual {p0, p1}, Landroid/support/v4/widget/DrawerLayout;->isDrawerView(Landroid/view/View;)Z @@ -4990,6 +5077,10 @@ .method public removeDrawerListener(Landroid/support/v4/widget/DrawerLayout$DrawerListener;)V .locals 1 + .param p1 # Landroid/support/v4/widget/DrawerLayout$DrawerListener; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param if-nez p1, :cond_0 @@ -5047,6 +5138,11 @@ .method public setChildInsets(Ljava/lang/Object;Z)V .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 405 iput-object p1, p0, Landroid/support/v4/widget/DrawerLayout;->mLastInsets:Ljava/lang/Object; @@ -5275,6 +5371,10 @@ .method public setDrawerLockMode(ILandroid/view/View;)V .locals 2 + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 635 invoke-virtual {p0, p2}, Landroid/support/v4/widget/DrawerLayout;->isDrawerView(Landroid/view/View;)Z @@ -5330,6 +5430,10 @@ .method public setDrawerShadow(II)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .line 465 invoke-virtual {p0}, Landroid/support/v4/widget/DrawerLayout;->getContext()Landroid/content/Context; @@ -5414,6 +5518,10 @@ .method public setDrawerTitle(ILjava/lang/CharSequence;)V .locals 1 + .param p2 # Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 728 invoke-static {p0}, Landroid/support/v4/view/ViewCompat;->getLayoutDirection(Landroid/view/View;)I @@ -5478,6 +5586,10 @@ .method public setScrimColor(I)V .locals 0 + .param p1 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param .line 474 iput p1, p0, Landroid/support/v4/widget/DrawerLayout;->mScrimColor:I @@ -5518,6 +5630,10 @@ .method public setStatusBarBackground(Landroid/graphics/drawable/Drawable;)V .locals 0 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 1339 iput-object p1, p0, Landroid/support/v4/widget/DrawerLayout;->mStatusBarBackground:Landroid/graphics/drawable/Drawable; @@ -5530,6 +5646,10 @@ .method public setStatusBarBackgroundColor(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param .line 1372 new-instance v0, Landroid/graphics/drawable/ColorDrawable; diff --git a/smali/android/support/v4/widget/EdgeEffectCompat.smali b/smali/android/support/v4/widget/EdgeEffectCompat.smali index e7e42f86..32ca162e 100644 --- a/smali/android/support/v4/widget/EdgeEffectCompat.smali +++ b/smali/android/support/v4/widget/EdgeEffectCompat.smali @@ -28,6 +28,10 @@ .method public static onPull(Landroid/widget/EdgeEffect;FF)V .locals 2 + .param p0 # Landroid/widget/EdgeEffect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 152 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/widget/ExploreByTouchHelper.smali b/smali/android/support/v4/widget/ExploreByTouchHelper.smali index 1944abbb..aa898071 100644 --- a/smali/android/support/v4/widget/ExploreByTouchHelper.smali +++ b/smali/android/support/v4/widget/ExploreByTouchHelper.smali @@ -73,11 +73,11 @@ .line 100 new-instance v0, Landroid/graphics/Rect; - const v1, 0x7fffffff + const/high16 v1, -0x80000000 - const/high16 v2, -0x80000000 + const v2, 0x7fffffff - invoke-direct {v0, v1, v1, v2, v2}, Landroid/graphics/Rect;->(IIII)V + invoke-direct {v0, v2, v2, v1, v1}, Landroid/graphics/Rect;->(IIII)V sput-object v0, Landroid/support/v4/widget/ExploreByTouchHelper;->INVALID_PARENT_BOUNDS:Landroid/graphics/Rect; @@ -100,6 +100,10 @@ .method public constructor (Landroid/view/View;)V .locals 2 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 135 invoke-direct {p0}, Landroid/support/v4/view/AccessibilityDelegateCompat;->()V @@ -127,9 +131,9 @@ const/4 v0, 0x2 + .line 107 new-array v0, v0, [I - .line 107 iput-object v0, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mTempGlobalRect:[I const/high16 v0, -0x80000000 @@ -419,6 +423,8 @@ .method private createNodeForChild(I)Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat; .locals 7 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 791 invoke-static {}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->obtain()Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat; @@ -444,12 +450,14 @@ invoke-virtual {v0, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->setBoundsInParent(Landroid/graphics/Rect;)V .line 798 + sget-object v2, Landroid/support/v4/widget/ExploreByTouchHelper;->INVALID_PARENT_BOUNDS:Landroid/graphics/Rect; + invoke-virtual {v0, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->setBoundsInScreen(Landroid/graphics/Rect;)V .line 799 - iget-object v3, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mHost:Landroid/view/View; + iget-object v2, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mHost:Landroid/view/View; - invoke-virtual {v0, v3}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->setParent(Landroid/view/View;)V + invoke-virtual {v0, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->setParent(Landroid/view/View;)V .line 802 invoke-virtual {p0, p1, v0}, Landroid/support/v4/widget/ExploreByTouchHelper;->onPopulateNodeForVirtualView(ILandroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;)V @@ -457,15 +465,15 @@ .line 805 invoke-virtual {v0}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->getText()Ljava/lang/CharSequence; - move-result-object v3 + move-result-object v2 - if-nez v3, :cond_1 + if-nez v2, :cond_1 invoke-virtual {v0}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->getContentDescription()Ljava/lang/CharSequence; - move-result-object v3 + move-result-object v2 - if-eqz v3, :cond_0 + if-eqz v2, :cond_0 goto :goto_0 @@ -482,81 +490,83 @@ .line 810 :cond_1 :goto_0 - iget-object v3, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mTempParentRect:Landroid/graphics/Rect; + iget-object v2, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mTempParentRect:Landroid/graphics/Rect; - invoke-virtual {v0, v3}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->getBoundsInParent(Landroid/graphics/Rect;)V + invoke-virtual {v0, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->getBoundsInParent(Landroid/graphics/Rect;)V .line 811 - iget-object v3, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mTempParentRect:Landroid/graphics/Rect; + iget-object v2, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mTempParentRect:Landroid/graphics/Rect; - invoke-virtual {v3, v2}, Landroid/graphics/Rect;->equals(Ljava/lang/Object;)Z + sget-object v3, Landroid/support/v4/widget/ExploreByTouchHelper;->INVALID_PARENT_BOUNDS:Landroid/graphics/Rect; - move-result v3 + invoke-virtual {v2, v3}, Landroid/graphics/Rect;->equals(Ljava/lang/Object;)Z + + move-result v2 - if-nez v3, :cond_c + if-nez v2, :cond_c .line 816 invoke-virtual {v0}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->getActions()I - move-result v3 + move-result v2 - and-int/lit8 v4, v3, 0x40 + and-int/lit8 v3, v2, 0x40 - if-nez v4, :cond_b + if-nez v3, :cond_b - const/16 v4, 0x80 + const/16 v3, 0x80 - and-int/2addr v3, v4 + and-int/2addr v2, v3 - if-nez v3, :cond_a + if-nez v2, :cond_a .line 827 - iget-object v3, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mHost:Landroid/view/View; + iget-object v2, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mHost:Landroid/view/View; - invoke-virtual {v3}, Landroid/view/View;->getContext()Landroid/content/Context; + invoke-virtual {v2}, Landroid/view/View;->getContext()Landroid/content/Context; - move-result-object v3 + move-result-object v2 - invoke-virtual {v3}, Landroid/content/Context;->getPackageName()Ljava/lang/String; + invoke-virtual {v2}, Landroid/content/Context;->getPackageName()Ljava/lang/String; - move-result-object v3 + move-result-object v2 - invoke-virtual {v0, v3}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->setPackageName(Ljava/lang/CharSequence;)V + invoke-virtual {v0, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->setPackageName(Ljava/lang/CharSequence;)V .line 828 - iget-object v3, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mHost:Landroid/view/View; + iget-object v2, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mHost:Landroid/view/View; - invoke-virtual {v0, v3, p1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->setSource(Landroid/view/View;I)V + invoke-virtual {v0, v2, p1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->setSource(Landroid/view/View;I)V .line 831 - iget v3, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mAccessibilityFocusedVirtualViewId:I + iget v2, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mAccessibilityFocusedVirtualViewId:I - const/4 v5, 0x0 + const/4 v4, 0x0 - if-ne v3, p1, :cond_2 + if-ne v2, p1, :cond_2 .line 832 invoke-virtual {v0, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->setAccessibilityFocused(Z)V .line 833 - invoke-virtual {v0, v4}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->addAction(I)V + invoke-virtual {v0, v3}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->addAction(I)V goto :goto_1 .line 835 :cond_2 - invoke-virtual {v0, v5}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->setAccessibilityFocused(Z)V + invoke-virtual {v0, v4}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->setAccessibilityFocused(Z)V - const/16 v3, 0x40 + const/16 v2, 0x40 .line 836 - invoke-virtual {v0, v3}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->addAction(I)V + invoke-virtual {v0, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->addAction(I)V .line 840 :goto_1 - iget v3, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mKeyboardFocusedVirtualViewId:I + iget v2, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mKeyboardFocusedVirtualViewId:I - if-ne v3, p1, :cond_3 + if-ne v2, p1, :cond_3 const/4 p1, 0x1 @@ -568,10 +578,10 @@ :goto_2 if-eqz p1, :cond_4 - const/4 v3, 0x2 + const/4 v2, 0x2 .line 842 - invoke-virtual {v0, v3}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->addAction(I)V + invoke-virtual {v0, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->addAction(I)V goto :goto_3 @@ -579,9 +589,9 @@ :cond_4 invoke-virtual {v0}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->isFocusable()Z - move-result v3 + move-result v2 - if-eqz v3, :cond_5 + if-eqz v2, :cond_5 .line 844 invoke-virtual {v0, v1}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->addAction(I)V @@ -594,9 +604,9 @@ .line 848 iget-object p1, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mHost:Landroid/view/View; - iget-object v3, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mTempGlobalRect:[I + iget-object v2, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mTempGlobalRect:[I - invoke-virtual {p1, v3}, Landroid/view/View;->getLocationOnScreen([I)V + invoke-virtual {p1, v2}, Landroid/view/View;->getLocationOnScreen([I)V .line 852 iget-object p1, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mTempScreenRect:Landroid/graphics/Rect; @@ -606,6 +616,8 @@ .line 853 iget-object p1, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mTempScreenRect:Landroid/graphics/Rect; + sget-object v2, Landroid/support/v4/widget/ExploreByTouchHelper;->INVALID_PARENT_BOUNDS:Landroid/graphics/Rect; + invoke-virtual {p1, v2}, Landroid/graphics/Rect;->equals(Ljava/lang/Object;)Z move-result p1 @@ -636,14 +648,14 @@ if-eq v3, v2, :cond_6 .line 864 - iget-object v4, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mHost:Landroid/view/View; + iget-object v5, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mHost:Landroid/view/View; - invoke-virtual {p1, v4, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->setParent(Landroid/view/View;I)V + invoke-virtual {p1, v5, v2}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->setParent(Landroid/view/View;I)V .line 865 - sget-object v4, Landroid/support/v4/widget/ExploreByTouchHelper;->INVALID_PARENT_BOUNDS:Landroid/graphics/Rect; + sget-object v5, Landroid/support/v4/widget/ExploreByTouchHelper;->INVALID_PARENT_BOUNDS:Landroid/graphics/Rect; - invoke-virtual {p1, v4}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->setBoundsInParent(Landroid/graphics/Rect;)V + invoke-virtual {p1, v5}, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->setBoundsInParent(Landroid/graphics/Rect;)V .line 867 invoke-virtual {p0, v3, p1}, Landroid/support/v4/widget/ExploreByTouchHelper;->onPopulateNodeForVirtualView(ILandroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;)V @@ -656,15 +668,15 @@ .line 869 iget-object v3, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mTempScreenRect:Landroid/graphics/Rect; - iget-object v4, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mTempParentRect:Landroid/graphics/Rect; + iget-object v5, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mTempParentRect:Landroid/graphics/Rect; - iget v4, v4, Landroid/graphics/Rect;->left:I + iget v5, v5, Landroid/graphics/Rect;->left:I iget-object v6, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mTempParentRect:Landroid/graphics/Rect; iget v6, v6, Landroid/graphics/Rect;->top:I - invoke-virtual {v3, v4, v6}, Landroid/graphics/Rect;->offset(II)V + invoke-virtual {v3, v5, v6}, Landroid/graphics/Rect;->offset(II)V .line 862 iget v3, p1, Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;->mParentVirtualDescendantId:I @@ -681,7 +693,7 @@ iget-object v2, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mTempGlobalRect:[I - aget v2, v2, v5 + aget v2, v2, v4 iget-object v3, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mHost:Landroid/view/View; @@ -695,14 +707,14 @@ aget v3, v3, v1 - iget-object v4, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mHost:Landroid/view/View; + iget-object v5, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mHost:Landroid/view/View; .line 875 - invoke-virtual {v4}, Landroid/view/View;->getScrollY()I + invoke-virtual {v5}, Landroid/view/View;->getScrollY()I - move-result v4 + move-result v5 - sub-int/2addr v3, v4 + sub-int/2addr v3, v5 .line 874 invoke-virtual {p1, v2, v3}, Landroid/graphics/Rect;->offset(II)V @@ -724,7 +736,7 @@ iget-object v2, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mTempGlobalRect:[I - aget v2, v2, v5 + aget v2, v2, v4 iget-object v3, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mHost:Landroid/view/View; @@ -809,17 +821,15 @@ invoke-direct {p1, v0}, Ljava/lang/RuntimeException;->(Ljava/lang/String;)V - goto :goto_6 - - :goto_5 throw p1 - :goto_6 - goto :goto_5 + return-void .end method .method private createNodeForHost()Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat; .locals 6 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 734 iget-object v0, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mHost:Landroid/view/View; @@ -968,6 +978,14 @@ .method private static guessPreviouslyFocusedRect(Landroid/view/View;ILandroid/graphics/Rect;)Landroid/graphics/Rect; .locals 4 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 450 invoke-virtual {p0}, Landroid/view/View;->getWidth()I @@ -1157,6 +1175,10 @@ .method private moveFocus(ILandroid/graphics/Rect;)Z .locals 9 + .param p2 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 372 invoke-direct {p0}, Landroid/support/v4/widget/ExploreByTouchHelper;->getAllNodes()Landroid/support/v4/util/SparseArrayCompat; @@ -1527,6 +1549,10 @@ .method public final dispatchHoverEvent(Landroid/view/MotionEvent;)Z .locals 5 + .param p1 # Landroid/view/MotionEvent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 182 iget-object v0, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mManager:Landroid/view/accessibility/AccessibilityManager; @@ -1615,6 +1641,10 @@ .method public final dispatchKeyEvent(Landroid/view/KeyEvent;)Z .locals 6 + .param p1 # Landroid/view/KeyEvent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 218 invoke-virtual {p1}, Landroid/view/KeyEvent;->getAction()I @@ -1895,6 +1925,8 @@ .method obtainAccessibilityNodeInfo(I)Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation const/4 v0, -0x1 @@ -1918,6 +1950,10 @@ .method public final onFocusChanged(ZILandroid/graphics/Rect;)V .locals 2 + .param p3 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 275 iget v0, p0, Landroid/support/v4/widget/ExploreByTouchHelper;->mKeyboardFocusedVirtualViewId:I @@ -1964,27 +2000,47 @@ .end method .method protected abstract onPerformActionForVirtualView(IILandroid/os/Bundle;)Z + .param p3 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .end method .method protected onPopulateEventForHost(Landroid/view/accessibility/AccessibilityEvent;)V .locals 0 + .param p1 # Landroid/view/accessibility/AccessibilityEvent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param return-void .end method .method protected onPopulateEventForVirtualView(ILandroid/view/accessibility/AccessibilityEvent;)V .locals 0 + .param p2 # Landroid/view/accessibility/AccessibilityEvent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param return-void .end method .method protected onPopulateNodeForHost(Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;)V .locals 0 + .param p1 # Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param return-void .end method .method protected abstract onPopulateNodeForVirtualView(ILandroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat;)V + .param p2 # Landroid/support/v4/view/accessibility/AccessibilityNodeInfoCompat; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method .method protected onVirtualViewKeyboardFocusChanged(IZ)V diff --git a/smali/android/support/v4/widget/FocusStrategy.smali b/smali/android/support/v4/widget/FocusStrategy.smali index bc53f3dd..93031a10 100644 --- a/smali/android/support/v4/widget/FocusStrategy.smali +++ b/smali/android/support/v4/widget/FocusStrategy.smali @@ -25,6 +25,18 @@ .method private static beamBeats(ILandroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;)Z .locals 3 + .param p1 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 243 invoke-static {p0, p1, p2}, Landroid/support/v4/widget/FocusStrategy;->beamsOverlap(ILandroid/graphics/Rect;Landroid/graphics/Rect;)Z @@ -80,10 +92,10 @@ if-ge p2, p0, :cond_3 - const/4 v2, 0x1 + goto :goto_0 :cond_3 - return v2 + const/4 v1, 0x0 :cond_4 :goto_0 @@ -96,6 +108,14 @@ .method private static beamsOverlap(ILandroid/graphics/Rect;Landroid/graphics/Rect;)Z .locals 3 + .param p1 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/16 v0, 0x11 @@ -177,6 +197,26 @@ .method public static findNextFocusInAbsoluteDirection(Ljava/lang/Object;Landroid/support/v4/widget/FocusStrategy$CollectionAdapter;Landroid/support/v4/widget/FocusStrategy$BoundsAdapter;Ljava/lang/Object;Landroid/graphics/Rect;I)Ljava/lang/Object; .locals 7 + .param p0 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/support/v4/widget/FocusStrategy$CollectionAdapter; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v4/widget/FocusStrategy$BoundsAdapter; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p4 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "<", @@ -331,6 +371,22 @@ .method public static findNextFocusInRelativeDirection(Ljava/lang/Object;Landroid/support/v4/widget/FocusStrategy$CollectionAdapter;Landroid/support/v4/widget/FocusStrategy$BoundsAdapter;Ljava/lang/Object;IZZ)Ljava/lang/Object; .locals 4 + .param p0 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/support/v4/widget/FocusStrategy$CollectionAdapter; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v4/widget/FocusStrategy$BoundsAdapter; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "<", @@ -555,6 +611,18 @@ .method private static isBetterCandidate(ILandroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;)Z .locals 3 + .param p1 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 203 invoke-static {p1, p2, p0}, Landroid/support/v4/widget/FocusStrategy;->isCandidate(Landroid/graphics/Rect;Landroid/graphics/Rect;I)Z @@ -640,6 +708,14 @@ .method private static isCandidate(Landroid/graphics/Rect;Landroid/graphics/Rect;I)Z .locals 3 + .param p0 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/16 v0, 0x11 @@ -789,6 +865,14 @@ .method private static isToDirectionOf(ILandroid/graphics/Rect;Landroid/graphics/Rect;)Z .locals 3 + .param p1 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/16 v0, 0x11 @@ -886,6 +970,14 @@ .method private static majorAxisDistance(ILandroid/graphics/Rect;Landroid/graphics/Rect;)I .locals 0 + .param p1 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 365 invoke-static {p0, p1, p2}, Landroid/support/v4/widget/FocusStrategy;->majorAxisDistanceRaw(ILandroid/graphics/Rect;Landroid/graphics/Rect;)I @@ -903,6 +995,14 @@ .method private static majorAxisDistanceRaw(ILandroid/graphics/Rect;Landroid/graphics/Rect;)I .locals 1 + .param p1 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/16 v0, 0x11 @@ -967,6 +1067,14 @@ .method private static majorAxisDistanceToFarEdge(ILandroid/graphics/Rect;Landroid/graphics/Rect;)I .locals 0 + .param p1 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 392 invoke-static {p0, p1, p2}, Landroid/support/v4/widget/FocusStrategy;->majorAxisDistanceToFarEdgeRaw(ILandroid/graphics/Rect;Landroid/graphics/Rect;)I @@ -984,6 +1092,14 @@ .method private static majorAxisDistanceToFarEdgeRaw(ILandroid/graphics/Rect;Landroid/graphics/Rect;)I .locals 1 + .param p1 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/16 v0, 0x11 @@ -1048,6 +1164,14 @@ .method private static minorAxisDistance(ILandroid/graphics/Rect;Landroid/graphics/Rect;)I .locals 1 + .param p1 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/16 v0, 0x11 diff --git a/smali/android/support/v4/widget/ImageViewCompat.smali b/smali/android/support/v4/widget/ImageViewCompat.smali index 2af33c2f..b9823a0f 100644 --- a/smali/android/support/v4/widget/ImageViewCompat.smali +++ b/smali/android/support/v4/widget/ImageViewCompat.smali @@ -15,6 +15,12 @@ .method public static getImageTintList(Landroid/widget/ImageView;)Landroid/content/res/ColorStateList; .locals 2 + .param p0 # Landroid/widget/ImageView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 37 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -54,6 +60,12 @@ .method public static getImageTintMode(Landroid/widget/ImageView;)Landroid/graphics/PorterDuff$Mode; .locals 2 + .param p0 # Landroid/widget/ImageView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 76 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -93,6 +105,14 @@ .method public static setImageTintList(Landroid/widget/ImageView;Landroid/content/res/ColorStateList;)V .locals 2 + .param p0 # Landroid/widget/ImageView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 50 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -178,6 +198,14 @@ .method public static setImageTintMode(Landroid/widget/ImageView;Landroid/graphics/PorterDuff$Mode;)V .locals 2 + .param p0 # Landroid/widget/ImageView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/graphics/PorterDuff$Mode; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 90 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/widget/ListPopupWindowCompat.smali b/smali/android/support/v4/widget/ListPopupWindowCompat.smali index 1a9b1441..e955a7a6 100644 --- a/smali/android/support/v4/widget/ListPopupWindowCompat.smali +++ b/smali/android/support/v4/widget/ListPopupWindowCompat.smali @@ -15,6 +15,16 @@ .method public static createDragToOpenListener(Landroid/widget/ListPopupWindow;Landroid/view/View;)Landroid/view/View$OnTouchListener; .locals 2 + .param p0 # Landroid/widget/ListPopupWindow; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 97 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/widget/ListViewAutoScrollHelper.smali b/smali/android/support/v4/widget/ListViewAutoScrollHelper.smali index 06c2cf98..92fbec48 100644 --- a/smali/android/support/v4/widget/ListViewAutoScrollHelper.smali +++ b/smali/android/support/v4/widget/ListViewAutoScrollHelper.smali @@ -10,6 +10,10 @@ # direct methods .method public constructor (Landroid/widget/ListView;)V .locals 0 + .param p1 # Landroid/widget/ListView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 33 invoke-direct {p0, p1}, Landroid/support/v4/widget/AutoScrollHelper;->(Landroid/view/View;)V diff --git a/smali/android/support/v4/widget/ListViewCompat.smali b/smali/android/support/v4/widget/ListViewCompat.smali index e6600b9e..d3d9cc4b 100644 --- a/smali/android/support/v4/widget/ListViewCompat.smali +++ b/smali/android/support/v4/widget/ListViewCompat.smali @@ -15,6 +15,10 @@ .method public static canScrollList(Landroid/widget/ListView;I)Z .locals 4 + .param p0 # Landroid/widget/ListView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 67 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -119,6 +123,10 @@ .method public static scrollListBy(Landroid/widget/ListView;I)V .locals 2 + .param p0 # Landroid/widget/ListView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 37 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/widget/NestedScrollView.smali b/smali/android/support/v4/widget/NestedScrollView.smali index f5507ab6..c930f9f6 100644 --- a/smali/android/support/v4/widget/NestedScrollView.smali +++ b/smali/android/support/v4/widget/NestedScrollView.smali @@ -99,6 +99,7 @@ const/4 v0, 0x1 + .line 177 new-array v0, v0, [I const/4 v1, 0x0 @@ -107,7 +108,6 @@ aput v2, v0, v1 - .line 177 sput-object v0, Landroid/support/v4/widget/NestedScrollView;->SCROLLVIEW_STYLEABLE:[I return-void @@ -115,6 +115,10 @@ .method public constructor (Landroid/content/Context;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 v0, 0x0 @@ -126,6 +130,14 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param const/4 v0, 0x0 @@ -137,6 +149,14 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;I)V .locals 4 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 198 invoke-direct {p0, p1, p2, p3}, Landroid/widget/FrameLayout;->(Landroid/content/Context;Landroid/util/AttributeSet;I)V @@ -176,14 +196,14 @@ const/4 v2, 0x2 + .line 161 new-array v3, v2, [I - .line 161 iput-object v3, p0, Landroid/support/v4/widget/NestedScrollView;->mScrollOffset:[I + .line 162 new-array v2, v2, [I - .line 162 iput-object v2, p0, Landroid/support/v4/widget/NestedScrollView;->mScrollConsumed:[I .line 199 @@ -449,15 +469,17 @@ const/4 v3, 0x0 - const/4 v4, 0x0 + move-object v4, v3 + + const/4 v3, 0x0 const/4 v5, 0x0 :goto_0 - if-ge v4, v1, :cond_8 + if-ge v3, v1, :cond_8 .line 1121 - invoke-interface {v0, v4}, Ljava/util/List;->get(I)Ljava/lang/Object; + invoke-interface {v0, v3}, Ljava/util/List;->get(I)Ljava/lang/Object; move-result-object v6 @@ -491,9 +513,9 @@ const/4 v10, 0x0 :goto_1 - if-nez v3, :cond_1 + if-nez v4, :cond_1 - move-object v3, v6 + move-object v4, v6 move v5, v10 @@ -503,7 +525,7 @@ if-eqz p1, :cond_2 .line 1139 - invoke-virtual {v3}, Landroid/view/View;->getTop()I + invoke-virtual {v4}, Landroid/view/View;->getTop()I move-result v11 @@ -513,7 +535,7 @@ if-nez p1, :cond_4 .line 1140 - invoke-virtual {v3}, Landroid/view/View;->getBottom()I + invoke-virtual {v4}, Landroid/view/View;->getBottom()I move-result v7 @@ -539,7 +561,7 @@ :cond_5 if-eqz v10, :cond_6 - move-object v3, v6 + move-object v4, v6 const/4 v5, 0x1 @@ -549,16 +571,16 @@ if-eqz v7, :cond_7 :goto_3 - move-object v3, v6 + move-object v4, v6 :cond_7 :goto_4 - add-int/lit8 v4, v4, 0x1 + add-int/lit8 v3, v3, 0x1 goto :goto_0 :cond_8 - return-object v3 + return-object v4 .end method .method private flingWithNestedDispatch(I)V @@ -1493,6 +1515,11 @@ .method public computeHorizontalScrollExtent()I .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 1472 invoke-super {p0}, Landroid/widget/FrameLayout;->computeHorizontalScrollExtent()I @@ -1504,6 +1531,11 @@ .method public computeHorizontalScrollOffset()I .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 1465 invoke-super {p0}, Landroid/widget/FrameLayout;->computeHorizontalScrollOffset()I @@ -1515,6 +1547,11 @@ .method public computeHorizontalScrollRange()I .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 1458 invoke-super {p0}, Landroid/widget/FrameLayout;->computeHorizontalScrollRange()I @@ -1927,6 +1964,11 @@ .method public computeVerticalScrollExtent()I .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 1451 invoke-super {p0}, Landroid/widget/FrameLayout;->computeVerticalScrollExtent()I @@ -1938,6 +1980,11 @@ .method public computeVerticalScrollOffset()I .locals 2 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 1444 invoke-super {p0}, Landroid/widget/FrameLayout;->computeVerticalScrollOffset()I @@ -1955,6 +2002,11 @@ .method public computeVerticalScrollRange()I .locals 4 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 1420 invoke-virtual {p0}, Landroid/support/v4/widget/NestedScrollView;->getChildCount()I @@ -2485,6 +2537,10 @@ .method public executeKeyEvent(Landroid/view/KeyEvent;)Z .locals 5 + .param p1 # Landroid/view/KeyEvent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 604 iget-object v0, p0, Landroid/support/v4/widget/NestedScrollView;->mTempRect:Landroid/graphics/Rect; @@ -2735,9 +2791,7 @@ iput v1, v4, Landroid/graphics/Rect;->top:I .line 1226 - iget-object v1, p0, Landroid/support/v4/widget/NestedScrollView;->mTempRect:Landroid/graphics/Rect; - - iput v3, v1, Landroid/graphics/Rect;->bottom:I + iput v3, v4, Landroid/graphics/Rect;->bottom:I if-eqz v2, :cond_1 @@ -3258,27 +3312,25 @@ if-gez p1, :cond_1 - const/4 v0, 0x0 + const/4 p1, 0x0 goto :goto_0 :cond_1 if-le p1, v0, :cond_2 - goto :goto_0 + move p1, v0 :cond_2 - move v0, p1 - :goto_0 - if-eq v0, v2, :cond_3 + if-eq p1, v2, :cond_3 .line 988 invoke-virtual {p0}, Landroid/support/v4/widget/NestedScrollView;->getScrollX()I - move-result p1 + move-result v0 - invoke-super {p0, p1, v0}, Landroid/widget/FrameLayout;->scrollTo(II)V + invoke-super {p0, v0, p1}, Landroid/widget/FrameLayout;->scrollTo(II)V const/4 p1, 0x1 @@ -3879,6 +3931,14 @@ .method public onNestedPreScroll(Landroid/view/View;II[II)V .locals 6 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # [I + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 v4, 0x0 @@ -3972,6 +4032,14 @@ .method public onNestedScrollAccepted(Landroid/view/View;Landroid/view/View;II)V .locals 1 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 307 iget-object v0, p0, Landroid/support/v4/widget/NestedScrollView;->mParentHelper:Landroid/support/v4/view/NestedScrollingParentHelper; @@ -4217,6 +4285,14 @@ .method public onStartNestedScroll(Landroid/view/View;Landroid/view/View;II)Z .locals 0 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param and-int/lit8 p1, p3, 0x2 @@ -4246,6 +4322,10 @@ .method public onStopNestedScroll(Landroid/view/View;I)V .locals 1 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 313 iget-object v0, p0, Landroid/support/v4/widget/NestedScrollView;->mParentHelper:Landroid/support/v4/view/NestedScrollingParentHelper; @@ -4694,17 +4774,19 @@ iget-object v1, v10, Landroid/support/v4/widget/NestedScrollView;->mScrollOffset:[I - aget v1, v1, v15 + aget v2, v1, v15 - sub-int/2addr v0, v1 + sub-int/2addr v0, v2 iput v0, v10, Landroid/support/v4/widget/NestedScrollView;->mLastMotionY:I - int-to-float v0, v1 + .line 886 + aget v0, v1, v15 + + int-to-float v0, v0 const/4 v1, 0x0 - .line 886 invoke-virtual {v12, v1, v0}, Landroid/view/MotionEvent;->offsetLocation(FF)V .line 887 @@ -5149,7 +5231,7 @@ if-le v3, v2, :cond_8 - move v3, v2 + move v7, v2 :goto_8 const/4 v2, 0x1 @@ -5159,11 +5241,11 @@ :cond_8 if-ge v3, v7, :cond_9 - move v3, v7 - goto :goto_8 :cond_9 + move v7, v3 + const/4 v2, 0x0 :goto_9 @@ -5192,12 +5274,12 @@ .line 1069 invoke-virtual {p0, v5}, Landroid/support/v4/widget/NestedScrollView;->hasNestedScrollingParent(I)Z - move-result v7 + move-result v3 - if-nez v7, :cond_c + if-nez v3, :cond_c .line 1070 - iget-object v7, v0, Landroid/support/v4/widget/NestedScrollView;->mScroller:Landroid/widget/OverScroller; + iget-object v3, v0, Landroid/support/v4/widget/NestedScrollView;->mScroller:Landroid/widget/OverScroller; const/4 v8, 0x0 @@ -5209,9 +5291,9 @@ move-result v11 - move-object p1, v7 + move-object p1, v3 - move p2, v3 + move p2, v7 move p3, v6 @@ -5227,7 +5309,7 @@ .line 1073 :cond_c - invoke-virtual {p0, v3, v6, v2, v1}, Landroid/support/v4/widget/NestedScrollView;->onOverScrolled(IIZZ)V + invoke-virtual {p0, v7, v6, v2, v1}, Landroid/support/v4/widget/NestedScrollView;->onOverScrolled(IIZZ)V if-nez v2, :cond_d @@ -5617,6 +5699,10 @@ .method public setOnScrollChangeListener(Landroid/support/v4/widget/NestedScrollView$OnScrollChangeListener;)V .locals 0 + .param p1 # Landroid/support/v4/widget/NestedScrollView$OnScrollChangeListener; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 487 iput-object p1, p0, Landroid/support/v4/widget/NestedScrollView;->mOnScrollChangeListener:Landroid/support/v4/widget/NestedScrollView$OnScrollChangeListener; diff --git a/smali/android/support/v4/widget/PopupMenuCompat.smali b/smali/android/support/v4/widget/PopupMenuCompat.smali index e2bf8d62..8e83acae 100644 --- a/smali/android/support/v4/widget/PopupMenuCompat.smali +++ b/smali/android/support/v4/widget/PopupMenuCompat.smali @@ -15,6 +15,12 @@ .method public static getDragToOpenListener(Ljava/lang/Object;)Landroid/view/View$OnTouchListener; .locals 2 + .param p0 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 55 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/widget/PopupWindowCompat.smali b/smali/android/support/v4/widget/PopupWindowCompat.smali index 71aed832..4f2336e2 100644 --- a/smali/android/support/v4/widget/PopupWindowCompat.smali +++ b/smali/android/support/v4/widget/PopupWindowCompat.smali @@ -31,6 +31,10 @@ .method public static getOverlapAnchor(Landroid/widget/PopupWindow;)Z .locals 4 + .param p0 # Landroid/widget/PopupWindow; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 119 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -76,6 +80,8 @@ sput-object v2, Landroid/support/v4/widget/PopupWindowCompat;->sOverlapAnchorField:Ljava/lang/reflect/Field; .line 126 + sget-object v2, Landroid/support/v4/widget/PopupWindowCompat;->sOverlapAnchorField:Ljava/lang/reflect/Field; + invoke-virtual {v2, v0}, Ljava/lang/reflect/Field;->setAccessible(Z)V :try_end_0 .catch Ljava/lang/NoSuchFieldException; {:try_start_0 .. :try_end_0} :catch_0 @@ -132,6 +138,10 @@ .method public static getWindowLayoutType(Landroid/widget/PopupWindow;)I .locals 5 + .param p0 # Landroid/widget/PopupWindow; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 183 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -172,6 +182,8 @@ sput-object v2, Landroid/support/v4/widget/PopupWindowCompat;->sGetWindowLayoutTypeMethod:Ljava/lang/reflect/Method; .line 191 + sget-object v2, Landroid/support/v4/widget/PopupWindowCompat;->sGetWindowLayoutTypeMethod:Ljava/lang/reflect/Method; + invoke-virtual {v2, v0}, Ljava/lang/reflect/Method;->setAccessible(Z)V :try_end_0 .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0 @@ -186,10 +198,10 @@ if-eqz v0, :cond_2 + .line 199 :try_start_1 new-array v2, v1, [Ljava/lang/Object; - .line 199 invoke-virtual {v0, p0, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; move-result-object p0 @@ -211,6 +223,10 @@ .method public static setOverlapAnchor(Landroid/widget/PopupWindow;Z)V .locals 4 + .param p0 # Landroid/widget/PopupWindow; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 90 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -254,6 +270,8 @@ sput-object v2, Landroid/support/v4/widget/PopupWindowCompat;->sOverlapAnchorField:Ljava/lang/reflect/Field; .line 96 + sget-object v2, Landroid/support/v4/widget/PopupWindowCompat;->sOverlapAnchorField:Ljava/lang/reflect/Field; + invoke-virtual {v2, v0}, Ljava/lang/reflect/Field;->setAccessible(Z)V :try_end_0 .catch Ljava/lang/NoSuchFieldException; {:try_start_0 .. :try_end_0} :catch_0 @@ -305,6 +323,10 @@ .method public static setWindowLayoutType(Landroid/widget/PopupWindow;I)V .locals 6 + .param p0 # Landroid/widget/PopupWindow; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 153 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -347,6 +369,8 @@ sput-object v0, Landroid/support/v4/widget/PopupWindowCompat;->sSetWindowLayoutTypeMethod:Ljava/lang/reflect/Method; .line 162 + sget-object v0, Landroid/support/v4/widget/PopupWindowCompat;->sSetWindowLayoutTypeMethod:Ljava/lang/reflect/Method; + invoke-virtual {v0, v2}, Ljava/lang/reflect/Method;->setAccessible(Z)V :try_end_0 .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0 @@ -361,10 +385,10 @@ if-eqz v0, :cond_2 + .line 170 :try_start_1 new-array v2, v2, [Ljava/lang/Object; - .line 170 invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; move-result-object p1 @@ -382,6 +406,14 @@ .method public static showAsDropDown(Landroid/widget/PopupWindow;Landroid/view/View;III)V .locals 2 + .param p0 # Landroid/widget/PopupWindow; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 68 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/widget/ScrollerCompat.smali b/smali/android/support/v4/widget/ScrollerCompat.smali index e3ee5eef..36e48119 100644 --- a/smali/android/support/v4/widget/ScrollerCompat.smali +++ b/smali/android/support/v4/widget/ScrollerCompat.smali @@ -19,16 +19,18 @@ .line 56 invoke-direct {p0}, Ljava/lang/Object;->()V + if-eqz p2, :cond_0 + .line 57 new-instance v0, Landroid/widget/OverScroller; - if-eqz p2, :cond_0 - invoke-direct {v0, p1, p2}, Landroid/widget/OverScroller;->(Landroid/content/Context;Landroid/view/animation/Interpolator;)V goto :goto_0 :cond_0 + new-instance v0, Landroid/widget/OverScroller; + invoke-direct {v0, p1}, Landroid/widget/OverScroller;->(Landroid/content/Context;)V :goto_0 diff --git a/smali/android/support/v4/widget/SimpleCursorAdapter.smali b/smali/android/support/v4/widget/SimpleCursorAdapter.smali index aec9f539..a9914552 100644 --- a/smali/android/support/v4/widget/SimpleCursorAdapter.smali +++ b/smali/android/support/v4/widget/SimpleCursorAdapter.smali @@ -16,12 +16,24 @@ .field private mCursorToStringConverter:Landroid/support/v4/widget/SimpleCursorAdapter$CursorToStringConverter; .field protected mFrom:[I + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field .field mOriginalFrom:[Ljava/lang/String; .field private mStringConversionColumn:I .field protected mTo:[I + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation +.end field .field private mViewBinder:Landroid/support/v4/widget/SimpleCursorAdapter$ViewBinder; @@ -269,6 +281,8 @@ iput-object p3, p0, Landroid/support/v4/widget/SimpleCursorAdapter;->mTo:[I .line 356 + iget-object p2, p0, Landroid/support/v4/widget/SimpleCursorAdapter;->mOriginalFrom:[Ljava/lang/String; + invoke-direct {p0, p1, p2}, Landroid/support/v4/widget/SimpleCursorAdapter;->findColumns(Landroid/database/Cursor;[Ljava/lang/String;)V .line 357 diff --git a/smali/android/support/v4/widget/SlidingPaneLayout$LayoutParams.smali b/smali/android/support/v4/widget/SlidingPaneLayout$LayoutParams.smali index 5f310ccc..0b393979 100644 --- a/smali/android/support/v4/widget/SlidingPaneLayout$LayoutParams.smali +++ b/smali/android/support/v4/widget/SlidingPaneLayout$LayoutParams.smali @@ -34,6 +34,7 @@ const/4 v0, 0x1 + .line 1423 new-array v0, v0, [I const/4 v1, 0x0 @@ -42,7 +43,6 @@ aput v2, v0, v1 - .line 1423 sput-object v0, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->ATTRS:[I return-void @@ -80,6 +80,14 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V .locals 2 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 1468 invoke-direct {p0, p1, p2}, Landroid/view/ViewGroup$MarginLayoutParams;->(Landroid/content/Context;Landroid/util/AttributeSet;)V @@ -113,6 +121,10 @@ .method public constructor (Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;)V .locals 1 + .param p1 # Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1463 invoke-direct {p0, p1}, Landroid/view/ViewGroup$MarginLayoutParams;->(Landroid/view/ViewGroup$MarginLayoutParams;)V @@ -132,6 +144,10 @@ .method public constructor (Landroid/view/ViewGroup$LayoutParams;)V .locals 0 + .param p1 # Landroid/view/ViewGroup$LayoutParams; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1455 invoke-direct {p0, p1}, Landroid/view/ViewGroup$MarginLayoutParams;->(Landroid/view/ViewGroup$LayoutParams;)V @@ -146,6 +162,10 @@ .method public constructor (Landroid/view/ViewGroup$MarginLayoutParams;)V .locals 0 + .param p1 # Landroid/view/ViewGroup$MarginLayoutParams; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1459 invoke-direct {p0, p1}, Landroid/view/ViewGroup$MarginLayoutParams;->(Landroid/view/ViewGroup$MarginLayoutParams;)V diff --git a/smali/android/support/v4/widget/SlidingPaneLayout$PanelSlideListener.smali b/smali/android/support/v4/widget/SlidingPaneLayout$PanelSlideListener.smali index c46d0835..9fb566f2 100644 --- a/smali/android/support/v4/widget/SlidingPaneLayout$PanelSlideListener.smali +++ b/smali/android/support/v4/widget/SlidingPaneLayout$PanelSlideListener.smali @@ -16,10 +16,22 @@ # virtual methods .method public abstract onPanelClosed(Landroid/view/View;)V + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method .method public abstract onPanelOpened(Landroid/view/View;)V + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method .method public abstract onPanelSlide(Landroid/view/View;F)V + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method diff --git a/smali/android/support/v4/widget/SlidingPaneLayout.smali b/smali/android/support/v4/widget/SlidingPaneLayout.smali index 2d0c2d2c..16276b9d 100644 --- a/smali/android/support/v4/widget/SlidingPaneLayout.smali +++ b/smali/android/support/v4/widget/SlidingPaneLayout.smali @@ -86,6 +86,10 @@ # direct methods .method public constructor (Landroid/content/Context;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 v0, 0x0 @@ -97,6 +101,14 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param const/4 v0, 0x0 @@ -108,6 +120,14 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;I)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 249 invoke-direct {p0, p1, p2, p3}, Landroid/view/ViewGroup;->(Landroid/content/Context;Landroid/util/AttributeSet;I)V @@ -186,11 +206,13 @@ iput-object p2, p0, Landroid/support/v4/widget/SlidingPaneLayout;->mDragHelper:Landroid/support/v4/widget/ViewDragHelper; + .line 260 + iget-object p2, p0, Landroid/support/v4/widget/SlidingPaneLayout;->mDragHelper:Landroid/support/v4/widget/ViewDragHelper; + const/high16 p3, 0x43c80000 # 400.0f mul-float p1, p1, p3 - .line 260 invoke-virtual {p2, p1}, Landroid/support/v4/widget/ViewDragHelper;->setMinVelocity(F)V return-void @@ -486,16 +508,18 @@ if-eqz v1, :cond_5 + if-eqz v0, :cond_4 + .line 1226 iget v5, p0, Landroid/support/v4/widget/SlidingPaneLayout;->mParallaxOffset:F - if-eqz v0, :cond_4 - sub-float/2addr v5, v6 goto :goto_3 :cond_4 + iget v5, p0, Landroid/support/v4/widget/SlidingPaneLayout;->mParallaxOffset:F + sub-float v5, v6, v5 :goto_3 @@ -1109,6 +1133,8 @@ .method public getCoveredFadeColor()I .locals 1 + .annotation build Landroid/support/annotation/ColorInt; + .end annotation .line 317 iget v0, p0, Landroid/support/v4/widget/SlidingPaneLayout;->mCoveredFadeColor:I @@ -1118,6 +1144,8 @@ .method public getParallaxDistance()I .locals 1 + .annotation build Landroid/support/annotation/Px; + .end annotation .line 282 iget v0, p0, Landroid/support/v4/widget/SlidingPaneLayout;->mParallaxBy:I @@ -1127,6 +1155,8 @@ .method public getSliderFadeColor()I .locals 1 + .annotation build Landroid/support/annotation/ColorInt; + .end annotation .line 299 iget v0, p0, Landroid/support/v4/widget/SlidingPaneLayout;->mSliderFadeColor:I @@ -1186,7 +1216,7 @@ check-cast v5, [Ljava/lang/Class; - invoke-virtual {v0, v4, v1}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method; + invoke-virtual {v0, v4, v5}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method; move-result-object v0 @@ -1218,6 +1248,8 @@ iput-object v0, p0, Landroid/support/v4/widget/SlidingPaneLayout;->mRecreateDisplayList:Ljava/lang/reflect/Field; .line 1037 + iget-object v0, p0, Landroid/support/v4/widget/SlidingPaneLayout;->mRecreateDisplayList:Ljava/lang/reflect/Field; + invoke-virtual {v0, v2}, Ljava/lang/reflect/Field;->setAccessible(Z)V :try_end_1 .catch Ljava/lang/NoSuchFieldException; {:try_start_1 .. :try_end_1} :catch_1 @@ -1256,9 +1288,7 @@ .line 1052 iget-object v0, p0, Landroid/support/v4/widget/SlidingPaneLayout;->mGetDisplayList:Ljava/lang/reflect/Method; - move-object v2, v1 - - check-cast v2, [Ljava/lang/Object; + check-cast v1, [Ljava/lang/Object; invoke-virtual {v0, p1, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; :try_end_2 @@ -1813,13 +1843,15 @@ :cond_4 move v11, v4 - const/4 v12, 0x0 + move v12, v11 + + const/4 v4, 0x0 :goto_4 - if-ge v12, v7, :cond_b + if-ge v4, v7, :cond_b .line 670 - invoke-virtual {v0, v12}, Landroid/support/v4/widget/SlidingPaneLayout;->getChildAt(I)Landroid/view/View; + invoke-virtual {v0, v4}, Landroid/support/v4/widget/SlidingPaneLayout;->getChildAt(I)Landroid/view/View; move-result-object v13 @@ -1868,11 +1900,11 @@ sub-int v10, v8, v10 - invoke-static {v4, v10}, Ljava/lang/Math;->min(II)I + invoke-static {v11, v10}, Ljava/lang/Math;->min(II)I move-result v10 - sub-int/2addr v10, v11 + sub-int/2addr v10, v12 sub-int/2addr v10, v2 @@ -1890,7 +1922,7 @@ iget v2, v14, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->leftMargin:I :goto_5 - add-int v16, v11, v2 + add-int v16, v12, v2 add-int v16, v16, v10 @@ -1922,20 +1954,20 @@ add-int/2addr v2, v8 - add-int/2addr v11, v2 + add-int/2addr v2, v12 - int-to-float v2, v8 + int-to-float v8, v8 .line 690 - iget v8, v0, Landroid/support/v4/widget/SlidingPaneLayout;->mSlideRange:I + iget v9, v0, Landroid/support/v4/widget/SlidingPaneLayout;->mSlideRange:I - int-to-float v8, v8 + int-to-float v9, v9 - div-float/2addr v2, v8 + div-float/2addr v8, v9 - iput v2, v0, Landroid/support/v4/widget/SlidingPaneLayout;->mSlideOffset:F + iput v8, v0, Landroid/support/v4/widget/SlidingPaneLayout;->mSlideOffset:F - const/4 v2, 0x0 + const/4 v8, 0x0 const/high16 v9, 0x3f800000 # 1.0f @@ -1962,55 +1994,57 @@ mul-float v8, v8, v2 - float-to-int v2, v8 + float-to-int v8, v8 - move v11, v4 + move v2, v11 goto :goto_7 :cond_9 const/high16 v9, 0x3f800000 # 1.0f - move v11, v4 + move v2, v11 - const/4 v2, 0x0 + const/4 v8, 0x0 :goto_7 if-eqz v1, :cond_a - sub-int v8, v3, v11 + sub-int v10, v3, v2 - add-int/2addr v8, v2 + add-int/2addr v10, v8 - sub-int v2, v8, v15 + sub-int v8, v10, v15 goto :goto_8 :cond_a - sub-int v2, v11, v2 + sub-int v8, v2, v8 - add-int v8, v2, v15 + add-int v10, v8, v15 .line 709 :goto_8 invoke-virtual {v13}, Landroid/view/View;->getMeasuredHeight()I - move-result v10 + move-result v12 - add-int/2addr v10, v6 + add-int/2addr v12, v6 .line 710 - invoke-virtual {v13, v2, v6, v8, v10}, Landroid/view/View;->layout(IIII)V + invoke-virtual {v13, v8, v6, v10, v12}, Landroid/view/View;->layout(IIII)V .line 712 invoke-virtual {v13}, Landroid/view/View;->getWidth()I - move-result v2 + move-result v8 + + add-int/2addr v11, v8 - add-int/2addr v4, v2 + move v12, v2 :goto_9 - add-int/lit8 v12, v12, 0x1 + add-int/lit8 v4, v4, 0x1 const/4 v2, 0x1 @@ -2274,23 +2308,25 @@ .line 494 iput-object v10, v0, Landroid/support/v4/widget/SlidingPaneLayout;->mSlideableView:Landroid/view/View; + move v13, v4 + move v14, v8 + const/4 v4, 0x0 + const/4 v11, 0x0 const/4 v12, 0x0 - const/4 v13, 0x0 - :goto_2 const/16 v15, 0x8 const/16 v16, 0x1 - if-ge v11, v9, :cond_11 + if-ge v4, v9, :cond_11 .line 499 - invoke-virtual {v0, v11}, Landroid/support/v4/widget/SlidingPaneLayout;->getChildAt(I)Landroid/view/View; + invoke-virtual {v0, v4}, Landroid/support/v4/widget/SlidingPaneLayout;->getChildAt(I)Landroid/view/View; move-result-object v6 @@ -2328,7 +2364,7 @@ .line 508 iget v10, v7, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->weight:F - add-float/2addr v13, v10 + add-float/2addr v12, v10 .line 512 iget v10, v7, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->width:I @@ -2456,12 +2492,12 @@ if-ne v3, v15, :cond_e - if-le v10, v4, :cond_e + if-le v10, v13, :cond_e .line 541 invoke-static {v10, v5}, Ljava/lang/Math;->min(II)I - move-result v4 + move-result v13 :cond_e sub-int/2addr v14, v1 @@ -2479,19 +2515,21 @@ :goto_5 iput-boolean v1, v7, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->slideable:Z - or-int/2addr v12, v1 + or-int/2addr v1, v11 .line 546 - iget-boolean v1, v7, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->slideable:Z + iget-boolean v7, v7, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->slideable:Z - if-eqz v1, :cond_10 + if-eqz v7, :cond_10 .line 547 iput-object v6, v0, Landroid/support/v4/widget/SlidingPaneLayout;->mSlideableView:Landroid/view/View; :cond_10 + move v11, v1 + :goto_6 - add-int/lit8 v11, v11, 0x1 + add-int/lit8 v4, v4, 0x1 const/4 v1, 0x0 @@ -2502,11 +2540,11 @@ goto/16 :goto_2 :cond_11 - if-nez v12, :cond_12 + if-nez v11, :cond_12 const/4 v1, 0x0 - cmpl-float v3, v13, v1 + cmpl-float v3, v12, v1 if-lez v3, :cond_22 @@ -2524,14 +2562,14 @@ .line 556 invoke-virtual {v0, v3}, Landroid/support/v4/widget/SlidingPaneLayout;->getChildAt(I)Landroid/view/View; - move-result-object v6 + move-result-object v4 .line 558 - invoke-virtual {v6}, Landroid/view/View;->getVisibility()I + invoke-virtual {v4}, Landroid/view/View;->getVisibility()I - move-result v7 + move-result v6 - if-ne v7, v15, :cond_15 + if-ne v6, v15, :cond_15 :cond_13 :goto_8 @@ -2541,205 +2579,205 @@ :goto_9 const/4 v1, 0x0 - const/high16 v7, 0x40000000 # 2.0f + const/high16 v6, 0x40000000 # 2.0f goto/16 :goto_e .line 562 :cond_15 - invoke-virtual {v6}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams; + invoke-virtual {v4}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams; - move-result-object v7 + move-result-object v6 - check-cast v7, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams; + check-cast v6, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams; .line 564 - invoke-virtual {v6}, Landroid/view/View;->getVisibility()I + invoke-virtual {v4}, Landroid/view/View;->getVisibility()I - move-result v10 + move-result v7 - if-ne v10, v15, :cond_16 + if-ne v7, v15, :cond_16 goto :goto_8 .line 568 :cond_16 - iget v10, v7, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->width:I + iget v7, v6, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->width:I - if-nez v10, :cond_17 + if-nez v7, :cond_17 - iget v10, v7, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->weight:F + iget v7, v6, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->weight:F - const/4 v11, 0x0 + const/4 v10, 0x0 - cmpl-float v10, v10, v11 + cmpl-float v7, v7, v10 - if-lez v10, :cond_17 + if-lez v7, :cond_17 - const/4 v10, 0x1 + const/4 v7, 0x1 goto :goto_a :cond_17 - const/4 v10, 0x0 + const/4 v7, 0x0 :goto_a - if-eqz v10, :cond_18 + if-eqz v7, :cond_18 - const/4 v11, 0x0 + const/4 v10, 0x0 goto :goto_b .line 569 :cond_18 - invoke-virtual {v6}, Landroid/view/View;->getMeasuredWidth()I + invoke-virtual {v4}, Landroid/view/View;->getMeasuredWidth()I - move-result v11 + move-result v10 :goto_b - if-eqz v12, :cond_1d + if-eqz v11, :cond_1d .line 570 iget-object v15, v0, Landroid/support/v4/widget/SlidingPaneLayout;->mSlideableView:Landroid/view/View; - if-eq v6, v15, :cond_1d + if-eq v4, v15, :cond_1d .line 571 - iget v15, v7, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->width:I + iget v15, v6, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->width:I if-gez v15, :cond_13 - if-gt v11, v1, :cond_19 + if-gt v10, v1, :cond_19 - iget v11, v7, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->weight:F + iget v10, v6, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->weight:F const/4 v15, 0x0 - cmpl-float v11, v11, v15 + cmpl-float v10, v10, v15 - if-lez v11, :cond_13 + if-lez v10, :cond_13 :cond_19 - if-eqz v10, :cond_1c + if-eqz v7, :cond_1c .line 578 - iget v10, v7, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->height:I + iget v7, v6, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->height:I - const/4 v11, -0x2 + const/4 v10, -0x2 - if-ne v10, v11, :cond_1a + if-ne v7, v10, :cond_1a - const/high16 v10, -0x80000000 + const/high16 v7, -0x80000000 .line 579 - invoke-static {v5, v10}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I + invoke-static {v5, v7}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I - move-result v7 + move-result v6 - const/high16 v10, 0x40000000 # 2.0f + const/high16 v7, 0x40000000 # 2.0f goto :goto_c .line 581 :cond_1a - iget v10, v7, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->height:I + iget v7, v6, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->height:I - const/4 v11, -0x1 + const/4 v10, -0x1 - if-ne v10, v11, :cond_1b + if-ne v7, v10, :cond_1b - const/high16 v10, 0x40000000 # 2.0f + const/high16 v7, 0x40000000 # 2.0f .line 582 - invoke-static {v5, v10}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I + invoke-static {v5, v7}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I - move-result v7 + move-result v6 goto :goto_c :cond_1b - const/high16 v10, 0x40000000 # 2.0f + const/high16 v7, 0x40000000 # 2.0f .line 585 - iget v7, v7, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->height:I + iget v6, v6, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->height:I - invoke-static {v7, v10}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I + invoke-static {v6, v7}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I - move-result v7 + move-result v6 goto :goto_c :cond_1c - const/high16 v10, 0x40000000 # 2.0f + const/high16 v7, 0x40000000 # 2.0f .line 590 - invoke-virtual {v6}, Landroid/view/View;->getMeasuredHeight()I + invoke-virtual {v4}, Landroid/view/View;->getMeasuredHeight()I - move-result v7 + move-result v6 .line 589 - invoke-static {v7, v10}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I + invoke-static {v6, v7}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I - move-result v7 + move-result v6 .line 592 :goto_c - invoke-static {v1, v10}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I + invoke-static {v1, v7}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I - move-result v11 + move-result v10 .line 594 - invoke-virtual {v6, v11, v7}, Landroid/view/View;->measure(II)V + invoke-virtual {v4, v10, v6}, Landroid/view/View;->measure(II)V goto :goto_8 .line 596 :cond_1d - iget v10, v7, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->weight:F + iget v7, v6, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->weight:F const/4 v15, 0x0 - cmpl-float v10, v10, v15 + cmpl-float v7, v7, v15 - if-lez v10, :cond_13 + if-lez v7, :cond_13 .line 598 - iget v10, v7, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->width:I + iget v7, v6, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->width:I - if-nez v10, :cond_20 + if-nez v7, :cond_20 .line 600 - iget v10, v7, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->height:I + iget v7, v6, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->height:I const/4 v15, -0x2 - if-ne v10, v15, :cond_1e + if-ne v7, v15, :cond_1e - const/high16 v10, -0x80000000 + const/high16 v7, -0x80000000 .line 601 - invoke-static {v5, v10}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I + invoke-static {v5, v7}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I move-result v17 move/from16 v15, v17 - const/high16 v10, 0x40000000 # 2.0f + const/high16 v7, 0x40000000 # 2.0f goto :goto_d .line 603 :cond_1e - iget v10, v7, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->height:I + iget v7, v6, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->height:I const/4 v15, -0x1 - if-ne v10, v15, :cond_1f + if-ne v7, v15, :cond_1f - const/high16 v10, 0x40000000 # 2.0f + const/high16 v7, 0x40000000 # 2.0f .line 604 - invoke-static {v5, v10}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I + invoke-static {v5, v7}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I move-result v19 @@ -2748,55 +2786,55 @@ goto :goto_d :cond_1f - const/high16 v10, 0x40000000 # 2.0f + const/high16 v7, 0x40000000 # 2.0f .line 607 - iget v15, v7, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->height:I + iget v15, v6, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->height:I - invoke-static {v15, v10}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I + invoke-static {v15, v7}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I move-result v15 goto :goto_d :cond_20 - const/high16 v10, 0x40000000 # 2.0f + const/high16 v7, 0x40000000 # 2.0f .line 612 - invoke-virtual {v6}, Landroid/view/View;->getMeasuredHeight()I + invoke-virtual {v4}, Landroid/view/View;->getMeasuredHeight()I move-result v15 .line 611 - invoke-static {v15, v10}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I + invoke-static {v15, v7}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I move-result v15 :goto_d - if-eqz v12, :cond_21 + if-eqz v11, :cond_21 .line 617 - iget v10, v7, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->leftMargin:I + iget v7, v6, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->leftMargin:I - iget v7, v7, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->rightMargin:I + iget v6, v6, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->rightMargin:I - add-int/2addr v10, v7 + add-int/2addr v7, v6 - sub-int v7, v8, v10 + sub-int v6, v8, v7 move/from16 v19, v1 - const/high16 v10, 0x40000000 # 2.0f + const/high16 v7, 0x40000000 # 2.0f .line 619 - invoke-static {v7, v10}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I + invoke-static {v6, v7}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I move-result v1 - if-eq v11, v7, :cond_14 + if-eq v10, v6, :cond_14 .line 622 - invoke-virtual {v6, v1, v15}, Landroid/view/View;->measure(II)V + invoke-virtual {v4, v1, v15}, Landroid/view/View;->measure(II)V goto/16 :goto_9 @@ -2808,30 +2846,30 @@ .line 626 invoke-static {v1, v14}, Ljava/lang/Math;->max(II)I - move-result v10 + move-result v7 .line 627 - iget v7, v7, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->weight:F + iget v6, v6, Landroid/support/v4/widget/SlidingPaneLayout$LayoutParams;->weight:F - int-to-float v10, v10 + int-to-float v7, v7 - mul-float v7, v7, v10 + mul-float v6, v6, v7 - div-float/2addr v7, v13 + div-float/2addr v6, v12 - float-to-int v7, v7 + float-to-int v6, v6 - add-int/2addr v11, v7 + add-int/2addr v10, v6 - const/high16 v7, 0x40000000 # 2.0f + const/high16 v6, 0x40000000 # 2.0f .line 628 - invoke-static {v11, v7}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I + invoke-static {v10, v6}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I - move-result v10 + move-result v7 .line 630 - invoke-virtual {v6, v10, v15}, Landroid/view/View;->measure(II)V + invoke-virtual {v4, v7, v15}, Landroid/view/View;->measure(II)V :goto_e add-int/lit8 v3, v3, 0x1 @@ -2848,19 +2886,19 @@ move-result v1 - add-int/2addr v4, v1 + add-int/2addr v13, v1 invoke-virtual/range {p0 .. p0}, Landroid/support/v4/widget/SlidingPaneLayout;->getPaddingBottom()I move-result v1 - add-int/2addr v4, v1 + add-int/2addr v13, v1 .line 639 - invoke-virtual {v0, v2, v4}, Landroid/support/v4/widget/SlidingPaneLayout;->setMeasuredDimension(II)V + invoke-virtual {v0, v2, v13}, Landroid/support/v4/widget/SlidingPaneLayout;->setMeasuredDimension(II)V .line 640 - iput-boolean v12, v0, Landroid/support/v4/widget/SlidingPaneLayout;->mCanSlide:Z + iput-boolean v11, v0, Landroid/support/v4/widget/SlidingPaneLayout;->mCanSlide:Z .line 642 iget-object v1, v0, Landroid/support/v4/widget/SlidingPaneLayout;->mDragHelper:Landroid/support/v4/widget/ViewDragHelper; @@ -2871,7 +2909,7 @@ if-eqz v1, :cond_23 - if-nez v12, :cond_23 + if-nez v11, :cond_23 .line 644 iget-object v1, v0, Landroid/support/v4/widget/SlidingPaneLayout;->mDragHelper:Landroid/support/v4/widget/ViewDragHelper; @@ -2973,11 +3011,13 @@ iput p1, p0, Landroid/support/v4/widget/SlidingPaneLayout;->mSlideOffset:F .line 951 - iget v0, p0, Landroid/support/v4/widget/SlidingPaneLayout;->mParallaxBy:I + iget p1, p0, Landroid/support/v4/widget/SlidingPaneLayout;->mParallaxBy:I - if-eqz v0, :cond_4 + if-eqz p1, :cond_4 .line 952 + iget p1, p0, Landroid/support/v4/widget/SlidingPaneLayout;->mSlideOffset:F + invoke-direct {p0, p1}, Landroid/support/v4/widget/SlidingPaneLayout;->parallaxOtherViews(F)V .line 955 @@ -3329,6 +3369,10 @@ .method public setCoveredFadeColor(I)V .locals 0 + .param p1 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param .line 309 iput p1, p0, Landroid/support/v4/widget/SlidingPaneLayout;->mCoveredFadeColor:I @@ -3338,6 +3382,10 @@ .method public setPanelSlideListener(Landroid/support/v4/widget/SlidingPaneLayout$PanelSlideListener;)V .locals 0 + .param p1 # Landroid/support/v4/widget/SlidingPaneLayout$PanelSlideListener; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 321 iput-object p1, p0, Landroid/support/v4/widget/SlidingPaneLayout;->mPanelSlideListener:Landroid/support/v4/widget/SlidingPaneLayout$PanelSlideListener; @@ -3347,6 +3395,10 @@ .method public setParallaxDistance(I)V .locals 0 + .param p1 # I + .annotation build Landroid/support/annotation/Px; + .end annotation + .end param .line 271 iput p1, p0, Landroid/support/v4/widget/SlidingPaneLayout;->mParallaxBy:I @@ -3370,6 +3422,10 @@ .method public setShadowDrawableLeft(Landroid/graphics/drawable/Drawable;)V .locals 0 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 1126 iput-object p1, p0, Landroid/support/v4/widget/SlidingPaneLayout;->mShadowDrawableLeft:Landroid/graphics/drawable/Drawable; @@ -3379,6 +3435,10 @@ .method public setShadowDrawableRight(Landroid/graphics/drawable/Drawable;)V .locals 0 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 1136 iput-object p1, p0, Landroid/support/v4/widget/SlidingPaneLayout;->mShadowDrawableRight:Landroid/graphics/drawable/Drawable; @@ -3388,6 +3448,10 @@ .method public setShadowResource(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .annotation runtime Ljava/lang/Deprecated; .end annotation @@ -3441,6 +3505,10 @@ .method public setSliderFadeColor(I)V .locals 0 + .param p1 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param .line 291 iput p1, p0, Landroid/support/v4/widget/SlidingPaneLayout;->mSliderFadeColor:I @@ -3712,10 +3780,10 @@ const/4 v12, 0x0 :goto_3 - move-object/from16 v13, p0 - if-ge v12, v11, :cond_8 + move-object/from16 v13, p0 + .line 364 invoke-virtual {v13, v12}, Landroid/support/v4/widget/SlidingPaneLayout;->getChildAt(I)Landroid/view/View; @@ -3769,15 +3837,17 @@ move-result v15 - move/from16 v16, v1 - if-eqz v1, :cond_6 + move/from16 v16, v1 + move v0, v2 goto :goto_5 :cond_6 + move/from16 v16, v1 + move v0, v3 .line 377 @@ -3808,16 +3878,16 @@ if-gt v1, v10, :cond_7 - const/4 v0, 0x4 + const/4 v6, 0x4 goto :goto_6 :cond_7 - const/4 v0, 0x0 + const/4 v6, 0x0 .line 386 :goto_6 - invoke-virtual {v14, v0}, Landroid/view/View;->setVisibility(I)V + invoke-virtual {v14, v6}, Landroid/view/View;->setVisibility(I)V :goto_7 add-int/lit8 v12, v12, 0x1 @@ -3829,6 +3899,8 @@ goto :goto_3 :cond_8 + move-object/from16 v13, p0 + :goto_8 return-void .end method diff --git a/smali/android/support/v4/widget/Space.smali b/smali/android/support/v4/widget/Space.smali index aa695ea8..4aa54142 100644 --- a/smali/android/support/v4/widget/Space.smali +++ b/smali/android/support/v4/widget/Space.smali @@ -11,6 +11,10 @@ # direct methods .method public constructor (Landroid/content/Context;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation runtime Ljava/lang/Deprecated; .end annotation @@ -24,6 +28,14 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation runtime Ljava/lang/Deprecated; .end annotation @@ -37,6 +49,14 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;I)V .locals 0 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation runtime Ljava/lang/Deprecated; .end annotation @@ -76,6 +96,8 @@ if-eq v0, v1, :cond_1 + if-eqz v0, :cond_2 + const/high16 v1, 0x40000000 # 2.0f if-eq v0, v1, :cond_0 @@ -93,6 +115,7 @@ move-result p0 + :cond_2 :goto_0 return p0 .end method @@ -101,6 +124,12 @@ # virtual methods .method public draw(Landroid/graphics/Canvas;)V .locals 0 + .annotation build Landroid/annotation/SuppressLint; + value = { + "MissingSuperCall" + } + .end annotation + .annotation runtime Ljava/lang/Deprecated; .end annotation diff --git a/smali/android/support/v4/widget/SwipeRefreshLayout$OnChildScrollUpCallback.smali b/smali/android/support/v4/widget/SwipeRefreshLayout$OnChildScrollUpCallback.smali index 6ab040af..fe983810 100644 --- a/smali/android/support/v4/widget/SwipeRefreshLayout$OnChildScrollUpCallback.smali +++ b/smali/android/support/v4/widget/SwipeRefreshLayout$OnChildScrollUpCallback.smali @@ -16,4 +16,12 @@ # virtual methods .method public abstract canChildScrollUp(Landroid/support/v4/widget/SwipeRefreshLayout;Landroid/view/View;)Z + .param p1 # Landroid/support/v4/widget/SwipeRefreshLayout; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .end method diff --git a/smali/android/support/v4/widget/SwipeRefreshLayout.smali b/smali/android/support/v4/widget/SwipeRefreshLayout.smali index 441f9520..5b272e6e 100644 --- a/smali/android/support/v4/widget/SwipeRefreshLayout.smali +++ b/smali/android/support/v4/widget/SwipeRefreshLayout.smali @@ -26,8 +26,14 @@ .field private static final CIRCLE_BG_LIGHT:I = -0x50506 .field static final CIRCLE_DIAMETER:I = 0x28 + .annotation build Landroid/support/annotation/VisibleForTesting; + .end annotation +.end field .field static final CIRCLE_DIAMETER_LARGE:I = 0x38 + .annotation build Landroid/support/annotation/VisibleForTesting; + .end annotation +.end field .field private static final DECELERATE_INTERPOLATION_FACTOR:F = 2.0f @@ -144,6 +150,7 @@ const/4 v0, 0x1 + .line 140 new-array v0, v0, [I const/4 v1, 0x0 @@ -152,7 +159,6 @@ aput v2, v0, v1 - .line 140 sput-object v0, Landroid/support/v4/widget/SwipeRefreshLayout;->LAYOUT_ATTRS:[I return-void @@ -160,6 +166,10 @@ .method public constructor (Landroid/content/Context;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 v0, 0x0 @@ -171,6 +181,14 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V .locals 4 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 350 invoke-direct {p0, p1, p2}, Landroid/view/ViewGroup;->(Landroid/content/Context;Landroid/util/AttributeSet;)V @@ -187,14 +205,14 @@ const/4 v1, 0x2 + .line 122 new-array v2, v1, [I - .line 122 iput-object v2, p0, Landroid/support/v4/widget/SwipeRefreshLayout;->mParentScrollConsumed:[I + .line 123 new-array v1, v1, [I - .line 123 iput-object v1, p0, Landroid/support/v4/widget/SwipeRefreshLayout;->mParentOffsetInWindow:[I const/4 v1, -0x1 @@ -301,9 +319,11 @@ iput v1, p0, Landroid/support/v4/widget/SwipeRefreshLayout;->mSpinnerOffsetEnd:I + .line 367 + iget v1, p0, Landroid/support/v4/widget/SwipeRefreshLayout;->mSpinnerOffsetEnd:I + int-to-float v1, v1 - .line 367 iput v1, p0, Landroid/support/v4/widget/SwipeRefreshLayout;->mTotalDragDistance:F .line 368 @@ -492,9 +512,11 @@ iput-object v0, p0, Landroid/support/v4/widget/SwipeRefreshLayout;->mProgress:Landroid/support/v4/widget/CircularProgressDrawable; + .line 400 + iget-object v0, p0, Landroid/support/v4/widget/SwipeRefreshLayout;->mProgress:Landroid/support/v4/widget/CircularProgressDrawable; + const/4 v1, 0x1 - .line 400 invoke-virtual {v0, v1}, Landroid/support/v4/widget/CircularProgressDrawable;->setStyle(I)V .line 401 @@ -1030,6 +1052,9 @@ .line 468 iput-boolean p1, p0, Landroid/support/v4/widget/SwipeRefreshLayout;->mRefreshing:Z + .line 469 + iget-boolean p1, p0, Landroid/support/v4/widget/SwipeRefreshLayout;->mRefreshing:Z + if-eqz p1, :cond_0 .line 470 @@ -1193,9 +1218,11 @@ iput-object p1, p0, Landroid/support/v4/widget/SwipeRefreshLayout;->mScaleDownToStartAnimation:Landroid/view/animation/Animation; + .line 1160 + iget-object p1, p0, Landroid/support/v4/widget/SwipeRefreshLayout;->mScaleDownToStartAnimation:Landroid/view/animation/Animation; + const-wide/16 v0, 0x96 - .line 1160 invoke-virtual {p1, v0, v1}, Landroid/view/animation/Animation;->setDuration(J)V if-eqz p2, :cond_0 @@ -1246,6 +1273,8 @@ iput-object v0, p0, Landroid/support/v4/widget/SwipeRefreshLayout;->mScaleAnimation:Landroid/view/animation/Animation; .line 447 + iget-object v0, p0, Landroid/support/v4/widget/SwipeRefreshLayout;->mScaleAnimation:Landroid/view/animation/Animation; + iget v1, p0, Landroid/support/v4/widget/SwipeRefreshLayout;->mMediumAnimationDuration:I int-to-long v1, v1 @@ -1680,6 +1709,8 @@ iput-boolean v2, p0, Landroid/support/v4/widget/SwipeRefreshLayout;->mIsBeingDragged:Z .line 713 + iget v0, p0, Landroid/support/v4/widget/SwipeRefreshLayout;->mActivePointerId:I + invoke-virtual {p1, v0}, Landroid/view/MotionEvent;->findPointerIndex(I)I move-result v0 @@ -2152,6 +2183,8 @@ iput p1, p0, Landroid/support/v4/widget/SwipeRefreshLayout;->mTotalUnconsumed:F .line 845 + iget p1, p0, Landroid/support/v4/widget/SwipeRefreshLayout;->mTotalUnconsumed:F + invoke-direct {p0, p1}, Landroid/support/v4/widget/SwipeRefreshLayout;->moveSpinner(F)V :cond_0 @@ -2605,6 +2638,10 @@ .method public varargs setColorScheme([I)V .locals 0 + .param p1 # [I + .annotation build Landroid/support/annotation/ColorRes; + .end annotation + .end param .annotation runtime Ljava/lang/Deprecated; .end annotation @@ -2616,6 +2653,10 @@ .method public varargs setColorSchemeColors([I)V .locals 1 + .param p1 # [I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param .line 572 invoke-direct {p0}, Landroid/support/v4/widget/SwipeRefreshLayout;->ensureTarget()V @@ -2630,6 +2671,10 @@ .method public varargs setColorSchemeResources([I)V .locals 4 + .param p1 # [I + .annotation build Landroid/support/annotation/ColorRes; + .end annotation + .end param .line 556 invoke-virtual {p0}, Landroid/support/v4/widget/SwipeRefreshLayout;->getContext()Landroid/content/Context; @@ -2708,6 +2753,10 @@ .method public setOnChildScrollUpCallback(Landroid/support/v4/widget/SwipeRefreshLayout$OnChildScrollUpCallback;)V .locals 0 + .param p1 # Landroid/support/v4/widget/SwipeRefreshLayout$OnChildScrollUpCallback; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 687 iput-object p1, p0, Landroid/support/v4/widget/SwipeRefreshLayout;->mChildScrollUpCallback:Landroid/support/v4/widget/SwipeRefreshLayout$OnChildScrollUpCallback; @@ -2717,6 +2766,10 @@ .method public setOnRefreshListener(Landroid/support/v4/widget/SwipeRefreshLayout$OnRefreshListener;)V .locals 0 + .param p1 # Landroid/support/v4/widget/SwipeRefreshLayout$OnRefreshListener; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 411 iput-object p1, p0, Landroid/support/v4/widget/SwipeRefreshLayout;->mListener:Landroid/support/v4/widget/SwipeRefreshLayout$OnRefreshListener; @@ -2737,6 +2790,10 @@ .method public setProgressBackgroundColorSchemeColor(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param .line 537 iget-object v0, p0, Landroid/support/v4/widget/SwipeRefreshLayout;->mCircleView:Landroid/support/v4/widget/CircleImageView; @@ -2748,6 +2805,10 @@ .method public setProgressBackgroundColorSchemeResource(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/ColorRes; + .end annotation + .end param .line 528 invoke-virtual {p0}, Landroid/support/v4/widget/SwipeRefreshLayout;->getContext()Landroid/content/Context; @@ -2940,6 +3001,10 @@ .method public setSlingshotDistance(I)V .locals 0 + .param p1 # I + .annotation build Landroid/support/annotation/Px; + .end annotation + .end param .line 310 iput p1, p0, Landroid/support/v4/widget/SwipeRefreshLayout;->mCustomSlingshotDistance:I @@ -2995,9 +3060,11 @@ iput-object v0, p0, Landroid/support/v4/widget/SwipeRefreshLayout;->mScaleDownAnimation:Landroid/view/animation/Animation; + .line 484 + iget-object v0, p0, Landroid/support/v4/widget/SwipeRefreshLayout;->mScaleDownAnimation:Landroid/view/animation/Animation; + const-wide/16 v1, 0x96 - .line 484 invoke-virtual {v0, v1, v2}, Landroid/view/animation/Animation;->setDuration(J)V .line 485 diff --git a/smali/android/support/v4/widget/TextViewCompat$AutoSizeTextType.smali b/smali/android/support/v4/widget/TextViewCompat$AutoSizeTextType.smali index d7428e7c..10a9bf25 100644 --- a/smali/android/support/v4/widget/TextViewCompat$AutoSizeTextType.smali +++ b/smali/android/support/v4/widget/TextViewCompat$AutoSizeTextType.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/widget/TextViewCompat; .end annotation diff --git a/smali/android/support/v4/widget/TextViewCompat$OreoCallback.smali b/smali/android/support/v4/widget/TextViewCompat$OreoCallback.smali index 564983da..7c2da5cd 100644 --- a/smali/android/support/v4/widget/TextViewCompat$OreoCallback.smali +++ b/smali/android/support/v4/widget/TextViewCompat$OreoCallback.smali @@ -7,6 +7,10 @@ # annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0x1a +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v4/widget/TextViewCompat; .end annotation @@ -324,9 +328,11 @@ iput-object v2, p0, Landroid/support/v4/widget/TextViewCompat$OreoCallback;->mMenuBuilderClass:Ljava/lang/Class; + .line 583 + iget-object v2, p0, Landroid/support/v4/widget/TextViewCompat$OreoCallback;->mMenuBuilderClass:Ljava/lang/Class; + new-array v6, v5, [Ljava/lang/Class; - .line 583 sget-object v7, Ljava/lang/Integer;->TYPE:Ljava/lang/Class; aput-object v7, v6, v4 @@ -436,9 +442,9 @@ if-eqz v6, :cond_2 + .line 603 new-array v6, v5, [Ljava/lang/Object; - .line 603 invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; move-result-object v7 diff --git a/smali/android/support/v4/widget/TextViewCompat.smali b/smali/android/support/v4/widget/TextViewCompat.smali index 8f20c3df..e1e4f458 100644 --- a/smali/android/support/v4/widget/TextViewCompat.smali +++ b/smali/android/support/v4/widget/TextViewCompat.smali @@ -50,6 +50,10 @@ .method public static getAutoSizeMaxTextSize(Landroid/widget/TextView;)I .locals 2 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 454 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -88,6 +92,10 @@ .method public static getAutoSizeMinTextSize(Landroid/widget/TextView;)I .locals 2 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 437 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -126,6 +134,10 @@ .method public static getAutoSizeStepGranularity(Landroid/widget/TextView;)I .locals 2 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 420 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -164,6 +176,12 @@ .method public static getAutoSizeTextAvailableSizes(Landroid/widget/TextView;)[I .locals 2 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 471 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -197,6 +215,7 @@ :cond_1 const/4 p0, 0x0 + .line 477 new-array p0, p0, [I return-object p0 @@ -204,6 +223,10 @@ .method public static getAutoSizeTextType(Landroid/widget/TextView;)I .locals 2 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 404 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -242,6 +265,12 @@ .method public static getCompoundDrawablesRelative(Landroid/widget/TextView;)[Landroid/graphics/drawable/Drawable; .locals 4 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 293 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -317,6 +346,10 @@ .method public static getFirstBaselineToTopHeight(Landroid/widget/TextView;)I .locals 1 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 766 invoke-virtual {p0}, Landroid/widget/TextView;->getPaddingTop()I @@ -340,6 +373,10 @@ .method public static getLastBaselineToBottomHeight(Landroid/widget/TextView;)I .locals 1 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 776 invoke-virtual {p0}, Landroid/widget/TextView;->getPaddingBottom()I @@ -363,6 +400,10 @@ .method public static getMaxLines(Landroid/widget/TextView;)I .locals 2 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 224 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -448,6 +489,10 @@ .method public static getMinLines(Landroid/widget/TextView;)I .locals 2 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 250 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -533,6 +578,13 @@ .method private static getTextDirection(Landroid/text/TextDirectionHeuristic;)I .locals 2 + .param p0 # Landroid/text/TextDirectionHeuristic; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x12 + .end annotation .line 961 sget-object v0, Landroid/text/TextDirectionHeuristics;->FIRSTSTRONG_RTL:Landroid/text/TextDirectionHeuristic; @@ -617,6 +669,13 @@ .method private static getTextDirectionHeuristic(Landroid/widget/TextView;)Landroid/text/TextDirectionHeuristic; .locals 4 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x12 + .end annotation .line 905 invoke-virtual {p0}, Landroid/widget/TextView;->getTransformationMethod()Landroid/text/method/TransformationMethod; @@ -783,6 +842,12 @@ .method public static getTextMetricsParams(Landroid/widget/TextView;)Landroid/support/v4/text/PrecomputedTextCompat$Params; .locals 3 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 813 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -960,6 +1025,10 @@ .method public static setAutoSizeTextTypeUniformWithConfiguration(Landroid/widget/TextView;IIII)V .locals 2 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Ljava/lang/IllegalArgumentException; @@ -996,6 +1065,14 @@ .method public static setAutoSizeTextTypeUniformWithPresetSizes(Landroid/widget/TextView;[II)V .locals 2 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # [I + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Ljava/lang/IllegalArgumentException; @@ -1032,6 +1109,10 @@ .method public static setAutoSizeTextTypeWithDefaults(Landroid/widget/TextView;I)V .locals 2 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 324 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1063,6 +1144,26 @@ .method public static setCompoundDrawablesRelative(Landroid/widget/TextView;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V .locals 2 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p2 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p4 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 149 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1132,6 +1233,26 @@ .method public static setCompoundDrawablesRelativeWithIntrinsicBounds(Landroid/widget/TextView;IIII)V .locals 2 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param + .param p3 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param + .param p4 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .line 208 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1201,6 +1322,26 @@ .method public static setCompoundDrawablesRelativeWithIntrinsicBounds(Landroid/widget/TextView;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;Landroid/graphics/drawable/Drawable;)V .locals 2 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p2 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p4 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 176 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1270,6 +1411,14 @@ .method public static setCustomSelectionActionModeCallback(Landroid/widget/TextView;Landroid/view/ActionMode$Callback;)V .locals 0 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/view/ActionMode$Callback; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 505 invoke-static {p0, p1}, Landroid/support/v4/widget/TextViewCompat;->wrapCustomSelectionActionModeCallback(Landroid/widget/TextView;Landroid/view/ActionMode$Callback;)Landroid/view/ActionMode$Callback; @@ -1284,6 +1433,18 @@ .method public static setFirstBaselineToTopHeight(Landroid/widget/TextView;I)V .locals 3 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + .end annotation + + .annotation build Landroid/support/annotation/Px; + .end annotation + .end param .line 691 invoke-static {p1}, Landroid/support/v4/util/Preconditions;->checkArgumentNonnegative(I)I @@ -1372,6 +1533,18 @@ .method public static setLastBaselineToBottomHeight(Landroid/widget/TextView;I)V .locals 3 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + .end annotation + + .annotation build Landroid/support/annotation/Px; + .end annotation + .end param .line 736 invoke-static {p1}, Landroid/support/v4/util/Preconditions;->checkArgumentNonnegative(I)I @@ -1445,6 +1618,18 @@ .method public static setLineHeight(Landroid/widget/TextView;I)V .locals 2 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + .end annotation + + .annotation build Landroid/support/annotation/Px; + .end annotation + .end param .line 794 invoke-static {p1}, Landroid/support/v4/util/Preconditions;->checkArgumentNonnegative(I)I @@ -1477,6 +1662,14 @@ .method public static setPrecomputedText(Landroid/widget/TextView;Landroid/support/v4/text/PrecomputedTextCompat;)V .locals 2 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/support/v4/text/PrecomputedTextCompat; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 882 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1530,6 +1723,14 @@ .method public static setTextAppearance(Landroid/widget/TextView;I)V .locals 2 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/StyleRes; + .end annotation + .end param .line 281 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1557,6 +1758,14 @@ .method public static setTextMetricsParams(Landroid/widget/TextView;Landroid/support/v4/text/PrecomputedTextCompat$Params;)V .locals 2 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/support/v4/text/PrecomputedTextCompat$Params; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 840 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1662,6 +1871,22 @@ .method public static wrapCustomSelectionActionModeCallback(Landroid/widget/TextView;Landroid/view/ActionMode$Callback;)Landroid/view/ActionMode$Callback; .locals 2 + .param p0 # Landroid/widget/TextView; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/view/ActionMode$Callback; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 517 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v4/widget/TintableCompoundButton.smali b/smali/android/support/v4/widget/TintableCompoundButton.smali index 58829680..bf02d811 100644 --- a/smali/android/support/v4/widget/TintableCompoundButton.smali +++ b/smali/android/support/v4/widget/TintableCompoundButton.smali @@ -5,13 +5,25 @@ # virtual methods .method public abstract getSupportButtonTintList()Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method .method public abstract getSupportButtonTintMode()Landroid/graphics/PorterDuff$Mode; + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method .method public abstract setSupportButtonTintList(Landroid/content/res/ColorStateList;)V + .param p1 # Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .end method .method public abstract setSupportButtonTintMode(Landroid/graphics/PorterDuff$Mode;)V + .param p1 # Landroid/graphics/PorterDuff$Mode; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .end method diff --git a/smali/android/support/v4/widget/TintableImageSourceView.smali b/smali/android/support/v4/widget/TintableImageSourceView.smali index 847498b0..9e011eeb 100644 --- a/smali/android/support/v4/widget/TintableImageSourceView.smali +++ b/smali/android/support/v4/widget/TintableImageSourceView.smali @@ -3,15 +3,35 @@ .source "TintableImageSourceView.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # virtual methods .method public abstract getSupportImageTintList()Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method .method public abstract getSupportImageTintMode()Landroid/graphics/PorterDuff$Mode; + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method .method public abstract setSupportImageTintList(Landroid/content/res/ColorStateList;)V + .param p1 # Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .end method .method public abstract setSupportImageTintMode(Landroid/graphics/PorterDuff$Mode;)V + .param p1 # Landroid/graphics/PorterDuff$Mode; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .end method diff --git a/smali/android/support/v4/widget/ViewDragHelper$Callback.smali b/smali/android/support/v4/widget/ViewDragHelper$Callback.smali index 24a8f868..c81e4abf 100644 --- a/smali/android/support/v4/widget/ViewDragHelper$Callback.smali +++ b/smali/android/support/v4/widget/ViewDragHelper$Callback.smali @@ -28,6 +28,10 @@ # virtual methods .method public clampViewPositionHorizontal(Landroid/view/View;II)I .locals 0 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 p1, 0x0 @@ -36,6 +40,10 @@ .method public clampViewPositionVertical(Landroid/view/View;II)I .locals 0 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 p1, 0x0 @@ -50,6 +58,10 @@ .method public getViewHorizontalDragRange(Landroid/view/View;)I .locals 0 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 p1, 0x0 @@ -58,6 +70,10 @@ .method public getViewVerticalDragRange(Landroid/view/View;)I .locals 0 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 p1, 0x0 @@ -86,6 +102,10 @@ .method public onViewCaptured(Landroid/view/View;I)V .locals 0 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param return-void .end method @@ -98,15 +118,35 @@ .method public onViewPositionChanged(Landroid/view/View;IIII)V .locals 0 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # I + .annotation build Landroid/support/annotation/Px; + .end annotation + .end param + .param p5 # I + .annotation build Landroid/support/annotation/Px; + .end annotation + .end param return-void .end method .method public onViewReleased(Landroid/view/View;FF)V .locals 0 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param return-void .end method .method public abstract tryCaptureView(Landroid/view/View;I)Z + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method diff --git a/smali/android/support/v4/widget/ViewDragHelper.smali b/smali/android/support/v4/widget/ViewDragHelper.smali index a47fcbb0..d21f039a 100644 --- a/smali/android/support/v4/widget/ViewDragHelper.smali +++ b/smali/android/support/v4/widget/ViewDragHelper.smali @@ -109,6 +109,18 @@ .method private constructor (Landroid/content/Context;Landroid/view/ViewGroup;Landroid/support/v4/widget/ViewDragHelper$Callback;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/ViewGroup; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/support/v4/widget/ViewDragHelper$Callback; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 383 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -879,6 +891,14 @@ .method public static create(Landroid/view/ViewGroup;FLandroid/support/v4/widget/ViewDragHelper$Callback;)Landroid/support/v4/widget/ViewDragHelper; .locals 1 + .param p0 # Landroid/view/ViewGroup; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v4/widget/ViewDragHelper$Callback; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 369 invoke-static {p0, p2}, Landroid/support/v4/widget/ViewDragHelper;->create(Landroid/view/ViewGroup;Landroid/support/v4/widget/ViewDragHelper$Callback;)Landroid/support/v4/widget/ViewDragHelper; @@ -905,6 +925,14 @@ .method public static create(Landroid/view/ViewGroup;Landroid/support/v4/widget/ViewDragHelper$Callback;)Landroid/support/v4/widget/ViewDragHelper; .locals 2 + .param p0 # Landroid/view/ViewGroup; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/support/v4/widget/ViewDragHelper$Callback; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 355 new-instance v0, Landroid/support/v4/widget/ViewDragHelper; @@ -1060,103 +1088,106 @@ if-eqz v0, :cond_0 - array-length v1, v0 + array-length v0, v0 - if-gt v1, p1, :cond_2 + if-gt v0, p1, :cond_2 :cond_0 add-int/lit8 p1, p1, 0x1 .line 819 - new-array v1, p1, [F + new-array v0, p1, [F .line 820 - new-array v2, p1, [F + new-array v1, p1, [F .line 821 - new-array v3, p1, [F + new-array v2, p1, [F .line 822 - new-array v4, p1, [F + new-array v3, p1, [F .line 823 - new-array v5, p1, [I + new-array v4, p1, [I .line 824 - new-array v6, p1, [I + new-array v5, p1, [I .line 825 new-array p1, p1, [I - if-eqz v0, :cond_1 + .line 827 + iget-object v6, p0, Landroid/support/v4/widget/ViewDragHelper;->mInitialMotionX:[F + + if-eqz v6, :cond_1 .line 828 - array-length v7, v0 + array-length v7, v6 const/4 v8, 0x0 - invoke-static {v0, v8, v1, v8, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V + invoke-static {v6, v8, v0, v8, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V .line 829 - iget-object v0, p0, Landroid/support/v4/widget/ViewDragHelper;->mInitialMotionY:[F + iget-object v6, p0, Landroid/support/v4/widget/ViewDragHelper;->mInitialMotionY:[F - array-length v7, v0 + array-length v7, v6 - invoke-static {v0, v8, v2, v8, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V + invoke-static {v6, v8, v1, v8, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V .line 830 - iget-object v0, p0, Landroid/support/v4/widget/ViewDragHelper;->mLastMotionX:[F + iget-object v6, p0, Landroid/support/v4/widget/ViewDragHelper;->mLastMotionX:[F - array-length v7, v0 + array-length v7, v6 - invoke-static {v0, v8, v3, v8, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V + invoke-static {v6, v8, v2, v8, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V .line 831 - iget-object v0, p0, Landroid/support/v4/widget/ViewDragHelper;->mLastMotionY:[F + iget-object v6, p0, Landroid/support/v4/widget/ViewDragHelper;->mLastMotionY:[F - array-length v7, v0 + array-length v7, v6 - invoke-static {v0, v8, v4, v8, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V + invoke-static {v6, v8, v3, v8, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V .line 832 - iget-object v0, p0, Landroid/support/v4/widget/ViewDragHelper;->mInitialEdgesTouched:[I + iget-object v6, p0, Landroid/support/v4/widget/ViewDragHelper;->mInitialEdgesTouched:[I - array-length v7, v0 + array-length v7, v6 - invoke-static {v0, v8, v5, v8, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V + invoke-static {v6, v8, v4, v8, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V .line 833 - iget-object v0, p0, Landroid/support/v4/widget/ViewDragHelper;->mEdgeDragsInProgress:[I + iget-object v6, p0, Landroid/support/v4/widget/ViewDragHelper;->mEdgeDragsInProgress:[I - array-length v7, v0 + array-length v7, v6 - invoke-static {v0, v8, v6, v8, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V + invoke-static {v6, v8, v5, v8, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V .line 834 - iget-object v0, p0, Landroid/support/v4/widget/ViewDragHelper;->mEdgeDragsLocked:[I + iget-object v6, p0, Landroid/support/v4/widget/ViewDragHelper;->mEdgeDragsLocked:[I - array-length v7, v0 + array-length v7, v6 - invoke-static {v0, v8, p1, v8, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V + invoke-static {v6, v8, p1, v8, v7}, Ljava/lang/System;->arraycopy(Ljava/lang/Object;ILjava/lang/Object;II)V .line 837 :cond_1 - iput-object v1, p0, Landroid/support/v4/widget/ViewDragHelper;->mInitialMotionX:[F + iput-object v0, p0, Landroid/support/v4/widget/ViewDragHelper;->mInitialMotionX:[F .line 838 - iput-object v2, p0, Landroid/support/v4/widget/ViewDragHelper;->mInitialMotionY:[F + iput-object v1, p0, Landroid/support/v4/widget/ViewDragHelper;->mInitialMotionY:[F .line 839 - iput-object v3, p0, Landroid/support/v4/widget/ViewDragHelper;->mLastMotionX:[F + iput-object v2, p0, Landroid/support/v4/widget/ViewDragHelper;->mLastMotionX:[F .line 840 - iput-object v4, p0, Landroid/support/v4/widget/ViewDragHelper;->mLastMotionY:[F + iput-object v3, p0, Landroid/support/v4/widget/ViewDragHelper;->mLastMotionY:[F .line 841 - iput-object v5, p0, Landroid/support/v4/widget/ViewDragHelper;->mInitialEdgesTouched:[I + iput-object v4, p0, Landroid/support/v4/widget/ViewDragHelper;->mInitialEdgesTouched:[I .line 842 - iput-object v6, p0, Landroid/support/v4/widget/ViewDragHelper;->mEdgeDragsInProgress:[I + iput-object v5, p0, Landroid/support/v4/widget/ViewDragHelper;->mEdgeDragsInProgress:[I .line 843 iput-object p1, p0, Landroid/support/v4/widget/ViewDragHelper;->mEdgeDragsLocked:[I @@ -1429,8 +1460,16 @@ .line 1256 invoke-direct {p0, p1, p2, p3, v0}, Landroid/support/v4/widget/ViewDragHelper;->checkNewEdgeDrag(FFII)Z - move-result v0 + move-result v1 + if-eqz v1, :cond_0 + + goto :goto_0 + + :cond_0 + const/4 v0, 0x0 + + :goto_0 const/4 v1, 0x4 .line 1259 @@ -1438,11 +1477,11 @@ move-result v1 - if-eqz v1, :cond_0 + if-eqz v1, :cond_1 or-int/lit8 v0, v0, 0x4 - :cond_0 + :cond_1 const/4 v1, 0x2 .line 1262 @@ -1450,11 +1489,11 @@ move-result v1 - if-eqz v1, :cond_1 + if-eqz v1, :cond_2 or-int/lit8 v0, v0, 0x2 - :cond_1 + :cond_2 const/16 v1, 0x8 .line 1265 @@ -1462,12 +1501,12 @@ move-result p1 - if-eqz p1, :cond_2 + if-eqz p1, :cond_3 or-int/lit8 v0, v0, 0x8 - :cond_2 - if-eqz v0, :cond_3 + :cond_3 + if-eqz v0, :cond_4 .line 1270 iget-object p1, p0, Landroid/support/v4/widget/ViewDragHelper;->mEdgeDragsInProgress:[I @@ -1483,7 +1522,7 @@ invoke-virtual {p1, v0, p3}, Landroid/support/v4/widget/ViewDragHelper$Callback;->onEdgeDragStarted(II)V - :cond_3 + :cond_4 return-void .end method @@ -1665,6 +1704,10 @@ .method protected canScroll(Landroid/view/View;ZIIII)Z .locals 13 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param move-object v0, p1 @@ -1837,6 +1880,10 @@ .method public captureChildView(Landroid/view/View;I)V .locals 2 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 471 invoke-virtual {p1}, Landroid/view/View;->getParent()Landroid/view/ViewParent; @@ -2206,6 +2253,8 @@ .method public findTopChildUnder(II)Landroid/view/View; .locals 3 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 1487 iget-object v0, p0, Landroid/support/v4/widget/ViewDragHelper;->mParentView:Landroid/view/ViewGroup; @@ -2356,6 +2405,8 @@ .method public getCapturedView()Landroid/view/View; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 487 iget-object v0, p0, Landroid/support/v4/widget/ViewDragHelper;->mCapturedView:Landroid/view/View; @@ -2365,6 +2416,8 @@ .method public getEdgeSize()I .locals 1 + .annotation build Landroid/support/annotation/Px; + .end annotation .line 459 iget v0, p0, Landroid/support/v4/widget/ViewDragHelper;->mEdgeSize:I @@ -2383,6 +2436,8 @@ .method public getTouchSlop()I .locals 1 + .annotation build Landroid/support/annotation/Px; + .end annotation .line 503 iget v0, p0, Landroid/support/v4/widget/ViewDragHelper;->mTouchSlop:I @@ -2501,6 +2556,10 @@ .method public isViewUnder(Landroid/view/View;II)Z .locals 2 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param const/4 v0, 0x0 @@ -2545,6 +2604,10 @@ .method public processTouchEvent(Landroid/view/MotionEvent;)V .locals 9 + .param p1 # Landroid/view/MotionEvent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1097 invoke-virtual {p1}, Landroid/view/MotionEvent;->getActionMasked()I @@ -3145,6 +3208,10 @@ .method public shouldInterceptTouchEvent(Landroid/view/MotionEvent;)Z .locals 16 + .param p1 # Landroid/view/MotionEvent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param move-object/from16 v0, p0 @@ -3560,6 +3627,10 @@ .method public smoothSlideViewTo(Landroid/view/View;II)Z .locals 0 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 552 iput-object p1, p0, Landroid/support/v4/widget/ViewDragHelper;->mCapturedView:Landroid/view/View; diff --git a/smali/android/support/v4/widget/ViewGroupUtils.smali b/smali/android/support/v4/widget/ViewGroupUtils.smali index c4451f52..79e12226 100644 --- a/smali/android/support/v4/widget/ViewGroupUtils.smali +++ b/smali/android/support/v4/widget/ViewGroupUtils.smali @@ -3,6 +3,14 @@ .source "ViewGroupUtils.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field private static final sMatrix:Ljava/lang/ThreadLocal; .annotation system Ldalvik/annotation/Signature; @@ -163,84 +171,88 @@ invoke-virtual {v0}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object; - move-result-object v1 + move-result-object v0 - check-cast v1, Landroid/graphics/Matrix; + check-cast v0, Landroid/graphics/Matrix; - if-nez v1, :cond_0 + if-nez v0, :cond_0 .line 50 - new-instance v1, Landroid/graphics/Matrix; + new-instance v0, Landroid/graphics/Matrix; - invoke-direct {v1}, Landroid/graphics/Matrix;->()V + invoke-direct {v0}, Landroid/graphics/Matrix;->()V .line 51 - invoke-virtual {v0, v1}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V + sget-object v1, Landroid/support/v4/widget/ViewGroupUtils;->sMatrix:Ljava/lang/ThreadLocal; + + invoke-virtual {v1, v0}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V goto :goto_0 .line 53 :cond_0 - invoke-virtual {v1}, Landroid/graphics/Matrix;->reset()V + invoke-virtual {v0}, Landroid/graphics/Matrix;->reset()V .line 56 :goto_0 - invoke-static {p0, p1, v1}, Landroid/support/v4/widget/ViewGroupUtils;->offsetDescendantMatrix(Landroid/view/ViewParent;Landroid/view/View;Landroid/graphics/Matrix;)V + invoke-static {p0, p1, v0}, Landroid/support/v4/widget/ViewGroupUtils;->offsetDescendantMatrix(Landroid/view/ViewParent;Landroid/view/View;Landroid/graphics/Matrix;)V .line 58 sget-object p0, Landroid/support/v4/widget/ViewGroupUtils;->sRectF:Ljava/lang/ThreadLocal; invoke-virtual {p0}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object; - move-result-object p1 + move-result-object p0 - check-cast p1, Landroid/graphics/RectF; + check-cast p0, Landroid/graphics/RectF; - if-nez p1, :cond_1 + if-nez p0, :cond_1 .line 60 - new-instance p1, Landroid/graphics/RectF; + new-instance p0, Landroid/graphics/RectF; - invoke-direct {p1}, Landroid/graphics/RectF;->()V + invoke-direct {p0}, Landroid/graphics/RectF;->()V .line 61 - invoke-virtual {p0, p1}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V + sget-object p1, Landroid/support/v4/widget/ViewGroupUtils;->sRectF:Ljava/lang/ThreadLocal; + + invoke-virtual {p1, p0}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V .line 63 :cond_1 - invoke-virtual {p1, p2}, Landroid/graphics/RectF;->set(Landroid/graphics/Rect;)V + invoke-virtual {p0, p2}, Landroid/graphics/RectF;->set(Landroid/graphics/Rect;)V .line 64 - invoke-virtual {v1, p1}, Landroid/graphics/Matrix;->mapRect(Landroid/graphics/RectF;)Z + invoke-virtual {v0, p0}, Landroid/graphics/Matrix;->mapRect(Landroid/graphics/RectF;)Z .line 65 - iget p0, p1, Landroid/graphics/RectF;->left:F + iget p1, p0, Landroid/graphics/RectF;->left:F const/high16 v0, 0x3f000000 # 0.5f - add-float/2addr p0, v0 + add-float/2addr p1, v0 - float-to-int p0, p0 + float-to-int p1, p1 - iget v1, p1, Landroid/graphics/RectF;->top:F + iget v1, p0, Landroid/graphics/RectF;->top:F add-float/2addr v1, v0 float-to-int v1, v1 - iget v2, p1, Landroid/graphics/RectF;->right:F + iget v2, p0, Landroid/graphics/RectF;->right:F add-float/2addr v2, v0 float-to-int v2, v2 - iget p1, p1, Landroid/graphics/RectF;->bottom:F + iget p0, p0, Landroid/graphics/RectF;->bottom:F - add-float/2addr p1, v0 + add-float/2addr p0, v0 - float-to-int p1, p1 + float-to-int p0, p0 - invoke-virtual {p2, p0, v1, v2, p1}, Landroid/graphics/Rect;->set(IIII)V + invoke-virtual {p2, p1, v1, v2, p0}, Landroid/graphics/Rect;->set(IIII)V return-void .end method diff --git a/smali/android/support/v7/app/ActionBar$DisplayOptions.smali b/smali/android/support/v7/app/ActionBar$DisplayOptions.smali index 232f7a89..ae022f3f 100644 --- a/smali/android/support/v7/app/ActionBar$DisplayOptions.smali +++ b/smali/android/support/v7/app/ActionBar$DisplayOptions.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v7/app/ActionBar; .end annotation diff --git a/smali/android/support/v7/app/ActionBar$LayoutParams.smali b/smali/android/support/v7/app/ActionBar$LayoutParams.smali index f102971c..0e34fd5a 100644 --- a/smali/android/support/v7/app/ActionBar$LayoutParams.smali +++ b/smali/android/support/v7/app/ActionBar$LayoutParams.smali @@ -38,6 +38,11 @@ .line 1385 invoke-direct {p0, p1, p2}, Landroid/view/ViewGroup$MarginLayoutParams;->(II)V + const/4 p1, 0x0 + + .line 1374 + iput p1, p0, Landroid/support/v7/app/ActionBar$LayoutParams;->gravity:I + const p1, 0x800013 .line 1386 @@ -52,6 +57,11 @@ .line 1390 invoke-direct {p0, p1, p2}, Landroid/view/ViewGroup$MarginLayoutParams;->(II)V + const/4 p1, 0x0 + + .line 1374 + iput p1, p0, Landroid/support/v7/app/ActionBar$LayoutParams;->gravity:I + .line 1391 iput p3, p0, Landroid/support/v7/app/ActionBar$LayoutParams;->gravity:I @@ -60,6 +70,10 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V .locals 2 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1377 invoke-direct {p0, p1, p2}, Landroid/view/ViewGroup$MarginLayoutParams;->(Landroid/content/Context;Landroid/util/AttributeSet;)V diff --git a/smali/android/support/v7/app/ActionBar$NavigationMode.smali b/smali/android/support/v7/app/ActionBar$NavigationMode.smali index 49ca6b23..088144bc 100644 --- a/smali/android/support/v7/app/ActionBar$NavigationMode.smali +++ b/smali/android/support/v7/app/ActionBar$NavigationMode.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v7/app/ActionBar; .end annotation diff --git a/smali/android/support/v7/app/ActionBar$Tab.smali b/smali/android/support/v7/app/ActionBar$Tab.smali index 899a0129..e31486d3 100644 --- a/smali/android/support/v7/app/ActionBar$Tab.smali +++ b/smali/android/support/v7/app/ActionBar$Tab.smali @@ -55,6 +55,10 @@ .end method .method public abstract setContentDescription(I)Landroid/support/v7/app/ActionBar$Tab; + .param p1 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param .end method .method public abstract setContentDescription(Ljava/lang/CharSequence;)Landroid/support/v7/app/ActionBar$Tab; @@ -67,6 +71,10 @@ .end method .method public abstract setIcon(I)Landroid/support/v7/app/ActionBar$Tab; + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .end method .method public abstract setIcon(Landroid/graphics/drawable/Drawable;)Landroid/support/v7/app/ActionBar$Tab; diff --git a/smali/android/support/v7/app/ActionBar.smali b/smali/android/support/v7/app/ActionBar.smali index 18e32b8f..142311a9 100644 --- a/smali/android/support/v7/app/ActionBar.smali +++ b/smali/android/support/v7/app/ActionBar.smali @@ -81,6 +81,11 @@ .method public closeOptionsMenu()Z .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation const/4 v0, 0x0 @@ -89,6 +94,11 @@ .method public collapseActionView()Z .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation const/4 v0, 0x0 @@ -97,6 +107,11 @@ .method public dispatchMenuVisibilityChanged(Z)V .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation return-void .end method @@ -142,11 +157,16 @@ .end method .method public abstract getSelectedTab()Landroid/support/v7/app/ActionBar$Tab; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation runtime Ljava/lang/Deprecated; .end annotation .end method .method public abstract getSubtitle()Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method .method public abstract getTabAt(I)Landroid/support/v7/app/ActionBar$Tab; @@ -168,6 +188,8 @@ .end method .method public abstract getTitle()Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method .method public abstract hide()V @@ -175,6 +197,11 @@ .method public invalidateOptionsMenu()Z .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation const/4 v0, 0x0 @@ -194,6 +221,11 @@ .method public isTitleTruncated()Z .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation const/4 v0, 0x0 @@ -207,6 +239,11 @@ .method public onConfigurationChanged(Landroid/content/res/Configuration;)V .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation return-void .end method @@ -219,6 +256,11 @@ .method public onKeyShortcut(ILandroid/view/KeyEvent;)Z .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation const/4 p1, 0x0 @@ -227,6 +269,11 @@ .method public onMenuKeyEvent(Landroid/view/KeyEvent;)Z .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation const/4 p1, 0x0 @@ -235,6 +282,11 @@ .method public openOptionsMenu()Z .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation const/4 v0, 0x0 @@ -261,6 +313,11 @@ .method requestFocus()Z .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation const/4 v0, 0x0 @@ -273,6 +330,10 @@ .end method .method public abstract setBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .end method .method public abstract setCustomView(I)V @@ -286,6 +347,11 @@ .method public setDefaultDisplayHomeAsUpEnabled(Z)V .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation return-void .end method @@ -371,24 +437,40 @@ .method public setHomeActionContentDescription(I)V .locals 0 + .param p1 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param return-void .end method .method public setHomeActionContentDescription(Ljava/lang/CharSequence;)V .locals 0 + .param p1 # Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param return-void .end method .method public setHomeAsUpIndicator(I)V .locals 0 + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param return-void .end method .method public setHomeAsUpIndicator(Landroid/graphics/drawable/Drawable;)V .locals 0 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param return-void .end method @@ -400,6 +482,10 @@ .end method .method public abstract setIcon(I)V + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .end method .method public abstract setIcon(Landroid/graphics/drawable/Drawable;)V @@ -411,6 +497,10 @@ .end method .method public abstract setLogo(I)V + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .end method .method public abstract setLogo(Landroid/graphics/drawable/Drawable;)V @@ -428,6 +518,11 @@ .method public setShowHideAnimationEnabled(Z)V .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation return-void .end method @@ -451,6 +546,10 @@ .end method .method public abstract setTitle(I)V + .param p1 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param .end method .method public abstract setTitle(Ljava/lang/CharSequence;)V @@ -458,6 +557,11 @@ .method public setWindowTitle(Ljava/lang/CharSequence;)V .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation return-void .end method @@ -467,6 +571,11 @@ .method public startActionMode(Landroid/support/v7/view/ActionMode$Callback;)Landroid/support/v7/view/ActionMode; .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation const/4 p1, 0x0 diff --git a/smali/android/support/v7/app/ActionBarDrawerToggle$Delegate.smali b/smali/android/support/v7/app/ActionBarDrawerToggle$Delegate.smali index 5f609ded..b3f27a79 100644 --- a/smali/android/support/v7/app/ActionBarDrawerToggle$Delegate.smali +++ b/smali/android/support/v7/app/ActionBarDrawerToggle$Delegate.smali @@ -25,7 +25,15 @@ .end method .method public abstract setActionBarDescription(I)V + .param p1 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param .end method .method public abstract setActionBarUpIndicator(Landroid/graphics/drawable/Drawable;I)V + .param p2 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param .end method diff --git a/smali/android/support/v7/app/ActionBarDrawerToggle$DelegateProvider.smali b/smali/android/support/v7/app/ActionBarDrawerToggle$DelegateProvider.smali index cd8dbc08..7a8454ff 100644 --- a/smali/android/support/v7/app/ActionBarDrawerToggle$DelegateProvider.smali +++ b/smali/android/support/v7/app/ActionBarDrawerToggle$DelegateProvider.smali @@ -16,4 +16,6 @@ # virtual methods .method public abstract getDrawerToggleDelegate()Landroid/support/v7/app/ActionBarDrawerToggle$Delegate; + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method diff --git a/smali/android/support/v7/app/ActionBarDrawerToggle$ToolbarCompatDelegate.smali b/smali/android/support/v7/app/ActionBarDrawerToggle$ToolbarCompatDelegate.smali index dd7ff040..11b44521 100644 --- a/smali/android/support/v7/app/ActionBarDrawerToggle$ToolbarCompatDelegate.smali +++ b/smali/android/support/v7/app/ActionBarDrawerToggle$ToolbarCompatDelegate.smali @@ -86,6 +86,10 @@ .method public setActionBarDescription(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param if-nez p1, :cond_0 @@ -110,6 +114,10 @@ .method public setActionBarUpIndicator(Landroid/graphics/drawable/Drawable;I)V .locals 1 + .param p2 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param .line 599 iget-object v0, p0, Landroid/support/v7/app/ActionBarDrawerToggle$ToolbarCompatDelegate;->mToolbar:Landroid/support/v7/widget/Toolbar; diff --git a/smali/android/support/v7/app/ActionBarDrawerToggle.smali b/smali/android/support/v7/app/ActionBarDrawerToggle.smali index a9090db2..62ea9f48 100644 --- a/smali/android/support/v7/app/ActionBarDrawerToggle.smali +++ b/smali/android/support/v7/app/ActionBarDrawerToggle.smali @@ -44,6 +44,14 @@ # direct methods .method public constructor (Landroid/app/Activity;Landroid/support/v4/widget/DrawerLayout;II)V .locals 7 + .param p3 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param + .param p4 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param const/4 v2, 0x0 @@ -67,6 +75,14 @@ .method public constructor (Landroid/app/Activity;Landroid/support/v4/widget/DrawerLayout;Landroid/support/v7/widget/Toolbar;II)V .locals 7 + .param p4 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param + .param p5 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param const/4 v4, 0x0 @@ -90,6 +106,14 @@ .method constructor (Landroid/app/Activity;Landroid/support/v7/widget/Toolbar;Landroid/support/v4/widget/DrawerLayout;Landroid/support/v7/graphics/drawable/DrawerArrowDrawable;II)V .locals 1 + .param p5 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param + .param p6 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param .line 195 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -238,6 +262,8 @@ # virtual methods .method public getDrawerArrowDrawable()Landroid/support/v7/graphics/drawable/DrawerArrowDrawable; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 371 iget-object v0, p0, Landroid/support/v7/app/ActionBarDrawerToggle;->mSlider:Landroid/support/v7/graphics/drawable/DrawerArrowDrawable; @@ -471,6 +497,10 @@ .method public setDrawerArrowDrawable(Landroid/support/v7/graphics/drawable/DrawerArrowDrawable;)V .locals 0 + .param p1 # Landroid/support/v7/graphics/drawable/DrawerArrowDrawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 380 iput-object p1, p0, Landroid/support/v7/app/ActionBarDrawerToggle;->mSlider:Landroid/support/v7/graphics/drawable/DrawerArrowDrawable; diff --git a/smali/android/support/v7/app/ActionBarDrawerToggleHoneycomb$SetIndicatorInfo.smali b/smali/android/support/v7/app/ActionBarDrawerToggleHoneycomb$SetIndicatorInfo.smali index 086484b4..969e863e 100644 --- a/smali/android/support/v7/app/ActionBarDrawerToggleHoneycomb$SetIndicatorInfo.smali +++ b/smali/android/support/v7/app/ActionBarDrawerToggleHoneycomb$SetIndicatorInfo.smali @@ -123,20 +123,23 @@ if-ne v1, v2, :cond_2 - move-object v0, p1 + goto :goto_0 - .line 133 :cond_2 + move-object p1, v0 + + .line 133 + :goto_0 nop - instance-of p1, v0, Landroid/widget/ImageView; + instance-of v0, p1, Landroid/widget/ImageView; - if-eqz p1, :cond_3 + if-eqz v0, :cond_3 .line 135 - check-cast v0, Landroid/widget/ImageView; + check-cast p1, Landroid/widget/ImageView; - iput-object v0, p0, Landroid/support/v7/app/ActionBarDrawerToggleHoneycomb$SetIndicatorInfo;->upIndicatorView:Landroid/widget/ImageView; + iput-object p1, p0, Landroid/support/v7/app/ActionBarDrawerToggleHoneycomb$SetIndicatorInfo;->upIndicatorView:Landroid/widget/ImageView; :cond_3 return-void diff --git a/smali/android/support/v7/app/ActionBarDrawerToggleHoneycomb.smali b/smali/android/support/v7/app/ActionBarDrawerToggleHoneycomb.smali index e9825565..064a5412 100644 --- a/smali/android/support/v7/app/ActionBarDrawerToggleHoneycomb.smali +++ b/smali/android/support/v7/app/ActionBarDrawerToggleHoneycomb.smali @@ -23,6 +23,7 @@ const/4 v0, 0x1 + .line 45 new-array v0, v0, [I const/4 v1, 0x0 @@ -31,7 +32,6 @@ aput v2, v0, v1 - .line 45 sput-object v0, Landroid/support/v7/app/ActionBarDrawerToggleHoneycomb;->THEME_ATTRS:[I return-void diff --git a/smali/android/support/v7/app/AlertController$AlertParams$2.smali b/smali/android/support/v7/app/AlertController$AlertParams$2.smali index f4a3603a..85fce204 100644 --- a/smali/android/support/v7/app/AlertController$AlertParams$2.smali +++ b/smali/android/support/v7/app/AlertController$AlertParams$2.smali @@ -42,21 +42,25 @@ .line 1014 invoke-virtual {p0}, Landroid/support/v7/app/AlertController$AlertParams$2;->getCursor()Landroid/database/Cursor; - move-result-object p2 + move-result-object p1 .line 1015 - iget-object p3, p1, Landroid/support/v7/app/AlertController$AlertParams;->mLabelColumn:Ljava/lang/String; + iget-object p2, p0, Landroid/support/v7/app/AlertController$AlertParams$2;->this$0:Landroid/support/v7/app/AlertController$AlertParams; - invoke-interface {p2, p3}, Landroid/database/Cursor;->getColumnIndexOrThrow(Ljava/lang/String;)I + iget-object p2, p2, Landroid/support/v7/app/AlertController$AlertParams;->mLabelColumn:Ljava/lang/String; - move-result p3 + invoke-interface {p1, p2}, Landroid/database/Cursor;->getColumnIndexOrThrow(Ljava/lang/String;)I - iput p3, p0, Landroid/support/v7/app/AlertController$AlertParams$2;->mLabelIndex:I + move-result p2 + + iput p2, p0, Landroid/support/v7/app/AlertController$AlertParams$2;->mLabelIndex:I .line 1016 - iget-object p1, p1, Landroid/support/v7/app/AlertController$AlertParams;->mIsCheckedColumn:Ljava/lang/String; + iget-object p2, p0, Landroid/support/v7/app/AlertController$AlertParams$2;->this$0:Landroid/support/v7/app/AlertController$AlertParams; + + iget-object p2, p2, Landroid/support/v7/app/AlertController$AlertParams;->mIsCheckedColumn:Ljava/lang/String; - invoke-interface {p2, p1}, Landroid/database/Cursor;->getColumnIndexOrThrow(Ljava/lang/String;)I + invoke-interface {p1, p2}, Landroid/database/Cursor;->getColumnIndexOrThrow(Ljava/lang/String;)I move-result p1 diff --git a/smali/android/support/v7/app/AlertController$AlertParams.smali b/smali/android/support/v7/app/AlertController$AlertParams.smali index e30b599e..2c95ee88 100644 --- a/smali/android/support/v7/app/AlertController$AlertParams.smali +++ b/smali/android/support/v7/app/AlertController$AlertParams.smali @@ -157,7 +157,7 @@ .end method .method private createListView(Landroid/support/v7/app/AlertController;)V - .locals 10 + .locals 11 .line 988 iget-object v0, p0, Landroid/support/v7/app/AlertController$AlertParams;->mInflater:Landroid/view/LayoutInflater; @@ -181,9 +181,9 @@ if-eqz v1, :cond_1 .line 993 - iget-object v1, p0, Landroid/support/v7/app/AlertController$AlertParams;->mCursor:Landroid/database/Cursor; + iget-object v4, p0, Landroid/support/v7/app/AlertController$AlertParams;->mCursor:Landroid/database/Cursor; - if-nez v1, :cond_0 + if-nez v4, :cond_0 .line 994 new-instance v9, Landroid/support/v7/app/AlertController$AlertParams$1; @@ -212,8 +212,6 @@ iget-object v3, p0, Landroid/support/v7/app/AlertController$AlertParams;->mContext:Landroid/content/Context; - iget-object v4, p0, Landroid/support/v7/app/AlertController$AlertParams;->mCursor:Landroid/database/Cursor; - const/4 v5, 0x0 move-object v1, v9 @@ -247,34 +245,32 @@ move v4, v1 .line 1044 - iget-object v1, p0, Landroid/support/v7/app/AlertController$AlertParams;->mCursor:Landroid/database/Cursor; + iget-object v5, p0, Landroid/support/v7/app/AlertController$AlertParams;->mCursor:Landroid/database/Cursor; - const v2, 0x1020014 + const v1, 0x1020014 - if-eqz v1, :cond_3 + if-eqz v5, :cond_3 .line 1045 new-instance v9, Landroid/widget/SimpleCursorAdapter; iget-object v3, p0, Landroid/support/v7/app/AlertController$AlertParams;->mContext:Landroid/content/Context; - iget-object v5, p0, Landroid/support/v7/app/AlertController$AlertParams;->mCursor:Landroid/database/Cursor; - new-array v6, v8, [Ljava/lang/String; - iget-object v1, p0, Landroid/support/v7/app/AlertController$AlertParams;->mLabelColumn:Ljava/lang/String; + iget-object v2, p0, Landroid/support/v7/app/AlertController$AlertParams;->mLabelColumn:Ljava/lang/String; const/4 v7, 0x0 - aput-object v1, v6, v7 + aput-object v2, v6, v7 - new-array v1, v8, [I + new-array v10, v8, [I - aput v2, v1, v7 + aput v1, v10, v7 move-object v2, v9 - move-object v7, v1 + move-object v7, v10 invoke-direct/range {v2 .. v7}, Landroid/widget/SimpleCursorAdapter;->(Landroid/content/Context;ILandroid/database/Cursor;[Ljava/lang/String;[I)V @@ -292,11 +288,11 @@ :cond_4 new-instance v9, Landroid/support/v7/app/AlertController$CheckedItemAdapter; - iget-object v1, p0, Landroid/support/v7/app/AlertController$AlertParams;->mContext:Landroid/content/Context; + iget-object v2, p0, Landroid/support/v7/app/AlertController$AlertParams;->mContext:Landroid/content/Context; iget-object v3, p0, Landroid/support/v7/app/AlertController$AlertParams;->mItems:[Ljava/lang/CharSequence; - invoke-direct {v9, v1, v4, v2, v3}, Landroid/support/v7/app/AlertController$CheckedItemAdapter;->(Landroid/content/Context;II[Ljava/lang/CharSequence;)V + invoke-direct {v9, v2, v4, v1, v3}, Landroid/support/v7/app/AlertController$CheckedItemAdapter;->(Landroid/content/Context;II[Ljava/lang/CharSequence;)V .line 1054 :goto_1 @@ -386,7 +382,7 @@ # virtual methods .method public apply(Landroid/support/v7/app/AlertController;)V - .locals 13 + .locals 7 .line 931 iget-object v0, p0, Landroid/support/v7/app/AlertController$AlertParams;->mCustomTitleView:Landroid/view/View; @@ -450,9 +446,9 @@ .line 950 :cond_5 - iget-object v3, p0, Landroid/support/v7/app/AlertController$AlertParams;->mPositiveButtonText:Ljava/lang/CharSequence; + iget-object v0, p0, Landroid/support/v7/app/AlertController$AlertParams;->mPositiveButtonText:Ljava/lang/CharSequence; - if-nez v3, :cond_6 + if-nez v0, :cond_6 iget-object v0, p0, Landroid/support/v7/app/AlertController$AlertParams;->mPositiveButtonIcon:Landroid/graphics/drawable/Drawable; @@ -462,6 +458,8 @@ const/4 v2, -0x1 .line 951 + iget-object v3, p0, Landroid/support/v7/app/AlertController$AlertParams;->mPositiveButtonText:Ljava/lang/CharSequence; + iget-object v4, p0, Landroid/support/v7/app/AlertController$AlertParams;->mPositiveButtonListener:Landroid/content/DialogInterface$OnClickListener; const/4 v5, 0x0 @@ -474,51 +472,55 @@ .line 954 :cond_7 - iget-object v9, p0, Landroid/support/v7/app/AlertController$AlertParams;->mNegativeButtonText:Ljava/lang/CharSequence; + iget-object v0, p0, Landroid/support/v7/app/AlertController$AlertParams;->mNegativeButtonText:Ljava/lang/CharSequence; - if-nez v9, :cond_8 + if-nez v0, :cond_8 iget-object v0, p0, Landroid/support/v7/app/AlertController$AlertParams;->mNegativeButtonIcon:Landroid/graphics/drawable/Drawable; if-eqz v0, :cond_9 :cond_8 - const/4 v8, -0x2 + const/4 v2, -0x2 .line 955 - iget-object v10, p0, Landroid/support/v7/app/AlertController$AlertParams;->mNegativeButtonListener:Landroid/content/DialogInterface$OnClickListener; + iget-object v3, p0, Landroid/support/v7/app/AlertController$AlertParams;->mNegativeButtonText:Ljava/lang/CharSequence; - const/4 v11, 0x0 + iget-object v4, p0, Landroid/support/v7/app/AlertController$AlertParams;->mNegativeButtonListener:Landroid/content/DialogInterface$OnClickListener; - iget-object v12, p0, Landroid/support/v7/app/AlertController$AlertParams;->mNegativeButtonIcon:Landroid/graphics/drawable/Drawable; + const/4 v5, 0x0 - move-object v7, p1 + iget-object v6, p0, Landroid/support/v7/app/AlertController$AlertParams;->mNegativeButtonIcon:Landroid/graphics/drawable/Drawable; - invoke-virtual/range {v7 .. v12}, Landroid/support/v7/app/AlertController;->setButton(ILjava/lang/CharSequence;Landroid/content/DialogInterface$OnClickListener;Landroid/os/Message;Landroid/graphics/drawable/Drawable;)V + move-object v1, p1 + + invoke-virtual/range {v1 .. v6}, Landroid/support/v7/app/AlertController;->setButton(ILjava/lang/CharSequence;Landroid/content/DialogInterface$OnClickListener;Landroid/os/Message;Landroid/graphics/drawable/Drawable;)V .line 958 :cond_9 - iget-object v2, p0, Landroid/support/v7/app/AlertController$AlertParams;->mNeutralButtonText:Ljava/lang/CharSequence; + iget-object v0, p0, Landroid/support/v7/app/AlertController$AlertParams;->mNeutralButtonText:Ljava/lang/CharSequence; - if-nez v2, :cond_a + if-nez v0, :cond_a iget-object v0, p0, Landroid/support/v7/app/AlertController$AlertParams;->mNeutralButtonIcon:Landroid/graphics/drawable/Drawable; if-eqz v0, :cond_b :cond_a - const/4 v1, -0x3 + const/4 v2, -0x3 .line 959 - iget-object v3, p0, Landroid/support/v7/app/AlertController$AlertParams;->mNeutralButtonListener:Landroid/content/DialogInterface$OnClickListener; + iget-object v3, p0, Landroid/support/v7/app/AlertController$AlertParams;->mNeutralButtonText:Ljava/lang/CharSequence; - const/4 v4, 0x0 + iget-object v4, p0, Landroid/support/v7/app/AlertController$AlertParams;->mNeutralButtonListener:Landroid/content/DialogInterface$OnClickListener; - iget-object v5, p0, Landroid/support/v7/app/AlertController$AlertParams;->mNeutralButtonIcon:Landroid/graphics/drawable/Drawable; + const/4 v5, 0x0 + + iget-object v6, p0, Landroid/support/v7/app/AlertController$AlertParams;->mNeutralButtonIcon:Landroid/graphics/drawable/Drawable; - move-object v0, p1 + move-object v1, p1 - invoke-virtual/range {v0 .. v5}, Landroid/support/v7/app/AlertController;->setButton(ILjava/lang/CharSequence;Landroid/content/DialogInterface$OnClickListener;Landroid/os/Message;Landroid/graphics/drawable/Drawable;)V + invoke-virtual/range {v1 .. v6}, Landroid/support/v7/app/AlertController;->setButton(ILjava/lang/CharSequence;Landroid/content/DialogInterface$OnClickListener;Landroid/os/Message;Landroid/graphics/drawable/Drawable;)V .line 964 :cond_b diff --git a/smali/android/support/v7/app/AlertController.smali b/smali/android/support/v7/app/AlertController.smali index 1b9c0935..cc284f45 100644 --- a/smali/android/support/v7/app/AlertController.smali +++ b/smali/android/support/v7/app/AlertController.smali @@ -385,6 +385,16 @@ .method private resolvePanel(Landroid/view/View;Landroid/view/View;)Landroid/view/ViewGroup; .locals 2 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation if-nez p1, :cond_1 @@ -516,7 +526,7 @@ .line 571 invoke-virtual {p1, v1}, Landroid/view/ViewGroup;->removeView(Landroid/view/View;)V - goto :goto_0 + goto :goto_1 :cond_1 const/4 p2, 0x0 @@ -542,62 +552,65 @@ .line 580 invoke-virtual {p1, v1}, Landroid/view/ViewGroup;->removeView(Landroid/view/View;)V - move-object v1, p2 + goto :goto_0 :cond_3 + move-object p2, v1 + + :goto_0 if-nez v0, :cond_4 - if-eqz v1, :cond_8 + if-eqz p2, :cond_8 .line 588 :cond_4 - iget-object p2, p0, Landroid/support/v7/app/AlertController;->mMessage:Ljava/lang/CharSequence; + iget-object p3, p0, Landroid/support/v7/app/AlertController;->mMessage:Ljava/lang/CharSequence; - if-eqz p2, :cond_5 + if-eqz p3, :cond_5 .line 590 iget-object p1, p0, Landroid/support/v7/app/AlertController;->mScrollView:Landroid/support/v4/widget/NestedScrollView; - new-instance p2, Landroid/support/v7/app/AlertController$2; + new-instance p3, Landroid/support/v7/app/AlertController$2; - invoke-direct {p2, p0, v0, v1}, Landroid/support/v7/app/AlertController$2;->(Landroid/support/v7/app/AlertController;Landroid/view/View;Landroid/view/View;)V + invoke-direct {p3, p0, v0, p2}, Landroid/support/v7/app/AlertController$2;->(Landroid/support/v7/app/AlertController;Landroid/view/View;Landroid/view/View;)V - invoke-virtual {p1, p2}, Landroid/support/v4/widget/NestedScrollView;->setOnScrollChangeListener(Landroid/support/v4/widget/NestedScrollView$OnScrollChangeListener;)V + invoke-virtual {p1, p3}, Landroid/support/v4/widget/NestedScrollView;->setOnScrollChangeListener(Landroid/support/v4/widget/NestedScrollView$OnScrollChangeListener;)V .line 600 iget-object p1, p0, Landroid/support/v7/app/AlertController;->mScrollView:Landroid/support/v4/widget/NestedScrollView; - new-instance p2, Landroid/support/v7/app/AlertController$3; + new-instance p3, Landroid/support/v7/app/AlertController$3; - invoke-direct {p2, p0, v0, v1}, Landroid/support/v7/app/AlertController$3;->(Landroid/support/v7/app/AlertController;Landroid/view/View;Landroid/view/View;)V + invoke-direct {p3, p0, v0, p2}, Landroid/support/v7/app/AlertController$3;->(Landroid/support/v7/app/AlertController;Landroid/view/View;Landroid/view/View;)V - invoke-virtual {p1, p2}, Landroid/support/v4/widget/NestedScrollView;->post(Ljava/lang/Runnable;)Z + invoke-virtual {p1, p3}, Landroid/support/v4/widget/NestedScrollView;->post(Ljava/lang/Runnable;)Z - goto :goto_0 + goto :goto_1 .line 606 :cond_5 - iget-object p2, p0, Landroid/support/v7/app/AlertController;->mListView:Landroid/widget/ListView; + iget-object p3, p0, Landroid/support/v7/app/AlertController;->mListView:Landroid/widget/ListView; - if-eqz p2, :cond_6 + if-eqz p3, :cond_6 .line 608 new-instance p1, Landroid/support/v7/app/AlertController$4; - invoke-direct {p1, p0, v0, v1}, Landroid/support/v7/app/AlertController$4;->(Landroid/support/v7/app/AlertController;Landroid/view/View;Landroid/view/View;)V + invoke-direct {p1, p0, v0, p2}, Landroid/support/v7/app/AlertController$4;->(Landroid/support/v7/app/AlertController;Landroid/view/View;Landroid/view/View;)V - invoke-virtual {p2, p1}, Landroid/widget/ListView;->setOnScrollListener(Landroid/widget/AbsListView$OnScrollListener;)V + invoke-virtual {p3, p1}, Landroid/widget/ListView;->setOnScrollListener(Landroid/widget/AbsListView$OnScrollListener;)V .line 619 iget-object p1, p0, Landroid/support/v7/app/AlertController;->mListView:Landroid/widget/ListView; - new-instance p2, Landroid/support/v7/app/AlertController$5; + new-instance p3, Landroid/support/v7/app/AlertController$5; - invoke-direct {p2, p0, v0, v1}, Landroid/support/v7/app/AlertController$5;->(Landroid/support/v7/app/AlertController;Landroid/view/View;Landroid/view/View;)V + invoke-direct {p3, p0, v0, p2}, Landroid/support/v7/app/AlertController$5;->(Landroid/support/v7/app/AlertController;Landroid/view/View;Landroid/view/View;)V - invoke-virtual {p1, p2}, Landroid/widget/ListView;->post(Ljava/lang/Runnable;)Z + invoke-virtual {p1, p3}, Landroid/widget/ListView;->post(Ljava/lang/Runnable;)Z - goto :goto_0 + goto :goto_1 :cond_6 if-eqz v0, :cond_7 @@ -606,13 +619,13 @@ invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->removeView(Landroid/view/View;)V :cond_7 - if-eqz v1, :cond_8 + if-eqz p2, :cond_8 .line 631 - invoke-virtual {p1, v1}, Landroid/view/ViewGroup;->removeView(Landroid/view/View;)V + invoke-virtual {p1, p2}, Landroid/view/ViewGroup;->removeView(Landroid/view/View;)V :cond_8 - :goto_0 + :goto_1 return-void .end method @@ -631,6 +644,8 @@ iput-object v0, p0, Landroid/support/v7/app/AlertController;->mButtonPositive:Landroid/widget/Button; .line 764 + iget-object v0, p0, Landroid/support/v7/app/AlertController;->mButtonPositive:Landroid/widget/Button; + iget-object v1, p0, Landroid/support/v7/app/AlertController;->mButtonHandler:Landroid/view/View$OnClickListener; invoke-virtual {v0, v1}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V @@ -711,6 +726,8 @@ iput-object v5, p0, Landroid/support/v7/app/AlertController;->mButtonNegative:Landroid/widget/Button; .line 779 + iget-object v5, p0, Landroid/support/v7/app/AlertController;->mButtonNegative:Landroid/widget/Button; + iget-object v6, p0, Landroid/support/v7/app/AlertController;->mButtonHandler:Landroid/view/View$OnClickListener; invoke-virtual {v5, v6}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V @@ -781,6 +798,8 @@ iput-object v5, p0, Landroid/support/v7/app/AlertController;->mButtonNeutral:Landroid/widget/Button; .line 794 + iget-object v5, p0, Landroid/support/v7/app/AlertController;->mButtonNeutral:Landroid/widget/Button; + iget-object v6, p0, Landroid/support/v7/app/AlertController;->mButtonHandler:Landroid/view/View$OnClickListener; invoke-virtual {v5, v6}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V @@ -914,9 +933,11 @@ iput-object v0, p0, Landroid/support/v7/app/AlertController;->mScrollView:Landroid/support/v4/widget/NestedScrollView; + .line 720 + iget-object v0, p0, Landroid/support/v7/app/AlertController;->mScrollView:Landroid/support/v4/widget/NestedScrollView; + const/4 v1, 0x0 - .line 720 invoke-virtual {v0, v1}, Landroid/support/v4/widget/NestedScrollView;->setFocusable(Z)V .line 721 @@ -935,6 +956,9 @@ iput-object v0, p0, Landroid/support/v7/app/AlertController;->mMessageView:Landroid/widget/TextView; + .line 725 + iget-object v0, p0, Landroid/support/v7/app/AlertController;->mMessageView:Landroid/widget/TextView; + if-nez v0, :cond_0 return-void @@ -1221,6 +1245,8 @@ iput-object p1, p0, Landroid/support/v7/app/AlertController;->mTitleView:Landroid/widget/TextView; .line 690 + iget-object p1, p0, Landroid/support/v7/app/AlertController;->mTitleView:Landroid/widget/TextView; + iget-object v0, p0, Landroid/support/v7/app/AlertController;->mTitle:Ljava/lang/CharSequence; invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V diff --git a/smali/android/support/v7/app/AlertDialog$Builder.smali b/smali/android/support/v7/app/AlertDialog$Builder.smali index 77da8f59..2445834b 100644 --- a/smali/android/support/v7/app/AlertDialog$Builder.smali +++ b/smali/android/support/v7/app/AlertDialog$Builder.smali @@ -23,6 +23,10 @@ # direct methods .method public constructor (Landroid/content/Context;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 v0, 0x0 @@ -38,6 +42,14 @@ .method public constructor (Landroid/content/Context;I)V .locals 3 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/StyleRes; + .end annotation + .end param .line 342 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -141,6 +153,8 @@ .method public getContext()Landroid/content/Context; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 358 iget-object v0, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; @@ -159,9 +173,7 @@ iput-object p1, v0, Landroid/support/v7/app/AlertController$AlertParams;->mAdapter:Landroid/widget/ListAdapter; .line 660 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - - iput-object p2, p1, Landroid/support/v7/app/AlertController$AlertParams;->mOnClickListener:Landroid/content/DialogInterface$OnClickListener; + iput-object p2, v0, Landroid/support/v7/app/AlertController$AlertParams;->mOnClickListener:Landroid/content/DialogInterface$OnClickListener; return-object p0 .end method @@ -186,20 +198,20 @@ iput-object p1, v0, Landroid/support/v7/app/AlertController$AlertParams;->mCursor:Landroid/database/Cursor; .line 679 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - - iput-object p3, p1, Landroid/support/v7/app/AlertController$AlertParams;->mLabelColumn:Ljava/lang/String; + iput-object p3, v0, Landroid/support/v7/app/AlertController$AlertParams;->mLabelColumn:Ljava/lang/String; .line 680 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - - iput-object p2, p1, Landroid/support/v7/app/AlertController$AlertParams;->mOnClickListener:Landroid/content/DialogInterface$OnClickListener; + iput-object p2, v0, Landroid/support/v7/app/AlertController$AlertParams;->mOnClickListener:Landroid/content/DialogInterface$OnClickListener; return-object p0 .end method .method public setCustomTitle(Landroid/view/View;)Landroid/support/v7/app/AlertDialog$Builder; .locals 1 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 398 iget-object v0, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; @@ -211,6 +223,10 @@ .method public setIcon(I)Landroid/support/v7/app/AlertDialog$Builder; .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .line 430 iget-object v0, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; @@ -222,6 +238,10 @@ .method public setIcon(Landroid/graphics/drawable/Drawable;)Landroid/support/v7/app/AlertDialog$Builder; .locals 1 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 445 iget-object v0, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; @@ -233,6 +253,10 @@ .method public setIconAttribute(I)Landroid/support/v7/app/AlertDialog$Builder; .locals 3 + .param p1 # I + .annotation build Landroid/support/annotation/AttrRes; + .end annotation + .end param .line 459 new-instance v0, Landroid/util/TypedValue; @@ -277,6 +301,10 @@ .method public setItems(ILandroid/content/DialogInterface$OnClickListener;)Landroid/support/v7/app/AlertDialog$Builder; .locals 2 + .param p1 # I + .annotation build Landroid/support/annotation/ArrayRes; + .end annotation + .end param .line 631 iget-object v0, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; @@ -310,15 +338,17 @@ iput-object p1, v0, Landroid/support/v7/app/AlertController$AlertParams;->mItems:[Ljava/lang/CharSequence; .line 644 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - - iput-object p2, p1, Landroid/support/v7/app/AlertController$AlertParams;->mOnClickListener:Landroid/content/DialogInterface$OnClickListener; + iput-object p2, v0, Landroid/support/v7/app/AlertController$AlertParams;->mOnClickListener:Landroid/content/DialogInterface$OnClickListener; return-object p0 .end method .method public setMessage(I)Landroid/support/v7/app/AlertDialog$Builder; .locals 2 + .param p1 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param .line 408 iget-object v0, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; @@ -336,6 +366,10 @@ .method public setMessage(Ljava/lang/CharSequence;)Landroid/support/v7/app/AlertDialog$Builder; .locals 1 + .param p1 # Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 418 iget-object v0, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; @@ -347,6 +381,10 @@ .method public setMultiChoiceItems(I[ZLandroid/content/DialogInterface$OnMultiChoiceClickListener;)Landroid/support/v7/app/AlertDialog$Builder; .locals 2 + .param p1 # I + .annotation build Landroid/support/annotation/ArrayRes; + .end annotation + .end param .line 704 iget-object v0, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; @@ -369,15 +407,11 @@ iput-object p3, p1, Landroid/support/v7/app/AlertController$AlertParams;->mOnCheckboxClickListener:Landroid/content/DialogInterface$OnMultiChoiceClickListener; .line 706 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - iput-object p2, p1, Landroid/support/v7/app/AlertController$AlertParams;->mCheckedItems:[Z - .line 707 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - const/4 p2, 0x1 + .line 707 iput-boolean p2, p1, Landroid/support/v7/app/AlertController$AlertParams;->mIsMultiChoice:Z return-object p0 @@ -392,26 +426,18 @@ iput-object p1, v0, Landroid/support/v7/app/AlertController$AlertParams;->mCursor:Landroid/database/Cursor; .line 759 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - - iput-object p4, p1, Landroid/support/v7/app/AlertController$AlertParams;->mOnCheckboxClickListener:Landroid/content/DialogInterface$OnMultiChoiceClickListener; + iput-object p4, v0, Landroid/support/v7/app/AlertController$AlertParams;->mOnCheckboxClickListener:Landroid/content/DialogInterface$OnMultiChoiceClickListener; .line 760 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - - iput-object p2, p1, Landroid/support/v7/app/AlertController$AlertParams;->mIsCheckedColumn:Ljava/lang/String; + iput-object p2, v0, Landroid/support/v7/app/AlertController$AlertParams;->mIsCheckedColumn:Ljava/lang/String; .line 761 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; + iput-object p3, v0, Landroid/support/v7/app/AlertController$AlertParams;->mLabelColumn:Ljava/lang/String; - iput-object p3, p1, Landroid/support/v7/app/AlertController$AlertParams;->mLabelColumn:Ljava/lang/String; + const/4 p1, 0x1 .line 762 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - - const/4 p2, 0x1 - - iput-boolean p2, p1, Landroid/support/v7/app/AlertController$AlertParams;->mIsMultiChoice:Z + iput-boolean p1, v0, Landroid/support/v7/app/AlertController$AlertParams;->mIsMultiChoice:Z return-object p0 .end method @@ -425,27 +451,25 @@ iput-object p1, v0, Landroid/support/v7/app/AlertController$AlertParams;->mItems:[Ljava/lang/CharSequence; .line 731 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - - iput-object p3, p1, Landroid/support/v7/app/AlertController$AlertParams;->mOnCheckboxClickListener:Landroid/content/DialogInterface$OnMultiChoiceClickListener; + iput-object p3, v0, Landroid/support/v7/app/AlertController$AlertParams;->mOnCheckboxClickListener:Landroid/content/DialogInterface$OnMultiChoiceClickListener; .line 732 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; + iput-object p2, v0, Landroid/support/v7/app/AlertController$AlertParams;->mCheckedItems:[Z - iput-object p2, p1, Landroid/support/v7/app/AlertController$AlertParams;->mCheckedItems:[Z + const/4 p1, 0x1 .line 733 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - - const/4 p2, 0x1 - - iput-boolean p2, p1, Landroid/support/v7/app/AlertController$AlertParams;->mIsMultiChoice:Z + iput-boolean p1, v0, Landroid/support/v7/app/AlertController$AlertParams;->mIsMultiChoice:Z return-object p0 .end method .method public setNegativeButton(ILandroid/content/DialogInterface$OnClickListener;)Landroid/support/v7/app/AlertDialog$Builder; .locals 2 + .param p1 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param .line 509 iget-object v0, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; @@ -475,9 +499,7 @@ iput-object p1, v0, Landroid/support/v7/app/AlertController$AlertParams;->mNegativeButtonText:Ljava/lang/CharSequence; .line 523 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - - iput-object p2, p1, Landroid/support/v7/app/AlertController$AlertParams;->mNegativeButtonListener:Landroid/content/DialogInterface$OnClickListener; + iput-object p2, v0, Landroid/support/v7/app/AlertController$AlertParams;->mNegativeButtonListener:Landroid/content/DialogInterface$OnClickListener; return-object p0 .end method @@ -495,6 +517,10 @@ .method public setNeutralButton(ILandroid/content/DialogInterface$OnClickListener;)Landroid/support/v7/app/AlertDialog$Builder; .locals 2 + .param p1 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param .line 545 iget-object v0, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; @@ -524,9 +550,7 @@ iput-object p1, v0, Landroid/support/v7/app/AlertController$AlertParams;->mNeutralButtonText:Ljava/lang/CharSequence; .line 559 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - - iput-object p2, p1, Landroid/support/v7/app/AlertController$AlertParams;->mNeutralButtonListener:Landroid/content/DialogInterface$OnClickListener; + iput-object p2, v0, Landroid/support/v7/app/AlertController$AlertParams;->mNeutralButtonListener:Landroid/content/DialogInterface$OnClickListener; return-object p0 .end method @@ -588,6 +612,10 @@ .method public setPositiveButton(ILandroid/content/DialogInterface$OnClickListener;)Landroid/support/v7/app/AlertDialog$Builder; .locals 2 + .param p1 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param .line 473 iget-object v0, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; @@ -617,9 +645,7 @@ iput-object p1, v0, Landroid/support/v7/app/AlertController$AlertParams;->mPositiveButtonText:Ljava/lang/CharSequence; .line 487 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - - iput-object p2, p1, Landroid/support/v7/app/AlertController$AlertParams;->mPositiveButtonListener:Landroid/content/DialogInterface$OnClickListener; + iput-object p2, v0, Landroid/support/v7/app/AlertController$AlertParams;->mPositiveButtonListener:Landroid/content/DialogInterface$OnClickListener; return-object p0 .end method @@ -637,6 +663,11 @@ .method public setRecycleOnMeasureEnabled(Z)Landroid/support/v7/app/AlertDialog$Builder; .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 965 iget-object v0, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; @@ -648,6 +679,10 @@ .method public setSingleChoiceItems(IILandroid/content/DialogInterface$OnClickListener;)Landroid/support/v7/app/AlertDialog$Builder; .locals 2 + .param p1 # I + .annotation build Landroid/support/annotation/ArrayRes; + .end annotation + .end param .line 783 iget-object v0, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; @@ -670,15 +705,11 @@ iput-object p3, p1, Landroid/support/v7/app/AlertController$AlertParams;->mOnClickListener:Landroid/content/DialogInterface$OnClickListener; .line 785 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - iput p2, p1, Landroid/support/v7/app/AlertController$AlertParams;->mCheckedItem:I - .line 786 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - const/4 p2, 0x1 + .line 786 iput-boolean p2, p1, Landroid/support/v7/app/AlertController$AlertParams;->mIsSingleChoice:Z return-object p0 @@ -693,26 +724,18 @@ iput-object p1, v0, Landroid/support/v7/app/AlertController$AlertParams;->mCursor:Landroid/database/Cursor; .line 809 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - - iput-object p4, p1, Landroid/support/v7/app/AlertController$AlertParams;->mOnClickListener:Landroid/content/DialogInterface$OnClickListener; + iput-object p4, v0, Landroid/support/v7/app/AlertController$AlertParams;->mOnClickListener:Landroid/content/DialogInterface$OnClickListener; .line 810 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - - iput p2, p1, Landroid/support/v7/app/AlertController$AlertParams;->mCheckedItem:I + iput p2, v0, Landroid/support/v7/app/AlertController$AlertParams;->mCheckedItem:I .line 811 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; + iput-object p3, v0, Landroid/support/v7/app/AlertController$AlertParams;->mLabelColumn:Ljava/lang/String; - iput-object p3, p1, Landroid/support/v7/app/AlertController$AlertParams;->mLabelColumn:Ljava/lang/String; + const/4 p1, 0x1 .line 812 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - - const/4 p2, 0x1 - - iput-boolean p2, p1, Landroid/support/v7/app/AlertController$AlertParams;->mIsSingleChoice:Z + iput-boolean p1, v0, Landroid/support/v7/app/AlertController$AlertParams;->mIsSingleChoice:Z return-object p0 .end method @@ -726,21 +749,15 @@ iput-object p1, v0, Landroid/support/v7/app/AlertController$AlertParams;->mAdapter:Landroid/widget/ListAdapter; .line 854 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - - iput-object p3, p1, Landroid/support/v7/app/AlertController$AlertParams;->mOnClickListener:Landroid/content/DialogInterface$OnClickListener; + iput-object p3, v0, Landroid/support/v7/app/AlertController$AlertParams;->mOnClickListener:Landroid/content/DialogInterface$OnClickListener; .line 855 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; + iput p2, v0, Landroid/support/v7/app/AlertController$AlertParams;->mCheckedItem:I - iput p2, p1, Landroid/support/v7/app/AlertController$AlertParams;->mCheckedItem:I + const/4 p1, 0x1 .line 856 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - - const/4 p2, 0x1 - - iput-boolean p2, p1, Landroid/support/v7/app/AlertController$AlertParams;->mIsSingleChoice:Z + iput-boolean p1, v0, Landroid/support/v7/app/AlertController$AlertParams;->mIsSingleChoice:Z return-object p0 .end method @@ -754,27 +771,25 @@ iput-object p1, v0, Landroid/support/v7/app/AlertController$AlertParams;->mItems:[Ljava/lang/CharSequence; .line 832 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - - iput-object p3, p1, Landroid/support/v7/app/AlertController$AlertParams;->mOnClickListener:Landroid/content/DialogInterface$OnClickListener; + iput-object p3, v0, Landroid/support/v7/app/AlertController$AlertParams;->mOnClickListener:Landroid/content/DialogInterface$OnClickListener; .line 833 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; + iput p2, v0, Landroid/support/v7/app/AlertController$AlertParams;->mCheckedItem:I - iput p2, p1, Landroid/support/v7/app/AlertController$AlertParams;->mCheckedItem:I + const/4 p1, 0x1 .line 834 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - - const/4 p2, 0x1 - - iput-boolean p2, p1, Landroid/support/v7/app/AlertController$AlertParams;->mIsSingleChoice:Z + iput-boolean p1, v0, Landroid/support/v7/app/AlertController$AlertParams;->mIsSingleChoice:Z return-object p0 .end method .method public setTitle(I)Landroid/support/v7/app/AlertDialog$Builder; .locals 2 + .param p1 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param .line 367 iget-object v0, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; @@ -792,6 +807,10 @@ .method public setTitle(Ljava/lang/CharSequence;)Landroid/support/v7/app/AlertDialog$Builder; .locals 1 + .param p1 # Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 377 iget-object v0, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; @@ -812,16 +831,12 @@ iput-object v1, v0, Landroid/support/v7/app/AlertController$AlertParams;->mView:Landroid/view/View; .line 882 - iget-object v0, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - iput p1, v0, Landroid/support/v7/app/AlertController$AlertParams;->mViewLayoutResId:I - .line 883 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; + const/4 p1, 0x0 - const/4 v0, 0x0 - - iput-boolean v0, p1, Landroid/support/v7/app/AlertController$AlertParams;->mViewSpacingSpecified:Z + .line 883 + iput-boolean p1, v0, Landroid/support/v7/app/AlertController$AlertParams;->mViewSpacingSpecified:Z return-object p0 .end method @@ -834,23 +849,25 @@ iput-object p1, v0, Landroid/support/v7/app/AlertController$AlertParams;->mView:Landroid/view/View; - .line 903 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - - const/4 v0, 0x0 + const/4 p1, 0x0 - iput v0, p1, Landroid/support/v7/app/AlertController$AlertParams;->mViewLayoutResId:I + .line 903 + iput p1, v0, Landroid/support/v7/app/AlertController$AlertParams;->mViewLayoutResId:I .line 904 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - - iput-boolean v0, p1, Landroid/support/v7/app/AlertController$AlertParams;->mViewSpacingSpecified:Z + iput-boolean p1, v0, Landroid/support/v7/app/AlertController$AlertParams;->mViewSpacingSpecified:Z return-object p0 .end method .method public setView(Landroid/view/View;IIII)Landroid/support/v7/app/AlertDialog$Builder; .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation + .annotation runtime Ljava/lang/Deprecated; .end annotation @@ -859,39 +876,27 @@ iput-object p1, v0, Landroid/support/v7/app/AlertController$AlertParams;->mView:Landroid/view/View; - .line 935 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; + const/4 p1, 0x0 - const/4 v0, 0x0 + .line 935 + iput p1, v0, Landroid/support/v7/app/AlertController$AlertParams;->mViewLayoutResId:I - iput v0, p1, Landroid/support/v7/app/AlertController$AlertParams;->mViewLayoutResId:I + const/4 p1, 0x1 .line 936 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - - const/4 v0, 0x1 - - iput-boolean v0, p1, Landroid/support/v7/app/AlertController$AlertParams;->mViewSpacingSpecified:Z + iput-boolean p1, v0, Landroid/support/v7/app/AlertController$AlertParams;->mViewSpacingSpecified:Z .line 937 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - - iput p2, p1, Landroid/support/v7/app/AlertController$AlertParams;->mViewSpacingLeft:I + iput p2, v0, Landroid/support/v7/app/AlertController$AlertParams;->mViewSpacingLeft:I .line 938 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - - iput p3, p1, Landroid/support/v7/app/AlertController$AlertParams;->mViewSpacingTop:I + iput p3, v0, Landroid/support/v7/app/AlertController$AlertParams;->mViewSpacingTop:I .line 939 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - - iput p4, p1, Landroid/support/v7/app/AlertController$AlertParams;->mViewSpacingRight:I + iput p4, v0, Landroid/support/v7/app/AlertController$AlertParams;->mViewSpacingRight:I .line 940 - iget-object p1, p0, Landroid/support/v7/app/AlertDialog$Builder;->P:Landroid/support/v7/app/AlertController$AlertParams; - - iput p5, p1, Landroid/support/v7/app/AlertController$AlertParams;->mViewSpacingBottom:I + iput p5, v0, Landroid/support/v7/app/AlertController$AlertParams;->mViewSpacingBottom:I return-object p0 .end method diff --git a/smali/android/support/v7/app/AlertDialog.smali b/smali/android/support/v7/app/AlertDialog.smali index 1f034873..e446c5f4 100644 --- a/smali/android/support/v7/app/AlertDialog.smali +++ b/smali/android/support/v7/app/AlertDialog.smali @@ -27,6 +27,10 @@ # direct methods .method protected constructor (Landroid/content/Context;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 v0, 0x0 @@ -38,6 +42,14 @@ .method protected constructor (Landroid/content/Context;I)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/StyleRes; + .end annotation + .end param .line 98 invoke-static {p1, p2}, Landroid/support/v7/app/AlertDialog;->resolveDialogTheme(Landroid/content/Context;I)I @@ -66,6 +78,14 @@ .method protected constructor (Landroid/content/Context;ZLandroid/content/DialogInterface$OnCancelListener;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/content/DialogInterface$OnCancelListener; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param const/4 v0, 0x0 @@ -83,6 +103,14 @@ .method static resolveDialogTheme(Landroid/content/Context;I)I .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/StyleRes; + .end annotation + .end param ushr-int/lit8 v0, p1, 0x18 @@ -272,6 +300,11 @@ .method setButtonPanelLayoutHint(I)V .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 196 iget-object v0, p0, Landroid/support/v7/app/AlertDialog;->mAlert:Landroid/support/v7/app/AlertController; diff --git a/smali/android/support/v7/app/AppCompatActivity.smali b/smali/android/support/v7/app/AppCompatActivity.smali index 9231aaa2..f1b50743 100644 --- a/smali/android/support/v7/app/AppCompatActivity.smali +++ b/smali/android/support/v7/app/AppCompatActivity.smali @@ -206,6 +206,10 @@ .method public findViewById(I)Landroid/view/View; .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/IdRes; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "mDelegate:Landroid/support/v7/app/AppCompatDelegate; @@ -250,6 +256,8 @@ .method public getDrawerToggleDelegate()Landroid/support/v7/app/ActionBarDrawerToggle$Delegate; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 483 invoke-virtual {p0}, Landroid/support/v7/app/AppCompatActivity;->getDelegate()Landroid/support/v7/app/AppCompatDelegate; @@ -319,6 +327,8 @@ .method public getSupportActionBar()Landroid/support/v7/app/ActionBar; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 110 invoke-virtual {p0}, Landroid/support/v7/app/AppCompatActivity;->getDelegate()Landroid/support/v7/app/AppCompatDelegate; @@ -334,6 +344,8 @@ .method public getSupportParentActivityIntent()Landroid/content/Intent; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 431 invoke-static {p0}, Landroid/support/v4/app/NavUtils;->getParentActivityIntent(Landroid/app/Activity;)Landroid/content/Intent; @@ -403,6 +415,10 @@ .method protected onCreate(Landroid/os/Bundle;)V .locals 3 + .param p1 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 71 invoke-virtual {p0}, Landroid/support/v7/app/AppCompatActivity;->getDelegate()Landroid/support/v7/app/AppCompatDelegate; @@ -462,6 +478,10 @@ .method public onCreateSupportNavigateUpTaskStack(Landroid/support/v4/app/TaskStackBuilder;)V .locals 0 + .param p1 # Landroid/support/v4/app/TaskStackBuilder; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 348 invoke-virtual {p1, p0}, Landroid/support/v4/app/TaskStackBuilder;->addParentStack(Landroid/app/Activity;)Landroid/support/v4/app/TaskStackBuilder; @@ -583,6 +603,10 @@ .method protected onPostCreate(Landroid/os/Bundle;)V .locals 1 + .param p1 # Landroid/os/Bundle; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 97 invoke-super {p0, p1}, Landroid/support/v4/app/FragmentActivity;->onPostCreate(Landroid/os/Bundle;)V @@ -615,6 +639,10 @@ .method public onPrepareSupportNavigateUpTaskStack(Landroid/support/v4/app/TaskStackBuilder;)V .locals 0 + .param p1 # Landroid/support/v4/app/TaskStackBuilder; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param return-void .end method @@ -669,12 +697,24 @@ .method public onSupportActionModeFinished(Landroid/support/v7/view/ActionMode;)V .locals 0 + .param p1 # Landroid/support/v7/view/ActionMode; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/CallSuper; + .end annotation return-void .end method .method public onSupportActionModeStarted(Landroid/support/v7/view/ActionMode;)V .locals 0 + .param p1 # Landroid/support/v7/view/ActionMode; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/CallSuper; + .end annotation return-void .end method @@ -765,6 +805,12 @@ .method public onWindowStartingSupportActionMode(Landroid/support/v7/view/ActionMode$Callback;)Landroid/support/v7/view/ActionMode; .locals 0 + .param p1 # Landroid/support/v7/view/ActionMode$Callback; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation const/4 p1, 0x0 @@ -811,6 +857,10 @@ .method public setContentView(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/LayoutRes; + .end annotation + .end param .line 140 invoke-virtual {p0}, Landroid/support/v7/app/AppCompatActivity;->getDelegate()Landroid/support/v7/app/AppCompatDelegate; @@ -850,6 +900,10 @@ .method public setSupportActionBar(Landroid/support/v7/widget/Toolbar;)V .locals 1 + .param p1 # Landroid/support/v7/widget/Toolbar; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 130 invoke-virtual {p0}, Landroid/support/v7/app/AppCompatActivity;->getDelegate()Landroid/support/v7/app/AppCompatDelegate; @@ -895,6 +949,10 @@ .method public setTheme(I)V .locals 0 + .param p1 # I + .annotation build Landroid/support/annotation/StyleRes; + .end annotation + .end param .line 90 invoke-super {p0, p1}, Landroid/support/v4/app/FragmentActivity;->setTheme(I)V @@ -907,6 +965,12 @@ .method public startSupportActionMode(Landroid/support/v7/view/ActionMode$Callback;)Landroid/support/v7/view/ActionMode; .locals 1 + .param p1 # Landroid/support/v7/view/ActionMode$Callback; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 293 invoke-virtual {p0}, Landroid/support/v7/app/AppCompatActivity;->getDelegate()Landroid/support/v7/app/AppCompatDelegate; @@ -935,6 +999,10 @@ .method public supportNavigateUpTo(Landroid/content/Intent;)V .locals 0 + .param p1 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 464 invoke-static {p0, p1}, Landroid/support/v4/app/NavUtils;->navigateUpTo(Landroid/app/Activity;Landroid/content/Intent;)V @@ -959,6 +1027,10 @@ .method public supportShouldUpRecreateTask(Landroid/content/Intent;)Z .locals 0 + .param p1 # Landroid/content/Intent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 448 invoke-static {p0, p1}, Landroid/support/v4/app/NavUtils;->shouldUpRecreateTask(Landroid/app/Activity;Landroid/content/Intent;)Z diff --git a/smali/android/support/v7/app/AppCompatCallback.smali b/smali/android/support/v7/app/AppCompatCallback.smali index d7f7bef1..e1742f33 100644 --- a/smali/android/support/v7/app/AppCompatCallback.smali +++ b/smali/android/support/v7/app/AppCompatCallback.smali @@ -11,4 +11,6 @@ .end method .method public abstract onWindowStartingSupportActionMode(Landroid/support/v7/view/ActionMode$Callback;)Landroid/support/v7/view/ActionMode; + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method diff --git a/smali/android/support/v7/app/AppCompatDelegate$NightMode.smali b/smali/android/support/v7/app/AppCompatDelegate$NightMode.smali index 5daf5972..73efede3 100644 --- a/smali/android/support/v7/app/AppCompatDelegate$NightMode.smali +++ b/smali/android/support/v7/app/AppCompatDelegate$NightMode.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v7/app/AppCompatDelegate; .end annotation diff --git a/smali/android/support/v7/app/AppCompatDelegate.smali b/smali/android/support/v7/app/AppCompatDelegate.smali index 17ca8d3c..05e5a40b 100644 --- a/smali/android/support/v7/app/AppCompatDelegate.smali +++ b/smali/android/support/v7/app/AppCompatDelegate.smali @@ -166,9 +166,28 @@ .end method .method public abstract createView(Landroid/view/View;Ljava/lang/String;Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/view/View; + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method .method public abstract findViewById(I)Landroid/view/View; + .param p1 # I + .annotation build Landroid/support/annotation/IdRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "mInvalidatePanelMenuPosted:Z .line 233 - iget-object v0, p0, Landroid/support/v7/app/AppCompatDelegateImpl$2;->this$0:Landroid/support/v7/app/AppCompatDelegateImpl; - iput v1, v0, Landroid/support/v7/app/AppCompatDelegateImpl;->mInvalidatePanelMenuFeatures:I return-void diff --git a/smali/android/support/v7/app/AppCompatDelegateImpl$6.smali b/smali/android/support/v7/app/AppCompatDelegateImpl$6.smali index 3dabe59d..ecaf1524 100644 --- a/smali/android/support/v7/app/AppCompatDelegateImpl$6.smali +++ b/smali/android/support/v7/app/AppCompatDelegateImpl$6.smali @@ -47,11 +47,11 @@ iget-object v1, v1, Landroid/support/v7/app/AppCompatDelegateImpl;->mActionModeView:Landroid/support/v7/widget/ActionBarContextView; - const/16 v2, 0x37 + const/4 v2, 0x0 - const/4 v3, 0x0 + const/16 v3, 0x37 - invoke-virtual {v0, v1, v2, v3, v3}, Landroid/widget/PopupWindow;->showAtLocation(Landroid/view/View;III)V + invoke-virtual {v0, v1, v3, v2, v2}, Landroid/widget/PopupWindow;->showAtLocation(Landroid/view/View;III)V .line 997 iget-object v0, p0, Landroid/support/v7/app/AppCompatDelegateImpl$6;->this$0:Landroid/support/v7/app/AppCompatDelegateImpl; @@ -119,7 +119,7 @@ iget-object v0, v0, Landroid/support/v7/app/AppCompatDelegateImpl;->mActionModeView:Landroid/support/v7/widget/ActionBarContextView; - invoke-virtual {v0, v3}, Landroid/support/v7/widget/ActionBarContextView;->setVisibility(I)V + invoke-virtual {v0, v2}, Landroid/support/v7/widget/ActionBarContextView;->setVisibility(I)V :goto_0 return-void diff --git a/smali/android/support/v7/app/AppCompatDelegateImpl$AppCompatWindowCallback.smali b/smali/android/support/v7/app/AppCompatDelegateImpl$AppCompatWindowCallback.smali index 1640c04c..6b28ebf2 100644 --- a/smali/android/support/v7/app/AppCompatDelegateImpl$AppCompatWindowCallback.smali +++ b/smali/android/support/v7/app/AppCompatDelegateImpl$AppCompatWindowCallback.smali @@ -215,6 +215,10 @@ .method public onProvideKeyboardShortcuts(Ljava/util/List;Landroid/view/Menu;I)V .locals 3 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x18 + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -301,6 +305,9 @@ .method public onWindowStartingActionMode(Landroid/view/ActionMode$Callback;I)Landroid/view/ActionMode; .locals 1 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x17 + .end annotation .line 2638 iget-object v0, p0, Landroid/support/v7/app/AppCompatDelegateImpl$AppCompatWindowCallback;->this$0:Landroid/support/v7/app/AppCompatDelegateImpl; diff --git a/smali/android/support/v7/app/AppCompatDelegateImpl$AutoNightModeManager.smali b/smali/android/support/v7/app/AppCompatDelegateImpl$AutoNightModeManager.smali index 3686c2f3..03bfb7e1 100644 --- a/smali/android/support/v7/app/AppCompatDelegateImpl$AutoNightModeManager.smali +++ b/smali/android/support/v7/app/AppCompatDelegateImpl$AutoNightModeManager.smali @@ -4,6 +4,9 @@ # annotations +.annotation build Landroid/support/annotation/VisibleForTesting; +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v7/app/AppCompatDelegateImpl; .end annotation @@ -29,6 +32,10 @@ # direct methods .method constructor (Landroid/support/v7/app/AppCompatDelegateImpl;Landroid/support/v7/app/TwilightManager;)V .locals 0 + .param p1 # Landroid/support/v7/app/AppCompatDelegateImpl; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2673 iput-object p1, p0, Landroid/support/v7/app/AppCompatDelegateImpl$AutoNightModeManager;->this$0:Landroid/support/v7/app/AppCompatDelegateImpl; @@ -115,6 +122,9 @@ iput-boolean v0, p0, Landroid/support/v7/app/AppCompatDelegateImpl$AutoNightModeManager;->mIsNight:Z + .line 2681 + iget-boolean v0, p0, Landroid/support/v7/app/AppCompatDelegateImpl$AutoNightModeManager;->mIsNight:Z + if-eqz v0, :cond_0 const/4 v0, 0x2 @@ -159,9 +169,11 @@ iput-object v0, p0, Landroid/support/v7/app/AppCompatDelegateImpl$AutoNightModeManager;->mAutoTimeChangeReceiverFilter:Landroid/content/IntentFilter; + .line 2711 + iget-object v0, p0, Landroid/support/v7/app/AppCompatDelegateImpl$AutoNightModeManager;->mAutoTimeChangeReceiverFilter:Landroid/content/IntentFilter; + const-string v1, "android.intent.action.TIME_SET" - .line 2711 invoke-virtual {v0, v1}, Landroid/content/IntentFilter;->addAction(Ljava/lang/String;)V .line 2712 diff --git a/smali/android/support/v7/app/AppCompatDelegateImpl$PanelFeatureState$SavedState.smali b/smali/android/support/v7/app/AppCompatDelegateImpl$PanelFeatureState$SavedState.smali index a032efd8..fa497834 100644 --- a/smali/android/support/v7/app/AppCompatDelegateImpl$PanelFeatureState$SavedState.smali +++ b/smali/android/support/v7/app/AppCompatDelegateImpl$PanelFeatureState$SavedState.smali @@ -92,7 +92,10 @@ :goto_0 iput-boolean v2, v0, Landroid/support/v7/app/AppCompatDelegateImpl$PanelFeatureState$SavedState;->isOpen:Z - if-eqz v2, :cond_1 + .line 2463 + iget-boolean v1, v0, Landroid/support/v7/app/AppCompatDelegateImpl$PanelFeatureState$SavedState;->isOpen:Z + + if-eqz v1, :cond_1 .line 2464 invoke-virtual {p0, p1}, Landroid/os/Parcel;->readBundle(Ljava/lang/ClassLoader;)Landroid/os/Bundle; diff --git a/smali/android/support/v7/app/AppCompatDelegateImpl$PanelFeatureState.smali b/smali/android/support/v7/app/AppCompatDelegateImpl$PanelFeatureState.smali index 5cea1dfe..e6ccd939 100644 --- a/smali/android/support/v7/app/AppCompatDelegateImpl$PanelFeatureState.smali +++ b/smali/android/support/v7/app/AppCompatDelegateImpl$PanelFeatureState.smali @@ -160,6 +160,8 @@ iput-object v0, p0, Landroid/support/v7/app/AppCompatDelegateImpl$PanelFeatureState;->listMenuPresenter:Landroid/support/v7/view/menu/ListMenuPresenter; .line 2396 + iget-object v0, p0, Landroid/support/v7/app/AppCompatDelegateImpl$PanelFeatureState;->listMenuPresenter:Landroid/support/v7/view/menu/ListMenuPresenter; + invoke-virtual {v0, p1}, Landroid/support/v7/view/menu/ListMenuPresenter;->setCallback(Landroid/support/v7/view/menu/MenuPresenter$Callback;)V .line 2397 diff --git a/smali/android/support/v7/app/AppCompatDelegateImpl.smali b/smali/android/support/v7/app/AppCompatDelegateImpl.smali index 2aedcc2d..d7aaf80b 100644 --- a/smali/android/support/v7/app/AppCompatDelegateImpl.smali +++ b/smali/android/support/v7/app/AppCompatDelegateImpl.smali @@ -126,7 +126,7 @@ # direct methods .method static constructor ()V - .locals 5 + .locals 4 .line 116 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -149,18 +149,20 @@ :goto_0 sput-boolean v0, Landroid/support/v7/app/AppCompatDelegateImpl;->IS_PRE_LOLLIPOP:Z - new-array v3, v2, [I + .line 119 + new-array v0, v2, [I - const v4, 0x1010054 + const v3, 0x1010054 - aput v4, v3, v1 + aput v3, v0, v1 - .line 119 - sput-object v3, Landroid/support/v7/app/AppCompatDelegateImpl;->sWindowBackgroundStyleable:[I + sput-object v0, Landroid/support/v7/app/AppCompatDelegateImpl;->sWindowBackgroundStyleable:[I + + .line 128 + sget-boolean v0, Landroid/support/v7/app/AppCompatDelegateImpl;->IS_PRE_LOLLIPOP:Z if-eqz v0, :cond_1 - .line 128 sget-boolean v0, Landroid/support/v7/app/AppCompatDelegateImpl;->sInstalledExceptionHandler:Z if-nez v0, :cond_1 @@ -222,45 +224,55 @@ iput-object p3, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mAppCompatCallback:Landroid/support/v7/app/AppCompatCallback; .line 249 + iget-object p2, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mWindow:Landroid/view/Window; + invoke-virtual {p2}, Landroid/view/Window;->getCallback()Landroid/view/Window$Callback; - move-result-object p3 + move-result-object p2 - iput-object p3, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mOriginalWindowCallback:Landroid/view/Window$Callback; + iput-object p2, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mOriginalWindowCallback:Landroid/view/Window$Callback; .line 250 - instance-of v1, p3, Landroid/support/v7/app/AppCompatDelegateImpl$AppCompatWindowCallback; + iget-object p2, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mOriginalWindowCallback:Landroid/view/Window$Callback; - if-nez v1, :cond_1 + instance-of p3, p2, Landroid/support/v7/app/AppCompatDelegateImpl$AppCompatWindowCallback; + + if-nez p3, :cond_1 .line 254 - new-instance v1, Landroid/support/v7/app/AppCompatDelegateImpl$AppCompatWindowCallback; + new-instance p3, Landroid/support/v7/app/AppCompatDelegateImpl$AppCompatWindowCallback; - invoke-direct {v1, p0, p3}, Landroid/support/v7/app/AppCompatDelegateImpl$AppCompatWindowCallback;->(Landroid/support/v7/app/AppCompatDelegateImpl;Landroid/view/Window$Callback;)V + invoke-direct {p3, p0, p2}, Landroid/support/v7/app/AppCompatDelegateImpl$AppCompatWindowCallback;->(Landroid/support/v7/app/AppCompatDelegateImpl;Landroid/view/Window$Callback;)V - iput-object v1, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mAppCompatWindowCallback:Landroid/view/Window$Callback; + iput-object p3, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mAppCompatWindowCallback:Landroid/view/Window$Callback; .line 256 - invoke-virtual {p2, v1}, Landroid/view/Window;->setCallback(Landroid/view/Window$Callback;)V + iget-object p2, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mWindow:Landroid/view/Window; + + iget-object p3, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mAppCompatWindowCallback:Landroid/view/Window$Callback; + + invoke-virtual {p2, p3}, Landroid/view/Window;->setCallback(Landroid/view/Window$Callback;)V .line 258 - sget-object p3, Landroid/support/v7/app/AppCompatDelegateImpl;->sWindowBackgroundStyleable:[I + sget-object p2, Landroid/support/v7/app/AppCompatDelegateImpl;->sWindowBackgroundStyleable:[I - invoke-static {p1, v0, p3}, Landroid/support/v7/widget/TintTypedArray;->obtainStyledAttributes(Landroid/content/Context;Landroid/util/AttributeSet;[I)Landroid/support/v7/widget/TintTypedArray; + invoke-static {p1, v0, p2}, Landroid/support/v7/widget/TintTypedArray;->obtainStyledAttributes(Landroid/content/Context;Landroid/util/AttributeSet;[I)Landroid/support/v7/widget/TintTypedArray; move-result-object p1 - const/4 p3, 0x0 + const/4 p2, 0x0 .line 260 - invoke-virtual {p1, p3}, Landroid/support/v7/widget/TintTypedArray;->getDrawableIfKnown(I)Landroid/graphics/drawable/Drawable; + invoke-virtual {p1, p2}, Landroid/support/v7/widget/TintTypedArray;->getDrawableIfKnown(I)Landroid/graphics/drawable/Drawable; - move-result-object p3 + move-result-object p2 - if-eqz p3, :cond_0 + if-eqz p2, :cond_0 .line 262 - invoke-virtual {p2, p3}, Landroid/view/Window;->setBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V + iget-object p3, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mWindow:Landroid/view/Window; + + invoke-virtual {p3, p2}, Landroid/view/Window;->setBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V .line 264 :cond_0 @@ -650,6 +662,8 @@ iput-object v1, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mDecorContentParent:Landroid/support/v7/widget/DecorContentParent; .line 611 + iget-object v1, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mDecorContentParent:Landroid/support/v7/widget/DecorContentParent; + invoke-virtual {p0}, Landroid/support/v7/app/AppCompatDelegateImpl;->getWindowCallback()Landroid/view/Window$Callback; move-result-object v3 @@ -927,13 +941,9 @@ invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;->(Ljava/lang/String;)V - goto :goto_6 - - :goto_5 throw v0 - :goto_6 - goto :goto_5 + return-void .end method .method private ensureAutoNightModeManager()V @@ -1114,36 +1124,32 @@ if-eqz v1, :cond_1 .line 326 - new-instance v0, Landroid/support/v7/app/WindowDecorActionBar; - - iget-object v1, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mOriginalWindowCallback:Landroid/view/Window$Callback; + new-instance v1, Landroid/support/v7/app/WindowDecorActionBar; - check-cast v1, Landroid/app/Activity; + check-cast v0, Landroid/app/Activity; iget-boolean v2, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mOverlayActionBar:Z - invoke-direct {v0, v1, v2}, Landroid/support/v7/app/WindowDecorActionBar;->(Landroid/app/Activity;Z)V + invoke-direct {v1, v0, v2}, Landroid/support/v7/app/WindowDecorActionBar;->(Landroid/app/Activity;Z)V - iput-object v0, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mActionBar:Landroid/support/v7/app/ActionBar; + iput-object v1, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mActionBar:Landroid/support/v7/app/ActionBar; goto :goto_0 .line 328 :cond_1 - instance-of v0, v0, Landroid/app/Dialog; + instance-of v1, v0, Landroid/app/Dialog; - if-eqz v0, :cond_2 + if-eqz v1, :cond_2 .line 329 - new-instance v0, Landroid/support/v7/app/WindowDecorActionBar; + new-instance v1, Landroid/support/v7/app/WindowDecorActionBar; - iget-object v1, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mOriginalWindowCallback:Landroid/view/Window$Callback; + check-cast v0, Landroid/app/Dialog; - check-cast v1, Landroid/app/Dialog; + invoke-direct {v1, v0}, Landroid/support/v7/app/WindowDecorActionBar;->(Landroid/app/Dialog;)V - invoke-direct {v0, v1}, Landroid/support/v7/app/WindowDecorActionBar;->(Landroid/app/Dialog;)V - - iput-object v0, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mActionBar:Landroid/support/v7/app/ActionBar; + iput-object v1, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mActionBar:Landroid/support/v7/app/ActionBar; .line 331 :cond_2 @@ -1538,7 +1544,7 @@ invoke-interface {p1}, Landroid/support/v7/widget/DecorContentParent;->showOverflowMenu()Z - move-result v0 + move-result p1 goto :goto_2 @@ -1548,7 +1554,7 @@ invoke-interface {p1}, Landroid/support/v7/widget/DecorContentParent;->hideOverflowMenu()Z - move-result v0 + move-result p1 goto :goto_2 @@ -1594,10 +1600,12 @@ .line 1738 invoke-direct {p0, v2, p2}, Landroid/support/v7/app/AppCompatDelegateImpl;->openPanel(Landroid/support/v7/app/AppCompatDelegateImpl$PanelFeatureState;Landroid/view/KeyEvent;)V + const/4 p1, 0x1 + goto :goto_2 :cond_5 - const/4 v0, 0x0 + const/4 p1, 0x0 goto :goto_2 @@ -1609,40 +1617,38 @@ .line 1726 invoke-virtual {p0, v2, v0}, Landroid/support/v7/app/AppCompatDelegateImpl;->closePanel(Landroid/support/v7/app/AppCompatDelegateImpl$PanelFeatureState;Z)V - move v0, p1 - :goto_2 - if-eqz v0, :cond_8 + if-eqz p1, :cond_8 .line 1745 - iget-object p1, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mContext:Landroid/content/Context; + iget-object p2, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mContext:Landroid/content/Context; - const-string p2, "audio" + const-string v0, "audio" - invoke-virtual {p1, p2}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object; + invoke-virtual {p2, v0}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object; - move-result-object p1 + move-result-object p2 - check-cast p1, Landroid/media/AudioManager; + check-cast p2, Landroid/media/AudioManager; - if-eqz p1, :cond_7 + if-eqz p2, :cond_7 .line 1748 - invoke-virtual {p1, v1}, Landroid/media/AudioManager;->playSoundEffect(I)V + invoke-virtual {p2, v1}, Landroid/media/AudioManager;->playSoundEffect(I)V goto :goto_3 :cond_7 - const-string p1, "AppCompatDelegate" + const-string p2, "AppCompatDelegate" - const-string p2, "Couldn\'t get audio manager" + const-string v0, "Couldn\'t get audio manager" .line 1750 - invoke-static {p1, p2}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I + invoke-static {p2, v0}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I :cond_8 :goto_3 - return v0 + return p1 .end method .method private openPanel(Landroid/support/v7/app/AppCompatDelegateImpl$PanelFeatureState;Landroid/view/KeyEvent;)V @@ -2639,8 +2645,10 @@ iget-object v4, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mContext:Landroid/content/Context; + iget-object v5, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mContext:Landroid/content/Context; + .line 2135 - invoke-virtual {v4}, Ljava/lang/Object;->getClass()Ljava/lang/Class; + invoke-virtual {v5}, Ljava/lang/Object;->getClass()Ljava/lang/Class; move-result-object v5 @@ -3086,6 +3094,14 @@ .method public createView(Landroid/view/View;Ljava/lang/String;Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/view/View; .locals 11 + .param p3 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1234 iget-object v0, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mAppCompatViewInflater:Landroid/support/v7/app/AppCompatViewInflater; @@ -3136,6 +3152,7 @@ move-result-object v2 + .line 1246 new-array v3, v1, [Ljava/lang/Class; .line 1247 @@ -3154,11 +3171,11 @@ iput-object v2, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mAppCompatViewInflater:Landroid/support/v7/app/AppCompatViewInflater; :try_end_0 - .catchall {:try_start_0 .. :try_end_0} :catchall_0 + .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0 goto :goto_1 - :catchall_0 + :catch_0 move-exception v2 .line 1250 @@ -3205,9 +3222,9 @@ .line 1258 :cond_2 :goto_1 - sget-boolean v8, Landroid/support/v7/app/AppCompatDelegateImpl;->IS_PRE_LOLLIPOP:Z + sget-boolean v0, Landroid/support/v7/app/AppCompatDelegateImpl;->IS_PRE_LOLLIPOP:Z - if-eqz v8, :cond_5 + if-eqz v0, :cond_5 .line 1259 instance-of v0, p4, Lorg/xmlpull/v1/XmlPullParser; @@ -3256,6 +3273,8 @@ :goto_3 iget-object v2, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mAppCompatViewInflater:Landroid/support/v7/app/AppCompatViewInflater; + sget-boolean v8, Landroid/support/v7/app/AppCompatDelegateImpl;->IS_PRE_LOLLIPOP:Z + const/4 v9, 0x1 .line 1269 @@ -3598,6 +3617,13 @@ .method public findViewById(I)Landroid/view/View; .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/IdRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "ensureAutoNightModeManager()V @@ -4153,12 +4181,7 @@ :try_end_0 .catch Ljava/lang/IllegalArgumentException; {:try_start_0 .. :try_end_0} :catch_0 - goto :goto_0 - :catch_0 - nop - - :goto_0 if-eqz v1, :cond_1 .line 279 @@ -4173,14 +4196,14 @@ .line 281 iput-boolean v1, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mEnableDefaultActionBarUp:Z - goto :goto_1 + goto :goto_0 .line 283 :cond_0 invoke-virtual {v0, v1}, Landroid/support/v7/app/ActionBar;->setDefaultDisplayHomeAsUpEnabled(Z)V :cond_1 - :goto_1 + :goto_0 if-eqz p1, :cond_2 .line 288 @@ -5133,6 +5156,10 @@ .method public startSupportActionMode(Landroid/support/v7/view/ActionMode$Callback;)Landroid/support/v7/view/ActionMode; .locals 2 + .param p1 # Landroid/support/v7/view/ActionMode$Callback; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param if-eqz p1, :cond_3 @@ -5164,9 +5191,11 @@ iput-object p1, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mActionMode:Landroid/support/v7/view/ActionMode; + .line 914 + iget-object p1, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mActionMode:Landroid/support/v7/view/ActionMode; + if-eqz p1, :cond_1 - .line 914 iget-object v1, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mAppCompatCallback:Landroid/support/v7/app/AppCompatCallback; if-eqz v1, :cond_1 @@ -5206,6 +5235,10 @@ .method startSupportActionModeFromWindow(Landroid/support/v7/view/ActionMode$Callback;)Landroid/support/v7/view/ActionMode; .locals 7 + .param p1 # Landroid/support/v7/view/ActionMode$Callback; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 936 invoke-virtual {p0}, Landroid/support/v7/app/AppCompatDelegateImpl;->endOnGoingFadeAnimation()V @@ -5254,8 +5287,6 @@ goto :goto_0 :catch_0 - nop - :cond_2 move-object v0, v1 @@ -5360,9 +5391,11 @@ iput-object v5, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mActionModePopup:Landroid/widget/PopupWindow; + .line 980 + iget-object v5, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mActionModePopup:Landroid/widget/PopupWindow; + const/4 v6, 0x2 - .line 980 invoke-static {v5, v6}, Landroid/support/v4/widget/PopupWindowCompat;->setWindowLayoutType(Landroid/widget/PopupWindow;I)V .line 982 @@ -5551,6 +5584,8 @@ iput-object p1, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mFadeAnim:Landroid/support/v4/view/ViewPropertyAnimatorCompat; .line 1045 + iget-object p1, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mFadeAnim:Landroid/support/v4/view/ViewPropertyAnimatorCompat; + new-instance v0, Landroid/support/v7/app/AppCompatDelegateImpl$7; invoke-direct {v0, p0}, Landroid/support/v7/app/AppCompatDelegateImpl$7;->(Landroid/support/v7/app/AppCompatDelegateImpl;)V @@ -5645,7 +5680,7 @@ .end method .method updateStatusGuard(I)I - .locals 8 + .locals 7 .line 1883 iget-object v0, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mActionModeView:Landroid/support/v7/widget/ActionBarContextView; @@ -5682,7 +5717,7 @@ const/4 v3, 0x1 - if-eqz v2, :cond_7 + if-eqz v2, :cond_6 .line 1890 iget-object v2, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mTempRect1:Landroid/graphics/Rect; @@ -5754,6 +5789,8 @@ iput-object v2, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mStatusGuard:Landroid/view/View; .line 1906 + iget-object v2, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mStatusGuard:Landroid/view/View; + iget-object v4, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mContext:Landroid/content/Context; invoke-virtual {v4}, Landroid/content/Context;->getResources()Landroid/content/res/Resources; @@ -5828,68 +5865,63 @@ :goto_3 iget-boolean v4, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mOverlayActionMode:Z - if-nez v4, :cond_6 + if-nez v4, :cond_8 - if-eqz v3, :cond_6 + if-eqz v3, :cond_8 const/4 p1, 0x0 - :cond_6 - move v7, v3 - - move v3, v2 - - move v2, v7 - - goto :goto_4 + goto :goto_5 .line 1933 - :cond_7 + :cond_6 iget v2, v0, Landroid/view/ViewGroup$MarginLayoutParams;->topMargin:I - if-eqz v2, :cond_8 + if-eqz v2, :cond_7 .line 1935 iput v1, v0, Landroid/view/ViewGroup$MarginLayoutParams;->topMargin:I - const/4 v2, 0x0 + const/4 v2, 0x1 goto :goto_4 - :cond_8 + :cond_7 const/4 v2, 0x0 + :goto_4 const/4 v3, 0x0 - :goto_4 - if-eqz v3, :cond_a + :cond_8 + :goto_5 + if-eqz v2, :cond_a .line 1939 - iget-object v3, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mActionModeView:Landroid/support/v7/widget/ActionBarContextView; + iget-object v2, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mActionModeView:Landroid/support/v7/widget/ActionBarContextView; - invoke-virtual {v3, v0}, Landroid/support/v7/widget/ActionBarContextView;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V + invoke-virtual {v2, v0}, Landroid/support/v7/widget/ActionBarContextView;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V - goto :goto_5 + goto :goto_6 :cond_9 - const/4 v2, 0x0 + const/4 v3, 0x0 .line 1943 :cond_a - :goto_5 + :goto_6 iget-object v0, p0, Landroid/support/v7/app/AppCompatDelegateImpl;->mStatusGuard:Landroid/view/View; if-eqz v0, :cond_c - if-eqz v2, :cond_b + if-eqz v3, :cond_b - goto :goto_6 + goto :goto_7 :cond_b const/16 v1, 0x8 .line 1944 - :goto_6 + :goto_7 invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V :cond_c diff --git a/smali/android/support/v7/app/AppCompatDialog.smali b/smali/android/support/v7/app/AppCompatDialog.smali index 904a6c42..7b30a4d5 100644 --- a/smali/android/support/v7/app/AppCompatDialog.smali +++ b/smali/android/support/v7/app/AppCompatDialog.smali @@ -143,6 +143,13 @@ .method public findViewById(I)Landroid/view/View; .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/IdRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 161 invoke-virtual {p0}, Landroid/support/v7/app/AppCompatDialog;->getDelegate()Landroid/support/v7/app/AppCompatDelegate; @@ -266,6 +278,8 @@ .method public onWindowStartingSupportActionMode(Landroid/support/v7/view/ActionMode$Callback;)Landroid/support/v7/view/ActionMode; .locals 0 + .annotation build Landroid/support/annotation/Nullable; + .end annotation const/4 p1, 0x0 @@ -274,6 +288,10 @@ .method public setContentView(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/LayoutRes; + .end annotation + .end param .line 94 invoke-virtual {p0}, Landroid/support/v7/app/AppCompatDialog;->getDelegate()Landroid/support/v7/app/AppCompatDelegate; diff --git a/smali/android/support/v7/app/AppCompatDialogFragment.smali b/smali/android/support/v7/app/AppCompatDialogFragment.smali index 2e026f45..51b8017d 100644 --- a/smali/android/support/v7/app/AppCompatDialogFragment.smali +++ b/smali/android/support/v7/app/AppCompatDialogFragment.smali @@ -36,6 +36,11 @@ .method public setupDialog(Landroid/app/Dialog;I)V .locals 3 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 47 instance-of v0, p1, Landroid/support/v7/app/AppCompatDialog; diff --git a/smali/android/support/v7/app/AppCompatViewInflater$DeclaredOnClickListener.smali b/smali/android/support/v7/app/AppCompatViewInflater$DeclaredOnClickListener.smali index 0c19ef55..1d2df32a 100644 --- a/smali/android/support/v7/app/AppCompatViewInflater$DeclaredOnClickListener.smali +++ b/smali/android/support/v7/app/AppCompatViewInflater$DeclaredOnClickListener.smali @@ -30,6 +30,14 @@ # direct methods .method public constructor (Landroid/view/View;Ljava/lang/String;)V .locals 0 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 373 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -45,6 +53,16 @@ .method private resolveMethod(Landroid/content/Context;Ljava/lang/String;)V .locals 4 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation :goto_0 if-eqz p1, :cond_2 @@ -90,10 +108,8 @@ return-void - :catch_0 - nop - .line 411 + :catch_0 :cond_0 instance-of p2, p1, Landroid/content/ContextWrapper; @@ -205,19 +221,19 @@ invoke-direct {p2, p1}, Ljava/lang/IllegalStateException;->(Ljava/lang/String;)V - goto :goto_3 - - :goto_2 throw p2 - :goto_3 - goto :goto_2 + return-void .end method # virtual methods .method public onClick(Landroid/view/View;)V .locals 4 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 380 iget-object v0, p0, Landroid/support/v7/app/AppCompatViewInflater$DeclaredOnClickListener;->mResolvedMethod:Ljava/lang/reflect/Method; diff --git a/smali/android/support/v7/app/AppCompatViewInflater.smali b/smali/android/support/v7/app/AppCompatViewInflater.smali index a084fc7c..2fa36599 100644 --- a/smali/android/support/v7/app/AppCompatViewInflater.smali +++ b/smali/android/support/v7/app/AppCompatViewInflater.smali @@ -52,9 +52,9 @@ const/4 v0, 0x2 + .line 62 new-array v0, v0, [Ljava/lang/Class; - .line 62 const-class v1, Landroid/content/Context; const/4 v2, 0x0 @@ -69,13 +69,13 @@ sput-object v0, Landroid/support/v7/app/AppCompatViewInflater;->sConstructorSignature:[Ljava/lang/Class; + .line 64 new-array v0, v3, [I const v1, 0x101026f aput v1, v0, v2 - .line 64 sput-object v0, Landroid/support/v7/app/AppCompatViewInflater;->sOnClickAttrs:[I const-string v0, "android.widget." @@ -109,9 +109,9 @@ const/4 v0, 0x2 + .line 77 new-array v0, v0, [Ljava/lang/Object; - .line 77 iput-object v0, p0, Landroid/support/v7/app/AppCompatViewInflater;->mConstructorArgs:[Ljava/lang/Object; return-void @@ -179,7 +179,7 @@ .end method .method private createViewByPrefix(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)Landroid/view/View; - .locals 2 + .locals 1 .annotation system Ldalvik/annotation/Throws; value = { Ljava/lang/ClassNotFoundException;, @@ -192,11 +192,11 @@ invoke-interface {v0, p2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v1 + move-result-object v0 - check-cast v1, Ljava/lang/reflect/Constructor; + check-cast v0, Ljava/lang/reflect/Constructor; - if-nez v1, :cond_1 + if-nez v0, :cond_1 .line 316 :try_start_0 @@ -206,15 +206,15 @@ if-eqz p3, :cond_0 - new-instance v1, Ljava/lang/StringBuilder; + new-instance v0, Ljava/lang/StringBuilder; - invoke-direct {v1}, Ljava/lang/StringBuilder;->()V + invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v1, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, p3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; move-result-object p3 @@ -240,21 +240,23 @@ invoke-virtual {p1, p3}, Ljava/lang/Class;->getConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor; - move-result-object v1 + move-result-object v0 .line 320 - invoke-interface {v0, p2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + sget-object p1, Landroid/support/v7/app/AppCompatViewInflater;->sConstructorMap:Ljava/util/Map; + + invoke-interface {p1, p2, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; :cond_1 const/4 p1, 0x1 .line 322 - invoke-virtual {v1, p1}, Ljava/lang/reflect/Constructor;->setAccessible(Z)V + invoke-virtual {v0, p1}, Ljava/lang/reflect/Constructor;->setAccessible(Z)V .line 323 iget-object p1, p0, Landroid/support/v7/app/AppCompatViewInflater;->mConstructorArgs:[Ljava/lang/Object; - invoke-virtual {v1, p1}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object; + invoke-virtual {v0, p1}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object; move-result-object p1 @@ -271,7 +273,7 @@ .end method .method private createViewFromTag(Landroid/content/Context;Ljava/lang/String;Landroid/util/AttributeSet;)Landroid/view/View; - .locals 5 + .locals 4 const-string v0, "view" @@ -303,6 +305,8 @@ aput-object p1, v3, v2 .line 261 + iget-object v3, p0, Landroid/support/v7/app/AppCompatViewInflater;->mConstructorArgs:[Ljava/lang/Object; + aput-object p3, v3, v0 const/4 p3, -0x1 @@ -322,11 +326,13 @@ :goto_0 sget-object v3, Landroid/support/v7/app/AppCompatViewInflater;->sClassPrefixList:[Ljava/lang/String; - array-length v4, v3 + array-length v3, v3 - if-ge p3, v4, :cond_2 + if-ge p3, v3, :cond_2 .line 265 + sget-object v3, Landroid/support/v7/app/AppCompatViewInflater;->sClassPrefixList:[Ljava/lang/String; + aget-object v3, v3, p3 invoke-direct {p0, p1, p2, v3}, Landroid/support/v7/app/AppCompatViewInflater;->createViewByPrefix(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)Landroid/view/View; @@ -538,6 +544,8 @@ # virtual methods .method protected createAutoCompleteTextView(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatAutoCompleteTextView; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 223 new-instance v0, Landroid/support/v7/widget/AppCompatAutoCompleteTextView; @@ -549,6 +557,8 @@ .method protected createButton(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatButton; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 187 new-instance v0, Landroid/support/v7/widget/AppCompatButton; @@ -560,6 +570,8 @@ .method protected createCheckBox(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatCheckBox; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 207 new-instance v0, Landroid/support/v7/widget/AppCompatCheckBox; @@ -571,6 +583,8 @@ .method protected createCheckedTextView(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatCheckedTextView; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 217 new-instance v0, Landroid/support/v7/widget/AppCompatCheckedTextView; @@ -582,6 +596,8 @@ .method protected createEditText(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatEditText; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 192 new-instance v0, Landroid/support/v7/widget/AppCompatEditText; @@ -593,6 +609,8 @@ .method protected createImageButton(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatImageButton; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 202 new-instance v0, Landroid/support/v7/widget/AppCompatImageButton; @@ -604,6 +622,8 @@ .method protected createImageView(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatImageView; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 182 new-instance v0, Landroid/support/v7/widget/AppCompatImageView; @@ -615,6 +635,8 @@ .method protected createMultiAutoCompleteTextView(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatMultiAutoCompleteTextView; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 229 new-instance v0, Landroid/support/v7/widget/AppCompatMultiAutoCompleteTextView; @@ -626,6 +648,8 @@ .method protected createRadioButton(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatRadioButton; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 212 new-instance v0, Landroid/support/v7/widget/AppCompatRadioButton; @@ -637,6 +661,8 @@ .method protected createRatingBar(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatRatingBar; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 234 new-instance v0, Landroid/support/v7/widget/AppCompatRatingBar; @@ -648,6 +674,8 @@ .method protected createSeekBar(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatSeekBar; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 239 new-instance v0, Landroid/support/v7/widget/AppCompatSeekBar; @@ -659,6 +687,8 @@ .method protected createSpinner(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatSpinner; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 197 new-instance v0, Landroid/support/v7/widget/AppCompatSpinner; @@ -670,6 +700,8 @@ .method protected createTextView(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatTextView; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 177 new-instance v0, Landroid/support/v7/widget/AppCompatTextView; @@ -681,6 +713,8 @@ .method protected createView(Landroid/content/Context;Ljava/lang/String;Landroid/util/AttributeSet;)Landroid/view/View; .locals 0 + .annotation build Landroid/support/annotation/Nullable; + .end annotation const/4 p1, 0x0 @@ -689,6 +723,14 @@ .method final createView(Landroid/view/View;Ljava/lang/String;Landroid/content/Context;Landroid/util/AttributeSet;ZZZZ)Landroid/view/View; .locals 0 + .param p3 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param if-eqz p5, :cond_0 @@ -723,12 +765,10 @@ move-result-object p1 - .line 100 :cond_3 - invoke-virtual {p2}, Ljava/lang/String;->hashCode()I - const/4 p5, -0x1 + .line 100 invoke-virtual {p2}, Ljava/lang/String;->hashCode()I move-result p6 @@ -744,12 +784,9 @@ move-result p6 - if-nez p6, :cond_4 - - goto/16 :goto_1 + if-eqz p6, :cond_4 - :cond_4 - const/16 p5, 0xc + const/4 p5, 0x2 goto/16 :goto_1 @@ -760,12 +797,9 @@ move-result p6 - if-nez p6, :cond_5 + if-eqz p6, :cond_4 - goto/16 :goto_1 - - :cond_5 - const/16 p5, 0xb + const/4 p5, 0x3 goto/16 :goto_1 @@ -776,12 +810,9 @@ move-result p6 - if-nez p6, :cond_6 + if-eqz p6, :cond_4 - goto/16 :goto_1 - - :cond_6 - const/16 p5, 0xa + const/4 p5, 0x6 goto/16 :goto_1 @@ -792,14 +823,11 @@ move-result p6 - if-nez p6, :cond_7 + if-eqz p6, :cond_4 - goto/16 :goto_1 - - :cond_7 const/16 p5, 0x9 - goto/16 :goto_1 + goto :goto_1 :sswitch_4 const-string p6, "ImageView" @@ -808,14 +836,11 @@ move-result p6 - if-nez p6, :cond_8 - - goto/16 :goto_1 + if-eqz p6, :cond_4 - :cond_8 - const/16 p5, 0x8 + const/4 p5, 0x1 - goto/16 :goto_1 + goto :goto_1 :sswitch_5 const-string p6, "RadioButton" @@ -824,11 +849,8 @@ move-result p6 - if-nez p6, :cond_9 + if-eqz p6, :cond_4 - goto :goto_1 - - :cond_9 const/4 p5, 0x7 goto :goto_1 @@ -840,12 +862,9 @@ move-result p6 - if-nez p6, :cond_a - - goto :goto_1 + if-eqz p6, :cond_4 - :cond_a - const/4 p5, 0x6 + const/4 p5, 0x4 goto :goto_1 @@ -856,12 +875,9 @@ move-result p6 - if-nez p6, :cond_b - - goto :goto_1 + if-eqz p6, :cond_4 - :cond_b - const/4 p5, 0x5 + const/16 p5, 0xc goto :goto_1 @@ -872,12 +888,9 @@ move-result p6 - if-nez p6, :cond_c + if-eqz p6, :cond_4 - goto :goto_1 - - :cond_c - const/4 p5, 0x4 + const/4 p5, 0x5 goto :goto_1 @@ -888,12 +901,9 @@ move-result p6 - if-nez p6, :cond_d - - goto :goto_1 + if-eqz p6, :cond_4 - :cond_d - const/4 p5, 0x3 + const/4 p5, 0x0 goto :goto_1 @@ -904,12 +914,9 @@ move-result p6 - if-nez p6, :cond_e + if-eqz p6, :cond_4 - goto :goto_1 - - :cond_e - const/4 p5, 0x2 + const/16 p5, 0xa goto :goto_1 @@ -920,12 +927,9 @@ move-result p6 - if-nez p6, :cond_f - - goto :goto_1 + if-eqz p6, :cond_4 - :cond_f - const/4 p5, 0x1 + const/16 p5, 0x8 goto :goto_1 @@ -936,13 +940,11 @@ move-result p6 - if-nez p6, :cond_10 + if-eqz p6, :cond_4 - goto :goto_1 - - :cond_10 - const/4 p5, 0x0 + const/16 p5, 0xb + :cond_4 :goto_1 packed-switch p5, :pswitch_data_0 @@ -953,35 +955,35 @@ goto/16 :goto_2 - .line 110 + .line 150 :pswitch_0 - invoke-virtual {p0, p1, p4}, Landroid/support/v7/app/AppCompatViewInflater;->createButton(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatButton; + invoke-virtual {p0, p1, p4}, Landroid/support/v7/app/AppCompatViewInflater;->createSeekBar(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatSeekBar; move-result-object p5 - .line 111 + .line 151 invoke-direct {p0, p5, p2}, Landroid/support/v7/app/AppCompatViewInflater;->verifyNotNull(Landroid/view/View;Ljava/lang/String;)V goto :goto_2 - .line 114 + .line 146 :pswitch_1 - invoke-virtual {p0, p1, p4}, Landroid/support/v7/app/AppCompatViewInflater;->createEditText(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatEditText; + invoke-virtual {p0, p1, p4}, Landroid/support/v7/app/AppCompatViewInflater;->createRatingBar(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatRatingBar; move-result-object p5 - .line 115 + .line 147 invoke-direct {p0, p5, p2}, Landroid/support/v7/app/AppCompatViewInflater;->verifyNotNull(Landroid/view/View;Ljava/lang/String;)V goto :goto_2 - .line 126 + .line 142 :pswitch_2 - invoke-virtual {p0, p1, p4}, Landroid/support/v7/app/AppCompatViewInflater;->createCheckBox(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatCheckBox; + invoke-virtual {p0, p1, p4}, Landroid/support/v7/app/AppCompatViewInflater;->createMultiAutoCompleteTextView(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatMultiAutoCompleteTextView; move-result-object p5 - .line 127 + .line 143 invoke-direct {p0, p5, p2}, Landroid/support/v7/app/AppCompatViewInflater;->verifyNotNull(Landroid/view/View;Ljava/lang/String;)V goto :goto_2 @@ -997,13 +999,13 @@ goto :goto_2 - .line 106 + .line 134 :pswitch_4 - invoke-virtual {p0, p1, p4}, Landroid/support/v7/app/AppCompatViewInflater;->createImageView(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatImageView; + invoke-virtual {p0, p1, p4}, Landroid/support/v7/app/AppCompatViewInflater;->createCheckedTextView(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatCheckedTextView; move-result-object p5 - .line 107 + .line 135 invoke-direct {p0, p5, p2}, Landroid/support/v7/app/AppCompatViewInflater;->verifyNotNull(Landroid/view/View;Ljava/lang/String;)V goto :goto_2 @@ -1019,100 +1021,102 @@ goto :goto_2 - .line 118 + .line 126 :pswitch_6 - invoke-virtual {p0, p1, p4}, Landroid/support/v7/app/AppCompatViewInflater;->createSpinner(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatSpinner; + invoke-virtual {p0, p1, p4}, Landroid/support/v7/app/AppCompatViewInflater;->createCheckBox(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatCheckBox; move-result-object p5 - .line 119 + .line 127 invoke-direct {p0, p5, p2}, Landroid/support/v7/app/AppCompatViewInflater;->verifyNotNull(Landroid/view/View;Ljava/lang/String;)V goto :goto_2 - .line 150 + .line 122 :pswitch_7 - invoke-virtual {p0, p1, p4}, Landroid/support/v7/app/AppCompatViewInflater;->createSeekBar(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatSeekBar; + invoke-virtual {p0, p1, p4}, Landroid/support/v7/app/AppCompatViewInflater;->createImageButton(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatImageButton; move-result-object p5 - .line 151 + .line 123 invoke-direct {p0, p5, p2}, Landroid/support/v7/app/AppCompatViewInflater;->verifyNotNull(Landroid/view/View;Ljava/lang/String;)V goto :goto_2 - .line 122 + .line 118 :pswitch_8 - invoke-virtual {p0, p1, p4}, Landroid/support/v7/app/AppCompatViewInflater;->createImageButton(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatImageButton; + invoke-virtual {p0, p1, p4}, Landroid/support/v7/app/AppCompatViewInflater;->createSpinner(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatSpinner; move-result-object p5 - .line 123 + .line 119 invoke-direct {p0, p5, p2}, Landroid/support/v7/app/AppCompatViewInflater;->verifyNotNull(Landroid/view/View;Ljava/lang/String;)V goto :goto_2 - .line 102 + .line 114 :pswitch_9 - invoke-virtual {p0, p1, p4}, Landroid/support/v7/app/AppCompatViewInflater;->createTextView(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatTextView; + invoke-virtual {p0, p1, p4}, Landroid/support/v7/app/AppCompatViewInflater;->createEditText(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatEditText; move-result-object p5 - .line 103 + .line 115 invoke-direct {p0, p5, p2}, Landroid/support/v7/app/AppCompatViewInflater;->verifyNotNull(Landroid/view/View;Ljava/lang/String;)V goto :goto_2 - .line 142 + .line 110 :pswitch_a - invoke-virtual {p0, p1, p4}, Landroid/support/v7/app/AppCompatViewInflater;->createMultiAutoCompleteTextView(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatMultiAutoCompleteTextView; + invoke-virtual {p0, p1, p4}, Landroid/support/v7/app/AppCompatViewInflater;->createButton(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatButton; move-result-object p5 - .line 143 + .line 111 invoke-direct {p0, p5, p2}, Landroid/support/v7/app/AppCompatViewInflater;->verifyNotNull(Landroid/view/View;Ljava/lang/String;)V goto :goto_2 - .line 134 + .line 106 :pswitch_b - invoke-virtual {p0, p1, p4}, Landroid/support/v7/app/AppCompatViewInflater;->createCheckedTextView(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatCheckedTextView; + invoke-virtual {p0, p1, p4}, Landroid/support/v7/app/AppCompatViewInflater;->createImageView(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatImageView; move-result-object p5 - .line 135 + .line 107 invoke-direct {p0, p5, p2}, Landroid/support/v7/app/AppCompatViewInflater;->verifyNotNull(Landroid/view/View;Ljava/lang/String;)V goto :goto_2 - .line 146 + .line 102 :pswitch_c - invoke-virtual {p0, p1, p4}, Landroid/support/v7/app/AppCompatViewInflater;->createRatingBar(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatRatingBar; + invoke-virtual {p0, p1, p4}, Landroid/support/v7/app/AppCompatViewInflater;->createTextView(Landroid/content/Context;Landroid/util/AttributeSet;)Landroid/support/v7/widget/AppCompatTextView; move-result-object p5 - .line 147 + .line 103 invoke-direct {p0, p5, p2}, Landroid/support/v7/app/AppCompatViewInflater;->verifyNotNull(Landroid/view/View;Ljava/lang/String;)V :goto_2 - if-nez p5, :cond_11 + if-nez p5, :cond_5 - if-eq p3, p1, :cond_11 + if-eq p3, p1, :cond_5 .line 164 invoke-direct {p0, p1, p2, p4}, Landroid/support/v7/app/AppCompatViewInflater;->createViewFromTag(Landroid/content/Context;Ljava/lang/String;Landroid/util/AttributeSet;)Landroid/view/View; move-result-object p5 - :cond_11 - if-eqz p5, :cond_12 + :cond_5 + if-eqz p5, :cond_6 .line 169 invoke-direct {p0, p5, p4}, Landroid/support/v7/app/AppCompatViewInflater;->checkOnClickListener(Landroid/view/View;Landroid/util/AttributeSet;)V - :cond_12 + :cond_6 return-object p5 + nop + :sswitch_data_0 .sparse-switch -0x7404ceea -> :sswitch_c diff --git a/smali/android/support/v7/app/ResourcesFlusher.smali b/smali/android/support/v7/app/ResourcesFlusher.smali index a60213f3..7ffbaa29 100644 --- a/smali/android/support/v7/app/ResourcesFlusher.smali +++ b/smali/android/support/v7/app/ResourcesFlusher.smali @@ -35,6 +35,10 @@ .method static flush(Landroid/content/res/Resources;)V .locals 2 + .param p0 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 46 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -89,6 +93,13 @@ .method private static flushLollipops(Landroid/content/res/Resources;)V .locals 4 + .param p0 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x15 + .end annotation .line 60 sget-boolean v0, Landroid/support/v7/app/ResourcesFlusher;->sDrawableCacheFieldFetched:Z @@ -112,6 +123,8 @@ sput-object v2, Landroid/support/v7/app/ResourcesFlusher;->sDrawableCacheField:Ljava/lang/reflect/Field; .line 63 + sget-object v2, Landroid/support/v7/app/ResourcesFlusher;->sDrawableCacheField:Ljava/lang/reflect/Field; + invoke-virtual {v2, v0}, Ljava/lang/reflect/Field;->setAccessible(Z)V :try_end_0 .catch Ljava/lang/NoSuchFieldException; {:try_start_0 .. :try_end_0} :catch_0 @@ -148,8 +161,6 @@ :try_end_1 .catch Ljava/lang/IllegalAccessException; {:try_start_1 .. :try_end_1} :catch_1 - move-object v2, p0 - goto :goto_1 :catch_1 @@ -160,11 +171,13 @@ .line 74 invoke-static {v1, v0, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I + move-object p0, v2 + :goto_1 - if-eqz v2, :cond_1 + if-eqz p0, :cond_1 .line 77 - invoke-interface {v2}, Ljava/util/Map;->clear()V + invoke-interface {p0}, Ljava/util/Map;->clear()V :cond_1 return-void @@ -172,6 +185,13 @@ .method private static flushMarshmallows(Landroid/content/res/Resources;)V .locals 4 + .param p0 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x17 + .end annotation .line 84 sget-boolean v0, Landroid/support/v7/app/ResourcesFlusher;->sDrawableCacheFieldFetched:Z @@ -195,6 +215,8 @@ sput-object v2, Landroid/support/v7/app/ResourcesFlusher;->sDrawableCacheField:Ljava/lang/reflect/Field; .line 87 + sget-object v2, Landroid/support/v7/app/ResourcesFlusher;->sDrawableCacheField:Ljava/lang/reflect/Field; + invoke-virtual {v2, v0}, Ljava/lang/reflect/Field;->setAccessible(Z)V :try_end_0 .catch Ljava/lang/NoSuchFieldException; {:try_start_0 .. :try_end_0} :catch_0 @@ -254,6 +276,13 @@ .method private static flushNougats(Landroid/content/res/Resources;)V .locals 5 + .param p0 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x18 + .end annotation .line 113 sget-boolean v0, Landroid/support/v7/app/ResourcesFlusher;->sResourcesImplFieldFetched:Z @@ -277,6 +306,8 @@ sput-object v0, Landroid/support/v7/app/ResourcesFlusher;->sResourcesImplField:Ljava/lang/reflect/Field; .line 116 + sget-object v0, Landroid/support/v7/app/ResourcesFlusher;->sResourcesImplField:Ljava/lang/reflect/Field; + invoke-virtual {v0, v1}, Ljava/lang/reflect/Field;->setAccessible(Z)V :try_end_0 .catch Ljava/lang/NoSuchFieldException; {:try_start_0 .. :try_end_0} :catch_0 @@ -352,6 +383,8 @@ sput-object v0, Landroid/support/v7/app/ResourcesFlusher;->sDrawableCacheField:Ljava/lang/reflect/Field; .line 143 + sget-object v0, Landroid/support/v7/app/ResourcesFlusher;->sDrawableCacheField:Ljava/lang/reflect/Field; + invoke-virtual {v0, v1}, Ljava/lang/reflect/Field;->setAccessible(Z)V :try_end_2 .catch Ljava/lang/NoSuchFieldException; {:try_start_2 .. :try_end_2} :catch_2 @@ -407,6 +440,13 @@ .method private static flushThemedResourcesCache(Ljava/lang/Object;)V .locals 4 + .param p0 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x10 + .end annotation .line 166 sget-boolean v0, Landroid/support/v7/app/ResourcesFlusher;->sThemedResourceCacheClazzFetched:Z @@ -468,6 +508,8 @@ sput-object v0, Landroid/support/v7/app/ResourcesFlusher;->sThemedResourceCache_mUnthemedEntriesField:Ljava/lang/reflect/Field; .line 184 + sget-object v0, Landroid/support/v7/app/ResourcesFlusher;->sThemedResourceCache_mUnthemedEntriesField:Ljava/lang/reflect/Field; + invoke-virtual {v0, v1}, Ljava/lang/reflect/Field;->setAccessible(Z)V :try_end_1 .catch Ljava/lang/NoSuchFieldException; {:try_start_1 .. :try_end_1} :catch_1 @@ -507,8 +549,6 @@ :try_end_2 .catch Ljava/lang/IllegalAccessException; {:try_start_2 .. :try_end_2} :catch_2 - move-object v1, p0 - goto :goto_2 :catch_2 @@ -519,11 +559,13 @@ .line 201 invoke-static {v2, v0, p0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I + move-object p0, v1 + :goto_2 - if-eqz v1, :cond_4 + if-eqz p0, :cond_4 .line 205 - invoke-virtual {v1}, Landroid/util/LongSparseArray;->clear()V + invoke-virtual {p0}, Landroid/util/LongSparseArray;->clear()V :cond_4 return-void diff --git a/smali/android/support/v7/app/ToolbarActionBar.smali b/smali/android/support/v7/app/ToolbarActionBar.smali index 061591a9..b3c58e05 100644 --- a/smali/android/support/v7/app/ToolbarActionBar.smali +++ b/smali/android/support/v7/app/ToolbarActionBar.smali @@ -41,7 +41,7 @@ # direct methods .method constructor (Landroid/support/v7/widget/Toolbar;Ljava/lang/CharSequence;Landroid/view/Window$Callback;)V - .locals 3 + .locals 2 .line 68 invoke-direct {p0}, Landroid/support/v7/app/ActionBar;->()V @@ -68,28 +68,32 @@ iput-object v0, p0, Landroid/support/v7/app/ToolbarActionBar;->mMenuClicker:Landroid/support/v7/widget/Toolbar$OnMenuItemClickListener; .line 69 - new-instance v1, Landroid/support/v7/widget/ToolbarWidgetWrapper; + new-instance v0, Landroid/support/v7/widget/ToolbarWidgetWrapper; - const/4 v2, 0x0 + const/4 v1, 0x0 - invoke-direct {v1, p1, v2}, Landroid/support/v7/widget/ToolbarWidgetWrapper;->(Landroid/support/v7/widget/Toolbar;Z)V + invoke-direct {v0, p1, v1}, Landroid/support/v7/widget/ToolbarWidgetWrapper;->(Landroid/support/v7/widget/Toolbar;Z)V - iput-object v1, p0, Landroid/support/v7/app/ToolbarActionBar;->mDecorToolbar:Landroid/support/v7/widget/DecorToolbar; + iput-object v0, p0, Landroid/support/v7/app/ToolbarActionBar;->mDecorToolbar:Landroid/support/v7/widget/DecorToolbar; .line 70 - new-instance v1, Landroid/support/v7/app/ToolbarActionBar$ToolbarCallbackWrapper; + new-instance v0, Landroid/support/v7/app/ToolbarActionBar$ToolbarCallbackWrapper; - invoke-direct {v1, p0, p3}, Landroid/support/v7/app/ToolbarActionBar$ToolbarCallbackWrapper;->(Landroid/support/v7/app/ToolbarActionBar;Landroid/view/Window$Callback;)V + invoke-direct {v0, p0, p3}, Landroid/support/v7/app/ToolbarActionBar$ToolbarCallbackWrapper;->(Landroid/support/v7/app/ToolbarActionBar;Landroid/view/Window$Callback;)V - iput-object v1, p0, Landroid/support/v7/app/ToolbarActionBar;->mWindowCallback:Landroid/view/Window$Callback; + iput-object v0, p0, Landroid/support/v7/app/ToolbarActionBar;->mWindowCallback:Landroid/view/Window$Callback; .line 71 iget-object p3, p0, Landroid/support/v7/app/ToolbarActionBar;->mDecorToolbar:Landroid/support/v7/widget/DecorToolbar; - invoke-interface {p3, v1}, Landroid/support/v7/widget/DecorToolbar;->setWindowCallback(Landroid/view/Window$Callback;)V + iget-object v0, p0, Landroid/support/v7/app/ToolbarActionBar;->mWindowCallback:Landroid/view/Window$Callback; + + invoke-interface {p3, v0}, Landroid/support/v7/widget/DecorToolbar;->setWindowCallback(Landroid/view/Window$Callback;)V .line 72 - invoke-virtual {p1, v0}, Landroid/support/v7/widget/Toolbar;->setOnMenuItemClickListener(Landroid/support/v7/widget/Toolbar$OnMenuItemClickListener;)V + iget-object p3, p0, Landroid/support/v7/app/ToolbarActionBar;->mMenuClicker:Landroid/support/v7/widget/Toolbar$OnMenuItemClickListener; + + invoke-virtual {p1, p3}, Landroid/support/v7/widget/Toolbar;->setOnMenuItemClickListener(Landroid/support/v7/widget/Toolbar$OnMenuItemClickListener;)V .line 73 iget-object p1, p0, Landroid/support/v7/app/ToolbarActionBar;->mDecorToolbar:Landroid/support/v7/widget/DecorToolbar; @@ -832,6 +836,10 @@ .method public setBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V .locals 1 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 290 iget-object v0, p0, Landroid/support/v7/app/ToolbarActionBar;->mDecorToolbar:Landroid/support/v7/widget/DecorToolbar; @@ -934,6 +942,11 @@ .method public setDisplayOptions(I)V .locals 1 + .annotation build Landroid/annotation/SuppressLint; + value = { + "WrongConstant" + } + .end annotation const/4 v0, -0x1 diff --git a/smali/android/support/v7/app/TwilightCalculator.smali b/smali/android/support/v7/app/TwilightCalculator.smali index b4c870d0..4ac3fdbf 100644 --- a/smali/android/support/v7/app/TwilightCalculator.smali +++ b/smali/android/support/v7/app/TwilightCalculator.smali @@ -347,11 +347,13 @@ iput-wide v3, v0, Landroid/support/v7/app/TwilightCalculator;->sunrise:J - cmp-long v1, v3, p1 + .line 133 + iget-wide v1, v0, Landroid/support/v7/app/TwilightCalculator;->sunrise:J + + cmp-long v3, v1, p1 - if-gez v1, :cond_2 + if-gez v3, :cond_2 - .line 133 iget-wide v1, v0, Landroid/support/v7/app/TwilightCalculator;->sunset:J cmp-long v3, v1, p1 diff --git a/smali/android/support/v7/app/TwilightManager.smali b/smali/android/support/v7/app/TwilightManager.smali index 12bacf32..30c8b50e 100644 --- a/smali/android/support/v7/app/TwilightManager.smali +++ b/smali/android/support/v7/app/TwilightManager.smali @@ -32,6 +32,16 @@ # direct methods .method constructor (Landroid/content/Context;Landroid/location/LocationManager;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/location/LocationManager; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/VisibleForTesting; + .end annotation .line 69 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -54,6 +64,10 @@ .method static getInstance(Landroid/content/Context;)Landroid/support/v7/app/TwilightManager; .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 50 sget-object v0, Landroid/support/v7/app/TwilightManager;->sInstance:Landroid/support/v7/app/TwilightManager; @@ -90,6 +104,11 @@ .method private getLastKnownLocation()Landroid/location/Location; .locals 7 + .annotation build Landroid/annotation/SuppressLint; + value = { + "MissingPermission" + } + .end annotation .line 110 iget-object v0, p0, Landroid/support/v7/app/TwilightManager;->mContext:Landroid/content/Context; @@ -169,6 +188,12 @@ .method private getLastKnownLocationForProvider(Ljava/lang/String;)Landroid/location/Location; .locals 2 + .annotation build Landroid/support/annotation/RequiresPermission; + anyOf = { + "android.permission.ACCESS_COARSE_LOCATION", + "android.permission.ACCESS_FINE_LOCATION" + } + .end annotation .line 134 :try_start_0 @@ -236,6 +261,8 @@ .method static setInstance(Landroid/support/v7/app/TwilightManager;)V .locals 0 + .annotation build Landroid/support/annotation/VisibleForTesting; + .end annotation .line 60 sput-object p0, Landroid/support/v7/app/TwilightManager;->sInstance:Landroid/support/v7/app/TwilightManager; @@ -245,6 +272,10 @@ .method private updateState(Landroid/location/Location;)V .locals 22 + .param p1 # Landroid/location/Location; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param move-object/from16 v0, p0 diff --git a/smali/android/support/v7/app/WindowDecorActionBar$1.smali b/smali/android/support/v7/app/WindowDecorActionBar$1.smali index 97c45946..147401a9 100644 --- a/smali/android/support/v7/app/WindowDecorActionBar$1.smali +++ b/smali/android/support/v7/app/WindowDecorActionBar$1.smali @@ -91,8 +91,6 @@ iput-object v0, p1, Landroid/support/v7/app/WindowDecorActionBar;->mCurrentShowAnim:Landroid/support/v7/view/ViewPropertyAnimatorCompatSet; .line 145 - iget-object p1, p0, Landroid/support/v7/app/WindowDecorActionBar$1;->this$0:Landroid/support/v7/app/WindowDecorActionBar; - invoke-virtual {p1}, Landroid/support/v7/app/WindowDecorActionBar;->completeDeferredDestroyActionMode()V .line 146 diff --git a/smali/android/support/v7/app/WindowDecorActionBar$2.smali b/smali/android/support/v7/app/WindowDecorActionBar$2.smali index db55e941..57f1b1e2 100644 --- a/smali/android/support/v7/app/WindowDecorActionBar$2.smali +++ b/smali/android/support/v7/app/WindowDecorActionBar$2.smali @@ -43,8 +43,6 @@ iput-object v0, p1, Landroid/support/v7/app/WindowDecorActionBar;->mCurrentShowAnim:Landroid/support/v7/view/ViewPropertyAnimatorCompatSet; .line 156 - iget-object p1, p0, Landroid/support/v7/app/WindowDecorActionBar$2;->this$0:Landroid/support/v7/app/WindowDecorActionBar; - iget-object p1, p1, Landroid/support/v7/app/WindowDecorActionBar;->mContainerView:Landroid/support/v7/widget/ActionBarContainer; invoke-virtual {p1}, Landroid/support/v7/widget/ActionBarContainer;->requestLayout()V diff --git a/smali/android/support/v7/app/WindowDecorActionBar$ActionModeImpl.smali b/smali/android/support/v7/app/WindowDecorActionBar$ActionModeImpl.smali index 0cc561ef..eceb8a44 100644 --- a/smali/android/support/v7/app/WindowDecorActionBar$ActionModeImpl.smali +++ b/smali/android/support/v7/app/WindowDecorActionBar$ActionModeImpl.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v7/app/WindowDecorActionBar; .end annotation @@ -67,6 +73,8 @@ iput-object p1, p0, Landroid/support/v7/app/WindowDecorActionBar$ActionModeImpl;->mMenu:Landroid/support/v7/view/menu/MenuBuilder; .line 998 + iget-object p1, p0, Landroid/support/v7/app/WindowDecorActionBar$ActionModeImpl;->mMenu:Landroid/support/v7/view/menu/MenuBuilder; + invoke-virtual {p1, p0}, Landroid/support/v7/view/menu/MenuBuilder;->setCallback(Landroid/support/v7/view/menu/MenuBuilder$Callback;)V return-void @@ -147,8 +155,6 @@ iput-object p0, v0, Landroid/support/v7/app/WindowDecorActionBar;->mDeferredDestroyActionMode:Landroid/support/v7/view/ActionMode; .line 1026 - iget-object v0, p0, Landroid/support/v7/app/WindowDecorActionBar$ActionModeImpl;->this$0:Landroid/support/v7/app/WindowDecorActionBar; - iget-object v1, p0, Landroid/support/v7/app/WindowDecorActionBar$ActionModeImpl;->mCallback:Landroid/support/v7/view/ActionMode$Callback; iput-object v1, v0, Landroid/support/v7/app/WindowDecorActionBar;->mDeferredModeDestroyCallback:Landroid/support/v7/view/ActionMode$Callback; diff --git a/smali/android/support/v7/app/WindowDecorActionBar$TabImpl.smali b/smali/android/support/v7/app/WindowDecorActionBar$TabImpl.smali index fe0706ef..bbfd02e8 100644 --- a/smali/android/support/v7/app/WindowDecorActionBar$TabImpl.smali +++ b/smali/android/support/v7/app/WindowDecorActionBar$TabImpl.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v7/app/WindowDecorActionBar; .end annotation diff --git a/smali/android/support/v7/app/WindowDecorActionBar.smali b/smali/android/support/v7/app/WindowDecorActionBar.smali index bcbffccc..a8c72da1 100644 --- a/smali/android/support/v7/app/WindowDecorActionBar.smali +++ b/smali/android/support/v7/app/WindowDecorActionBar.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v7/app/WindowDecorActionBar$TabImpl;, @@ -302,6 +308,11 @@ .method public constructor (Landroid/view/View;)V .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 189 invoke-direct {p0}, Landroid/support/v7/app/ActionBar;->()V @@ -484,13 +495,9 @@ invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;->(Ljava/lang/String;)V - goto :goto_2 - - :goto_1 throw p1 - :goto_2 - goto :goto_1 + return-void .end method .method private ensureTabsExist()V @@ -682,6 +689,9 @@ iput-object v0, p0, Landroid/support/v7/app/WindowDecorActionBar;->mOverlayLayout:Landroid/support/v7/widget/ActionBarOverlayLayout; + .line 196 + iget-object v0, p0, Landroid/support/v7/app/WindowDecorActionBar;->mOverlayLayout:Landroid/support/v7/widget/ActionBarOverlayLayout; + if-eqz v0, :cond_0 .line 197 @@ -724,18 +734,20 @@ iput-object p1, p0, Landroid/support/v7/app/WindowDecorActionBar;->mContainerView:Landroid/support/v7/widget/ActionBarContainer; .line 205 - iget-object v0, p0, Landroid/support/v7/app/WindowDecorActionBar;->mDecorToolbar:Landroid/support/v7/widget/DecorToolbar; + iget-object p1, p0, Landroid/support/v7/app/WindowDecorActionBar;->mDecorToolbar:Landroid/support/v7/widget/DecorToolbar; - if-eqz v0, :cond_7 + if-eqz p1, :cond_7 - iget-object v1, p0, Landroid/support/v7/app/WindowDecorActionBar;->mContextView:Landroid/support/v7/widget/ActionBarContextView; + iget-object v0, p0, Landroid/support/v7/app/WindowDecorActionBar;->mContextView:Landroid/support/v7/widget/ActionBarContextView; - if-eqz v1, :cond_7 + if-eqz v0, :cond_7 - if-eqz p1, :cond_7 + iget-object v0, p0, Landroid/support/v7/app/WindowDecorActionBar;->mContainerView:Landroid/support/v7/widget/ActionBarContainer; + + if-eqz v0, :cond_7 .line 210 - invoke-interface {v0}, Landroid/support/v7/widget/DecorToolbar;->getContext()Landroid/content/Context; + invoke-interface {p1}, Landroid/support/v7/widget/DecorToolbar;->getContext()Landroid/content/Context; move-result-object p1 @@ -894,6 +906,9 @@ .line 263 iput-boolean p1, p0, Landroid/support/v7/app/WindowDecorActionBar;->mHasEmbeddedTabs:Z + .line 265 + iget-boolean p1, p0, Landroid/support/v7/app/WindowDecorActionBar;->mHasEmbeddedTabs:Z + const/4 v0, 0x0 if-nez p1, :cond_0 @@ -1469,9 +1484,9 @@ const/4 p1, 0x2 + .line 847 new-array p1, p1, [I - .line 847 fill-array-data p1, :array_0 .line 848 @@ -1479,6 +1494,7 @@ invoke-virtual {v3, p1}, Landroid/support/v7/widget/ActionBarContainer;->getLocationInWindow([I)V + .line 849 aget p1, p1, v1 int-to-float p1, p1 @@ -1622,9 +1638,9 @@ const/4 p1, 0x2 + .line 798 new-array p1, p1, [I - .line 798 fill-array-data p1, :array_0 .line 799 @@ -1634,6 +1650,7 @@ const/4 v2, 0x1 + .line 800 aget p1, p1, v2 int-to-float p1, p1 @@ -2650,6 +2667,9 @@ iput-object p1, p0, Landroid/support/v7/app/WindowDecorActionBar;->mSelectedTab:Landroid/support/v7/app/WindowDecorActionBar$TabImpl; + .line 652 + iget-object p1, p0, Landroid/support/v7/app/WindowDecorActionBar;->mSelectedTab:Landroid/support/v7/app/WindowDecorActionBar$TabImpl; + if-eqz p1, :cond_6 .line 653 diff --git a/smali/android/support/v7/appcompat/R$anim.smali b/smali/android/support/v7/appcompat/R$anim.smali index 501e0803..80d5a3e2 100644 --- a/smali/android/support/v7/appcompat/R$anim.smali +++ b/smali/android/support/v7/appcompat/R$anim.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/v7/appcompat/R$anim; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -43,6 +44,7 @@ .method private constructor ()V .locals 0 + .line 13 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/v7/appcompat/R$attr.smali b/smali/android/support/v7/appcompat/R$attr.smali index 4e075c51..44399c63 100644 --- a/smali/android/support/v7/appcompat/R$attr.smali +++ b/smali/android/support/v7/appcompat/R$attr.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/v7/appcompat/R$attr; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -563,6 +564,7 @@ .method private constructor ()V .locals 0 + .line 29 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/v7/appcompat/R$bool.smali b/smali/android/support/v7/appcompat/R$bool.smali index 48ce550f..12952ff7 100644 --- a/smali/android/support/v7/appcompat/R$bool.smali +++ b/smali/android/support/v7/appcompat/R$bool.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/v7/appcompat/R$bool; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -25,6 +26,7 @@ .method private constructor ()V .locals 0 + .line 305 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/v7/appcompat/R$color.smali b/smali/android/support/v7/appcompat/R$color.smali index 812bae4b..3f49890a 100644 --- a/smali/android/support/v7/appcompat/R$color.smali +++ b/smali/android/support/v7/appcompat/R$color.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/v7/appcompat/R$color; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -187,6 +188,7 @@ .method private constructor ()V .locals 0 + .line 312 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/v7/appcompat/R$dimen.smali b/smali/android/support/v7/appcompat/R$dimen.smali index 64865c55..c6c257e2 100644 --- a/smali/android/support/v7/appcompat/R$dimen.smali +++ b/smali/android/support/v7/appcompat/R$dimen.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/v7/appcompat/R$dimen; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -247,6 +248,7 @@ .method private constructor ()V .locals 0 + .line 400 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/v7/appcompat/R$drawable.smali b/smali/android/support/v7/appcompat/R$drawable.smali index 24f299a8..b07a3c2c 100644 --- a/smali/android/support/v7/appcompat/R$drawable.smali +++ b/smali/android/support/v7/appcompat/R$drawable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/v7/appcompat/R$drawable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -215,6 +216,7 @@ .method private constructor ()V .locals 0 + .line 518 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/v7/appcompat/R$id.smali b/smali/android/support/v7/appcompat/R$id.smali index 4b6e6514..92d309b7 100644 --- a/smali/android/support/v7/appcompat/R$id.smali +++ b/smali/android/support/v7/appcompat/R$id.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/v7/appcompat/R$id; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -229,6 +230,7 @@ .method private constructor ()V .locals 0 + .line 620 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/v7/appcompat/R$integer.smali b/smali/android/support/v7/appcompat/R$integer.smali index b10b1899..21aecbc0 100644 --- a/smali/android/support/v7/appcompat/R$integer.smali +++ b/smali/android/support/v7/appcompat/R$integer.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/v7/appcompat/R$integer; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -29,6 +30,7 @@ .method private constructor ()V .locals 0 + .line 729 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/v7/appcompat/R$layout.smali b/smali/android/support/v7/appcompat/R$layout.smali index dac602c6..ca3a5bb2 100644 --- a/smali/android/support/v7/appcompat/R$layout.smali +++ b/smali/android/support/v7/appcompat/R$layout.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/v7/appcompat/R$layout; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -95,6 +96,7 @@ .method private constructor ()V .locals 0 + .line 738 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/v7/appcompat/R$string.smali b/smali/android/support/v7/appcompat/R$string.smali index 6f0159f7..cbc99fb1 100644 --- a/smali/android/support/v7/appcompat/R$string.smali +++ b/smali/android/support/v7/appcompat/R$string.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/v7/appcompat/R$string; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -101,6 +102,7 @@ .method private constructor ()V .locals 0 + .line 780 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/v7/appcompat/R$style.smali b/smali/android/support/v7/appcompat/R$style.smali index 7f126e54..5fb82774 100644 --- a/smali/android/support/v7/appcompat/R$style.smali +++ b/smali/android/support/v7/appcompat/R$style.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/v7/appcompat/R$style; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -711,6 +712,7 @@ .method private constructor ()V .locals 0 + .line 825 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/v7/appcompat/R$styleable.smali b/smali/android/support/v7/appcompat/R$styleable.smali index 4be4ae52..8b48ce9e 100644 --- a/smali/android/support/v7/appcompat/R$styleable.smali +++ b/smali/android/support/v7/appcompat/R$styleable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/v7/appcompat/R$styleable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -934,11 +935,12 @@ # direct methods -.method public static constructor ()V +.method static constructor ()V .locals 10 const/16 v0, 0x1d + .line 1177 new-array v1, v0, [I fill-array-data v1, :array_0 @@ -947,39 +949,44 @@ const/4 v1, 0x1 + .line 1207 new-array v2, v1, [I - const v3, 0x10100b3 + const/4 v3, 0x0 - const/4 v4, 0x0 + const v4, 0x10100b3 - aput v3, v2, v4 + aput v4, v2, v3 sput-object v2, Landroid/support/v7/appcompat/R$styleable;->ActionBarLayout:[I + .line 1209 new-array v2, v1, [I - const v3, 0x101013f + const v4, 0x101013f - aput v3, v2, v4 + aput v4, v2, v3 sput-object v2, Landroid/support/v7/appcompat/R$styleable;->ActionMenuItemView:[I - new-array v2, v4, [I + .line 1211 + new-array v2, v3, [I sput-object v2, Landroid/support/v7/appcompat/R$styleable;->ActionMenuView:[I const/4 v2, 0x6 - new-array v3, v2, [I + .line 1212 + new-array v4, v2, [I - fill-array-data v3, :array_1 + fill-array-data v4, :array_1 - sput-object v3, Landroid/support/v7/appcompat/R$styleable;->ActionMode:[I + sput-object v4, Landroid/support/v7/appcompat/R$styleable;->ActionMode:[I - const/4 v3, 0x2 + const/4 v4, 0x2 - new-array v5, v3, [I + .line 1219 + new-array v5, v4, [I fill-array-data v5, :array_2 @@ -987,19 +994,22 @@ const/16 v5, 0x8 + .line 1222 new-array v6, v5, [I fill-array-data v6, :array_3 sput-object v6, Landroid/support/v7/appcompat/R$styleable;->AlertDialog:[I + .line 1231 new-array v6, v2, [I fill-array-data v6, :array_4 sput-object v6, Landroid/support/v7/appcompat/R$styleable;->AnimatedStateListDrawableCompat:[I - new-array v6, v3, [I + .line 1238 + new-array v6, v4, [I fill-array-data v6, :array_5 @@ -1007,18 +1017,21 @@ const/4 v6, 0x4 + .line 1241 new-array v7, v6, [I fill-array-data v7, :array_6 sput-object v7, Landroid/support/v7/appcompat/R$styleable;->AnimatedStateListDrawableTransition:[I + .line 1246 new-array v7, v6, [I fill-array-data v7, :array_7 sput-object v7, Landroid/support/v7/appcompat/R$styleable;->AppCompatImageView:[I + .line 1251 new-array v7, v6, [I fill-array-data v7, :array_8 @@ -1027,6 +1040,7 @@ const/4 v7, 0x7 + .line 1256 new-array v8, v7, [I fill-array-data v8, :array_9 @@ -1035,6 +1049,7 @@ const/16 v8, 0xb + .line 1264 new-array v8, v8, [I fill-array-data v8, :array_a @@ -1043,52 +1058,60 @@ const/16 v8, 0x79 + .line 1276 new-array v8, v8, [I fill-array-data v8, :array_b sput-object v8, Landroid/support/v7/appcompat/R$styleable;->AppCompatTheme:[I + .line 1398 new-array v8, v1, [I const v9, 0x7f020026 - aput v9, v8, v4 + aput v9, v8, v3 sput-object v8, Landroid/support/v7/appcompat/R$styleable;->ButtonBarLayout:[I const/4 v8, 0x3 + .line 1400 new-array v9, v8, [I fill-array-data v9, :array_c sput-object v9, Landroid/support/v7/appcompat/R$styleable;->ColorStateListItem:[I + .line 1404 new-array v9, v8, [I fill-array-data v9, :array_d sput-object v9, Landroid/support/v7/appcompat/R$styleable;->CompoundButton:[I - new-array v9, v3, [I + .line 1408 + new-array v9, v4, [I fill-array-data v9, :array_e sput-object v9, Landroid/support/v7/appcompat/R$styleable;->CoordinatorLayout:[I + .line 1411 new-array v7, v7, [I fill-array-data v7, :array_f sput-object v7, Landroid/support/v7/appcompat/R$styleable;->CoordinatorLayout_Layout:[I + .line 1419 new-array v5, v5, [I fill-array-data v5, :array_10 sput-object v5, Landroid/support/v7/appcompat/R$styleable;->DrawerArrowToggle:[I + .line 1428 new-array v5, v2, [I fill-array-data v5, :array_11 @@ -1097,6 +1120,7 @@ const/16 v5, 0xa + .line 1435 new-array v5, v5, [I fill-array-data v5, :array_12 @@ -1105,13 +1129,15 @@ const/16 v5, 0xc + .line 1446 new-array v5, v5, [I fill-array-data v5, :array_13 sput-object v5, Landroid/support/v7/appcompat/R$styleable;->GradientColor:[I - new-array v5, v3, [I + .line 1459 + new-array v5, v4, [I fill-array-data v5, :array_14 @@ -1119,24 +1145,28 @@ const/16 v5, 0x9 + .line 1462 new-array v7, v5, [I fill-array-data v7, :array_15 sput-object v7, Landroid/support/v7/appcompat/R$styleable;->LinearLayoutCompat:[I + .line 1472 new-array v6, v6, [I fill-array-data v6, :array_16 sput-object v6, Landroid/support/v7/appcompat/R$styleable;->LinearLayoutCompat_Layout:[I - new-array v6, v3, [I + .line 1477 + new-array v6, v4, [I fill-array-data v6, :array_17 sput-object v6, Landroid/support/v7/appcompat/R$styleable;->ListPopupWindow:[I + .line 1480 new-array v6, v2, [I fill-array-data v6, :array_18 @@ -1145,70 +1175,80 @@ const/16 v6, 0x17 + .line 1487 new-array v6, v6, [I fill-array-data v6, :array_19 sput-object v6, Landroid/support/v7/appcompat/R$styleable;->MenuItem:[I + .line 1511 new-array v5, v5, [I fill-array-data v5, :array_1a sput-object v5, Landroid/support/v7/appcompat/R$styleable;->MenuView:[I + .line 1521 new-array v5, v8, [I fill-array-data v5, :array_1b sput-object v5, Landroid/support/v7/appcompat/R$styleable;->PopupWindow:[I + .line 1525 new-array v5, v1, [I const v6, 0x7f020173 - aput v6, v5, v4 + aput v6, v5, v3 sput-object v5, Landroid/support/v7/appcompat/R$styleable;->PopupWindowBackgroundState:[I - new-array v3, v3, [I + .line 1527 + new-array v4, v4, [I - fill-array-data v3, :array_1c + fill-array-data v4, :array_1c - sput-object v3, Landroid/support/v7/appcompat/R$styleable;->RecycleListView:[I + sput-object v4, Landroid/support/v7/appcompat/R$styleable;->RecycleListView:[I - const/16 v3, 0x11 + const/16 v4, 0x11 - new-array v3, v3, [I + .line 1530 + new-array v4, v4, [I - fill-array-data v3, :array_1d + fill-array-data v4, :array_1d - sput-object v3, Landroid/support/v7/appcompat/R$styleable;->SearchView:[I + sput-object v4, Landroid/support/v7/appcompat/R$styleable;->SearchView:[I - const/4 v3, 0x5 + const/4 v4, 0x5 - new-array v5, v3, [I + .line 1548 + new-array v5, v4, [I fill-array-data v5, :array_1e sput-object v5, Landroid/support/v7/appcompat/R$styleable;->Spinner:[I + .line 1554 new-array v2, v2, [I fill-array-data v2, :array_1f sput-object v2, Landroid/support/v7/appcompat/R$styleable;->StateListDrawable:[I + .line 1561 new-array v1, v1, [I const v2, 0x1010199 - aput v2, v1, v4 + aput v2, v1, v3 sput-object v1, Landroid/support/v7/appcompat/R$styleable;->StateListDrawableItem:[I const/16 v1, 0xe + .line 1563 new-array v1, v1, [I fill-array-data v1, :array_20 @@ -1217,30 +1257,35 @@ const/16 v1, 0xd + .line 1578 new-array v1, v1, [I fill-array-data v1, :array_21 sput-object v1, Landroid/support/v7/appcompat/R$styleable;->TextAppearance:[I + .line 1592 new-array v0, v0, [I fill-array-data v0, :array_22 sput-object v0, Landroid/support/v7/appcompat/R$styleable;->Toolbar:[I - new-array v0, v3, [I + .line 1622 + new-array v0, v4, [I fill-array-data v0, :array_23 sput-object v0, Landroid/support/v7/appcompat/R$styleable;->View:[I + .line 1628 new-array v0, v8, [I fill-array-data v0, :array_24 sput-object v0, Landroid/support/v7/appcompat/R$styleable;->ViewBackgroundHelper:[I + .line 1632 new-array v0, v8, [I fill-array-data v0, :array_25 @@ -1815,6 +1860,7 @@ .method private constructor ()V .locals 0 + .line 1175 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/v7/appcompat/R.smali b/smali/android/support/v7/appcompat/R.smali index f5ed3dbe..4c663650 100644 --- a/smali/android/support/v7/appcompat/R.smali +++ b/smali/android/support/v7/appcompat/R.smali @@ -1,22 +1,23 @@ .class public final Landroid/support/v7/appcompat/R; .super Ljava/lang/Object; +.source "R.java" # annotations .annotation system Ldalvik/annotation/MemberClasses; value = { - Landroid/support/v7/appcompat/R$anim;, - Landroid/support/v7/appcompat/R$attr;, - Landroid/support/v7/appcompat/R$bool;, - Landroid/support/v7/appcompat/R$color;, - Landroid/support/v7/appcompat/R$dimen;, - Landroid/support/v7/appcompat/R$drawable;, - Landroid/support/v7/appcompat/R$id;, - Landroid/support/v7/appcompat/R$integer;, - Landroid/support/v7/appcompat/R$layout;, - Landroid/support/v7/appcompat/R$string;, + Landroid/support/v7/appcompat/R$styleable;, Landroid/support/v7/appcompat/R$style;, - Landroid/support/v7/appcompat/R$styleable; + Landroid/support/v7/appcompat/R$string;, + Landroid/support/v7/appcompat/R$layout;, + Landroid/support/v7/appcompat/R$integer;, + Landroid/support/v7/appcompat/R$id;, + Landroid/support/v7/appcompat/R$drawable;, + Landroid/support/v7/appcompat/R$dimen;, + Landroid/support/v7/appcompat/R$color;, + Landroid/support/v7/appcompat/R$bool;, + Landroid/support/v7/appcompat/R$attr;, + Landroid/support/v7/appcompat/R$anim; } .end annotation @@ -25,6 +26,7 @@ .method private constructor ()V .locals 0 + .line 10 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/v7/content/res/AppCompatResources$ColorStateListCacheEntry.smali b/smali/android/support/v7/content/res/AppCompatResources$ColorStateListCacheEntry.smali index 31e05d12..fa8467c1 100644 --- a/smali/android/support/v7/content/res/AppCompatResources$ColorStateListCacheEntry.smali +++ b/smali/android/support/v7/content/res/AppCompatResources$ColorStateListCacheEntry.smali @@ -23,6 +23,14 @@ # direct methods .method constructor (Landroid/content/res/ColorStateList;Landroid/content/res/Configuration;)V .locals 0 + .param p1 # Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/content/res/Configuration; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 184 invoke-direct {p0}, Ljava/lang/Object;->()V diff --git a/smali/android/support/v7/content/res/AppCompatResources.smali b/smali/android/support/v7/content/res/AppCompatResources.smali index 340ae9db..c8518366 100644 --- a/smali/android/support/v7/content/res/AppCompatResources.smali +++ b/smali/android/support/v7/content/res/AppCompatResources.smali @@ -80,6 +80,18 @@ .method private static addColorStateListToCache(Landroid/content/Context;ILandroid/content/res/ColorStateList;)V .locals 3 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/ColorRes; + .end annotation + .end param + .param p2 # Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 148 sget-object v0, Landroid/support/v7/content/res/AppCompatResources;->sColorStateCacheLock:Ljava/lang/Object; @@ -92,23 +104,25 @@ invoke-virtual {v1, p0}, Ljava/util/WeakHashMap;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v2 + move-result-object v1 - check-cast v2, Landroid/util/SparseArray; + check-cast v1, Landroid/util/SparseArray; - if-nez v2, :cond_0 + if-nez v1, :cond_0 .line 151 - new-instance v2, Landroid/util/SparseArray; + new-instance v1, Landroid/util/SparseArray; - invoke-direct {v2}, Landroid/util/SparseArray;->()V + invoke-direct {v1}, Landroid/util/SparseArray;->()V .line 152 - invoke-virtual {v1, p0, v2}, Ljava/util/WeakHashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + sget-object v2, Landroid/support/v7/content/res/AppCompatResources;->sColorStateCaches:Ljava/util/WeakHashMap; + + invoke-virtual {v2, p0, v1}, Ljava/util/WeakHashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 154 :cond_0 - new-instance v1, Landroid/support/v7/content/res/AppCompatResources$ColorStateListCacheEntry; + new-instance v2, Landroid/support/v7/content/res/AppCompatResources$ColorStateListCacheEntry; .line 155 invoke-virtual {p0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources; @@ -119,10 +133,10 @@ move-result-object p0 - invoke-direct {v1, p2, p0}, Landroid/support/v7/content/res/AppCompatResources$ColorStateListCacheEntry;->(Landroid/content/res/ColorStateList;Landroid/content/res/Configuration;)V + invoke-direct {v2, p2, p0}, Landroid/support/v7/content/res/AppCompatResources$ColorStateListCacheEntry;->(Landroid/content/res/ColorStateList;Landroid/content/res/Configuration;)V .line 154 - invoke-virtual {v2, p1, v1}, Landroid/util/SparseArray;->append(ILjava/lang/Object;)V + invoke-virtual {v1, p1, v2}, Landroid/util/SparseArray;->append(ILjava/lang/Object;)V .line 156 monitor-exit v0 @@ -141,6 +155,16 @@ .method private static getCachedColorStateList(Landroid/content/Context;I)Landroid/content/res/ColorStateList; .locals 4 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/ColorRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 128 sget-object v0, Landroid/support/v7/content/res/AppCompatResources;->sColorStateCacheLock:Ljava/lang/Object; @@ -223,6 +247,14 @@ .method public static getColorStateList(Landroid/content/Context;I)Landroid/content/res/ColorStateList; .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/ColorRes; + .end annotation + .end param .line 65 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -272,6 +304,16 @@ .method public static getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable; .locals 1 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 102 invoke-static {}, Landroid/support/v7/widget/AppCompatDrawableManager;->get()Landroid/support/v7/widget/AppCompatDrawableManager; @@ -287,32 +329,38 @@ .method private static getTypedValue()Landroid/util/TypedValue; .locals 2 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 171 sget-object v0, Landroid/support/v7/content/res/AppCompatResources;->TL_TYPED_VALUE:Ljava/lang/ThreadLocal; invoke-virtual {v0}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object; - move-result-object v1 + move-result-object v0 - check-cast v1, Landroid/util/TypedValue; + check-cast v0, Landroid/util/TypedValue; - if-nez v1, :cond_0 + if-nez v0, :cond_0 .line 173 - new-instance v1, Landroid/util/TypedValue; + new-instance v0, Landroid/util/TypedValue; - invoke-direct {v1}, Landroid/util/TypedValue;->()V + invoke-direct {v0}, Landroid/util/TypedValue;->()V .line 174 - invoke-virtual {v0, v1}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V + sget-object v1, Landroid/support/v7/content/res/AppCompatResources;->TL_TYPED_VALUE:Ljava/lang/ThreadLocal; + + invoke-virtual {v1, v0}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V :cond_0 - return-object v1 + return-object v0 .end method .method private static inflateColorStateList(Landroid/content/Context;I)Landroid/content/res/ColorStateList; .locals 2 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 110 invoke-static {p0, p1}, Landroid/support/v7/content/res/AppCompatResources;->isColorInt(Landroid/content/Context;I)Z @@ -365,6 +413,14 @@ .method private static isColorInt(Landroid/content/Context;I)Z .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/ColorRes; + .end annotation + .end param .line 160 invoke-virtual {p0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources; diff --git a/smali/android/support/v7/graphics/drawable/AnimatedStateListDrawableCompat$AnimatedStateListState.smali b/smali/android/support/v7/graphics/drawable/AnimatedStateListDrawableCompat$AnimatedStateListState.smali index 2dbdcb75..4651e3e8 100644 --- a/smali/android/support/v7/graphics/drawable/AnimatedStateListDrawableCompat$AnimatedStateListState.smali +++ b/smali/android/support/v7/graphics/drawable/AnimatedStateListDrawableCompat$AnimatedStateListState.smali @@ -45,6 +45,18 @@ # direct methods .method constructor (Landroid/support/v7/graphics/drawable/AnimatedStateListDrawableCompat$AnimatedStateListState;Landroid/support/v7/graphics/drawable/AnimatedStateListDrawableCompat;Landroid/content/res/Resources;)V .locals 0 + .param p1 # Landroid/support/v7/graphics/drawable/AnimatedStateListDrawableCompat$AnimatedStateListState; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p2 # Landroid/support/v7/graphics/drawable/AnimatedStateListDrawableCompat; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 633 invoke-direct {p0, p1, p2, p3}, Landroid/support/v7/graphics/drawable/StateListDrawable$StateListState;->(Landroid/support/v7/graphics/drawable/StateListDrawable$StateListState;Landroid/support/v7/graphics/drawable/StateListDrawable;Landroid/content/res/Resources;)V @@ -102,6 +114,14 @@ # virtual methods .method addStateSet([ILandroid/graphics/drawable/Drawable;I)I .locals 0 + .param p1 # [I + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 666 invoke-super {p0, p1, p2}, Landroid/support/v7/graphics/drawable/StateListDrawable$StateListState;->addStateSet([ILandroid/graphics/drawable/Drawable;)I @@ -122,6 +142,10 @@ .method addTransition(IILandroid/graphics/drawable/Drawable;Z)I .locals 9 + .param p3 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 651 invoke-super {p0, p3}, Landroid/support/v7/graphics/drawable/StateListDrawable$StateListState;->addChild(Landroid/graphics/drawable/Drawable;)I @@ -215,6 +239,10 @@ .method indexOfKeyframe([I)I .locals 0 + .param p1 # [I + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 672 invoke-super {p0, p1}, Landroid/support/v7/graphics/drawable/StateListDrawable$StateListState;->indexOfStateSet([I)I @@ -342,6 +370,8 @@ .method public newDrawable()Landroid/graphics/drawable/Drawable; .locals 2 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 701 new-instance v0, Landroid/support/v7/graphics/drawable/AnimatedStateListDrawableCompat; @@ -355,6 +385,8 @@ .method public newDrawable(Landroid/content/res/Resources;)Landroid/graphics/drawable/Drawable; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 707 new-instance v0, Landroid/support/v7/graphics/drawable/AnimatedStateListDrawableCompat; diff --git a/smali/android/support/v7/graphics/drawable/AnimatedStateListDrawableCompat$AnimationDrawableTransition.smali b/smali/android/support/v7/graphics/drawable/AnimatedStateListDrawableCompat$AnimationDrawableTransition.smali index 8bed3f02..e8a14aa5 100644 --- a/smali/android/support/v7/graphics/drawable/AnimatedStateListDrawableCompat$AnimationDrawableTransition.smali +++ b/smali/android/support/v7/graphics/drawable/AnimatedStateListDrawableCompat$AnimationDrawableTransition.smali @@ -65,6 +65,7 @@ const/4 p2, 0x2 + .line 397 new-array p2, p2, [I aput v2, p2, v1 diff --git a/smali/android/support/v7/graphics/drawable/AnimatedStateListDrawableCompat$FrameInterpolator.smali b/smali/android/support/v7/graphics/drawable/AnimatedStateListDrawableCompat$FrameInterpolator.smali index 87851a8f..e75c8204 100644 --- a/smali/android/support/v7/graphics/drawable/AnimatedStateListDrawableCompat$FrameInterpolator.smali +++ b/smali/android/support/v7/graphics/drawable/AnimatedStateListDrawableCompat$FrameInterpolator.smali @@ -72,6 +72,9 @@ if-lt p1, v3, :cond_0 + .line 765 + aget v3, v1, v2 + sub-int/2addr p1, v3 add-int/lit8 v2, v2, 0x1 diff --git a/smali/android/support/v7/graphics/drawable/AnimatedStateListDrawableCompat.smali b/smali/android/support/v7/graphics/drawable/AnimatedStateListDrawableCompat.smali index 435bff85..fa7340c0 100644 --- a/smali/android/support/v7/graphics/drawable/AnimatedStateListDrawableCompat.smali +++ b/smali/android/support/v7/graphics/drawable/AnimatedStateListDrawableCompat.smali @@ -62,6 +62,14 @@ .method constructor (Landroid/support/v7/graphics/drawable/AnimatedStateListDrawableCompat$AnimatedStateListState;Landroid/content/res/Resources;)V .locals 1 + .param p1 # Landroid/support/v7/graphics/drawable/AnimatedStateListDrawableCompat$AnimatedStateListState; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p2 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param const/4 v0, 0x0 @@ -99,6 +107,20 @@ .method public static create(Landroid/content/Context;ILandroid/content/res/Resources$Theme;)Landroid/support/v7/graphics/drawable/AnimatedStateListDrawableCompat; .locals 6 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param + .param p2 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation const-string v0, "parser error" @@ -183,6 +205,26 @@ .method public static createFromXmlInner(Landroid/content/Context;Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/content/res/Resources$Theme;)Landroid/support/v7/graphics/drawable/AnimatedStateListDrawableCompat; .locals 8 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Lorg/xmlpull/v1/XmlPullParser; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Ljava/io/IOException;, @@ -258,6 +300,26 @@ .method private inflateChildElements(Landroid/content/Context;Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/content/res/Resources$Theme;)V .locals 5 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Lorg/xmlpull/v1/XmlPullParser; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p5 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Lorg/xmlpull/v1/XmlPullParserException;, @@ -363,6 +425,26 @@ .method private parseItem(Landroid/content/Context;Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/content/res/Resources$Theme;)I .locals 4 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Lorg/xmlpull/v1/XmlPullParser; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p5 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Lorg/xmlpull/v1/XmlPullParserException;, @@ -542,17 +624,33 @@ invoke-direct {p1, p2}, Lorg/xmlpull/v1/XmlPullParserException;->(Ljava/lang/String;)V - goto :goto_4 - - :goto_3 throw p1 - :goto_4 - goto :goto_3 + return-void .end method .method private parseTransition(Landroid/content/Context;Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/content/res/Resources$Theme;)I .locals 7 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Lorg/xmlpull/v1/XmlPullParser; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p5 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Lorg/xmlpull/v1/XmlPullParserException;, @@ -771,13 +869,9 @@ invoke-direct {p1, p2}, Lorg/xmlpull/v1/XmlPullParserException;->(Ljava/lang/String;)V - goto :goto_4 - - :goto_3 throw p1 - :goto_4 - goto :goto_3 + return-void .end method .method private selectTransition(I)Z @@ -1067,6 +1161,14 @@ .method public addState([ILandroid/graphics/drawable/Drawable;I)V .locals 1 + .param p1 # [I + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param if-eqz p2, :cond_0 @@ -1097,6 +1199,10 @@ .method public addTransition(IILandroid/graphics/drawable/Drawable;Z)V .locals 1 + .param p3 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "applyTheme(Landroid/content/res/Resources$Theme;)V @@ -1138,6 +1251,9 @@ .method public bridge synthetic canApplyTheme()Z .locals 1 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x15 + .end annotation .line 89 invoke-super {p0}, Landroid/support/v7/graphics/drawable/StateListDrawable;->canApplyTheme()Z @@ -1200,6 +1316,10 @@ .method public bridge synthetic draw(Landroid/graphics/Canvas;)V .locals 0 + .param p1 # Landroid/graphics/Canvas; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 89 invoke-super {p0, p1}, Landroid/support/v7/graphics/drawable/StateListDrawable;->draw(Landroid/graphics/Canvas;)V @@ -1231,6 +1351,8 @@ .method public bridge synthetic getCurrent()Landroid/graphics/drawable/Drawable; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 89 invoke-super {p0}, Landroid/support/v7/graphics/drawable/StateListDrawable;->getCurrent()Landroid/graphics/drawable/Drawable; @@ -1242,6 +1364,10 @@ .method public bridge synthetic getHotspotBounds(Landroid/graphics/Rect;)V .locals 0 + .param p1 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 89 invoke-super {p0, p1}, Landroid/support/v7/graphics/drawable/StateListDrawable;->getHotspotBounds(Landroid/graphics/Rect;)V @@ -1306,6 +1432,13 @@ .method public bridge synthetic getOutline(Landroid/graphics/Outline;)V .locals 0 + .param p1 # Landroid/graphics/Outline; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x15 + .end annotation .line 89 invoke-super {p0, p1}, Landroid/support/v7/graphics/drawable/StateListDrawable;->getOutline(Landroid/graphics/Outline;)V @@ -1315,6 +1448,10 @@ .method public bridge synthetic getPadding(Landroid/graphics/Rect;)Z .locals 0 + .param p1 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 89 invoke-super {p0, p1}, Landroid/support/v7/graphics/drawable/StateListDrawable;->getPadding(Landroid/graphics/Rect;)Z @@ -1326,6 +1463,26 @@ .method public inflate(Landroid/content/Context;Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/content/res/Resources$Theme;)V .locals 3 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Lorg/xmlpull/v1/XmlPullParser; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p5 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Lorg/xmlpull/v1/XmlPullParserException;, @@ -1371,6 +1528,10 @@ .method public bridge synthetic invalidateDrawable(Landroid/graphics/drawable/Drawable;)V .locals 0 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 89 invoke-super {p0, p1}, Landroid/support/v7/graphics/drawable/StateListDrawable;->invalidateDrawable(Landroid/graphics/drawable/Drawable;)V @@ -1531,6 +1692,14 @@ .method public bridge synthetic scheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;J)V .locals 0 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/Runnable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 89 invoke-super {p0, p1, p2, p3, p4}, Landroid/support/v7/graphics/drawable/StateListDrawable;->scheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;J)V @@ -1567,6 +1736,10 @@ .method protected setConstantState(Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;)V .locals 1 + .param p1 # Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 717 invoke-super {p0, p1}, Landroid/support/v7/graphics/drawable/StateListDrawable;->setConstantState(Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;)V @@ -1641,6 +1814,10 @@ .method public bridge synthetic setTintMode(Landroid/graphics/PorterDuff$Mode;)V .locals 0 + .param p1 # Landroid/graphics/PorterDuff$Mode; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 89 invoke-super {p0, p1}, Landroid/support/v7/graphics/drawable/StateListDrawable;->setTintMode(Landroid/graphics/PorterDuff$Mode;)V @@ -1669,7 +1846,9 @@ if-eqz p1, :cond_1 .line 216 - invoke-virtual {v1}, Landroid/support/v7/graphics/drawable/AnimatedStateListDrawableCompat$Transition;->start()V + iget-object p1, p0, Landroid/support/v7/graphics/drawable/AnimatedStateListDrawableCompat;->mTransition:Landroid/support/v7/graphics/drawable/AnimatedStateListDrawableCompat$Transition; + + invoke-virtual {p1}, Landroid/support/v7/graphics/drawable/AnimatedStateListDrawableCompat$Transition;->start()V goto :goto_0 @@ -1684,6 +1863,14 @@ .method public bridge synthetic unscheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;)V .locals 0 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/Runnable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 89 invoke-super {p0, p1, p2}, Landroid/support/v7/graphics/drawable/StateListDrawable;->unscheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;)V diff --git a/smali/android/support/v7/graphics/drawable/DrawableContainer$BlockInvalidateCallback.smali b/smali/android/support/v7/graphics/drawable/DrawableContainer$BlockInvalidateCallback.smali index 0d51adca..7b86bd7e 100644 --- a/smali/android/support/v7/graphics/drawable/DrawableContainer$BlockInvalidateCallback.smali +++ b/smali/android/support/v7/graphics/drawable/DrawableContainer$BlockInvalidateCallback.smali @@ -35,12 +35,24 @@ # virtual methods .method public invalidateDrawable(Landroid/graphics/drawable/Drawable;)V .locals 0 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param return-void .end method .method public scheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;J)V .locals 1 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/Runnable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1193 iget-object v0, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$BlockInvalidateCallback;->mCallback:Landroid/graphics/drawable/Drawable$Callback; @@ -56,6 +68,14 @@ .method public unscheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;)V .locals 1 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/Runnable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1200 iget-object v0, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$BlockInvalidateCallback;->mCallback:Landroid/graphics/drawable/Drawable$Callback; diff --git a/smali/android/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState.smali b/smali/android/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState.smali index 4e277f60..138e8cf7 100644 --- a/smali/android/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState.smali +++ b/smali/android/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState.smali @@ -168,14 +168,14 @@ if-eqz p1, :cond_a .line 692 - iget p3, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mChangingConfigurations:I + iget p2, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mChangingConfigurations:I - iput p3, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mChangingConfigurations:I + iput p2, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mChangingConfigurations:I .line 693 - iget p3, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mChildrenChangingConfigurations:I + iget p2, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mChildrenChangingConfigurations:I - iput p3, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mChildrenChangingConfigurations:I + iput p2, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mChildrenChangingConfigurations:I .line 694 iput-boolean v1, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mCheckedConstantState:Z @@ -184,79 +184,81 @@ iput-boolean v1, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mCanConstantState:Z .line 696 - iget-boolean p3, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mVariablePadding:Z + iget-boolean p2, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mVariablePadding:Z - iput-boolean p3, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mVariablePadding:Z + iput-boolean p2, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mVariablePadding:Z .line 697 - iget-boolean p3, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mConstantSize:Z + iget-boolean p2, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mConstantSize:Z - iput-boolean p3, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mConstantSize:Z + iput-boolean p2, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mConstantSize:Z .line 698 - iget-boolean p3, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mDither:Z + iget-boolean p2, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mDither:Z - iput-boolean p3, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mDither:Z + iput-boolean p2, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mDither:Z .line 699 - iget-boolean p3, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mMutated:Z + iget-boolean p2, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mMutated:Z - iput-boolean p3, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mMutated:Z + iput-boolean p2, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mMutated:Z .line 700 - iget p3, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mLayoutDirection:I + iget p2, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mLayoutDirection:I - iput p3, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mLayoutDirection:I + iput p2, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mLayoutDirection:I .line 701 - iget p3, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mEnterFadeDuration:I + iget p2, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mEnterFadeDuration:I - iput p3, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mEnterFadeDuration:I + iput p2, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mEnterFadeDuration:I .line 702 - iget p3, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mExitFadeDuration:I + iget p2, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mExitFadeDuration:I - iput p3, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mExitFadeDuration:I + iput p2, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mExitFadeDuration:I .line 703 - iget-boolean p3, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mAutoMirrored:Z + iget-boolean p2, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mAutoMirrored:Z - iput-boolean p3, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mAutoMirrored:Z + iput-boolean p2, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mAutoMirrored:Z .line 704 - iget-object p3, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mColorFilter:Landroid/graphics/ColorFilter; + iget-object p2, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mColorFilter:Landroid/graphics/ColorFilter; - iput-object p3, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mColorFilter:Landroid/graphics/ColorFilter; + iput-object p2, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mColorFilter:Landroid/graphics/ColorFilter; .line 705 - iget-boolean p3, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mHasColorFilter:Z + iget-boolean p2, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mHasColorFilter:Z - iput-boolean p3, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mHasColorFilter:Z + iput-boolean p2, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mHasColorFilter:Z .line 706 - iget-object p3, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mTintList:Landroid/content/res/ColorStateList; + iget-object p2, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mTintList:Landroid/content/res/ColorStateList; - iput-object p3, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mTintList:Landroid/content/res/ColorStateList; + iput-object p2, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mTintList:Landroid/content/res/ColorStateList; .line 707 - iget-object p3, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mTintMode:Landroid/graphics/PorterDuff$Mode; + iget-object p2, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mTintMode:Landroid/graphics/PorterDuff$Mode; - iput-object p3, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mTintMode:Landroid/graphics/PorterDuff$Mode; + iput-object p2, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mTintMode:Landroid/graphics/PorterDuff$Mode; .line 708 - iget-boolean p3, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mHasTintList:Z + iget-boolean p2, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mHasTintList:Z - iput-boolean p3, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mHasTintList:Z + iput-boolean p2, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mHasTintList:Z .line 709 - iget-boolean p3, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mHasTintMode:Z + iget-boolean p2, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mHasTintMode:Z - iput-boolean p3, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mHasTintMode:Z + iput-boolean p2, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mHasTintMode:Z .line 710 - iget p3, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mDensity:I + iget p2, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mDensity:I + + iget p3, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mDensity:I - if-ne p3, p2, :cond_4 + if-ne p2, p3, :cond_4 .line 711 iget-boolean p2, p1, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mCheckedPadding:Z @@ -385,6 +387,8 @@ if-eqz p3, :cond_9 .line 748 + aget-object p3, p2, v0 + invoke-virtual {p3}, Landroid/graphics/drawable/Drawable;->getConstantState()Landroid/graphics/drawable/Drawable$ConstantState; move-result-object p3 @@ -415,9 +419,9 @@ :cond_a const/16 p1, 0xa + .line 757 new-array p1, p1, [Landroid/graphics/drawable/Drawable; - .line 757 iput-object p1, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mDrawables:[Landroid/graphics/drawable/Drawable; .line 758 @@ -543,12 +547,12 @@ :cond_0 invoke-virtual {p1}, Landroid/graphics/drawable/Drawable;->mutate()Landroid/graphics/drawable/Drawable; - const/4 v1, 0x0 + const/4 v1, 0x1 - const/4 v2, 0x1 + const/4 v2, 0x0 .line 779 - invoke-virtual {p1, v1, v2}, Landroid/graphics/drawable/Drawable;->setVisible(ZZ)Z + invoke-virtual {p1, v2, v1}, Landroid/graphics/drawable/Drawable;->setVisible(ZZ)Z .line 780 iget-object v3, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mOwner:Landroid/support/v7/graphics/drawable/DrawableContainer; @@ -563,18 +567,18 @@ .line 782 iget v3, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mNumChildren:I - add-int/2addr v3, v2 + add-int/2addr v3, v1 iput v3, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mNumChildren:I .line 783 - iget v2, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mChildrenChangingConfigurations:I + iget v1, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mChildrenChangingConfigurations:I invoke-virtual {p1}, Landroid/graphics/drawable/Drawable;->getChangingConfigurations()I move-result p1 - or-int/2addr p1, v2 + or-int/2addr p1, v1 iput p1, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mChildrenChangingConfigurations:I @@ -587,19 +591,22 @@ iput-object p1, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mConstantPadding:Landroid/graphics/Rect; .line 786 - iput-boolean v1, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mCheckedPadding:Z + iput-boolean v2, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mCheckedPadding:Z .line 787 - iput-boolean v1, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mCheckedConstantSize:Z + iput-boolean v2, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mCheckedConstantSize:Z .line 788 - iput-boolean v1, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mCheckedConstantState:Z + iput-boolean v2, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mCheckedConstantState:Z return v0 .end method .method final applyTheme(Landroid/content/res/Resources$Theme;)V .locals 5 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x15 + .end annotation if-eqz p1, :cond_2 @@ -622,6 +629,8 @@ if-eqz v3, :cond_0 + aget-object v3, v1, v2 + invoke-virtual {v3}, Landroid/graphics/drawable/Drawable;->canApplyTheme()Z move-result v3 @@ -665,6 +674,9 @@ .method public canApplyTheme()Z .locals 6 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x15 + .end annotation .line 916 iget v0, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mNumChildren:I @@ -809,13 +821,9 @@ monitor-exit p0 - goto :goto_2 - - :goto_1 throw v0 - :goto_2 - goto :goto_1 + return-void .end method .method final clearMutated()V @@ -1107,9 +1115,9 @@ if-nez v0, :cond_8 - iget-boolean v2, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mCheckedPadding:Z + iget-boolean v0, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mCheckedPadding:Z - if-eqz v2, :cond_1 + if-eqz v0, :cond_1 goto :goto_1 @@ -1130,13 +1138,15 @@ const/4 v4, 0x0 - const/4 v5, 0x0 + move-object v5, v1 + + const/4 v1, 0x0 :goto_0 - if-ge v5, v2, :cond_7 + if-ge v1, v2, :cond_7 .line 983 - aget-object v6, v3, v5 + aget-object v6, v3, v1 invoke-virtual {v6, v0}, Landroid/graphics/drawable/Drawable;->getPadding(Landroid/graphics/Rect;)Z @@ -1144,63 +1154,63 @@ if-eqz v6, :cond_6 - if-nez v1, :cond_2 + if-nez v5, :cond_2 .line 984 - new-instance v1, Landroid/graphics/Rect; + new-instance v5, Landroid/graphics/Rect; - invoke-direct {v1, v4, v4, v4, v4}, Landroid/graphics/Rect;->(IIII)V + invoke-direct {v5, v4, v4, v4, v4}, Landroid/graphics/Rect;->(IIII)V .line 985 :cond_2 iget v6, v0, Landroid/graphics/Rect;->left:I - iget v7, v1, Landroid/graphics/Rect;->left:I + iget v7, v5, Landroid/graphics/Rect;->left:I if-le v6, v7, :cond_3 iget v6, v0, Landroid/graphics/Rect;->left:I - iput v6, v1, Landroid/graphics/Rect;->left:I + iput v6, v5, Landroid/graphics/Rect;->left:I .line 986 :cond_3 iget v6, v0, Landroid/graphics/Rect;->top:I - iget v7, v1, Landroid/graphics/Rect;->top:I + iget v7, v5, Landroid/graphics/Rect;->top:I if-le v6, v7, :cond_4 iget v6, v0, Landroid/graphics/Rect;->top:I - iput v6, v1, Landroid/graphics/Rect;->top:I + iput v6, v5, Landroid/graphics/Rect;->top:I .line 987 :cond_4 iget v6, v0, Landroid/graphics/Rect;->right:I - iget v7, v1, Landroid/graphics/Rect;->right:I + iget v7, v5, Landroid/graphics/Rect;->right:I if-le v6, v7, :cond_5 iget v6, v0, Landroid/graphics/Rect;->right:I - iput v6, v1, Landroid/graphics/Rect;->right:I + iput v6, v5, Landroid/graphics/Rect;->right:I .line 988 :cond_5 iget v6, v0, Landroid/graphics/Rect;->bottom:I - iget v7, v1, Landroid/graphics/Rect;->bottom:I + iget v7, v5, Landroid/graphics/Rect;->bottom:I if-le v6, v7, :cond_6 iget v6, v0, Landroid/graphics/Rect;->bottom:I - iput v6, v1, Landroid/graphics/Rect;->bottom:I + iput v6, v5, Landroid/graphics/Rect;->bottom:I :cond_6 - add-int/lit8 v5, v5, 0x1 + add-int/lit8 v1, v1, 0x1 goto :goto_0 @@ -1211,12 +1221,15 @@ iput-boolean v0, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mCheckedPadding:Z .line 992 - iput-object v1, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mConstantPadding:Landroid/graphics/Rect; + iput-object v5, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mConstantPadding:Landroid/graphics/Rect; - return-object v1 + return-object v5 + .line 975 :cond_8 :goto_1 + iget-object v0, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mConstantPadding:Landroid/graphics/Rect; + return-object v0 .end method @@ -1298,34 +1311,36 @@ :goto_0 const/4 v3, 0x1 - const/4 v4, 0x1 + move v4, v2 + + const/4 v2, 0x1 :goto_1 - if-ge v4, v0, :cond_2 + if-ge v2, v0, :cond_2 .line 1094 - aget-object v5, v1, v4 + aget-object v5, v1, v2 invoke-virtual {v5}, Landroid/graphics/drawable/Drawable;->getOpacity()I move-result v5 - invoke-static {v2, v5}, Landroid/graphics/drawable/Drawable;->resolveOpacity(II)I + invoke-static {v4, v5}, Landroid/graphics/drawable/Drawable;->resolveOpacity(II)I - move-result v2 + move-result v4 - add-int/lit8 v4, v4, 0x1 + add-int/lit8 v2, v2, 0x1 goto :goto_1 .line 1096 :cond_2 - iput v2, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mOpacity:I + iput v4, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mOpacity:I .line 1097 iput-boolean v3, p0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mCheckedOpacity:Z - return v2 + return v4 .end method .method public growArray(II)V @@ -1451,6 +1466,8 @@ if-eqz v3, :cond_0 .line 941 + aget-object v3, v1, v2 + invoke-virtual {v3}, Landroid/graphics/drawable/Drawable;->mutate()Landroid/graphics/drawable/Drawable; :cond_0 diff --git a/smali/android/support/v7/graphics/drawable/DrawableContainer.smali b/smali/android/support/v7/graphics/drawable/DrawableContainer.smali index 9f4641ec..94b2e474 100644 --- a/smali/android/support/v7/graphics/drawable/DrawableContainer.smali +++ b/smali/android/support/v7/graphics/drawable/DrawableContainer.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v7/graphics/drawable/DrawableContainer$BlockInvalidateCallback;, @@ -289,6 +295,15 @@ .method private needsMirroring()Z .locals 2 + .annotation build Landroid/annotation/SuppressLint; + value = { + "WrongConstant" + } + .end annotation + + .annotation build Landroid/annotation/TargetApi; + value = 0x17 + .end annotation .line 106 invoke-virtual {p0}, Landroid/support/v7/graphics/drawable/DrawableContainer;->isAutoMirrored()Z @@ -316,6 +331,10 @@ .method static resolveDensity(Landroid/content/res/Resources;I)I .locals 0 + .param p0 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param if-nez p0, :cond_0 @@ -514,6 +533,13 @@ .method public applyTheme(Landroid/content/res/Resources$Theme;)V .locals 1 + .param p1 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x15 + .end annotation .line 598 iget-object v0, p0, Landroid/support/v7/graphics/drawable/DrawableContainer;->mDrawableContainerState:Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState; @@ -525,6 +551,9 @@ .method public canApplyTheme()Z .locals 1 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x15 + .end annotation .line 604 iget-object v0, p0, Landroid/support/v7/graphics/drawable/DrawableContainer;->mDrawableContainerState:Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState; @@ -563,6 +592,10 @@ .method public draw(Landroid/graphics/Canvas;)V .locals 1 + .param p1 # Landroid/graphics/Canvas; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 89 iget-object v0, p0, Landroid/support/v7/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable; @@ -648,6 +681,8 @@ .method public getCurrent()Landroid/graphics/drawable/Drawable; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 581 iget-object v0, p0, Landroid/support/v7/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable; @@ -666,6 +701,10 @@ .method public getHotspotBounds(Landroid/graphics/Rect;)V .locals 1 + .param p1 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 299 iget-object v0, p0, Landroid/support/v7/graphics/drawable/DrawableContainer;->mHotspotBounds:Landroid/graphics/Rect; @@ -881,6 +920,13 @@ .method public getOutline(Landroid/graphics/Outline;)V .locals 1 + .param p1 # Landroid/graphics/Outline; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x15 + .end annotation .line 135 iget-object v0, p0, Landroid/support/v7/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable; @@ -896,6 +942,10 @@ .method public getPadding(Landroid/graphics/Rect;)Z .locals 3 + .param p1 # Landroid/graphics/Rect; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 111 iget-object v0, p0, Landroid/support/v7/graphics/drawable/DrawableContainer;->mDrawableContainerState:Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState; @@ -980,6 +1030,10 @@ .method public invalidateDrawable(Landroid/graphics/drawable/Drawable;)V .locals 1 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 372 iget-object v0, p0, Landroid/support/v7/graphics/drawable/DrawableContainer;->mDrawableContainerState:Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState; @@ -1113,13 +1167,10 @@ .line 270 iput-wide v4, p0, Landroid/support/v7/graphics/drawable/DrawableContainer;->mEnterAnimationEnd:J - goto :goto_1 + const/4 v0, 0x1 :cond_3 - move v1, v0 - - :goto_1 - if-eqz v1, :cond_4 + if-eqz v0, :cond_4 .line 274 invoke-virtual {p0}, Landroid/support/v7/graphics/drawable/DrawableContainer;->invalidateSelf()V @@ -1130,6 +1181,8 @@ .method public mutate()Landroid/graphics/drawable/Drawable; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 619 iget-boolean v0, p0, Landroid/support/v7/graphics/drawable/DrawableContainer;->mMutated:Z @@ -1273,6 +1326,14 @@ .method public scheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;J)V .locals 1 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/Runnable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 382 iget-object v0, p0, Landroid/support/v7/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable; @@ -1559,8 +1620,6 @@ if-eqz p1, :cond_0 .line 239 - iget-object v0, p0, Landroid/support/v7/graphics/drawable/DrawableContainer;->mDrawableContainerState:Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState; - iget-boolean v0, v0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mAutoMirrored:Z invoke-static {p1, v0}, Landroid/support/v4/graphics/drawable/DrawableCompat;->setAutoMirrored(Landroid/graphics/drawable/Drawable;Z)V @@ -1580,8 +1639,6 @@ iput-boolean v1, v0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mHasColorFilter:Z .line 173 - iget-object v0, p0, Landroid/support/v7/graphics/drawable/DrawableContainer;->mDrawableContainerState:Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState; - iget-object v0, v0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mColorFilter:Landroid/graphics/ColorFilter; if-eq v0, p1, :cond_0 @@ -1621,6 +1678,9 @@ iput-object p1, p0, Landroid/support/v7/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable; + .line 1159 + iget-object p1, p0, Landroid/support/v7/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable; + if-eqz p1, :cond_0 .line 1160 @@ -1670,8 +1730,6 @@ if-eqz p1, :cond_0 .line 165 - iget-object v0, p0, Landroid/support/v7/graphics/drawable/DrawableContainer;->mDrawableContainerState:Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState; - iget-boolean v0, v0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mDither:Z invoke-virtual {p1, v0}, Landroid/graphics/drawable/Drawable;->setDither(Z)V @@ -1762,8 +1820,6 @@ iput-boolean v1, v0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mHasTintList:Z .line 184 - iget-object v0, p0, Landroid/support/v7/graphics/drawable/DrawableContainer;->mDrawableContainerState:Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState; - iget-object v0, v0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mTintList:Landroid/content/res/ColorStateList; if-eq v0, p1, :cond_0 @@ -1784,6 +1840,10 @@ .method public setTintMode(Landroid/graphics/PorterDuff$Mode;)V .locals 2 + .param p1 # Landroid/graphics/PorterDuff$Mode; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 192 iget-object v0, p0, Landroid/support/v7/graphics/drawable/DrawableContainer;->mDrawableContainerState:Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState; @@ -1793,8 +1853,6 @@ iput-boolean v1, v0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mHasTintMode:Z .line 193 - iget-object v0, p0, Landroid/support/v7/graphics/drawable/DrawableContainer;->mDrawableContainerState:Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState; - iget-object v0, v0, Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;->mTintMode:Landroid/graphics/PorterDuff$Mode; if-eq v0, p1, :cond_0 @@ -1844,6 +1902,14 @@ .method public unscheduleDrawable(Landroid/graphics/drawable/Drawable;Ljava/lang/Runnable;)V .locals 1 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/Runnable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 389 iget-object v0, p0, Landroid/support/v7/graphics/drawable/DrawableContainer;->mCurrDrawable:Landroid/graphics/drawable/Drawable; diff --git a/smali/android/support/v7/graphics/drawable/DrawableWrapper.smali b/smali/android/support/v7/graphics/drawable/DrawableWrapper.smali index 5a6e45b2..970efab4 100644 --- a/smali/android/support/v7/graphics/drawable/DrawableWrapper.smali +++ b/smali/android/support/v7/graphics/drawable/DrawableWrapper.smali @@ -6,6 +6,14 @@ .implements Landroid/graphics/drawable/Drawable$Callback; +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # instance fields .field private mDrawable:Landroid/graphics/drawable/Drawable; diff --git a/smali/android/support/v7/graphics/drawable/DrawerArrowDrawable$ArrowDirection.smali b/smali/android/support/v7/graphics/drawable/DrawerArrowDrawable$ArrowDirection.smali index 1df327ff..ea6b684e 100644 --- a/smali/android/support/v7/graphics/drawable/DrawerArrowDrawable$ArrowDirection.smali +++ b/smali/android/support/v7/graphics/drawable/DrawerArrowDrawable$ArrowDirection.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v7/graphics/drawable/DrawerArrowDrawable; .end annotation diff --git a/smali/android/support/v7/graphics/drawable/DrawerArrowDrawable.smali b/smali/android/support/v7/graphics/drawable/DrawerArrowDrawable.smali index 56ae40b4..c4395ab1 100644 --- a/smali/android/support/v7/graphics/drawable/DrawerArrowDrawable.smali +++ b/smali/android/support/v7/graphics/drawable/DrawerArrowDrawable.smali @@ -81,48 +81,56 @@ iput-object v0, p0, Landroid/support/v7/graphics/drawable/DrawerArrowDrawable;->mPaint:Landroid/graphics/Paint; .line 113 - new-instance v1, Landroid/graphics/Path; + new-instance v0, Landroid/graphics/Path; - invoke-direct {v1}, Landroid/graphics/Path;->()V + invoke-direct {v0}, Landroid/graphics/Path;->()V - iput-object v1, p0, Landroid/support/v7/graphics/drawable/DrawerArrowDrawable;->mPath:Landroid/graphics/Path; + iput-object v0, p0, Landroid/support/v7/graphics/drawable/DrawerArrowDrawable;->mPath:Landroid/graphics/Path; - const/4 v1, 0x0 + const/4 v0, 0x0 .line 117 - iput-boolean v1, p0, Landroid/support/v7/graphics/drawable/DrawerArrowDrawable;->mVerticalMirror:Z + iput-boolean v0, p0, Landroid/support/v7/graphics/drawable/DrawerArrowDrawable;->mVerticalMirror:Z - const/4 v2, 0x2 + const/4 v1, 0x2 .line 123 - iput v2, p0, Landroid/support/v7/graphics/drawable/DrawerArrowDrawable;->mDirection:I + iput v1, p0, Landroid/support/v7/graphics/drawable/DrawerArrowDrawable;->mDirection:I .line 129 + iget-object v1, p0, Landroid/support/v7/graphics/drawable/DrawerArrowDrawable;->mPaint:Landroid/graphics/Paint; + sget-object v2, Landroid/graphics/Paint$Style;->STROKE:Landroid/graphics/Paint$Style; - invoke-virtual {v0, v2}, Landroid/graphics/Paint;->setStyle(Landroid/graphics/Paint$Style;)V + invoke-virtual {v1, v2}, Landroid/graphics/Paint;->setStyle(Landroid/graphics/Paint$Style;)V .line 130 + iget-object v1, p0, Landroid/support/v7/graphics/drawable/DrawerArrowDrawable;->mPaint:Landroid/graphics/Paint; + sget-object v2, Landroid/graphics/Paint$Join;->MITER:Landroid/graphics/Paint$Join; - invoke-virtual {v0, v2}, Landroid/graphics/Paint;->setStrokeJoin(Landroid/graphics/Paint$Join;)V + invoke-virtual {v1, v2}, Landroid/graphics/Paint;->setStrokeJoin(Landroid/graphics/Paint$Join;)V .line 131 + iget-object v1, p0, Landroid/support/v7/graphics/drawable/DrawerArrowDrawable;->mPaint:Landroid/graphics/Paint; + sget-object v2, Landroid/graphics/Paint$Cap;->BUTT:Landroid/graphics/Paint$Cap; - invoke-virtual {v0, v2}, Landroid/graphics/Paint;->setStrokeCap(Landroid/graphics/Paint$Cap;)V + invoke-virtual {v1, v2}, Landroid/graphics/Paint;->setStrokeCap(Landroid/graphics/Paint$Cap;)V + + .line 132 + iget-object v1, p0, Landroid/support/v7/graphics/drawable/DrawerArrowDrawable;->mPaint:Landroid/graphics/Paint; const/4 v2, 0x1 - .line 132 - invoke-virtual {v0, v2}, Landroid/graphics/Paint;->setAntiAlias(Z)V + invoke-virtual {v1, v2}, Landroid/graphics/Paint;->setAntiAlias(Z)V .line 134 invoke-virtual {p1}, Landroid/content/Context;->getTheme()Landroid/content/res/Resources$Theme; move-result-object p1 - sget-object v0, Landroid/support/v7/appcompat/R$styleable;->DrawerArrowToggle:[I + sget-object v1, Landroid/support/v7/appcompat/R$styleable;->DrawerArrowToggle:[I sget v3, Landroid/support/v7/appcompat/R$attr;->drawerArrowStyle:I @@ -130,58 +138,58 @@ const/4 v5, 0x0 - invoke-virtual {p1, v5, v0, v3, v4}, Landroid/content/res/Resources$Theme;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray; + invoke-virtual {p1, v5, v1, v3, v4}, Landroid/content/res/Resources$Theme;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray; move-result-object p1 .line 138 - sget v0, Landroid/support/v7/appcompat/R$styleable;->DrawerArrowToggle_color:I + sget v1, Landroid/support/v7/appcompat/R$styleable;->DrawerArrowToggle_color:I - invoke-virtual {p1, v0, v1}, Landroid/content/res/TypedArray;->getColor(II)I + invoke-virtual {p1, v1, v0}, Landroid/content/res/TypedArray;->getColor(II)I - move-result v0 + move-result v1 - invoke-virtual {p0, v0}, Landroid/support/v7/graphics/drawable/DrawerArrowDrawable;->setColor(I)V + invoke-virtual {p0, v1}, Landroid/support/v7/graphics/drawable/DrawerArrowDrawable;->setColor(I)V .line 139 - sget v0, Landroid/support/v7/appcompat/R$styleable;->DrawerArrowToggle_thickness:I + sget v1, Landroid/support/v7/appcompat/R$styleable;->DrawerArrowToggle_thickness:I const/4 v3, 0x0 - invoke-virtual {p1, v0, v3}, Landroid/content/res/TypedArray;->getDimension(IF)F + invoke-virtual {p1, v1, v3}, Landroid/content/res/TypedArray;->getDimension(IF)F - move-result v0 + move-result v1 - invoke-virtual {p0, v0}, Landroid/support/v7/graphics/drawable/DrawerArrowDrawable;->setBarThickness(F)V + invoke-virtual {p0, v1}, Landroid/support/v7/graphics/drawable/DrawerArrowDrawable;->setBarThickness(F)V .line 140 - sget v0, Landroid/support/v7/appcompat/R$styleable;->DrawerArrowToggle_spinBars:I + sget v1, Landroid/support/v7/appcompat/R$styleable;->DrawerArrowToggle_spinBars:I - invoke-virtual {p1, v0, v2}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z + invoke-virtual {p1, v1, v2}, Landroid/content/res/TypedArray;->getBoolean(IZ)Z - move-result v0 + move-result v1 - invoke-virtual {p0, v0}, Landroid/support/v7/graphics/drawable/DrawerArrowDrawable;->setSpinEnabled(Z)V + invoke-virtual {p0, v1}, Landroid/support/v7/graphics/drawable/DrawerArrowDrawable;->setSpinEnabled(Z)V .line 142 - sget v0, Landroid/support/v7/appcompat/R$styleable;->DrawerArrowToggle_gapBetweenBars:I + sget v1, Landroid/support/v7/appcompat/R$styleable;->DrawerArrowToggle_gapBetweenBars:I - invoke-virtual {p1, v0, v3}, Landroid/content/res/TypedArray;->getDimension(IF)F + invoke-virtual {p1, v1, v3}, Landroid/content/res/TypedArray;->getDimension(IF)F - move-result v0 + move-result v1 - invoke-static {v0}, Ljava/lang/Math;->round(F)I + invoke-static {v1}, Ljava/lang/Math;->round(F)I - move-result v0 + move-result v1 - int-to-float v0, v0 + int-to-float v1, v1 - invoke-virtual {p0, v0}, Landroid/support/v7/graphics/drawable/DrawerArrowDrawable;->setGapSize(F)V + invoke-virtual {p0, v1}, Landroid/support/v7/graphics/drawable/DrawerArrowDrawable;->setGapSize(F)V .line 144 - sget v0, Landroid/support/v7/appcompat/R$styleable;->DrawerArrowToggle_drawableSize:I + sget v1, Landroid/support/v7/appcompat/R$styleable;->DrawerArrowToggle_drawableSize:I - invoke-virtual {p1, v0, v1}, Landroid/content/res/TypedArray;->getDimensionPixelSize(II)I + invoke-virtual {p1, v1, v0}, Landroid/content/res/TypedArray;->getDimensionPixelSize(II)I move-result v0 @@ -648,6 +656,8 @@ .method public getColor()I .locals 1 + .annotation build Landroid/support/annotation/ColorInt; + .end annotation .line 227 iget-object v0, p0, Landroid/support/v7/graphics/drawable/DrawerArrowDrawable;->mPaint:Landroid/graphics/Paint; @@ -714,6 +724,10 @@ .method public getProgress()F .locals 1 + .annotation build Landroid/support/annotation/FloatRange; + from = 0.0 + to = 1.0 + .end annotation .line 437 iget v0, p0, Landroid/support/v7/graphics/drawable/DrawerArrowDrawable;->mProgress:F @@ -865,6 +879,10 @@ .method public setColor(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param .line 216 iget-object v0, p0, Landroid/support/v7/graphics/drawable/DrawerArrowDrawable;->mPaint:Landroid/graphics/Paint; @@ -941,6 +959,12 @@ .method public setProgress(F)V .locals 1 + .param p1 # F + .annotation build Landroid/support/annotation/FloatRange; + from = 0.0 + to = 1.0 + .end annotation + .end param .line 448 iget v0, p0, Landroid/support/v7/graphics/drawable/DrawerArrowDrawable;->mProgress:F diff --git a/smali/android/support/v7/graphics/drawable/StateListDrawable$StateListState.smali b/smali/android/support/v7/graphics/drawable/StateListDrawable$StateListState.smali index 8d73e221..cf1e71aa 100644 --- a/smali/android/support/v7/graphics/drawable/StateListDrawable$StateListState.smali +++ b/smali/android/support/v7/graphics/drawable/StateListDrawable$StateListState.smali @@ -127,7 +127,7 @@ .end method .method mutate()V - .locals 3 + .locals 4 .line 341 iget-object v0, p0, Landroid/support/v7/graphics/drawable/StateListDrawable$StateListState;->mStateSets:[[I @@ -147,9 +147,11 @@ .line 343 iget-object v2, p0, Landroid/support/v7/graphics/drawable/StateListDrawable$StateListState;->mStateSets:[[I - aget-object v2, v2, v0 + aget-object v3, v2, v0 - if-eqz v2, :cond_0 + if-eqz v3, :cond_0 + + aget-object v2, v2, v0 invoke-virtual {v2}, [I->clone()Ljava/lang/Object; @@ -178,6 +180,8 @@ .method public newDrawable()Landroid/graphics/drawable/Drawable; .locals 2 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 368 new-instance v0, Landroid/support/v7/graphics/drawable/StateListDrawable; @@ -191,6 +195,8 @@ .method public newDrawable(Landroid/content/res/Resources;)Landroid/graphics/drawable/Drawable; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 374 new-instance v0, Landroid/support/v7/graphics/drawable/StateListDrawable; diff --git a/smali/android/support/v7/graphics/drawable/StateListDrawable.smali b/smali/android/support/v7/graphics/drawable/StateListDrawable.smali index 083e53c1..1306a716 100644 --- a/smali/android/support/v7/graphics/drawable/StateListDrawable.smali +++ b/smali/android/support/v7/graphics/drawable/StateListDrawable.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v7/graphics/drawable/StateListDrawable$StateListState; @@ -37,6 +43,10 @@ .method constructor (Landroid/support/v7/graphics/drawable/StateListDrawable$StateListState;)V .locals 0 + .param p1 # Landroid/support/v7/graphics/drawable/StateListDrawable$StateListState; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 412 invoke-direct {p0}, Landroid/support/v7/graphics/drawable/DrawableContainer;->()V @@ -364,6 +374,13 @@ .method public applyTheme(Landroid/content/res/Resources$Theme;)V .locals 0 + .param p1 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x15 + .end annotation .line 389 invoke-super {p0, p1}, Landroid/support/v7/graphics/drawable/DrawableContainer;->applyTheme(Landroid/content/res/Resources$Theme;)V @@ -549,6 +566,26 @@ .method public inflate(Landroid/content/Context;Landroid/content/res/Resources;Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/content/res/Resources$Theme;)V .locals 3 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Lorg/xmlpull/v1/XmlPullParser; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p5 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Lorg/xmlpull/v1/XmlPullParserException;, @@ -606,6 +643,8 @@ .method public mutate()Landroid/graphics/drawable/Drawable; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 308 iget-boolean v0, p0, Landroid/support/v7/graphics/drawable/StateListDrawable;->mMutated:Z @@ -685,6 +724,10 @@ .method protected setConstantState(Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;)V .locals 1 + .param p1 # Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 395 invoke-super {p0, p1}, Landroid/support/v7/graphics/drawable/DrawableContainer;->setConstantState(Landroid/support/v7/graphics/drawable/DrawableContainer$DrawableContainerState;)V diff --git a/smali/android/support/v7/text/AllCapsTransformationMethod.smali b/smali/android/support/v7/text/AllCapsTransformationMethod.smali index 6d5fbaed..8091be8e 100644 --- a/smali/android/support/v7/text/AllCapsTransformationMethod.smali +++ b/smali/android/support/v7/text/AllCapsTransformationMethod.smali @@ -6,6 +6,14 @@ .implements Landroid/text/method/TransformationMethod; +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # instance fields .field private mLocale:Ljava/util/Locale; diff --git a/smali/android/support/v7/view/ActionBarPolicy.smali b/smali/android/support/v7/view/ActionBarPolicy.smali index 58b56aab..9d3bdcd6 100644 --- a/smali/android/support/v7/view/ActionBarPolicy.smali +++ b/smali/android/support/v7/view/ActionBarPolicy.smali @@ -3,6 +3,14 @@ .source "ActionBarPolicy.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # instance fields .field private mContext:Landroid/content/Context; @@ -205,14 +213,14 @@ const/4 v4, 0x0 - invoke-virtual {v0, v3, v1, v2, v4}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray; + invoke-virtual {v0, v4, v1, v2, v3}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray; move-result-object v0 .line 96 sget v1, Landroid/support/v7/appcompat/R$styleable;->ActionBar_height:I - invoke-virtual {v0, v1, v4}, Landroid/content/res/TypedArray;->getLayoutDimension(II)I + invoke-virtual {v0, v1, v3}, Landroid/content/res/TypedArray;->getLayoutDimension(II)I move-result v1 diff --git a/smali/android/support/v7/view/ActionMode.smali b/smali/android/support/v7/view/ActionMode.smali index 6326ee63..80f81520 100644 --- a/smali/android/support/v7/view/ActionMode.smali +++ b/smali/android/support/v7/view/ActionMode.smali @@ -78,6 +78,11 @@ .method public isUiFocusable()Z .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation const/4 v0, 0x1 diff --git a/smali/android/support/v7/view/ContextThemeWrapper.smali b/smali/android/support/v7/view/ContextThemeWrapper.smali index 613bee62..9d1d1447 100644 --- a/smali/android/support/v7/view/ContextThemeWrapper.smali +++ b/smali/android/support/v7/view/ContextThemeWrapper.smali @@ -29,6 +29,10 @@ .method public constructor (Landroid/content/Context;I)V .locals 0 + .param p2 # I + .annotation build Landroid/support/annotation/StyleRes; + .end annotation + .end param .line 63 invoke-direct {p0, p1}, Landroid/content/ContextWrapper;->(Landroid/content/Context;)V diff --git a/smali/android/support/v7/view/StandaloneActionMode.smali b/smali/android/support/v7/view/StandaloneActionMode.smali index 82e3e572..5cac1441 100644 --- a/smali/android/support/v7/view/StandaloneActionMode.smali +++ b/smali/android/support/v7/view/StandaloneActionMode.smali @@ -6,6 +6,14 @@ .implements Landroid/support/v7/view/menu/MenuBuilder$Callback; +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # instance fields .field private mCallback:Landroid/support/v7/view/ActionMode$Callback; @@ -64,6 +72,8 @@ iput-object p1, p0, Landroid/support/v7/view/StandaloneActionMode;->mMenu:Landroid/support/v7/view/menu/MenuBuilder; .line 57 + iget-object p1, p0, Landroid/support/v7/view/StandaloneActionMode;->mMenu:Landroid/support/v7/view/menu/MenuBuilder; + invoke-virtual {p1, p0}, Landroid/support/v7/view/menu/MenuBuilder;->setCallback(Landroid/support/v7/view/menu/MenuBuilder$Callback;)V .line 58 diff --git a/smali/android/support/v7/view/SupportActionModeWrapper$CallbackWrapper.smali b/smali/android/support/v7/view/SupportActionModeWrapper$CallbackWrapper.smali index 90d1671c..0320370a 100644 --- a/smali/android/support/v7/view/SupportActionModeWrapper$CallbackWrapper.smali +++ b/smali/android/support/v7/view/SupportActionModeWrapper$CallbackWrapper.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v7/view/SupportActionModeWrapper; .end annotation diff --git a/smali/android/support/v7/view/SupportActionModeWrapper.smali b/smali/android/support/v7/view/SupportActionModeWrapper.smali index e41dbd5f..2b97f899 100644 --- a/smali/android/support/v7/view/SupportActionModeWrapper.smali +++ b/smali/android/support/v7/view/SupportActionModeWrapper.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v7/view/SupportActionModeWrapper$CallbackWrapper; diff --git a/smali/android/support/v7/view/SupportMenuInflater$InflatedOnMenuItemClickListener.smali b/smali/android/support/v7/view/SupportMenuInflater$InflatedOnMenuItemClickListener.smali index 43c4a385..1efef993 100644 --- a/smali/android/support/v7/view/SupportMenuInflater$InflatedOnMenuItemClickListener.smali +++ b/smali/android/support/v7/view/SupportMenuInflater$InflatedOnMenuItemClickListener.smali @@ -41,14 +41,14 @@ const/4 v0, 0x1 + .line 241 new-array v0, v0, [Ljava/lang/Class; - const/4 v1, 0x0 + const-class v1, Landroid/view/MenuItem; - .line 241 - const-class v2, Landroid/view/MenuItem; + const/4 v2, 0x0 - aput-object v2, v0, v1 + aput-object v1, v0, v2 sput-object v0, Landroid/support/v7/view/SupportMenuInflater$InflatedOnMenuItemClickListener;->PARAM_TYPES:[Ljava/lang/Class; diff --git a/smali/android/support/v7/view/SupportMenuInflater$MenuState.smali b/smali/android/support/v7/view/SupportMenuInflater$MenuState.smali index 406b75c4..22b72234 100644 --- a/smali/android/support/v7/view/SupportMenuInflater$MenuState.smali +++ b/smali/android/support/v7/view/SupportMenuInflater$MenuState.smali @@ -862,37 +862,42 @@ iput-object v0, p0, Landroid/support/v7/view/SupportMenuInflater$MenuState;->itemActionProviderClassName:Ljava/lang/String; + .line 421 + iget-object v0, p0, Landroid/support/v7/view/SupportMenuInflater$MenuState;->itemActionProviderClassName:Ljava/lang/String; + if-eqz v0, :cond_1 - const/4 v3, 0x1 + const/4 v0, 0x1 goto :goto_1 :cond_1 - const/4 v3, 0x0 + const/4 v0, 0x0 :goto_1 - const/4 v4, 0x0 + const/4 v3, 0x0 - if-eqz v3, :cond_2 + if-eqz v0, :cond_2 .line 422 - iget v5, p0, Landroid/support/v7/view/SupportMenuInflater$MenuState;->itemActionViewLayout:I + iget v4, p0, Landroid/support/v7/view/SupportMenuInflater$MenuState;->itemActionViewLayout:I - if-nez v5, :cond_2 + if-nez v4, :cond_2 - iget-object v5, p0, Landroid/support/v7/view/SupportMenuInflater$MenuState;->itemActionViewClassName:Ljava/lang/String; + iget-object v4, p0, Landroid/support/v7/view/SupportMenuInflater$MenuState;->itemActionViewClassName:Ljava/lang/String; - if-nez v5, :cond_2 + if-nez v4, :cond_2 .line 423 - sget-object v3, Landroid/support/v7/view/SupportMenuInflater;->ACTION_PROVIDER_CONSTRUCTOR_SIGNATURE:[Ljava/lang/Class; + iget-object v0, p0, Landroid/support/v7/view/SupportMenuInflater$MenuState;->itemActionProviderClassName:Ljava/lang/String; + + sget-object v4, Landroid/support/v7/view/SupportMenuInflater;->ACTION_PROVIDER_CONSTRUCTOR_SIGNATURE:[Ljava/lang/Class; iget-object v5, p0, Landroid/support/v7/view/SupportMenuInflater$MenuState;->this$0:Landroid/support/v7/view/SupportMenuInflater; iget-object v5, v5, Landroid/support/v7/view/SupportMenuInflater;->mActionProviderConstructorArguments:[Ljava/lang/Object; - invoke-direct {p0, v0, v3, v5}, Landroid/support/v7/view/SupportMenuInflater$MenuState;->newInstance(Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object; + invoke-direct {p0, v0, v4, v5}, Landroid/support/v7/view/SupportMenuInflater$MenuState;->newInstance(Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;)Ljava/lang/Object; move-result-object v0 @@ -903,18 +908,18 @@ goto :goto_2 :cond_2 - if-eqz v3, :cond_3 + if-eqz v0, :cond_3 const-string v0, "SupportMenuInflater" - const-string v3, "Ignoring attribute \'actionProviderClass\'. Action view already specified." + const-string v4, "Ignoring attribute \'actionProviderClass\'. Action view already specified." .line 428 - invoke-static {v0, v3}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I + invoke-static {v0, v4}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I .line 431 :cond_3 - iput-object v4, p0, Landroid/support/v7/view/SupportMenuInflater$MenuState;->itemActionProvider:Landroid/support/v4/view/ActionProvider; + iput-object v3, p0, Landroid/support/v7/view/SupportMenuInflater$MenuState;->itemActionProvider:Landroid/support/v4/view/ActionProvider; .line 434 :goto_2 @@ -963,7 +968,7 @@ .line 442 :cond_4 - iput-object v4, p0, Landroid/support/v7/view/SupportMenuInflater$MenuState;->itemIconTintMode:Landroid/graphics/PorterDuff$Mode; + iput-object v3, p0, Landroid/support/v7/view/SupportMenuInflater$MenuState;->itemIconTintMode:Landroid/graphics/PorterDuff$Mode; .line 444 :goto_3 @@ -988,7 +993,7 @@ .line 448 :cond_5 - iput-object v4, p0, Landroid/support/v7/view/SupportMenuInflater$MenuState;->itemIconTintList:Landroid/content/res/ColorStateList; + iput-object v3, p0, Landroid/support/v7/view/SupportMenuInflater$MenuState;->itemIconTintList:Landroid/content/res/ColorStateList; .line 451 :goto_4 diff --git a/smali/android/support/v7/view/SupportMenuInflater.smali b/smali/android/support/v7/view/SupportMenuInflater.smali index 4e960aae..12b9af67 100644 --- a/smali/android/support/v7/view/SupportMenuInflater.smali +++ b/smali/android/support/v7/view/SupportMenuInflater.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v7/view/SupportMenuInflater$MenuState;, @@ -60,18 +66,20 @@ const/4 v0, 0x1 + .line 82 new-array v0, v0, [Ljava/lang/Class; - const/4 v1, 0x0 + const-class v1, Landroid/content/Context; - .line 82 - const-class v2, Landroid/content/Context; + const/4 v2, 0x0 - aput-object v2, v0, v1 + aput-object v1, v0, v2 sput-object v0, Landroid/support/v7/view/SupportMenuInflater;->ACTION_VIEW_CONSTRUCTOR_SIGNATURE:[Ljava/lang/Class; .line 84 + sget-object v0, Landroid/support/v7/view/SupportMenuInflater;->ACTION_VIEW_CONSTRUCTOR_SIGNATURE:[Ljava/lang/Class; + sput-object v0, Landroid/support/v7/view/SupportMenuInflater;->ACTION_PROVIDER_CONSTRUCTOR_SIGNATURE:[Ljava/lang/Class; return-void @@ -88,17 +96,19 @@ const/4 v0, 0x1 + .line 102 new-array v0, v0, [Ljava/lang/Object; const/4 v1, 0x0 aput-object p1, v0, v1 - .line 102 iput-object v0, p0, Landroid/support/v7/view/SupportMenuInflater;->mActionViewConstructorArguments:[Ljava/lang/Object; .line 103 - iput-object v0, p0, Landroid/support/v7/view/SupportMenuInflater;->mActionProviderConstructorArguments:[Ljava/lang/Object; + iget-object p1, p0, Landroid/support/v7/view/SupportMenuInflater;->mActionViewConstructorArguments:[Ljava/lang/Object; + + iput-object p1, p0, Landroid/support/v7/view/SupportMenuInflater;->mActionProviderConstructorArguments:[Ljava/lang/Object; return-void .end method @@ -216,26 +226,28 @@ const/4 v5, 0x0 + move v6, p3 + move-object v8, v4 - const/4 v6, 0x0 + const/4 p3, 0x0 const/4 v7, 0x0 :goto_1 - if-nez v6, :cond_f + if-nez p3, :cond_f - if-eq p3, v3, :cond_e + if-eq v6, v3, :cond_e const-string v9, "item" const-string v10, "group" - if-eq p3, v1, :cond_8 + if-eq v6, v1, :cond_8 const/4 v11, 0x3 - if-eq p3, v11, :cond_3 + if-eq v6, v11, :cond_3 goto/16 :goto_2 @@ -243,12 +255,12 @@ :cond_3 invoke-interface {p1}, Lorg/xmlpull/v1/XmlPullParser;->getName()Ljava/lang/String; - move-result-object p3 + move-result-object v6 if-eqz v7, :cond_4 .line 193 - invoke-virtual {p3, v8}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v6, v8}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v11 @@ -262,7 +274,7 @@ .line 196 :cond_4 - invoke-virtual {p3, v10}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v6, v10}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v10 @@ -275,7 +287,7 @@ .line 198 :cond_5 - invoke-virtual {p3, v9}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v6, v9}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v9 @@ -284,23 +296,23 @@ .line 201 invoke-virtual {v0}, Landroid/support/v7/view/SupportMenuInflater$MenuState;->hasAddedItem()Z - move-result p3 + move-result v6 - if-nez p3, :cond_d + if-nez v6, :cond_d .line 202 - iget-object p3, v0, Landroid/support/v7/view/SupportMenuInflater$MenuState;->itemActionProvider:Landroid/support/v4/view/ActionProvider; + iget-object v6, v0, Landroid/support/v7/view/SupportMenuInflater$MenuState;->itemActionProvider:Landroid/support/v4/view/ActionProvider; - if-eqz p3, :cond_6 + if-eqz v6, :cond_6 - iget-object p3, v0, Landroid/support/v7/view/SupportMenuInflater$MenuState;->itemActionProvider:Landroid/support/v4/view/ActionProvider; + iget-object v6, v0, Landroid/support/v7/view/SupportMenuInflater$MenuState;->itemActionProvider:Landroid/support/v4/view/ActionProvider; .line 203 - invoke-virtual {p3}, Landroid/support/v4/view/ActionProvider;->hasSubMenu()Z + invoke-virtual {v6}, Landroid/support/v4/view/ActionProvider;->hasSubMenu()Z - move-result p3 + move-result v6 - if-eqz p3, :cond_6 + if-eqz v6, :cond_6 .line 204 invoke-virtual {v0}, Landroid/support/v7/view/SupportMenuInflater$MenuState;->addSubMenuItem()Landroid/view/SubMenu; @@ -315,13 +327,13 @@ .line 209 :cond_7 - invoke-virtual {p3, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v6, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z - move-result p3 + move-result v6 - if-eqz p3, :cond_d + if-eqz v6, :cond_d - const/4 v6, 0x1 + const/4 p3, 0x1 goto :goto_2 @@ -334,10 +346,10 @@ :cond_9 invoke-interface {p1}, Lorg/xmlpull/v1/XmlPullParser;->getName()Ljava/lang/String; - move-result-object p3 + move-result-object v6 .line 175 - invoke-virtual {p3, v10}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v6, v10}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v10 @@ -350,7 +362,7 @@ .line 177 :cond_a - invoke-virtual {p3, v9}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v6, v9}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v9 @@ -363,7 +375,7 @@ .line 179 :cond_b - invoke-virtual {p3, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v6, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v9 @@ -372,15 +384,15 @@ .line 181 invoke-virtual {v0}, Landroid/support/v7/view/SupportMenuInflater$MenuState;->addSubMenuItem()Landroid/view/SubMenu; - move-result-object p3 + move-result-object v6 .line 184 - invoke-direct {p0, p1, p2, p3}, Landroid/support/v7/view/SupportMenuInflater;->parseMenu(Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/view/Menu;)V + invoke-direct {p0, p1, p2, v6}, Landroid/support/v7/view/SupportMenuInflater;->parseMenu(Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/view/Menu;)V goto :goto_2 :cond_c - move-object v8, p3 + move-object v8, v6 const/4 v7, 0x1 @@ -389,7 +401,7 @@ :goto_2 invoke-interface {p1}, Lorg/xmlpull/v1/XmlPullParser;->next()I - move-result p3 + move-result v6 goto :goto_1 @@ -435,6 +447,10 @@ .method public inflate(ILandroid/view/Menu;)V .locals 3 + .param p1 # I + .annotation build Landroid/support/annotation/LayoutRes; + .end annotation + .end param const-string v0, "Error inflating menu XML" diff --git a/smali/android/support/v7/view/ViewPropertyAnimatorCompatSet.smali b/smali/android/support/v7/view/ViewPropertyAnimatorCompatSet.smali index 500070c4..02e9b26c 100644 --- a/smali/android/support/v7/view/ViewPropertyAnimatorCompatSet.smali +++ b/smali/android/support/v7/view/ViewPropertyAnimatorCompatSet.smali @@ -3,6 +3,14 @@ .source "ViewPropertyAnimatorCompatSet.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # instance fields .field final mAnimators:Ljava/util/ArrayList; .annotation system Ldalvik/annotation/Signature; diff --git a/smali/android/support/v7/view/WindowCallbackWrapper.smali b/smali/android/support/v7/view/WindowCallbackWrapper.smali index 4c85e2e3..25d8b32e 100644 --- a/smali/android/support/v7/view/WindowCallbackWrapper.smali +++ b/smali/android/support/v7/view/WindowCallbackWrapper.smali @@ -6,6 +6,14 @@ .implements Landroid/view/Window$Callback; +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # instance fields .field final mWrapped:Landroid/view/Window$Callback; @@ -235,6 +243,9 @@ .method public onPointerCaptureChanged(Z)V .locals 1 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x1a + .end annotation .line 184 iget-object v0, p0, Landroid/support/v7/view/WindowCallbackWrapper;->mWrapped:Landroid/view/Window$Callback; @@ -259,6 +270,10 @@ .method public onProvideKeyboardShortcuts(Ljava/util/List;Landroid/view/Menu;I)V .locals 1 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x18 + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -293,6 +308,9 @@ .method public onSearchRequested(Landroid/view/SearchEvent;)Z .locals 1 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x17 + .end annotation .line 145 iget-object v0, p0, Landroid/support/v7/view/WindowCallbackWrapper;->mWrapped:Landroid/view/Window$Callback; @@ -341,6 +359,9 @@ .method public onWindowStartingActionMode(Landroid/view/ActionMode$Callback;I)Landroid/view/ActionMode; .locals 1 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x17 + .end annotation .line 161 iget-object v0, p0, Landroid/support/v7/view/WindowCallbackWrapper;->mWrapped:Landroid/view/Window$Callback; diff --git a/smali/android/support/v7/view/menu/ActionMenuItem.smali b/smali/android/support/v7/view/menu/ActionMenuItem.smali index f5b0c3ba..66c620d2 100644 --- a/smali/android/support/v7/view/menu/ActionMenuItem.smali +++ b/smali/android/support/v7/view/menu/ActionMenuItem.smali @@ -6,6 +6,14 @@ .implements Landroid/support/v4/internal/view/SupportMenuItem; +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field private static final CHECKABLE:I = 0x1 @@ -134,16 +142,18 @@ if-eqz v0, :cond_2 - iget-boolean v1, p0, Landroid/support/v7/view/menu/ActionMenuItem;->mHasIconTint:Z + iget-boolean v0, p0, Landroid/support/v7/view/menu/ActionMenuItem;->mHasIconTint:Z - if-nez v1, :cond_0 + if-nez v0, :cond_0 - iget-boolean v1, p0, Landroid/support/v7/view/menu/ActionMenuItem;->mHasIconTintMode:Z + iget-boolean v0, p0, Landroid/support/v7/view/menu/ActionMenuItem;->mHasIconTintMode:Z - if-eqz v1, :cond_2 + if-eqz v0, :cond_2 .line 435 :cond_0 + iget-object v0, p0, Landroid/support/v7/view/menu/ActionMenuItem;->mIconDrawable:Landroid/graphics/drawable/Drawable; + invoke-static {v0}, Landroid/support/v4/graphics/drawable/DrawableCompat;->wrap(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; move-result-object v0 @@ -151,6 +161,8 @@ iput-object v0, p0, Landroid/support/v7/view/menu/ActionMenuItem;->mIconDrawable:Landroid/graphics/drawable/Drawable; .line 436 + iget-object v0, p0, Landroid/support/v7/view/menu/ActionMenuItem;->mIconDrawable:Landroid/graphics/drawable/Drawable; + invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->mutate()Landroid/graphics/drawable/Drawable; move-result-object v0 @@ -158,11 +170,13 @@ iput-object v0, p0, Landroid/support/v7/view/menu/ActionMenuItem;->mIconDrawable:Landroid/graphics/drawable/Drawable; .line 438 - iget-boolean v1, p0, Landroid/support/v7/view/menu/ActionMenuItem;->mHasIconTint:Z + iget-boolean v0, p0, Landroid/support/v7/view/menu/ActionMenuItem;->mHasIconTint:Z - if-eqz v1, :cond_1 + if-eqz v0, :cond_1 .line 439 + iget-object v0, p0, Landroid/support/v7/view/menu/ActionMenuItem;->mIconDrawable:Landroid/graphics/drawable/Drawable; + iget-object v1, p0, Landroid/support/v7/view/menu/ActionMenuItem;->mIconTintList:Landroid/content/res/ColorStateList; invoke-static {v0, v1}, Landroid/support/v4/graphics/drawable/DrawableCompat;->setTintList(Landroid/graphics/drawable/Drawable;Landroid/content/res/ColorStateList;)V @@ -763,6 +777,10 @@ .method public setIconTintList(Landroid/content/res/ColorStateList;)Landroid/view/MenuItem; .locals 0 + .param p1 # Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 405 iput-object p1, p0, Landroid/support/v7/view/menu/ActionMenuItem;->mIconTintList:Landroid/content/res/ColorStateList; diff --git a/smali/android/support/v7/view/menu/ActionMenuItemView.smali b/smali/android/support/v7/view/menu/ActionMenuItemView.smali index 9f8be94d..3ba549f3 100644 --- a/smali/android/support/v7/view/menu/ActionMenuItemView.smali +++ b/smali/android/support/v7/view/menu/ActionMenuItemView.smali @@ -9,6 +9,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v7/view/menu/ActionMenuItemView$PopupCallback;, @@ -773,7 +779,10 @@ move v0, v2 + .line 224 :cond_0 + iget v2, p0, Landroid/support/v7/view/menu/ActionMenuItemView;->mMaxIconSize:I + if-le v1, v2, :cond_1 int-to-float v3, v2 @@ -788,16 +797,13 @@ float-to-int v0, v0 - goto :goto_0 + move v1, v2 :cond_1 - move v2, v1 - - :goto_0 - const/4 v1, 0x0 + const/4 v2, 0x0 .line 229 - invoke-virtual {p1, v1, v1, v0, v2}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V + invoke-virtual {p1, v2, v2, v0, v1}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V :cond_2 const/4 v0, 0x0 diff --git a/smali/android/support/v7/view/menu/BaseMenuPresenter.smali b/smali/android/support/v7/view/menu/BaseMenuPresenter.smali index af727d15..cdfb7a60 100644 --- a/smali/android/support/v7/view/menu/BaseMenuPresenter.smali +++ b/smali/android/support/v7/view/menu/BaseMenuPresenter.smali @@ -6,6 +6,14 @@ .implements Landroid/support/v7/view/menu/MenuPresenter; +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # instance fields .field private mCallback:Landroid/support/v7/view/menu/MenuPresenter$Callback; @@ -210,6 +218,8 @@ iput-object p1, p0, Landroid/support/v7/view/menu/BaseMenuPresenter;->mMenuView:Landroid/support/v7/view/menu/MenuView; .line 79 + iget-object p1, p0, Landroid/support/v7/view/menu/BaseMenuPresenter;->mMenuView:Landroid/support/v7/view/menu/MenuView; + iget-object v0, p0, Landroid/support/v7/view/menu/BaseMenuPresenter;->mMenu:Landroid/support/v7/view/menu/MenuBuilder; invoke-interface {p1, v0}, Landroid/support/v7/view/menu/MenuView;->initialize(Landroid/support/v7/view/menu/MenuBuilder;)V @@ -233,6 +243,8 @@ iput-object p1, p0, Landroid/support/v7/view/menu/BaseMenuPresenter;->mContext:Landroid/content/Context; .line 71 + iget-object p1, p0, Landroid/support/v7/view/menu/BaseMenuPresenter;->mContext:Landroid/content/Context; + invoke-static {p1}, Landroid/view/LayoutInflater;->from(Landroid/content/Context;)Landroid/view/LayoutInflater; move-result-object p1 diff --git a/smali/android/support/v7/view/menu/CascadingMenuPopup$3.smali b/smali/android/support/v7/view/menu/CascadingMenuPopup$3.smali index 19b06915..4d456234 100644 --- a/smali/android/support/v7/view/menu/CascadingMenuPopup$3.smali +++ b/smali/android/support/v7/view/menu/CascadingMenuPopup$3.smali @@ -37,6 +37,14 @@ # virtual methods .method public onItemHoverEnter(Landroid/support/v7/view/menu/MenuBuilder;Landroid/view/MenuItem;)V .locals 5 + .param p1 # Landroid/support/v7/view/menu/MenuBuilder; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/MenuItem; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 150 iget-object v0, p0, Landroid/support/v7/view/menu/CascadingMenuPopup$3;->this$0:Landroid/support/v7/view/menu/CascadingMenuPopup; @@ -147,6 +155,14 @@ .method public onItemHoverExit(Landroid/support/v7/view/menu/MenuBuilder;Landroid/view/MenuItem;)V .locals 0 + .param p1 # Landroid/support/v7/view/menu/MenuBuilder; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/MenuItem; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 143 iget-object p2, p0, Landroid/support/v7/view/menu/CascadingMenuPopup$3;->this$0:Landroid/support/v7/view/menu/CascadingMenuPopup; diff --git a/smali/android/support/v7/view/menu/CascadingMenuPopup$CascadingMenuInfo.smali b/smali/android/support/v7/view/menu/CascadingMenuPopup$CascadingMenuInfo.smali index 742232f4..3c680c9e 100644 --- a/smali/android/support/v7/view/menu/CascadingMenuPopup$CascadingMenuInfo.smali +++ b/smali/android/support/v7/view/menu/CascadingMenuPopup$CascadingMenuInfo.smali @@ -25,6 +25,14 @@ # direct methods .method public constructor (Landroid/support/v7/widget/MenuPopupWindow;Landroid/support/v7/view/menu/MenuBuilder;I)V .locals 0 + .param p1 # Landroid/support/v7/widget/MenuPopupWindow; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v7/view/menu/MenuBuilder; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 800 invoke-direct {p0}, Ljava/lang/Object;->()V diff --git a/smali/android/support/v7/view/menu/CascadingMenuPopup.smali b/smali/android/support/v7/view/menu/CascadingMenuPopup.smali index a6504b3c..6b25fb4f 100644 --- a/smali/android/support/v7/view/menu/CascadingMenuPopup.smali +++ b/smali/android/support/v7/view/menu/CascadingMenuPopup.smali @@ -111,6 +111,22 @@ .method public constructor (Landroid/content/Context;Landroid/view/View;IIZ)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # I + .annotation build Landroid/support/annotation/AttrRes; + .end annotation + .end param + .param p4 # I + .annotation build Landroid/support/annotation/StyleRes; + .end annotation + .end param .line 222 invoke-direct {p0}, Landroid/support/v7/view/menu/MenuPopup;->()V @@ -273,6 +289,10 @@ .method private findIndexOfAddedMenu(Landroid/support/v7/view/menu/MenuBuilder;)I .locals 3 + .param p1 # Landroid/support/v7/view/menu/MenuBuilder; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 655 iget-object v0, p0, Landroid/support/v7/view/menu/CascadingMenuPopup;->mShowingMenus:Ljava/util/List; @@ -315,6 +335,14 @@ .method private findMenuItemForSubmenu(Landroid/support/v7/view/menu/MenuBuilder;Landroid/support/v7/view/menu/MenuBuilder;)Landroid/view/MenuItem; .locals 4 + .param p1 # Landroid/support/v7/view/menu/MenuBuilder; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v7/view/menu/MenuBuilder; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 516 invoke-virtual {p1}, Landroid/support/v7/view/menu/MenuBuilder;->size()I @@ -359,6 +387,16 @@ .method private findParentViewForSubmenu(Landroid/support/v7/view/menu/CascadingMenuPopup$CascadingMenuInfo;Landroid/support/v7/view/menu/MenuBuilder;)Landroid/view/View; .locals 7 + .param p1 # Landroid/support/v7/view/menu/CascadingMenuPopup$CascadingMenuInfo; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v7/view/menu/MenuBuilder; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 537 iget-object v0, p1, Landroid/support/v7/view/menu/CascadingMenuPopup$CascadingMenuInfo;->menu:Landroid/support/v7/view/menu/MenuBuilder; @@ -527,6 +565,7 @@ const/4 v1, 0x2 + .line 331 new-array v1, v1, [I .line 332 @@ -549,9 +588,9 @@ if-ne v4, v2, :cond_1 + .line 338 aget v1, v1, v5 - .line 338 invoke-virtual {v0}, Landroid/widget/ListView;->getWidth()I move-result v0 @@ -570,6 +609,7 @@ :cond_0 return v2 + .line 344 :cond_1 aget v0, v1, v5 @@ -585,6 +625,10 @@ .method private showMenu(Landroid/support/v7/view/menu/MenuBuilder;)V .locals 14 + .param p1 # Landroid/support/v7/view/menu/MenuBuilder; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 369 iget-object v0, p0, Landroid/support/v7/view/menu/CascadingMenuPopup;->mContext:Landroid/content/Context; @@ -750,6 +794,7 @@ :cond_4 const/4 v8, 0x2 + .line 428 new-array v10, v8, [I .line 429 @@ -757,6 +802,7 @@ invoke-virtual {v12, v10}, Landroid/view/View;->getLocationOnScreen([I)V + .line 431 new-array v8, v8, [I .line 432 @@ -769,9 +815,9 @@ if-ne v12, v11, :cond_5 + .line 439 aget v12, v10, v7 - .line 439 iget-object v13, p0, Landroid/support/v7/view/menu/CascadingMenuPopup;->mAnchorView:Landroid/view/View; invoke-virtual {v13}, Landroid/view/View;->getWidth()I @@ -782,9 +828,9 @@ aput v12, v10, v7 + .line 440 aget v12, v8, v7 - .line 440 invoke-virtual {v6}, Landroid/view/View;->getWidth()I move-result v13 @@ -793,6 +839,7 @@ aput v12, v8, v7 + .line 445 :cond_5 aget v12, v8, v7 @@ -800,6 +847,7 @@ sub-int/2addr v12, v13 + .line 446 aget v8, v8, v3 aget v10, v10, v3 @@ -1496,6 +1544,10 @@ .method public setAnchorView(Landroid/view/View;)V .locals 1 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 749 iget-object v0, p0, Landroid/support/v7/view/menu/CascadingMenuPopup;->mAnchorView:Landroid/view/View; @@ -1506,15 +1558,17 @@ iput-object p1, p0, Landroid/support/v7/view/menu/CascadingMenuPopup;->mAnchorView:Landroid/view/View; .line 753 - iget v0, p0, Landroid/support/v7/view/menu/CascadingMenuPopup;->mRawDropDownGravity:I + iget p1, p0, Landroid/support/v7/view/menu/CascadingMenuPopup;->mRawDropDownGravity:I + + iget-object v0, p0, Landroid/support/v7/view/menu/CascadingMenuPopup;->mAnchorView:Landroid/view/View; .line 754 - invoke-static {p1}, Landroid/support/v4/view/ViewCompat;->getLayoutDirection(Landroid/view/View;)I + invoke-static {v0}, Landroid/support/v4/view/ViewCompat;->getLayoutDirection(Landroid/view/View;)I - move-result p1 + move-result v0 .line 753 - invoke-static {v0, p1}, Landroid/support/v4/view/GravityCompat;->getAbsoluteGravity(II)I + invoke-static {p1, v0}, Landroid/support/v4/view/GravityCompat;->getAbsoluteGravity(II)I move-result p1 @@ -1667,31 +1721,38 @@ iput-object v0, p0, Landroid/support/v7/view/menu/CascadingMenuPopup;->mShownAnchorView:Landroid/view/View; + .line 271 + iget-object v0, p0, Landroid/support/v7/view/menu/CascadingMenuPopup;->mShownAnchorView:Landroid/view/View; + if-eqz v0, :cond_4 .line 272 - iget-object v1, p0, Landroid/support/v7/view/menu/CascadingMenuPopup;->mTreeObserver:Landroid/view/ViewTreeObserver; + iget-object v0, p0, Landroid/support/v7/view/menu/CascadingMenuPopup;->mTreeObserver:Landroid/view/ViewTreeObserver; - if-nez v1, :cond_2 + if-nez v0, :cond_2 - const/4 v1, 0x1 + const/4 v0, 0x1 goto :goto_1 :cond_2 - const/4 v1, 0x0 + const/4 v0, 0x0 .line 273 :goto_1 - invoke-virtual {v0}, Landroid/view/View;->getViewTreeObserver()Landroid/view/ViewTreeObserver; + iget-object v1, p0, Landroid/support/v7/view/menu/CascadingMenuPopup;->mShownAnchorView:Landroid/view/View; - move-result-object v0 + invoke-virtual {v1}, Landroid/view/View;->getViewTreeObserver()Landroid/view/ViewTreeObserver; + + move-result-object v1 - iput-object v0, p0, Landroid/support/v7/view/menu/CascadingMenuPopup;->mTreeObserver:Landroid/view/ViewTreeObserver; + iput-object v1, p0, Landroid/support/v7/view/menu/CascadingMenuPopup;->mTreeObserver:Landroid/view/ViewTreeObserver; - if-eqz v1, :cond_3 + if-eqz v0, :cond_3 .line 275 + iget-object v0, p0, Landroid/support/v7/view/menu/CascadingMenuPopup;->mTreeObserver:Landroid/view/ViewTreeObserver; + iget-object v1, p0, Landroid/support/v7/view/menu/CascadingMenuPopup;->mGlobalLayoutListener:Landroid/view/ViewTreeObserver$OnGlobalLayoutListener; invoke-virtual {v0, v1}, Landroid/view/ViewTreeObserver;->addOnGlobalLayoutListener(Landroid/view/ViewTreeObserver$OnGlobalLayoutListener;)V diff --git a/smali/android/support/v7/view/menu/ExpandedMenuView.smali b/smali/android/support/v7/view/menu/ExpandedMenuView.smali index 7abb6c2c..e208884f 100644 --- a/smali/android/support/v7/view/menu/ExpandedMenuView.smali +++ b/smali/android/support/v7/view/menu/ExpandedMenuView.smali @@ -8,6 +8,14 @@ .implements Landroid/widget/AdapterView$OnItemClickListener; +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field private static final TINT_ATTRS:[I @@ -24,9 +32,9 @@ const/4 v0, 0x2 + .line 42 new-array v0, v0, [I - .line 42 fill-array-data v0, :array_0 sput-object v0, Landroid/support/v7/view/menu/ExpandedMenuView;->TINT_ATTRS:[I diff --git a/smali/android/support/v7/view/menu/ListMenuItemView.smali b/smali/android/support/v7/view/menu/ListMenuItemView.smali index c05299f9..593b2e95 100644 --- a/smali/android/support/v7/view/menu/ListMenuItemView.smali +++ b/smali/android/support/v7/view/menu/ListMenuItemView.smali @@ -7,6 +7,14 @@ .implements Landroid/widget/AbsListView$SelectionBoundsAdjuster; +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field private static final TAG:Ljava/lang/String; = "ListMenuItemView" @@ -240,6 +248,8 @@ iput-object v0, p0, Landroid/support/v7/view/menu/ListMenuItemView;->mCheckBox:Landroid/widget/CheckBox; .line 316 + iget-object v0, p0, Landroid/support/v7/view/menu/ListMenuItemView;->mCheckBox:Landroid/widget/CheckBox; + invoke-direct {p0, v0}, Landroid/support/v7/view/menu/ListMenuItemView;->addContentView(Landroid/view/View;)V return-void @@ -267,6 +277,8 @@ iput-object v0, p0, Landroid/support/v7/view/menu/ListMenuItemView;->mIconView:Landroid/widget/ImageView; .line 300 + iget-object v0, p0, Landroid/support/v7/view/menu/ListMenuItemView;->mIconView:Landroid/widget/ImageView; + invoke-direct {p0, v0, v2}, Landroid/support/v7/view/menu/ListMenuItemView;->addContentView(Landroid/view/View;I)V return-void @@ -295,6 +307,8 @@ iput-object v0, p0, Landroid/support/v7/view/menu/ListMenuItemView;->mRadioButton:Landroid/widget/RadioButton; .line 308 + iget-object v0, p0, Landroid/support/v7/view/menu/ListMenuItemView;->mRadioButton:Landroid/widget/RadioButton; + invoke-direct {p0, v0}, Landroid/support/v7/view/menu/ListMenuItemView;->addContentView(Landroid/view/View;)V return-void @@ -489,16 +503,18 @@ iput-object v0, p0, Landroid/support/v7/view/menu/ListMenuItemView;->mTitleView:Landroid/widget/TextView; .line 109 - iget v1, p0, Landroid/support/v7/view/menu/ListMenuItemView;->mTextAppearance:I + iget v0, p0, Landroid/support/v7/view/menu/ListMenuItemView;->mTextAppearance:I - const/4 v2, -0x1 + const/4 v1, -0x1 - if-eq v1, v2, :cond_0 + if-eq v0, v1, :cond_0 .line 110 + iget-object v1, p0, Landroid/support/v7/view/menu/ListMenuItemView;->mTitleView:Landroid/widget/TextView; + iget-object v2, p0, Landroid/support/v7/view/menu/ListMenuItemView;->mTextAppearanceContext:Landroid/content/Context; - invoke-virtual {v0, v2, v1}, Landroid/widget/TextView;->setTextAppearance(Landroid/content/Context;I)V + invoke-virtual {v1, v2, v0}, Landroid/widget/TextView;->setTextAppearance(Landroid/content/Context;I)V .line 114 :cond_0 @@ -523,6 +539,9 @@ iput-object v0, p0, Landroid/support/v7/view/menu/ListMenuItemView;->mSubMenuArrowView:Landroid/widget/ImageView; + .line 116 + iget-object v0, p0, Landroid/support/v7/view/menu/ListMenuItemView;->mSubMenuArrowView:Landroid/widget/ImageView; + if-eqz v0, :cond_1 .line 117 @@ -821,7 +840,7 @@ .end method .method public setIcon(Landroid/graphics/drawable/Drawable;)V - .locals 4 + .locals 3 .line 259 iget-object v0, p0, Landroid/support/v7/view/menu/ListMenuItemView;->mItemData:Landroid/support/v7/view/menu/MenuItemImpl; @@ -867,13 +886,16 @@ if-nez p1, :cond_3 - iget-boolean v3, p0, Landroid/support/v7/view/menu/ListMenuItemView;->mPreserveIconSpacing:Z + iget-boolean v2, p0, Landroid/support/v7/view/menu/ListMenuItemView;->mPreserveIconSpacing:Z - if-nez v3, :cond_3 + if-nez v2, :cond_3 return-void + .line 268 :cond_3 + iget-object v2, p0, Landroid/support/v7/view/menu/ListMenuItemView;->mIconView:Landroid/widget/ImageView; + if-nez v2, :cond_4 .line 269 diff --git a/smali/android/support/v7/view/menu/ListMenuPresenter.smali b/smali/android/support/v7/view/menu/ListMenuPresenter.smali index c601c167..00036f2c 100644 --- a/smali/android/support/v7/view/menu/ListMenuPresenter.smali +++ b/smali/android/support/v7/view/menu/ListMenuPresenter.smali @@ -8,6 +8,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v7/view/menu/ListMenuPresenter$MenuAdapter; @@ -71,6 +77,8 @@ iput-object p1, p0, Landroid/support/v7/view/menu/ListMenuPresenter;->mContext:Landroid/content/Context; .line 73 + iget-object p1, p0, Landroid/support/v7/view/menu/ListMenuPresenter;->mContext:Landroid/content/Context; + invoke-static {p1}, Landroid/view/LayoutInflater;->from(Landroid/content/Context;)Landroid/view/LayoutInflater; move-result-object p1 @@ -210,16 +218,16 @@ if-eqz v0, :cond_0 .line 89 - new-instance v0, Landroid/view/ContextThemeWrapper; - - iget v1, p0, Landroid/support/v7/view/menu/ListMenuPresenter;->mThemeRes:I + new-instance v1, Landroid/view/ContextThemeWrapper; - invoke-direct {v0, p1, v1}, Landroid/view/ContextThemeWrapper;->(Landroid/content/Context;I)V + invoke-direct {v1, p1, v0}, Landroid/view/ContextThemeWrapper;->(Landroid/content/Context;I)V - iput-object v0, p0, Landroid/support/v7/view/menu/ListMenuPresenter;->mContext:Landroid/content/Context; + iput-object v1, p0, Landroid/support/v7/view/menu/ListMenuPresenter;->mContext:Landroid/content/Context; .line 90 - invoke-static {v0}, Landroid/view/LayoutInflater;->from(Landroid/content/Context;)Landroid/view/LayoutInflater; + iget-object p1, p0, Landroid/support/v7/view/menu/ListMenuPresenter;->mContext:Landroid/content/Context; + + invoke-static {p1}, Landroid/view/LayoutInflater;->from(Landroid/content/Context;)Landroid/view/LayoutInflater; move-result-object p1 @@ -237,11 +245,13 @@ iput-object p1, p0, Landroid/support/v7/view/menu/ListMenuPresenter;->mContext:Landroid/content/Context; .line 93 - iget-object v0, p0, Landroid/support/v7/view/menu/ListMenuPresenter;->mInflater:Landroid/view/LayoutInflater; + iget-object p1, p0, Landroid/support/v7/view/menu/ListMenuPresenter;->mInflater:Landroid/view/LayoutInflater; - if-nez v0, :cond_1 + if-nez p1, :cond_1 .line 94 + iget-object p1, p0, Landroid/support/v7/view/menu/ListMenuPresenter;->mContext:Landroid/content/Context; + invoke-static {p1}, Landroid/view/LayoutInflater;->from(Landroid/content/Context;)Landroid/view/LayoutInflater; move-result-object p1 diff --git a/smali/android/support/v7/view/menu/MenuAdapter.smali b/smali/android/support/v7/view/menu/MenuAdapter.smali index 73bd30d1..06f33e1b 100644 --- a/smali/android/support/v7/view/menu/MenuAdapter.smali +++ b/smali/android/support/v7/view/menu/MenuAdapter.smali @@ -3,6 +3,14 @@ .source "MenuAdapter.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # instance fields .field mAdapterMenu:Landroid/support/v7/view/menu/MenuBuilder; diff --git a/smali/android/support/v7/view/menu/MenuBuilder$Callback.smali b/smali/android/support/v7/view/menu/MenuBuilder$Callback.smali index 63a09ec3..6eee04a5 100644 --- a/smali/android/support/v7/view/menu/MenuBuilder$Callback.smali +++ b/smali/android/support/v7/view/menu/MenuBuilder$Callback.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v7/view/menu/MenuBuilder; .end annotation diff --git a/smali/android/support/v7/view/menu/MenuBuilder$ItemInvoker.smali b/smali/android/support/v7/view/menu/MenuBuilder$ItemInvoker.smali index aec53d07..3fc8a47e 100644 --- a/smali/android/support/v7/view/menu/MenuBuilder$ItemInvoker.smali +++ b/smali/android/support/v7/view/menu/MenuBuilder$ItemInvoker.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v7/view/menu/MenuBuilder; .end annotation diff --git a/smali/android/support/v7/view/menu/MenuBuilder.smali b/smali/android/support/v7/view/menu/MenuBuilder.smali index 05ab6d74..97512765 100644 --- a/smali/android/support/v7/view/menu/MenuBuilder.smali +++ b/smali/android/support/v7/view/menu/MenuBuilder.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v7/view/menu/MenuBuilder$ItemInvoker;, @@ -146,9 +152,9 @@ const/4 v0, 0x6 + .line 68 new-array v0, v0, [I - .line 68 fill-array-data v0, :array_0 sput-object v0, Landroid/support/v7/view/menu/MenuBuilder;->sCategoryToOrder:[I @@ -2330,6 +2336,9 @@ .method public getVisibleItems()Ljava/util/ArrayList; .locals 5 + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "()", diff --git a/smali/android/support/v7/view/menu/MenuDialogHelper.smali b/smali/android/support/v7/view/menu/MenuDialogHelper.smali index d73f7b4a..db0bfabe 100644 --- a/smali/android/support/v7/view/menu/MenuDialogHelper.smali +++ b/smali/android/support/v7/view/menu/MenuDialogHelper.smali @@ -298,6 +298,8 @@ iput-object v2, p0, Landroid/support/v7/view/menu/MenuDialogHelper;->mPresenter:Landroid/support/v7/view/menu/ListMenuPresenter; .line 61 + iget-object v2, p0, Landroid/support/v7/view/menu/MenuDialogHelper;->mPresenter:Landroid/support/v7/view/menu/ListMenuPresenter; + invoke-virtual {v2, p0}, Landroid/support/v7/view/menu/ListMenuPresenter;->setCallback(Landroid/support/v7/view/menu/MenuPresenter$Callback;)V .line 62 @@ -356,6 +358,8 @@ iput-object v0, p0, Landroid/support/v7/view/menu/MenuDialogHelper;->mDialog:Landroid/support/v7/app/AlertDialog; .line 80 + iget-object v0, p0, Landroid/support/v7/view/menu/MenuDialogHelper;->mDialog:Landroid/support/v7/app/AlertDialog; + invoke-virtual {v0, p0}, Landroid/support/v7/app/AlertDialog;->setOnDismissListener(Landroid/content/DialogInterface$OnDismissListener;)V .line 82 diff --git a/smali/android/support/v7/view/menu/MenuItemImpl.smali b/smali/android/support/v7/view/menu/MenuItemImpl.smali index 2ef905a7..fc015c1a 100644 --- a/smali/android/support/v7/view/menu/MenuItemImpl.smali +++ b/smali/android/support/v7/view/menu/MenuItemImpl.smali @@ -6,6 +6,14 @@ .implements Landroid/support/v4/internal/view/SupportMenuItem; +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field private static final CHECKABLE:I = 0x1 @@ -132,6 +140,9 @@ .line 99 iput v1, p0, Landroid/support/v7/view/menu/MenuItemImpl;->mFlags:I + .line 107 + iput v0, p0, Landroid/support/v7/view/menu/MenuItemImpl;->mShowAsAction:I + .line 112 iput-boolean v0, p0, Landroid/support/v7/view/menu/MenuItemImpl;->mIsActionViewExpanded:Z @@ -380,6 +391,9 @@ iput-object v0, p0, Landroid/support/v7/view/menu/MenuItemImpl;->mActionView:Landroid/view/View; + .line 768 + iget-object v0, p0, Landroid/support/v7/view/menu/MenuItemImpl;->mActionView:Landroid/view/View; + return-object v0 :cond_1 @@ -1490,6 +1504,9 @@ .line 596 iput p1, p0, Landroid/support/v7/view/menu/MenuItemImpl;->mFlags:I + .line 597 + iget p1, p0, Landroid/support/v7/view/menu/MenuItemImpl;->mFlags:I + if-eq v0, p1, :cond_0 .line 598 @@ -1553,6 +1570,9 @@ .line 632 iput p1, p0, Landroid/support/v7/view/menu/MenuItemImpl;->mFlags:I + .line 633 + iget p1, p0, Landroid/support/v7/view/menu/MenuItemImpl;->mFlags:I + if-eq v0, p1, :cond_1 .line 634 @@ -1701,6 +1721,10 @@ .method public setIconTintList(Landroid/content/res/ColorStateList;)Landroid/view/MenuItem; .locals 1 + .param p1 # Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 539 iput-object p1, p0, Landroid/support/v7/view/menu/MenuItemImpl;->mIconTintList:Landroid/content/res/ColorStateList; @@ -2099,7 +2123,13 @@ .line 486 iput-object p1, p0, Landroid/support/v7/view/menu/MenuItemImpl;->mTitleCondensed:Ljava/lang/CharSequence; + if-nez p1, :cond_0 + + .line 490 + iget-object p1, p0, Landroid/support/v7/view/menu/MenuItemImpl;->mTitle:Ljava/lang/CharSequence; + .line 493 + :cond_0 iget-object p1, p0, Landroid/support/v7/view/menu/MenuItemImpl;->mMenu:Landroid/support/v7/view/menu/MenuBuilder; const/4 v0, 0x0 @@ -2179,6 +2209,9 @@ .line 656 iput p1, p0, Landroid/support/v7/view/menu/MenuItemImpl;->mFlags:I + .line 657 + iget p1, p0, Landroid/support/v7/view/menu/MenuItemImpl;->mFlags:I + if-eq v0, p1, :cond_1 const/4 v2, 0x1 diff --git a/smali/android/support/v7/view/menu/MenuItemWrapperICS.smali b/smali/android/support/v7/view/menu/MenuItemWrapperICS.smali index 6fb09624..1dd6aaa2 100644 --- a/smali/android/support/v7/view/menu/MenuItemWrapperICS.smali +++ b/smali/android/support/v7/view/menu/MenuItemWrapperICS.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v7/view/menu/MenuItemWrapperICS$CollapsibleActionViewWrapper;, diff --git a/smali/android/support/v7/view/menu/MenuItemWrapperJB.smali b/smali/android/support/v7/view/menu/MenuItemWrapperJB.smali index 59a611ab..b35b57e8 100644 --- a/smali/android/support/v7/view/menu/MenuItemWrapperJB.smali +++ b/smali/android/support/v7/view/menu/MenuItemWrapperJB.smali @@ -4,6 +4,16 @@ # annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0x10 +.end annotation + +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v7/view/menu/MenuItemWrapperJB$ActionProviderWrapperJB; diff --git a/smali/android/support/v7/view/menu/MenuPopup.smali b/smali/android/support/v7/view/menu/MenuPopup.smali index 7973eb6e..9cc8489e 100644 --- a/smali/android/support/v7/view/menu/MenuPopup.smali +++ b/smali/android/support/v7/view/menu/MenuPopup.smali @@ -44,11 +44,13 @@ const/4 v4, 0x0 + move-object v6, p1 + move-object v7, v4 - const/4 v5, 0x0 + const/4 p1, 0x0 - const/4 v6, 0x0 + const/4 v5, 0x0 :goto_0 if-ge v0, v3, :cond_4 @@ -58,23 +60,23 @@ move-result v8 - if-eq v8, v6, :cond_0 + if-eq v8, v5, :cond_0 move-object v7, v4 - move v6, v8 + move v5, v8 :cond_0 - if-nez p1, :cond_1 + if-nez v6, :cond_1 .line 158 - new-instance p1, Landroid/widget/FrameLayout; + new-instance v6, Landroid/widget/FrameLayout; - invoke-direct {p1, p2}, Landroid/widget/FrameLayout;->(Landroid/content/Context;)V + invoke-direct {v6, p2}, Landroid/widget/FrameLayout;->(Landroid/content/Context;)V .line 161 :cond_1 - invoke-interface {p0, v0, v7, p1}, Landroid/widget/ListAdapter;->getView(ILandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View; + invoke-interface {p0, v0, v7, v6}, Landroid/widget/ListAdapter;->getView(ILandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View; move-result-object v7 @@ -91,9 +93,9 @@ return p3 :cond_2 - if-le v8, v5, :cond_3 + if-le v8, p1, :cond_3 - move v5, v8 + move p1, v8 :cond_3 add-int/lit8 v0, v0, 0x1 @@ -101,7 +103,7 @@ goto :goto_0 :cond_4 - return v5 + return p1 .end method .method protected static shouldPreserveIconSpacing(Landroid/support/v7/view/menu/MenuBuilder;)Z @@ -238,6 +240,14 @@ .method public initForMenu(Landroid/content/Context;Landroid/support/v7/view/menu/MenuBuilder;)V .locals 0 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v7/view/menu/MenuBuilder; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param return-void .end method diff --git a/smali/android/support/v7/view/menu/MenuPopupHelper.smali b/smali/android/support/v7/view/menu/MenuPopupHelper.smali index ff6b15a1..35346439 100644 --- a/smali/android/support/v7/view/menu/MenuPopupHelper.smali +++ b/smali/android/support/v7/view/menu/MenuPopupHelper.smali @@ -6,6 +6,14 @@ .implements Landroid/support/v7/view/menu/MenuHelper; +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field private static final TOUCH_EPICENTER_SIZE_DP:I = 0x30 @@ -39,6 +47,14 @@ # direct methods .method public constructor (Landroid/content/Context;Landroid/support/v7/view/menu/MenuBuilder;)V .locals 7 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v7/view/menu/MenuBuilder; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 68 sget v5, Landroid/support/v7/appcompat/R$attr;->popupMenuStyle:I @@ -62,6 +78,18 @@ .method public constructor (Landroid/content/Context;Landroid/support/v7/view/menu/MenuBuilder;Landroid/view/View;)V .locals 7 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v7/view/menu/MenuBuilder; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 73 sget v5, Landroid/support/v7/appcompat/R$attr;->popupMenuStyle:I @@ -85,6 +113,22 @@ .method public constructor (Landroid/content/Context;Landroid/support/v7/view/menu/MenuBuilder;Landroid/view/View;ZI)V .locals 7 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v7/view/menu/MenuBuilder; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p5 # I + .annotation build Landroid/support/annotation/AttrRes; + .end annotation + .end param const/4 v6, 0x0 @@ -108,6 +152,26 @@ .method public constructor (Landroid/content/Context;Landroid/support/v7/view/menu/MenuBuilder;Landroid/view/View;ZII)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v7/view/menu/MenuBuilder; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p5 # I + .annotation build Landroid/support/annotation/AttrRes; + .end annotation + .end param + .param p6 # I + .annotation build Landroid/support/annotation/StyleRes; + .end annotation + .end param .line 84 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -147,6 +211,8 @@ .method private createPopup()Landroid/support/v7/view/menu/MenuPopup; .locals 14 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 224 iget-object v0, p0, Landroid/support/v7/view/menu/MenuPopupHelper;->mContext:Landroid/content/Context; @@ -436,6 +502,8 @@ .method public getPopup()Landroid/support/v7/view/menu/MenuPopup; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 156 iget-object v0, p0, Landroid/support/v7/view/menu/MenuPopupHelper;->mPopup:Landroid/support/v7/view/menu/MenuPopup; @@ -503,6 +571,10 @@ .method public setAnchorView(Landroid/view/View;)V .locals 0 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 105 iput-object p1, p0, Landroid/support/v7/view/menu/MenuPopupHelper;->mAnchorView:Landroid/view/View; @@ -539,6 +611,10 @@ .method public setOnDismissListener(Landroid/widget/PopupWindow$OnDismissListener;)V .locals 0 + .param p1 # Landroid/widget/PopupWindow$OnDismissListener; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 94 iput-object p1, p0, Landroid/support/v7/view/menu/MenuPopupHelper;->mOnDismissListener:Landroid/widget/PopupWindow$OnDismissListener; @@ -548,6 +624,10 @@ .method public setPresenterCallback(Landroid/support/v7/view/menu/MenuPresenter$Callback;)V .locals 1 + .param p1 # Landroid/support/v7/view/menu/MenuPresenter$Callback; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 325 iput-object p1, p0, Landroid/support/v7/view/menu/MenuPopupHelper;->mPresenterCallback:Landroid/support/v7/view/menu/MenuPresenter$Callback; diff --git a/smali/android/support/v7/view/menu/MenuPresenter.smali b/smali/android/support/v7/view/menu/MenuPresenter.smali index 5ed2419f..2678a715 100644 --- a/smali/android/support/v7/view/menu/MenuPresenter.smali +++ b/smali/android/support/v7/view/menu/MenuPresenter.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v7/view/menu/MenuPresenter$Callback; diff --git a/smali/android/support/v7/view/menu/MenuView.smali b/smali/android/support/v7/view/menu/MenuView.smali index cfe82124..cbdc6147 100644 --- a/smali/android/support/v7/view/menu/MenuView.smali +++ b/smali/android/support/v7/view/menu/MenuView.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v7/view/menu/MenuView$ItemView; diff --git a/smali/android/support/v7/view/menu/MenuWrapperFactory.smali b/smali/android/support/v7/view/menu/MenuWrapperFactory.smali index d77c014e..eaccb8dd 100644 --- a/smali/android/support/v7/view/menu/MenuWrapperFactory.smali +++ b/smali/android/support/v7/view/menu/MenuWrapperFactory.smali @@ -3,6 +3,14 @@ .source "MenuWrapperFactory.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # direct methods .method private constructor ()V .locals 0 diff --git a/smali/android/support/v7/view/menu/ShowableListMenu.smali b/smali/android/support/v7/view/menu/ShowableListMenu.smali index 9e4de324..0f35d477 100644 --- a/smali/android/support/v7/view/menu/ShowableListMenu.smali +++ b/smali/android/support/v7/view/menu/ShowableListMenu.smali @@ -3,6 +3,14 @@ .source "ShowableListMenu.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # virtual methods .method public abstract dismiss()V .end method diff --git a/smali/android/support/v7/view/menu/StandardMenuPopup.smali b/smali/android/support/v7/view/menu/StandardMenuPopup.smali index 61606f67..097705ba 100644 --- a/smali/android/support/v7/view/menu/StandardMenuPopup.smali +++ b/smali/android/support/v7/view/menu/StandardMenuPopup.smali @@ -104,16 +104,18 @@ .line 121 invoke-static {p1}, Landroid/view/LayoutInflater;->from(Landroid/content/Context;)Landroid/view/LayoutInflater; - move-result-object v0 + move-result-object p6 .line 122 - new-instance v1, Landroid/support/v7/view/menu/MenuAdapter; + new-instance v0, Landroid/support/v7/view/menu/MenuAdapter; + + iget-boolean v1, p0, Landroid/support/v7/view/menu/StandardMenuPopup;->mOverflowOnly:Z sget v2, Landroid/support/v7/view/menu/StandardMenuPopup;->ITEM_LAYOUT:I - invoke-direct {v1, p2, v0, p6, v2}, Landroid/support/v7/view/menu/MenuAdapter;->(Landroid/support/v7/view/menu/MenuBuilder;Landroid/view/LayoutInflater;ZI)V + invoke-direct {v0, p2, p6, v1, v2}, Landroid/support/v7/view/menu/MenuAdapter;->(Landroid/support/v7/view/menu/MenuBuilder;Landroid/view/LayoutInflater;ZI)V - iput-object v1, p0, Landroid/support/v7/view/menu/StandardMenuPopup;->mAdapter:Landroid/support/v7/view/menu/MenuAdapter; + iput-object v0, p0, Landroid/support/v7/view/menu/StandardMenuPopup;->mAdapter:Landroid/support/v7/view/menu/MenuAdapter; .line 123 iput p4, p0, Landroid/support/v7/view/menu/StandardMenuPopup;->mPopupStyleAttr:I @@ -124,30 +126,30 @@ .line 126 invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources; - move-result-object p6 + move-result-object p4 .line 127 - invoke-virtual {p6}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics; + invoke-virtual {p4}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics; - move-result-object v0 + move-result-object p5 - iget v0, v0, Landroid/util/DisplayMetrics;->widthPixels:I + iget p5, p5, Landroid/util/DisplayMetrics;->widthPixels:I - div-int/lit8 v0, v0, 0x2 + div-int/lit8 p5, p5, 0x2 - sget v1, Landroid/support/v7/appcompat/R$dimen;->abc_config_prefDialogWidth:I + sget p6, Landroid/support/v7/appcompat/R$dimen;->abc_config_prefDialogWidth:I .line 128 - invoke-virtual {p6, v1}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I + invoke-virtual {p4, p6}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I - move-result p6 + move-result p4 .line 127 - invoke-static {v0, p6}, Ljava/lang/Math;->max(II)I + invoke-static {p5, p4}, Ljava/lang/Math;->max(II)I - move-result p6 + move-result p4 - iput p6, p0, Landroid/support/v7/view/menu/StandardMenuPopup;->mPopupMaxWidth:I + iput p4, p0, Landroid/support/v7/view/menu/StandardMenuPopup;->mPopupMaxWidth:I .line 130 iput-object p3, p0, Landroid/support/v7/view/menu/StandardMenuPopup;->mAnchorView:Landroid/view/View; @@ -155,9 +157,15 @@ .line 132 new-instance p3, Landroid/support/v7/widget/MenuPopupWindow; - const/4 p6, 0x0 + iget-object p4, p0, Landroid/support/v7/view/menu/StandardMenuPopup;->mContext:Landroid/content/Context; + + iget p5, p0, Landroid/support/v7/view/menu/StandardMenuPopup;->mPopupStyleAttr:I - invoke-direct {p3, p1, p6, p4, p5}, Landroid/support/v7/widget/MenuPopupWindow;->(Landroid/content/Context;Landroid/util/AttributeSet;II)V + iget p6, p0, Landroid/support/v7/view/menu/StandardMenuPopup;->mPopupStyleRes:I + + const/4 v0, 0x0 + + invoke-direct {p3, p4, v0, p5, p6}, Landroid/support/v7/widget/MenuPopupWindow;->(Landroid/content/Context;Landroid/util/AttributeSet;II)V iput-object p3, p0, Landroid/support/v7/view/menu/StandardMenuPopup;->mPopup:Landroid/support/v7/widget/MenuPopupWindow; @@ -240,9 +248,11 @@ if-eqz v3, :cond_3 .line 167 - iget-object v3, p0, Landroid/support/v7/view/menu/StandardMenuPopup;->mGlobalLayoutListener:Landroid/view/ViewTreeObserver$OnGlobalLayoutListener; + iget-object v3, p0, Landroid/support/v7/view/menu/StandardMenuPopup;->mTreeObserver:Landroid/view/ViewTreeObserver; + + iget-object v4, p0, Landroid/support/v7/view/menu/StandardMenuPopup;->mGlobalLayoutListener:Landroid/view/ViewTreeObserver$OnGlobalLayoutListener; - invoke-virtual {v4, v3}, Landroid/view/ViewTreeObserver;->addOnGlobalLayoutListener(Landroid/view/ViewTreeObserver$OnGlobalLayoutListener;)V + invoke-virtual {v3, v4}, Landroid/view/ViewTreeObserver;->addOnGlobalLayoutListener(Landroid/view/ViewTreeObserver$OnGlobalLayoutListener;)V .line 169 :cond_3 diff --git a/smali/android/support/v7/view/menu/SubMenuBuilder.smali b/smali/android/support/v7/view/menu/SubMenuBuilder.smali index 3a5f6de8..16c7c9bb 100644 --- a/smali/android/support/v7/view/menu/SubMenuBuilder.smali +++ b/smali/android/support/v7/view/menu/SubMenuBuilder.smali @@ -6,6 +6,14 @@ .implements Landroid/view/SubMenu; +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # instance fields .field private mItem:Landroid/support/v7/view/menu/MenuItemImpl; diff --git a/smali/android/support/v7/view/menu/SubMenuWrapperICS.smali b/smali/android/support/v7/view/menu/SubMenuWrapperICS.smali index 7040ad16..fd8732b5 100644 --- a/smali/android/support/v7/view/menu/SubMenuWrapperICS.smali +++ b/smali/android/support/v7/view/menu/SubMenuWrapperICS.smali @@ -6,6 +6,14 @@ .implements Landroid/view/SubMenu; +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # direct methods .method constructor (Landroid/content/Context;Landroid/support/v4/internal/view/SupportSubMenu;)V .locals 0 diff --git a/smali/android/support/v7/viewpager/R$attr.smali b/smali/android/support/v7/viewpager/R$attr.smali index 32186041..06c8551a 100644 --- a/smali/android/support/v7/viewpager/R$attr.smali +++ b/smali/android/support/v7/viewpager/R$attr.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/v7/viewpager/R$attr; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -43,6 +44,7 @@ .method private constructor ()V .locals 0 + .line 13 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/v7/viewpager/R$color.smali b/smali/android/support/v7/viewpager/R$color.smali index 4e389b1a..8b5db92b 100644 --- a/smali/android/support/v7/viewpager/R$color.smali +++ b/smali/android/support/v7/viewpager/R$color.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/v7/viewpager/R$color; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -27,6 +28,7 @@ .method private constructor ()V .locals 0 + .line 29 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/v7/viewpager/R$dimen.smali b/smali/android/support/v7/viewpager/R$dimen.smali index fec06735..5d977fae 100644 --- a/smali/android/support/v7/viewpager/R$dimen.smali +++ b/smali/android/support/v7/viewpager/R$dimen.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/v7/viewpager/R$dimen; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -63,6 +64,7 @@ .method private constructor ()V .locals 0 + .line 37 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/v7/viewpager/R$drawable.smali b/smali/android/support/v7/viewpager/R$drawable.smali index e5736e02..ef004e6b 100644 --- a/smali/android/support/v7/viewpager/R$drawable.smali +++ b/smali/android/support/v7/viewpager/R$drawable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/v7/viewpager/R$drawable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -43,6 +44,7 @@ .method private constructor ()V .locals 0 + .line 63 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/v7/viewpager/R$id.smali b/smali/android/support/v7/viewpager/R$id.smali index 19e76bb8..0a0d94b0 100644 --- a/smali/android/support/v7/viewpager/R$id.smali +++ b/smali/android/support/v7/viewpager/R$id.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/v7/viewpager/R$id; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -75,6 +76,7 @@ .method private constructor ()V .locals 0 + .line 79 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/v7/viewpager/R$integer.smali b/smali/android/support/v7/viewpager/R$integer.smali index 5f0169b9..b72d420b 100644 --- a/smali/android/support/v7/viewpager/R$integer.smali +++ b/smali/android/support/v7/viewpager/R$integer.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/v7/viewpager/R$integer; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -21,6 +22,7 @@ .method private constructor ()V .locals 0 + .line 111 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/v7/viewpager/R$layout.smali b/smali/android/support/v7/viewpager/R$layout.smali index f54aaed7..60a451d4 100644 --- a/smali/android/support/v7/viewpager/R$layout.smali +++ b/smali/android/support/v7/viewpager/R$layout.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/v7/viewpager/R$layout; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -31,6 +32,7 @@ .method private constructor ()V .locals 0 + .line 116 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/v7/viewpager/R$string.smali b/smali/android/support/v7/viewpager/R$string.smali index 25d7f3fa..833b6a40 100644 --- a/smali/android/support/v7/viewpager/R$string.smali +++ b/smali/android/support/v7/viewpager/R$string.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/v7/viewpager/R$string; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -21,6 +22,7 @@ .method private constructor ()V .locals 0 + .line 126 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/v7/viewpager/R$style.smali b/smali/android/support/v7/viewpager/R$style.smali index d9b2836b..0708c3e5 100644 --- a/smali/android/support/v7/viewpager/R$style.smali +++ b/smali/android/support/v7/viewpager/R$style.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/v7/viewpager/R$style; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -33,6 +34,7 @@ .method private constructor ()V .locals 0 + .line 131 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/v7/viewpager/R$styleable.smali b/smali/android/support/v7/viewpager/R$styleable.smali index 5caadb63..1e6e4456 100644 --- a/smali/android/support/v7/viewpager/R$styleable.smali +++ b/smali/android/support/v7/viewpager/R$styleable.smali @@ -1,5 +1,6 @@ .class public final Landroid/support/v7/viewpager/R$styleable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -92,11 +93,12 @@ # direct methods -.method public static constructor ()V +.method static constructor ()V .locals 1 const/4 v0, 0x3 + .line 144 new-array v0, v0, [I fill-array-data v0, :array_0 @@ -105,6 +107,7 @@ const/4 v0, 0x6 + .line 148 new-array v0, v0, [I fill-array-data v0, :array_1 @@ -113,6 +116,7 @@ const/16 v0, 0xa + .line 155 new-array v0, v0, [I fill-array-data v0, :array_2 @@ -121,6 +125,7 @@ const/16 v0, 0xc + .line 166 new-array v0, v0, [I fill-array-data v0, :array_3 @@ -129,6 +134,7 @@ const/4 v0, 0x2 + .line 179 new-array v0, v0, [I fill-array-data v0, :array_4 @@ -196,6 +202,7 @@ .method private constructor ()V .locals 0 + .line 142 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/v7/viewpager/R.smali b/smali/android/support/v7/viewpager/R.smali index c4a6d778..86f169d8 100644 --- a/smali/android/support/v7/viewpager/R.smali +++ b/smali/android/support/v7/viewpager/R.smali @@ -1,20 +1,21 @@ .class public final Landroid/support/v7/viewpager/R; .super Ljava/lang/Object; +.source "R.java" # annotations .annotation system Ldalvik/annotation/MemberClasses; value = { - Landroid/support/v7/viewpager/R$attr;, - Landroid/support/v7/viewpager/R$color;, - Landroid/support/v7/viewpager/R$dimen;, - Landroid/support/v7/viewpager/R$drawable;, - Landroid/support/v7/viewpager/R$id;, - Landroid/support/v7/viewpager/R$integer;, - Landroid/support/v7/viewpager/R$layout;, - Landroid/support/v7/viewpager/R$string;, + Landroid/support/v7/viewpager/R$styleable;, Landroid/support/v7/viewpager/R$style;, - Landroid/support/v7/viewpager/R$styleable; + Landroid/support/v7/viewpager/R$string;, + Landroid/support/v7/viewpager/R$layout;, + Landroid/support/v7/viewpager/R$integer;, + Landroid/support/v7/viewpager/R$id;, + Landroid/support/v7/viewpager/R$drawable;, + Landroid/support/v7/viewpager/R$dimen;, + Landroid/support/v7/viewpager/R$color;, + Landroid/support/v7/viewpager/R$attr; } .end annotation @@ -23,6 +24,7 @@ .method private constructor ()V .locals 0 + .line 10 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/android/support/v7/widget/AbsActionBarView$VisibilityAnimListener.smali b/smali/android/support/v7/widget/AbsActionBarView$VisibilityAnimListener.smali index ff14324d..b53741e1 100644 --- a/smali/android/support/v7/widget/AbsActionBarView$VisibilityAnimListener.smali +++ b/smali/android/support/v7/widget/AbsActionBarView$VisibilityAnimListener.smali @@ -74,8 +74,6 @@ iput-object v0, p1, Landroid/support/v7/widget/AbsActionBarView;->mVisibilityAnim:Landroid/support/v4/view/ViewPropertyAnimatorCompat; .line 295 - iget-object p1, p0, Landroid/support/v7/widget/AbsActionBarView$VisibilityAnimListener;->this$0:Landroid/support/v7/widget/AbsActionBarView; - iget v0, p0, Landroid/support/v7/widget/AbsActionBarView$VisibilityAnimListener;->mFinalVisibility:I invoke-static {p1, v0}, Landroid/support/v7/widget/AbsActionBarView;->access$101(Landroid/support/v7/widget/AbsActionBarView;I)V diff --git a/smali/android/support/v7/widget/AbsActionBarView.smali b/smali/android/support/v7/widget/AbsActionBarView.smali index 6ec0e164..3efa6ea9 100644 --- a/smali/android/support/v7/widget/AbsActionBarView.smali +++ b/smali/android/support/v7/widget/AbsActionBarView.smali @@ -377,14 +377,14 @@ const/4 v4, 0x0 - invoke-virtual {v0, v3, v1, v2, v4}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray; + invoke-virtual {v0, v4, v1, v2, v3}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray; move-result-object v0 .line 79 sget v1, Landroid/support/v7/appcompat/R$styleable;->ActionBar_height:I - invoke-virtual {v0, v1, v4}, Landroid/content/res/TypedArray;->getLayoutDimension(II)I + invoke-virtual {v0, v1, v3}, Landroid/content/res/TypedArray;->getLayoutDimension(II)I move-result v1 diff --git a/smali/android/support/v7/widget/ActionBarBackgroundDrawable.smali b/smali/android/support/v7/widget/ActionBarBackgroundDrawable.smali index 7a787155..69c9abe6 100644 --- a/smali/android/support/v7/widget/ActionBarBackgroundDrawable.smali +++ b/smali/android/support/v7/widget/ActionBarBackgroundDrawable.smali @@ -99,6 +99,13 @@ .method public getOutline(Landroid/graphics/Outline;)V .locals 1 + .param p1 # Landroid/graphics/Outline; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x15 + .end annotation .line 68 iget-object v0, p0, Landroid/support/v7/widget/ActionBarBackgroundDrawable;->mContainer:Landroid/support/v7/widget/ActionBarContainer; diff --git a/smali/android/support/v7/widget/ActionBarContainer.smali b/smali/android/support/v7/widget/ActionBarContainer.smali index 33ed7ff2..06fad390 100644 --- a/smali/android/support/v7/widget/ActionBarContainer.smali +++ b/smali/android/support/v7/widget/ActionBarContainer.smali @@ -3,6 +3,14 @@ .source "ActionBarContainer.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # instance fields .field private mActionBarView:Landroid/view/View; @@ -125,7 +133,10 @@ if-nez p1, :cond_2 - goto :goto_0 + :goto_0 + const/4 p2, 0x1 + + goto :goto_1 :cond_1 iget-object p1, p0, Landroid/support/v7/widget/ActionBarContainer;->mBackground:Landroid/graphics/drawable/Drawable; @@ -139,10 +150,8 @@ goto :goto_0 :cond_2 - const/4 v1, 0x0 - - :goto_0 - invoke-virtual {p0, v1}, Landroid/support/v7/widget/ActionBarContainer;->setWillNotDraw(Z)V + :goto_1 + invoke-virtual {p0, p2}, Landroid/support/v7/widget/ActionBarContainer;->setWillNotDraw(Z)V return-void .end method diff --git a/smali/android/support/v7/widget/ActionBarContextView.smali b/smali/android/support/v7/widget/ActionBarContextView.smali index 9be334a0..434257af 100644 --- a/smali/android/support/v7/widget/ActionBarContextView.smali +++ b/smali/android/support/v7/widget/ActionBarContextView.smali @@ -3,6 +3,14 @@ .source "ActionBarContextView.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field private static final TAG:Ljava/lang/String; = "ActionBarContextView" @@ -160,6 +168,8 @@ iput-object v0, p0, Landroid/support/v7/widget/ActionBarContextView;->mTitleLayout:Landroid/widget/LinearLayout; .line 138 + iget-object v0, p0, Landroid/support/v7/widget/ActionBarContextView;->mTitleLayout:Landroid/widget/LinearLayout; + sget v1, Landroid/support/v7/appcompat/R$id;->action_bar_title:I invoke-virtual {v0, v1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View; @@ -470,6 +480,8 @@ iput-object v0, p0, Landroid/support/v7/widget/ActionBarContextView;->mClose:Landroid/view/View; .line 164 + iget-object v0, p0, Landroid/support/v7/widget/ActionBarContextView;->mClose:Landroid/view/View; + invoke-virtual {p0, v0}, Landroid/support/v7/widget/ActionBarContextView;->addView(Landroid/view/View;)V goto :goto_0 @@ -860,12 +872,15 @@ .line 334 invoke-static {v8, p5, p1}, Landroid/support/v7/widget/ActionBarContextView;->next(IIZ)I - move-result v0 + move-result p5 + + goto :goto_3 :cond_3 move p5, v0 .line 337 + :goto_3 iget-object v0, p0, Landroid/support/v7/widget/ActionBarContextView;->mTitleLayout:Landroid/widget/LinearLayout; if-eqz v0, :cond_4 @@ -928,7 +943,7 @@ move v3, p2 - goto :goto_3 + goto :goto_4 :cond_6 sub-int/2addr p4, p2 @@ -942,7 +957,7 @@ move v3, p4 .line 347 - :goto_3 + :goto_4 iget-object p2, p0, Landroid/support/v7/widget/ActionBarContextView;->mMenuView:Landroid/support/v7/widget/ActionMenuView; if-eqz p2, :cond_7 @@ -1353,13 +1368,9 @@ invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;->(Ljava/lang/String;)V - goto :goto_9 - - :goto_8 throw p1 - :goto_9 - goto :goto_8 + return-void .end method .method public bridge synthetic onTouchEvent(Landroid/view/MotionEvent;)Z diff --git a/smali/android/support/v7/widget/ActionBarOverlayLayout$1.smali b/smali/android/support/v7/widget/ActionBarOverlayLayout$1.smali index bb2b6fa0..ec681a00 100644 --- a/smali/android/support/v7/widget/ActionBarOverlayLayout$1.smali +++ b/smali/android/support/v7/widget/ActionBarOverlayLayout$1.smali @@ -42,11 +42,9 @@ iput-object v0, p1, Landroid/support/v7/widget/ActionBarOverlayLayout;->mCurrentActionBarTopAnimator:Landroid/view/ViewPropertyAnimator; - .line 106 - iget-object p1, p0, Landroid/support/v7/widget/ActionBarOverlayLayout$1;->this$0:Landroid/support/v7/widget/ActionBarOverlayLayout; - const/4 v0, 0x0 + .line 106 iput-boolean v0, p1, Landroid/support/v7/widget/ActionBarOverlayLayout;->mAnimatingForFling:Z return-void @@ -62,11 +60,9 @@ iput-object v0, p1, Landroid/support/v7/widget/ActionBarOverlayLayout;->mCurrentActionBarTopAnimator:Landroid/view/ViewPropertyAnimator; - .line 100 - iget-object p1, p0, Landroid/support/v7/widget/ActionBarOverlayLayout$1;->this$0:Landroid/support/v7/widget/ActionBarOverlayLayout; - const/4 v0, 0x0 + .line 100 iput-boolean v0, p1, Landroid/support/v7/widget/ActionBarOverlayLayout;->mAnimatingForFling:Z return-void diff --git a/smali/android/support/v7/widget/ActionBarOverlayLayout.smali b/smali/android/support/v7/widget/ActionBarOverlayLayout.smali index f5d252c3..98bd8046 100644 --- a/smali/android/support/v7/widget/ActionBarOverlayLayout.smali +++ b/smali/android/support/v7/widget/ActionBarOverlayLayout.smali @@ -8,6 +8,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v7/widget/ActionBarOverlayLayout$ActionBarVisibilityCallback;, @@ -86,9 +92,9 @@ const/4 v0, 0x2 + .line 129 new-array v0, v0, [I - .line 129 sget v1, Landroid/support/v7/appcompat/R$attr;->actionBarSize:I const/4 v2, 0x0 @@ -307,13 +313,10 @@ iput p2, p1, Landroid/support/v7/widget/ActionBarOverlayLayout$LayoutParams;->bottomMargin:I - goto :goto_1 + const/4 p3, 0x1 :cond_3 - move v0, p3 - - :goto_1 - return v0 + return p3 .end method .method private getDecorToolbar(Landroid/view/View;)Landroid/support/v7/widget/DecorToolbar; @@ -412,6 +415,9 @@ iput-object v3, p0, Landroid/support/v7/widget/ActionBarOverlayLayout;->mWindowContentOverlay:Landroid/graphics/drawable/Drawable; + .line 151 + iget-object v3, p0, Landroid/support/v7/widget/ActionBarOverlayLayout;->mWindowContentOverlay:Landroid/graphics/drawable/Drawable; + if-nez v3, :cond_0 const/4 v3, 0x1 @@ -421,7 +427,6 @@ :cond_0 const/4 v3, 0x0 - .line 151 :goto_0 invoke-virtual {p0, v3}, Landroid/support/v7/widget/ActionBarOverlayLayout;->setWillNotDraw(Z)V @@ -676,7 +681,7 @@ .end method .method protected fitSystemWindows(Landroid/graphics/Rect;)Z - .locals 7 + .locals 8 .line 287 invoke-virtual {p0}, Landroid/support/v7/widget/ActionBarOverlayLayout;->pullChildren()V @@ -684,22 +689,26 @@ .line 289 invoke-static {p0}, Landroid/support/v4/view/ViewCompat;->getWindowSystemUiVisibility(Landroid/view/View;)I - .line 294 - iget-object v1, p0, Landroid/support/v7/widget/ActionBarOverlayLayout;->mActionBarTop:Landroid/support/v7/widget/ActionBarContainer; + move-result v0 - const/4 v3, 0x1 + and-int/lit16 v0, v0, 0x100 + + .line 294 + iget-object v2, p0, Landroid/support/v7/widget/ActionBarOverlayLayout;->mActionBarTop:Landroid/support/v7/widget/ActionBarContainer; const/4 v4, 0x1 - const/4 v5, 0x0 + const/4 v5, 0x1 - const/4 v6, 0x1 + const/4 v6, 0x0 - move-object v0, p0 + const/4 v7, 0x1 - move-object v2, p1 + move-object v1, p0 - invoke-direct/range {v0 .. v6}, Landroid/support/v7/widget/ActionBarOverlayLayout;->applyInsets(Landroid/view/View;Landroid/graphics/Rect;ZZZZ)Z + move-object v3, p1 + + invoke-direct/range {v1 .. v7}, Landroid/support/v7/widget/ActionBarOverlayLayout;->applyInsets(Landroid/view/View;Landroid/graphics/Rect;ZZZZ)Z move-result v0 @@ -1635,6 +1644,8 @@ iput p1, p0, Landroid/support/v7/widget/ActionBarOverlayLayout;->mHideOnContentScrollReference:I .line 489 + iget p1, p0, Landroid/support/v7/widget/ActionBarOverlayLayout;->mHideOnContentScrollReference:I + invoke-virtual {p0, p1}, Landroid/support/v7/widget/ActionBarOverlayLayout;->setActionBarHideOffset(I)V return-void diff --git a/smali/android/support/v7/widget/ActionMenuPresenter$ActionButtonSubmenu.smali b/smali/android/support/v7/widget/ActionMenuPresenter$ActionButtonSubmenu.smali index 45d339a0..fc6f659a 100644 --- a/smali/android/support/v7/widget/ActionMenuPresenter$ActionButtonSubmenu.smali +++ b/smali/android/support/v7/widget/ActionMenuPresenter$ActionButtonSubmenu.smali @@ -94,11 +94,9 @@ iput-object v1, v0, Landroid/support/v7/widget/ActionMenuPresenter;->mActionButtonPopup:Landroid/support/v7/widget/ActionMenuPresenter$ActionButtonSubmenu; - .line 762 - iget-object v0, p0, Landroid/support/v7/widget/ActionMenuPresenter$ActionButtonSubmenu;->this$0:Landroid/support/v7/widget/ActionMenuPresenter; - const/4 v1, 0x0 + .line 762 iput v1, v0, Landroid/support/v7/widget/ActionMenuPresenter;->mOpenSubMenuId:I .line 764 diff --git a/smali/android/support/v7/widget/ActionMenuPresenter$OverflowMenuButton.smali b/smali/android/support/v7/widget/ActionMenuPresenter$OverflowMenuButton.smali index 446c38a6..5b2ffd75 100644 --- a/smali/android/support/v7/widget/ActionMenuPresenter$OverflowMenuButton.smali +++ b/smali/android/support/v7/widget/ActionMenuPresenter$OverflowMenuButton.smali @@ -39,9 +39,9 @@ const/4 p2, 0x2 + .line 640 new-array p2, p2, [F - .line 640 iput-object p2, p0, Landroid/support/v7/widget/ActionMenuPresenter$OverflowMenuButton;->mTempPts:[F const/4 p2, 0x1 diff --git a/smali/android/support/v7/widget/ActionMenuPresenter.smali b/smali/android/support/v7/widget/ActionMenuPresenter.smali index 3c421fb3..c86b4dbb 100644 --- a/smali/android/support/v7/widget/ActionMenuPresenter.smali +++ b/smali/android/support/v7/widget/ActionMenuPresenter.smali @@ -340,19 +340,21 @@ check-cast v7, Landroid/view/ViewGroup; + move v11, v4 + + const/4 v4, 0x0 + const/4 v8, 0x0 const/4 v9, 0x0 const/4 v10, 0x0 - const/4 v11, 0x0 - :goto_1 - if-ge v8, v3, :cond_4 + if-ge v4, v3, :cond_4 .line 439 - invoke-virtual {v1, v8}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v1, v4}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; move-result-object v13 @@ -365,7 +367,7 @@ if-eqz v14, :cond_1 - add-int/lit8 v10, v10, 0x1 + add-int/lit8 v9, v9, 0x1 goto :goto_2 @@ -377,12 +379,12 @@ if-eqz v14, :cond_2 - add-int/lit8 v11, v11, 0x1 + add-int/lit8 v10, v10, 0x1 goto :goto_2 :cond_2 - const/4 v9, 0x1 + const/4 v8, 0x1 .line 447 :goto_2 @@ -396,72 +398,74 @@ if-eqz v12, :cond_3 - const/4 v4, 0x0 + const/4 v11, 0x0 :cond_3 - add-int/lit8 v8, v8, 0x1 + add-int/lit8 v4, v4, 0x1 goto :goto_1 .line 455 :cond_4 - iget-boolean v8, v0, Landroid/support/v7/widget/ActionMenuPresenter;->mReserveOverflow:Z + iget-boolean v4, v0, Landroid/support/v7/widget/ActionMenuPresenter;->mReserveOverflow:Z - if-eqz v8, :cond_6 + if-eqz v4, :cond_6 - if-nez v9, :cond_5 + if-nez v8, :cond_5 - add-int/2addr v11, v10 + add-int/2addr v10, v9 - if-le v11, v4, :cond_6 + if-le v10, v11, :cond_6 :cond_5 - add-int/lit8 v4, v4, -0x1 + add-int/lit8 v11, v11, -0x1 :cond_6 - sub-int/2addr v4, v10 + sub-int/2addr v11, v9 .line 461 - iget-object v8, v0, Landroid/support/v7/widget/ActionMenuPresenter;->mActionButtonGroups:Landroid/util/SparseBooleanArray; + iget-object v4, v0, Landroid/support/v7/widget/ActionMenuPresenter;->mActionButtonGroups:Landroid/util/SparseBooleanArray; .line 462 - invoke-virtual {v8}, Landroid/util/SparseBooleanArray;->clear()V + invoke-virtual {v4}, Landroid/util/SparseBooleanArray;->clear()V .line 466 - iget-boolean v9, v0, Landroid/support/v7/widget/ActionMenuPresenter;->mStrictWidthLimit:Z + iget-boolean v8, v0, Landroid/support/v7/widget/ActionMenuPresenter;->mStrictWidthLimit:Z - if-eqz v9, :cond_7 + if-eqz v8, :cond_7 .line 467 - iget v9, v0, Landroid/support/v7/widget/ActionMenuPresenter;->mMinCellSize:I + iget v8, v0, Landroid/support/v7/widget/ActionMenuPresenter;->mMinCellSize:I - div-int v10, v5, v9 + div-int v9, v5, v8 .line 468 - rem-int v11, v5, v9 + rem-int v10, v5, v8 .line 469 - div-int/2addr v11, v10 + div-int/2addr v10, v9 - add-int/2addr v9, v11 + add-int/2addr v8, v10 goto :goto_3 :cond_7 - const/4 v9, 0x0 + const/4 v8, 0x0 - const/4 v10, 0x0 + const/4 v9, 0x0 :goto_3 - const/4 v11, 0x0 + move v10, v5 + + const/4 v5, 0x0 const/4 v13, 0x0 :goto_4 - if-ge v11, v3, :cond_1d + if-ge v5, v3, :cond_1d .line 474 - invoke-virtual {v1, v11}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v1, v5}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; move-result-object v14 @@ -496,11 +500,11 @@ if-eqz v12, :cond_9 .line 482 - invoke-static {v15, v9, v10, v6, v2}, Landroid/support/v7/widget/ActionMenuView;->measureChildForCells(Landroid/view/View;IIII)I + invoke-static {v15, v8, v9, v6, v2}, Landroid/support/v7/widget/ActionMenuView;->measureChildForCells(Landroid/view/View;IIII)I move-result v12 - sub-int/2addr v10, v12 + sub-int/2addr v9, v12 goto :goto_5 @@ -514,35 +518,45 @@ move-result v12 - sub-int/2addr v5, v12 + sub-int/2addr v10, v12 if-nez v13, :cond_a - move v13, v12 + goto :goto_6 - .line 492 :cond_a + move v12, v13 + + .line 492 + :goto_6 invoke-virtual {v14}, Landroid/support/v7/view/menu/MenuItemImpl;->getGroupId()I - move-result v12 + move-result v13 - const/4 v15, 0x1 + if-eqz v13, :cond_b - if-eqz v12, :cond_b + const/4 v15, 0x1 .line 494 - invoke-virtual {v8, v12, v15}, Landroid/util/SparseBooleanArray;->put(IZ)V + invoke-virtual {v4, v13, v15}, Landroid/util/SparseBooleanArray;->put(IZ)V + + goto :goto_7 - .line 496 :cond_b + const/4 v15, 0x1 + + .line 496 + :goto_7 invoke-virtual {v14, v15}, Landroid/support/v7/view/menu/MenuItemImpl;->setIsActionButton(Z)V move/from16 v17, v3 - :goto_6 + move v13, v12 + + :goto_8 const/4 v0, 0x0 - goto/16 :goto_e + goto/16 :goto_10 .line 497 :cond_c @@ -558,37 +572,37 @@ move-result v12 .line 501 - invoke-virtual {v8, v12}, Landroid/util/SparseBooleanArray;->get(I)Z + invoke-virtual {v4, v12}, Landroid/util/SparseBooleanArray;->get(I)Z move-result v15 - if-gtz v4, :cond_d + if-gtz v11, :cond_d if-eqz v15, :cond_f :cond_d - if-lez v5, :cond_f + if-lez v10, :cond_f .line 502 iget-boolean v2, v0, Landroid/support/v7/widget/ActionMenuPresenter;->mStrictWidthLimit:Z if-eqz v2, :cond_e - if-lez v10, :cond_f + if-lez v9, :cond_f :cond_e const/4 v2, 0x1 - goto :goto_7 + goto :goto_9 :cond_f const/4 v2, 0x0 - :goto_7 - move/from16 v16, v2 - + :goto_9 if-eqz v2, :cond_16 + move/from16 v16, v2 + .line 506 iget-object v2, v0, Landroid/support/v7/widget/ActionMenuPresenter;->mScrapActionButtonView:Landroid/view/View; @@ -615,17 +629,17 @@ const/4 v3, 0x0 .line 511 - invoke-static {v2, v9, v10, v6, v3}, Landroid/support/v7/widget/ActionMenuView;->measureChildForCells(Landroid/view/View;IIII)I + invoke-static {v2, v8, v9, v6, v3}, Landroid/support/v7/widget/ActionMenuView;->measureChildForCells(Landroid/view/View;IIII)I move-result v18 - sub-int v10, v10, v18 + sub-int v9, v9, v18 if-nez v18, :cond_12 const/16 v16, 0x0 - goto :goto_8 + goto :goto_a .line 518 :cond_11 @@ -633,12 +647,12 @@ .line 520 :cond_12 - :goto_8 + :goto_a invoke-virtual {v2}, Landroid/view/View;->getMeasuredWidth()I move-result v2 - sub-int/2addr v5, v2 + sub-int/2addr v10, v2 if-nez v13, :cond_13 @@ -650,32 +664,34 @@ if-eqz v2, :cond_14 - if-ltz v5, :cond_15 + if-ltz v10, :cond_15 - goto :goto_9 + goto :goto_b :cond_14 - add-int v2, v5, v13 + add-int v2, v10, v13 if-lez v2, :cond_15 - :goto_9 + :goto_b const/4 v2, 0x1 - goto :goto_a + goto :goto_c :cond_15 const/4 v2, 0x0 - :goto_a + :goto_c and-int v2, v16, v2 - goto :goto_b + goto :goto_d :cond_16 + move/from16 v16, v2 + move/from16 v17, v3 - :goto_b + :goto_d if-eqz v2, :cond_17 if-eqz v12, :cond_17 @@ -683,9 +699,9 @@ const/4 v3, 0x1 .line 535 - invoke-virtual {v8, v12, v3}, Landroid/util/SparseBooleanArray;->put(IZ)V + invoke-virtual {v4, v12, v3}, Landroid/util/SparseBooleanArray;->put(IZ)V - goto :goto_d + goto :goto_f :cond_17 if-eqz v15, :cond_1a @@ -693,12 +709,12 @@ const/4 v3, 0x0 .line 538 - invoke-virtual {v8, v12, v3}, Landroid/util/SparseBooleanArray;->put(IZ)V + invoke-virtual {v4, v12, v3}, Landroid/util/SparseBooleanArray;->put(IZ)V const/4 v3, 0x0 - :goto_c - if-ge v3, v11, :cond_1a + :goto_e + if-ge v3, v5, :cond_1a .line 540 invoke-virtual {v1, v3}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; @@ -721,7 +737,7 @@ if-eqz v0, :cond_18 - add-int/lit8 v4, v4, 0x1 + add-int/lit8 v11, v11, 0x1 :cond_18 const/4 v0, 0x0 @@ -734,19 +750,19 @@ move-object/from16 v0, p0 - goto :goto_c + goto :goto_e :cond_1a - :goto_d + :goto_f if-eqz v2, :cond_1b - add-int/lit8 v4, v4, -0x1 + add-int/lit8 v11, v11, -0x1 .line 551 :cond_1b invoke-virtual {v14, v2}, Landroid/support/v7/view/menu/MenuItemImpl;->setIsActionButton(Z)V - goto/16 :goto_6 + goto/16 :goto_8 :cond_1c move/from16 v17, v3 @@ -756,15 +772,15 @@ .line 554 invoke-virtual {v14, v0}, Landroid/support/v7/view/menu/MenuItemImpl;->setIsActionButton(Z)V - :goto_e - add-int/lit8 v11, v11, 0x1 + :goto_10 + add-int/lit8 v5, v5, 0x1 + + const/4 v2, 0x0 move-object/from16 v0, p0 move/from16 v3, v17 - const/4 v2, 0x0 - goto/16 :goto_4 :cond_1d @@ -966,6 +982,14 @@ .method public initForMenu(Landroid/content/Context;Landroid/support/v7/view/menu/MenuBuilder;)V .locals 4 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v7/view/menu/MenuBuilder; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 93 invoke-super {p0, p1, p2}, Landroid/support/v7/view/menu/BaseMenuPresenter;->initForMenu(Landroid/content/Context;Landroid/support/v7/view/menu/MenuBuilder;)V @@ -1044,26 +1068,28 @@ iput-object v0, p0, Landroid/support/v7/widget/ActionMenuPresenter;->mOverflowButton:Landroid/support/v7/widget/ActionMenuPresenter$OverflowMenuButton; .line 115 - iget-boolean v2, p0, Landroid/support/v7/widget/ActionMenuPresenter;->mPendingOverflowIconSet:Z + iget-boolean v0, p0, Landroid/support/v7/widget/ActionMenuPresenter;->mPendingOverflowIconSet:Z - const/4 v3, 0x0 + const/4 v2, 0x0 - if-eqz v2, :cond_3 + if-eqz v0, :cond_3 .line 116 - iget-object v2, p0, Landroid/support/v7/widget/ActionMenuPresenter;->mPendingOverflowIcon:Landroid/graphics/drawable/Drawable; + iget-object v0, p0, Landroid/support/v7/widget/ActionMenuPresenter;->mOverflowButton:Landroid/support/v7/widget/ActionMenuPresenter$OverflowMenuButton; + + iget-object v3, p0, Landroid/support/v7/widget/ActionMenuPresenter;->mPendingOverflowIcon:Landroid/graphics/drawable/Drawable; - invoke-virtual {v0, v2}, Landroid/support/v7/widget/ActionMenuPresenter$OverflowMenuButton;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V + invoke-virtual {v0, v3}, Landroid/support/v7/widget/ActionMenuPresenter$OverflowMenuButton;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V .line 117 iput-object v1, p0, Landroid/support/v7/widget/ActionMenuPresenter;->mPendingOverflowIcon:Landroid/graphics/drawable/Drawable; .line 118 - iput-boolean v3, p0, Landroid/support/v7/widget/ActionMenuPresenter;->mPendingOverflowIconSet:Z + iput-boolean v2, p0, Landroid/support/v7/widget/ActionMenuPresenter;->mPendingOverflowIconSet:Z .line 120 :cond_3 - invoke-static {v3, v3}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I + invoke-static {v2, v2}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I move-result v0 @@ -1399,7 +1425,9 @@ iput-object v2, p0, Landroid/support/v7/widget/ActionMenuPresenter;->mActionButtonPopup:Landroid/support/v7/widget/ActionMenuPresenter$ActionButtonSubmenu; .line 313 - invoke-virtual {v2, v1}, Landroid/support/v7/widget/ActionMenuPresenter$ActionButtonSubmenu;->setForceShowIcon(Z)V + iget-object v0, p0, Landroid/support/v7/widget/ActionMenuPresenter;->mActionButtonPopup:Landroid/support/v7/widget/ActionMenuPresenter$ActionButtonSubmenu; + + invoke-virtual {v0, v1}, Landroid/support/v7/widget/ActionMenuPresenter$ActionButtonSubmenu;->setForceShowIcon(Z)V .line 314 iget-object v0, p0, Landroid/support/v7/widget/ActionMenuPresenter;->mActionButtonPopup:Landroid/support/v7/widget/ActionMenuPresenter$ActionButtonSubmenu; diff --git a/smali/android/support/v7/widget/ActionMenuView$ActionMenuChildView.smali b/smali/android/support/v7/widget/ActionMenuView$ActionMenuChildView.smali index 0cc694b0..ce7fd842 100644 --- a/smali/android/support/v7/widget/ActionMenuView$ActionMenuChildView.smali +++ b/smali/android/support/v7/widget/ActionMenuView$ActionMenuChildView.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v7/widget/ActionMenuView; .end annotation diff --git a/smali/android/support/v7/widget/ActionMenuView.smali b/smali/android/support/v7/widget/ActionMenuView.smali index 91cb5bdf..323d41da 100644 --- a/smali/android/support/v7/widget/ActionMenuView.smali +++ b/smali/android/support/v7/widget/ActionMenuView.smali @@ -343,14 +343,16 @@ move-result v8 + move v14, v7 + + const/4 v7, 0x0 + const/4 v10, 0x0 const/4 v12, 0x0 const/4 v13, 0x0 - const/4 v14, 0x0 - const/4 v15, 0x0 const/16 v16, 0x0 @@ -358,10 +360,10 @@ const-wide/16 v17, 0x0 :goto_0 - if-ge v12, v8, :cond_8 + if-ge v7, v8, :cond_8 .line 214 - invoke-virtual {v0, v12}, Landroid/support/v7/widget/ActionMenuView;->getChildAt(I)Landroid/view/View; + invoke-virtual {v0, v7}, Landroid/support/v7/widget/ActionMenuView;->getChildAt(I)Landroid/view/View; move-result-object v11 @@ -382,25 +384,25 @@ :cond_1 instance-of v3, v11, Landroid/support/v7/view/menu/ActionMenuItemView; - add-int/lit8 v14, v14, 0x1 + add-int/lit8 v13, v13, 0x1 if-eqz v3, :cond_2 .line 223 iget v9, v0, Landroid/support/v7/widget/ActionMenuView;->mGeneratedItemPadding:I - move/from16 v20, v14 + move/from16 v20, v13 - const/4 v14, 0x0 + const/4 v13, 0x0 - invoke-virtual {v11, v9, v14, v9, v14}, Landroid/view/View;->setPadding(IIII)V + invoke-virtual {v11, v9, v13, v9, v13}, Landroid/view/View;->setPadding(IIII)V goto :goto_1 :cond_2 - move/from16 v20, v14 + move/from16 v20, v13 - const/4 v14, 0x0 + const/4 v13, 0x0 .line 226 :goto_1 @@ -411,22 +413,22 @@ check-cast v9, Landroid/support/v7/widget/ActionMenuView$LayoutParams; .line 227 - iput-boolean v14, v9, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->expanded:Z + iput-boolean v13, v9, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->expanded:Z .line 228 - iput v14, v9, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->extraPixels:I + iput v13, v9, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->extraPixels:I .line 229 - iput v14, v9, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->cellsUsed:I + iput v13, v9, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->cellsUsed:I .line 230 - iput-boolean v14, v9, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->expandable:Z + iput-boolean v13, v9, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->expandable:Z .line 231 - iput v14, v9, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->leftMargin:I + iput v13, v9, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->leftMargin:I .line 232 - iput v14, v9, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->rightMargin:I + iput v13, v9, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->rightMargin:I if-eqz v3, :cond_3 @@ -461,7 +463,7 @@ goto :goto_3 :cond_4 - move v3, v7 + move v3, v14 .line 238 :goto_3 @@ -472,12 +474,12 @@ .line 241 invoke-static {v15, v3}, Ljava/lang/Math;->max(II)I - move-result v15 + move-result v13 .line 242 - iget-boolean v14, v9, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->expandable:Z + iget-boolean v15, v9, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->expandable:Z - if-eqz v14, :cond_5 + if-eqz v15, :cond_5 add-int/lit8 v16, v16, 0x1 @@ -487,10 +489,10 @@ if-eqz v9, :cond_6 - const/4 v13, 0x1 + const/4 v12, 0x1 :cond_6 - sub-int/2addr v7, v3 + sub-int/2addr v14, v3 .line 246 invoke-virtual {v11}, Landroid/view/View;->getMeasuredHeight()I @@ -505,7 +507,7 @@ if-ne v3, v9, :cond_7 - shl-int v3, v9, v12 + shl-int v3, v9, v7 move v11, v10 @@ -523,10 +525,12 @@ move v11, v10 :goto_4 - move/from16 v14, v20 + move v15, v13 + + move/from16 v13, v20 :goto_5 - add-int/lit8 v12, v12, 0x1 + add-int/lit8 v7, v7, 0x1 move/from16 v3, v19 @@ -539,9 +543,9 @@ const/4 v3, 0x2 - if-eqz v13, :cond_9 + if-eqz v12, :cond_9 - if-ne v14, v3, :cond_9 + if-ne v13, v3, :cond_9 const/4 v5, 0x1 @@ -551,28 +555,30 @@ const/4 v5, 0x0 :goto_6 - const/4 v9, 0x0 + const/4 v7, 0x0 :goto_7 + const-wide/16 v20, 0x1 + if-lez v16, :cond_13 - if-lez v7, :cond_13 + if-lez v14, :cond_13 - const v20, 0x7fffffff + const v9, 0x7fffffff - const/4 v3, 0x0 + const v3, 0x7fffffff - const/4 v11, 0x0 + const/4 v9, 0x0 - const v12, 0x7fffffff + const/4 v11, 0x0 - const-wide/16 v20, 0x0 + const-wide/16 v22, 0x0 :goto_8 - if-ge v11, v8, :cond_d + if-ge v9, v8, :cond_d .line 263 - invoke-virtual {v0, v11}, Landroid/support/v7/widget/ActionMenuView;->getChildAt(I)Landroid/view/View; + invoke-virtual {v0, v9}, Landroid/support/v7/widget/ActionMenuView;->getChildAt(I)Landroid/view/View; move-result-object v24 @@ -581,16 +587,16 @@ move-result-object v24 - move/from16 v25, v9 + move/from16 v25, v7 - move-object/from16 v9, v24 + move-object/from16 v7, v24 - check-cast v9, Landroid/support/v7/widget/ActionMenuView$LayoutParams; + check-cast v7, Landroid/support/v7/widget/ActionMenuView$LayoutParams; move/from16 v24, v10 .line 267 - iget-boolean v10, v9, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->expandable:Z + iget-boolean v10, v7, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->expandable:Z if-nez v10, :cond_a @@ -598,59 +604,51 @@ .line 270 :cond_a - iget v10, v9, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->cellsUsed:I + iget v10, v7, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->cellsUsed:I - if-ge v10, v12, :cond_b + if-ge v10, v3, :cond_b .line 271 - iget v3, v9, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->cellsUsed:I - - const-wide/16 v22, 0x1 + iget v3, v7, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->cellsUsed:I - shl-long v9, v22, v11 + shl-long v10, v20, v9 - move v12, v3 + move-wide/from16 v22, v10 - move-wide/from16 v20, v9 - - const/4 v3, 0x1 + const/4 v11, 0x1 goto :goto_9 - :cond_b - const-wide/16 v22, 0x1 - .line 274 - iget v9, v9, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->cellsUsed:I + :cond_b + iget v7, v7, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->cellsUsed:I - if-ne v9, v12, :cond_c + if-ne v7, v3, :cond_c - shl-long v9, v22, v11 + shl-long v26, v20, v9 - or-long v9, v20, v9 + or-long v22, v22, v26 - add-int/lit8 v3, v3, 0x1 - - move-wide/from16 v20, v9 + add-int/lit8 v11, v11, 0x1 :cond_c :goto_9 - add-int/lit8 v11, v11, 0x1 + add-int/lit8 v9, v9, 0x1 move/from16 v10, v24 - move/from16 v9, v25 + move/from16 v7, v25 goto :goto_8 :cond_d - move/from16 v25, v9 + move/from16 v25, v7 move/from16 v24, v10 - or-long v17, v17, v20 + or-long v17, v17, v22 - if-le v3, v7, :cond_e + if-le v11, v14, :cond_e move v11, v1 @@ -659,15 +657,15 @@ goto :goto_d :cond_e - add-int/lit8 v12, v12, 0x1 + add-int/lit8 v3, v3, 0x1 - const/4 v3, 0x0 + const/4 v7, 0x0 :goto_a - if-ge v3, v8, :cond_12 + if-ge v7, v8, :cond_12 .line 289 - invoke-virtual {v0, v3}, Landroid/support/v7/widget/ActionMenuView;->getChildAt(I)Landroid/view/View; + invoke-virtual {v0, v7}, Landroid/support/v7/widget/ActionMenuView;->getChildAt(I)Landroid/view/View; move-result-object v9 @@ -682,29 +680,29 @@ const/4 v11, 0x1 - shl-int v2, v11, v3 + shl-int v2, v11, v7 move v11, v1 int-to-long v1, v2 - and-long v22, v20, v1 + and-long v20, v22, v1 const-wide/16 v27, 0x0 - cmp-long v25, v22, v27 + cmp-long v25, v20, v27 if-nez v25, :cond_10 .line 293 iget v9, v10, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->cellsUsed:I - if-ne v9, v12, :cond_f + if-ne v9, v3, :cond_f or-long v17, v17, v1 :cond_f - move/from16 v27, v5 + move/from16 v20, v3 goto :goto_c @@ -718,23 +716,23 @@ const/4 v1, 0x1 - if-ne v7, v1, :cond_11 + if-ne v14, v1, :cond_11 .line 299 iget v2, v0, Landroid/support/v7/widget/ActionMenuView;->mGeneratedItemPadding:I add-int v1, v2, v4 - move/from16 v27, v5 + move/from16 v20, v3 - const/4 v5, 0x0 + const/4 v3, 0x0 - invoke-virtual {v9, v1, v5, v2, v5}, Landroid/view/View;->setPadding(IIII)V + invoke-virtual {v9, v1, v3, v2, v3}, Landroid/view/View;->setPadding(IIII)V goto :goto_b :cond_11 - move/from16 v27, v5 + move/from16 v20, v3 .line 301 :goto_b @@ -749,16 +747,16 @@ .line 302 iput-boolean v2, v10, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->expanded:Z - add-int/lit8 v7, v7, -0x1 + add-int/lit8 v14, v14, -0x1 :goto_c - add-int/lit8 v3, v3, 0x1 + add-int/lit8 v7, v7, 0x1 move v1, v11 - move/from16 v2, v26 + move/from16 v3, v20 - move/from16 v5, v27 + move/from16 v2, v26 goto :goto_a @@ -767,7 +765,7 @@ const/4 v3, 0x2 - const/4 v9, 0x1 + const/4 v7, 0x1 goto/16 :goto_7 @@ -776,67 +774,68 @@ move/from16 v26, v2 - move/from16 v25, v9 + move/from16 v25, v7 move/from16 v24, v10 :goto_d - const/4 v1, 0x1 + if-nez v12, :cond_14 - if-nez v13, :cond_14 + const/4 v1, 0x1 - if-ne v14, v1, :cond_14 + if-ne v13, v1, :cond_15 const/4 v2, 0x1 goto :goto_e :cond_14 + const/4 v1, 0x1 + + :cond_15 const/4 v2, 0x0 :goto_e - if-lez v7, :cond_20 + if-lez v14, :cond_22 const-wide/16 v9, 0x0 cmp-long v3, v17, v9 - if-eqz v3, :cond_20 + if-eqz v3, :cond_22 - sub-int/2addr v14, v1 + sub-int/2addr v13, v1 - if-lt v7, v14, :cond_15 + if-lt v14, v13, :cond_16 - if-nez v2, :cond_15 + if-nez v2, :cond_16 - if-le v15, v1, :cond_20 + if-le v15, v1, :cond_22 .line 315 - :cond_15 + :cond_16 invoke-static/range {v17 .. v18}, Ljava/lang/Long;->bitCount(J)I move-result v1 int-to-float v1, v1 - if-nez v2, :cond_17 + if-nez v2, :cond_19 - const-wide/16 v2, 0x1 - - and-long v2, v17, v2 + and-long v2, v17, v20 const/high16 v5, 0x3f000000 # 0.5f const-wide/16 v9, 0x0 - cmp-long v12, v2, v9 + cmp-long v7, v2, v9 - const/4 v14, 0x0 + if-eqz v7, :cond_17 - if-eqz v12, :cond_16 + const/4 v13, 0x0 .line 320 - invoke-virtual {v0, v14}, Landroid/support/v7/widget/ActionMenuView;->getChildAt(I)Landroid/view/View; + invoke-virtual {v0, v13}, Landroid/support/v7/widget/ActionMenuView;->getChildAt(I)Landroid/view/View; move-result-object v2 @@ -849,26 +848,32 @@ .line 321 iget-boolean v2, v2, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->preventEdgeOffset:Z - if-nez v2, :cond_16 + if-nez v2, :cond_18 sub-float/2addr v1, v5 - :cond_16 + goto :goto_f + + :cond_17 + const/4 v13, 0x0 + + :cond_18 + :goto_f add-int/lit8 v2, v8, -0x1 const/4 v3, 0x1 - shl-int v9, v3, v2 + shl-int v7, v3, v2 - int-to-long v9, v9 + int-to-long v9, v7 and-long v9, v17, v9 - const-wide/16 v12, 0x0 + const-wide/16 v15, 0x0 - cmp-long v3, v9, v12 + cmp-long v3, v9, v15 - if-eqz v3, :cond_18 + if-eqz v3, :cond_1a .line 324 invoke-virtual {v0, v2}, Landroid/support/v7/widget/ActionMenuView;->getChildAt(I)Landroid/view/View; @@ -884,187 +889,181 @@ .line 325 iget-boolean v2, v2, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->preventEdgeOffset:Z - if-nez v2, :cond_18 + if-nez v2, :cond_1a sub-float/2addr v1, v5 - goto :goto_f + goto :goto_10 - :cond_17 - const/4 v14, 0x0 + :cond_19 + const/4 v13, 0x0 - :cond_18 - :goto_f + :cond_1a + :goto_10 const/4 v2, 0x0 cmpl-float v2, v1, v2 - if-lez v2, :cond_19 + if-lez v2, :cond_1b - mul-int v7, v7, v4 + mul-int v14, v14, v4 - int-to-float v2, v7 + int-to-float v2, v14 div-float/2addr v2, v1 - float-to-int v1, v2 + float-to-int v9, v2 - goto :goto_10 - - :cond_19 - const/4 v1, 0x0 - - :goto_10 - move/from16 v9, v25 + goto :goto_11 - const/4 v2, 0x0 + :cond_1b + const/4 v9, 0x0 :goto_11 - if-ge v2, v8, :cond_21 + const/4 v1, 0x0 - const/4 v3, 0x1 + :goto_12 + if-ge v1, v8, :cond_23 + + const/4 v2, 0x1 - shl-int v5, v3, v2 + shl-int v3, v2, v1 - int-to-long v12, v5 + int-to-long v2, v3 - and-long v12, v17, v12 + and-long v2, v17, v2 - const-wide/16 v15, 0x0 + const-wide/16 v14, 0x0 - cmp-long v3, v12, v15 + cmp-long v5, v2, v14 - if-nez v3, :cond_1a + if-nez v5, :cond_1c - const/4 v3, 0x1 + const/4 v2, 0x1 - const/4 v7, 0x2 + const/4 v5, 0x2 - goto :goto_14 + goto :goto_15 .line 335 - :cond_1a - invoke-virtual {v0, v2}, Landroid/support/v7/widget/ActionMenuView;->getChildAt(I)Landroid/view/View; + :cond_1c + invoke-virtual {v0, v1}, Landroid/support/v7/widget/ActionMenuView;->getChildAt(I)Landroid/view/View; - move-result-object v3 + move-result-object v2 .line 336 - invoke-virtual {v3}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams; + invoke-virtual {v2}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams; - move-result-object v5 + move-result-object v3 - check-cast v5, Landroid/support/v7/widget/ActionMenuView$LayoutParams; + check-cast v3, Landroid/support/v7/widget/ActionMenuView$LayoutParams; .line 337 - instance-of v3, v3, Landroid/support/v7/view/menu/ActionMenuItemView; + instance-of v2, v2, Landroid/support/v7/view/menu/ActionMenuItemView; - if-eqz v3, :cond_1c + if-eqz v2, :cond_1e .line 339 - iput v1, v5, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->extraPixels:I + iput v9, v3, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->extraPixels:I - const/4 v3, 0x1 + const/4 v2, 0x1 .line 340 - iput-boolean v3, v5, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->expanded:Z + iput-boolean v2, v3, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->expanded:Z - if-nez v2, :cond_1b + if-nez v1, :cond_1d .line 341 - iget-boolean v3, v5, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->preventEdgeOffset:Z + iget-boolean v2, v3, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->preventEdgeOffset:Z - if-nez v3, :cond_1b + if-nez v2, :cond_1d - neg-int v3, v1 + neg-int v2, v9 - const/4 v7, 0x2 + const/4 v5, 0x2 .line 344 - div-int/2addr v3, v7 + div-int/2addr v2, v5 - iput v3, v5, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->leftMargin:I + iput v2, v3, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->leftMargin:I - goto :goto_12 + goto :goto_13 - :cond_1b - const/4 v7, 0x2 + :cond_1d + const/4 v5, 0x2 - :goto_12 - const/4 v3, 0x1 + :goto_13 + const/4 v2, 0x1 - goto :goto_13 + goto :goto_14 - :cond_1c - const/4 v7, 0x2 + :cond_1e + const/4 v5, 0x2 .line 347 - iget-boolean v3, v5, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->isOverflowButton:Z + iget-boolean v2, v3, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->isOverflowButton:Z - if-eqz v3, :cond_1d + if-eqz v2, :cond_1f .line 348 - iput v1, v5, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->extraPixels:I + iput v9, v3, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->extraPixels:I - const/4 v3, 0x1 + const/4 v2, 0x1 .line 349 - iput-boolean v3, v5, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->expanded:Z + iput-boolean v2, v3, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->expanded:Z - neg-int v9, v1 + neg-int v7, v9 .line 350 - div-int/2addr v9, v7 + div-int/2addr v7, v5 - iput v9, v5, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->rightMargin:I + iput v7, v3, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->rightMargin:I - :goto_13 - const/4 v9, 0x1 + :goto_14 + const/16 v25, 0x1 - goto :goto_14 + goto :goto_15 - :cond_1d - const/4 v3, 0x1 + :cond_1f + const/4 v2, 0x1 - if-eqz v2, :cond_1e + if-eqz v1, :cond_20 .line 357 - div-int/lit8 v10, v1, 0x2 + div-int/lit8 v7, v9, 0x2 - iput v10, v5, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->leftMargin:I + iput v7, v3, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->leftMargin:I - :cond_1e - add-int/lit8 v10, v8, -0x1 + :cond_20 + add-int/lit8 v7, v8, -0x1 - if-eq v2, v10, :cond_1f + if-eq v1, v7, :cond_21 .line 360 - div-int/lit8 v10, v1, 0x2 + div-int/lit8 v7, v9, 0x2 - iput v10, v5, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->rightMargin:I + iput v7, v3, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->rightMargin:I - :cond_1f - :goto_14 - add-int/lit8 v2, v2, 0x1 - - goto :goto_11 + :cond_21 + :goto_15 + add-int/lit8 v1, v1, 0x1 - :cond_20 - const/4 v14, 0x0 + goto :goto_12 - move/from16 v9, v25 + :cond_22 + const/4 v13, 0x0 - :cond_21 + :cond_23 const/high16 v1, 0x40000000 # 2.0f - if-eqz v9, :cond_23 - - const/4 v9, 0x0 + if-eqz v25, :cond_25 - :goto_15 - if-ge v9, v8, :cond_23 + :goto_16 + if-ge v13, v8, :cond_25 .line 371 - invoke-virtual {v0, v9}, Landroid/support/v7/widget/ActionMenuView;->getChildAt(I)Landroid/view/View; + invoke-virtual {v0, v13}, Landroid/support/v7/widget/ActionMenuView;->getChildAt(I)Landroid/view/View; move-result-object v2 @@ -1078,12 +1077,12 @@ .line 374 iget-boolean v5, v3, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->expanded:Z - if-nez v5, :cond_22 + if-nez v5, :cond_24 - goto :goto_16 + goto :goto_17 .line 376 - :cond_22 + :cond_24 iget v5, v3, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->cellsUsed:I mul-int v5, v5, v4 @@ -1099,26 +1098,26 @@ invoke-virtual {v2, v3, v6}, Landroid/view/View;->measure(II)V - :goto_16 - add-int/lit8 v9, v9, 0x1 + :goto_17 + add-int/lit8 v13, v13, 0x1 - goto :goto_15 + goto :goto_16 - :cond_23 - if-eq v11, v1, :cond_24 + :cond_25 + if-eq v11, v1, :cond_26 - move/from16 v3, v24 + move/from16 v1, v24 - goto :goto_17 + goto :goto_18 - :cond_24 - move/from16 v3, v19 + :cond_26 + move/from16 v1, v19 - :goto_17 + :goto_18 move/from16 v2, v26 .line 386 - invoke-virtual {v0, v2, v3}, Landroid/support/v7/widget/ActionMenuView;->setMeasuredDimension(II)V + invoke-virtual {v0, v2, v1}, Landroid/support/v7/widget/ActionMenuView;->setMeasuredDimension(II)V return-void .end method @@ -1316,6 +1315,11 @@ .method public generateOverflowButtonLayoutParams()Landroid/support/v7/widget/ActionMenuView$LayoutParams; .locals 2 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 616 invoke-virtual {p0}, Landroid/support/v7/widget/ActionMenuView;->generateDefaultLayoutParams()Landroid/support/v7/widget/ActionMenuView$LayoutParams; @@ -1351,6 +1355,8 @@ iput-object v1, p0, Landroid/support/v7/widget/ActionMenuView;->mMenu:Landroid/support/v7/view/menu/MenuBuilder; .line 654 + iget-object v1, p0, Landroid/support/v7/widget/ActionMenuView;->mMenu:Landroid/support/v7/view/menu/MenuBuilder; + new-instance v2, Landroid/support/v7/widget/ActionMenuView$MenuBuilderCallback; invoke-direct {v2, p0}, Landroid/support/v7/widget/ActionMenuView$MenuBuilderCallback;->(Landroid/support/v7/widget/ActionMenuView;)V @@ -1364,10 +1370,12 @@ iput-object v1, p0, Landroid/support/v7/widget/ActionMenuView;->mPresenter:Landroid/support/v7/widget/ActionMenuPresenter; - const/4 v0, 0x1 - .line 656 - invoke-virtual {v1, v0}, Landroid/support/v7/widget/ActionMenuPresenter;->setReserveOverflow(Z)V + iget-object v0, p0, Landroid/support/v7/widget/ActionMenuView;->mPresenter:Landroid/support/v7/widget/ActionMenuPresenter; + + const/4 v1, 0x1 + + invoke-virtual {v0, v1}, Landroid/support/v7/widget/ActionMenuPresenter;->setReserveOverflow(Z)V .line 657 iget-object v0, p0, Landroid/support/v7/widget/ActionMenuView;->mPresenter:Landroid/support/v7/widget/ActionMenuPresenter; @@ -1409,6 +1417,8 @@ .method public getOverflowIcon()Landroid/graphics/drawable/Drawable; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 565 invoke-virtual {p0}, Landroid/support/v7/widget/ActionMenuView;->getMenu()Landroid/view/Menu; @@ -1434,6 +1444,11 @@ .method public getWindowAnimations()I .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation const/4 v0, 0x0 @@ -1442,6 +1457,11 @@ .method protected hasSupportDividerBeforeChildAt(I)Z .locals 4 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation const/4 v0, 0x0 @@ -1530,6 +1550,11 @@ .method public initialize(Landroid/support/v7/view/menu/MenuBuilder;)V .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 639 iput-object p1, p0, Landroid/support/v7/widget/ActionMenuView;->mMenu:Landroid/support/v7/view/menu/MenuBuilder; @@ -1539,6 +1564,11 @@ .method public invokeItem(Landroid/support/v7/view/menu/MenuItemImpl;)Z .locals 2 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 625 iget-object v0, p0, Landroid/support/v7/widget/ActionMenuView;->mMenu:Landroid/support/v7/view/menu/MenuBuilder; @@ -1554,6 +1584,11 @@ .method public isOverflowMenuShowPending()Z .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 716 iget-object v0, p0, Landroid/support/v7/widget/ActionMenuView;->mPresenter:Landroid/support/v7/widget/ActionMenuPresenter; @@ -1604,6 +1639,11 @@ .method public isOverflowReserved()Z .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 572 iget-boolean v0, p0, Landroid/support/v7/widget/ActionMenuView;->mReserveOverflow:Z @@ -1713,21 +1753,23 @@ move-result v6 + move v10, v5 + + const/4 v5, 0x0 + const/4 v8, 0x0 const/4 v9, 0x0 - const/4 v10, 0x0 - :goto_0 const/16 v11, 0x8 const/4 v12, 0x1 - if-ge v8, v1, :cond_5 + if-ge v5, v1, :cond_5 .line 454 - invoke-virtual {v0, v8}, Landroid/support/v7/widget/ActionMenuView;->getChildAt(I)Landroid/view/View; + invoke-virtual {v0, v5}, Landroid/support/v7/widget/ActionMenuView;->getChildAt(I)Landroid/view/View; move-result-object v13 @@ -1756,16 +1798,16 @@ .line 461 invoke-virtual {v13}, Landroid/view/View;->getMeasuredWidth()I - move-result v9 + move-result v8 .line 462 - invoke-virtual {v0, v8}, Landroid/support/v7/widget/ActionMenuView;->hasSupportDividerBeforeChildAt(I)Z + invoke-virtual {v0, v5}, Landroid/support/v7/widget/ActionMenuView;->hasSupportDividerBeforeChildAt(I)Z move-result v14 if-eqz v14, :cond_2 - add-int/2addr v9, v3 + add-int/2addr v8, v3 .line 465 :cond_2 @@ -1784,7 +1826,7 @@ add-int/2addr v15, v11 - add-int v11, v15, v9 + add-int v11, v15, v8 goto :goto_1 @@ -1804,7 +1846,7 @@ sub-int v11, v15, v11 - sub-int v15, v11, v9 + sub-int v15, v11, v8 .line 475 :goto_1 @@ -1817,9 +1859,9 @@ .line 477 invoke-virtual {v13, v15, v7, v11, v14}, Landroid/view/View;->layout(IIII)V - sub-int/2addr v5, v9 + sub-int/2addr v10, v8 - const/4 v9, 0x1 + const/4 v8, 0x1 goto :goto_2 @@ -1837,22 +1879,24 @@ add-int/2addr v7, v11 - sub-int/2addr v5, v7 + sub-int/2addr v10, v7 .line 485 - invoke-virtual {v0, v8}, Landroid/support/v7/widget/ActionMenuView;->hasSupportDividerBeforeChildAt(I)Z + invoke-virtual {v0, v5}, Landroid/support/v7/widget/ActionMenuView;->hasSupportDividerBeforeChildAt(I)Z - add-int/lit8 v10, v10, 0x1 + move-result v7 + + add-int/lit8 v9, v9, 0x1 :goto_2 - add-int/lit8 v8, v8, 0x1 + add-int/lit8 v5, v5, 0x1 goto :goto_0 :cond_5 if-ne v1, v12, :cond_6 - if-nez v9, :cond_6 + if-nez v8, :cond_6 const/4 v3, 0x0 @@ -1894,26 +1938,28 @@ return-void :cond_6 - xor-int/lit8 v3, v9, 0x1 + xor-int/lit8 v3, v8, 0x1 - sub-int/2addr v10, v3 + sub-int/2addr v9, v3 - if-lez v10, :cond_7 + if-lez v9, :cond_7 .line 505 - div-int v3, v5, v10 + div-int v7, v10, v9 + + const/4 v3, 0x0 goto :goto_3 :cond_7 const/4 v3, 0x0 - :goto_3 - const/4 v4, 0x0 + const/4 v7, 0x0 - invoke-static {v4, v3}, Ljava/lang/Math;->max(II)I + :goto_3 + invoke-static {v3, v7}, Ljava/lang/Math;->max(II)I - move-result v3 + move-result v4 if-eqz v6, :cond_a @@ -1928,31 +1974,29 @@ sub-int/2addr v5, v6 - const/4 v7, 0x0 - :goto_4 - if-ge v7, v1, :cond_d + if-ge v3, v1, :cond_d .line 510 - invoke-virtual {v0, v7}, Landroid/support/v7/widget/ActionMenuView;->getChildAt(I)Landroid/view/View; + invoke-virtual {v0, v3}, Landroid/support/v7/widget/ActionMenuView;->getChildAt(I)Landroid/view/View; - move-result-object v4 + move-result-object v6 .line 511 - invoke-virtual {v4}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams; + invoke-virtual {v6}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams; - move-result-object v6 + move-result-object v7 - check-cast v6, Landroid/support/v7/widget/ActionMenuView$LayoutParams; + check-cast v7, Landroid/support/v7/widget/ActionMenuView$LayoutParams; .line 512 - invoke-virtual {v4}, Landroid/view/View;->getVisibility()I + invoke-virtual {v6}, Landroid/view/View;->getVisibility()I move-result v8 if-eq v8, v11, :cond_9 - iget-boolean v8, v6, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->isOverflowButton:Z + iget-boolean v8, v7, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->isOverflowButton:Z if-eqz v8, :cond_8 @@ -1960,17 +2004,17 @@ .line 516 :cond_8 - iget v8, v6, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->rightMargin:I + iget v8, v7, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->rightMargin:I sub-int/2addr v5, v8 .line 517 - invoke-virtual {v4}, Landroid/view/View;->getMeasuredWidth()I + invoke-virtual {v6}, Landroid/view/View;->getMeasuredWidth()I move-result v8 .line 518 - invoke-virtual {v4}, Landroid/view/View;->getMeasuredHeight()I + invoke-virtual {v6}, Landroid/view/View;->getMeasuredHeight()I move-result v9 @@ -1984,20 +2028,20 @@ add-int/2addr v9, v10 .line 520 - invoke-virtual {v4, v12, v10, v5, v9}, Landroid/view/View;->layout(IIII)V + invoke-virtual {v6, v12, v10, v5, v9}, Landroid/view/View;->layout(IIII)V .line 521 - iget v4, v6, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->leftMargin:I + iget v6, v7, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->leftMargin:I - add-int/2addr v8, v4 + add-int/2addr v8, v6 - add-int/2addr v8, v3 + add-int/2addr v8, v4 sub-int/2addr v5, v8 :cond_9 :goto_5 - add-int/lit8 v7, v7, 0x1 + add-int/lit8 v3, v3, 0x1 goto :goto_4 @@ -2007,31 +2051,29 @@ move-result v5 - const/4 v7, 0x0 - :goto_6 - if-ge v7, v1, :cond_d + if-ge v3, v1, :cond_d .line 526 - invoke-virtual {v0, v7}, Landroid/support/v7/widget/ActionMenuView;->getChildAt(I)Landroid/view/View; + invoke-virtual {v0, v3}, Landroid/support/v7/widget/ActionMenuView;->getChildAt(I)Landroid/view/View; - move-result-object v4 + move-result-object v6 .line 527 - invoke-virtual {v4}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams; + invoke-virtual {v6}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams; - move-result-object v6 + move-result-object v7 - check-cast v6, Landroid/support/v7/widget/ActionMenuView$LayoutParams; + check-cast v7, Landroid/support/v7/widget/ActionMenuView$LayoutParams; .line 528 - invoke-virtual {v4}, Landroid/view/View;->getVisibility()I + invoke-virtual {v6}, Landroid/view/View;->getVisibility()I move-result v8 if-eq v8, v11, :cond_c - iget-boolean v8, v6, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->isOverflowButton:Z + iget-boolean v8, v7, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->isOverflowButton:Z if-eqz v8, :cond_b @@ -2039,17 +2081,17 @@ .line 532 :cond_b - iget v8, v6, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->leftMargin:I + iget v8, v7, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->leftMargin:I add-int/2addr v5, v8 .line 533 - invoke-virtual {v4}, Landroid/view/View;->getMeasuredWidth()I + invoke-virtual {v6}, Landroid/view/View;->getMeasuredWidth()I move-result v8 .line 534 - invoke-virtual {v4}, Landroid/view/View;->getMeasuredHeight()I + invoke-virtual {v6}, Landroid/view/View;->getMeasuredHeight()I move-result v9 @@ -2063,20 +2105,20 @@ add-int/2addr v9, v10 .line 536 - invoke-virtual {v4, v5, v10, v12, v9}, Landroid/view/View;->layout(IIII)V + invoke-virtual {v6, v5, v10, v12, v9}, Landroid/view/View;->layout(IIII)V .line 537 - iget v4, v6, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->rightMargin:I + iget v6, v7, Landroid/support/v7/widget/ActionMenuView$LayoutParams;->rightMargin:I - add-int/2addr v8, v4 + add-int/2addr v8, v6 - add-int/2addr v8, v3 + add-int/2addr v8, v4 add-int/2addr v5, v8 :cond_c :goto_7 - add-int/lit8 v7, v7, 0x1 + add-int/lit8 v3, v3, 0x1 goto :goto_6 @@ -2113,6 +2155,9 @@ :goto_0 iput-boolean v1, p0, Landroid/support/v7/widget/ActionMenuView;->mFormatItems:Z + .line 150 + iget-boolean v1, p0, Landroid/support/v7/widget/ActionMenuView;->mFormatItems:Z + if-eq v0, v1, :cond_1 .line 151 @@ -2198,6 +2243,11 @@ .method public peekMenu()Landroid/support/v7/view/menu/MenuBuilder; .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 682 iget-object v0, p0, Landroid/support/v7/widget/ActionMenuView;->mMenu:Landroid/support/v7/view/menu/MenuBuilder; @@ -2207,6 +2257,11 @@ .method public setExpandedActionViewsExclusive(Z)V .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 756 iget-object v0, p0, Landroid/support/v7/widget/ActionMenuView;->mPresenter:Landroid/support/v7/widget/ActionMenuPresenter; @@ -2218,6 +2273,11 @@ .method public setMenuCallbacks(Landroid/support/v7/view/menu/MenuPresenter$Callback;Landroid/support/v7/view/menu/MenuBuilder$Callback;)V .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 672 iput-object p1, p0, Landroid/support/v7/widget/ActionMenuView;->mActionMenuPresenterCallback:Landroid/support/v7/view/menu/MenuPresenter$Callback; @@ -2239,6 +2299,10 @@ .method public setOverflowIcon(Landroid/graphics/drawable/Drawable;)V .locals 1 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 554 invoke-virtual {p0}, Landroid/support/v7/widget/ActionMenuView;->getMenu()Landroid/view/Menu; @@ -2253,6 +2317,11 @@ .method public setOverflowReserved(Z)V .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 578 iput-boolean p1, p0, Landroid/support/v7/widget/ActionMenuView;->mReserveOverflow:Z @@ -2262,6 +2331,10 @@ .method public setPopupTheme(I)V .locals 2 + .param p1 # I + .annotation build Landroid/support/annotation/StyleRes; + .end annotation + .end param .line 97 iget v0, p0, Landroid/support/v7/widget/ActionMenuView;->mPopupTheme:I @@ -2301,11 +2374,18 @@ .method public setPresenter(Landroid/support/v7/widget/ActionMenuPresenter;)V .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 122 iput-object p1, p0, Landroid/support/v7/widget/ActionMenuView;->mPresenter:Landroid/support/v7/widget/ActionMenuPresenter; .line 123 + iget-object p1, p0, Landroid/support/v7/widget/ActionMenuView;->mPresenter:Landroid/support/v7/widget/ActionMenuPresenter; + invoke-virtual {p1, p0}, Landroid/support/v7/widget/ActionMenuPresenter;->setMenuView(Landroid/support/v7/widget/ActionMenuView;)V return-void diff --git a/smali/android/support/v7/widget/ActivityChooserModel.smali b/smali/android/support/v7/widget/ActivityChooserModel.smali index ecc22ce3..0c868fce 100644 --- a/smali/android/support/v7/widget/ActivityChooserModel.smali +++ b/smali/android/support/v7/widget/ActivityChooserModel.smali @@ -290,7 +290,7 @@ .end method .method public static get(Landroid/content/Context;Ljava/lang/String;)Landroid/support/v7/widget/ActivityChooserModel; - .locals 3 + .locals 2 .line 330 sget-object v0, Landroid/support/v7/widget/ActivityChooserModel;->sRegistryLock:Ljava/lang/Object; @@ -303,25 +303,27 @@ invoke-interface {v1, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v2 + move-result-object v1 - check-cast v2, Landroid/support/v7/widget/ActivityChooserModel; + check-cast v1, Landroid/support/v7/widget/ActivityChooserModel; - if-nez v2, :cond_0 + if-nez v1, :cond_0 .line 333 - new-instance v2, Landroid/support/v7/widget/ActivityChooserModel; + new-instance v1, Landroid/support/v7/widget/ActivityChooserModel; - invoke-direct {v2, p0, p1}, Landroid/support/v7/widget/ActivityChooserModel;->(Landroid/content/Context;Ljava/lang/String;)V + invoke-direct {v1, p0, p1}, Landroid/support/v7/widget/ActivityChooserModel;->(Landroid/content/Context;Ljava/lang/String;)V .line 334 - invoke-interface {v1, p1, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + sget-object p0, Landroid/support/v7/widget/ActivityChooserModel;->sDataModelRegistry:Ljava/util/Map; + + invoke-interface {p0, p1, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .line 336 :cond_0 monitor-exit v0 - return-object v2 + return-object v1 :catchall_0 move-exception p0 @@ -1141,13 +1143,9 @@ :try_end_0 .catchall {:try_start_0 .. :try_end_0} :catchall_0 - goto :goto_2 - - :goto_1 throw p1 - :goto_2 - goto :goto_1 + return-void .end method .method public getDefaultActivity()Landroid/content/pm/ResolveInfo; diff --git a/smali/android/support/v7/widget/ActivityChooserView$Callbacks.smali b/smali/android/support/v7/widget/ActivityChooserView$Callbacks.smali index a2a1aad2..7ea2366e 100644 --- a/smali/android/support/v7/widget/ActivityChooserView$Callbacks.smali +++ b/smali/android/support/v7/widget/ActivityChooserView$Callbacks.smali @@ -143,8 +143,6 @@ iput-boolean v0, p1, Landroid/support/v7/widget/ActivityChooserView;->mIsSelectingDefaultActivity:Z .line 624 - iget-object p1, p0, Landroid/support/v7/widget/ActivityChooserView$Callbacks;->this$0:Landroid/support/v7/widget/ActivityChooserView; - iget v0, p1, Landroid/support/v7/widget/ActivityChooserView;->mInitialActivityCount:I invoke-virtual {p1, v0}, Landroid/support/v7/widget/ActivityChooserView;->showPopupUnchecked(I)V @@ -344,8 +342,6 @@ iput-boolean v0, p1, Landroid/support/v7/widget/ActivityChooserView;->mIsSelectingDefaultActivity:Z .line 636 - iget-object p1, p0, Landroid/support/v7/widget/ActivityChooserView$Callbacks;->this$0:Landroid/support/v7/widget/ActivityChooserView; - iget v1, p1, Landroid/support/v7/widget/ActivityChooserView;->mInitialActivityCount:I invoke-virtual {p1, v1}, Landroid/support/v7/widget/ActivityChooserView;->showPopupUnchecked(I)V diff --git a/smali/android/support/v7/widget/ActivityChooserView$InnerLayout.smali b/smali/android/support/v7/widget/ActivityChooserView$InnerLayout.smali index e5a98429..d75ffbb1 100644 --- a/smali/android/support/v7/widget/ActivityChooserView$InnerLayout.smali +++ b/smali/android/support/v7/widget/ActivityChooserView$InnerLayout.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v7/widget/ActivityChooserView; .end annotation @@ -24,6 +30,7 @@ const/4 v0, 0x1 + .line 864 new-array v0, v0, [I const/4 v1, 0x0 @@ -32,7 +39,6 @@ aput v2, v0, v1 - .line 864 sput-object v0, Landroid/support/v7/widget/ActivityChooserView$InnerLayout;->TINT_ATTRS:[I return-void diff --git a/smali/android/support/v7/widget/ActivityChooserView.smali b/smali/android/support/v7/widget/ActivityChooserView.smali index 5509dafa..9e22ddca 100644 --- a/smali/android/support/v7/widget/ActivityChooserView.smali +++ b/smali/android/support/v7/widget/ActivityChooserView.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v7/widget/ActivityChooserView$InnerLayout;, @@ -158,83 +164,97 @@ iput-object p2, p0, Landroid/support/v7/widget/ActivityChooserView;->mCallbacks:Landroid/support/v7/widget/ActivityChooserView$Callbacks; .line 240 - sget v0, Landroid/support/v7/appcompat/R$id;->activity_chooser_view_content:I + sget p2, Landroid/support/v7/appcompat/R$id;->activity_chooser_view_content:I - invoke-virtual {p0, v0}, Landroid/support/v7/widget/ActivityChooserView;->findViewById(I)Landroid/view/View; + invoke-virtual {p0, p2}, Landroid/support/v7/widget/ActivityChooserView;->findViewById(I)Landroid/view/View; - move-result-object v0 + move-result-object p2 - iput-object v0, p0, Landroid/support/v7/widget/ActivityChooserView;->mActivityChooserContent:Landroid/view/View; + iput-object p2, p0, Landroid/support/v7/widget/ActivityChooserView;->mActivityChooserContent:Landroid/view/View; .line 241 - invoke-virtual {v0}, Landroid/view/View;->getBackground()Landroid/graphics/drawable/Drawable; + iget-object p2, p0, Landroid/support/v7/widget/ActivityChooserView;->mActivityChooserContent:Landroid/view/View; - move-result-object v0 + invoke-virtual {p2}, Landroid/view/View;->getBackground()Landroid/graphics/drawable/Drawable; - iput-object v0, p0, Landroid/support/v7/widget/ActivityChooserView;->mActivityChooserContentBackground:Landroid/graphics/drawable/Drawable; + move-result-object p2 + + iput-object p2, p0, Landroid/support/v7/widget/ActivityChooserView;->mActivityChooserContentBackground:Landroid/graphics/drawable/Drawable; .line 243 - sget v0, Landroid/support/v7/appcompat/R$id;->default_activity_button:I + sget p2, Landroid/support/v7/appcompat/R$id;->default_activity_button:I - invoke-virtual {p0, v0}, Landroid/support/v7/widget/ActivityChooserView;->findViewById(I)Landroid/view/View; + invoke-virtual {p0, p2}, Landroid/support/v7/widget/ActivityChooserView;->findViewById(I)Landroid/view/View; - move-result-object v0 + move-result-object p2 - check-cast v0, Landroid/widget/FrameLayout; + check-cast p2, Landroid/widget/FrameLayout; - iput-object v0, p0, Landroid/support/v7/widget/ActivityChooserView;->mDefaultActivityButton:Landroid/widget/FrameLayout; + iput-object p2, p0, Landroid/support/v7/widget/ActivityChooserView;->mDefaultActivityButton:Landroid/widget/FrameLayout; .line 244 - invoke-virtual {v0, p2}, Landroid/widget/FrameLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V + iget-object p2, p0, Landroid/support/v7/widget/ActivityChooserView;->mDefaultActivityButton:Landroid/widget/FrameLayout; + + iget-object v0, p0, Landroid/support/v7/widget/ActivityChooserView;->mCallbacks:Landroid/support/v7/widget/ActivityChooserView$Callbacks; + + invoke-virtual {p2, v0}, Landroid/widget/FrameLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V .line 245 - invoke-virtual {v0, p2}, Landroid/widget/FrameLayout;->setOnLongClickListener(Landroid/view/View$OnLongClickListener;)V + iget-object p2, p0, Landroid/support/v7/widget/ActivityChooserView;->mDefaultActivityButton:Landroid/widget/FrameLayout; + + iget-object v0, p0, Landroid/support/v7/widget/ActivityChooserView;->mCallbacks:Landroid/support/v7/widget/ActivityChooserView$Callbacks; + + invoke-virtual {p2, v0}, Landroid/widget/FrameLayout;->setOnLongClickListener(Landroid/view/View$OnLongClickListener;)V .line 246 - sget v1, Landroid/support/v7/appcompat/R$id;->image:I + iget-object p2, p0, Landroid/support/v7/widget/ActivityChooserView;->mDefaultActivityButton:Landroid/widget/FrameLayout; - invoke-virtual {v0, v1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View; + sget v0, Landroid/support/v7/appcompat/R$id;->image:I - move-result-object v0 + invoke-virtual {p2, v0}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View; - check-cast v0, Landroid/widget/ImageView; + move-result-object p2 - iput-object v0, p0, Landroid/support/v7/widget/ActivityChooserView;->mDefaultActivityButtonImage:Landroid/widget/ImageView; + check-cast p2, Landroid/widget/ImageView; + + iput-object p2, p0, Landroid/support/v7/widget/ActivityChooserView;->mDefaultActivityButtonImage:Landroid/widget/ImageView; .line 248 - sget v0, Landroid/support/v7/appcompat/R$id;->expand_activities_button:I + sget p2, Landroid/support/v7/appcompat/R$id;->expand_activities_button:I - invoke-virtual {p0, v0}, Landroid/support/v7/widget/ActivityChooserView;->findViewById(I)Landroid/view/View; + invoke-virtual {p0, p2}, Landroid/support/v7/widget/ActivityChooserView;->findViewById(I)Landroid/view/View; - move-result-object v0 + move-result-object p2 - check-cast v0, Landroid/widget/FrameLayout; + check-cast p2, Landroid/widget/FrameLayout; .line 249 - invoke-virtual {v0, p2}, Landroid/widget/FrameLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V + iget-object v0, p0, Landroid/support/v7/widget/ActivityChooserView;->mCallbacks:Landroid/support/v7/widget/ActivityChooserView$Callbacks; + + invoke-virtual {p2, v0}, Landroid/widget/FrameLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V .line 250 - new-instance p2, Landroid/support/v7/widget/ActivityChooserView$3; + new-instance v0, Landroid/support/v7/widget/ActivityChooserView$3; - invoke-direct {p2, p0}, Landroid/support/v7/widget/ActivityChooserView$3;->(Landroid/support/v7/widget/ActivityChooserView;)V + invoke-direct {v0, p0}, Landroid/support/v7/widget/ActivityChooserView$3;->(Landroid/support/v7/widget/ActivityChooserView;)V - invoke-virtual {v0, p2}, Landroid/widget/FrameLayout;->setAccessibilityDelegate(Landroid/view/View$AccessibilityDelegate;)V + invoke-virtual {p2, v0}, Landroid/widget/FrameLayout;->setAccessibilityDelegate(Landroid/view/View$AccessibilityDelegate;)V .line 257 - new-instance p2, Landroid/support/v7/widget/ActivityChooserView$4; + new-instance v0, Landroid/support/v7/widget/ActivityChooserView$4; - invoke-direct {p2, p0, v0}, Landroid/support/v7/widget/ActivityChooserView$4;->(Landroid/support/v7/widget/ActivityChooserView;Landroid/view/View;)V + invoke-direct {v0, p0, p2}, Landroid/support/v7/widget/ActivityChooserView$4;->(Landroid/support/v7/widget/ActivityChooserView;Landroid/view/View;)V - invoke-virtual {v0, p2}, Landroid/widget/FrameLayout;->setOnTouchListener(Landroid/view/View$OnTouchListener;)V + invoke-virtual {p2, v0}, Landroid/widget/FrameLayout;->setOnTouchListener(Landroid/view/View$OnTouchListener;)V .line 275 - iput-object v0, p0, Landroid/support/v7/widget/ActivityChooserView;->mExpandActivityOverflowButton:Landroid/widget/FrameLayout; + iput-object p2, p0, Landroid/support/v7/widget/ActivityChooserView;->mExpandActivityOverflowButton:Landroid/widget/FrameLayout; .line 276 - sget p2, Landroid/support/v7/appcompat/R$id;->image:I + sget v0, Landroid/support/v7/appcompat/R$id;->image:I .line 277 - invoke-virtual {v0, p2}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View; + invoke-virtual {p2, v0}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View; move-result-object p2 @@ -243,6 +263,8 @@ iput-object p2, p0, Landroid/support/v7/widget/ActivityChooserView;->mExpandActivityOverflowButtonImage:Landroid/widget/ImageView; .line 278 + iget-object p2, p0, Landroid/support/v7/widget/ActivityChooserView;->mExpandActivityOverflowButtonImage:Landroid/widget/ImageView; + invoke-virtual {p2, p3}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V .line 280 @@ -253,6 +275,8 @@ iput-object p2, p0, Landroid/support/v7/widget/ActivityChooserView;->mAdapter:Landroid/support/v7/widget/ActivityChooserView$ActivityChooserViewAdapter; .line 281 + iget-object p2, p0, Landroid/support/v7/widget/ActivityChooserView;->mAdapter:Landroid/support/v7/widget/ActivityChooserView$ActivityChooserViewAdapter; + new-instance p3, Landroid/support/v7/widget/ActivityChooserView$5; invoke-direct {p3, p0}, Landroid/support/v7/widget/ActivityChooserView$5;->(Landroid/support/v7/widget/ActivityChooserView;)V @@ -365,6 +389,8 @@ iput-object v0, p0, Landroid/support/v7/widget/ActivityChooserView;->mListPopupWindow:Landroid/support/v7/widget/ListPopupWindow; .line 525 + iget-object v0, p0, Landroid/support/v7/widget/ActivityChooserView;->mListPopupWindow:Landroid/support/v7/widget/ListPopupWindow; + iget-object v1, p0, Landroid/support/v7/widget/ActivityChooserView;->mAdapter:Landroid/support/v7/widget/ActivityChooserView$ActivityChooserViewAdapter; invoke-virtual {v0, v1}, Landroid/support/v7/widget/ListPopupWindow;->setAdapter(Landroid/widget/ListAdapter;)V @@ -661,6 +687,11 @@ .method public setProvider(Landroid/support/v4/view/ActionProvider;)V .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 342 iput-object p1, p0, Landroid/support/v7/widget/ActivityChooserView;->mProvider:Landroid/support/v4/view/ActionProvider; diff --git a/smali/android/support/v7/widget/AlertDialogLayout.smali b/smali/android/support/v7/widget/AlertDialogLayout.smali index ca132e12..c24b8696 100644 --- a/smali/android/support/v7/widget/AlertDialogLayout.smali +++ b/smali/android/support/v7/widget/AlertDialogLayout.smali @@ -3,9 +3,21 @@ .source "AlertDialogLayout.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # direct methods .method public constructor (Landroid/content/Context;)V .locals 0 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 55 invoke-direct {p0, p1}, Landroid/support/v7/widget/LinearLayoutCompat;->(Landroid/content/Context;)V @@ -15,6 +27,14 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V .locals 0 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 59 invoke-direct {p0, p1, p2}, Landroid/support/v7/widget/LinearLayoutCompat;->(Landroid/content/Context;Landroid/util/AttributeSet;)V @@ -189,15 +209,17 @@ move-object v7, v6 - const/4 v8, 0x0 + move-object v8, v7 + + const/4 v4, 0x0 :goto_0 const/16 v9, 0x8 - if-ge v8, v3, :cond_6 + if-ge v4, v3, :cond_6 .line 77 - invoke-virtual {v0, v8}, Landroid/support/v7/widget/AlertDialogLayout;->getChildAt(I)Landroid/view/View; + invoke-virtual {v0, v4}, Landroid/support/v7/widget/AlertDialogLayout;->getChildAt(I)Landroid/view/View; move-result-object v10 @@ -221,7 +243,7 @@ if-ne v9, v11, :cond_1 - move-object v4, v10 + move-object v6, v10 goto :goto_2 @@ -231,7 +253,7 @@ if-ne v9, v11, :cond_2 - move-object v6, v10 + move-object v7, v10 goto :goto_2 @@ -252,15 +274,15 @@ :cond_4 :goto_1 - if-eqz v7, :cond_5 + if-eqz v8, :cond_5 return v5 :cond_5 - move-object v7, v10 + move-object v8, v10 :goto_2 - add-int/lit8 v8, v8, 0x1 + add-int/lit8 v4, v4, 0x1 goto :goto_0 @@ -268,7 +290,7 @@ :cond_6 invoke-static/range {p2 .. p2}, Landroid/view/View$MeasureSpec;->getMode(I)I - move-result v8 + move-result v4 .line 100 invoke-static/range {p2 .. p2}, Landroid/view/View$MeasureSpec;->getSize(I)I @@ -291,45 +313,45 @@ add-int/2addr v12, v13 - if-eqz v4, :cond_7 + if-eqz v6, :cond_7 .line 107 - invoke-virtual {v4, v1, v5}, Landroid/view/View;->measure(II)V + invoke-virtual {v6, v1, v5}, Landroid/view/View;->measure(II)V .line 109 - invoke-virtual {v4}, Landroid/view/View;->getMeasuredHeight()I + invoke-virtual {v6}, Landroid/view/View;->getMeasuredHeight()I move-result v13 add-int/2addr v12, v13 .line 110 - invoke-virtual {v4}, Landroid/view/View;->getMeasuredState()I + invoke-virtual {v6}, Landroid/view/View;->getMeasuredState()I - move-result v4 + move-result v6 - invoke-static {v5, v4}, Landroid/view/View;->combineMeasuredStates(II)I + invoke-static {v5, v6}, Landroid/view/View;->combineMeasuredStates(II)I - move-result v4 + move-result v6 goto :goto_3 :cond_7 - const/4 v4, 0x0 + const/4 v6, 0x0 :goto_3 - if-eqz v6, :cond_8 + if-eqz v7, :cond_8 .line 116 - invoke-virtual {v6, v1, v5}, Landroid/view/View;->measure(II)V + invoke-virtual {v7, v1, v5}, Landroid/view/View;->measure(II)V .line 117 - invoke-static {v6}, Landroid/support/v7/widget/AlertDialogLayout;->resolveMinimumHeight(Landroid/view/View;)I + invoke-static {v7}, Landroid/support/v7/widget/AlertDialogLayout;->resolveMinimumHeight(Landroid/view/View;)I move-result v13 .line 118 - invoke-virtual {v6}, Landroid/view/View;->getMeasuredHeight()I + invoke-virtual {v7}, Landroid/view/View;->getMeasuredHeight()I move-result v14 @@ -338,13 +360,13 @@ add-int/2addr v12, v13 .line 121 - invoke-virtual {v6}, Landroid/view/View;->getMeasuredState()I + invoke-virtual {v7}, Landroid/view/View;->getMeasuredState()I move-result v15 - invoke-static {v4, v15}, Landroid/view/View;->combineMeasuredStates(II)I + invoke-static {v6, v15}, Landroid/view/View;->combineMeasuredStates(II)I - move-result v4 + move-result v6 goto :goto_4 @@ -354,9 +376,9 @@ const/4 v14, 0x0 :goto_4 - if-eqz v7, :cond_a + if-eqz v8, :cond_a - if-nez v8, :cond_9 + if-nez v4, :cond_9 const/4 v15, 0x0 @@ -371,29 +393,29 @@ move-result v15 .line 130 - invoke-static {v15, v8}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I + invoke-static {v15, v4}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I move-result v15 .line 134 :goto_5 - invoke-virtual {v7, v1, v15}, Landroid/view/View;->measure(II)V + invoke-virtual {v8, v1, v15}, Landroid/view/View;->measure(II)V .line 135 - invoke-virtual {v7}, Landroid/view/View;->getMeasuredHeight()I + invoke-virtual {v8}, Landroid/view/View;->getMeasuredHeight()I move-result v15 add-int/2addr v12, v15 .line 138 - invoke-virtual {v7}, Landroid/view/View;->getMeasuredState()I + invoke-virtual {v8}, Landroid/view/View;->getMeasuredState()I move-result v5 - invoke-static {v4, v5}, Landroid/view/View;->combineMeasuredStates(II)I + invoke-static {v6, v5}, Landroid/view/View;->combineMeasuredStates(II)I - move-result v4 + move-result v6 goto :goto_6 @@ -405,7 +427,7 @@ const/high16 v5, 0x40000000 # 2.0f - if-eqz v6, :cond_c + if-eqz v7, :cond_c sub-int/2addr v12, v13 @@ -427,26 +449,26 @@ move-result v13 .line 157 - invoke-virtual {v6, v1, v13}, Landroid/view/View;->measure(II)V + invoke-virtual {v7, v1, v13}, Landroid/view/View;->measure(II)V .line 159 - invoke-virtual {v6}, Landroid/view/View;->getMeasuredHeight()I + invoke-virtual {v7}, Landroid/view/View;->getMeasuredHeight()I move-result v13 add-int/2addr v12, v13 .line 160 - invoke-virtual {v6}, Landroid/view/View;->getMeasuredState()I + invoke-virtual {v7}, Landroid/view/View;->getMeasuredState()I - move-result v6 + move-result v7 - invoke-static {v4, v6}, Landroid/view/View;->combineMeasuredStates(II)I + invoke-static {v6, v7}, Landroid/view/View;->combineMeasuredStates(II)I - move-result v4 + move-result v6 :cond_c - if-eqz v7, :cond_d + if-eqz v8, :cond_d if-lez v10, :cond_d @@ -455,39 +477,39 @@ add-int/2addr v15, v10 .line 175 - invoke-static {v15, v8}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I + invoke-static {v15, v4}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I - move-result v6 + move-result v4 .line 177 - invoke-virtual {v7, v1, v6}, Landroid/view/View;->measure(II)V + invoke-virtual {v8, v1, v4}, Landroid/view/View;->measure(II)V .line 179 - invoke-virtual {v7}, Landroid/view/View;->getMeasuredHeight()I + invoke-virtual {v8}, Landroid/view/View;->getMeasuredHeight()I - move-result v6 + move-result v4 - add-int/2addr v12, v6 + add-int/2addr v12, v4 .line 180 - invoke-virtual {v7}, Landroid/view/View;->getMeasuredState()I + invoke-virtual {v8}, Landroid/view/View;->getMeasuredState()I - move-result v6 + move-result v4 - invoke-static {v4, v6}, Landroid/view/View;->combineMeasuredStates(II)I + invoke-static {v6, v4}, Landroid/view/View;->combineMeasuredStates(II)I - move-result v4 + move-result v6 :cond_d - const/4 v6, 0x0 + const/4 v4, 0x0 const/4 v7, 0x0 :goto_7 - if-ge v6, v3, :cond_f + if-ge v4, v3, :cond_f .line 186 - invoke-virtual {v0, v6}, Landroid/support/v7/widget/AlertDialogLayout;->getChildAt(I)Landroid/view/View; + invoke-virtual {v0, v4}, Landroid/support/v7/widget/AlertDialogLayout;->getChildAt(I)Landroid/view/View; move-result-object v8 @@ -508,7 +530,7 @@ move-result v7 :cond_e - add-int/lit8 v6, v6, 0x1 + add-int/lit8 v4, v4, 0x1 goto :goto_7 @@ -516,18 +538,18 @@ :cond_f invoke-virtual/range {p0 .. p0}, Landroid/support/v7/widget/AlertDialogLayout;->getPaddingLeft()I - move-result v6 + move-result v4 invoke-virtual/range {p0 .. p0}, Landroid/support/v7/widget/AlertDialogLayout;->getPaddingRight()I move-result v8 - add-int/2addr v6, v8 + add-int/2addr v4, v8 - add-int/2addr v7, v6 + add-int/2addr v7, v4 .line 194 - invoke-static {v7, v1, v4}, Landroid/view/View;->resolveSizeAndState(III)I + invoke-static {v7, v1, v6}, Landroid/view/View;->resolveSizeAndState(III)I move-result v1 diff --git a/smali/android/support/v7/widget/AppCompatAutoCompleteTextView.smali b/smali/android/support/v7/widget/AppCompatAutoCompleteTextView.smali index 60769281..464f7799 100644 --- a/smali/android/support/v7/widget/AppCompatAutoCompleteTextView.smali +++ b/smali/android/support/v7/widget/AppCompatAutoCompleteTextView.smali @@ -22,6 +22,7 @@ const/4 v0, 0x1 + .line 58 new-array v0, v0, [I const/4 v1, 0x0 @@ -30,7 +31,6 @@ aput v2, v0, v1 - .line 58 sput-object v0, Landroid/support/v7/widget/AppCompatAutoCompleteTextView;->TINT_ATTRS:[I return-void @@ -107,6 +107,8 @@ iput-object p1, p0, Landroid/support/v7/widget/AppCompatAutoCompleteTextView;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; .line 84 + iget-object p1, p0, Landroid/support/v7/widget/AppCompatAutoCompleteTextView;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; + invoke-virtual {p1, p2, p3}, Landroid/support/v7/widget/AppCompatBackgroundHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V .line 86 @@ -117,9 +119,13 @@ iput-object p1, p0, Landroid/support/v7/widget/AppCompatAutoCompleteTextView;->mTextHelper:Landroid/support/v7/widget/AppCompatTextHelper; .line 87 + iget-object p1, p0, Landroid/support/v7/widget/AppCompatAutoCompleteTextView;->mTextHelper:Landroid/support/v7/widget/AppCompatTextHelper; + invoke-virtual {p1, p2, p3}, Landroid/support/v7/widget/AppCompatTextHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V .line 88 + iget-object p1, p0, Landroid/support/v7/widget/AppCompatAutoCompleteTextView;->mTextHelper:Landroid/support/v7/widget/AppCompatTextHelper; + invoke-virtual {p1}, Landroid/support/v7/widget/AppCompatTextHelper;->applyCompoundDrawablesTints()V return-void @@ -156,6 +162,14 @@ .method public getSupportBackgroundTintList()Landroid/content/res/ColorStateList; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 136 iget-object v0, p0, Landroid/support/v7/widget/AppCompatAutoCompleteTextView;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; @@ -178,6 +192,14 @@ .method public getSupportBackgroundTintMode()Landroid/graphics/PorterDuff$Mode; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 164 iget-object v0, p0, Landroid/support/v7/widget/AppCompatAutoCompleteTextView;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; @@ -233,6 +255,10 @@ .method public setBackgroundResource(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .line 98 invoke-super {p0, p1}, Landroid/widget/AutoCompleteTextView;->setBackgroundResource(I)V @@ -265,6 +291,10 @@ .method public setDropDownBackgroundResource(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .line 93 invoke-virtual {p0}, Landroid/support/v7/widget/AppCompatAutoCompleteTextView;->getContext()Landroid/content/Context; @@ -282,6 +312,15 @@ .method public setSupportBackgroundTintList(Landroid/content/res/ColorStateList;)V .locals 1 + .param p1 # Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 121 iget-object v0, p0, Landroid/support/v7/widget/AppCompatAutoCompleteTextView;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; @@ -297,6 +336,15 @@ .method public setSupportBackgroundTintMode(Landroid/graphics/PorterDuff$Mode;)V .locals 1 + .param p1 # Landroid/graphics/PorterDuff$Mode; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 149 iget-object v0, p0, Landroid/support/v7/widget/AppCompatAutoCompleteTextView;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; diff --git a/smali/android/support/v7/widget/AppCompatBackgroundHelper.smali b/smali/android/support/v7/widget/AppCompatBackgroundHelper.smali index 82f7ecba..035b31e1 100644 --- a/smali/android/support/v7/widget/AppCompatBackgroundHelper.smali +++ b/smali/android/support/v7/widget/AppCompatBackgroundHelper.smali @@ -44,6 +44,10 @@ .method private applyFrameworkTintUsingColorFilter(Landroid/graphics/drawable/Drawable;)Z .locals 3 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 173 iget-object v0, p0, Landroid/support/v7/widget/AppCompatBackgroundHelper;->mTmpInfo:Landroid/support/v7/widget/TintInfo; @@ -481,12 +485,10 @@ iput-object p1, v0, Landroid/support/v7/widget/TintInfo;->mTintList:Landroid/content/res/ColorStateList; - .line 143 - iget-object p1, p0, Landroid/support/v7/widget/AppCompatBackgroundHelper;->mInternalBackgroundTint:Landroid/support/v7/widget/TintInfo; - - const/4 v0, 0x1 + const/4 p1, 0x1 - iput-boolean v0, p1, Landroid/support/v7/widget/TintInfo;->mHasTintList:Z + .line 143 + iput-boolean p1, v0, Landroid/support/v7/widget/TintInfo;->mHasTintList:Z goto :goto_0 @@ -524,12 +526,10 @@ iput-object p1, v0, Landroid/support/v7/widget/TintInfo;->mTintList:Landroid/content/res/ColorStateList; - .line 95 - iget-object p1, p0, Landroid/support/v7/widget/AppCompatBackgroundHelper;->mBackgroundTint:Landroid/support/v7/widget/TintInfo; - - const/4 v0, 0x1 + const/4 p1, 0x1 - iput-boolean v0, p1, Landroid/support/v7/widget/TintInfo;->mHasTintList:Z + .line 95 + iput-boolean p1, v0, Landroid/support/v7/widget/TintInfo;->mHasTintList:Z .line 96 invoke-virtual {p0}, Landroid/support/v7/widget/AppCompatBackgroundHelper;->applySupportBackgroundTint()V @@ -558,12 +558,10 @@ iput-object p1, v0, Landroid/support/v7/widget/TintInfo;->mTintMode:Landroid/graphics/PorterDuff$Mode; - .line 108 - iget-object p1, p0, Landroid/support/v7/widget/AppCompatBackgroundHelper;->mBackgroundTint:Landroid/support/v7/widget/TintInfo; - - const/4 v0, 0x1 + const/4 p1, 0x1 - iput-boolean v0, p1, Landroid/support/v7/widget/TintInfo;->mHasTintMode:Z + .line 108 + iput-boolean p1, v0, Landroid/support/v7/widget/TintInfo;->mHasTintMode:Z .line 110 invoke-virtual {p0}, Landroid/support/v7/widget/AppCompatBackgroundHelper;->applySupportBackgroundTint()V diff --git a/smali/android/support/v7/widget/AppCompatButton.smali b/smali/android/support/v7/widget/AppCompatButton.smali index b9ce8771..0abfc083 100644 --- a/smali/android/support/v7/widget/AppCompatButton.smali +++ b/smali/android/support/v7/widget/AppCompatButton.smali @@ -54,6 +54,8 @@ iput-object p1, p0, Landroid/support/v7/widget/AppCompatButton;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; .line 74 + iget-object p1, p0, Landroid/support/v7/widget/AppCompatButton;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; + invoke-virtual {p1, p2, p3}, Landroid/support/v7/widget/AppCompatBackgroundHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V .line 76 @@ -64,9 +66,13 @@ iput-object p1, p0, Landroid/support/v7/widget/AppCompatButton;->mTextHelper:Landroid/support/v7/widget/AppCompatTextHelper; .line 77 + iget-object p1, p0, Landroid/support/v7/widget/AppCompatButton;->mTextHelper:Landroid/support/v7/widget/AppCompatTextHelper; + invoke-virtual {p1, p2, p3}, Landroid/support/v7/widget/AppCompatTextHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V .line 78 + iget-object p1, p0, Landroid/support/v7/widget/AppCompatButton;->mTextHelper:Landroid/support/v7/widget/AppCompatTextHelper; + invoke-virtual {p1}, Landroid/support/v7/widget/AppCompatTextHelper;->applyCompoundDrawablesTints()V return-void @@ -103,6 +109,11 @@ .method public getAutoSizeMaxTextSize()I .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 321 sget-boolean v0, Landroid/support/v7/widget/AppCompatButton;->PLATFORM_SUPPORTS_AUTOSIZE:Z @@ -137,6 +148,11 @@ .method public getAutoSizeMinTextSize()I .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 305 sget-boolean v0, Landroid/support/v7/widget/AppCompatButton;->PLATFORM_SUPPORTS_AUTOSIZE:Z @@ -171,6 +187,11 @@ .method public getAutoSizeStepGranularity()I .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 289 sget-boolean v0, Landroid/support/v7/widget/AppCompatButton;->PLATFORM_SUPPORTS_AUTOSIZE:Z @@ -205,6 +226,11 @@ .method public getAutoSizeTextAvailableSizes()[I .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 337 sget-boolean v0, Landroid/support/v7/widget/AppCompatButton;->PLATFORM_SUPPORTS_AUTOSIZE:Z @@ -234,6 +260,7 @@ :cond_1 const/4 v0, 0x0 + .line 344 new-array v0, v0, [I return-object v0 @@ -241,6 +268,11 @@ .method public getAutoSizeTextType()I .locals 3 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 271 sget-boolean v0, Landroid/support/v7/widget/AppCompatButton;->PLATFORM_SUPPORTS_AUTOSIZE:Z @@ -282,6 +314,14 @@ .method public getSupportBackgroundTintList()Landroid/content/res/ColorStateList; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 121 iget-object v0, p0, Landroid/support/v7/widget/AppCompatButton;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; @@ -304,6 +344,14 @@ .method public getSupportBackgroundTintMode()Landroid/graphics/PorterDuff$Mode; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 149 iget-object v0, p0, Landroid/support/v7/widget/AppCompatButton;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; @@ -422,6 +470,12 @@ .method public setAutoSizeTextTypeUniformWithConfiguration(IIII)V .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Ljava/lang/IllegalArgumentException; @@ -454,6 +508,16 @@ .method public setAutoSizeTextTypeUniformWithPresetSizes([II)V .locals 1 + .param p1 # [I + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Ljava/lang/IllegalArgumentException; @@ -486,6 +550,11 @@ .method public setAutoSizeTextTypeWithDefaults(I)V .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 218 sget-boolean v0, Landroid/support/v7/widget/AppCompatButton;->PLATFORM_SUPPORTS_AUTOSIZE:Z @@ -531,6 +600,10 @@ .method public setBackgroundResource(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .line 83 invoke-super {p0, p1}, Landroid/widget/Button;->setBackgroundResource(I)V @@ -578,6 +651,15 @@ .method public setSupportBackgroundTintList(Landroid/content/res/ColorStateList;)V .locals 1 + .param p1 # Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 106 iget-object v0, p0, Landroid/support/v7/widget/AppCompatButton;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; @@ -593,6 +675,15 @@ .method public setSupportBackgroundTintMode(Landroid/graphics/PorterDuff$Mode;)V .locals 1 + .param p1 # Landroid/graphics/PorterDuff$Mode; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 134 iget-object v0, p0, Landroid/support/v7/widget/AppCompatButton;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; diff --git a/smali/android/support/v7/widget/AppCompatCheckBox.smali b/smali/android/support/v7/widget/AppCompatCheckBox.smali index 14700a15..1a103364 100644 --- a/smali/android/support/v7/widget/AppCompatCheckBox.smali +++ b/smali/android/support/v7/widget/AppCompatCheckBox.smali @@ -51,6 +51,8 @@ iput-object p1, p0, Landroid/support/v7/widget/AppCompatCheckBox;->mCompoundButtonHelper:Landroid/support/v7/widget/AppCompatCompoundButtonHelper; .line 65 + iget-object p1, p0, Landroid/support/v7/widget/AppCompatCheckBox;->mCompoundButtonHelper:Landroid/support/v7/widget/AppCompatCompoundButtonHelper; + invoke-virtual {p1, p2, p3}, Landroid/support/v7/widget/AppCompatCompoundButtonHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V return-void @@ -82,6 +84,14 @@ .method public getSupportButtonTintList()Landroid/content/res/ColorStateList; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 109 iget-object v0, p0, Landroid/support/v7/widget/AppCompatCheckBox;->mCompoundButtonHelper:Landroid/support/v7/widget/AppCompatCompoundButtonHelper; @@ -104,6 +114,14 @@ .method public getSupportButtonTintMode()Landroid/graphics/PorterDuff$Mode; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 134 iget-object v0, p0, Landroid/support/v7/widget/AppCompatCheckBox;->mCompoundButtonHelper:Landroid/support/v7/widget/AppCompatCompoundButtonHelper; @@ -126,6 +144,10 @@ .method public setButtonDrawable(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .line 78 invoke-virtual {p0}, Landroid/support/v7/widget/AppCompatCheckBox;->getContext()Landroid/content/Context; @@ -161,6 +183,15 @@ .method public setSupportButtonTintList(Landroid/content/res/ColorStateList;)V .locals 1 + .param p1 # Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 96 iget-object v0, p0, Landroid/support/v7/widget/AppCompatCheckBox;->mCompoundButtonHelper:Landroid/support/v7/widget/AppCompatCompoundButtonHelper; @@ -176,6 +207,15 @@ .method public setSupportButtonTintMode(Landroid/graphics/PorterDuff$Mode;)V .locals 1 + .param p1 # Landroid/graphics/PorterDuff$Mode; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 121 iget-object v0, p0, Landroid/support/v7/widget/AppCompatCheckBox;->mCompoundButtonHelper:Landroid/support/v7/widget/AppCompatCompoundButtonHelper; diff --git a/smali/android/support/v7/widget/AppCompatCheckedTextView.smali b/smali/android/support/v7/widget/AppCompatCheckedTextView.smali index 98fcdfdf..50d5f9db 100644 --- a/smali/android/support/v7/widget/AppCompatCheckedTextView.smali +++ b/smali/android/support/v7/widget/AppCompatCheckedTextView.smali @@ -17,6 +17,7 @@ const/4 v0, 0x1 + .line 40 new-array v0, v0, [I const/4 v1, 0x0 @@ -25,7 +26,6 @@ aput v2, v0, v1 - .line 40 sput-object v0, Landroid/support/v7/widget/AppCompatCheckedTextView;->TINT_ATTRS:[I return-void @@ -71,9 +71,13 @@ iput-object p1, p0, Landroid/support/v7/widget/AppCompatCheckedTextView;->mTextHelper:Landroid/support/v7/widget/AppCompatTextHelper; .line 58 + iget-object p1, p0, Landroid/support/v7/widget/AppCompatCheckedTextView;->mTextHelper:Landroid/support/v7/widget/AppCompatTextHelper; + invoke-virtual {p1, p2, p3}, Landroid/support/v7/widget/AppCompatTextHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V .line 59 + iget-object p1, p0, Landroid/support/v7/widget/AppCompatCheckedTextView;->mTextHelper:Landroid/support/v7/widget/AppCompatTextHelper; + invoke-virtual {p1}, Landroid/support/v7/widget/AppCompatTextHelper;->applyCompoundDrawablesTints()V .line 61 @@ -139,6 +143,10 @@ .method public setCheckMarkDrawable(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .line 69 invoke-virtual {p0}, Landroid/support/v7/widget/AppCompatCheckedTextView;->getContext()Landroid/content/Context; diff --git a/smali/android/support/v7/widget/AppCompatCompoundButtonHelper.smali b/smali/android/support/v7/widget/AppCompatCompoundButtonHelper.smali index d26e3294..acddbbdb 100644 --- a/smali/android/support/v7/widget/AppCompatCompoundButtonHelper.smali +++ b/smali/android/support/v7/widget/AppCompatCompoundButtonHelper.smali @@ -224,8 +224,10 @@ .line 63 iget-object v0, p0, Landroid/support/v7/widget/AppCompatCompoundButtonHelper;->mView:Landroid/widget/CompoundButton; + iget-object v1, p0, Landroid/support/v7/widget/AppCompatCompoundButtonHelper;->mView:Landroid/widget/CompoundButton; + .line 64 - invoke-virtual {v0}, Landroid/widget/CompoundButton;->getContext()Landroid/content/Context; + invoke-virtual {v1}, Landroid/widget/CompoundButton;->getContext()Landroid/content/Context; move-result-object v1 @@ -353,6 +355,10 @@ .method setSupportButtonTintMode(Landroid/graphics/PorterDuff$Mode;)V .locals 0 + .param p1 # Landroid/graphics/PorterDuff$Mode; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 94 iput-object p1, p0, Landroid/support/v7/widget/AppCompatCompoundButtonHelper;->mButtonTintMode:Landroid/graphics/PorterDuff$Mode; diff --git a/smali/android/support/v7/widget/AppCompatDrawableManager$AsldcInflateDelegate.smali b/smali/android/support/v7/widget/AppCompatDrawableManager$AsldcInflateDelegate.smali index fefa4db5..79d2e581 100644 --- a/smali/android/support/v7/widget/AppCompatDrawableManager$AsldcInflateDelegate.smali +++ b/smali/android/support/v7/widget/AppCompatDrawableManager$AsldcInflateDelegate.smali @@ -7,6 +7,10 @@ # annotations +.annotation build Landroid/support/annotation/RequiresApi; + value = 0xb +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v7/widget/AppCompatDrawableManager; .end annotation @@ -31,6 +35,22 @@ # virtual methods .method public createFromXmlInner(Landroid/content/Context;Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/content/res/Resources$Theme;)Landroid/graphics/drawable/Drawable; .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Lorg/xmlpull/v1/XmlPullParser; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 807 :try_start_0 diff --git a/smali/android/support/v7/widget/AppCompatDrawableManager$AvdcInflateDelegate.smali b/smali/android/support/v7/widget/AppCompatDrawableManager$AvdcInflateDelegate.smali index 4d213084..b763eab0 100644 --- a/smali/android/support/v7/widget/AppCompatDrawableManager$AvdcInflateDelegate.smali +++ b/smali/android/support/v7/widget/AppCompatDrawableManager$AvdcInflateDelegate.smali @@ -31,6 +31,22 @@ # virtual methods .method public createFromXmlInner(Landroid/content/Context;Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/content/res/Resources$Theme;)Landroid/graphics/drawable/Drawable; .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Lorg/xmlpull/v1/XmlPullParser; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 792 :try_start_0 diff --git a/smali/android/support/v7/widget/AppCompatDrawableManager$InflateDelegate.smali b/smali/android/support/v7/widget/AppCompatDrawableManager$InflateDelegate.smali index 33e8b7e5..d78ad002 100644 --- a/smali/android/support/v7/widget/AppCompatDrawableManager$InflateDelegate.smali +++ b/smali/android/support/v7/widget/AppCompatDrawableManager$InflateDelegate.smali @@ -16,4 +16,20 @@ # virtual methods .method public abstract createFromXmlInner(Landroid/content/Context;Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/content/res/Resources$Theme;)Landroid/graphics/drawable/Drawable; + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Lorg/xmlpull/v1/XmlPullParser; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .end method diff --git a/smali/android/support/v7/widget/AppCompatDrawableManager$VdcInflateDelegate.smali b/smali/android/support/v7/widget/AppCompatDrawableManager$VdcInflateDelegate.smali index 165ea0b2..3a448e3a 100644 --- a/smali/android/support/v7/widget/AppCompatDrawableManager$VdcInflateDelegate.smali +++ b/smali/android/support/v7/widget/AppCompatDrawableManager$VdcInflateDelegate.smali @@ -31,6 +31,22 @@ # virtual methods .method public createFromXmlInner(Landroid/content/Context;Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroid/content/res/Resources$Theme;)Landroid/graphics/drawable/Drawable; .locals 0 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Lorg/xmlpull/v1/XmlPullParser; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 775 :try_start_0 diff --git a/smali/android/support/v7/widget/AppCompatDrawableManager.smali b/smali/android/support/v7/widget/AppCompatDrawableManager.smali index b6f03628..9ea97341 100644 --- a/smali/android/support/v7/widget/AppCompatDrawableManager.smali +++ b/smali/android/support/v7/widget/AppCompatDrawableManager.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v7/widget/AppCompatDrawableManager$AsldcInflateDelegate;, @@ -115,9 +121,9 @@ const/4 v0, 0x3 + .line 113 new-array v2, v0, [I - .line 113 sget v3, Landroid/support/v7/appcompat/R$drawable;->abc_textfield_search_default_mtrl_alpha:I const/4 v4, 0x0 @@ -140,9 +146,9 @@ const/4 v2, 0x7 + .line 123 new-array v3, v2, [I - .line 123 sget v7, Landroid/support/v7/appcompat/R$drawable;->abc_ic_commit_search_api_mtrl_alpha:I aput v7, v3, v4 @@ -179,9 +185,9 @@ const/16 v3, 0xa + .line 137 new-array v3, v3, [I - .line 137 sget v7, Landroid/support/v7/appcompat/R$drawable;->abc_textfield_activated_mtrl_alpha:I aput v7, v3, v4 @@ -228,9 +234,9 @@ sput-object v3, Landroid/support/v7/widget/AppCompatDrawableManager;->COLORFILTER_COLOR_CONTROL_ACTIVATED:[I + .line 154 new-array v0, v0, [I - .line 154 sget v1, Landroid/support/v7/appcompat/R$drawable;->abc_popup_background_mtrl_mult:I aput v1, v0, v4 @@ -245,9 +251,9 @@ sput-object v0, Landroid/support/v7/widget/AppCompatDrawableManager;->COLORFILTER_COLOR_BACKGROUND_MULTIPLY:[I + .line 164 new-array v0, v6, [I - .line 164 sget v1, Landroid/support/v7/appcompat/R$drawable;->abc_tab_indicator_material:I aput v1, v0, v4 @@ -258,9 +264,9 @@ sput-object v0, Landroid/support/v7/widget/AppCompatDrawableManager;->TINT_COLOR_CONTROL_STATE_LIST:[I + .line 174 new-array v0, v6, [I - .line 174 sget v1, Landroid/support/v7/appcompat/R$drawable;->abc_btn_check_material:I aput v1, v0, v4 @@ -294,6 +300,14 @@ .method private addDelegate(Ljava/lang/String;Landroid/support/v7/widget/AppCompatDrawableManager$InflateDelegate;)V .locals 1 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v7/widget/AppCompatDrawableManager$InflateDelegate; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 489 iget-object v0, p0, Landroid/support/v7/widget/AppCompatDrawableManager;->mDelegates:Landroid/support/v4/util/ArrayMap; @@ -318,6 +332,14 @@ .method private declared-synchronized addDrawableToCache(Landroid/content/Context;JLandroid/graphics/drawable/Drawable;)Z .locals 2 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param monitor-enter p0 @@ -385,6 +407,18 @@ .method private addTintListToCache(Landroid/content/Context;ILandroid/content/res/ColorStateList;)V .locals 2 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param + .param p3 # Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 568 iget-object v0, p0, Landroid/support/v7/widget/AppCompatDrawableManager;->mTintLists:Ljava/util/WeakHashMap; @@ -459,6 +493,10 @@ .method private checkVectorDrawableSetup(Landroid/content/Context;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 746 iget-boolean v0, p0, Landroid/support/v7/widget/AppCompatDrawableManager;->mHasCheckedVectorDrawableSetup:Z @@ -509,6 +547,10 @@ .method private createBorderlessButtonColorStateList(Landroid/content/Context;)Landroid/content/res/ColorStateList; .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 v0, 0x0 @@ -522,11 +564,21 @@ .method private createButtonColorStateList(Landroid/content/Context;I)Landroid/content/res/ColorStateList; .locals 5 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param const/4 v0, 0x4 + .line 596 new-array v1, v0, [[I + .line 597 new-array v0, v0, [I .line 600 @@ -620,6 +672,10 @@ .method private createColoredButtonColorStateList(Landroid/content/Context;)Landroid/content/res/ColorStateList; .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 590 sget v0, Landroid/support/v7/appcompat/R$attr;->colorAccent:I @@ -639,6 +695,10 @@ .method private createDefaultButtonColorStateList(Landroid/content/Context;)Landroid/content/res/ColorStateList; .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 580 sget v0, Landroid/support/v7/appcompat/R$attr;->colorButtonNormal:I @@ -658,6 +718,14 @@ .method private createDrawableIfNeeded(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable; .locals 7 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .line 231 iget-object v0, p0, Landroid/support/v7/widget/AppCompatDrawableManager;->mTypedValue:Landroid/util/TypedValue; @@ -753,8 +821,10 @@ const/4 v0, 0x3 + .line 625 new-array v1, v0, [[I + .line 626 new-array v0, v0, [I .line 629 @@ -785,6 +855,8 @@ aput-object v6, v1, v5 .line 638 + aget-object v6, v1, v5 + invoke-virtual {v2, v6, v5}, Landroid/content/res/ColorStateList;->getColorForState([II)I move-result v6 @@ -923,6 +995,8 @@ sput-object v1, Landroid/support/v7/widget/AppCompatDrawableManager;->INSTANCE:Landroid/support/v7/widget/AppCompatDrawableManager; .line 91 + sget-object v1, Landroid/support/v7/widget/AppCompatDrawableManager;->INSTANCE:Landroid/support/v7/widget/AppCompatDrawableManager; + invoke-static {v1}, Landroid/support/v7/widget/AppCompatDrawableManager;->installDefaultInflateDelegates(Landroid/support/v7/widget/AppCompatDrawableManager;)V .line 93 @@ -945,6 +1019,10 @@ .method private declared-synchronized getCachedDrawable(Landroid/content/Context;J)Landroid/graphics/drawable/Drawable; .locals 3 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param monitor-enter p0 @@ -1038,17 +1116,19 @@ invoke-virtual {v1, p0, p1}, Landroid/support/v7/widget/AppCompatDrawableManager$ColorFilterLruCache;->get(ILandroid/graphics/PorterDuff$Mode;)Landroid/graphics/PorterDuffColorFilter; - move-result-object v2 + move-result-object v1 - if-nez v2, :cond_0 + if-nez v1, :cond_0 .line 731 - new-instance v2, Landroid/graphics/PorterDuffColorFilter; + new-instance v1, Landroid/graphics/PorterDuffColorFilter; - invoke-direct {v2, p0, p1}, Landroid/graphics/PorterDuffColorFilter;->(ILandroid/graphics/PorterDuff$Mode;)V + invoke-direct {v1, p0, p1}, Landroid/graphics/PorterDuffColorFilter;->(ILandroid/graphics/PorterDuff$Mode;)V .line 732 - invoke-virtual {v1, p0, p1, v2}, Landroid/support/v7/widget/AppCompatDrawableManager$ColorFilterLruCache;->put(ILandroid/graphics/PorterDuff$Mode;Landroid/graphics/PorterDuffColorFilter;)Landroid/graphics/PorterDuffColorFilter; + sget-object v2, Landroid/support/v7/widget/AppCompatDrawableManager;->COLOR_FILTER_CACHE:Landroid/support/v7/widget/AppCompatDrawableManager$ColorFilterLruCache; + + invoke-virtual {v2, p0, p1, v1}, Landroid/support/v7/widget/AppCompatDrawableManager$ColorFilterLruCache;->put(ILandroid/graphics/PorterDuff$Mode;Landroid/graphics/PorterDuffColorFilter;)Landroid/graphics/PorterDuffColorFilter; :try_end_0 .catchall {:try_start_0 .. :try_end_0} :catchall_0 @@ -1056,7 +1136,7 @@ :cond_0 monitor-exit v0 - return-object v2 + return-object v1 :catchall_0 move-exception p0 @@ -1068,6 +1148,14 @@ .method private getTintListFromCache(Landroid/content/Context;I)Landroid/content/res/ColorStateList; .locals 2 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .line 559 iget-object v0, p0, Landroid/support/v7/widget/AppCompatDrawableManager;->mTintLists:Ljava/util/WeakHashMap; @@ -1120,6 +1208,10 @@ .method private static installDefaultInflateDelegates(Landroid/support/v7/widget/AppCompatDrawableManager;)V .locals 2 + .param p0 # Landroid/support/v7/widget/AppCompatDrawableManager; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 100 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1161,6 +1253,10 @@ .method private static isVectorDrawable(Landroid/graphics/drawable/Drawable;)Z .locals 1 + .param p0 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 762 instance-of v0, p0, Landroid/support/graphics/drawable/VectorDrawableCompat; @@ -1201,6 +1297,14 @@ .method private loadDrawableFromDelegates(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable; .locals 10 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .line 308 iget-object v0, p0, Landroid/support/v7/widget/AppCompatDrawableManager;->mDelegates:Landroid/support/v4/util/ArrayMap; @@ -1433,6 +1537,14 @@ .method private removeDelegate(Ljava/lang/String;Landroid/support/v7/widget/AppCompatDrawableManager$InflateDelegate;)V .locals 1 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v7/widget/AppCompatDrawableManager$InflateDelegate; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 496 iget-object v0, p0, Landroid/support/v7/widget/AppCompatDrawableManager;->mDelegates:Landroid/support/v4/util/ArrayMap; @@ -1487,6 +1599,18 @@ .method private tintDrawable(Landroid/content/Context;IZLandroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; .locals 4 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param + .param p4 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 263 invoke-virtual {p0, p1, p2}, Landroid/support/v7/widget/AppCompatDrawableManager;->getTintList(Landroid/content/Context;I)Landroid/content/res/ColorStateList; @@ -1574,8 +1698,10 @@ move-result v0 + sget-object v2, Landroid/support/v7/widget/AppCompatDrawableManager;->DEFAULT_MODE:Landroid/graphics/PorterDuff$Mode; + .line 281 - invoke-static {p3, v0, v3}, Landroid/support/v7/widget/AppCompatDrawableManager;->setPorterDuffColorFilter(Landroid/graphics/drawable/Drawable;ILandroid/graphics/PorterDuff$Mode;)V + invoke-static {p3, v0, v2}, Landroid/support/v7/widget/AppCompatDrawableManager;->setPorterDuffColorFilter(Landroid/graphics/drawable/Drawable;ILandroid/graphics/PorterDuff$Mode;)V .line 283 invoke-virtual {p2, v1}, Landroid/graphics/drawable/LayerDrawable;->findDrawableByLayerId(I)Landroid/graphics/drawable/Drawable; @@ -1589,8 +1715,10 @@ move-result p1 + sget-object p3, Landroid/support/v7/widget/AppCompatDrawableManager;->DEFAULT_MODE:Landroid/graphics/PorterDuff$Mode; + .line 283 - invoke-static {p2, p1, v3}, Landroid/support/v7/widget/AppCompatDrawableManager;->setPorterDuffColorFilter(Landroid/graphics/drawable/Drawable;ILandroid/graphics/PorterDuff$Mode;)V + invoke-static {p2, p1, p3}, Landroid/support/v7/widget/AppCompatDrawableManager;->setPorterDuffColorFilter(Landroid/graphics/drawable/Drawable;ILandroid/graphics/PorterDuff$Mode;)V goto :goto_1 @@ -1660,8 +1788,10 @@ move-result v0 + sget-object v2, Landroid/support/v7/widget/AppCompatDrawableManager;->DEFAULT_MODE:Landroid/graphics/PorterDuff$Mode; + .line 292 - invoke-static {p3, v0, v3}, Landroid/support/v7/widget/AppCompatDrawableManager;->setPorterDuffColorFilter(Landroid/graphics/drawable/Drawable;ILandroid/graphics/PorterDuff$Mode;)V + invoke-static {p3, v0, v2}, Landroid/support/v7/widget/AppCompatDrawableManager;->setPorterDuffColorFilter(Landroid/graphics/drawable/Drawable;ILandroid/graphics/PorterDuff$Mode;)V .line 294 invoke-virtual {p2, v1}, Landroid/graphics/drawable/LayerDrawable;->findDrawableByLayerId(I)Landroid/graphics/drawable/Drawable; @@ -1675,8 +1805,10 @@ move-result p1 + sget-object p3, Landroid/support/v7/widget/AppCompatDrawableManager;->DEFAULT_MODE:Landroid/graphics/PorterDuff$Mode; + .line 294 - invoke-static {p2, p1, v3}, Landroid/support/v7/widget/AppCompatDrawableManager;->setPorterDuffColorFilter(Landroid/graphics/drawable/Drawable;ILandroid/graphics/PorterDuff$Mode;)V + invoke-static {p2, p1, p3}, Landroid/support/v7/widget/AppCompatDrawableManager;->setPorterDuffColorFilter(Landroid/graphics/drawable/Drawable;ILandroid/graphics/PorterDuff$Mode;)V :cond_5 :goto_1 @@ -1777,6 +1909,18 @@ .method static tintDrawableUsingColorFilter(Landroid/content/Context;ILandroid/graphics/drawable/Drawable;)Z .locals 6 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param + .param p2 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 442 sget-object v0, Landroid/support/v7/widget/AppCompatDrawableManager;->DEFAULT_MODE:Landroid/graphics/PorterDuff$Mode; @@ -1802,12 +1946,11 @@ sget v2, Landroid/support/v7/appcompat/R$attr;->colorControlNormal:I :goto_0 - const/4 p1, -0x1 + const/4 p1, 0x1 - :goto_1 - const/4 v1, 0x1 + const/4 v1, -0x1 - goto :goto_2 + goto :goto_1 .line 450 :cond_0 @@ -1854,6 +1997,10 @@ move-result p1 + move v1, p1 + + const/4 p1, 0x1 + goto :goto_1 .line 461 @@ -1865,21 +2012,21 @@ goto :goto_0 :cond_4 - const/4 p1, -0x1 + const/4 p1, 0x0 - const/4 v1, 0x0 + const/4 v1, -0x1 const/4 v2, 0x0 - :goto_2 - if-eqz v1, :cond_7 + :goto_1 + if-eqz p1, :cond_7 .line 467 invoke-static {p2}, Landroid/support/v7/widget/DrawableUtils;->canSafelyMutateDrawable(Landroid/graphics/drawable/Drawable;)Z - move-result v1 + move-result p1 - if-eqz v1, :cond_5 + if-eqz p1, :cond_5 .line 468 invoke-virtual {p2}, Landroid/graphics/drawable/Drawable;->mutate()Landroid/graphics/drawable/Drawable; @@ -1899,10 +2046,10 @@ invoke-virtual {p2, p0}, Landroid/graphics/drawable/Drawable;->setColorFilter(Landroid/graphics/ColorFilter;)V - if-eq p1, v3, :cond_6 + if-eq v1, v3, :cond_6 .line 475 - invoke-virtual {p2, p1}, Landroid/graphics/drawable/Drawable;->setAlpha(I)V + invoke-virtual {p2, v1}, Landroid/graphics/drawable/Drawable;->setAlpha(I)V :cond_6 return v5 @@ -1915,6 +2062,14 @@ # virtual methods .method public declared-synchronized getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable; .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param monitor-enter p0 @@ -1942,6 +2097,14 @@ .method declared-synchronized getDrawable(Landroid/content/Context;IZ)Landroid/graphics/drawable/Drawable; .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param monitor-enter p0 @@ -2001,6 +2164,14 @@ .method declared-synchronized getTintList(Landroid/content/Context;I)Landroid/content/res/ColorStateList; .locals 2 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param monitor-enter p0 @@ -2211,6 +2382,10 @@ .method public declared-synchronized onConfigurationChanged(Landroid/content/Context;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param monitor-enter p0 @@ -2247,6 +2422,18 @@ .method declared-synchronized onDrawableLoadedFromResources(Landroid/content/Context;Landroid/support/v7/widget/VectorEnabledTintResources;I)Landroid/graphics/drawable/Drawable; .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/support/v7/widget/VectorEnabledTintResources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param monitor-enter p0 diff --git a/smali/android/support/v7/widget/AppCompatEditText.smali b/smali/android/support/v7/widget/AppCompatEditText.smali index f43a97b2..6957de7d 100644 --- a/smali/android/support/v7/widget/AppCompatEditText.smali +++ b/smali/android/support/v7/widget/AppCompatEditText.smali @@ -53,6 +53,8 @@ iput-object p1, p0, Landroid/support/v7/widget/AppCompatEditText;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; .line 72 + iget-object p1, p0, Landroid/support/v7/widget/AppCompatEditText;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; + invoke-virtual {p1, p2, p3}, Landroid/support/v7/widget/AppCompatBackgroundHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V .line 74 @@ -63,9 +65,13 @@ iput-object p1, p0, Landroid/support/v7/widget/AppCompatEditText;->mTextHelper:Landroid/support/v7/widget/AppCompatTextHelper; .line 75 + iget-object p1, p0, Landroid/support/v7/widget/AppCompatEditText;->mTextHelper:Landroid/support/v7/widget/AppCompatTextHelper; + invoke-virtual {p1, p2, p3}, Landroid/support/v7/widget/AppCompatTextHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V .line 76 + iget-object p1, p0, Landroid/support/v7/widget/AppCompatEditText;->mTextHelper:Landroid/support/v7/widget/AppCompatTextHelper; + invoke-virtual {p1}, Landroid/support/v7/widget/AppCompatTextHelper;->applyCompoundDrawablesTints()V return-void @@ -102,6 +108,14 @@ .method public getSupportBackgroundTintList()Landroid/content/res/ColorStateList; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 133 iget-object v0, p0, Landroid/support/v7/widget/AppCompatEditText;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; @@ -124,6 +138,14 @@ .method public getSupportBackgroundTintMode()Landroid/graphics/PorterDuff$Mode; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 161 iget-object v0, p0, Landroid/support/v7/widget/AppCompatEditText;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; @@ -146,6 +168,8 @@ .method public getText()Landroid/text/Editable; .locals 2 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 85 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -172,6 +196,8 @@ .method public bridge synthetic getText()Ljava/lang/CharSequence; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 55 invoke-virtual {p0}, Landroid/support/v7/widget/AppCompatEditText;->getText()Landroid/text/Editable; @@ -216,6 +242,10 @@ .method public setBackgroundResource(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .line 95 invoke-super {p0, p1}, Landroid/widget/EditText;->setBackgroundResource(I)V @@ -248,6 +278,15 @@ .method public setSupportBackgroundTintList(Landroid/content/res/ColorStateList;)V .locals 1 + .param p1 # Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 118 iget-object v0, p0, Landroid/support/v7/widget/AppCompatEditText;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; @@ -263,6 +302,15 @@ .method public setSupportBackgroundTintMode(Landroid/graphics/PorterDuff$Mode;)V .locals 1 + .param p1 # Landroid/graphics/PorterDuff$Mode; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 146 iget-object v0, p0, Landroid/support/v7/widget/AppCompatEditText;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; diff --git a/smali/android/support/v7/widget/AppCompatImageButton.smali b/smali/android/support/v7/widget/AppCompatImageButton.smali index a465ab05..2686c81c 100644 --- a/smali/android/support/v7/widget/AppCompatImageButton.smali +++ b/smali/android/support/v7/widget/AppCompatImageButton.smali @@ -54,6 +54,8 @@ iput-object p1, p0, Landroid/support/v7/widget/AppCompatImageButton;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; .line 76 + iget-object p1, p0, Landroid/support/v7/widget/AppCompatImageButton;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; + invoke-virtual {p1, p2, p3}, Landroid/support/v7/widget/AppCompatBackgroundHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V .line 78 @@ -64,6 +66,8 @@ iput-object p1, p0, Landroid/support/v7/widget/AppCompatImageButton;->mImageHelper:Landroid/support/v7/widget/AppCompatImageHelper; .line 79 + iget-object p1, p0, Landroid/support/v7/widget/AppCompatImageButton;->mImageHelper:Landroid/support/v7/widget/AppCompatImageHelper; + invoke-virtual {p1, p2, p3}, Landroid/support/v7/widget/AppCompatImageHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V return-void @@ -100,6 +104,14 @@ .method public getSupportBackgroundTintList()Landroid/content/res/ColorStateList; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 152 iget-object v0, p0, Landroid/support/v7/widget/AppCompatImageButton;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; @@ -122,6 +134,14 @@ .method public getSupportBackgroundTintMode()Landroid/graphics/PorterDuff$Mode; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 180 iget-object v0, p0, Landroid/support/v7/widget/AppCompatImageButton;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; @@ -144,6 +164,14 @@ .method public getSupportImageTintList()Landroid/content/res/ColorStateList; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 207 iget-object v0, p0, Landroid/support/v7/widget/AppCompatImageButton;->mImageHelper:Landroid/support/v7/widget/AppCompatImageHelper; @@ -166,6 +194,14 @@ .method public getSupportImageTintMode()Landroid/graphics/PorterDuff$Mode; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 235 iget-object v0, p0, Landroid/support/v7/widget/AppCompatImageButton;->mImageHelper:Landroid/support/v7/widget/AppCompatImageHelper; @@ -235,6 +271,10 @@ .method public setBackgroundResource(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .line 114 invoke-super {p0, p1}, Landroid/widget/ImageButton;->setBackgroundResource(I)V @@ -271,6 +311,10 @@ .method public setImageDrawable(Landroid/graphics/drawable/Drawable;)V .locals 0 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 90 invoke-super {p0, p1}, Landroid/widget/ImageButton;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V @@ -289,6 +333,10 @@ .method public setImageResource(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .line 85 iget-object v0, p0, Landroid/support/v7/widget/AppCompatImageButton;->mImageHelper:Landroid/support/v7/widget/AppCompatImageHelper; @@ -300,6 +348,10 @@ .method public setImageURI(Landroid/net/Uri;)V .locals 0 + .param p1 # Landroid/net/Uri; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 106 invoke-super {p0, p1}, Landroid/widget/ImageButton;->setImageURI(Landroid/net/Uri;)V @@ -318,6 +370,15 @@ .method public setSupportBackgroundTintList(Landroid/content/res/ColorStateList;)V .locals 1 + .param p1 # Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 137 iget-object v0, p0, Landroid/support/v7/widget/AppCompatImageButton;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; @@ -333,6 +394,15 @@ .method public setSupportBackgroundTintMode(Landroid/graphics/PorterDuff$Mode;)V .locals 1 + .param p1 # Landroid/graphics/PorterDuff$Mode; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 165 iget-object v0, p0, Landroid/support/v7/widget/AppCompatImageButton;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; @@ -348,6 +418,15 @@ .method public setSupportImageTintList(Landroid/content/res/ColorStateList;)V .locals 1 + .param p1 # Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 192 iget-object v0, p0, Landroid/support/v7/widget/AppCompatImageButton;->mImageHelper:Landroid/support/v7/widget/AppCompatImageHelper; @@ -363,6 +442,15 @@ .method public setSupportImageTintMode(Landroid/graphics/PorterDuff$Mode;)V .locals 1 + .param p1 # Landroid/graphics/PorterDuff$Mode; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 220 iget-object v0, p0, Landroid/support/v7/widget/AppCompatImageButton;->mImageHelper:Landroid/support/v7/widget/AppCompatImageHelper; diff --git a/smali/android/support/v7/widget/AppCompatImageHelper.smali b/smali/android/support/v7/widget/AppCompatImageHelper.smali index 2b372bfb..33516ea4 100644 --- a/smali/android/support/v7/widget/AppCompatImageHelper.smali +++ b/smali/android/support/v7/widget/AppCompatImageHelper.smali @@ -3,6 +3,14 @@ .source "AppCompatImageHelper.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # instance fields .field private mImageTint:Landroid/support/v7/widget/TintInfo; @@ -28,6 +36,10 @@ .method private applyFrameworkTintUsingColorFilter(Landroid/graphics/drawable/Drawable;)Z .locals 3 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 196 iget-object v0, p0, Landroid/support/v7/widget/AppCompatImageHelper;->mTmpInfo:Landroid/support/v7/widget/TintInfo; @@ -493,12 +505,10 @@ iput-object p1, v0, Landroid/support/v7/widget/TintInfo;->mTintList:Landroid/content/res/ColorStateList; - .line 166 - iget-object p1, p0, Landroid/support/v7/widget/AppCompatImageHelper;->mInternalImageTint:Landroid/support/v7/widget/TintInfo; + const/4 p1, 0x1 - const/4 v0, 0x1 - - iput-boolean v0, p1, Landroid/support/v7/widget/TintInfo;->mHasTintList:Z + .line 166 + iput-boolean p1, v0, Landroid/support/v7/widget/TintInfo;->mHasTintList:Z goto :goto_0 @@ -536,12 +546,10 @@ iput-object p1, v0, Landroid/support/v7/widget/TintInfo;->mTintList:Landroid/content/res/ColorStateList; - .line 114 - iget-object p1, p0, Landroid/support/v7/widget/AppCompatImageHelper;->mImageTint:Landroid/support/v7/widget/TintInfo; - - const/4 v0, 0x1 + const/4 p1, 0x1 - iput-boolean v0, p1, Landroid/support/v7/widget/TintInfo;->mHasTintList:Z + .line 114 + iput-boolean p1, v0, Landroid/support/v7/widget/TintInfo;->mHasTintList:Z .line 115 invoke-virtual {p0}, Landroid/support/v7/widget/AppCompatImageHelper;->applySupportImageTint()V @@ -570,12 +578,10 @@ iput-object p1, v0, Landroid/support/v7/widget/TintInfo;->mTintMode:Landroid/graphics/PorterDuff$Mode; - .line 127 - iget-object p1, p0, Landroid/support/v7/widget/AppCompatImageHelper;->mImageTint:Landroid/support/v7/widget/TintInfo; + const/4 p1, 0x1 - const/4 v0, 0x1 - - iput-boolean v0, p1, Landroid/support/v7/widget/TintInfo;->mHasTintMode:Z + .line 127 + iput-boolean p1, v0, Landroid/support/v7/widget/TintInfo;->mHasTintMode:Z .line 129 invoke-virtual {p0}, Landroid/support/v7/widget/AppCompatImageHelper;->applySupportImageTint()V diff --git a/smali/android/support/v7/widget/AppCompatImageView.smali b/smali/android/support/v7/widget/AppCompatImageView.smali index c121f35d..25f12cc5 100644 --- a/smali/android/support/v7/widget/AppCompatImageView.smali +++ b/smali/android/support/v7/widget/AppCompatImageView.smali @@ -54,6 +54,8 @@ iput-object p1, p0, Landroid/support/v7/widget/AppCompatImageView;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; .line 75 + iget-object p1, p0, Landroid/support/v7/widget/AppCompatImageView;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; + invoke-virtual {p1, p2, p3}, Landroid/support/v7/widget/AppCompatBackgroundHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V .line 77 @@ -64,6 +66,8 @@ iput-object p1, p0, Landroid/support/v7/widget/AppCompatImageView;->mImageHelper:Landroid/support/v7/widget/AppCompatImageHelper; .line 78 + iget-object p1, p0, Landroid/support/v7/widget/AppCompatImageView;->mImageHelper:Landroid/support/v7/widget/AppCompatImageHelper; + invoke-virtual {p1, p2, p3}, Landroid/support/v7/widget/AppCompatImageHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V return-void @@ -100,6 +104,14 @@ .method public getSupportBackgroundTintList()Landroid/content/res/ColorStateList; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 162 iget-object v0, p0, Landroid/support/v7/widget/AppCompatImageView;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; @@ -122,6 +134,14 @@ .method public getSupportBackgroundTintMode()Landroid/graphics/PorterDuff$Mode; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 190 iget-object v0, p0, Landroid/support/v7/widget/AppCompatImageView;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; @@ -144,6 +164,14 @@ .method public getSupportImageTintList()Landroid/content/res/ColorStateList; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 218 iget-object v0, p0, Landroid/support/v7/widget/AppCompatImageView;->mImageHelper:Landroid/support/v7/widget/AppCompatImageHelper; @@ -166,6 +194,14 @@ .method public getSupportImageTintMode()Landroid/graphics/PorterDuff$Mode; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 246 iget-object v0, p0, Landroid/support/v7/widget/AppCompatImageView;->mImageHelper:Landroid/support/v7/widget/AppCompatImageHelper; @@ -235,6 +271,10 @@ .method public setBackgroundResource(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .line 124 invoke-super {p0, p1}, Landroid/widget/ImageView;->setBackgroundResource(I)V @@ -271,6 +311,10 @@ .method public setImageDrawable(Landroid/graphics/drawable/Drawable;)V .locals 0 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 100 invoke-super {p0, p1}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V @@ -289,6 +333,10 @@ .method public setImageResource(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .line 92 iget-object v0, p0, Landroid/support/v7/widget/AppCompatImageView;->mImageHelper:Landroid/support/v7/widget/AppCompatImageHelper; @@ -304,6 +352,10 @@ .method public setImageURI(Landroid/net/Uri;)V .locals 0 + .param p1 # Landroid/net/Uri; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 116 invoke-super {p0, p1}, Landroid/widget/ImageView;->setImageURI(Landroid/net/Uri;)V @@ -322,6 +374,15 @@ .method public setSupportBackgroundTintList(Landroid/content/res/ColorStateList;)V .locals 1 + .param p1 # Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 147 iget-object v0, p0, Landroid/support/v7/widget/AppCompatImageView;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; @@ -337,6 +398,15 @@ .method public setSupportBackgroundTintMode(Landroid/graphics/PorterDuff$Mode;)V .locals 1 + .param p1 # Landroid/graphics/PorterDuff$Mode; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 175 iget-object v0, p0, Landroid/support/v7/widget/AppCompatImageView;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; @@ -352,6 +422,15 @@ .method public setSupportImageTintList(Landroid/content/res/ColorStateList;)V .locals 1 + .param p1 # Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 203 iget-object v0, p0, Landroid/support/v7/widget/AppCompatImageView;->mImageHelper:Landroid/support/v7/widget/AppCompatImageHelper; @@ -367,6 +446,15 @@ .method public setSupportImageTintMode(Landroid/graphics/PorterDuff$Mode;)V .locals 1 + .param p1 # Landroid/graphics/PorterDuff$Mode; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 231 iget-object v0, p0, Landroid/support/v7/widget/AppCompatImageView;->mImageHelper:Landroid/support/v7/widget/AppCompatImageHelper; diff --git a/smali/android/support/v7/widget/AppCompatMultiAutoCompleteTextView.smali b/smali/android/support/v7/widget/AppCompatMultiAutoCompleteTextView.smali index e0ee9737..a65eda35 100644 --- a/smali/android/support/v7/widget/AppCompatMultiAutoCompleteTextView.smali +++ b/smali/android/support/v7/widget/AppCompatMultiAutoCompleteTextView.smali @@ -22,6 +22,7 @@ const/4 v0, 0x1 + .line 55 new-array v0, v0, [I const/4 v1, 0x0 @@ -30,7 +31,6 @@ aput v2, v0, v1 - .line 55 sput-object v0, Landroid/support/v7/widget/AppCompatMultiAutoCompleteTextView;->TINT_ATTRS:[I return-void @@ -107,6 +107,8 @@ iput-object p1, p0, Landroid/support/v7/widget/AppCompatMultiAutoCompleteTextView;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; .line 81 + iget-object p1, p0, Landroid/support/v7/widget/AppCompatMultiAutoCompleteTextView;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; + invoke-virtual {p1, p2, p3}, Landroid/support/v7/widget/AppCompatBackgroundHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V .line 83 @@ -117,9 +119,13 @@ iput-object p1, p0, Landroid/support/v7/widget/AppCompatMultiAutoCompleteTextView;->mTextHelper:Landroid/support/v7/widget/AppCompatTextHelper; .line 84 + iget-object p1, p0, Landroid/support/v7/widget/AppCompatMultiAutoCompleteTextView;->mTextHelper:Landroid/support/v7/widget/AppCompatTextHelper; + invoke-virtual {p1, p2, p3}, Landroid/support/v7/widget/AppCompatTextHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V .line 85 + iget-object p1, p0, Landroid/support/v7/widget/AppCompatMultiAutoCompleteTextView;->mTextHelper:Landroid/support/v7/widget/AppCompatTextHelper; + invoke-virtual {p1}, Landroid/support/v7/widget/AppCompatTextHelper;->applyCompoundDrawablesTints()V return-void @@ -156,6 +162,14 @@ .method public getSupportBackgroundTintList()Landroid/content/res/ColorStateList; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 133 iget-object v0, p0, Landroid/support/v7/widget/AppCompatMultiAutoCompleteTextView;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; @@ -178,6 +192,14 @@ .method public getSupportBackgroundTintMode()Landroid/graphics/PorterDuff$Mode; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 161 iget-object v0, p0, Landroid/support/v7/widget/AppCompatMultiAutoCompleteTextView;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; @@ -233,6 +255,10 @@ .method public setBackgroundResource(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .line 95 invoke-super {p0, p1}, Landroid/widget/MultiAutoCompleteTextView;->setBackgroundResource(I)V @@ -251,6 +277,10 @@ .method public setDropDownBackgroundResource(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .line 90 invoke-virtual {p0}, Landroid/support/v7/widget/AppCompatMultiAutoCompleteTextView;->getContext()Landroid/content/Context; @@ -268,6 +298,15 @@ .method public setSupportBackgroundTintList(Landroid/content/res/ColorStateList;)V .locals 1 + .param p1 # Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 118 iget-object v0, p0, Landroid/support/v7/widget/AppCompatMultiAutoCompleteTextView;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; @@ -283,6 +322,15 @@ .method public setSupportBackgroundTintMode(Landroid/graphics/PorterDuff$Mode;)V .locals 1 + .param p1 # Landroid/graphics/PorterDuff$Mode; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 146 iget-object v0, p0, Landroid/support/v7/widget/AppCompatMultiAutoCompleteTextView;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; diff --git a/smali/android/support/v7/widget/AppCompatPopupWindow.smali b/smali/android/support/v7/widget/AppCompatPopupWindow.smali index 574a2bfa..18da5873 100644 --- a/smali/android/support/v7/widget/AppCompatPopupWindow.smali +++ b/smali/android/support/v7/widget/AppCompatPopupWindow.smali @@ -37,6 +37,18 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;I)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # I + .annotation build Landroid/support/annotation/AttrRes; + .end annotation + .end param .line 40 invoke-direct {p0, p1, p2, p3}, Landroid/widget/PopupWindow;->(Landroid/content/Context;Landroid/util/AttributeSet;I)V @@ -51,6 +63,22 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;II)V .locals 0 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # I + .annotation build Landroid/support/annotation/AttrRes; + .end annotation + .end param + .param p4 # I + .annotation build Landroid/support/annotation/StyleRes; + .end annotation + .end param .line 46 invoke-direct {p0, p1, p2, p3, p4}, Landroid/widget/PopupWindow;->(Landroid/content/Context;Landroid/util/AttributeSet;II)V diff --git a/smali/android/support/v7/widget/AppCompatProgressBarHelper.smali b/smali/android/support/v7/widget/AppCompatProgressBarHelper.smali index f963eca8..812d38e6 100644 --- a/smali/android/support/v7/widget/AppCompatProgressBarHelper.smali +++ b/smali/android/support/v7/widget/AppCompatProgressBarHelper.smali @@ -19,9 +19,9 @@ const/4 v0, 0x2 + .line 38 new-array v0, v0, [I - .line 38 fill-array-data v0, :array_0 sput-object v0, Landroid/support/v7/widget/AppCompatProgressBarHelper;->TINT_ATTRS:[I @@ -54,9 +54,9 @@ const/16 v0, 0x8 + .line 140 new-array v0, v0, [F - .line 140 fill-array-data v0, :array_0 .line 141 @@ -271,10 +271,10 @@ invoke-direct {p1, v2, p2, v1}, Landroid/graphics/drawable/ClipDrawable;->(Landroid/graphics/drawable/Drawable;II)V - move-object v2, p1 + goto :goto_4 :cond_7 - return-object v2 + move-object p1, v2 :cond_8 :goto_4 diff --git a/smali/android/support/v7/widget/AppCompatRadioButton.smali b/smali/android/support/v7/widget/AppCompatRadioButton.smali index 01e22f45..47a82ffb 100644 --- a/smali/android/support/v7/widget/AppCompatRadioButton.smali +++ b/smali/android/support/v7/widget/AppCompatRadioButton.smali @@ -53,6 +53,8 @@ iput-object p1, p0, Landroid/support/v7/widget/AppCompatRadioButton;->mCompoundButtonHelper:Landroid/support/v7/widget/AppCompatCompoundButtonHelper; .line 66 + iget-object p1, p0, Landroid/support/v7/widget/AppCompatRadioButton;->mCompoundButtonHelper:Landroid/support/v7/widget/AppCompatCompoundButtonHelper; + invoke-virtual {p1, p2, p3}, Landroid/support/v7/widget/AppCompatCompoundButtonHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V .line 67 @@ -63,6 +65,8 @@ iput-object p1, p0, Landroid/support/v7/widget/AppCompatRadioButton;->mTextHelper:Landroid/support/v7/widget/AppCompatTextHelper; .line 68 + iget-object p1, p0, Landroid/support/v7/widget/AppCompatRadioButton;->mTextHelper:Landroid/support/v7/widget/AppCompatTextHelper; + invoke-virtual {p1, p2, p3}, Landroid/support/v7/widget/AppCompatTextHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V return-void @@ -94,6 +98,14 @@ .method public getSupportButtonTintList()Landroid/content/res/ColorStateList; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 112 iget-object v0, p0, Landroid/support/v7/widget/AppCompatRadioButton;->mCompoundButtonHelper:Landroid/support/v7/widget/AppCompatCompoundButtonHelper; @@ -116,6 +128,14 @@ .method public getSupportButtonTintMode()Landroid/graphics/PorterDuff$Mode; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 137 iget-object v0, p0, Landroid/support/v7/widget/AppCompatRadioButton;->mCompoundButtonHelper:Landroid/support/v7/widget/AppCompatCompoundButtonHelper; @@ -138,6 +158,10 @@ .method public setButtonDrawable(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .line 81 invoke-virtual {p0}, Landroid/support/v7/widget/AppCompatRadioButton;->getContext()Landroid/content/Context; @@ -173,6 +197,15 @@ .method public setSupportButtonTintList(Landroid/content/res/ColorStateList;)V .locals 1 + .param p1 # Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 99 iget-object v0, p0, Landroid/support/v7/widget/AppCompatRadioButton;->mCompoundButtonHelper:Landroid/support/v7/widget/AppCompatCompoundButtonHelper; @@ -188,6 +221,15 @@ .method public setSupportButtonTintMode(Landroid/graphics/PorterDuff$Mode;)V .locals 1 + .param p1 # Landroid/graphics/PorterDuff$Mode; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 124 iget-object v0, p0, Landroid/support/v7/widget/AppCompatRadioButton;->mCompoundButtonHelper:Landroid/support/v7/widget/AppCompatCompoundButtonHelper; diff --git a/smali/android/support/v7/widget/AppCompatRatingBar.smali b/smali/android/support/v7/widget/AppCompatRatingBar.smali index 8b80a89f..ea3617ee 100644 --- a/smali/android/support/v7/widget/AppCompatRatingBar.smali +++ b/smali/android/support/v7/widget/AppCompatRatingBar.smali @@ -44,6 +44,8 @@ iput-object p1, p0, Landroid/support/v7/widget/AppCompatRatingBar;->mAppCompatProgressBarHelper:Landroid/support/v7/widget/AppCompatProgressBarHelper; .line 51 + iget-object p1, p0, Landroid/support/v7/widget/AppCompatRatingBar;->mAppCompatProgressBarHelper:Landroid/support/v7/widget/AppCompatProgressBarHelper; + invoke-virtual {p1, p2, p3}, Landroid/support/v7/widget/AppCompatProgressBarHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V return-void diff --git a/smali/android/support/v7/widget/AppCompatSeekBar.smali b/smali/android/support/v7/widget/AppCompatSeekBar.smali index b9e04358..9d8c8428 100644 --- a/smali/android/support/v7/widget/AppCompatSeekBar.smali +++ b/smali/android/support/v7/widget/AppCompatSeekBar.smali @@ -44,6 +44,8 @@ iput-object p1, p0, Landroid/support/v7/widget/AppCompatSeekBar;->mAppCompatSeekBarHelper:Landroid/support/v7/widget/AppCompatSeekBarHelper; .line 50 + iget-object p1, p0, Landroid/support/v7/widget/AppCompatSeekBar;->mAppCompatSeekBarHelper:Landroid/support/v7/widget/AppCompatSeekBarHelper; + invoke-virtual {p1, p2, p3}, Landroid/support/v7/widget/AppCompatSeekBarHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V return-void diff --git a/smali/android/support/v7/widget/AppCompatSeekBarHelper.smali b/smali/android/support/v7/widget/AppCompatSeekBarHelper.smali index 9bc14eef..6f263870 100644 --- a/smali/android/support/v7/widget/AppCompatSeekBarHelper.smali +++ b/smali/android/support/v7/widget/AppCompatSeekBarHelper.smali @@ -54,16 +54,18 @@ if-eqz v0, :cond_3 - iget-boolean v1, p0, Landroid/support/v7/widget/AppCompatSeekBarHelper;->mHasTickMarkTint:Z + iget-boolean v0, p0, Landroid/support/v7/widget/AppCompatSeekBarHelper;->mHasTickMarkTint:Z - if-nez v1, :cond_0 + if-nez v0, :cond_0 - iget-boolean v1, p0, Landroid/support/v7/widget/AppCompatSeekBarHelper;->mHasTickMarkTintMode:Z + iget-boolean v0, p0, Landroid/support/v7/widget/AppCompatSeekBarHelper;->mHasTickMarkTintMode:Z - if-eqz v1, :cond_3 + if-eqz v0, :cond_3 .line 126 :cond_0 + iget-object v0, p0, Landroid/support/v7/widget/AppCompatSeekBarHelper;->mTickMark:Landroid/graphics/drawable/Drawable; + invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->mutate()Landroid/graphics/drawable/Drawable; move-result-object v0 @@ -75,11 +77,13 @@ iput-object v0, p0, Landroid/support/v7/widget/AppCompatSeekBarHelper;->mTickMark:Landroid/graphics/drawable/Drawable; .line 128 - iget-boolean v1, p0, Landroid/support/v7/widget/AppCompatSeekBarHelper;->mHasTickMarkTint:Z + iget-boolean v0, p0, Landroid/support/v7/widget/AppCompatSeekBarHelper;->mHasTickMarkTint:Z - if-eqz v1, :cond_1 + if-eqz v0, :cond_1 .line 129 + iget-object v0, p0, Landroid/support/v7/widget/AppCompatSeekBarHelper;->mTickMark:Landroid/graphics/drawable/Drawable; + iget-object v1, p0, Landroid/support/v7/widget/AppCompatSeekBarHelper;->mTickMarkTintList:Landroid/content/res/ColorStateList; invoke-static {v0, v1}, Landroid/support/v4/graphics/drawable/DrawableCompat;->setTintList(Landroid/graphics/drawable/Drawable;Landroid/content/res/ColorStateList;)V @@ -305,6 +309,8 @@ .method getTickMark()Landroid/graphics/drawable/Drawable; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 97 iget-object v0, p0, Landroid/support/v7/widget/AppCompatSeekBarHelper;->mTickMark:Landroid/graphics/drawable/Drawable; @@ -314,6 +320,8 @@ .method getTickMarkTintList()Landroid/content/res/ColorStateList; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 109 iget-object v0, p0, Landroid/support/v7/widget/AppCompatSeekBarHelper;->mTickMarkTintList:Landroid/content/res/ColorStateList; @@ -323,6 +331,8 @@ .method getTickMarkTintMode()Landroid/graphics/PorterDuff$Mode; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 121 iget-object v0, p0, Landroid/support/v7/widget/AppCompatSeekBarHelper;->mTickMarkTintMode:Landroid/graphics/PorterDuff$Mode; @@ -456,6 +466,10 @@ .method setTickMark(Landroid/graphics/drawable/Drawable;)V .locals 2 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 77 iget-object v0, p0, Landroid/support/v7/widget/AppCompatSeekBarHelper;->mTickMark:Landroid/graphics/drawable/Drawable; @@ -518,6 +532,10 @@ .method setTickMarkTintList(Landroid/content/res/ColorStateList;)V .locals 0 + .param p1 # Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 101 iput-object p1, p0, Landroid/support/v7/widget/AppCompatSeekBarHelper;->mTickMarkTintList:Landroid/content/res/ColorStateList; @@ -535,6 +553,10 @@ .method setTickMarkTintMode(Landroid/graphics/PorterDuff$Mode;)V .locals 0 + .param p1 # Landroid/graphics/PorterDuff$Mode; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 113 iput-object p1, p0, Landroid/support/v7/widget/AppCompatSeekBarHelper;->mTickMarkTintMode:Landroid/graphics/PorterDuff$Mode; diff --git a/smali/android/support/v7/widget/AppCompatSpinner$DropDownAdapter.smali b/smali/android/support/v7/widget/AppCompatSpinner$DropDownAdapter.smali index 81461273..68e38bec 100644 --- a/smali/android/support/v7/widget/AppCompatSpinner$DropDownAdapter.smali +++ b/smali/android/support/v7/widget/AppCompatSpinner$DropDownAdapter.smali @@ -27,6 +27,14 @@ # direct methods .method public constructor (Landroid/widget/SpinnerAdapter;Landroid/content/res/Resources$Theme;)V .locals 2 + .param p1 # Landroid/widget/SpinnerAdapter; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p2 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 604 invoke-direct {p0}, Ljava/lang/Object;->()V diff --git a/smali/android/support/v7/widget/AppCompatSpinner.smali b/smali/android/support/v7/widget/AppCompatSpinner.smali index 5336abc0..fb34b3a4 100644 --- a/smali/android/support/v7/widget/AppCompatSpinner.smali +++ b/smali/android/support/v7/widget/AppCompatSpinner.smali @@ -53,6 +53,7 @@ const/4 v0, 0x1 + .line 71 new-array v0, v0, [I const/4 v1, 0x0 @@ -61,7 +62,6 @@ aput v2, v0, v1 - .line 71 sput-object v0, Landroid/support/v7/widget/AppCompatSpinner;->ATTRS_ANDROID_SPINNERMODE:[I return-void @@ -269,6 +269,8 @@ :catchall_0 move-exception p1 + move-object p5, v2 + goto :goto_4 :catch_1 @@ -294,13 +296,11 @@ :catchall_1 move-exception p1 - move-object v2, p5 - :goto_4 - if-eqz v2, :cond_4 + if-eqz p5, :cond_4 .line 229 - invoke-virtual {v2}, Landroid/content/res/TypedArray;->recycle()V + invoke-virtual {p5}, Landroid/content/res/TypedArray;->recycle()V :cond_4 throw p1 @@ -484,17 +484,15 @@ const/4 v5, 0x0 - move v6, v3 - move-object v7, v5 - const/4 v3, 0x0 + const/4 v6, 0x0 :goto_0 - if-ge v6, v4, :cond_3 + if-ge v3, v4, :cond_3 .line 562 - invoke-interface {p1, v6}, Landroid/widget/SpinnerAdapter;->getItemViewType(I)I + invoke-interface {p1, v3}, Landroid/widget/SpinnerAdapter;->getItemViewType(I)I move-result v8 @@ -506,7 +504,7 @@ .line 567 :cond_1 - invoke-interface {p1, v6, v7, p0}, Landroid/widget/SpinnerAdapter;->getView(ILandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View; + invoke-interface {p1, v3, v7, p0}, Landroid/widget/SpinnerAdapter;->getView(ILandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View; move-result-object v7 @@ -535,11 +533,11 @@ move-result v8 - invoke-static {v3, v8}, Ljava/lang/Math;->max(II)I + invoke-static {v6, v8}, Ljava/lang/Math;->max(II)I - move-result v3 + move-result v6 - add-int/lit8 v6, v6, 0x1 + add-int/lit8 v3, v3, 0x1 goto :goto_0 @@ -562,10 +560,10 @@ add-int/2addr p1, p2 - add-int/2addr v3, p1 + add-int/2addr v6, p1 :cond_4 - return v3 + return v6 .end method .method protected drawableStateChanged()V @@ -787,6 +785,14 @@ .method public getSupportBackgroundTintList()Landroid/content/res/ColorStateList; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 501 iget-object v0, p0, Landroid/support/v7/widget/AppCompatSpinner;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; @@ -809,6 +815,14 @@ .method public getSupportBackgroundTintMode()Landroid/graphics/PorterDuff$Mode; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 530 iget-object v0, p0, Landroid/support/v7/widget/AppCompatSpinner;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; @@ -1060,6 +1074,10 @@ .method public setBackgroundResource(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .line 462 invoke-super {p0, p1}, Landroid/widget/Spinner;->setBackgroundResource(I)V @@ -1194,6 +1212,10 @@ .method public setPopupBackgroundResource(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .line 309 invoke-virtual {p0}, Landroid/support/v7/widget/AppCompatSpinner;->getPopupContext()Landroid/content/Context; @@ -1232,6 +1254,15 @@ .method public setSupportBackgroundTintList(Landroid/content/res/ColorStateList;)V .locals 1 + .param p1 # Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 486 iget-object v0, p0, Landroid/support/v7/widget/AppCompatSpinner;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; @@ -1247,6 +1278,15 @@ .method public setSupportBackgroundTintMode(Landroid/graphics/PorterDuff$Mode;)V .locals 1 + .param p1 # Landroid/graphics/PorterDuff$Mode; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 515 iget-object v0, p0, Landroid/support/v7/widget/AppCompatSpinner;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; diff --git a/smali/android/support/v7/widget/AppCompatTextHelper$1.smali b/smali/android/support/v7/widget/AppCompatTextHelper$1.smali index c8cd44c7..509081a8 100644 --- a/smali/android/support/v7/widget/AppCompatTextHelper$1.smali +++ b/smali/android/support/v7/widget/AppCompatTextHelper$1.smali @@ -44,6 +44,10 @@ .method public onFontRetrieved(Landroid/graphics/Typeface;)V .locals 2 + .param p1 # Landroid/graphics/Typeface; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 255 iget-object v0, p0, Landroid/support/v7/widget/AppCompatTextHelper$1;->this$0:Landroid/support/v7/widget/AppCompatTextHelper; diff --git a/smali/android/support/v7/widget/AppCompatTextHelper.smali b/smali/android/support/v7/widget/AppCompatTextHelper.smali index 0817d73e..ed9ea131 100644 --- a/smali/android/support/v7/widget/AppCompatTextHelper.smali +++ b/smali/android/support/v7/widget/AppCompatTextHelper.smali @@ -15,6 +15,9 @@ .field private mAsyncFontPending:Z .field private final mAutoSizeTextHelper:Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper; + .annotation build Landroid/support/annotation/NonNull; + .end annotation +.end field .field private mDrawableBottomTint:Landroid/support/v7/widget/TintInfo; @@ -51,11 +54,13 @@ iput-object p1, p0, Landroid/support/v7/widget/AppCompatTextHelper;->mView:Landroid/widget/TextView; .line 66 - new-instance v0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper; + new-instance p1, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper; + + iget-object v0, p0, Landroid/support/v7/widget/AppCompatTextHelper;->mView:Landroid/widget/TextView; - invoke-direct {v0, p1}, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->(Landroid/widget/TextView;)V + invoke-direct {p1, v0}, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->(Landroid/widget/TextView;)V - iput-object v0, p0, Landroid/support/v7/widget/AppCompatTextHelper;->mAutoSizeTextHelper:Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper; + iput-object p1, p0, Landroid/support/v7/widget/AppCompatTextHelper;->mAutoSizeTextHelper:Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper; return-void .end method @@ -271,11 +276,13 @@ iput-object p1, p0, Landroid/support/v7/widget/AppCompatTextHelper;->mFontTypeface:Landroid/graphics/Typeface; + .line 267 + iget-object p1, p0, Landroid/support/v7/widget/AppCompatTextHelper;->mFontTypeface:Landroid/graphics/Typeface; + if-nez p1, :cond_7 const/4 v1, 0x1 - .line 267 :cond_7 iput-boolean v1, p0, Landroid/support/v7/widget/AppCompatTextHelper;->mAsyncFontPending:Z :try_end_0 @@ -425,6 +432,11 @@ .method autoSizeText()V .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 408 iget-object v0, p0, Landroid/support/v7/widget/AppCompatTextHelper;->mAutoSizeTextHelper:Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper; @@ -501,6 +513,11 @@ .method isAutoSizeEnabled()Z .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 414 iget-object v0, p0, Landroid/support/v7/widget/AppCompatTextHelper;->mAutoSizeTextHelper:Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper; @@ -514,6 +531,11 @@ .method loadFromAttributes(Landroid/util/AttributeSet;I)V .locals 17 + .annotation build Landroid/annotation/SuppressLint; + value = { + "NewApi" + } + .end annotation move-object/from16 v0, p0 @@ -754,7 +776,9 @@ move-result v11 - const/4 v12, 0x1 + move v12, v11 + + const/4 v11, 0x1 goto :goto_0 @@ -885,18 +909,18 @@ invoke-virtual {v7, v11, v6}, Landroid/support/v7/widget/TintTypedArray;->getBoolean(IZ)Z - move-result v11 + move-result v12 goto :goto_5 :cond_c - move v5, v12 + move v5, v11 .line 154 :goto_5 - sget v12, Landroid/os/Build$VERSION;->SDK_INT:I + sget v11, Landroid/os/Build$VERSION;->SDK_INT:I - if-ge v12, v9, :cond_f + if-ge v11, v9, :cond_f .line 157 sget v9, Landroid/support/v7/appcompat/R$styleable;->TextAppearance_android_textColor:I @@ -952,9 +976,9 @@ :cond_f sget v9, Landroid/os/Build$VERSION;->SDK_INT:I - const/16 v12, 0x1c + const/16 v11, 0x1c - if-lt v9, v12, :cond_10 + if-lt v9, v11, :cond_10 sget v9, Landroid/support/v7/appcompat/R$styleable;->TextAppearance_android_textSize:I @@ -977,9 +1001,9 @@ .line 173 iget-object v9, v0, Landroid/support/v7/widget/AppCompatTextHelper;->mView:Landroid/widget/TextView; - const/4 v12, 0x0 + const/4 v11, 0x0 - invoke-virtual {v9, v6, v12}, Landroid/widget/TextView;->setTextSize(IF)V + invoke-virtual {v9, v6, v11}, Landroid/widget/TextView;->setTextSize(IF)V .line 177 :cond_10 @@ -1017,7 +1041,7 @@ if-eqz v5, :cond_14 .line 190 - invoke-virtual {v0, v11}, Landroid/support/v7/widget/AppCompatTextHelper;->setAllCaps(Z)V + invoke-virtual {v0, v12}, Landroid/support/v7/widget/AppCompatTextHelper;->setAllCaps(Z)V .line 192 :cond_14 @@ -1216,6 +1240,11 @@ .method onLayout(ZIIII)V .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 390 sget-boolean p1, Landroid/support/v4/widget/AutoSizeableTextView;->PLATFORM_SUPPORTS_AUTOSIZE:Z @@ -1371,6 +1400,10 @@ .method setAutoSizeTextTypeUniformWithPresetSizes([II)V .locals 1 + .param p1 # [I + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Throws; value = { Ljava/lang/IllegalArgumentException; @@ -1398,6 +1431,11 @@ .method setTextSize(IF)V .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 398 sget-boolean v0, Landroid/support/v4/widget/AutoSizeableTextView;->PLATFORM_SUPPORTS_AUTOSIZE:Z diff --git a/smali/android/support/v7/widget/AppCompatTextView.smali b/smali/android/support/v7/widget/AppCompatTextView.smali index f5430511..faa0d06a 100644 --- a/smali/android/support/v7/widget/AppCompatTextView.smali +++ b/smali/android/support/v7/widget/AppCompatTextView.smali @@ -11,6 +11,9 @@ .field private final mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; .field private mPrecomputedTextFuture:Ljava/util/concurrent/Future; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .annotation system Ldalvik/annotation/Signature; value = { "Ljava/util/concurrent/Future<", @@ -64,6 +67,8 @@ iput-object p1, p0, Landroid/support/v7/widget/AppCompatTextView;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; .line 90 + iget-object p1, p0, Landroid/support/v7/widget/AppCompatTextView;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; + invoke-virtual {p1, p2, p3}, Landroid/support/v7/widget/AppCompatBackgroundHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V .line 92 @@ -74,9 +79,13 @@ iput-object p1, p0, Landroid/support/v7/widget/AppCompatTextView;->mTextHelper:Landroid/support/v7/widget/AppCompatTextHelper; .line 93 + iget-object p1, p0, Landroid/support/v7/widget/AppCompatTextView;->mTextHelper:Landroid/support/v7/widget/AppCompatTextHelper; + invoke-virtual {p1, p2, p3}, Landroid/support/v7/widget/AppCompatTextHelper;->loadFromAttributes(Landroid/util/AttributeSet;I)V .line 94 + iget-object p1, p0, Landroid/support/v7/widget/AppCompatTextView;->mTextHelper:Landroid/support/v7/widget/AppCompatTextHelper; + invoke-virtual {p1}, Landroid/support/v7/widget/AppCompatTextHelper;->applyCompoundDrawablesTints()V return-void @@ -144,6 +153,11 @@ .method public getAutoSizeMaxTextSize()I .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 349 sget-boolean v0, Landroid/support/v7/widget/AppCompatTextView;->PLATFORM_SUPPORTS_AUTOSIZE:Z @@ -178,6 +192,11 @@ .method public getAutoSizeMinTextSize()I .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 330 sget-boolean v0, Landroid/support/v7/widget/AppCompatTextView;->PLATFORM_SUPPORTS_AUTOSIZE:Z @@ -212,6 +231,11 @@ .method public getAutoSizeStepGranularity()I .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 311 sget-boolean v0, Landroid/support/v7/widget/AppCompatTextView;->PLATFORM_SUPPORTS_AUTOSIZE:Z @@ -246,6 +270,11 @@ .method public getAutoSizeTextAvailableSizes()[I .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 368 sget-boolean v0, Landroid/support/v7/widget/AppCompatTextView;->PLATFORM_SUPPORTS_AUTOSIZE:Z @@ -275,6 +304,7 @@ :cond_1 const/4 v0, 0x0 + .line 375 new-array v0, v0, [I return-object v0 @@ -282,6 +312,11 @@ .method public getAutoSizeTextType()I .locals 3 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 290 sget-boolean v0, Landroid/support/v7/widget/AppCompatTextView;->PLATFORM_SUPPORTS_AUTOSIZE:Z @@ -345,6 +380,14 @@ .method public getSupportBackgroundTintList()Landroid/content/res/ColorStateList; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 137 iget-object v0, p0, Landroid/support/v7/widget/AppCompatTextView;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; @@ -367,6 +410,14 @@ .method public getSupportBackgroundTintMode()Landroid/graphics/PorterDuff$Mode; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation + + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 165 iget-object v0, p0, Landroid/support/v7/widget/AppCompatTextView;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; @@ -403,6 +454,8 @@ .method public getTextMetricsParamsCompat()Landroid/support/v4/text/PrecomputedTextCompat$Params; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 437 invoke-static {p0}, Landroid/support/v4/widget/TextViewCompat;->getTextMetricsParams(Landroid/widget/TextView;)Landroid/support/v4/text/PrecomputedTextCompat$Params; @@ -501,6 +554,12 @@ .method public setAutoSizeTextTypeUniformWithConfiguration(IIII)V .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Ljava/lang/IllegalArgumentException; @@ -533,6 +592,16 @@ .method public setAutoSizeTextTypeUniformWithPresetSizes([II)V .locals 1 + .param p1 # [I + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Ljava/lang/IllegalArgumentException; @@ -565,6 +634,11 @@ .method public setAutoSizeTextTypeWithDefaults(I)V .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 226 sget-boolean v0, Landroid/support/v7/widget/AppCompatTextView;->PLATFORM_SUPPORTS_AUTOSIZE:Z @@ -610,6 +684,10 @@ .method public setBackgroundResource(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .line 99 invoke-super {p0, p1}, Landroid/widget/TextView;->setBackgroundResource(I)V @@ -642,6 +720,14 @@ .method public setFirstBaselineToTopHeight(I)V .locals 2 + .param p1 # I + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + .end annotation + + .annotation build Landroid/support/annotation/Px; + .end annotation + .end param .line 386 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -665,6 +751,14 @@ .method public setLastBaselineToBottomHeight(I)V .locals 2 + .param p1 # I + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + .end annotation + + .annotation build Landroid/support/annotation/Px; + .end annotation + .end param .line 396 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -688,6 +782,14 @@ .method public setLineHeight(I)V .locals 0 + .param p1 # I + .annotation build Landroid/support/annotation/IntRange; + from = 0x0L + .end annotation + + .annotation build Landroid/support/annotation/Px; + .end annotation + .end param .line 416 invoke-static {p0, p1}, Landroid/support/v4/widget/TextViewCompat;->setLineHeight(Landroid/widget/TextView;I)V @@ -697,6 +799,10 @@ .method public setPrecomputedText(Landroid/support/v4/text/PrecomputedTextCompat;)V .locals 0 + .param p1 # Landroid/support/v4/text/PrecomputedTextCompat; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 460 invoke-static {p0, p1}, Landroid/support/v4/widget/TextViewCompat;->setPrecomputedText(Landroid/widget/TextView;Landroid/support/v4/text/PrecomputedTextCompat;)V @@ -706,6 +812,15 @@ .method public setSupportBackgroundTintList(Landroid/content/res/ColorStateList;)V .locals 1 + .param p1 # Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 122 iget-object v0, p0, Landroid/support/v7/widget/AppCompatTextView;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; @@ -721,6 +836,15 @@ .method public setSupportBackgroundTintMode(Landroid/graphics/PorterDuff$Mode;)V .locals 1 + .param p1 # Landroid/graphics/PorterDuff$Mode; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 150 iget-object v0, p0, Landroid/support/v7/widget/AppCompatTextView;->mBackgroundTintHelper:Landroid/support/v7/widget/AppCompatBackgroundHelper; @@ -754,6 +878,10 @@ .method public setTextFuture(Ljava/util/concurrent/Future;)V .locals 0 + .param p1 # Ljava/util/concurrent/Future; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -774,6 +902,10 @@ .method public setTextMetricsParamsCompat(Landroid/support/v4/text/PrecomputedTextCompat$Params;)V .locals 0 + .param p1 # Landroid/support/v4/text/PrecomputedTextCompat$Params; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 447 invoke-static {p0, p1}, Landroid/support/v4/widget/TextViewCompat;->setTextMetricsParams(Landroid/widget/TextView;Landroid/support/v4/text/PrecomputedTextCompat$Params;)V diff --git a/smali/android/support/v7/widget/AppCompatTextViewAutoSizeHelper.smali b/smali/android/support/v7/widget/AppCompatTextViewAutoSizeHelper.smali index adcf873c..40b80d60 100644 --- a/smali/android/support/v7/widget/AppCompatTextViewAutoSizeHelper.smali +++ b/smali/android/support/v7/widget/AppCompatTextViewAutoSizeHelper.smali @@ -98,9 +98,9 @@ .line 86 iput v1, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mAutoSizeMaxTextSizeInPx:F + .line 89 new-array v1, v0, [I - .line 89 iput-object v1, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mAutoSizeTextSizesInPx:[I .line 93 @@ -110,6 +110,8 @@ iput-object p1, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mTextView:Landroid/widget/TextView; .line 101 + iget-object p1, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mTextView:Landroid/widget/TextView; + invoke-virtual {p1}, Landroid/widget/TextView;->getContext()Landroid/content/Context; move-result-object p1 @@ -235,9 +237,9 @@ .line 588 iput v1, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mAutoSizeStepGranularityInPx:F + .line 589 new-array v1, v0, [I - .line 589 iput-object v1, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mAutoSizeTextSizesInPx:[I .line 590 @@ -248,6 +250,9 @@ .method private createStaticLayoutForMeasuring(Ljava/lang/CharSequence;Landroid/text/Layout$Alignment;II)Landroid/text/StaticLayout; .locals 4 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x17 + .end annotation .line 711 iget-object v0, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mTextView:Landroid/widget/TextView; @@ -558,17 +563,19 @@ invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;->(Ljava/lang/String;)V - goto :goto_2 - - :goto_1 throw p1 - :goto_2 - goto :goto_1 + return-void .end method .method private getTextViewMethod(Ljava/lang/String;)Ljava/lang/reflect/Method; .locals 3 + .param p1 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 786 :try_start_0 @@ -642,7 +649,19 @@ .end method .method private invokeAndReturnWithDefault(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object; - .locals 3 + .locals 4 + .param p1 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Ljava/lang/String; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p3 # Ljava/lang/Object; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "getTextViewMethod(Ljava/lang/String;)Ljava/lang/reflect/Method; - move-result-object v0 - - const/4 v1, 0x0 - - new-array v1, v1, [Ljava/lang/Object; + move-result-object v1 .line 770 - invoke-virtual {v0, p1, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; + new-array v2, v0, [Ljava/lang/Object; + + invoke-virtual {v1, p1, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; move-result-object p3 :try_end_0 @@ -682,29 +701,31 @@ :catch_0 move-exception p1 + const/4 v0, 0x1 + :try_start_1 - const-string v0, "ACTVAutoSizeHelper" + const-string v1, "ACTVAutoSizeHelper" .line 773 - new-instance v1, Ljava/lang/StringBuilder; + new-instance v2, Ljava/lang/StringBuilder; - invoke-direct {v1}, Ljava/lang/StringBuilder;->()V + invoke-direct {v2}, Ljava/lang/StringBuilder;->()V - const-string v2, "Failed to invoke TextView#" + const-string v3, "Failed to invoke TextView#" - invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v2, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; const-string p2, "() method" - invoke-virtual {v1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v2, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; move-result-object p2 - invoke-static {v0, p2, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I + invoke-static {v1, p2, p1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I :try_end_1 .catchall {:try_start_1 .. :try_end_1} :catchall_0 @@ -1002,46 +1023,51 @@ .end method .method private setupAutoSizeUniformPresetSizesConfiguration()Z - .locals 5 + .locals 4 .line 434 iget-object v0, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mAutoSizeTextSizesInPx:[I - array-length v1, v0 + array-length v0, v0 - const/4 v2, 0x0 + const/4 v1, 0x0 - const/4 v3, 0x1 + const/4 v2, 0x1 - if-lez v1, :cond_0 + if-lez v0, :cond_0 - const/4 v4, 0x1 + const/4 v3, 0x1 goto :goto_0 :cond_0 - const/4 v4, 0x0 + const/4 v3, 0x0 .line 435 :goto_0 - iput-boolean v4, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mHasPresetAutoSizeValues:Z + iput-boolean v3, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mHasPresetAutoSizeValues:Z + + .line 436 + iget-boolean v3, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mHasPresetAutoSizeValues:Z - if-eqz v4, :cond_1 + if-eqz v3, :cond_1 .line 437 - iput v3, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mAutoSizeTextType:I + iput v2, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mAutoSizeTextType:I .line 438 - aget v2, v0, v2 + iget-object v3, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mAutoSizeTextSizesInPx:[I - int-to-float v2, v2 + aget v1, v3, v1 + + int-to-float v1, v1 - iput v2, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mAutoSizeMinTextSizeInPx:F + iput v1, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mAutoSizeMinTextSizeInPx:F - sub-int/2addr v1, v3 + sub-int/2addr v0, v2 .line 439 - aget v0, v0, v1 + aget v0, v3, v0 int-to-float v0, v0 @@ -1052,8 +1078,11 @@ .line 440 iput v0, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mAutoSizeStepGranularityInPx:F + .line 442 :cond_1 - return v4 + iget-boolean v0, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mHasPresetAutoSizeValues:Z + + return v0 .end method .method private suggestedSizeFitsInSpace(ILandroid/graphics/RectF;)Z @@ -1254,8 +1283,16 @@ instance-of v0, v0, Landroid/support/v7/widget/AppCompatEditText; - xor-int/lit8 v0, v0, 0x1 + if-nez v0, :cond_0 + + const/4 v0, 0x1 + + goto :goto_0 + + :cond_0 + const/4 v0, 0x0 + :goto_0 return v0 .end method @@ -1392,7 +1429,12 @@ # virtual methods .method autoSizeText()V - .locals 4 + .locals 5 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 547 invoke-virtual {p0}, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->isAutoSizeEnabled()Z @@ -1432,17 +1474,17 @@ :cond_1 iget-object v0, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mTextView:Landroid/widget/TextView; - const-string v1, "getHorizontallyScrolling" - - const/4 v2, 0x0 + const/4 v1, 0x0 .line 557 - invoke-static {v2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean; + invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean; - move-result-object v3 + move-result-object v2 + + const-string v3, "getHorizontallyScrolling" .line 556 - invoke-direct {p0, v0, v1, v3}, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->invokeAndReturnWithDefault(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object; + invoke-direct {p0, v0, v3, v2}, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->invokeAndReturnWithDefault(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object; move-result-object v0 @@ -1467,30 +1509,30 @@ move-result v0 - iget-object v1, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mTextView:Landroid/widget/TextView; + iget-object v2, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mTextView:Landroid/widget/TextView; - invoke-virtual {v1}, Landroid/widget/TextView;->getTotalPaddingLeft()I + invoke-virtual {v2}, Landroid/widget/TextView;->getTotalPaddingLeft()I - move-result v1 + move-result v2 - sub-int/2addr v0, v1 + sub-int/2addr v0, v2 - iget-object v1, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mTextView:Landroid/widget/TextView; + iget-object v2, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mTextView:Landroid/widget/TextView; .line 561 - invoke-virtual {v1}, Landroid/widget/TextView;->getTotalPaddingRight()I + invoke-virtual {v2}, Landroid/widget/TextView;->getTotalPaddingRight()I - move-result v1 + move-result v2 - sub-int/2addr v0, v1 + sub-int/2addr v0, v2 .line 562 :goto_0 - iget-object v1, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mTextView:Landroid/widget/TextView; + iget-object v2, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mTextView:Landroid/widget/TextView; - invoke-virtual {v1}, Landroid/widget/TextView;->getHeight()I + invoke-virtual {v2}, Landroid/widget/TextView;->getHeight()I - move-result v1 + move-result v2 iget-object v3, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mTextView:Landroid/widget/TextView; @@ -1498,7 +1540,7 @@ move-result v3 - sub-int/2addr v1, v3 + sub-int/2addr v2, v3 iget-object v3, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mTextView:Landroid/widget/TextView; @@ -1507,11 +1549,11 @@ move-result v3 - sub-int/2addr v1, v3 + sub-int/2addr v2, v3 if-lez v0, :cond_5 - if-gtz v1, :cond_3 + if-gtz v2, :cond_3 goto :goto_1 @@ -1523,38 +1565,46 @@ .line 570 :try_start_0 - invoke-virtual {v3}, Landroid/graphics/RectF;->setEmpty()V + sget-object v4, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->TEMP_RECTF:Landroid/graphics/RectF; - int-to-float v0, v0 + invoke-virtual {v4}, Landroid/graphics/RectF;->setEmpty()V .line 571 - iput v0, v3, Landroid/graphics/RectF;->right:F + sget-object v4, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->TEMP_RECTF:Landroid/graphics/RectF; + + int-to-float v0, v0 - int-to-float v0, v1 + iput v0, v4, Landroid/graphics/RectF;->right:F .line 572 - iput v0, v3, Landroid/graphics/RectF;->bottom:F + sget-object v0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->TEMP_RECTF:Landroid/graphics/RectF; + + int-to-float v2, v2 + + iput v2, v0, Landroid/graphics/RectF;->bottom:F .line 573 - invoke-direct {p0, v3}, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->findLargestTextSizeWhichFits(Landroid/graphics/RectF;)I + sget-object v0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->TEMP_RECTF:Landroid/graphics/RectF; + + invoke-direct {p0, v0}, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->findLargestTextSizeWhichFits(Landroid/graphics/RectF;)I move-result v0 int-to-float v0, v0 .line 574 - iget-object v1, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mTextView:Landroid/widget/TextView; + iget-object v2, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mTextView:Landroid/widget/TextView; - invoke-virtual {v1}, Landroid/widget/TextView;->getTextSize()F + invoke-virtual {v2}, Landroid/widget/TextView;->getTextSize()F - move-result v1 + move-result v2 - cmpl-float v1, v0, v1 + cmpl-float v2, v0, v2 - if-eqz v1, :cond_4 + if-eqz v2, :cond_4 .line 575 - invoke-virtual {p0, v2, v0}, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->setTextSizeInternal(IF)V + invoke-virtual {p0, v1, v0}, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->setTextSizeInternal(IF)V .line 577 :cond_4 @@ -1587,6 +1637,11 @@ .method getAutoSizeMaxTextSize()I .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 404 iget v0, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mAutoSizeMaxTextSizeInPx:F @@ -1600,6 +1655,11 @@ .method getAutoSizeMinTextSize()I .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 388 iget v0, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mAutoSizeMinTextSizeInPx:F @@ -1613,6 +1673,11 @@ .method getAutoSizeStepGranularity()I .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 372 iget v0, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mAutoSizeStepGranularityInPx:F @@ -1626,6 +1691,11 @@ .method getAutoSizeTextAvailableSizes()[I .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 417 iget-object v0, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mAutoSizeTextSizesInPx:[I @@ -1635,6 +1705,11 @@ .method getAutoSizeTextType()I .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 358 iget v0, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mAutoSizeTextType:I @@ -1644,6 +1719,11 @@ .method isAutoSizeEnabled()Z .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 811 invoke-direct {p0}, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->supportsAutoSizeText()Z @@ -1890,6 +1970,12 @@ .method setAutoSizeTextTypeUniformWithConfiguration(IIII)V .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Ljava/lang/IllegalArgumentException; @@ -1954,6 +2040,16 @@ .method setAutoSizeTextTypeUniformWithPresetSizes([II)V .locals 5 + .param p1 # [I + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Ljava/lang/IllegalArgumentException; @@ -2087,6 +2183,11 @@ .method setAutoSizeTextTypeWithDefaults(I)V .locals 3 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 198 invoke-direct {p0}, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->supportsAutoSizeText()Z @@ -2179,6 +2280,11 @@ .method setTextSizeInternal(IF)V .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 596 iget-object v0, p0, Landroid/support/v7/widget/AppCompatTextViewAutoSizeHelper;->mContext:Landroid/content/Context; diff --git a/smali/android/support/v7/widget/ButtonBarLayout.smali b/smali/android/support/v7/widget/ButtonBarLayout.smali index f88668ae..309f377a 100644 --- a/smali/android/support/v7/widget/ButtonBarLayout.smali +++ b/smali/android/support/v7/widget/ButtonBarLayout.smali @@ -3,6 +3,14 @@ .source "ButtonBarLayout.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field private static final PEEK_BUTTON_DP:I = 0x10 @@ -441,9 +449,11 @@ .line 58 iput-boolean p1, p0, Landroid/support/v7/widget/ButtonBarLayout;->mAllowStacking:Z + .line 59 + iget-boolean p1, p0, Landroid/support/v7/widget/ButtonBarLayout;->mAllowStacking:Z + if-nez p1, :cond_0 - .line 59 invoke-virtual {p0}, Landroid/support/v7/widget/ButtonBarLayout;->getOrientation()I move-result p1 diff --git a/smali/android/support/v7/widget/ContentFrameLayout.smali b/smali/android/support/v7/widget/ContentFrameLayout.smali index a5c8d4d6..0736bf4f 100644 --- a/smali/android/support/v7/widget/ContentFrameLayout.smali +++ b/smali/android/support/v7/widget/ContentFrameLayout.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v7/widget/ContentFrameLayout$OnAttachListener; @@ -72,6 +78,11 @@ # virtual methods .method public dispatchFitSystemWindows(Landroid/graphics/Rect;)V .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 76 invoke-virtual {p0, p1}, Landroid/support/v7/widget/ContentFrameLayout;->fitSystemWindows(Landroid/graphics/Rect;)Z @@ -384,12 +395,16 @@ move-result p1 - const/4 v10, 0x1 + move v10, p1 + + const/4 p1, 0x1 goto :goto_4 :cond_4 - const/4 v10, 0x0 + move v10, p1 + + const/4 p1, 0x0 :goto_4 if-ne v5, v8, :cond_8 @@ -484,102 +499,102 @@ .line 143 :cond_8 - invoke-super {p0, p1, p2}, Landroid/widget/FrameLayout;->onMeasure(II)V + invoke-super {p0, v10, p2}, Landroid/widget/FrameLayout;->onMeasure(II)V .line 145 invoke-virtual {p0}, Landroid/support/v7/widget/ContentFrameLayout;->getMeasuredWidth()I - move-result p1 + move-result v5 .line 148 - invoke-static {p1, v9}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I + invoke-static {v5, v9}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I - move-result v5 + move-result v10 - if-nez v10, :cond_d + if-nez p1, :cond_d if-ne v2, v8, :cond_d if-eqz v1, :cond_9 .line 151 - iget-object v1, p0, Landroid/support/v7/widget/ContentFrameLayout;->mMinWidthMinor:Landroid/util/TypedValue; + iget-object p1, p0, Landroid/support/v7/widget/ContentFrameLayout;->mMinWidthMinor:Landroid/util/TypedValue; goto :goto_8 :cond_9 - iget-object v1, p0, Landroid/support/v7/widget/ContentFrameLayout;->mMinWidthMajor:Landroid/util/TypedValue; + iget-object p1, p0, Landroid/support/v7/widget/ContentFrameLayout;->mMinWidthMajor:Landroid/util/TypedValue; :goto_8 - if-eqz v1, :cond_d + if-eqz p1, :cond_d .line 152 - iget v2, v1, Landroid/util/TypedValue;->type:I + iget v1, p1, Landroid/util/TypedValue;->type:I - if-eqz v2, :cond_d + if-eqz v1, :cond_d .line 154 - iget v2, v1, Landroid/util/TypedValue;->type:I + iget v1, p1, Landroid/util/TypedValue;->type:I - if-ne v2, v7, :cond_a + if-ne v1, v7, :cond_a .line 155 - invoke-virtual {v1, v0}, Landroid/util/TypedValue;->getDimension(Landroid/util/DisplayMetrics;)F + invoke-virtual {p1, v0}, Landroid/util/TypedValue;->getDimension(Landroid/util/DisplayMetrics;)F - move-result v0 + move-result p1 :goto_9 - float-to-int v0, v0 + float-to-int p1, p1 goto :goto_a .line 156 :cond_a - iget v2, v1, Landroid/util/TypedValue;->type:I + iget v1, p1, Landroid/util/TypedValue;->type:I - if-ne v2, v6, :cond_b + if-ne v1, v6, :cond_b .line 157 - iget v2, v0, Landroid/util/DisplayMetrics;->widthPixels:I + iget v1, v0, Landroid/util/DisplayMetrics;->widthPixels:I - int-to-float v2, v2 + int-to-float v1, v1 iget v0, v0, Landroid/util/DisplayMetrics;->widthPixels:I int-to-float v0, v0 - invoke-virtual {v1, v2, v0}, Landroid/util/TypedValue;->getFraction(FF)F + invoke-virtual {p1, v1, v0}, Landroid/util/TypedValue;->getFraction(FF)F - move-result v0 + move-result p1 goto :goto_9 :cond_b - const/4 v0, 0x0 + const/4 p1, 0x0 :goto_a - if-lez v0, :cond_c + if-lez p1, :cond_c .line 160 - iget-object v1, p0, Landroid/support/v7/widget/ContentFrameLayout;->mDecorPadding:Landroid/graphics/Rect; + iget-object v0, p0, Landroid/support/v7/widget/ContentFrameLayout;->mDecorPadding:Landroid/graphics/Rect; - iget v1, v1, Landroid/graphics/Rect;->left:I + iget v0, v0, Landroid/graphics/Rect;->left:I - iget-object v2, p0, Landroid/support/v7/widget/ContentFrameLayout;->mDecorPadding:Landroid/graphics/Rect; + iget-object v1, p0, Landroid/support/v7/widget/ContentFrameLayout;->mDecorPadding:Landroid/graphics/Rect; - iget v2, v2, Landroid/graphics/Rect;->right:I + iget v1, v1, Landroid/graphics/Rect;->right:I - add-int/2addr v1, v2 + add-int/2addr v0, v1 - sub-int/2addr v0, v1 + sub-int/2addr p1, v0 :cond_c - if-ge p1, v0, :cond_d + if-ge v5, p1, :cond_d .line 163 - invoke-static {v0, v9}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I + invoke-static {p1, v9}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I - move-result v5 + move-result v10 goto :goto_b @@ -590,7 +605,7 @@ if-eqz v3, :cond_e .line 170 - invoke-super {p0, v5, p2}, Landroid/widget/FrameLayout;->onMeasure(II)V + invoke-super {p0, v10, p2}, Landroid/widget/FrameLayout;->onMeasure(II)V :cond_e return-void @@ -607,6 +622,11 @@ .method public setDecorPadding(IIII)V .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 91 iget-object v0, p0, Landroid/support/v7/widget/ContentFrameLayout;->mDecorPadding:Landroid/graphics/Rect; diff --git a/smali/android/support/v7/widget/DecorContentParent.smali b/smali/android/support/v7/widget/DecorContentParent.smali index 81c6542e..c01ab363 100644 --- a/smali/android/support/v7/widget/DecorContentParent.smali +++ b/smali/android/support/v7/widget/DecorContentParent.smali @@ -3,6 +3,14 @@ .source "DecorContentParent.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # virtual methods .method public abstract canShowOverflowMenu()Z .end method diff --git a/smali/android/support/v7/widget/DecorToolbar.smali b/smali/android/support/v7/widget/DecorToolbar.smali index 999079aa..9b2d1778 100644 --- a/smali/android/support/v7/widget/DecorToolbar.smali +++ b/smali/android/support/v7/widget/DecorToolbar.smali @@ -3,6 +3,14 @@ .source "DecorToolbar.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # virtual methods .method public abstract animateToVisibility(I)V .end method diff --git a/smali/android/support/v7/widget/DialogTitle.smali b/smali/android/support/v7/widget/DialogTitle.smali index 0e939dde..f4af9115 100644 --- a/smali/android/support/v7/widget/DialogTitle.smali +++ b/smali/android/support/v7/widget/DialogTitle.smali @@ -3,6 +3,14 @@ .source "DialogTitle.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # direct methods .method public constructor (Landroid/content/Context;)V .locals 0 diff --git a/smali/android/support/v7/widget/DrawableUtils.smali b/smali/android/support/v7/widget/DrawableUtils.smali index 514d033b..dcea8d59 100644 --- a/smali/android/support/v7/widget/DrawableUtils.smali +++ b/smali/android/support/v7/widget/DrawableUtils.smali @@ -3,6 +3,14 @@ .source "DrawableUtils.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field public static final INSETS_NONE:Landroid/graphics/Rect; @@ -66,6 +74,10 @@ .method public static canSafelyMutateDrawable(Landroid/graphics/drawable/Drawable;)Z .locals 4 + .param p0 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 129 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -224,6 +236,10 @@ .method static fixDrawable(Landroid/graphics/drawable/Drawable;)V .locals 2 + .param p0 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 118 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -325,9 +341,9 @@ move-result-object v0 + .line 77 new-array v1, v2, [Ljava/lang/Object; - .line 77 invoke-virtual {v0, p0, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; move-result-object p0 diff --git a/smali/android/support/v7/widget/DropDownListView$ResolveHoverRunnable.smali b/smali/android/support/v7/widget/DropDownListView$ResolveHoverRunnable.smali index f53a34e7..9d4c60a9 100644 --- a/smali/android/support/v7/widget/DropDownListView$ResolveHoverRunnable.smali +++ b/smali/android/support/v7/widget/DropDownListView$ResolveHoverRunnable.smali @@ -46,8 +46,6 @@ iput-object v1, v0, Landroid/support/v7/widget/DropDownListView;->mResolveHoverRunnable:Landroid/support/v7/widget/DropDownListView$ResolveHoverRunnable; .line 712 - iget-object v0, p0, Landroid/support/v7/widget/DropDownListView$ResolveHoverRunnable;->this$0:Landroid/support/v7/widget/DropDownListView; - invoke-virtual {v0, p0}, Landroid/support/v7/widget/DropDownListView;->removeCallbacks(Ljava/lang/Runnable;)Z return-void @@ -75,8 +73,6 @@ iput-object v1, v0, Landroid/support/v7/widget/DropDownListView;->mResolveHoverRunnable:Landroid/support/v7/widget/DropDownListView$ResolveHoverRunnable; .line 707 - iget-object v0, p0, Landroid/support/v7/widget/DropDownListView$ResolveHoverRunnable;->this$0:Landroid/support/v7/widget/DropDownListView; - invoke-virtual {v0}, Landroid/support/v7/widget/DropDownListView;->drawableStateChanged()V return-void diff --git a/smali/android/support/v7/widget/DropDownListView.smali b/smali/android/support/v7/widget/DropDownListView.smali index 7d4caa5a..03778992 100644 --- a/smali/android/support/v7/widget/DropDownListView.smali +++ b/smali/android/support/v7/widget/DropDownListView.smali @@ -98,9 +98,11 @@ iput-object p1, p0, Landroid/support/v7/widget/DropDownListView;->mIsChildViewEnabled:Ljava/lang/reflect/Field; + .line 124 + iget-object p1, p0, Landroid/support/v7/widget/DropDownListView;->mIsChildViewEnabled:Ljava/lang/reflect/Field; + const/4 p2, 0x1 - .line 124 invoke-virtual {p1, p2}, Ljava/lang/reflect/Field;->setAccessible(Z)V :try_end_0 .catch Ljava/lang/NoSuchFieldException; {:try_start_0 .. :try_end_0} :catch_0 @@ -935,19 +937,21 @@ const/4 v3, 0x0 + move v4, p2 + move-object v6, v3 - const/4 v4, 0x0 + const/4 p2, 0x0 const/4 v5, 0x0 const/4 v7, 0x0 :goto_1 - if-ge v4, v1, :cond_9 + if-ge p2, v1, :cond_9 .line 316 - invoke-interface {v2, v4}, Landroid/widget/ListAdapter;->getItemViewType(I)I + invoke-interface {v2, p2}, Landroid/widget/ListAdapter;->getItemViewType(I)I move-result v8 @@ -959,7 +963,7 @@ .line 321 :cond_2 - invoke-interface {v2, v4, v6, p0}, Landroid/widget/ListAdapter;->getView(ILandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View; + invoke-interface {v2, p2, v6, p0}, Landroid/widget/ListAdapter;->getView(ILandroid/view/View;Landroid/view/ViewGroup;)Landroid/view/View; move-result-object v6 @@ -1008,9 +1012,9 @@ .line 342 invoke-virtual {v6}, Landroid/view/View;->forceLayout()V - if-lez v4, :cond_5 + if-lez p2, :cond_5 - add-int/2addr p2, v0 + add-int/2addr v4, v0 .line 349 :cond_5 @@ -1018,17 +1022,17 @@ move-result v8 - add-int/2addr p2, v8 + add-int/2addr v4, v8 - if-lt p2, p4, :cond_7 + if-lt v4, p4, :cond_7 if-ltz p5, :cond_6 - if-le v4, p5, :cond_6 + if-le p2, p5, :cond_6 if-lez v7, :cond_6 - if-eq p2, p4, :cond_6 + if-eq v4, p4, :cond_6 move p4, v7 @@ -1038,17 +1042,17 @@ :cond_7 if-ltz p5, :cond_8 - if-lt v4, p5, :cond_8 + if-lt p2, p5, :cond_8 - move v7, p2 + move v7, v4 :cond_8 - add-int/lit8 v4, v4, 0x1 + add-int/lit8 p2, p2, 0x1 goto :goto_1 :cond_9 - return p2 + return v4 .end method .method protected onDetachedFromWindow()V @@ -1228,6 +1232,10 @@ .method public onHoverEvent(Landroid/view/MotionEvent;)Z .locals 4 + .param p1 # Landroid/view/MotionEvent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 430 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I @@ -1266,6 +1274,8 @@ iput-object v1, p0, Landroid/support/v7/widget/DropDownListView;->mResolveHoverRunnable:Landroid/support/v7/widget/DropDownListView$ResolveHoverRunnable; .line 442 + iget-object v1, p0, Landroid/support/v7/widget/DropDownListView;->mResolveHoverRunnable:Landroid/support/v7/widget/DropDownListView$ResolveHoverRunnable; + invoke-virtual {v1}, Landroid/support/v7/widget/DropDownListView$ResolveHoverRunnable;->post()V .line 446 @@ -1438,6 +1448,8 @@ iput-object v0, p0, Landroid/support/v7/widget/DropDownListView;->mSelector:Landroid/support/v7/widget/DropDownListView$GateKeeperDrawable; .line 170 + iget-object v0, p0, Landroid/support/v7/widget/DropDownListView;->mSelector:Landroid/support/v7/widget/DropDownListView$GateKeeperDrawable; + invoke-super {p0, v0}, Landroid/widget/ListView;->setSelector(Landroid/graphics/drawable/Drawable;)V .line 172 diff --git a/smali/android/support/v7/widget/FitWindowsFrameLayout.smali b/smali/android/support/v7/widget/FitWindowsFrameLayout.smali index 06ced23e..3cd59f2c 100644 --- a/smali/android/support/v7/widget/FitWindowsFrameLayout.smali +++ b/smali/android/support/v7/widget/FitWindowsFrameLayout.smali @@ -6,6 +6,14 @@ .implements Landroid/support/v7/widget/FitWindowsViewGroup; +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # instance fields .field private mListener:Landroid/support/v7/widget/FitWindowsViewGroup$OnFitSystemWindowsListener; diff --git a/smali/android/support/v7/widget/FitWindowsLinearLayout.smali b/smali/android/support/v7/widget/FitWindowsLinearLayout.smali index ae24cd2f..505159bd 100644 --- a/smali/android/support/v7/widget/FitWindowsLinearLayout.smali +++ b/smali/android/support/v7/widget/FitWindowsLinearLayout.smali @@ -6,6 +6,14 @@ .implements Landroid/support/v7/widget/FitWindowsViewGroup; +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # instance fields .field private mListener:Landroid/support/v7/widget/FitWindowsViewGroup$OnFitSystemWindowsListener; diff --git a/smali/android/support/v7/widget/FitWindowsViewGroup.smali b/smali/android/support/v7/widget/FitWindowsViewGroup.smali index 532f0427..eb793e14 100644 --- a/smali/android/support/v7/widget/FitWindowsViewGroup.smali +++ b/smali/android/support/v7/widget/FitWindowsViewGroup.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v7/widget/FitWindowsViewGroup$OnFitSystemWindowsListener; diff --git a/smali/android/support/v7/widget/ForwardingListener.smali b/smali/android/support/v7/widget/ForwardingListener.smali index 5eab0bb4..d8594452 100644 --- a/smali/android/support/v7/widget/ForwardingListener.smali +++ b/smali/android/support/v7/widget/ForwardingListener.smali @@ -8,6 +8,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v7/widget/ForwardingListener$TriggerLongPress;, @@ -45,9 +51,9 @@ const/4 v0, 0x2 + .line 66 new-array v1, v0, [I - .line 66 iput-object v1, p0, Landroid/support/v7/widget/ForwardingListener;->mTmpLocation:[I .line 69 @@ -86,6 +92,8 @@ iput p1, p0, Landroid/support/v7/widget/ForwardingListener;->mTapTimeout:I .line 77 + iget p1, p0, Landroid/support/v7/widget/ForwardingListener;->mTapTimeout:I + invoke-static {}, Landroid/view/ViewConfiguration;->getLongPressTimeout()I move-result v1 @@ -140,7 +148,7 @@ const/4 v2, 0x0 - if-eqz v1, :cond_3 + if-eqz v1, :cond_4 .line 261 invoke-interface {v1}, Landroid/support/v7/view/menu/ShowableListMenu;->isShowing()Z @@ -149,7 +157,7 @@ if-nez v3, :cond_0 - goto :goto_1 + goto :goto_2 .line 265 :cond_0 @@ -159,7 +167,7 @@ check-cast v1, Landroid/support/v7/widget/DropDownListView; - if-eqz v1, :cond_3 + if-eqz v1, :cond_4 .line 266 invoke-virtual {v1}, Landroid/support/v7/widget/DropDownListView;->isShown()Z @@ -168,7 +176,7 @@ if-nez v3, :cond_1 - goto :goto_1 + goto :goto_2 .line 271 :cond_1 @@ -217,10 +225,16 @@ if-eqz p1, :cond_3 - const/4 v2, 0x1 + goto :goto_1 :cond_3 + const/4 v1, 0x0 + :goto_1 + return v1 + + :cond_4 + :goto_2 return v2 .end method diff --git a/smali/android/support/v7/widget/LinearLayoutCompat$DividerMode.smali b/smali/android/support/v7/widget/LinearLayoutCompat$DividerMode.smali index 123b6677..fa196f83 100644 --- a/smali/android/support/v7/widget/LinearLayoutCompat$DividerMode.smali +++ b/smali/android/support/v7/widget/LinearLayoutCompat$DividerMode.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v7/widget/LinearLayoutCompat; .end annotation diff --git a/smali/android/support/v7/widget/LinearLayoutCompat$OrientationMode.smali b/smali/android/support/v7/widget/LinearLayoutCompat$OrientationMode.smali index 552f1036..c3b3c688 100644 --- a/smali/android/support/v7/widget/LinearLayoutCompat$OrientationMode.smali +++ b/smali/android/support/v7/widget/LinearLayoutCompat$OrientationMode.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v7/widget/LinearLayoutCompat; .end annotation diff --git a/smali/android/support/v7/widget/LinearLayoutCompat.smali b/smali/android/support/v7/widget/LinearLayoutCompat.smali index 8e5d64d8..a9a34ce7 100644 --- a/smali/android/support/v7/widget/LinearLayoutCompat.smali +++ b/smali/android/support/v7/widget/LinearLayoutCompat.smali @@ -1104,6 +1104,11 @@ .method public getDividerWidth()I .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 278 iget v0, p0, Landroid/support/v7/widget/LinearLayoutCompat;->mDividerWidth:I @@ -1187,6 +1192,11 @@ .method protected hasDividerBeforeChildAt(I)Z .locals 4 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation const/4 v0, 0x0 @@ -1421,7 +1431,7 @@ const/4 v3, 0x0 :goto_2 - if-ge v3, v10, :cond_d + if-ge v3, v10, :cond_e mul-int v0, v17, v3 @@ -1441,7 +1451,7 @@ add-int/2addr v1, v0 - goto/16 :goto_6 + goto/16 :goto_7 .line 1576 :cond_3 @@ -1451,7 +1461,7 @@ const/16 v15, 0x8 - if-eq v5, v15, :cond_c + if-eq v5, v15, :cond_d .line 1577 invoke-virtual {v0}, Landroid/view/View;->getMeasuredWidth()I @@ -1472,10 +1482,10 @@ check-cast v4, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams; - move/from16 v18, v3 - if-eqz v12, :cond_4 + move/from16 v18, v3 + .line 1584 iget v3, v4, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->height:I @@ -1488,105 +1498,115 @@ .line 1585 invoke-virtual {v0}, Landroid/view/View;->getBaseline()I - move-result v10 + move-result v3 goto :goto_3 :cond_4 + move/from16 v18, v3 + move/from16 v19, v10 :cond_5 - const/4 v10, -0x1 + const/4 v3, -0x1 .line 1588 :goto_3 - iget v3, v4, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->gravity:I + iget v10, v4, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->gravity:I - if-gez v3, :cond_6 + if-gez v10, :cond_6 - move v3, v11 + move v10, v11 :cond_6 - and-int/lit8 v3, v3, 0x70 + and-int/lit8 v10, v10, 0x70 move/from16 v20, v11 const/16 v11, 0x10 - if-eq v3, v11, :cond_a + if-eq v10, v11, :cond_b const/16 v11, 0x30 - if-eq v3, v11, :cond_8 + if-eq v10, v11, :cond_9 const/16 v11, 0x50 - if-eq v3, v11, :cond_7 + if-eq v10, v11, :cond_7 move v3, v7 const/4 v11, -0x1 - goto :goto_4 + :goto_4 + const/16 v21, 0x1 + + goto :goto_6 :cond_7 - sub-int v3, v8, v5 + sub-int v10, v8, v5 .line 1618 iget v11, v4, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->bottomMargin:I - sub-int/2addr v3, v11 + sub-int/2addr v10, v11 const/4 v11, -0x1 - if-eq v10, v11, :cond_9 + if-eq v3, v11, :cond_8 .line 1620 invoke-virtual {v0}, Landroid/view/View;->getMeasuredHeight()I move-result v21 - sub-int v21, v21, v10 + sub-int v21, v21, v3 - const/4 v10, 0x2 + const/4 v3, 0x2 .line 1621 - aget v22, v14, v10 + aget v22, v14, v3 sub-int v22, v22, v21 - sub-int v3, v3, v22 + sub-int v10, v10, v22 + + :cond_8 + move v3, v10 goto :goto_4 - :cond_8 + :cond_9 const/4 v11, -0x1 .line 1595 - iget v3, v4, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->topMargin:I + iget v10, v4, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->topMargin:I - add-int/2addr v3, v7 + add-int/2addr v10, v7 - if-eq v10, v11, :cond_9 + if-eq v3, v11, :cond_a const/16 v21, 0x1 .line 1597 aget v22, v13, v21 - sub-int v22, v22, v10 + sub-int v22, v22, v3 - add-int v3, v3, v22 + add-int v10, v10, v22 goto :goto_5 - :cond_9 - :goto_4 + :cond_a const/16 v21, 0x1 - goto :goto_5 + :goto_5 + move v3, v10 - :cond_a + goto :goto_6 + + :cond_b const/4 v11, -0x1 const/16 v21, 0x1 @@ -1609,12 +1629,12 @@ sub-int/2addr v3, v10 .line 1629 - :goto_5 + :goto_6 invoke-virtual {v6, v2}, Landroid/support/v7/widget/LinearLayoutCompat;->hasDividerBeforeChildAt(I)Z move-result v10 - if-eqz v10, :cond_b + if-eqz v10, :cond_c .line 1630 iget v10, v6, Landroid/support/v7/widget/LinearLayoutCompat;->mDividerWidth:I @@ -1622,7 +1642,7 @@ add-int/2addr v1, v10 .line 1633 - :cond_b + :cond_c iget v10, v4, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->leftMargin:I add-int/2addr v10, v1 @@ -1634,11 +1654,11 @@ add-int v22, v10, v1 - move-object/from16 p1, v0 + move-object v1, v0 move-object/from16 v0, p0 - move-object/from16 v1, p1 + move-object/from16 p1, v1 move v11, v2 @@ -1679,12 +1699,12 @@ move v1, v10 - goto :goto_7 + goto :goto_8 - :cond_c + :cond_d move/from16 v18, v3 - :goto_6 + :goto_7 move/from16 v22, v7 move/from16 v19, v10 @@ -1695,7 +1715,7 @@ const/16 v23, -0x1 - :goto_7 + :goto_8 add-int/lit8 v3, v3, 0x1 move/from16 v10, v19 @@ -1710,7 +1730,7 @@ goto/16 :goto_2 - :cond_d + :cond_e return-void .end method @@ -1827,7 +1847,7 @@ add-int/2addr v0, v1 - goto/16 :goto_4 + goto/16 :goto_5 .line 1464 :cond_2 @@ -1889,7 +1909,10 @@ add-int/2addr v1, v7 - goto :goto_3 + :goto_2 + move v2, v1 + + goto :goto_4 :cond_4 sub-int v1, v8, v4 @@ -1897,7 +1920,7 @@ .line 1485 iget v2, v5, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->rightMargin:I - goto :goto_2 + goto :goto_3 :cond_5 sub-int v1, v9, v4 @@ -1913,13 +1936,13 @@ iget v2, v5, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->rightMargin:I - :goto_2 + :goto_3 sub-int/2addr v1, v2 - :goto_3 - move v2, v1 + goto :goto_2 .line 1494 + :goto_4 invoke-virtual {v6, v12}, Landroid/support/v7/widget/LinearLayoutCompat;->hasDividerBeforeChildAt(I)Z move-result v1 @@ -1977,7 +2000,7 @@ move/from16 v0, v16 :cond_7 - :goto_4 + :goto_5 const/4 v1, 0x1 add-int/2addr v12, v1 @@ -2010,7 +2033,7 @@ .end method .method measureHorizontal(II)V - .locals 37 + .locals 38 move-object/from16 v7, p0 @@ -2049,15 +2072,15 @@ if-nez v0, :cond_1 + .line 945 :cond_0 new-array v0, v14, [I - .line 945 iput-object v0, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mMaxAscent:[I + .line 946 new-array v0, v14, [I - .line 946 iput-object v0, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mMaxDescent:[I .line 949 @@ -2127,14 +2150,14 @@ const/16 v24, 0x0 - const/16 v25, 0x0 + const/16 v26, 0x0 - const/16 v26, 0x1 + const/16 v27, 0x1 - const/16 v27, 0x0 + const/16 v28, 0x0 :goto_1 - move-object/from16 v28, v6 + move-object/from16 v29, v6 const/16 v5, 0x8 @@ -2159,15 +2182,11 @@ iput v5, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I :goto_2 - move v2, v1 - - move/from16 v32, v3 + move/from16 v33, v3 - move/from16 v36, v4 - - const/high16 v1, 0x40000000 # 2.0f + move/from16 v37, v4 - goto/16 :goto_f + goto/16 :goto_e .line 971 :cond_3 @@ -2216,7 +2235,7 @@ .line 983 iget v5, v10, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->weight:F - add-float v31, v0, v5 + add-float v32, v0, v5 if-ne v12, v2, :cond_8 @@ -2280,24 +2299,24 @@ .line 1004 invoke-virtual {v6, v2, v2}, Landroid/view/View;->measure(II)V - move/from16 v34, v1 + move/from16 v35, v1 - move/from16 v32, v3 + move/from16 v33, v3 - move/from16 v36, v4 + move/from16 v37, v4 move-object v3, v6 - const/16 v30, -0x2 + const/16 v31, -0x2 goto/16 :goto_7 :cond_7 - move/from16 v34, v1 + move/from16 v35, v1 - move/from16 v32, v3 + move/from16 v33, v3 - move/from16 v36, v4 + move/from16 v37, v4 move-object v3, v6 @@ -2305,7 +2324,7 @@ const/16 v24, 0x1 - const/16 v30, -0x2 + const/16 v31, -0x2 goto/16 :goto_8 @@ -2336,58 +2355,58 @@ const/high16 v2, -0x80000000 :goto_4 - cmpl-float v0, v31, v20 + cmpl-float v0, v32, v20 if-nez v0, :cond_a .line 1024 iget v0, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I - move/from16 v29, v0 + move/from16 v30, v0 goto :goto_5 :cond_a - const/16 v29, 0x0 + const/16 v30, 0x0 :goto_5 - const/16 v33, 0x0 + const/16 v34, 0x0 move-object/from16 v0, p0 - move/from16 v34, v1 + move/from16 v35, v1 move-object v1, v6 - move/from16 v35, v2 + move/from16 v36, v2 - move/from16 v2, v34 + move/from16 v2, v35 - move/from16 v32, v3 + move/from16 v33, v3 move/from16 v3, p1 - move/from16 v36, v4 + move/from16 v37, v4 - move/from16 v4, v29 + move/from16 v4, v30 const/4 v9, -0x1 - const/16 v29, -0x2 + const/16 v30, -0x2 move/from16 v5, p2 - move-object/from16 v29, v6 + move-object/from16 v30, v6 const/high16 v9, -0x80000000 - const/16 v30, -0x2 + const/16 v31, -0x2 - move/from16 v6, v33 + move/from16 v6, v34 invoke-virtual/range {v0 .. v6}, Landroid/support/v7/widget/LinearLayoutCompat;->measureChildBeforeLayout(Landroid/view/View;IIIII)V - move/from16 v0, v35 + move/from16 v0, v36 if-eq v0, v9, :cond_b @@ -2396,7 +2415,7 @@ .line 1032 :cond_b - invoke-virtual/range {v29 .. v29}, Landroid/view/View;->getMeasuredWidth()I + invoke-virtual/range {v30 .. v30}, Landroid/view/View;->getMeasuredWidth()I move-result v0 @@ -2413,7 +2432,7 @@ add-int/2addr v2, v3 - move-object/from16 v3, v29 + move-object/from16 v3, v30 .line 1035 invoke-virtual {v7, v3}, Landroid/support/v7/widget/LinearLayoutCompat;->getNextLocationOffset(Landroid/view/View;)I @@ -2429,7 +2448,7 @@ goto :goto_6 :cond_c - move-object/from16 v3, v29 + move-object/from16 v3, v30 .line 1037 iget v1, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I @@ -2460,7 +2479,7 @@ iput v1, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I :goto_6 - if-eqz v32, :cond_d + if-eqz v33, :cond_d .line 1043 invoke-static {v0, v14}, Ljava/lang/Math;->max(II)I @@ -2483,7 +2502,7 @@ const/4 v0, 0x1 - const/16 v27, 0x1 + const/16 v28, 0x1 goto :goto_9 @@ -2510,97 +2529,97 @@ move-result v5 - move/from16 v6, v25 + move/from16 v6, v26 invoke-static {v6, v5}, Landroid/view/View;->combineMeasuredStates(II)I - move-result v25 + move-result v5 - if-eqz v36, :cond_10 + if-eqz v37, :cond_10 .line 1061 invoke-virtual {v3}, Landroid/view/View;->getBaseline()I - move-result v5 + move-result v6 - const/4 v6, -0x1 + const/4 v9, -0x1 - if-eq v5, v6, :cond_10 + if-eq v6, v9, :cond_10 .line 1065 - iget v6, v10, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->gravity:I + iget v9, v10, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->gravity:I - if-gez v6, :cond_f + if-gez v9, :cond_f - iget v6, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mGravity:I + iget v9, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mGravity:I goto :goto_a :cond_f - iget v6, v10, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->gravity:I + iget v9, v10, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->gravity:I :goto_a - and-int/lit8 v6, v6, 0x70 + and-int/lit8 v9, v9, 0x70 - const/4 v9, 0x4 + const/16 v25, 0x4 - shr-int/2addr v6, v9 + shr-int/lit8 v9, v9, 0x4 - and-int/lit8 v6, v6, -0x2 + and-int/lit8 v9, v9, -0x2 - shr-int/lit8 v6, v6, 0x1 + shr-int/lit8 v9, v9, 0x1 .line 1070 - aget v9, v15, v6 + aget v1, v15, v9 - invoke-static {v9, v5}, Ljava/lang/Math;->max(II)I + invoke-static {v1, v6}, Ljava/lang/Math;->max(II)I - move-result v9 + move-result v1 - aput v9, v15, v6 + aput v1, v15, v9 .line 1071 - aget v9, v28, v6 + aget v1, v29, v9 - sub-int v5, v4, v5 + sub-int v6, v4, v6 - invoke-static {v9, v5}, Ljava/lang/Math;->max(II)I + invoke-static {v1, v6}, Ljava/lang/Math;->max(II)I - move-result v5 + move-result v1 - aput v5, v28, v6 + aput v1, v29, v9 :cond_10 - move/from16 v5, v21 + move/from16 v1, v21 .line 1075 - invoke-static {v5, v4}, Ljava/lang/Math;->max(II)I + invoke-static {v1, v4}, Ljava/lang/Math;->max(II)I - move-result v21 + move-result v1 - if-eqz v26, :cond_11 + if-eqz v27, :cond_11 .line 1077 - iget v5, v10, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->height:I + iget v6, v10, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->height:I - const/4 v6, -0x1 + const/4 v9, -0x1 - if-ne v5, v6, :cond_11 + if-ne v6, v9, :cond_11 - const/16 v26, 0x1 + const/4 v6, 0x1 goto :goto_b :cond_11 - const/16 v26, 0x0 + const/4 v6, 0x0 .line 1078 :goto_b - iget v5, v10, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->weight:F + iget v9, v10, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->weight:F - cmpl-float v5, v5, v20 + cmpl-float v9, v9, v20 - if-lez v5, :cond_13 + if-lez v9, :cond_13 if-eqz v0, :cond_12 @@ -2617,30 +2636,27 @@ move-result v23 - goto :goto_e + goto :goto_d :cond_13 move/from16 v10, v23 if-eqz v0, :cond_14 - goto :goto_d + move v4, v2 :cond_14 - move v2, v4 - - :goto_d - move/from16 v4, v22 + move/from16 v2, v22 .line 1086 - invoke-static {v4, v2}, Ljava/lang/Math;->max(II)I + invoke-static {v2, v4}, Ljava/lang/Math;->max(II)I move-result v22 move/from16 v23, v10 - :goto_e - move/from16 v10, v34 + :goto_d + move/from16 v10, v35 .line 1090 invoke-virtual {v7, v3, v10}, Landroid/support/v7/widget/LinearLayoutCompat;->getChildrenSkipCount(Landroid/view/View;I)I @@ -2649,22 +2665,26 @@ add-int/2addr v0, v10 - move v2, v0 + move/from16 v21, v1 - move/from16 v0, v31 + move/from16 v26, v5 - :goto_f - add-int/lit8 v2, v2, 0x1 + move/from16 v27, v6 - move/from16 v9, p2 + move v1, v0 - move v1, v2 + move/from16 v0, v32 - move-object/from16 v6, v28 + :goto_e + add-int/lit8 v1, v1, 0x1 + + move/from16 v9, p2 - move/from16 v3, v32 + move-object/from16 v6, v29 - move/from16 v4, v36 + move/from16 v3, v33 + + move/from16 v4, v37 const/high16 v2, 0x40000000 # 2.0f @@ -2675,23 +2695,21 @@ goto/16 :goto_1 :cond_15 - move/from16 v32, v3 + move/from16 v33, v3 - move/from16 v36, v4 + move/from16 v37, v4 - move/from16 v2, v21 + move/from16 v1, v21 - move/from16 v4, v22 + move/from16 v2, v22 move/from16 v10, v23 - move/from16 v6, v25 - - const/high16 v1, 0x40000000 # 2.0f + move/from16 v6, v26 const/high16 v9, -0x80000000 - const/16 v30, -0x2 + const/16 v31, -0x2 .line 1093 iget v3, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I @@ -2707,81 +2725,81 @@ .line 1094 iget v3, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I - iget v1, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mDividerWidth:I + iget v4, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mDividerWidth:I - add-int/2addr v3, v1 + add-int/2addr v3, v4 iput v3, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I .line 1099 :cond_16 - aget v1, v15, v18 + aget v3, v15, v18 - const/4 v3, -0x1 + const/4 v4, -0x1 - if-ne v1, v3, :cond_18 + if-ne v3, v4, :cond_18 - const/16 v21, 0x0 + const/4 v3, 0x0 - aget v5, v15, v21 + aget v5, v15, v3 - if-ne v5, v3, :cond_18 + if-ne v5, v4, :cond_18 - aget v5, v15, v17 + aget v3, v15, v17 - if-ne v5, v3, :cond_18 + if-ne v3, v4, :cond_18 - aget v5, v15, v16 + aget v3, v15, v16 - if-eq v5, v3, :cond_17 + if-eq v3, v4, :cond_17 - goto :goto_10 + goto :goto_f :cond_17 - move v1, v2 - move/from16 v23, v6 - goto :goto_11 + goto :goto_10 .line 1103 :cond_18 - :goto_10 + :goto_f aget v3, v15, v16 - const/4 v5, 0x0 + const/4 v4, 0x0 - aget v9, v15, v5 + aget v5, v15, v4 - aget v5, v15, v17 + aget v9, v15, v18 + + aget v4, v15, v17 .line 1105 - invoke-static {v1, v5}, Ljava/lang/Math;->max(II)I + invoke-static {v9, v4}, Ljava/lang/Math;->max(II)I - move-result v1 + move-result v4 .line 1104 - invoke-static {v9, v1}, Ljava/lang/Math;->max(II)I + invoke-static {v5, v4}, Ljava/lang/Math;->max(II)I - move-result v1 + move-result v4 .line 1103 - invoke-static {v3, v1}, Ljava/lang/Math;->max(II)I + invoke-static {v3, v4}, Ljava/lang/Math;->max(II)I - move-result v1 + move-result v3 .line 1106 - aget v3, v28, v16 + aget v4, v29, v16 const/4 v5, 0x0 - aget v9, v28, v5 + aget v9, v29, v5 - aget v5, v28, v18 + aget v5, v29, v18 move/from16 v23, v6 - aget v6, v28, v17 + aget v6, v29, v17 .line 1108 invoke-static {v5, v6}, Ljava/lang/Math;->max(II)I @@ -2794,60 +2812,60 @@ move-result v5 .line 1106 - invoke-static {v3, v5}, Ljava/lang/Math;->max(II)I + invoke-static {v4, v5}, Ljava/lang/Math;->max(II)I - move-result v3 + move-result v4 - add-int/2addr v1, v3 + add-int/2addr v3, v4 .line 1109 - invoke-static {v2, v1}, Ljava/lang/Math;->max(II)I + invoke-static {v1, v3}, Ljava/lang/Math;->max(II)I move-result v1 - :goto_11 - if-eqz v32, :cond_1d + :goto_10 + if-eqz v33, :cond_1d - const/high16 v2, -0x80000000 + const/high16 v3, -0x80000000 - if-eq v12, v2, :cond_19 + if-eq v12, v3, :cond_19 if-nez v12, :cond_1d :cond_19 - const/4 v2, 0x0 + const/4 v3, 0x0 .line 1114 - iput v2, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I + iput v3, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I - const/4 v2, 0x0 + const/4 v3, 0x0 - :goto_12 - if-ge v2, v11, :cond_1d + :goto_11 + if-ge v3, v11, :cond_1d .line 1117 - invoke-virtual {v7, v2}, Landroid/support/v7/widget/LinearLayoutCompat;->getVirtualChildAt(I)Landroid/view/View; + invoke-virtual {v7, v3}, Landroid/support/v7/widget/LinearLayoutCompat;->getVirtualChildAt(I)Landroid/view/View; - move-result-object v3 + move-result-object v4 - if-nez v3, :cond_1a + if-nez v4, :cond_1a .line 1120 - iget v3, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I + iget v4, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I - invoke-virtual {v7, v2}, Landroid/support/v7/widget/LinearLayoutCompat;->measureNullChild(I)I + invoke-virtual {v7, v3}, Landroid/support/v7/widget/LinearLayoutCompat;->measureNullChild(I)I move-result v5 - add-int/2addr v3, v5 + add-int/2addr v4, v5 - iput v3, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I + iput v4, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I - goto :goto_13 + goto :goto_12 .line 1124 :cond_1a - invoke-virtual {v3}, Landroid/view/View;->getVisibility()I + invoke-virtual {v4}, Landroid/view/View;->getVisibility()I move-result v5 @@ -2856,20 +2874,20 @@ if-ne v5, v6, :cond_1b .line 1125 - invoke-virtual {v7, v3, v2}, Landroid/support/v7/widget/LinearLayoutCompat;->getChildrenSkipCount(Landroid/view/View;I)I + invoke-virtual {v7, v4, v3}, Landroid/support/v7/widget/LinearLayoutCompat;->getChildrenSkipCount(Landroid/view/View;I)I - move-result v3 + move-result v4 - add-int/2addr v2, v3 + add-int/2addr v3, v4 - :goto_13 - move/from16 v21, v1 + :goto_12 + move/from16 v22, v1 - goto :goto_14 + goto :goto_13 .line 1130 :cond_1b - invoke-virtual {v3}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams; + invoke-virtual {v4}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams; move-result-object v5 @@ -2889,17 +2907,17 @@ add-int/2addr v9, v5 .line 1133 - invoke-virtual {v7, v3}, Landroid/support/v7/widget/LinearLayoutCompat;->getNextLocationOffset(Landroid/view/View;)I + invoke-virtual {v7, v4}, Landroid/support/v7/widget/LinearLayoutCompat;->getNextLocationOffset(Landroid/view/View;)I - move-result v3 + move-result v4 - add-int/2addr v9, v3 + add-int/2addr v9, v4 add-int/2addr v6, v9 iput v6, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I - goto :goto_13 + goto :goto_12 .line 1135 :cond_1c @@ -2907,7 +2925,7 @@ add-int v9, v6, v14 - move/from16 v21, v1 + move/from16 v22, v1 .line 1136 iget v1, v5, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->leftMargin:I @@ -2919,7 +2937,7 @@ add-int/2addr v9, v1 .line 1137 - invoke-virtual {v7, v3}, Landroid/support/v7/widget/LinearLayoutCompat;->getNextLocationOffset(Landroid/view/View;)I + invoke-virtual {v7, v4}, Landroid/support/v7/widget/LinearLayoutCompat;->getNextLocationOffset(Landroid/view/View;)I move-result v1 @@ -2932,155 +2950,158 @@ iput v1, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I - :goto_14 - add-int/lit8 v2, v2, 0x1 + :goto_13 + add-int/lit8 v3, v3, 0x1 - move/from16 v1, v21 + move/from16 v1, v22 - goto :goto_12 + goto :goto_11 :cond_1d - move/from16 v21, v1 + move/from16 v22, v1 .line 1143 iget v1, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I invoke-virtual/range {p0 .. p0}, Landroid/support/v7/widget/LinearLayoutCompat;->getPaddingLeft()I - move-result v2 + move-result v3 invoke-virtual/range {p0 .. p0}, Landroid/support/v7/widget/LinearLayoutCompat;->getPaddingRight()I - move-result v3 + move-result v4 - add-int/2addr v2, v3 + add-int/2addr v3, v4 - add-int/2addr v1, v2 + add-int/2addr v1, v3 iput v1, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I + .line 1145 + iget v1, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I + .line 1148 invoke-virtual/range {p0 .. p0}, Landroid/support/v7/widget/LinearLayoutCompat;->getSuggestedMinimumWidth()I - move-result v2 + move-result v3 - invoke-static {v1, v2}, Ljava/lang/Math;->max(II)I + invoke-static {v1, v3}, Ljava/lang/Math;->max(II)I move-result v1 - const/4 v2, 0x0 + const/4 v3, 0x0 .line 1151 - invoke-static {v1, v8, v2}, Landroid/view/View;->resolveSizeAndState(III)I + invoke-static {v1, v8, v3}, Landroid/view/View;->resolveSizeAndState(III)I move-result v1 - const v2, 0xffffff + const v3, 0xffffff - and-int/2addr v2, v1 + and-int/2addr v3, v1 .line 1157 - iget v3, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I + iget v4, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I - sub-int/2addr v2, v3 + sub-int/2addr v3, v4 if-nez v24, :cond_22 - if-eqz v2, :cond_1e + if-eqz v3, :cond_1e cmpl-float v5, v0, v20 if-lez v5, :cond_1e - goto :goto_17 + goto :goto_16 .line 1269 :cond_1e - invoke-static {v4, v10}, Ljava/lang/Math;->max(II)I + invoke-static {v2, v10}, Ljava/lang/Math;->max(II)I move-result v0 - if-eqz v32, :cond_21 + if-eqz v33, :cond_21 const/high16 v2, 0x40000000 # 2.0f if-eq v12, v2, :cond_21 - const/4 v10, 0x0 + const/4 v2, 0x0 - :goto_15 - if-ge v10, v11, :cond_21 + :goto_14 + if-ge v2, v11, :cond_21 .line 1275 - invoke-virtual {v7, v10}, Landroid/support/v7/widget/LinearLayoutCompat;->getVirtualChildAt(I)Landroid/view/View; + invoke-virtual {v7, v2}, Landroid/support/v7/widget/LinearLayoutCompat;->getVirtualChildAt(I)Landroid/view/View; - move-result-object v2 + move-result-object v3 - if-eqz v2, :cond_20 + if-eqz v3, :cond_20 .line 1277 - invoke-virtual {v2}, Landroid/view/View;->getVisibility()I + invoke-virtual {v3}, Landroid/view/View;->getVisibility()I - move-result v4 + move-result v5 - const/16 v5, 0x8 + const/16 v6, 0x8 - if-ne v4, v5, :cond_1f + if-ne v5, v6, :cond_1f - goto :goto_16 + goto :goto_15 .line 1282 :cond_1f - invoke-virtual {v2}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams; + invoke-virtual {v3}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams; - move-result-object v4 + move-result-object v5 - check-cast v4, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams; + check-cast v5, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams; .line 1284 - iget v4, v4, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->weight:F + iget v5, v5, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->weight:F - cmpl-float v4, v4, v20 + cmpl-float v5, v5, v20 - if-lez v4, :cond_20 + if-lez v5, :cond_20 - const/high16 v4, 0x40000000 # 2.0f + const/high16 v5, 0x40000000 # 2.0f .line 1287 - invoke-static {v14, v4}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I + invoke-static {v14, v5}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I - move-result v5 + move-result v6 .line 1288 - invoke-virtual {v2}, Landroid/view/View;->getMeasuredHeight()I + invoke-virtual {v3}, Landroid/view/View;->getMeasuredHeight()I - move-result v6 + move-result v9 - invoke-static {v6, v4}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I + invoke-static {v9, v5}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I - move-result v6 + move-result v9 .line 1286 - invoke-virtual {v2, v5, v6}, Landroid/view/View;->measure(II)V + invoke-virtual {v3, v6, v9}, Landroid/view/View;->measure(II)V :cond_20 - :goto_16 - add-int/lit8 v10, v10, 0x1 + :goto_15 + add-int/lit8 v2, v2, 0x1 - goto :goto_15 + goto :goto_14 :cond_21 - move/from16 v2, p2 + move/from16 v3, p2 - move/from16 v25, v11 + move/from16 v26, v11 - move/from16 v3, v21 + move/from16 v2, v22 goto/16 :goto_26 .line 1159 :cond_22 - :goto_17 + :goto_16 iget v5, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mWeightSum:F cmpl-float v6, v5, v20 @@ -3104,30 +3125,32 @@ aput v5, v15, v6 .line 1162 - aput v5, v28, v16 + aput v5, v29, v16 - aput v5, v28, v17 + aput v5, v29, v17 - aput v5, v28, v18 + aput v5, v29, v18 - aput v5, v28, v6 + aput v5, v29, v6 .line 1165 iput v6, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I - move v6, v4 + move v10, v2 move/from16 v9, v23 - const/4 v4, -0x1 + const/4 v6, -0x1 - const/4 v10, 0x0 + move v2, v0 - :goto_18 - if-ge v10, v11, :cond_32 + const/4 v0, 0x0 + + :goto_17 + if-ge v0, v11, :cond_32 .line 1168 - invoke-virtual {v7, v10}, Landroid/support/v7/widget/LinearLayoutCompat;->getVirtualChildAt(I)Landroid/view/View; + invoke-virtual {v7, v0}, Landroid/support/v7/widget/LinearLayoutCompat;->getVirtualChildAt(I)Landroid/view/View; move-result-object v14 @@ -3138,9 +3161,9 @@ move-result v5 - const/16 v3, 0x8 + const/16 v4, 0x8 - if-ne v5, v3, :cond_24 + if-ne v5, v4, :cond_24 goto/16 :goto_22 @@ -3153,99 +3176,99 @@ check-cast v5, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams; .line 1177 - iget v3, v5, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->weight:F + iget v4, v5, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->weight:F - cmpl-float v23, v3, v20 + cmpl-float v23, v4, v20 if-lez v23, :cond_29 - int-to-float v8, v2 + int-to-float v8, v3 - mul-float v8, v8, v3 + mul-float v8, v8, v4 - div-float/2addr v8, v0 + div-float/2addr v8, v2 float-to-int v8, v8 - sub-float/2addr v0, v3 + sub-float/2addr v2, v4 - sub-int/2addr v2, v8 + sub-int/2addr v3, v8 .line 1186 invoke-virtual/range {p0 .. p0}, Landroid/support/v7/widget/LinearLayoutCompat;->getPaddingTop()I - move-result v3 + move-result v4 invoke-virtual/range {p0 .. p0}, Landroid/support/v7/widget/LinearLayoutCompat;->getPaddingBottom()I move-result v23 - add-int v3, v3, v23 + add-int v4, v4, v23 - move/from16 v23, v0 + move/from16 v23, v2 - iget v0, v5, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->topMargin:I + iget v2, v5, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->topMargin:I - add-int/2addr v3, v0 + add-int/2addr v4, v2 - iget v0, v5, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->bottomMargin:I + iget v2, v5, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->bottomMargin:I - add-int/2addr v3, v0 + add-int/2addr v4, v2 - iget v0, v5, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->height:I + iget v2, v5, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->height:I - move/from16 v24, v2 + move/from16 v24, v3 - move/from16 v25, v11 + move/from16 v26, v11 const/4 v11, -0x1 - move/from16 v2, p2 + move/from16 v3, p2 .line 1184 - invoke-static {v2, v3, v0}, Landroid/support/v7/widget/LinearLayoutCompat;->getChildMeasureSpec(III)I + invoke-static {v3, v4, v2}, Landroid/support/v7/widget/LinearLayoutCompat;->getChildMeasureSpec(III)I - move-result v0 + move-result v2 .line 1191 - iget v3, v5, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->width:I + iget v4, v5, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->width:I - if-nez v3, :cond_27 + if-nez v4, :cond_27 - const/high16 v3, 0x40000000 # 2.0f + const/high16 v4, 0x40000000 # 2.0f - if-eq v12, v3, :cond_25 + if-eq v12, v4, :cond_25 - goto :goto_1a + goto :goto_19 :cond_25 if-lez v8, :cond_26 - goto :goto_19 + goto :goto_18 :cond_26 const/4 v8, 0x0 .line 1204 - :goto_19 - invoke-static {v8, v3}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I + :goto_18 + invoke-static {v8, v4}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I move-result v8 - invoke-virtual {v14, v8, v0}, Landroid/view/View;->measure(II)V + invoke-virtual {v14, v8, v2}, Landroid/view/View;->measure(II)V - goto :goto_1b + goto :goto_1a :cond_27 - const/high16 v3, 0x40000000 # 2.0f + const/high16 v4, 0x40000000 # 2.0f .line 1194 - :goto_1a + :goto_19 invoke-virtual {v14}, Landroid/view/View;->getMeasuredWidth()I - move-result v29 + move-result v30 - add-int v8, v29, v8 + add-int v8, v30, v8 if-gez v8, :cond_28 @@ -3253,44 +3276,44 @@ .line 1200 :cond_28 - invoke-static {v8, v3}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I + invoke-static {v8, v4}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I move-result v8 .line 1199 - invoke-virtual {v14, v8, v0}, Landroid/view/View;->measure(II)V + invoke-virtual {v14, v8, v2}, Landroid/view/View;->measure(II)V .line 1211 - :goto_1b + :goto_1a invoke-virtual {v14}, Landroid/view/View;->getMeasuredState()I - move-result v0 + move-result v2 - const/high16 v3, -0x1000000 + const/high16 v4, -0x1000000 - and-int/2addr v0, v3 + and-int/2addr v2, v4 .line 1210 - invoke-static {v9, v0}, Landroid/view/View;->combineMeasuredStates(II)I + invoke-static {v9, v2}, Landroid/view/View;->combineMeasuredStates(II)I move-result v9 - move/from16 v0, v23 + move/from16 v2, v23 - move/from16 v3, v24 + move/from16 v4, v24 - goto :goto_1c + goto :goto_1b :cond_29 - move v3, v2 + move v4, v3 - move/from16 v25, v11 + move/from16 v26, v11 const/4 v11, -0x1 - move/from16 v2, p2 + move/from16 v3, p2 - :goto_1c + :goto_1b if-eqz v19, :cond_2a .line 1215 @@ -3319,9 +3342,9 @@ iput v8, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I - move/from16 v23, v0 + move/from16 v23, v2 - goto :goto_1d + goto :goto_1c .line 1218 :cond_2a @@ -3334,51 +3357,51 @@ add-int/2addr v11, v8 - move/from16 v23, v0 + move/from16 v23, v2 - iget v0, v5, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->leftMargin:I + iget v2, v5, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->leftMargin:I - add-int/2addr v11, v0 + add-int/2addr v11, v2 - iget v0, v5, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->rightMargin:I + iget v2, v5, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->rightMargin:I - add-int/2addr v11, v0 + add-int/2addr v11, v2 .line 1220 invoke-virtual {v7, v14}, Landroid/support/v7/widget/LinearLayoutCompat;->getNextLocationOffset(Landroid/view/View;)I - move-result v0 + move-result v2 - add-int/2addr v11, v0 + add-int/2addr v11, v2 .line 1219 invoke-static {v8, v11}, Ljava/lang/Math;->max(II)I - move-result v0 + move-result v2 - iput v0, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I + iput v2, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I - :goto_1d - const/high16 v0, 0x40000000 # 2.0f + :goto_1c + const/high16 v2, 0x40000000 # 2.0f - if-eq v13, v0, :cond_2b + if-eq v13, v2, :cond_2b .line 1223 - iget v0, v5, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->height:I + iget v2, v5, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->height:I const/4 v8, -0x1 - if-ne v0, v8, :cond_2b + if-ne v2, v8, :cond_2b - const/4 v0, 0x1 + const/4 v2, 0x1 - goto :goto_1e + goto :goto_1d :cond_2b - const/4 v0, 0x0 + const/4 v2, 0x0 .line 1226 - :goto_1e + :goto_1d iget v8, v5, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->topMargin:I iget v11, v5, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->bottomMargin:I @@ -3393,241 +3416,250 @@ add-int/2addr v11, v8 .line 1228 - invoke-static {v4, v11}, Ljava/lang/Math;->max(II)I + invoke-static {v6, v11}, Ljava/lang/Math;->max(II)I - move-result v4 + move-result v6 - if-eqz v0, :cond_2c + if-eqz v2, :cond_2c - goto :goto_1f + goto :goto_1e :cond_2c move v8, v11 .line 1229 - :goto_1f - invoke-static {v6, v8}, Ljava/lang/Math;->max(II)I + :goto_1e + invoke-static {v10, v8}, Ljava/lang/Math;->max(II)I - move-result v0 + move-result v2 - if-eqz v26, :cond_2d + if-eqz v27, :cond_2d .line 1232 - iget v6, v5, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->height:I + iget v8, v5, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->height:I - const/4 v8, -0x1 + const/4 v10, -0x1 - if-ne v6, v8, :cond_2e + if-ne v8, v10, :cond_2e - const/4 v6, 0x1 + const/4 v8, 0x1 - goto :goto_20 + goto :goto_1f :cond_2d - const/4 v8, -0x1 + const/4 v10, -0x1 :cond_2e - const/4 v6, 0x0 + const/4 v8, 0x0 - :goto_20 - if-eqz v36, :cond_30 + :goto_1f + if-eqz v37, :cond_30 .line 1235 invoke-virtual {v14}, Landroid/view/View;->getBaseline()I move-result v14 - if-eq v14, v8, :cond_30 + if-eq v14, v10, :cond_30 .line 1238 - iget v8, v5, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->gravity:I + iget v10, v5, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->gravity:I - if-gez v8, :cond_2f + if-gez v10, :cond_2f iget v5, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mGravity:I - goto :goto_21 + goto :goto_20 :cond_2f iget v5, v5, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->gravity:I - :goto_21 + :goto_20 and-int/lit8 v5, v5, 0x70 - const/4 v8, 0x4 + const/16 v24, 0x4 - shr-int/2addr v5, v8 + shr-int/lit8 v5, v5, 0x4 and-int/lit8 v5, v5, -0x2 shr-int/lit8 v5, v5, 0x1 .line 1243 - aget v8, v15, v5 + aget v10, v15, v5 - invoke-static {v8, v14}, Ljava/lang/Math;->max(II)I + invoke-static {v10, v14}, Ljava/lang/Math;->max(II)I - move-result v8 + move-result v10 - aput v8, v15, v5 + aput v10, v15, v5 .line 1244 - aget v8, v28, v5 + aget v10, v29, v5 sub-int/2addr v11, v14 - invoke-static {v8, v11}, Ljava/lang/Math;->max(II)I + invoke-static {v10, v11}, Ljava/lang/Math;->max(II)I - move-result v8 + move-result v10 - aput v8, v28, v5 + aput v10, v29, v5 + + goto :goto_21 :cond_30 - move/from16 v26, v6 + const/16 v24, 0x4 - move v6, v0 + :goto_21 + move v10, v2 + + move/from16 v27, v8 - move/from16 v0, v23 + move/from16 v2, v23 goto :goto_23 :cond_31 :goto_22 - move v3, v2 + move v4, v3 - move/from16 v25, v11 + move/from16 v26, v11 - move/from16 v2, p2 + const/16 v24, 0x4 + + move/from16 v3, p2 :goto_23 - add-int/lit8 v10, v10, 0x1 + add-int/lit8 v0, v0, 0x1 move/from16 v8, p1 - move v2, v3 + move v3, v4 - move/from16 v11, v25 + move/from16 v11, v26 const/4 v5, -0x1 - goto/16 :goto_18 + goto/16 :goto_17 :cond_32 - move/from16 v2, p2 + move/from16 v3, p2 - move/from16 v25, v11 + move/from16 v26, v11 .line 1251 iget v0, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I invoke-virtual/range {p0 .. p0}, Landroid/support/v7/widget/LinearLayoutCompat;->getPaddingLeft()I - move-result v3 + move-result v2 invoke-virtual/range {p0 .. p0}, Landroid/support/v7/widget/LinearLayoutCompat;->getPaddingRight()I - move-result v5 + move-result v4 - add-int/2addr v3, v5 + add-int/2addr v2, v4 - add-int/2addr v0, v3 + add-int/2addr v0, v2 iput v0, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I .line 1256 aget v0, v15, v18 - const/4 v3, -0x1 + const/4 v2, -0x1 - if-ne v0, v3, :cond_34 + if-ne v0, v2, :cond_34 - const/4 v5, 0x0 + const/4 v0, 0x0 - aget v8, v15, v5 + aget v4, v15, v0 - if-ne v8, v3, :cond_34 + if-ne v4, v2, :cond_34 - aget v5, v15, v17 + aget v0, v15, v17 - if-ne v5, v3, :cond_34 + if-ne v0, v2, :cond_34 - aget v5, v15, v16 + aget v0, v15, v16 - if-eq v5, v3, :cond_33 + if-eq v0, v2, :cond_33 goto :goto_24 :cond_33 - move v0, v4 + move v0, v6 goto :goto_25 .line 1260 :cond_34 :goto_24 - aget v3, v15, v16 + aget v0, v15, v16 - const/4 v5, 0x0 + const/4 v2, 0x0 + + aget v4, v15, v2 - aget v8, v15, v5 + aget v5, v15, v18 - aget v10, v15, v17 + aget v8, v15, v17 .line 1262 - invoke-static {v0, v10}, Ljava/lang/Math;->max(II)I + invoke-static {v5, v8}, Ljava/lang/Math;->max(II)I - move-result v0 + move-result v5 .line 1261 - invoke-static {v8, v0}, Ljava/lang/Math;->max(II)I + invoke-static {v4, v5}, Ljava/lang/Math;->max(II)I - move-result v0 + move-result v4 .line 1260 - invoke-static {v3, v0}, Ljava/lang/Math;->max(II)I + invoke-static {v0, v4}, Ljava/lang/Math;->max(II)I move-result v0 .line 1263 - aget v3, v28, v16 + aget v4, v29, v16 - aget v5, v28, v5 + aget v2, v29, v2 - aget v8, v28, v18 + aget v5, v29, v18 - aget v10, v28, v17 + aget v8, v29, v17 .line 1265 - invoke-static {v8, v10}, Ljava/lang/Math;->max(II)I + invoke-static {v5, v8}, Ljava/lang/Math;->max(II)I - move-result v8 + move-result v5 .line 1264 - invoke-static {v5, v8}, Ljava/lang/Math;->max(II)I + invoke-static {v2, v5}, Ljava/lang/Math;->max(II)I - move-result v5 + move-result v2 .line 1263 - invoke-static {v3, v5}, Ljava/lang/Math;->max(II)I + invoke-static {v4, v2}, Ljava/lang/Math;->max(II)I - move-result v3 + move-result v2 - add-int/2addr v0, v3 + add-int/2addr v0, v2 .line 1266 - invoke-static {v4, v0}, Ljava/lang/Math;->max(II)I + invoke-static {v6, v0}, Ljava/lang/Math;->max(II)I move-result v0 :goto_25 - move v3, v0 - - move v0, v6 + move v2, v0 move/from16 v23, v9 + move v0, v10 + :goto_26 - if-nez v26, :cond_35 + if-nez v27, :cond_35 const/high16 v4, 0x40000000 # 2.0f @@ -3636,52 +3668,52 @@ goto :goto_27 :cond_35 - move v0, v3 + move v0, v2 .line 1299 :goto_27 invoke-virtual/range {p0 .. p0}, Landroid/support/v7/widget/LinearLayoutCompat;->getPaddingTop()I - move-result v3 + move-result v2 invoke-virtual/range {p0 .. p0}, Landroid/support/v7/widget/LinearLayoutCompat;->getPaddingBottom()I move-result v4 - add-int/2addr v3, v4 + add-int/2addr v2, v4 - add-int/2addr v0, v3 + add-int/2addr v0, v2 .line 1302 invoke-virtual/range {p0 .. p0}, Landroid/support/v7/widget/LinearLayoutCompat;->getSuggestedMinimumHeight()I - move-result v3 + move-result v2 - invoke-static {v0, v3}, Ljava/lang/Math;->max(II)I + invoke-static {v0, v2}, Ljava/lang/Math;->max(II)I move-result v0 - const/high16 v3, -0x1000000 + const/high16 v2, -0x1000000 - and-int v3, v23, v3 + and-int v2, v23, v2 - or-int/2addr v1, v3 + or-int/2addr v1, v2 - shl-int/lit8 v3, v23, 0x10 + shl-int/lit8 v2, v23, 0x10 .line 1305 - invoke-static {v0, v2, v3}, Landroid/view/View;->resolveSizeAndState(III)I + invoke-static {v0, v3, v2}, Landroid/view/View;->resolveSizeAndState(III)I move-result v0 .line 1304 invoke-virtual {v7, v1, v0}, Landroid/support/v7/widget/LinearLayoutCompat;->setMeasuredDimension(II)V - if-eqz v27, :cond_36 + if-eqz v28, :cond_36 move/from16 v0, p1 - move/from16 v1, v25 + move/from16 v1, v26 .line 1309 invoke-direct {v7, v1, v0}, Landroid/support/v7/widget/LinearLayoutCompat;->forceUniformHeight(II)V @@ -3784,11 +3816,12 @@ move/from16 v23, v11 - move/from16 v24, v13 - move/from16 v4, v22 - goto/16 :goto_a + :goto_1 + move/from16 v22, v13 + + goto/16 :goto_b :cond_0 move/from16 v24, v1 @@ -3813,9 +3846,7 @@ move/from16 v1, v24 - move/from16 v24, v13 - - goto/16 :goto_a + goto :goto_1 .line 630 :cond_1 @@ -3894,17 +3925,19 @@ move/from16 v8, v24 - move/from16 v29, v26 + move/from16 v30, v26 const/16 v18, 0x1 move v11, v6 - move/from16 v24, v13 + move/from16 v32, v22 - move/from16 v13, v22 + move/from16 v22, v13 - goto/16 :goto_3 + move/from16 v13, v32 + + goto/16 :goto_4 :cond_3 move/from16 v26, v2 @@ -3927,12 +3960,12 @@ const/4 v2, 0x0 - goto :goto_1 + goto :goto_2 :cond_4 const/high16 v2, -0x80000000 - :goto_1 + :goto_2 const/16 v27, 0x0 cmpl-float v0, v25, v16 @@ -3944,12 +3977,12 @@ move/from16 v28, v0 - goto :goto_2 + goto :goto_3 :cond_5 const/16 v28, 0x0 - :goto_2 + :goto_3 move-object/from16 v0, p0 move/from16 v8, v24 @@ -3958,9 +3991,9 @@ move-object v1, v4 - move/from16 v30, v2 + move/from16 v29, v2 - move/from16 v29, v26 + move/from16 v30, v26 move v2, v6 @@ -3968,15 +4001,17 @@ move/from16 v3, p1 + move-object/from16 v24, v4 + move/from16 v23, v11 - move/from16 v24, v13 + const/high16 v11, 0x40000000 # 2.0f - move/from16 v13, v22 + move/from16 v32, v22 - const/high16 v11, 0x40000000 # 2.0f + move/from16 v22, v13 - move-object/from16 v22, v4 + move/from16 v13, v32 move/from16 v4, v27 @@ -3990,7 +4025,7 @@ invoke-virtual/range {v0 .. v6}, Landroid/support/v7/widget/LinearLayoutCompat;->measureChildBeforeLayout(Landroid/view/View;IIIII)V - move/from16 v0, v30 + move/from16 v0, v29 const/high16 v1, -0x80000000 @@ -4001,7 +4036,7 @@ .line 669 :cond_6 - invoke-virtual/range {v22 .. v22}, Landroid/view/View;->getMeasuredHeight()I + invoke-virtual/range {v24 .. v24}, Landroid/view/View;->getMeasuredHeight()I move-result v0 @@ -4019,7 +4054,7 @@ add-int/2addr v2, v3 - move-object/from16 v3, v22 + move-object/from16 v3, v24 .line 672 invoke-virtual {v7, v3}, Landroid/support/v7/widget/LinearLayoutCompat;->getNextLocationOffset(Landroid/view/View;)I @@ -4042,12 +4077,12 @@ move-result v0 - goto :goto_3 + goto :goto_4 :cond_7 move v0, v9 - :goto_3 + :goto_4 if-ltz v14, :cond_8 add-int/lit8 v6, v11, 0x1 @@ -4069,7 +4104,7 @@ if-gtz v1, :cond_9 - goto :goto_4 + goto :goto_5 .line 691 :cond_9 @@ -4082,7 +4117,7 @@ throw v0 :cond_a - :goto_4 + :goto_5 const/high16 v1, 0x40000000 # 2.0f if-eq v12, v1, :cond_b @@ -4098,13 +4133,13 @@ const/16 v20, 0x1 - goto :goto_5 + goto :goto_6 :cond_b const/4 v1, 0x0 .line 707 - :goto_5 + :goto_6 iget v2, v10, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->leftMargin:I iget v4, v10, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->rightMargin:I @@ -4118,7 +4153,7 @@ add-int/2addr v4, v2 - move/from16 v5, v29 + move/from16 v5, v30 .line 709 invoke-static {v5, v4}, Ljava/lang/Math;->max(II)I @@ -4144,47 +4179,49 @@ if-ne v8, v9, :cond_c - const/16 v19, 0x1 + const/4 v8, 0x1 - goto :goto_6 + goto :goto_7 :cond_c - const/16 v19, 0x0 + const/4 v8, 0x0 .line 714 - :goto_6 - iget v8, v10, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->weight:F + :goto_7 + iget v9, v10, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->weight:F - cmpl-float v8, v8, v16 + cmpl-float v9, v9, v16 - if-lez v8, :cond_e + if-lez v9, :cond_e if-eqz v1, :cond_d - goto :goto_7 + goto :goto_8 :cond_d move v2, v4 .line 719 - :goto_7 + :goto_8 invoke-static {v13, v2}, Ljava/lang/Math;->max(II)I move-result v4 + move v13, v4 + move/from16 v1, v31 - goto :goto_9 + goto :goto_a :cond_e if-eqz v1, :cond_f - goto :goto_8 + goto :goto_9 :cond_f move v2, v4 - :goto_8 + :goto_9 move/from16 v1, v31 .line 722 @@ -4192,10 +4229,8 @@ move-result v1 - move v4, v13 - .line 726 - :goto_9 + :goto_a invoke-virtual {v7, v3, v11}, Landroid/support/v7/widget/LinearLayoutCompat;->getChildrenSkipCount(Landroid/view/View;I)I move-result v2 @@ -4204,6 +4239,10 @@ move v3, v0 + move/from16 v19, v8 + + move v4, v13 + move/from16 v0, v25 move/from16 v32, v5 @@ -4216,16 +4255,16 @@ move/from16 v2, v32 - :goto_a + :goto_b add-int/lit8 v6, v6, 0x1 move/from16 v8, p1 move/from16 v9, p2 - move/from16 v11, v23 + move/from16 v13, v22 - move/from16 v13, v24 + move/from16 v11, v23 goto/16 :goto_0 @@ -4238,11 +4277,13 @@ move/from16 v23, v11 - move/from16 v24, v13 + move v5, v2 - move/from16 v13, v22 + move/from16 v32, v22 - move v5, v2 + move/from16 v22, v13 + + move/from16 v13, v32 .line 729 iget v2, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I @@ -4266,22 +4307,22 @@ iput v3, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I - goto :goto_b + goto :goto_c :cond_11 move/from16 v2, v23 :cond_12 - :goto_b - move/from16 v3, v24 - + :goto_c if-eqz v15, :cond_16 + move/from16 v3, v22 + const/high16 v4, -0x80000000 if-eq v3, v4, :cond_13 - if-nez v3, :cond_16 + if-nez v3, :cond_17 :cond_13 const/4 v4, 0x0 @@ -4291,8 +4332,8 @@ const/4 v4, 0x0 - :goto_c - if-ge v4, v2, :cond_16 + :goto_d + if-ge v4, v2, :cond_17 .line 738 invoke-virtual {v7, v4}, Landroid/support/v7/widget/LinearLayoutCompat;->getVirtualChildAt(I)Landroid/view/View; @@ -4312,7 +4353,7 @@ iput v6, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I - goto :goto_d + goto :goto_e .line 745 :cond_14 @@ -4329,7 +4370,7 @@ add-int/2addr v4, v6 - goto :goto_d + goto :goto_e .line 751 :cond_15 @@ -4367,15 +4408,18 @@ iput v6, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I - :goto_d + :goto_e add-int/lit8 v4, v4, 0x1 const/16 v10, 0x8 - goto :goto_c + goto :goto_d - .line 760 :cond_16 + move/from16 v3, v22 + + .line 760 + :cond_17 iget v4, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I invoke-virtual/range {p0 .. p0}, Landroid/support/v7/widget/LinearLayoutCompat;->getPaddingTop()I @@ -4392,6 +4436,9 @@ iput v4, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I + .line 762 + iget v4, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I + .line 765 invoke-virtual/range {p0 .. p0}, Landroid/support/v7/widget/LinearLayoutCompat;->getSuggestedMinimumHeight()I @@ -4421,39 +4468,39 @@ sub-int/2addr v9, v11 - if-nez v18, :cond_1b + if-nez v18, :cond_1c - if-eqz v9, :cond_17 + if-eqz v9, :cond_18 cmpl-float v11, v0, v16 - if-lez v11, :cond_17 + if-lez v11, :cond_18 - goto :goto_10 + goto :goto_11 .line 847 - :cond_17 + :cond_18 invoke-static {v1, v13}, Ljava/lang/Math;->max(II)I move-result v0 - if-eqz v15, :cond_1a + if-eqz v15, :cond_1b const/high16 v1, 0x40000000 # 2.0f - if-eq v3, v1, :cond_1a + if-eq v3, v1, :cond_1b const/4 v1, 0x0 - :goto_e - if-ge v1, v2, :cond_1a + :goto_f + if-ge v1, v2, :cond_1b .line 855 invoke-virtual {v7, v1}, Landroid/support/v7/widget/LinearLayoutCompat;->getVirtualChildAt(I)Landroid/view/View; move-result-object v3 - if-eqz v3, :cond_19 + if-eqz v3, :cond_1a .line 857 invoke-virtual {v3}, Landroid/view/View;->getVisibility()I @@ -4462,12 +4509,12 @@ const/16 v11, 0x8 - if-ne v9, v11, :cond_18 + if-ne v9, v11, :cond_19 - goto :goto_f + goto :goto_10 .line 862 - :cond_18 + :cond_19 invoke-virtual {v3}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams; move-result-object v9 @@ -4479,7 +4526,7 @@ cmpl-float v9, v9, v16 - if-lez v9, :cond_19 + if-lez v9, :cond_1a .line 867 invoke-virtual {v3}, Landroid/view/View;->getMeasuredWidth()I @@ -4500,49 +4547,51 @@ .line 866 invoke-virtual {v3, v9, v13}, Landroid/view/View;->measure(II)V - :cond_19 - :goto_f + :cond_1a + :goto_10 add-int/lit8 v1, v1, 0x1 - goto :goto_e + goto :goto_f - :cond_1a + :cond_1b move/from16 v11, p1 move v1, v8 - goto/16 :goto_1a + goto/16 :goto_1b .line 776 - :cond_1b - :goto_10 + :cond_1c + :goto_11 iget v10, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mWeightSum:F cmpl-float v11, v10, v16 - if-lez v11, :cond_1c + if-lez v11, :cond_1d move v0, v10 - :cond_1c + :cond_1d const/4 v10, 0x0 .line 778 iput v10, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I - move v11, v9 + move v11, v0 + + const/4 v0, 0x0 - move v9, v1 + move/from16 v32, v8 - move v1, v8 + move v8, v1 - const/4 v8, 0x0 + move/from16 v1, v32 - :goto_11 - if-ge v8, v2, :cond_27 + :goto_12 + if-ge v0, v2, :cond_28 .line 781 - invoke-virtual {v7, v8}, Landroid/support/v7/widget/LinearLayoutCompat;->getVirtualChildAt(I)Landroid/view/View; + invoke-virtual {v7, v0}, Landroid/support/v7/widget/LinearLayoutCompat;->getVirtualChildAt(I)Landroid/view/View; move-result-object v13 @@ -4553,16 +4602,16 @@ const/16 v15, 0x8 - if-ne v14, v15, :cond_1d + if-ne v14, v15, :cond_1e move/from16 v21, v11 move/from16 v11, p1 - goto/16 :goto_19 + goto/16 :goto_1a .line 787 - :cond_1d + :cond_1e invoke-virtual {v13}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams; move-result-object v14 @@ -4574,19 +4623,19 @@ cmpl-float v18, v10, v16 - if-lez v18, :cond_22 + if-lez v18, :cond_23 - int-to-float v15, v11 + int-to-float v15, v9 mul-float v15, v15, v10 - div-float/2addr v15, v0 + div-float/2addr v15, v11 float-to-int v15, v15 - sub-float/2addr v0, v10 + sub-float/2addr v11, v10 - sub-int/2addr v11, v15 + sub-int/2addr v9, v15 .line 797 invoke-virtual/range {p0 .. p0}, Landroid/support/v7/widget/LinearLayoutCompat;->getPaddingLeft()I @@ -4599,182 +4648,180 @@ add-int v10, v10, v18 - move/from16 v18, v0 + move/from16 v18, v9 - iget v0, v14, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->leftMargin:I + iget v9, v14, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->leftMargin:I - add-int/2addr v10, v0 + add-int/2addr v10, v9 - iget v0, v14, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->rightMargin:I + iget v9, v14, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->rightMargin:I - add-int/2addr v10, v0 + add-int/2addr v10, v9 - iget v0, v14, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->width:I + iget v9, v14, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->width:I move/from16 v21, v11 move/from16 v11, p1 .line 796 - invoke-static {v11, v10, v0}, Landroid/support/v7/widget/LinearLayoutCompat;->getChildMeasureSpec(III)I + invoke-static {v11, v10, v9}, Landroid/support/v7/widget/LinearLayoutCompat;->getChildMeasureSpec(III)I - move-result v0 + move-result v9 .line 802 iget v10, v14, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->height:I - if-nez v10, :cond_20 + if-nez v10, :cond_21 const/high16 v10, 0x40000000 # 2.0f - if-eq v3, v10, :cond_1e + if-eq v3, v10, :cond_1f - goto :goto_13 + goto :goto_14 - :cond_1e - if-lez v15, :cond_1f + :cond_1f + if-lez v15, :cond_20 - goto :goto_12 + goto :goto_13 - :cond_1f + :cond_20 const/4 v15, 0x0 .line 816 - :goto_12 + :goto_13 invoke-static {v15, v10}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I move-result v15 .line 815 - invoke-virtual {v13, v0, v15}, Landroid/view/View;->measure(II)V + invoke-virtual {v13, v9, v15}, Landroid/view/View;->measure(II)V - goto :goto_14 + goto :goto_15 - :cond_20 + :cond_21 const/high16 v10, 0x40000000 # 2.0f .line 805 - :goto_13 + :goto_14 invoke-virtual {v13}, Landroid/view/View;->getMeasuredHeight()I move-result v23 add-int v15, v23, v15 - if-gez v15, :cond_21 + if-gez v15, :cond_22 const/4 v15, 0x0 .line 811 - :cond_21 + :cond_22 invoke-static {v15, v10}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I move-result v15 .line 810 - invoke-virtual {v13, v0, v15}, Landroid/view/View;->measure(II)V + invoke-virtual {v13, v9, v15}, Landroid/view/View;->measure(II)V .line 822 - :goto_14 + :goto_15 invoke-virtual {v13}, Landroid/view/View;->getMeasuredState()I - move-result v0 + move-result v9 - and-int/lit16 v0, v0, -0x100 + and-int/lit16 v9, v9, -0x100 .line 821 - invoke-static {v1, v0}, Landroid/view/View;->combineMeasuredStates(II)I + invoke-static {v1, v9}, Landroid/view/View;->combineMeasuredStates(II)I move-result v1 - move/from16 v0, v18 - - goto :goto_15 + goto :goto_16 - :cond_22 + :cond_23 move v10, v11 move/from16 v11, p1 + move/from16 v18, v9 + move/from16 v21, v10 .line 826 - :goto_15 - iget v10, v14, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->leftMargin:I + :goto_16 + iget v9, v14, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->leftMargin:I - iget v15, v14, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->rightMargin:I + iget v10, v14, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->rightMargin:I - add-int/2addr v10, v15 + add-int/2addr v9, v10 .line 827 invoke-virtual {v13}, Landroid/view/View;->getMeasuredWidth()I - move-result v15 + move-result v10 - add-int/2addr v15, v10 + add-int/2addr v10, v9 .line 828 - invoke-static {v5, v15}, Ljava/lang/Math;->max(II)I + invoke-static {v5, v10}, Ljava/lang/Math;->max(II)I move-result v5 - move/from16 v18, v0 + const/high16 v15, 0x40000000 # 2.0f - const/high16 v0, 0x40000000 # 2.0f - - if-eq v12, v0, :cond_23 + if-eq v12, v15, :cond_24 .line 830 - iget v0, v14, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->width:I + iget v15, v14, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->width:I move/from16 v23, v1 const/4 v1, -0x1 - if-ne v0, v1, :cond_24 + if-ne v15, v1, :cond_25 - const/4 v0, 0x1 + const/4 v15, 0x1 - goto :goto_16 + goto :goto_17 - :cond_23 + :cond_24 move/from16 v23, v1 const/4 v1, -0x1 - :cond_24 - const/4 v0, 0x0 + :cond_25 + const/4 v15, 0x0 - :goto_16 - if-eqz v0, :cond_25 + :goto_17 + if-eqz v15, :cond_26 - goto :goto_17 + goto :goto_18 - :cond_25 - move v10, v15 + :cond_26 + move v9, v10 .line 833 - :goto_17 - invoke-static {v9, v10}, Ljava/lang/Math;->max(II)I + :goto_18 + invoke-static {v8, v9}, Ljava/lang/Math;->max(II)I - move-result v0 + move-result v8 - if-eqz v19, :cond_26 + if-eqz v19, :cond_27 .line 836 iget v9, v14, Landroid/support/v7/widget/LinearLayoutCompat$LayoutParams;->width:I - if-ne v9, v1, :cond_26 + if-ne v9, v1, :cond_27 const/4 v9, 0x1 - goto :goto_18 + goto :goto_19 - :cond_26 + :cond_27 const/4 v9, 0x0 .line 838 - :goto_18 + :goto_19 iget v10, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I .line 839 @@ -4808,22 +4855,20 @@ move/from16 v19, v9 - move/from16 v1, v23 - - move v9, v0 + move/from16 v9, v18 - move/from16 v0, v18 + move/from16 v1, v23 - :goto_19 - add-int/lit8 v8, v8, 0x1 + :goto_1a + add-int/lit8 v0, v0, 0x1 move/from16 v11, v21 const/4 v10, 0x0 - goto/16 :goto_11 + goto/16 :goto_12 - :cond_27 + :cond_28 move/from16 v11, p1 .line 844 @@ -4835,30 +4880,30 @@ invoke-virtual/range {p0 .. p0}, Landroid/support/v7/widget/LinearLayoutCompat;->getPaddingBottom()I - move-result v8 + move-result v9 - add-int/2addr v3, v8 + add-int/2addr v3, v9 add-int/2addr v0, v3 iput v0, v7, Landroid/support/v7/widget/LinearLayoutCompat;->mTotalLength:I - move v0, v9 + move v0, v8 - :goto_1a - if-nez v19, :cond_28 + :goto_1b + if-nez v19, :cond_29 const/high16 v3, 0x40000000 # 2.0f - if-eq v12, v3, :cond_28 + if-eq v12, v3, :cond_29 - goto :goto_1b + goto :goto_1c - :cond_28 + :cond_29 move v0, v5 .line 880 - :goto_1b + :goto_1c invoke-virtual/range {p0 .. p0}, Landroid/support/v7/widget/LinearLayoutCompat;->getPaddingLeft()I move-result v3 @@ -4887,12 +4932,12 @@ invoke-virtual {v7, v0, v4}, Landroid/support/v7/widget/LinearLayoutCompat;->setMeasuredDimension(II)V - if-eqz v20, :cond_29 + if-eqz v20, :cond_2a .line 889 invoke-direct {v7, v2, v6}, Landroid/support/v7/widget/LinearLayoutCompat;->forceUniformWidth(II)V - :cond_29 + :cond_2a return-void .end method diff --git a/smali/android/support/v7/widget/ListPopupWindow.smali b/smali/android/support/v7/widget/ListPopupWindow.smali index 7f1fc79b..f47a50a9 100644 --- a/smali/android/support/v7/widget/ListPopupWindow.smali +++ b/smali/android/support/v7/widget/ListPopupWindow.smali @@ -228,6 +228,10 @@ .method public constructor (Landroid/content/Context;)V .locals 2 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 218 sget v0, Landroid/support/v7/appcompat/R$attr;->listPopupWindowStyle:I @@ -241,6 +245,14 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 229 sget v0, Landroid/support/v7/appcompat/R$attr;->listPopupWindowStyle:I @@ -252,6 +264,18 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;I)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # I + .annotation build Landroid/support/annotation/AttrRes; + .end annotation + .end param const/4 v0, 0x0 @@ -263,6 +287,22 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;II)V .locals 4 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .param p3 # I + .annotation build Landroid/support/annotation/AttrRes; + .end annotation + .end param + .param p4 # I + .annotation build Landroid/support/annotation/StyleRes; + .end annotation + .end param .line 255 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -378,6 +418,9 @@ iput v1, p0, Landroid/support/v7/widget/ListPopupWindow;->mDropDownVerticalOffset:I + .line 265 + iget v1, p0, Landroid/support/v7/widget/ListPopupWindow;->mDropDownVerticalOffset:I + if-eqz v1, :cond_0 .line 266 @@ -395,7 +438,9 @@ iput-object v1, p0, Landroid/support/v7/widget/ListPopupWindow;->mPopup:Landroid/widget/PopupWindow; .line 271 - invoke-virtual {v1, v0}, Landroid/widget/PopupWindow;->setInputMethodMode(I)V + iget-object p1, p0, Landroid/support/v7/widget/ListPopupWindow;->mPopup:Landroid/widget/PopupWindow; + + invoke-virtual {p1, v0}, Landroid/widget/PopupWindow;->setInputMethodMode(I)V return-void .end method @@ -438,12 +483,14 @@ iput-object v5, p0, Landroid/support/v7/widget/ListPopupWindow;->mDropDownList:Landroid/support/v7/widget/DropDownListView; .line 1159 - iget-object v6, p0, Landroid/support/v7/widget/ListPopupWindow;->mDropDownListHighlight:Landroid/graphics/drawable/Drawable; + iget-object v5, p0, Landroid/support/v7/widget/ListPopupWindow;->mDropDownListHighlight:Landroid/graphics/drawable/Drawable; - if-eqz v6, :cond_0 + if-eqz v5, :cond_0 .line 1160 - invoke-virtual {v5, v6}, Landroid/support/v7/widget/DropDownListView;->setSelector(Landroid/graphics/drawable/Drawable;)V + iget-object v6, p0, Landroid/support/v7/widget/ListPopupWindow;->mDropDownList:Landroid/support/v7/widget/DropDownListView; + + invoke-virtual {v6, v5}, Landroid/support/v7/widget/DropDownListView;->setSelector(Landroid/graphics/drawable/Drawable;)V .line 1162 :cond_0 @@ -757,7 +804,7 @@ if-ne v4, v2, :cond_b - goto :goto_7 + goto :goto_8 .line 1281 :cond_b @@ -776,7 +823,10 @@ move-result v1 - goto :goto_6 + :goto_6 + move v7, v1 + + goto :goto_7 .line 1289 :cond_c @@ -844,10 +894,10 @@ move-result v1 - :goto_6 - move v7, v1 + goto :goto_6 .line 1301 + :goto_7 iget-object v6, p0, Landroid/support/v7/widget/ListPopupWindow;->mDropDownList:Landroid/support/v7/widget/DropDownListView; const/4 v8, 0x0 @@ -890,7 +940,7 @@ return v1 :cond_f - :goto_7 + :goto_8 add-int/2addr v3, v5 return v3 @@ -1101,6 +1151,8 @@ .method createDropDownListView(Landroid/content/Context;Z)Landroid/support/v7/widget/DropDownListView; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 930 new-instance v0, Landroid/support/v7/widget/DropDownListView; @@ -1143,6 +1195,8 @@ .method public getAnchorView()Landroid/view/View; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 454 iget-object v0, p0, Landroid/support/v7/widget/ListPopupWindow;->mDropDownAnchorView:Landroid/view/View; @@ -1152,6 +1206,8 @@ .method public getAnimationStyle()I .locals 1 + .annotation build Landroid/support/annotation/StyleRes; + .end annotation .line 445 iget-object v0, p0, Landroid/support/v7/widget/ListPopupWindow;->mPopup:Landroid/widget/PopupWindow; @@ -1165,6 +1221,8 @@ .method public getBackground()Landroid/graphics/drawable/Drawable; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 417 iget-object v0, p0, Landroid/support/v7/widget/ListPopupWindow;->mPopup:Landroid/widget/PopupWindow; @@ -1209,6 +1267,8 @@ .method public getListView()Landroid/widget/ListView; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 926 iget-object v0, p0, Landroid/support/v7/widget/ListPopupWindow;->mDropDownList:Landroid/support/v7/widget/DropDownListView; @@ -1227,6 +1287,8 @@ .method public getSelectedItem()Ljava/lang/Object; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 875 invoke-virtual {p0}, Landroid/support/v7/widget/ListPopupWindow;->isShowing()Z @@ -1302,6 +1364,8 @@ .method public getSelectedView()Landroid/view/View; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 914 invoke-virtual {p0}, Landroid/support/v7/widget/ListPopupWindow;->isShowing()Z @@ -1368,6 +1432,11 @@ .method public isDropDownAlwaysVisible()Z .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 377 iget-boolean v0, p0, Landroid/support/v7/widget/ListPopupWindow;->mDropDownAlwaysVisible:Z @@ -1424,6 +1493,10 @@ .method public onKeyDown(ILandroid/view/KeyEvent;)Z .locals 9 + .param p2 # Landroid/view/KeyEvent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 956 invoke-virtual {p0}, Landroid/support/v7/widget/ListPopupWindow;->isShowing()Z @@ -1532,14 +1605,17 @@ :goto_1 move v5, v6 - move v6, v4 + goto :goto_2 :cond_3 - const/16 v4, 0x13 + const/high16 v4, -0x80000000 + + :goto_2 + const/16 v6, 0x13 if-eqz v2, :cond_4 - if-ne p1, v4, :cond_4 + if-ne p1, v6, :cond_4 if-le v0, v5, :cond_5 @@ -1550,7 +1626,7 @@ if-ne p1, v7, :cond_6 - if-lt v0, v6, :cond_6 + if-lt v0, v4, :cond_6 .line 988 :cond_5 @@ -1596,7 +1672,7 @@ .line 1010 invoke-virtual {p0}, Landroid/support/v7/widget/ListPopupWindow;->show()V - if-eq p1, v4, :cond_7 + if-eq p1, v6, :cond_7 if-eq p1, v7, :cond_7 @@ -1608,7 +1684,7 @@ if-eq p1, p2, :cond_7 - goto :goto_2 + goto :goto_3 :cond_7 return v3 @@ -1618,26 +1694,30 @@ if-ne p1, v7, :cond_9 - if-ne v0, v6, :cond_a + if-ne v0, v4, :cond_a return v3 :cond_9 if-nez v2, :cond_a - if-ne p1, v4, :cond_a + if-ne p1, v6, :cond_a if-ne v0, v5, :cond_a return v3 :cond_a - :goto_2 + :goto_3 return v1 .end method .method public onKeyPreIme(ILandroid/view/KeyEvent;)Z .locals 2 + .param p2 # Landroid/view/KeyEvent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 v0, 0x4 @@ -1726,6 +1806,10 @@ .method public onKeyUp(ILandroid/view/KeyEvent;)Z .locals 1 + .param p2 # Landroid/view/KeyEvent; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 1051 invoke-virtual {p0}, Landroid/support/v7/widget/ListPopupWindow;->isShowing()Z @@ -1841,6 +1925,10 @@ .method public setAdapter(Landroid/widget/ListAdapter;)V .locals 2 + .param p1 # Landroid/widget/ListAdapter; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 281 iget-object v0, p0, Landroid/support/v7/widget/ListPopupWindow;->mObserver:Landroid/database/DataSetObserver; @@ -1894,6 +1982,10 @@ .method public setAnchorView(Landroid/view/View;)V .locals 0 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 464 iput-object p1, p0, Landroid/support/v7/widget/ListPopupWindow;->mDropDownAnchorView:Landroid/view/View; @@ -1903,6 +1995,10 @@ .method public setAnimationStyle(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/StyleRes; + .end annotation + .end param .line 435 iget-object v0, p0, Landroid/support/v7/widget/ListPopupWindow;->mPopup:Landroid/widget/PopupWindow; @@ -1914,6 +2010,10 @@ .method public setBackgroundDrawable(Landroid/graphics/drawable/Drawable;)V .locals 1 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 426 iget-object v0, p0, Landroid/support/v7/widget/ListPopupWindow;->mPopup:Landroid/widget/PopupWindow; @@ -1967,6 +2067,11 @@ .method public setDropDownAlwaysVisible(Z)V .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 367 iput-boolean p1, p0, Landroid/support/v7/widget/ListPopupWindow;->mDropDownAlwaysVisible:Z @@ -1985,6 +2090,11 @@ .method public setEpicenterBounds(Landroid/graphics/Rect;)V .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 512 iput-object p1, p0, Landroid/support/v7/widget/ListPopupWindow;->mEpicenterBounds:Landroid/graphics/Rect; @@ -1994,6 +2104,11 @@ .method public setForceIgnoreOutsideTouch(Z)V .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 351 iput-boolean p1, p0, Landroid/support/v7/widget/ListPopupWindow;->mForceIgnoreOutsideTouch:Z @@ -2088,6 +2203,10 @@ .method public setOnDismissListener(Landroid/widget/PopupWindow$OnDismissListener;)V .locals 1 + .param p1 # Landroid/widget/PopupWindow$OnDismissListener; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 765 iget-object v0, p0, Landroid/support/v7/widget/ListPopupWindow;->mPopup:Landroid/widget/PopupWindow; @@ -2099,6 +2218,10 @@ .method public setOnItemClickListener(Landroid/widget/AdapterView$OnItemClickListener;)V .locals 0 + .param p1 # Landroid/widget/AdapterView$OnItemClickListener; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 603 iput-object p1, p0, Landroid/support/v7/widget/ListPopupWindow;->mItemClickListener:Landroid/widget/AdapterView$OnItemClickListener; @@ -2108,6 +2231,10 @@ .method public setOnItemSelectedListener(Landroid/widget/AdapterView$OnItemSelectedListener;)V .locals 0 + .param p1 # Landroid/widget/AdapterView$OnItemSelectedListener; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 614 iput-object p1, p0, Landroid/support/v7/widget/ListPopupWindow;->mItemSelectedListener:Landroid/widget/AdapterView$OnItemSelectedListener; @@ -2117,6 +2244,11 @@ .method public setOverlapAnchor(Z)V .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation const/4 v0, 0x1 @@ -2140,6 +2272,10 @@ .method public setPromptView(Landroid/view/View;)V .locals 1 + .param p1 # Landroid/view/View; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 624 invoke-virtual {p0}, Landroid/support/v7/widget/ListPopupWindow;->isShowing()Z diff --git a/smali/android/support/v7/widget/MenuItemHoverListener.smali b/smali/android/support/v7/widget/MenuItemHoverListener.smali index 6bd635df..3553b8a0 100644 --- a/smali/android/support/v7/widget/MenuItemHoverListener.smali +++ b/smali/android/support/v7/widget/MenuItemHoverListener.smali @@ -3,9 +3,33 @@ .source "MenuItemHoverListener.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # virtual methods .method public abstract onItemHoverEnter(Landroid/support/v7/view/menu/MenuBuilder;Landroid/view/MenuItem;)V + .param p1 # Landroid/support/v7/view/menu/MenuBuilder; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/MenuItem; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method .method public abstract onItemHoverExit(Landroid/support/v7/view/menu/MenuBuilder;Landroid/view/MenuItem;)V + .param p1 # Landroid/support/v7/view/menu/MenuBuilder; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/MenuItem; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .end method diff --git a/smali/android/support/v7/widget/MenuPopupWindow$MenuDropDownListView.smali b/smali/android/support/v7/widget/MenuPopupWindow$MenuDropDownListView.smali index 30fa1100..ea8b586b 100644 --- a/smali/android/support/v7/widget/MenuPopupWindow$MenuDropDownListView.smali +++ b/smali/android/support/v7/widget/MenuPopupWindow$MenuDropDownListView.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v7/widget/MenuPopupWindow; .end annotation diff --git a/smali/android/support/v7/widget/MenuPopupWindow.smali b/smali/android/support/v7/widget/MenuPopupWindow.smali index 34bdad6a..bb3b4758 100644 --- a/smali/android/support/v7/widget/MenuPopupWindow.smali +++ b/smali/android/support/v7/widget/MenuPopupWindow.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v7/widget/MenuPopupWindow$MenuDropDownListView; @@ -93,6 +99,14 @@ .method public onItemHoverEnter(Landroid/support/v7/view/menu/MenuBuilder;Landroid/view/MenuItem;)V .locals 1 + .param p1 # Landroid/support/v7/view/menu/MenuBuilder; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/MenuItem; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 113 iget-object v0, p0, Landroid/support/v7/widget/MenuPopupWindow;->mHoverListener:Landroid/support/v7/widget/MenuItemHoverListener; @@ -108,6 +122,14 @@ .method public onItemHoverExit(Landroid/support/v7/view/menu/MenuBuilder;Landroid/view/MenuItem;)V .locals 1 + .param p1 # Landroid/support/v7/view/menu/MenuBuilder; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/MenuItem; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 121 iget-object v0, p0, Landroid/support/v7/widget/MenuPopupWindow;->mHoverListener:Landroid/support/v7/widget/MenuItemHoverListener; diff --git a/smali/android/support/v7/widget/PopupMenu.smali b/smali/android/support/v7/widget/PopupMenu.smali index 05354669..23606c05 100644 --- a/smali/android/support/v7/widget/PopupMenu.smali +++ b/smali/android/support/v7/widget/PopupMenu.smali @@ -31,6 +31,14 @@ # direct methods .method public constructor (Landroid/content/Context;Landroid/view/View;)V .locals 1 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param const/4 v0, 0x0 @@ -42,6 +50,14 @@ .method public constructor (Landroid/content/Context;Landroid/view/View;I)V .locals 6 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 83 sget v4, Landroid/support/v7/appcompat/R$attr;->popupMenuStyle:I @@ -62,7 +78,23 @@ .end method .method public constructor (Landroid/content/Context;Landroid/view/View;III)V - .locals 8 + .locals 9 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p4 # I + .annotation build Landroid/support/annotation/AttrRes; + .end annotation + .end param + .param p5 # I + .annotation build Landroid/support/annotation/StyleRes; + .end annotation + .end param .line 104 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -74,47 +106,55 @@ iput-object p2, p0, Landroid/support/v7/widget/PopupMenu;->mAnchor:Landroid/view/View; .line 108 - new-instance v2, Landroid/support/v7/view/menu/MenuBuilder; + new-instance v0, Landroid/support/v7/view/menu/MenuBuilder; - invoke-direct {v2, p1}, Landroid/support/v7/view/menu/MenuBuilder;->(Landroid/content/Context;)V + invoke-direct {v0, p1}, Landroid/support/v7/view/menu/MenuBuilder;->(Landroid/content/Context;)V - iput-object v2, p0, Landroid/support/v7/widget/PopupMenu;->mMenu:Landroid/support/v7/view/menu/MenuBuilder; + iput-object v0, p0, Landroid/support/v7/widget/PopupMenu;->mMenu:Landroid/support/v7/view/menu/MenuBuilder; .line 109 - new-instance v0, Landroid/support/v7/widget/PopupMenu$1; + iget-object v0, p0, Landroid/support/v7/widget/PopupMenu;->mMenu:Landroid/support/v7/view/menu/MenuBuilder; + + new-instance v1, Landroid/support/v7/widget/PopupMenu$1; - invoke-direct {v0, p0}, Landroid/support/v7/widget/PopupMenu$1;->(Landroid/support/v7/widget/PopupMenu;)V + invoke-direct {v1, p0}, Landroid/support/v7/widget/PopupMenu$1;->(Landroid/support/v7/widget/PopupMenu;)V - invoke-virtual {v2, v0}, Landroid/support/v7/view/menu/MenuBuilder;->setCallback(Landroid/support/v7/view/menu/MenuBuilder$Callback;)V + invoke-virtual {v0, v1}, Landroid/support/v7/view/menu/MenuBuilder;->setCallback(Landroid/support/v7/view/menu/MenuBuilder$Callback;)V .line 123 - new-instance v7, Landroid/support/v7/view/menu/MenuPopupHelper; + new-instance v0, Landroid/support/v7/view/menu/MenuPopupHelper; - const/4 v4, 0x0 + iget-object v4, p0, Landroid/support/v7/widget/PopupMenu;->mMenu:Landroid/support/v7/view/menu/MenuBuilder; - move-object v0, v7 + const/4 v6, 0x0 - move-object v1, p1 + move-object v2, v0 - move-object v3, p2 + move-object v3, p1 - move v5, p4 + move-object v5, p2 - move v6, p5 + move v7, p4 - invoke-direct/range {v0 .. v6}, Landroid/support/v7/view/menu/MenuPopupHelper;->(Landroid/content/Context;Landroid/support/v7/view/menu/MenuBuilder;Landroid/view/View;ZII)V + move v8, p5 - iput-object v7, p0, Landroid/support/v7/widget/PopupMenu;->mPopup:Landroid/support/v7/view/menu/MenuPopupHelper; + invoke-direct/range {v2 .. v8}, Landroid/support/v7/view/menu/MenuPopupHelper;->(Landroid/content/Context;Landroid/support/v7/view/menu/MenuBuilder;Landroid/view/View;ZII)V + + iput-object v0, p0, Landroid/support/v7/widget/PopupMenu;->mPopup:Landroid/support/v7/view/menu/MenuPopupHelper; .line 124 - invoke-virtual {v7, p3}, Landroid/support/v7/view/menu/MenuPopupHelper;->setGravity(I)V + iget-object p1, p0, Landroid/support/v7/widget/PopupMenu;->mPopup:Landroid/support/v7/view/menu/MenuPopupHelper; + + invoke-virtual {p1, p3}, Landroid/support/v7/view/menu/MenuPopupHelper;->setGravity(I)V .line 125 - new-instance p1, Landroid/support/v7/widget/PopupMenu$2; + iget-object p1, p0, Landroid/support/v7/widget/PopupMenu;->mPopup:Landroid/support/v7/view/menu/MenuPopupHelper; + + new-instance p2, Landroid/support/v7/widget/PopupMenu$2; - invoke-direct {p1, p0}, Landroid/support/v7/widget/PopupMenu$2;->(Landroid/support/v7/widget/PopupMenu;)V + invoke-direct {p2, p0}, Landroid/support/v7/widget/PopupMenu$2;->(Landroid/support/v7/widget/PopupMenu;)V - invoke-virtual {v7, p1}, Landroid/support/v7/view/menu/MenuPopupHelper;->setOnDismissListener(Landroid/widget/PopupWindow$OnDismissListener;)V + invoke-virtual {p1, p2}, Landroid/support/v7/view/menu/MenuPopupHelper;->setOnDismissListener(Landroid/widget/PopupWindow$OnDismissListener;)V return-void .end method @@ -134,6 +174,8 @@ .method public getDragToOpenListener()Landroid/view/View$OnTouchListener; .locals 2 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 174 iget-object v0, p0, Landroid/support/v7/widget/PopupMenu;->mDragListener:Landroid/view/View$OnTouchListener; @@ -171,6 +213,8 @@ .method public getMenu()Landroid/view/Menu; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 209 iget-object v0, p0, Landroid/support/v7/widget/PopupMenu;->mMenu:Landroid/support/v7/view/menu/MenuBuilder; @@ -180,6 +224,8 @@ .method public getMenuInflater()Landroid/view/MenuInflater; .locals 2 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 219 new-instance v0, Landroid/support/v7/view/SupportMenuInflater; @@ -193,6 +239,11 @@ .method getMenuListView()Landroid/widget/ListView; .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 306 iget-object v0, p0, Landroid/support/v7/widget/PopupMenu;->mPopup:Landroid/support/v7/view/menu/MenuPopupHelper; @@ -220,6 +271,10 @@ .method public inflate(I)V .locals 2 + .param p1 # I + .annotation build Landroid/support/annotation/MenuRes; + .end annotation + .end param .line 229 invoke-virtual {p0}, Landroid/support/v7/widget/PopupMenu;->getMenuInflater()Landroid/view/MenuInflater; @@ -246,6 +301,10 @@ .method public setOnDismissListener(Landroid/support/v7/widget/PopupMenu$OnDismissListener;)V .locals 0 + .param p1 # Landroid/support/v7/widget/PopupMenu$OnDismissListener; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 266 iput-object p1, p0, Landroid/support/v7/widget/PopupMenu;->mOnDismissListener:Landroid/support/v7/widget/PopupMenu$OnDismissListener; @@ -255,6 +314,10 @@ .method public setOnMenuItemClickListener(Landroid/support/v7/widget/PopupMenu$OnMenuItemClickListener;)V .locals 0 + .param p1 # Landroid/support/v7/widget/PopupMenu$OnMenuItemClickListener; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 257 iput-object p1, p0, Landroid/support/v7/widget/PopupMenu;->mMenuItemClickListener:Landroid/support/v7/widget/PopupMenu$OnMenuItemClickListener; diff --git a/smali/android/support/v7/widget/ResourcesWrapper.smali b/smali/android/support/v7/widget/ResourcesWrapper.smali index 8de47e5b..4b444bb4 100644 --- a/smali/android/support/v7/widget/ResourcesWrapper.smali +++ b/smali/android/support/v7/widget/ResourcesWrapper.smali @@ -206,6 +206,10 @@ .method public getDrawable(ILandroid/content/res/Resources$Theme;)Landroid/graphics/drawable/Drawable; .locals 1 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x15 + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Landroid/content/res/Resources$NotFoundException; @@ -224,6 +228,10 @@ .method public getDrawableForDensity(II)Landroid/graphics/drawable/Drawable; .locals 1 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0xf + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Landroid/content/res/Resources$NotFoundException; @@ -242,6 +250,9 @@ .method public getDrawableForDensity(IILandroid/content/res/Resources$Theme;)Landroid/graphics/drawable/Drawable; .locals 1 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x15 + .end annotation .line 148 iget-object v0, p0, Landroid/support/v7/widget/ResourcesWrapper;->mResources:Landroid/content/res/Resources; @@ -614,6 +625,10 @@ .method public getValueForDensity(IILandroid/util/TypedValue;Z)V .locals 1 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0xf + .end annotation + .annotation system Ldalvik/annotation/Throws; value = { Landroid/content/res/Resources$NotFoundException; diff --git a/smali/android/support/v7/widget/ScrollingTabContainerView$TabView.smali b/smali/android/support/v7/widget/ScrollingTabContainerView$TabView.smali index 4f776455..2f08e152 100644 --- a/smali/android/support/v7/widget/ScrollingTabContainerView$TabView.smali +++ b/smali/android/support/v7/widget/ScrollingTabContainerView$TabView.smali @@ -44,36 +44,38 @@ const/4 p1, 0x1 + .line 381 new-array p1, p1, [I - const v1, 0x10100d4 + const/4 v1, 0x0 - const/4 v2, 0x0 + const v2, 0x10100d4 - aput v1, p1, v2 + aput v2, p1, v1 - .line 381 iput-object p1, p0, Landroid/support/v7/widget/ScrollingTabContainerView$TabView;->BG_ATTRS:[I .line 392 iput-object p3, p0, Landroid/support/v7/widget/ScrollingTabContainerView$TabView;->mTab:Landroid/support/v7/app/ActionBar$Tab; .line 394 + iget-object p1, p0, Landroid/support/v7/widget/ScrollingTabContainerView$TabView;->BG_ATTRS:[I + sget p3, Landroid/support/v7/appcompat/R$attr;->actionBarTabStyle:I - invoke-static {p2, v0, p1, p3, v2}, Landroid/support/v7/widget/TintTypedArray;->obtainStyledAttributes(Landroid/content/Context;Landroid/util/AttributeSet;[III)Landroid/support/v7/widget/TintTypedArray; + invoke-static {p2, v0, p1, p3, v1}, Landroid/support/v7/widget/TintTypedArray;->obtainStyledAttributes(Landroid/content/Context;Landroid/util/AttributeSet;[III)Landroid/support/v7/widget/TintTypedArray; move-result-object p1 .line 396 - invoke-virtual {p1, v2}, Landroid/support/v7/widget/TintTypedArray;->hasValue(I)Z + invoke-virtual {p1, v1}, Landroid/support/v7/widget/TintTypedArray;->hasValue(I)Z move-result p2 if-eqz p2, :cond_0 .line 397 - invoke-virtual {p1, v2}, Landroid/support/v7/widget/TintTypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable; + invoke-virtual {p1, v1}, Landroid/support/v7/widget/TintTypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable; move-result-object p2 diff --git a/smali/android/support/v7/widget/ScrollingTabContainerView$VisibilityAnimListener.smali b/smali/android/support/v7/widget/ScrollingTabContainerView$VisibilityAnimListener.smali index 018fd721..e94ab581 100644 --- a/smali/android/support/v7/widget/ScrollingTabContainerView$VisibilityAnimListener.smali +++ b/smali/android/support/v7/widget/ScrollingTabContainerView$VisibilityAnimListener.smali @@ -71,8 +71,6 @@ iput-object v0, p1, Landroid/support/v7/widget/ScrollingTabContainerView;->mVisibilityAnim:Landroid/view/ViewPropertyAnimator; .line 589 - iget-object p1, p0, Landroid/support/v7/widget/ScrollingTabContainerView$VisibilityAnimListener;->this$0:Landroid/support/v7/widget/ScrollingTabContainerView; - iget v0, p0, Landroid/support/v7/widget/ScrollingTabContainerView$VisibilityAnimListener;->mFinalVisibility:I invoke-virtual {p1, v0}, Landroid/support/v7/widget/ScrollingTabContainerView;->setVisibility(I)V diff --git a/smali/android/support/v7/widget/ScrollingTabContainerView.smali b/smali/android/support/v7/widget/ScrollingTabContainerView.smali index 6871acfc..cfa98a41 100644 --- a/smali/android/support/v7/widget/ScrollingTabContainerView.smali +++ b/smali/android/support/v7/widget/ScrollingTabContainerView.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v7/widget/ScrollingTabContainerView$VisibilityAnimListener;, @@ -108,6 +114,8 @@ iput-object p1, p0, Landroid/support/v7/widget/ScrollingTabContainerView;->mTabLayout:Landroid/support/v7/widget/LinearLayoutCompat; .line 91 + iget-object p1, p0, Landroid/support/v7/widget/ScrollingTabContainerView;->mTabLayout:Landroid/support/v7/widget/LinearLayoutCompat; + new-instance v0, Landroid/view/ViewGroup$LayoutParams; const/4 v1, -0x2 @@ -496,7 +504,9 @@ iput-object v0, p0, Landroid/support/v7/widget/ScrollingTabContainerView;->mTabSelector:Ljava/lang/Runnable; .line 272 - invoke-virtual {p0, v0}, Landroid/support/v7/widget/ScrollingTabContainerView;->post(Ljava/lang/Runnable;)Z + iget-object p1, p0, Landroid/support/v7/widget/ScrollingTabContainerView;->mTabSelector:Ljava/lang/Runnable; + + invoke-virtual {p0, p1}, Landroid/support/v7/widget/ScrollingTabContainerView;->post(Ljava/lang/Runnable;)Z return-void .end method diff --git a/smali/android/support/v7/widget/SearchView$AutoCompleteTextViewReflector.smali b/smali/android/support/v7/widget/SearchView$AutoCompleteTextViewReflector.smali index 4124080d..0f86a556 100644 --- a/smali/android/support/v7/widget/SearchView$AutoCompleteTextViewReflector.smali +++ b/smali/android/support/v7/widget/SearchView$AutoCompleteTextViewReflector.smali @@ -51,6 +51,8 @@ iput-object v2, p0, Landroid/support/v7/widget/SearchView$AutoCompleteTextViewReflector;->doBeforeTextChanged:Ljava/lang/reflect/Method; .line 2029 + iget-object v2, p0, Landroid/support/v7/widget/SearchView$AutoCompleteTextViewReflector;->doBeforeTextChanged:Ljava/lang/reflect/Method; + invoke-virtual {v2, v1}, Ljava/lang/reflect/Method;->setAccessible(Z)V :try_end_0 .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0 @@ -72,6 +74,8 @@ iput-object v2, p0, Landroid/support/v7/widget/SearchView$AutoCompleteTextViewReflector;->doAfterTextChanged:Ljava/lang/reflect/Method; .line 2036 + iget-object v2, p0, Landroid/support/v7/widget/SearchView$AutoCompleteTextViewReflector;->doAfterTextChanged:Ljava/lang/reflect/Method; + invoke-virtual {v2, v1}, Ljava/lang/reflect/Method;->setAccessible(Z)V :try_end_1 .catch Ljava/lang/NoSuchMethodException; {:try_start_1 .. :try_end_1} :catch_1 @@ -97,6 +101,8 @@ iput-object v0, p0, Landroid/support/v7/widget/SearchView$AutoCompleteTextViewReflector;->ensureImeVisible:Ljava/lang/reflect/Method; .line 2043 + iget-object v0, p0, Landroid/support/v7/widget/SearchView$AutoCompleteTextViewReflector;->ensureImeVisible:Ljava/lang/reflect/Method; + invoke-virtual {v0, v1}, Ljava/lang/reflect/Method;->setAccessible(Z)V :try_end_2 .catch Ljava/lang/NoSuchMethodException; {:try_start_2 .. :try_end_2} :catch_2 @@ -117,10 +123,10 @@ const/4 v1, 0x0 + .line 2061 :try_start_0 new-array v1, v1, [Ljava/lang/Object; - .line 2061 invoke-virtual {v0, p1, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; :try_end_0 .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0 @@ -140,10 +146,10 @@ const/4 v1, 0x0 + .line 2052 :try_start_0 new-array v1, v1, [Ljava/lang/Object; - .line 2052 invoke-virtual {v0, p1, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; :try_end_0 .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0 @@ -163,12 +169,12 @@ const/4 v1, 0x1 + .line 2070 :try_start_0 new-array v1, v1, [Ljava/lang/Object; const/4 v2, 0x0 - .line 2070 invoke-static {p2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean; move-result-object p2 diff --git a/smali/android/support/v7/widget/SearchView$SearchAutoComplete.smali b/smali/android/support/v7/widget/SearchView$SearchAutoComplete.smali index a6311f2e..b00d8bed 100644 --- a/smali/android/support/v7/widget/SearchView$SearchAutoComplete.smali +++ b/smali/android/support/v7/widget/SearchView$SearchAutoComplete.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/EnclosingClass; value = Landroid/support/v7/widget/SearchView; .end annotation diff --git a/smali/android/support/v7/widget/SearchView$UpdatableTouchDelegate.smali b/smali/android/support/v7/widget/SearchView$UpdatableTouchDelegate.smali index 25f688be..8bf29e2b 100644 --- a/smali/android/support/v7/widget/SearchView$UpdatableTouchDelegate.smali +++ b/smali/android/support/v7/widget/SearchView$UpdatableTouchDelegate.smali @@ -110,7 +110,7 @@ const/4 v5, 0x0 - if-eqz v2, :cond_3 + if-eqz v2, :cond_2 if-eq v2, v4, :cond_1 @@ -120,7 +120,7 @@ if-eq v2, v6, :cond_0 - goto :goto_2 + goto :goto_0 .line 1796 :cond_0 @@ -129,13 +129,13 @@ .line 1797 iput-boolean v5, p0, Landroid/support/v7/widget/SearchView$UpdatableTouchDelegate;->mDelegateTargeted:Z - goto :goto_0 + goto :goto_1 .line 1788 :cond_1 iget-boolean v2, p0, Landroid/support/v7/widget/SearchView$UpdatableTouchDelegate;->mDelegateTargeted:Z - if-eqz v2, :cond_2 + if-eqz v2, :cond_4 .line 1790 iget-object v6, p0, Landroid/support/v7/widget/SearchView$UpdatableTouchDelegate;->mSlopBounds:Landroid/graphics/Rect; @@ -144,48 +144,38 @@ move-result v6 - if-nez v6, :cond_2 + if-nez v6, :cond_4 - move v4, v2 - - const/4 v2, 0x0 - - goto :goto_3 - - :cond_2 - :goto_0 - move v4, v2 - - :goto_1 - const/4 v2, 0x1 + const/4 v4, 0x0 - goto :goto_3 + goto :goto_1 .line 1781 - :cond_3 + :cond_2 iget-object v2, p0, Landroid/support/v7/widget/SearchView$UpdatableTouchDelegate;->mTargetBounds:Landroid/graphics/Rect; invoke-virtual {v2, v0, v1}, Landroid/graphics/Rect;->contains(II)Z move-result v2 - if-eqz v2, :cond_4 + if-eqz v2, :cond_3 .line 1782 iput-boolean v4, p0, Landroid/support/v7/widget/SearchView$UpdatableTouchDelegate;->mDelegateTargeted:Z - goto :goto_1 - - :cond_4 - :goto_2 const/4 v2, 0x1 - const/4 v4, 0x0 + goto :goto_1 - :goto_3 - if-eqz v4, :cond_6 + :cond_3 + :goto_0 + const/4 v2, 0x0 - if-eqz v2, :cond_5 + :cond_4 + :goto_1 + if-eqz v2, :cond_6 + + if-eqz v4, :cond_5 .line 1801 iget-object v2, p0, Landroid/support/v7/widget/SearchView$UpdatableTouchDelegate;->mActualBounds:Landroid/graphics/Rect; @@ -221,7 +211,7 @@ .line 1805 invoke-virtual {p1, v0, v1}, Landroid/view/MotionEvent;->setLocation(FF)V - goto :goto_4 + goto :goto_2 .line 1809 :cond_5 @@ -244,7 +234,7 @@ invoke-virtual {p1, v0, v1}, Landroid/view/MotionEvent;->setLocation(FF)V .line 1812 - :goto_4 + :goto_2 iget-object v0, p0, Landroid/support/v7/widget/SearchView$UpdatableTouchDelegate;->mDelegateView:Landroid/view/View; invoke-virtual {v0, p1}, Landroid/view/View;->dispatchTouchEvent(Landroid/view/MotionEvent;)Z diff --git a/smali/android/support/v7/widget/SearchView.smali b/smali/android/support/v7/widget/SearchView.smali index 73178c19..9d424cce 100644 --- a/smali/android/support/v7/widget/SearchView.smali +++ b/smali/android/support/v7/widget/SearchView.smali @@ -178,529 +178,585 @@ .end method .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;I)V - .locals 16 - - move-object/from16 v0, p0 + .locals 3 .line 274 - invoke-direct/range {p0 .. p3}, Landroid/support/v7/widget/LinearLayoutCompat;->(Landroid/content/Context;Landroid/util/AttributeSet;I)V + invoke-direct {p0, p1, p2, p3}, Landroid/support/v7/widget/LinearLayoutCompat;->(Landroid/content/Context;Landroid/util/AttributeSet;I)V .line 131 - new-instance v1, Landroid/graphics/Rect; + new-instance v0, Landroid/graphics/Rect; - invoke-direct {v1}, Landroid/graphics/Rect;->()V + invoke-direct {v0}, Landroid/graphics/Rect;->()V - iput-object v1, v0, Landroid/support/v7/widget/SearchView;->mSearchSrcTextViewBounds:Landroid/graphics/Rect; + iput-object v0, p0, Landroid/support/v7/widget/SearchView;->mSearchSrcTextViewBounds:Landroid/graphics/Rect; .line 132 - new-instance v1, Landroid/graphics/Rect; + new-instance v0, Landroid/graphics/Rect; - invoke-direct {v1}, Landroid/graphics/Rect;->()V + invoke-direct {v0}, Landroid/graphics/Rect;->()V - iput-object v1, v0, Landroid/support/v7/widget/SearchView;->mSearchSrtTextViewBoundsExpanded:Landroid/graphics/Rect; + iput-object v0, p0, Landroid/support/v7/widget/SearchView;->mSearchSrtTextViewBoundsExpanded:Landroid/graphics/Rect; - const/4 v1, 0x2 - - new-array v2, v1, [I + const/4 v0, 0x2 .line 133 - iput-object v2, v0, Landroid/support/v7/widget/SearchView;->mTemp:[I + new-array v1, v0, [I - new-array v1, v1, [I + iput-object v1, p0, Landroid/support/v7/widget/SearchView;->mTemp:[I .line 134 - iput-object v1, v0, Landroid/support/v7/widget/SearchView;->mTemp2:[I + new-array v0, v0, [I + + iput-object v0, p0, Landroid/support/v7/widget/SearchView;->mTemp2:[I .line 177 - new-instance v1, Landroid/support/v7/widget/SearchView$1; + new-instance v0, Landroid/support/v7/widget/SearchView$1; - invoke-direct {v1, v0}, Landroid/support/v7/widget/SearchView$1;->(Landroid/support/v7/widget/SearchView;)V + invoke-direct {v0, p0}, Landroid/support/v7/widget/SearchView$1;->(Landroid/support/v7/widget/SearchView;)V - iput-object v1, v0, Landroid/support/v7/widget/SearchView;->mUpdateDrawableStateRunnable:Ljava/lang/Runnable; + iput-object v0, p0, Landroid/support/v7/widget/SearchView;->mUpdateDrawableStateRunnable:Ljava/lang/Runnable; .line 184 - new-instance v1, Landroid/support/v7/widget/SearchView$2; + new-instance v0, Landroid/support/v7/widget/SearchView$2; - invoke-direct {v1, v0}, Landroid/support/v7/widget/SearchView$2;->(Landroid/support/v7/widget/SearchView;)V + invoke-direct {v0, p0}, Landroid/support/v7/widget/SearchView$2;->(Landroid/support/v7/widget/SearchView;)V - iput-object v1, v0, Landroid/support/v7/widget/SearchView;->mReleaseCursorRunnable:Ljava/lang/Runnable; + iput-object v0, p0, Landroid/support/v7/widget/SearchView;->mReleaseCursorRunnable:Ljava/lang/Runnable; .line 195 - new-instance v1, Ljava/util/WeakHashMap; + new-instance v0, Ljava/util/WeakHashMap; - invoke-direct {v1}, Ljava/util/WeakHashMap;->()V + invoke-direct {v0}, Ljava/util/WeakHashMap;->()V - iput-object v1, v0, Landroid/support/v7/widget/SearchView;->mOutsideDrawablesCache:Ljava/util/WeakHashMap; + iput-object v0, p0, Landroid/support/v7/widget/SearchView;->mOutsideDrawablesCache:Ljava/util/WeakHashMap; .line 975 - new-instance v1, Landroid/support/v7/widget/SearchView$5; + new-instance v0, Landroid/support/v7/widget/SearchView$5; - invoke-direct {v1, v0}, Landroid/support/v7/widget/SearchView$5;->(Landroid/support/v7/widget/SearchView;)V + invoke-direct {v0, p0}, Landroid/support/v7/widget/SearchView$5;->(Landroid/support/v7/widget/SearchView;)V - iput-object v1, v0, Landroid/support/v7/widget/SearchView;->mOnClickListener:Landroid/view/View$OnClickListener; + iput-object v0, p0, Landroid/support/v7/widget/SearchView;->mOnClickListener:Landroid/view/View$OnClickListener; .line 997 - new-instance v2, Landroid/support/v7/widget/SearchView$6; + new-instance v0, Landroid/support/v7/widget/SearchView$6; - invoke-direct {v2, v0}, Landroid/support/v7/widget/SearchView$6;->(Landroid/support/v7/widget/SearchView;)V + invoke-direct {v0, p0}, Landroid/support/v7/widget/SearchView$6;->(Landroid/support/v7/widget/SearchView;)V - iput-object v2, v0, Landroid/support/v7/widget/SearchView;->mTextKeyListener:Landroid/view/View$OnKeyListener; + iput-object v0, p0, Landroid/support/v7/widget/SearchView;->mTextKeyListener:Landroid/view/View$OnKeyListener; .line 1160 - new-instance v2, Landroid/support/v7/widget/SearchView$7; + new-instance v0, Landroid/support/v7/widget/SearchView$7; - invoke-direct {v2, v0}, Landroid/support/v7/widget/SearchView$7;->(Landroid/support/v7/widget/SearchView;)V + invoke-direct {v0, p0}, Landroid/support/v7/widget/SearchView$7;->(Landroid/support/v7/widget/SearchView;)V - iput-object v2, v0, Landroid/support/v7/widget/SearchView;->mOnEditorActionListener:Landroid/widget/TextView$OnEditorActionListener; + iput-object v0, p0, Landroid/support/v7/widget/SearchView;->mOnEditorActionListener:Landroid/widget/TextView$OnEditorActionListener; .line 1406 - new-instance v3, Landroid/support/v7/widget/SearchView$8; + new-instance v0, Landroid/support/v7/widget/SearchView$8; - invoke-direct {v3, v0}, Landroid/support/v7/widget/SearchView$8;->(Landroid/support/v7/widget/SearchView;)V + invoke-direct {v0, p0}, Landroid/support/v7/widget/SearchView$8;->(Landroid/support/v7/widget/SearchView;)V - iput-object v3, v0, Landroid/support/v7/widget/SearchView;->mOnItemClickListener:Landroid/widget/AdapterView$OnItemClickListener; + iput-object v0, p0, Landroid/support/v7/widget/SearchView;->mOnItemClickListener:Landroid/widget/AdapterView$OnItemClickListener; .line 1418 - new-instance v4, Landroid/support/v7/widget/SearchView$9; + new-instance v0, Landroid/support/v7/widget/SearchView$9; - invoke-direct {v4, v0}, Landroid/support/v7/widget/SearchView$9;->(Landroid/support/v7/widget/SearchView;)V + invoke-direct {v0, p0}, Landroid/support/v7/widget/SearchView$9;->(Landroid/support/v7/widget/SearchView;)V - iput-object v4, v0, Landroid/support/v7/widget/SearchView;->mOnItemSelectedListener:Landroid/widget/AdapterView$OnItemSelectedListener; + iput-object v0, p0, Landroid/support/v7/widget/SearchView;->mOnItemSelectedListener:Landroid/widget/AdapterView$OnItemSelectedListener; .line 1708 - new-instance v5, Landroid/support/v7/widget/SearchView$10; + new-instance v0, Landroid/support/v7/widget/SearchView$10; - invoke-direct {v5, v0}, Landroid/support/v7/widget/SearchView$10;->(Landroid/support/v7/widget/SearchView;)V + invoke-direct {v0, p0}, Landroid/support/v7/widget/SearchView$10;->(Landroid/support/v7/widget/SearchView;)V - iput-object v5, v0, Landroid/support/v7/widget/SearchView;->mTextWatcher:Landroid/text/TextWatcher; + iput-object v0, p0, Landroid/support/v7/widget/SearchView;->mTextWatcher:Landroid/text/TextWatcher; .line 276 - sget-object v5, Landroid/support/v7/appcompat/R$styleable;->SearchView:[I - - const/4 v6, 0x0 - - move-object/from16 v7, p1 + sget-object v0, Landroid/support/v7/appcompat/R$styleable;->SearchView:[I - move-object/from16 v8, p2 - - move/from16 v9, p3 + const/4 v1, 0x0 - invoke-static {v7, v8, v5, v9, v6}, Landroid/support/v7/widget/TintTypedArray;->obtainStyledAttributes(Landroid/content/Context;Landroid/util/AttributeSet;[III)Landroid/support/v7/widget/TintTypedArray; + invoke-static {p1, p2, v0, p3, v1}, Landroid/support/v7/widget/TintTypedArray;->obtainStyledAttributes(Landroid/content/Context;Landroid/util/AttributeSet;[III)Landroid/support/v7/widget/TintTypedArray; - move-result-object v5 + move-result-object p2 .line 279 - invoke-static/range {p1 .. p1}, Landroid/view/LayoutInflater;->from(Landroid/content/Context;)Landroid/view/LayoutInflater; + invoke-static {p1}, Landroid/view/LayoutInflater;->from(Landroid/content/Context;)Landroid/view/LayoutInflater; - move-result-object v7 + move-result-object p1 .line 280 - sget v8, Landroid/support/v7/appcompat/R$styleable;->SearchView_layout:I + sget p3, Landroid/support/v7/appcompat/R$styleable;->SearchView_layout:I - sget v9, Landroid/support/v7/appcompat/R$layout;->abc_search_view:I + sget v0, Landroid/support/v7/appcompat/R$layout;->abc_search_view:I - invoke-virtual {v5, v8, v9}, Landroid/support/v7/widget/TintTypedArray;->getResourceId(II)I + invoke-virtual {p2, p3, v0}, Landroid/support/v7/widget/TintTypedArray;->getResourceId(II)I - move-result v8 + move-result p3 - const/4 v9, 0x1 + const/4 v0, 0x1 .line 282 - invoke-virtual {v7, v8, v0, v9}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View; + invoke-virtual {p1, p3, p0, v0}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View; .line 284 - sget v7, Landroid/support/v7/appcompat/R$id;->search_src_text:I + sget p1, Landroid/support/v7/appcompat/R$id;->search_src_text:I - invoke-virtual {v0, v7}, Landroid/support/v7/widget/SearchView;->findViewById(I)Landroid/view/View; + invoke-virtual {p0, p1}, Landroid/support/v7/widget/SearchView;->findViewById(I)Landroid/view/View; - move-result-object v7 + move-result-object p1 - check-cast v7, Landroid/support/v7/widget/SearchView$SearchAutoComplete; + check-cast p1, Landroid/support/v7/widget/SearchView$SearchAutoComplete; - iput-object v7, v0, Landroid/support/v7/widget/SearchView;->mSearchSrcTextView:Landroid/support/v7/widget/SearchView$SearchAutoComplete; + iput-object p1, p0, Landroid/support/v7/widget/SearchView;->mSearchSrcTextView:Landroid/support/v7/widget/SearchView$SearchAutoComplete; .line 285 - invoke-virtual {v7, v0}, Landroid/support/v7/widget/SearchView$SearchAutoComplete;->setSearchView(Landroid/support/v7/widget/SearchView;)V + iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mSearchSrcTextView:Landroid/support/v7/widget/SearchView$SearchAutoComplete; + + invoke-virtual {p1, p0}, Landroid/support/v7/widget/SearchView$SearchAutoComplete;->setSearchView(Landroid/support/v7/widget/SearchView;)V .line 287 - sget v8, Landroid/support/v7/appcompat/R$id;->search_edit_frame:I + sget p1, Landroid/support/v7/appcompat/R$id;->search_edit_frame:I - invoke-virtual {v0, v8}, Landroid/support/v7/widget/SearchView;->findViewById(I)Landroid/view/View; + invoke-virtual {p0, p1}, Landroid/support/v7/widget/SearchView;->findViewById(I)Landroid/view/View; - move-result-object v8 + move-result-object p1 - iput-object v8, v0, Landroid/support/v7/widget/SearchView;->mSearchEditFrame:Landroid/view/View; + iput-object p1, p0, Landroid/support/v7/widget/SearchView;->mSearchEditFrame:Landroid/view/View; .line 288 - sget v8, Landroid/support/v7/appcompat/R$id;->search_plate:I + sget p1, Landroid/support/v7/appcompat/R$id;->search_plate:I - invoke-virtual {v0, v8}, Landroid/support/v7/widget/SearchView;->findViewById(I)Landroid/view/View; + invoke-virtual {p0, p1}, Landroid/support/v7/widget/SearchView;->findViewById(I)Landroid/view/View; - move-result-object v8 + move-result-object p1 - iput-object v8, v0, Landroid/support/v7/widget/SearchView;->mSearchPlate:Landroid/view/View; + iput-object p1, p0, Landroid/support/v7/widget/SearchView;->mSearchPlate:Landroid/view/View; .line 289 - sget v10, Landroid/support/v7/appcompat/R$id;->submit_area:I + sget p1, Landroid/support/v7/appcompat/R$id;->submit_area:I - invoke-virtual {v0, v10}, Landroid/support/v7/widget/SearchView;->findViewById(I)Landroid/view/View; + invoke-virtual {p0, p1}, Landroid/support/v7/widget/SearchView;->findViewById(I)Landroid/view/View; - move-result-object v10 + move-result-object p1 - iput-object v10, v0, Landroid/support/v7/widget/SearchView;->mSubmitArea:Landroid/view/View; + iput-object p1, p0, Landroid/support/v7/widget/SearchView;->mSubmitArea:Landroid/view/View; .line 290 - sget v11, Landroid/support/v7/appcompat/R$id;->search_button:I + sget p1, Landroid/support/v7/appcompat/R$id;->search_button:I - invoke-virtual {v0, v11}, Landroid/support/v7/widget/SearchView;->findViewById(I)Landroid/view/View; + invoke-virtual {p0, p1}, Landroid/support/v7/widget/SearchView;->findViewById(I)Landroid/view/View; - move-result-object v11 + move-result-object p1 - check-cast v11, Landroid/widget/ImageView; + check-cast p1, Landroid/widget/ImageView; - iput-object v11, v0, Landroid/support/v7/widget/SearchView;->mSearchButton:Landroid/widget/ImageView; + iput-object p1, p0, Landroid/support/v7/widget/SearchView;->mSearchButton:Landroid/widget/ImageView; .line 291 - sget v12, Landroid/support/v7/appcompat/R$id;->search_go_btn:I + sget p1, Landroid/support/v7/appcompat/R$id;->search_go_btn:I - invoke-virtual {v0, v12}, Landroid/support/v7/widget/SearchView;->findViewById(I)Landroid/view/View; + invoke-virtual {p0, p1}, Landroid/support/v7/widget/SearchView;->findViewById(I)Landroid/view/View; - move-result-object v12 + move-result-object p1 - check-cast v12, Landroid/widget/ImageView; + check-cast p1, Landroid/widget/ImageView; - iput-object v12, v0, Landroid/support/v7/widget/SearchView;->mGoButton:Landroid/widget/ImageView; + iput-object p1, p0, Landroid/support/v7/widget/SearchView;->mGoButton:Landroid/widget/ImageView; .line 292 - sget v13, Landroid/support/v7/appcompat/R$id;->search_close_btn:I + sget p1, Landroid/support/v7/appcompat/R$id;->search_close_btn:I - invoke-virtual {v0, v13}, Landroid/support/v7/widget/SearchView;->findViewById(I)Landroid/view/View; + invoke-virtual {p0, p1}, Landroid/support/v7/widget/SearchView;->findViewById(I)Landroid/view/View; - move-result-object v13 + move-result-object p1 - check-cast v13, Landroid/widget/ImageView; + check-cast p1, Landroid/widget/ImageView; - iput-object v13, v0, Landroid/support/v7/widget/SearchView;->mCloseButton:Landroid/widget/ImageView; + iput-object p1, p0, Landroid/support/v7/widget/SearchView;->mCloseButton:Landroid/widget/ImageView; .line 293 - sget v14, Landroid/support/v7/appcompat/R$id;->search_voice_btn:I + sget p1, Landroid/support/v7/appcompat/R$id;->search_voice_btn:I - invoke-virtual {v0, v14}, Landroid/support/v7/widget/SearchView;->findViewById(I)Landroid/view/View; + invoke-virtual {p0, p1}, Landroid/support/v7/widget/SearchView;->findViewById(I)Landroid/view/View; - move-result-object v14 + move-result-object p1 - check-cast v14, Landroid/widget/ImageView; + check-cast p1, Landroid/widget/ImageView; - iput-object v14, v0, Landroid/support/v7/widget/SearchView;->mVoiceButton:Landroid/widget/ImageView; + iput-object p1, p0, Landroid/support/v7/widget/SearchView;->mVoiceButton:Landroid/widget/ImageView; .line 294 - sget v15, Landroid/support/v7/appcompat/R$id;->search_mag_icon:I + sget p1, Landroid/support/v7/appcompat/R$id;->search_mag_icon:I - invoke-virtual {v0, v15}, Landroid/support/v7/widget/SearchView;->findViewById(I)Landroid/view/View; + invoke-virtual {p0, p1}, Landroid/support/v7/widget/SearchView;->findViewById(I)Landroid/view/View; - move-result-object v15 + move-result-object p1 - check-cast v15, Landroid/widget/ImageView; + check-cast p1, Landroid/widget/ImageView; - iput-object v15, v0, Landroid/support/v7/widget/SearchView;->mCollapsedIcon:Landroid/widget/ImageView; + iput-object p1, p0, Landroid/support/v7/widget/SearchView;->mCollapsedIcon:Landroid/widget/ImageView; .line 297 - sget v9, Landroid/support/v7/appcompat/R$styleable;->SearchView_queryBackground:I + iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mSearchPlate:Landroid/view/View; + + sget p3, Landroid/support/v7/appcompat/R$styleable;->SearchView_queryBackground:I .line 298 - invoke-virtual {v5, v9}, Landroid/support/v7/widget/TintTypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable; + invoke-virtual {p2, p3}, Landroid/support/v7/widget/TintTypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable; - move-result-object v9 + move-result-object p3 .line 297 - invoke-static {v8, v9}, Landroid/support/v4/view/ViewCompat;->setBackground(Landroid/view/View;Landroid/graphics/drawable/Drawable;)V + invoke-static {p1, p3}, Landroid/support/v4/view/ViewCompat;->setBackground(Landroid/view/View;Landroid/graphics/drawable/Drawable;)V .line 299 - sget v8, Landroid/support/v7/appcompat/R$styleable;->SearchView_submitBackground:I + iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mSubmitArea:Landroid/view/View; + + sget p3, Landroid/support/v7/appcompat/R$styleable;->SearchView_submitBackground:I .line 300 - invoke-virtual {v5, v8}, Landroid/support/v7/widget/TintTypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable; + invoke-virtual {p2, p3}, Landroid/support/v7/widget/TintTypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable; - move-result-object v8 + move-result-object p3 .line 299 - invoke-static {v10, v8}, Landroid/support/v4/view/ViewCompat;->setBackground(Landroid/view/View;Landroid/graphics/drawable/Drawable;)V + invoke-static {p1, p3}, Landroid/support/v4/view/ViewCompat;->setBackground(Landroid/view/View;Landroid/graphics/drawable/Drawable;)V .line 301 - sget v8, Landroid/support/v7/appcompat/R$styleable;->SearchView_searchIcon:I + iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mSearchButton:Landroid/widget/ImageView; + + sget p3, Landroid/support/v7/appcompat/R$styleable;->SearchView_searchIcon:I - invoke-virtual {v5, v8}, Landroid/support/v7/widget/TintTypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable; + invoke-virtual {p2, p3}, Landroid/support/v7/widget/TintTypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable; - move-result-object v8 + move-result-object p3 - invoke-virtual {v11, v8}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V + invoke-virtual {p1, p3}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V .line 302 - sget v8, Landroid/support/v7/appcompat/R$styleable;->SearchView_goIcon:I + iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mGoButton:Landroid/widget/ImageView; + + sget p3, Landroid/support/v7/appcompat/R$styleable;->SearchView_goIcon:I - invoke-virtual {v5, v8}, Landroid/support/v7/widget/TintTypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable; + invoke-virtual {p2, p3}, Landroid/support/v7/widget/TintTypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable; - move-result-object v8 + move-result-object p3 - invoke-virtual {v12, v8}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V + invoke-virtual {p1, p3}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V .line 303 - sget v8, Landroid/support/v7/appcompat/R$styleable;->SearchView_closeIcon:I + iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mCloseButton:Landroid/widget/ImageView; - invoke-virtual {v5, v8}, Landroid/support/v7/widget/TintTypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable; + sget p3, Landroid/support/v7/appcompat/R$styleable;->SearchView_closeIcon:I - move-result-object v8 + invoke-virtual {p2, p3}, Landroid/support/v7/widget/TintTypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable; - invoke-virtual {v13, v8}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V + move-result-object p3 + + invoke-virtual {p1, p3}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V .line 304 - sget v8, Landroid/support/v7/appcompat/R$styleable;->SearchView_voiceIcon:I + iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mVoiceButton:Landroid/widget/ImageView; + + sget p3, Landroid/support/v7/appcompat/R$styleable;->SearchView_voiceIcon:I - invoke-virtual {v5, v8}, Landroid/support/v7/widget/TintTypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable; + invoke-virtual {p2, p3}, Landroid/support/v7/widget/TintTypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable; - move-result-object v8 + move-result-object p3 - invoke-virtual {v14, v8}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V + invoke-virtual {p1, p3}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V .line 305 - sget v8, Landroid/support/v7/appcompat/R$styleable;->SearchView_searchIcon:I + iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mCollapsedIcon:Landroid/widget/ImageView; + + sget p3, Landroid/support/v7/appcompat/R$styleable;->SearchView_searchIcon:I - invoke-virtual {v5, v8}, Landroid/support/v7/widget/TintTypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable; + invoke-virtual {p2, p3}, Landroid/support/v7/widget/TintTypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable; - move-result-object v8 + move-result-object p3 - invoke-virtual {v15, v8}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V + invoke-virtual {p1, p3}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V .line 307 - sget v8, Landroid/support/v7/appcompat/R$styleable;->SearchView_searchHintIcon:I + sget p1, Landroid/support/v7/appcompat/R$styleable;->SearchView_searchHintIcon:I + + invoke-virtual {p2, p1}, Landroid/support/v7/widget/TintTypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable; - invoke-virtual {v5, v8}, Landroid/support/v7/widget/TintTypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable; + move-result-object p1 - move-result-object v8 + iput-object p1, p0, Landroid/support/v7/widget/SearchView;->mSearchHintIcon:Landroid/graphics/drawable/Drawable; - iput-object v8, v0, Landroid/support/v7/widget/SearchView;->mSearchHintIcon:Landroid/graphics/drawable/Drawable; + .line 309 + iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mSearchButton:Landroid/widget/ImageView; .line 310 - invoke-virtual/range {p0 .. p0}, Landroid/support/v7/widget/SearchView;->getResources()Landroid/content/res/Resources; + invoke-virtual {p0}, Landroid/support/v7/widget/SearchView;->getResources()Landroid/content/res/Resources; - move-result-object v8 + move-result-object p3 - sget v9, Landroid/support/v7/appcompat/R$string;->abc_searchview_description_search:I + sget v2, Landroid/support/v7/appcompat/R$string;->abc_searchview_description_search:I - invoke-virtual {v8, v9}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; + invoke-virtual {p3, v2}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; - move-result-object v8 + move-result-object p3 .line 309 - invoke-static {v11, v8}, Landroid/support/v7/widget/TooltipCompat;->setTooltipText(Landroid/view/View;Ljava/lang/CharSequence;)V + invoke-static {p1, p3}, Landroid/support/v7/widget/TooltipCompat;->setTooltipText(Landroid/view/View;Ljava/lang/CharSequence;)V .line 313 - sget v8, Landroid/support/v7/appcompat/R$styleable;->SearchView_suggestionRowLayout:I + sget p1, Landroid/support/v7/appcompat/R$styleable;->SearchView_suggestionRowLayout:I - sget v9, Landroid/support/v7/appcompat/R$layout;->abc_search_dropdown_item_icons_2line:I + sget p3, Landroid/support/v7/appcompat/R$layout;->abc_search_dropdown_item_icons_2line:I - invoke-virtual {v5, v8, v9}, Landroid/support/v7/widget/TintTypedArray;->getResourceId(II)I + invoke-virtual {p2, p1, p3}, Landroid/support/v7/widget/TintTypedArray;->getResourceId(II)I - move-result v8 + move-result p1 - iput v8, v0, Landroid/support/v7/widget/SearchView;->mSuggestionRowLayout:I + iput p1, p0, Landroid/support/v7/widget/SearchView;->mSuggestionRowLayout:I .line 315 - sget v8, Landroid/support/v7/appcompat/R$styleable;->SearchView_commitIcon:I + sget p1, Landroid/support/v7/appcompat/R$styleable;->SearchView_commitIcon:I - invoke-virtual {v5, v8, v6}, Landroid/support/v7/widget/TintTypedArray;->getResourceId(II)I + invoke-virtual {p2, p1, v1}, Landroid/support/v7/widget/TintTypedArray;->getResourceId(II)I - move-result v6 + move-result p1 - iput v6, v0, Landroid/support/v7/widget/SearchView;->mSuggestionCommitIconResId:I + iput p1, p0, Landroid/support/v7/widget/SearchView;->mSuggestionCommitIconResId:I .line 317 - invoke-virtual {v11, v1}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V + iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mSearchButton:Landroid/widget/ImageView; + + iget-object p3, p0, Landroid/support/v7/widget/SearchView;->mOnClickListener:Landroid/view/View$OnClickListener; + + invoke-virtual {p1, p3}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V .line 318 - invoke-virtual {v13, v1}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V + iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mCloseButton:Landroid/widget/ImageView; + + iget-object p3, p0, Landroid/support/v7/widget/SearchView;->mOnClickListener:Landroid/view/View$OnClickListener; + + invoke-virtual {p1, p3}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V .line 319 - invoke-virtual {v12, v1}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V + iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mGoButton:Landroid/widget/ImageView; + + iget-object p3, p0, Landroid/support/v7/widget/SearchView;->mOnClickListener:Landroid/view/View$OnClickListener; + + invoke-virtual {p1, p3}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V .line 320 - invoke-virtual {v14, v1}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V + iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mVoiceButton:Landroid/widget/ImageView; + + iget-object p3, p0, Landroid/support/v7/widget/SearchView;->mOnClickListener:Landroid/view/View$OnClickListener; + + invoke-virtual {p1, p3}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V .line 321 - invoke-virtual {v7, v1}, Landroid/support/v7/widget/SearchView$SearchAutoComplete;->setOnClickListener(Landroid/view/View$OnClickListener;)V + iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mSearchSrcTextView:Landroid/support/v7/widget/SearchView$SearchAutoComplete; + + iget-object p3, p0, Landroid/support/v7/widget/SearchView;->mOnClickListener:Landroid/view/View$OnClickListener; + + invoke-virtual {p1, p3}, Landroid/support/v7/widget/SearchView$SearchAutoComplete;->setOnClickListener(Landroid/view/View$OnClickListener;)V .line 323 - iget-object v1, v0, Landroid/support/v7/widget/SearchView;->mTextWatcher:Landroid/text/TextWatcher; + iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mSearchSrcTextView:Landroid/support/v7/widget/SearchView$SearchAutoComplete; + + iget-object p3, p0, Landroid/support/v7/widget/SearchView;->mTextWatcher:Landroid/text/TextWatcher; - invoke-virtual {v7, v1}, Landroid/support/v7/widget/SearchView$SearchAutoComplete;->addTextChangedListener(Landroid/text/TextWatcher;)V + invoke-virtual {p1, p3}, Landroid/support/v7/widget/SearchView$SearchAutoComplete;->addTextChangedListener(Landroid/text/TextWatcher;)V .line 324 - invoke-virtual {v7, v2}, Landroid/support/v7/widget/SearchView$SearchAutoComplete;->setOnEditorActionListener(Landroid/widget/TextView$OnEditorActionListener;)V + iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mSearchSrcTextView:Landroid/support/v7/widget/SearchView$SearchAutoComplete; + + iget-object p3, p0, Landroid/support/v7/widget/SearchView;->mOnEditorActionListener:Landroid/widget/TextView$OnEditorActionListener; + + invoke-virtual {p1, p3}, Landroid/support/v7/widget/SearchView$SearchAutoComplete;->setOnEditorActionListener(Landroid/widget/TextView$OnEditorActionListener;)V .line 325 - invoke-virtual {v7, v3}, Landroid/support/v7/widget/SearchView$SearchAutoComplete;->setOnItemClickListener(Landroid/widget/AdapterView$OnItemClickListener;)V + iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mSearchSrcTextView:Landroid/support/v7/widget/SearchView$SearchAutoComplete; + + iget-object p3, p0, Landroid/support/v7/widget/SearchView;->mOnItemClickListener:Landroid/widget/AdapterView$OnItemClickListener; + + invoke-virtual {p1, p3}, Landroid/support/v7/widget/SearchView$SearchAutoComplete;->setOnItemClickListener(Landroid/widget/AdapterView$OnItemClickListener;)V .line 326 - invoke-virtual {v7, v4}, Landroid/support/v7/widget/SearchView$SearchAutoComplete;->setOnItemSelectedListener(Landroid/widget/AdapterView$OnItemSelectedListener;)V + iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mSearchSrcTextView:Landroid/support/v7/widget/SearchView$SearchAutoComplete; + + iget-object p3, p0, Landroid/support/v7/widget/SearchView;->mOnItemSelectedListener:Landroid/widget/AdapterView$OnItemSelectedListener; + + invoke-virtual {p1, p3}, Landroid/support/v7/widget/SearchView$SearchAutoComplete;->setOnItemSelectedListener(Landroid/widget/AdapterView$OnItemSelectedListener;)V .line 327 - iget-object v1, v0, Landroid/support/v7/widget/SearchView;->mTextKeyListener:Landroid/view/View$OnKeyListener; + iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mSearchSrcTextView:Landroid/support/v7/widget/SearchView$SearchAutoComplete; + + iget-object p3, p0, Landroid/support/v7/widget/SearchView;->mTextKeyListener:Landroid/view/View$OnKeyListener; - invoke-virtual {v7, v1}, Landroid/support/v7/widget/SearchView$SearchAutoComplete;->setOnKeyListener(Landroid/view/View$OnKeyListener;)V + invoke-virtual {p1, p3}, Landroid/support/v7/widget/SearchView$SearchAutoComplete;->setOnKeyListener(Landroid/view/View$OnKeyListener;)V .line 330 - new-instance v1, Landroid/support/v7/widget/SearchView$3; + iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mSearchSrcTextView:Landroid/support/v7/widget/SearchView$SearchAutoComplete; - invoke-direct {v1, v0}, Landroid/support/v7/widget/SearchView$3;->(Landroid/support/v7/widget/SearchView;)V + new-instance p3, Landroid/support/v7/widget/SearchView$3; - invoke-virtual {v7, v1}, Landroid/support/v7/widget/SearchView$SearchAutoComplete;->setOnFocusChangeListener(Landroid/view/View$OnFocusChangeListener;)V + invoke-direct {p3, p0}, Landroid/support/v7/widget/SearchView$3;->(Landroid/support/v7/widget/SearchView;)V - .line 338 - sget v1, Landroid/support/v7/appcompat/R$styleable;->SearchView_iconifiedByDefault:I + invoke-virtual {p1, p3}, Landroid/support/v7/widget/SearchView$SearchAutoComplete;->setOnFocusChangeListener(Landroid/view/View$OnFocusChangeListener;)V - const/4 v2, 0x1 + .line 338 + sget p1, Landroid/support/v7/appcompat/R$styleable;->SearchView_iconifiedByDefault:I - invoke-virtual {v5, v1, v2}, Landroid/support/v7/widget/TintTypedArray;->getBoolean(IZ)Z + invoke-virtual {p2, p1, v0}, Landroid/support/v7/widget/TintTypedArray;->getBoolean(IZ)Z - move-result v1 + move-result p1 - invoke-virtual {v0, v1}, Landroid/support/v7/widget/SearchView;->setIconifiedByDefault(Z)V + invoke-virtual {p0, p1}, Landroid/support/v7/widget/SearchView;->setIconifiedByDefault(Z)V .line 340 - sget v1, Landroid/support/v7/appcompat/R$styleable;->SearchView_android_maxWidth:I + sget p1, Landroid/support/v7/appcompat/R$styleable;->SearchView_android_maxWidth:I - const/4 v2, -0x1 + const/4 p3, -0x1 - invoke-virtual {v5, v1, v2}, Landroid/support/v7/widget/TintTypedArray;->getDimensionPixelSize(II)I + invoke-virtual {p2, p1, p3}, Landroid/support/v7/widget/TintTypedArray;->getDimensionPixelSize(II)I - move-result v1 + move-result p1 - if-eq v1, v2, :cond_0 + if-eq p1, p3, :cond_0 .line 342 - invoke-virtual {v0, v1}, Landroid/support/v7/widget/SearchView;->setMaxWidth(I)V + invoke-virtual {p0, p1}, Landroid/support/v7/widget/SearchView;->setMaxWidth(I)V .line 345 :cond_0 - sget v1, Landroid/support/v7/appcompat/R$styleable;->SearchView_defaultQueryHint:I + sget p1, Landroid/support/v7/appcompat/R$styleable;->SearchView_defaultQueryHint:I - invoke-virtual {v5, v1}, Landroid/support/v7/widget/TintTypedArray;->getText(I)Ljava/lang/CharSequence; + invoke-virtual {p2, p1}, Landroid/support/v7/widget/TintTypedArray;->getText(I)Ljava/lang/CharSequence; - move-result-object v1 + move-result-object p1 - iput-object v1, v0, Landroid/support/v7/widget/SearchView;->mDefaultQueryHint:Ljava/lang/CharSequence; + iput-object p1, p0, Landroid/support/v7/widget/SearchView;->mDefaultQueryHint:Ljava/lang/CharSequence; .line 346 - sget v1, Landroid/support/v7/appcompat/R$styleable;->SearchView_queryHint:I + sget p1, Landroid/support/v7/appcompat/R$styleable;->SearchView_queryHint:I - invoke-virtual {v5, v1}, Landroid/support/v7/widget/TintTypedArray;->getText(I)Ljava/lang/CharSequence; + invoke-virtual {p2, p1}, Landroid/support/v7/widget/TintTypedArray;->getText(I)Ljava/lang/CharSequence; - move-result-object v1 + move-result-object p1 - iput-object v1, v0, Landroid/support/v7/widget/SearchView;->mQueryHint:Ljava/lang/CharSequence; + iput-object p1, p0, Landroid/support/v7/widget/SearchView;->mQueryHint:Ljava/lang/CharSequence; .line 348 - sget v1, Landroid/support/v7/appcompat/R$styleable;->SearchView_android_imeOptions:I + sget p1, Landroid/support/v7/appcompat/R$styleable;->SearchView_android_imeOptions:I - invoke-virtual {v5, v1, v2}, Landroid/support/v7/widget/TintTypedArray;->getInt(II)I + invoke-virtual {p2, p1, p3}, Landroid/support/v7/widget/TintTypedArray;->getInt(II)I - move-result v1 + move-result p1 - if-eq v1, v2, :cond_1 + if-eq p1, p3, :cond_1 .line 350 - invoke-virtual {v0, v1}, Landroid/support/v7/widget/SearchView;->setImeOptions(I)V + invoke-virtual {p0, p1}, Landroid/support/v7/widget/SearchView;->setImeOptions(I)V .line 353 :cond_1 - sget v1, Landroid/support/v7/appcompat/R$styleable;->SearchView_android_inputType:I + sget p1, Landroid/support/v7/appcompat/R$styleable;->SearchView_android_inputType:I - invoke-virtual {v5, v1, v2}, Landroid/support/v7/widget/TintTypedArray;->getInt(II)I + invoke-virtual {p2, p1, p3}, Landroid/support/v7/widget/TintTypedArray;->getInt(II)I - move-result v1 + move-result p1 - if-eq v1, v2, :cond_2 + if-eq p1, p3, :cond_2 .line 355 - invoke-virtual {v0, v1}, Landroid/support/v7/widget/SearchView;->setInputType(I)V + invoke-virtual {p0, p1}, Landroid/support/v7/widget/SearchView;->setInputType(I)V .line 359 :cond_2 - sget v1, Landroid/support/v7/appcompat/R$styleable;->SearchView_android_focusable:I - - const/4 v2, 0x1 + sget p1, Landroid/support/v7/appcompat/R$styleable;->SearchView_android_focusable:I - invoke-virtual {v5, v1, v2}, Landroid/support/v7/widget/TintTypedArray;->getBoolean(IZ)Z + invoke-virtual {p2, p1, v0}, Landroid/support/v7/widget/TintTypedArray;->getBoolean(IZ)Z - move-result v1 + move-result p1 .line 360 - invoke-virtual {v0, v1}, Landroid/support/v7/widget/SearchView;->setFocusable(Z)V + invoke-virtual {p0, p1}, Landroid/support/v7/widget/SearchView;->setFocusable(Z)V .line 362 - invoke-virtual {v5}, Landroid/support/v7/widget/TintTypedArray;->recycle()V + invoke-virtual {p2}, Landroid/support/v7/widget/TintTypedArray;->recycle()V .line 365 - new-instance v1, Landroid/content/Intent; + new-instance p1, Landroid/content/Intent; - const-string v2, "android.speech.action.WEB_SEARCH" + const-string p2, "android.speech.action.WEB_SEARCH" - invoke-direct {v1, v2}, Landroid/content/Intent;->(Ljava/lang/String;)V - - iput-object v1, v0, Landroid/support/v7/widget/SearchView;->mVoiceWebSearchIntent:Landroid/content/Intent; + invoke-direct {p1, p2}, Landroid/content/Intent;->(Ljava/lang/String;)V - const/high16 v2, 0x10000000 + iput-object p1, p0, Landroid/support/v7/widget/SearchView;->mVoiceWebSearchIntent:Landroid/content/Intent; .line 366 - invoke-virtual {v1, v2}, Landroid/content/Intent;->addFlags(I)Landroid/content/Intent; + iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mVoiceWebSearchIntent:Landroid/content/Intent; - const-string v3, "android.speech.extra.LANGUAGE_MODEL" + const/high16 p2, 0x10000000 - const-string v4, "web_search" + invoke-virtual {p1, p2}, Landroid/content/Intent;->addFlags(I)Landroid/content/Intent; .line 367 - invoke-virtual {v1, v3, v4}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent; + iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mVoiceWebSearchIntent:Landroid/content/Intent; + + const-string p3, "android.speech.extra.LANGUAGE_MODEL" + + const-string v0, "web_search" + + invoke-virtual {p1, p3, v0}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent; .line 370 - new-instance v1, Landroid/content/Intent; + new-instance p1, Landroid/content/Intent; - const-string v3, "android.speech.action.RECOGNIZE_SPEECH" + const-string p3, "android.speech.action.RECOGNIZE_SPEECH" - invoke-direct {v1, v3}, Landroid/content/Intent;->(Ljava/lang/String;)V + invoke-direct {p1, p3}, Landroid/content/Intent;->(Ljava/lang/String;)V - iput-object v1, v0, Landroid/support/v7/widget/SearchView;->mVoiceAppSearchIntent:Landroid/content/Intent; + iput-object p1, p0, Landroid/support/v7/widget/SearchView;->mVoiceAppSearchIntent:Landroid/content/Intent; .line 371 - invoke-virtual {v1, v2}, Landroid/content/Intent;->addFlags(I)Landroid/content/Intent; + iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mVoiceAppSearchIntent:Landroid/content/Intent; + + invoke-virtual {p1, p2}, Landroid/content/Intent;->addFlags(I)Landroid/content/Intent; .line 373 - invoke-virtual {v7}, Landroid/support/v7/widget/SearchView$SearchAutoComplete;->getDropDownAnchor()I + iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mSearchSrcTextView:Landroid/support/v7/widget/SearchView$SearchAutoComplete; - move-result v1 + invoke-virtual {p1}, Landroid/support/v7/widget/SearchView$SearchAutoComplete;->getDropDownAnchor()I - invoke-virtual {v0, v1}, Landroid/support/v7/widget/SearchView;->findViewById(I)Landroid/view/View; + move-result p1 - move-result-object v1 + invoke-virtual {p0, p1}, Landroid/support/v7/widget/SearchView;->findViewById(I)Landroid/view/View; - iput-object v1, v0, Landroid/support/v7/widget/SearchView;->mDropDownAnchor:Landroid/view/View; + move-result-object p1 - if-eqz v1, :cond_3 + iput-object p1, p0, Landroid/support/v7/widget/SearchView;->mDropDownAnchor:Landroid/view/View; + + .line 374 + iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mDropDownAnchor:Landroid/view/View; + + if-eqz p1, :cond_3 .line 375 - new-instance v2, Landroid/support/v7/widget/SearchView$4; + new-instance p2, Landroid/support/v7/widget/SearchView$4; - invoke-direct {v2, v0}, Landroid/support/v7/widget/SearchView$4;->(Landroid/support/v7/widget/SearchView;)V + invoke-direct {p2, p0}, Landroid/support/v7/widget/SearchView$4;->(Landroid/support/v7/widget/SearchView;)V - invoke-virtual {v1, v2}, Landroid/view/View;->addOnLayoutChangeListener(Landroid/view/View$OnLayoutChangeListener;)V + invoke-virtual {p1, p2}, Landroid/view/View;->addOnLayoutChangeListener(Landroid/view/View$OnLayoutChangeListener;)V .line 384 :cond_3 - iget-boolean v1, v0, Landroid/support/v7/widget/SearchView;->mIconifiedByDefault:Z + iget-boolean p1, p0, Landroid/support/v7/widget/SearchView;->mIconifiedByDefault:Z - invoke-direct {v0, v1}, Landroid/support/v7/widget/SearchView;->updateViewsVisibility(Z)V + invoke-direct {p0, p1}, Landroid/support/v7/widget/SearchView;->updateViewsVisibility(Z)V .line 385 - invoke-direct/range {p0 .. p0}, Landroid/support/v7/widget/SearchView;->updateQueryHint()V + invoke-direct {p0}, Landroid/support/v7/widget/SearchView;->updateQueryHint()V return-void .end method @@ -1869,9 +1925,11 @@ iput-object v0, p0, Landroid/support/v7/widget/SearchView;->mSuggestionsAdapter:Landroid/support/v4/widget/CursorAdapter; .line 1138 - iget-object v1, p0, Landroid/support/v7/widget/SearchView;->mSearchSrcTextView:Landroid/support/v7/widget/SearchView$SearchAutoComplete; + iget-object v0, p0, Landroid/support/v7/widget/SearchView;->mSearchSrcTextView:Landroid/support/v7/widget/SearchView$SearchAutoComplete; + + iget-object v1, p0, Landroid/support/v7/widget/SearchView;->mSuggestionsAdapter:Landroid/support/v4/widget/CursorAdapter; - invoke-virtual {v1, v0}, Landroid/support/v7/widget/SearchView$SearchAutoComplete;->setAdapter(Landroid/widget/ListAdapter;)V + invoke-virtual {v0, v1}, Landroid/support/v7/widget/SearchView$SearchAutoComplete;->setAdapter(Landroid/widget/ListAdapter;)V .line 1139 iget-object v0, p0, Landroid/support/v7/widget/SearchView;->mSuggestionsAdapter:Landroid/support/v4/widget/CursorAdapter; @@ -1980,14 +2038,14 @@ .end method .method private updateViewsVisibility(Z)V - .locals 5 + .locals 6 .line 868 iput-boolean p1, p0, Landroid/support/v7/widget/SearchView;->mIconified:Z - const/4 v0, 0x0 + const/16 v0, 0x8 - const/16 v1, 0x8 + const/4 v1, 0x0 if-eqz p1, :cond_0 @@ -2010,12 +2068,14 @@ move-result v3 - xor-int/lit8 v3, v3, 0x1 + const/4 v4, 0x1 + + xor-int/2addr v3, v4 .line 874 - iget-object v4, p0, Landroid/support/v7/widget/SearchView;->mSearchButton:Landroid/widget/ImageView; + iget-object v5, p0, Landroid/support/v7/widget/SearchView;->mSearchButton:Landroid/widget/ImageView; - invoke-virtual {v4, v2}, Landroid/widget/ImageView;->setVisibility(I)V + invoke-virtual {v5, v2}, Landroid/widget/ImageView;->setVisibility(I)V .line 875 invoke-direct {p0, v3}, Landroid/support/v7/widget/SearchView;->updateSubmitButton(Z)V @@ -2042,17 +2102,20 @@ move-result-object p1 - if-eqz p1, :cond_2 + if-eqz p1, :cond_3 iget-boolean p1, p0, Landroid/support/v7/widget/SearchView;->mIconifiedByDefault:Z - if-eqz p1, :cond_3 + if-eqz p1, :cond_2 + + goto :goto_2 :cond_2 - const/16 v0, 0x8 + const/4 v0, 0x0 .line 884 :cond_3 + :goto_2 iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mCollapsedIcon:Landroid/widget/ImageView; invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setVisibility(I)V @@ -2060,10 +2123,13 @@ .line 886 invoke-direct {p0}, Landroid/support/v7/widget/SearchView;->updateCloseButton()V - xor-int/lit8 p1, v3, 0x1 + if-nez v3, :cond_4 + + const/4 v1, 0x1 .line 887 - invoke-direct {p0, p1}, Landroid/support/v7/widget/SearchView;->updateVoiceButton(Z)V + :cond_4 + invoke-direct {p0, v1}, Landroid/support/v7/widget/SearchView;->updateVoiceButton(Z)V .line 888 invoke-direct {p0}, Landroid/support/v7/widget/SearchView;->updateSubmitArea()V @@ -2096,13 +2162,16 @@ invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setVisibility(I)V - const/4 v1, 0x0 + goto :goto_0 - .line 1157 :cond_0 - iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mVoiceButton:Landroid/widget/ImageView; + const/16 p1, 0x8 + + .line 1157 + :goto_0 + iget-object v0, p0, Landroid/support/v7/widget/SearchView;->mVoiceButton:Landroid/widget/ImageView; - invoke-virtual {p1, v1}, Landroid/widget/ImageView;->setVisibility(I)V + invoke-virtual {v0, p1}, Landroid/widget/ImageView;->setVisibility(I)V return-void .end method @@ -2276,6 +2345,8 @@ invoke-virtual {v0, v1}, Landroid/support/v7/widget/SearchView$AutoCompleteTextViewReflector;->doBeforeTextChanged(Landroid/widget/AutoCompleteTextView;)V .line 1697 + sget-object v0, Landroid/support/v7/widget/SearchView;->HIDDEN_METHOD_INVOKER:Landroid/support/v7/widget/SearchView$AutoCompleteTextViewReflector; + iget-object v1, p0, Landroid/support/v7/widget/SearchView;->mSearchSrcTextView:Landroid/support/v7/widget/SearchView$SearchAutoComplete; invoke-virtual {v0, v1}, Landroid/support/v7/widget/SearchView$AutoCompleteTextViewReflector;->doAfterTextChanged(Landroid/widget/AutoCompleteTextView;)V @@ -2333,6 +2404,8 @@ .method public getQueryHint()Ljava/lang/CharSequence; .locals 2 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 618 iget-object v0, p0, Landroid/support/v7/widget/SearchView;->mQueryHint:Ljava/lang/CharSequence; @@ -2476,30 +2549,30 @@ .method public onActionViewCollapsed()V .locals 3 - const-string v0, "" + const/4 v0, 0x0 - const/4 v1, 0x0 + const-string v1, "" .line 1278 - invoke-virtual {p0, v0, v1}, Landroid/support/v7/widget/SearchView;->setQuery(Ljava/lang/CharSequence;Z)V + invoke-virtual {p0, v1, v0}, Landroid/support/v7/widget/SearchView;->setQuery(Ljava/lang/CharSequence;Z)V .line 1279 invoke-virtual {p0}, Landroid/support/v7/widget/SearchView;->clearFocus()V - const/4 v0, 0x1 + const/4 v1, 0x1 .line 1280 - invoke-direct {p0, v0}, Landroid/support/v7/widget/SearchView;->updateViewsVisibility(Z)V + invoke-direct {p0, v1}, Landroid/support/v7/widget/SearchView;->updateViewsVisibility(Z)V .line 1281 - iget-object v0, p0, Landroid/support/v7/widget/SearchView;->mSearchSrcTextView:Landroid/support/v7/widget/SearchView$SearchAutoComplete; + iget-object v1, p0, Landroid/support/v7/widget/SearchView;->mSearchSrcTextView:Landroid/support/v7/widget/SearchView$SearchAutoComplete; iget v2, p0, Landroid/support/v7/widget/SearchView;->mCollapsedImeOptions:I - invoke-virtual {v0, v2}, Landroid/support/v7/widget/SearchView$SearchAutoComplete;->setImeOptions(I)V + invoke-virtual {v1, v2}, Landroid/support/v7/widget/SearchView$SearchAutoComplete;->setImeOptions(I)V .line 1282 - iput-boolean v1, p0, Landroid/support/v7/widget/SearchView;->mExpandedInActionView:Z + iput-boolean v0, p0, Landroid/support/v7/widget/SearchView;->mExpandedInActionView:Z return-void .end method @@ -2530,13 +2603,15 @@ iput v0, p0, Landroid/support/v7/widget/SearchView;->mCollapsedImeOptions:I .line 1294 - iget-object v1, p0, Landroid/support/v7/widget/SearchView;->mSearchSrcTextView:Landroid/support/v7/widget/SearchView$SearchAutoComplete; + iget-object v0, p0, Landroid/support/v7/widget/SearchView;->mSearchSrcTextView:Landroid/support/v7/widget/SearchView$SearchAutoComplete; + + iget v1, p0, Landroid/support/v7/widget/SearchView;->mCollapsedImeOptions:I const/high16 v2, 0x2000000 - or-int/2addr v0, v2 + or-int/2addr v1, v2 - invoke-virtual {v1, v0}, Landroid/support/v7/widget/SearchView$SearchAutoComplete;->setImeOptions(I)V + invoke-virtual {v0, v1}, Landroid/support/v7/widget/SearchView$SearchAutoComplete;->setImeOptions(I)V .line 1295 iget-object v0, p0, Landroid/support/v7/widget/SearchView;->mSearchSrcTextView:Landroid/support/v7/widget/SearchView$SearchAutoComplete; @@ -2764,6 +2839,8 @@ iput-object p1, p0, Landroid/support/v7/widget/SearchView;->mTouchDelegate:Landroid/support/v7/widget/SearchView$UpdatableTouchDelegate; .line 842 + iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mTouchDelegate:Landroid/support/v7/widget/SearchView$UpdatableTouchDelegate; + invoke-virtual {p0, p1}, Landroid/support/v7/widget/SearchView;->setTouchDelegate(Landroid/view/TouchDelegate;)V goto :goto_0 @@ -3156,6 +3233,10 @@ invoke-virtual {p1}, Landroid/support/v7/widget/SearchView$SearchAutoComplete;->getListSelection()I + move-result p1 + + if-nez p1, :cond_7 + return v0 :cond_4 @@ -3242,15 +3323,23 @@ move-result v0 - xor-int/lit8 v0, v0, 0x1 + const/4 v1, 0x1 + + xor-int/2addr v0, v1 .line 1176 invoke-direct {p0, v0}, Landroid/support/v7/widget/SearchView;->updateSubmitButton(Z)V - xor-int/lit8 v0, v0, 0x1 + if-nez v0, :cond_0 + + goto :goto_0 + + :cond_0 + const/4 v1, 0x0 .line 1177 - invoke-direct {p0, v0}, Landroid/support/v7/widget/SearchView;->updateVoiceButton(Z)V + :goto_0 + invoke-direct {p0, v1}, Landroid/support/v7/widget/SearchView;->updateVoiceButton(Z)V .line 1178 invoke-direct {p0}, Landroid/support/v7/widget/SearchView;->updateCloseButton()V @@ -3261,7 +3350,7 @@ .line 1180 iget-object v0, p0, Landroid/support/v7/widget/SearchView;->mOnQueryChangeListener:Landroid/support/v7/widget/SearchView$OnQueryTextListener; - if-eqz v0, :cond_0 + if-eqz v0, :cond_1 iget-object v0, p0, Landroid/support/v7/widget/SearchView;->mOldQueryText:Ljava/lang/CharSequence; @@ -3269,7 +3358,7 @@ move-result v0 - if-nez v0, :cond_0 + if-nez v0, :cond_1 .line 1181 iget-object v0, p0, Landroid/support/v7/widget/SearchView;->mOnQueryChangeListener:Landroid/support/v7/widget/SearchView$OnQueryTextListener; @@ -3281,7 +3370,7 @@ invoke-interface {v0, v1}, Landroid/support/v7/widget/SearchView$OnQueryTextListener;->onQueryTextChange(Ljava/lang/String;)Z .line 1183 - :cond_0 + :cond_1 invoke-interface {p1}, Ljava/lang/CharSequence;->toString()Ljava/lang/String; move-result-object p1 @@ -3462,6 +3551,11 @@ .method public setAppSearchData(Landroid/os/Bundle;)V .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 428 iput-object p1, p0, Landroid/support/v7/widget/SearchView;->mAppSearchData:Landroid/os/Bundle; @@ -3630,6 +3724,10 @@ .method public setQueryHint(Ljava/lang/CharSequence;)V .locals 0 + .param p1 # Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 593 iput-object p1, p0, Landroid/support/v7/widget/SearchView;->mQueryHint:Ljava/lang/CharSequence; @@ -3678,6 +3776,9 @@ .line 405 iput-object p1, p0, Landroid/support/v7/widget/SearchView;->mSearchable:Landroid/app/SearchableInfo; + .line 406 + iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mSearchable:Landroid/app/SearchableInfo; + if-eqz p1, :cond_0 .line 407 @@ -3694,6 +3795,9 @@ iput-boolean p1, p0, Landroid/support/v7/widget/SearchView;->mVoiceButtonEnabled:Z + .line 413 + iget-boolean p1, p0, Landroid/support/v7/widget/SearchView;->mVoiceButtonEnabled:Z + if-eqz p1, :cond_1 .line 416 @@ -3737,9 +3841,11 @@ iput-object p1, p0, Landroid/support/v7/widget/SearchView;->mSuggestionsAdapter:Landroid/support/v4/widget/CursorAdapter; .line 746 - iget-object v0, p0, Landroid/support/v7/widget/SearchView;->mSearchSrcTextView:Landroid/support/v7/widget/SearchView$SearchAutoComplete; + iget-object p1, p0, Landroid/support/v7/widget/SearchView;->mSearchSrcTextView:Landroid/support/v7/widget/SearchView$SearchAutoComplete; + + iget-object v0, p0, Landroid/support/v7/widget/SearchView;->mSuggestionsAdapter:Landroid/support/v4/widget/CursorAdapter; - invoke-virtual {v0, p1}, Landroid/support/v7/widget/SearchView$SearchAutoComplete;->setAdapter(Landroid/widget/ListAdapter;)V + invoke-virtual {p1, v0}, Landroid/support/v7/widget/SearchView$SearchAutoComplete;->setAdapter(Landroid/widget/ListAdapter;)V return-void .end method diff --git a/smali/android/support/v7/widget/SuggestionsAdapter.smali b/smali/android/support/v7/widget/SuggestionsAdapter.smali index 4004e382..947f7c58 100644 --- a/smali/android/support/v7/widget/SuggestionsAdapter.smali +++ b/smali/android/support/v7/widget/SuggestionsAdapter.smali @@ -92,11 +92,11 @@ move-result v0 - const/4 v1, 0x0 + const/4 v1, 0x1 - const/4 v2, 0x1 + const/4 v2, 0x0 - invoke-direct {p0, p1, v0, v1, v2}, Landroid/support/v4/widget/ResourceCursorAdapter;->(Landroid/content/Context;ILandroid/database/Cursor;Z)V + invoke-direct {p0, p1, v0, v2, v1}, Landroid/support/v4/widget/ResourceCursorAdapter;->(Landroid/content/Context;ILandroid/database/Cursor;Z)V const/4 v0, 0x0 @@ -104,7 +104,7 @@ iput-boolean v0, p0, Landroid/support/v7/widget/SuggestionsAdapter;->mClosed:Z .line 75 - iput v2, p0, Landroid/support/v7/widget/SuggestionsAdapter;->mQueryRefinement:I + iput v1, p0, Landroid/support/v7/widget/SuggestionsAdapter;->mQueryRefinement:I const/4 v0, -0x1 @@ -1032,6 +1032,10 @@ .line 204 invoke-virtual {p1, v0}, Landroid/os/Bundle;->getBoolean(Ljava/lang/String;)Z + move-result p1 + + if-eqz p1, :cond_1 + :cond_1 return-void .end method @@ -1805,6 +1809,7 @@ const/4 p1, 0x1 + .line 766 new-array v0, p1, [Ljava/lang/String; const/4 p1, 0x0 diff --git a/smali/android/support/v7/widget/SwitchCompat.smali b/smali/android/support/v7/widget/SwitchCompat.smali index 1bca8728..a5a1b1fa 100644 --- a/smali/android/support/v7/widget/SwitchCompat.smali +++ b/smali/android/support/v7/widget/SwitchCompat.smali @@ -129,6 +129,7 @@ const/4 v0, 0x1 + .line 183 new-array v0, v0, [I const/4 v1, 0x0 @@ -137,7 +138,6 @@ aput v2, v0, v1 - .line 183 sput-object v0, Landroid/support/v7/widget/SwitchCompat;->CHECKED_STATE_SET:[I return-void @@ -225,16 +225,18 @@ .line 222 invoke-virtual {p0}, Landroid/support/v7/widget/SwitchCompat;->getResources()Landroid/content/res/Resources; - move-result-object v4 + move-result-object v2 .line 223 - invoke-virtual {v4}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics; + iget-object v4, p0, Landroid/support/v7/widget/SwitchCompat;->mTextPaint:Landroid/text/TextPaint; - move-result-object v4 + invoke-virtual {v2}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics; + + move-result-object v2 - iget v4, v4, Landroid/util/DisplayMetrics;->density:F + iget v2, v2, Landroid/util/DisplayMetrics;->density:F - iput v4, v2, Landroid/text/TextPaint;->density:F + iput v2, v4, Landroid/text/TextPaint;->density:F .line 225 sget-object v2, Landroid/support/v7/appcompat/R$styleable;->SwitchCompat:[I @@ -252,6 +254,9 @@ iput-object p3, p0, Landroid/support/v7/widget/SwitchCompat;->mThumbDrawable:Landroid/graphics/drawable/Drawable; + .line 228 + iget-object p3, p0, Landroid/support/v7/widget/SwitchCompat;->mThumbDrawable:Landroid/graphics/drawable/Drawable; + if-eqz p3, :cond_0 .line 229 @@ -267,6 +272,9 @@ iput-object p3, p0, Landroid/support/v7/widget/SwitchCompat;->mTrackDrawable:Landroid/graphics/drawable/Drawable; + .line 232 + iget-object p3, p0, Landroid/support/v7/widget/SwitchCompat;->mTrackDrawable:Landroid/graphics/drawable/Drawable; + if-eqz p3, :cond_1 .line 233 @@ -526,9 +534,11 @@ iput-object p1, p0, Landroid/support/v7/widget/SwitchCompat;->mPositionAnimator:Landroid/animation/ObjectAnimator; + .line 1026 + iget-object p1, p0, Landroid/support/v7/widget/SwitchCompat;->mPositionAnimator:Landroid/animation/ObjectAnimator; + const-wide/16 v2, 0xfa - .line 1026 invoke-virtual {p1, v2, v3}, Landroid/animation/ObjectAnimator;->setDuration(J)Landroid/animation/ObjectAnimator; .line 1027 @@ -560,16 +570,18 @@ if-eqz v0, :cond_3 - iget-boolean v1, p0, Landroid/support/v7/widget/SwitchCompat;->mHasThumbTint:Z + iget-boolean v0, p0, Landroid/support/v7/widget/SwitchCompat;->mHasThumbTint:Z - if-nez v1, :cond_0 + if-nez v0, :cond_0 - iget-boolean v1, p0, Landroid/support/v7/widget/SwitchCompat;->mHasThumbTintMode:Z + iget-boolean v0, p0, Landroid/support/v7/widget/SwitchCompat;->mHasThumbTintMode:Z - if-eqz v1, :cond_3 + if-eqz v0, :cond_3 .line 695 :cond_0 + iget-object v0, p0, Landroid/support/v7/widget/SwitchCompat;->mThumbDrawable:Landroid/graphics/drawable/Drawable; + invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->mutate()Landroid/graphics/drawable/Drawable; move-result-object v0 @@ -577,11 +589,13 @@ iput-object v0, p0, Landroid/support/v7/widget/SwitchCompat;->mThumbDrawable:Landroid/graphics/drawable/Drawable; .line 697 - iget-boolean v1, p0, Landroid/support/v7/widget/SwitchCompat;->mHasThumbTint:Z + iget-boolean v0, p0, Landroid/support/v7/widget/SwitchCompat;->mHasThumbTint:Z - if-eqz v1, :cond_1 + if-eqz v0, :cond_1 .line 698 + iget-object v0, p0, Landroid/support/v7/widget/SwitchCompat;->mThumbDrawable:Landroid/graphics/drawable/Drawable; + iget-object v1, p0, Landroid/support/v7/widget/SwitchCompat;->mThumbTintList:Landroid/content/res/ColorStateList; invoke-static {v0, v1}, Landroid/support/v4/graphics/drawable/DrawableCompat;->setTintList(Landroid/graphics/drawable/Drawable;Landroid/content/res/ColorStateList;)V @@ -630,16 +644,18 @@ if-eqz v0, :cond_3 - iget-boolean v1, p0, Landroid/support/v7/widget/SwitchCompat;->mHasTrackTint:Z + iget-boolean v0, p0, Landroid/support/v7/widget/SwitchCompat;->mHasTrackTint:Z - if-nez v1, :cond_0 + if-nez v0, :cond_0 - iget-boolean v1, p0, Landroid/support/v7/widget/SwitchCompat;->mHasTrackTintMode:Z + iget-boolean v0, p0, Landroid/support/v7/widget/SwitchCompat;->mHasTrackTintMode:Z - if-eqz v1, :cond_3 + if-eqz v0, :cond_3 .line 572 :cond_0 + iget-object v0, p0, Landroid/support/v7/widget/SwitchCompat;->mTrackDrawable:Landroid/graphics/drawable/Drawable; + invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->mutate()Landroid/graphics/drawable/Drawable; move-result-object v0 @@ -647,11 +663,13 @@ iput-object v0, p0, Landroid/support/v7/widget/SwitchCompat;->mTrackDrawable:Landroid/graphics/drawable/Drawable; .line 574 - iget-boolean v1, p0, Landroid/support/v7/widget/SwitchCompat;->mHasTrackTint:Z + iget-boolean v0, p0, Landroid/support/v7/widget/SwitchCompat;->mHasTrackTint:Z - if-eqz v1, :cond_1 + if-eqz v0, :cond_1 .line 575 + iget-object v0, p0, Landroid/support/v7/widget/SwitchCompat;->mTrackDrawable:Landroid/graphics/drawable/Drawable; + iget-object v1, p0, Landroid/support/v7/widget/SwitchCompat;->mTrackTintList:Landroid/content/res/ColorStateList; invoke-static {v0, v1}, Landroid/support/v4/graphics/drawable/DrawableCompat;->setTintList(Landroid/graphics/drawable/Drawable;Landroid/content/res/ColorStateList;)V @@ -1167,28 +1185,31 @@ :cond_2 const/4 v2, 0x0 - goto :goto_1 + :goto_1 + move v1, v2 + + goto :goto_2 .line 1009 :cond_3 invoke-direct {p0}, Landroid/support/v7/widget/SwitchCompat;->getTargetCheckedState()Z - move-result v2 + move-result v1 - goto :goto_1 + goto :goto_2 :cond_4 - move v2, v3 + move v1, v3 - :goto_1 - if-eq v2, v3, :cond_5 + :goto_2 + if-eq v1, v3, :cond_5 .line 1016 invoke-virtual {p0, v0}, Landroid/support/v7/widget/SwitchCompat;->playSoundEffect(I)V .line 1019 :cond_5 - invoke-virtual {p0, v2}, Landroid/support/v7/widget/SwitchCompat;->setChecked(Z)V + invoke-virtual {p0, v1}, Landroid/support/v7/widget/SwitchCompat;->setChecked(Z)V .line 1020 invoke-direct {p0, p1}, Landroid/support/v7/widget/SwitchCompat;->cancelSuperTouch(Landroid/view/MotionEvent;)V @@ -1651,6 +1672,8 @@ .method public getThumbTintList()Landroid/content/res/ColorStateList; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 661 iget-object v0, p0, Landroid/support/v7/widget/SwitchCompat;->mThumbTintList:Landroid/content/res/ColorStateList; @@ -1660,6 +1683,8 @@ .method public getThumbTintMode()Landroid/graphics/PorterDuff$Mode; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 690 iget-object v0, p0, Landroid/support/v7/widget/SwitchCompat;->mThumbTintMode:Landroid/graphics/PorterDuff$Mode; @@ -1678,6 +1703,8 @@ .method public getTrackTintList()Landroid/content/res/ColorStateList; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 539 iget-object v0, p0, Landroid/support/v7/widget/SwitchCompat;->mTrackTintList:Landroid/content/res/ColorStateList; @@ -1687,6 +1714,8 @@ .method public getTrackTintMode()Landroid/graphics/PorterDuff$Mode; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 567 iget-object v0, p0, Landroid/support/v7/widget/SwitchCompat;->mTrackTintMode:Landroid/graphics/PorterDuff$Mode; @@ -2215,7 +2244,10 @@ .line 1110 iget p4, p0, Landroid/support/v7/widget/SwitchCompat;->mSwitchHeight:I - goto :goto_3 + :goto_3 + add-int/2addr p4, p2 + + goto :goto_4 .line 1120 :cond_3 @@ -2262,8 +2294,7 @@ sub-int/2addr p2, p5 - :goto_3 - add-int/2addr p4, p2 + goto :goto_3 .line 1125 :goto_4 @@ -2570,6 +2601,8 @@ :cond_0 iget v0, p0, Landroid/support/v7/widget/SwitchCompat;->mTouchMode:I + if-eqz v0, :cond_b + if-eq v0, v1, :cond_6 if-eq v0, v2, :cond_1 @@ -3263,6 +3296,10 @@ .method public setThumbTintList(Landroid/content/res/ColorStateList;)V .locals 0 + .param p1 # Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 648 iput-object p1, p0, Landroid/support/v7/widget/SwitchCompat;->mThumbTintList:Landroid/content/res/ColorStateList; @@ -3280,6 +3317,10 @@ .method public setThumbTintMode(Landroid/graphics/PorterDuff$Mode;)V .locals 0 + .param p1 # Landroid/graphics/PorterDuff$Mode; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 676 iput-object p1, p0, Landroid/support/v7/widget/SwitchCompat;->mThumbTintMode:Landroid/graphics/PorterDuff$Mode; @@ -3343,6 +3384,10 @@ .method public setTrackTintList(Landroid/content/res/ColorStateList;)V .locals 0 + .param p1 # Landroid/content/res/ColorStateList; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 526 iput-object p1, p0, Landroid/support/v7/widget/SwitchCompat;->mTrackTintList:Landroid/content/res/ColorStateList; @@ -3360,6 +3405,10 @@ .method public setTrackTintMode(Landroid/graphics/PorterDuff$Mode;)V .locals 0 + .param p1 # Landroid/graphics/PorterDuff$Mode; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 553 iput-object p1, p0, Landroid/support/v7/widget/SwitchCompat;->mTrackTintMode:Landroid/graphics/PorterDuff$Mode; diff --git a/smali/android/support/v7/widget/ThemeUtils.smali b/smali/android/support/v7/widget/ThemeUtils.smali index 80c4d979..6755b7c3 100644 --- a/smali/android/support/v7/widget/ThemeUtils.smali +++ b/smali/android/support/v7/widget/ThemeUtils.smali @@ -46,79 +46,79 @@ const/4 v0, 0x1 + .line 30 new-array v1, v0, [I - const v2, -0x101009e + const/4 v2, 0x0 - const/4 v3, 0x0 + const v3, -0x101009e - aput v2, v1, v3 + aput v3, v1, v2 - .line 30 sput-object v1, Landroid/support/v7/widget/ThemeUtils;->DISABLED_STATE_SET:[I + .line 31 new-array v1, v0, [I - const v2, 0x101009c + const v3, 0x101009c - aput v2, v1, v3 + aput v3, v1, v2 - .line 31 sput-object v1, Landroid/support/v7/widget/ThemeUtils;->FOCUSED_STATE_SET:[I + .line 32 new-array v1, v0, [I - const v2, 0x10102fe + const v3, 0x10102fe - aput v2, v1, v3 + aput v3, v1, v2 - .line 32 sput-object v1, Landroid/support/v7/widget/ThemeUtils;->ACTIVATED_STATE_SET:[I + .line 33 new-array v1, v0, [I - const v2, 0x10100a7 + const v3, 0x10100a7 - aput v2, v1, v3 + aput v3, v1, v2 - .line 33 sput-object v1, Landroid/support/v7/widget/ThemeUtils;->PRESSED_STATE_SET:[I + .line 34 new-array v1, v0, [I - const v2, 0x10100a0 + const v3, 0x10100a0 - aput v2, v1, v3 + aput v3, v1, v2 - .line 34 sput-object v1, Landroid/support/v7/widget/ThemeUtils;->CHECKED_STATE_SET:[I + .line 35 new-array v1, v0, [I - const v2, 0x10100a1 + const v3, 0x10100a1 - aput v2, v1, v3 + aput v3, v1, v2 - .line 35 sput-object v1, Landroid/support/v7/widget/ThemeUtils;->SELECTED_STATE_SET:[I const/4 v1, 0x2 + .line 36 new-array v1, v1, [I - .line 36 fill-array-data v1, :array_0 sput-object v1, Landroid/support/v7/widget/ThemeUtils;->NOT_PRESSED_OR_FOCUSED_STATE_SET:[I - new-array v1, v3, [I - .line 38 + new-array v1, v2, [I + sput-object v1, Landroid/support/v7/widget/ThemeUtils;->EMPTY_STATE_SET:[I + .line 40 new-array v0, v0, [I - .line 40 sput-object v0, Landroid/support/v7/widget/ThemeUtils;->TEMP_ARRAY:[I return-void @@ -144,8 +144,10 @@ const/4 v0, 0x2 + .line 45 new-array v1, v0, [[I + .line 46 new-array v0, v0, [I .line 50 @@ -347,20 +349,22 @@ invoke-virtual {v0}, Ljava/lang/ThreadLocal;->get()Ljava/lang/Object; - move-result-object v1 + move-result-object v0 - check-cast v1, Landroid/util/TypedValue; + check-cast v0, Landroid/util/TypedValue; - if-nez v1, :cond_0 + if-nez v0, :cond_0 .line 102 - new-instance v1, Landroid/util/TypedValue; + new-instance v0, Landroid/util/TypedValue; - invoke-direct {v1}, Landroid/util/TypedValue;->()V + invoke-direct {v0}, Landroid/util/TypedValue;->()V .line 103 - invoke-virtual {v0, v1}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V + sget-object v1, Landroid/support/v7/widget/ThemeUtils;->TL_TYPED_VALUE:Ljava/lang/ThreadLocal; + + invoke-virtual {v1, v0}, Ljava/lang/ThreadLocal;->set(Ljava/lang/Object;)V :cond_0 - return-object v1 + return-object v0 .end method diff --git a/smali/android/support/v7/widget/ThemedSpinnerAdapter$Helper.smali b/smali/android/support/v7/widget/ThemedSpinnerAdapter$Helper.smali index 1c596246..569481bc 100644 --- a/smali/android/support/v7/widget/ThemedSpinnerAdapter$Helper.smali +++ b/smali/android/support/v7/widget/ThemedSpinnerAdapter$Helper.smali @@ -25,6 +25,10 @@ # direct methods .method public constructor (Landroid/content/Context;)V .locals 0 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 111 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -46,6 +50,8 @@ # virtual methods .method public getDropDownViewInflater()Landroid/view/LayoutInflater; .locals 1 + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 152 iget-object v0, p0, Landroid/support/v7/widget/ThemedSpinnerAdapter$Helper;->mDropDownInflater:Landroid/view/LayoutInflater; @@ -63,6 +69,8 @@ .method public getDropDownViewTheme()Landroid/content/res/Resources$Theme; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 140 iget-object v0, p0, Landroid/support/v7/widget/ThemedSpinnerAdapter$Helper;->mDropDownInflater:Landroid/view/LayoutInflater; @@ -88,6 +96,10 @@ .method public setDropDownViewTheme(Landroid/content/res/Resources$Theme;)V .locals 2 + .param p1 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param if-nez p1, :cond_0 diff --git a/smali/android/support/v7/widget/ThemedSpinnerAdapter.smali b/smali/android/support/v7/widget/ThemedSpinnerAdapter.smali index 6170a3d4..376f53e3 100644 --- a/smali/android/support/v7/widget/ThemedSpinnerAdapter.smali +++ b/smali/android/support/v7/widget/ThemedSpinnerAdapter.smali @@ -16,7 +16,13 @@ # virtual methods .method public abstract getDropDownViewTheme()Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method .method public abstract setDropDownViewTheme(Landroid/content/res/Resources$Theme;)V + .param p1 # Landroid/content/res/Resources$Theme; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .end method diff --git a/smali/android/support/v7/widget/TintContextWrapper.smali b/smali/android/support/v7/widget/TintContextWrapper.smali index e1e33772..6253fee6 100644 --- a/smali/android/support/v7/widget/TintContextWrapper.smali +++ b/smali/android/support/v7/widget/TintContextWrapper.smali @@ -3,6 +3,14 @@ .source "TintContextWrapper.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field private static final CACHE_LOCK:Ljava/lang/Object; @@ -40,6 +48,10 @@ .method private constructor (Landroid/content/Context;)V .locals 2 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 92 invoke-direct {p0, p1}, Landroid/content/ContextWrapper;->(Landroid/content/Context;)V @@ -63,6 +75,8 @@ iput-object v0, p0, Landroid/support/v7/widget/TintContextWrapper;->mResources:Landroid/content/res/Resources; .line 98 + iget-object v0, p0, Landroid/support/v7/widget/TintContextWrapper;->mResources:Landroid/content/res/Resources; + invoke-virtual {v0}, Landroid/content/res/Resources;->newTheme()Landroid/content/res/Resources$Theme; move-result-object v0 @@ -70,6 +84,8 @@ iput-object v0, p0, Landroid/support/v7/widget/TintContextWrapper;->mTheme:Landroid/content/res/Resources$Theme; .line 99 + iget-object v0, p0, Landroid/support/v7/widget/TintContextWrapper;->mTheme:Landroid/content/res/Resources$Theme; + invoke-virtual {p1}, Landroid/content/Context;->getTheme()Landroid/content/res/Resources$Theme; move-result-object p1 @@ -101,6 +117,10 @@ .method private static shouldWrap(Landroid/content/Context;)Z .locals 2 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 78 instance-of v0, p0, Landroid/support/v7/widget/TintContextWrapper; @@ -153,6 +173,10 @@ .method public static wrap(Landroid/content/Context;)Landroid/content/Context; .locals 4 + .param p0 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 46 invoke-static {p0}, Landroid/support/v7/widget/TintContextWrapper;->shouldWrap(Landroid/content/Context;)Z @@ -183,6 +207,8 @@ .line 52 :cond_0 + sget-object v1, Landroid/support/v7/widget/TintContextWrapper;->sCache:Ljava/util/ArrayList; + invoke-virtual {v1}, Ljava/util/ArrayList;->size()I move-result v1 diff --git a/smali/android/support/v7/widget/TintResources.smali b/smali/android/support/v7/widget/TintResources.smali index 3a2621df..8767b7c8 100644 --- a/smali/android/support/v7/widget/TintResources.smali +++ b/smali/android/support/v7/widget/TintResources.smali @@ -18,6 +18,14 @@ # direct methods .method public constructor (Landroid/content/Context;Landroid/content/res/Resources;)V .locals 0 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 35 invoke-direct {p0, p2}, Landroid/support/v7/widget/ResourcesWrapper;->(Landroid/content/res/Resources;)V diff --git a/smali/android/support/v7/widget/TintTypedArray.smali b/smali/android/support/v7/widget/TintTypedArray.smali index 4067c1d5..e7d7b25b 100644 --- a/smali/android/support/v7/widget/TintTypedArray.smali +++ b/smali/android/support/v7/widget/TintTypedArray.smali @@ -3,6 +3,14 @@ .source "TintTypedArray.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # instance fields .field private final mContext:Landroid/content/Context; @@ -90,6 +98,9 @@ .method public getChangingConfigurations()I .locals 1 + .annotation build Landroid/support/annotation/RequiresApi; + value = 0x15 + .end annotation .line 250 iget-object v0, p0, Landroid/support/v7/widget/TintTypedArray;->mWrapped:Landroid/content/res/TypedArray; @@ -301,6 +312,16 @@ .method public getFont(IILandroid/support/v4/content/res/ResourcesCompat$FontCallback;)Landroid/graphics/Typeface; .locals 2 + .param p1 # I + .annotation build Landroid/support/annotation/StyleableRes; + .end annotation + .end param + .param p3 # Landroid/support/v4/content/res/ResourcesCompat$FontCallback; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 112 iget-object v0, p0, Landroid/support/v7/widget/TintTypedArray;->mWrapped:Landroid/content/res/TypedArray; diff --git a/smali/android/support/v7/widget/Toolbar$ExpandedActionViewMenuPresenter.smali b/smali/android/support/v7/widget/Toolbar$ExpandedActionViewMenuPresenter.smali index 3ff80ce6..1a2ccab1 100644 --- a/smali/android/support/v7/widget/Toolbar$ExpandedActionViewMenuPresenter.smali +++ b/smali/android/support/v7/widget/Toolbar$ExpandedActionViewMenuPresenter.smali @@ -83,8 +83,6 @@ iput-object v0, p1, Landroid/support/v7/widget/Toolbar;->mExpandedActionView:Landroid/view/View; .line 2415 - iget-object p1, p0, Landroid/support/v7/widget/Toolbar$ExpandedActionViewMenuPresenter;->this$0:Landroid/support/v7/widget/Toolbar; - invoke-virtual {p1}, Landroid/support/v7/widget/Toolbar;->addChildrenForExpandedActionView()V .line 2416 diff --git a/smali/android/support/v7/widget/Toolbar$LayoutParams.smali b/smali/android/support/v7/widget/Toolbar$LayoutParams.smali index 4019bc7d..d84f5fac 100644 --- a/smali/android/support/v7/widget/Toolbar$LayoutParams.smali +++ b/smali/android/support/v7/widget/Toolbar$LayoutParams.smali @@ -78,6 +78,10 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V .locals 0 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 2216 invoke-direct {p0, p1, p2}, Landroid/support/v7/app/ActionBar$LayoutParams;->(Landroid/content/Context;Landroid/util/AttributeSet;)V diff --git a/smali/android/support/v7/widget/Toolbar.smali b/smali/android/support/v7/widget/Toolbar.smali index 207f60d0..3129fff8 100644 --- a/smali/android/support/v7/widget/Toolbar.smali +++ b/smali/android/support/v7/widget/Toolbar.smali @@ -132,6 +132,10 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V .locals 1 + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 229 sget v0, Landroid/support/v7/appcompat/R$attr;->toolbarStyle:I @@ -143,6 +147,10 @@ .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;I)V .locals 6 + .param p2 # Landroid/util/AttributeSet; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 233 invoke-direct {p0, p1, p2, p3}, Landroid/view/ViewGroup;->(Landroid/content/Context;Landroid/util/AttributeSet;I)V @@ -168,9 +176,9 @@ const/4 p1, 0x2 + .line 195 new-array p1, p1, [I - .line 195 iput-object p1, p0, Landroid/support/v7/widget/Toolbar;->mTempMargins:[I .line 199 @@ -910,6 +918,8 @@ iput-object v0, p0, Landroid/support/v7/widget/Toolbar;->mMenuView:Landroid/support/v7/widget/ActionMenuView; .line 1048 + iget-object v0, p0, Landroid/support/v7/widget/Toolbar;->mMenuView:Landroid/support/v7/widget/ActionMenuView; + iget v1, p0, Landroid/support/v7/widget/Toolbar;->mPopupTheme:I invoke-virtual {v0, v1}, Landroid/support/v7/widget/ActionMenuView;->setPopupTheme(I)V @@ -1303,15 +1313,19 @@ move-result v2 - const/4 v3, 0x0 + move v4, p2 + + move v3, v1 - const/4 v4, 0x0 + const/4 p2, 0x0 + + const/4 v1, 0x0 :goto_0 - if-ge v3, v2, :cond_0 + if-ge p2, v2, :cond_0 .line 1928 - invoke-interface {p1, v3}, Ljava/util/List;->get(I)Ljava/lang/Object; + invoke-interface {p1, p2}, Ljava/util/List;->get(I)Ljava/lang/Object; move-result-object v5 @@ -1327,20 +1341,20 @@ .line 1930 iget v7, v6, Landroid/support/v7/widget/Toolbar$LayoutParams;->leftMargin:I - sub-int/2addr v7, v1 + sub-int/2addr v7, v3 .line 1931 - iget v1, v6, Landroid/support/v7/widget/Toolbar$LayoutParams;->rightMargin:I + iget v3, v6, Landroid/support/v7/widget/Toolbar$LayoutParams;->rightMargin:I - sub-int/2addr v1, p2 + sub-int/2addr v3, v4 .line 1932 invoke-static {v0, v7}, Ljava/lang/Math;->max(II)I - move-result p2 + move-result v4 .line 1933 - invoke-static {v0, v1}, Ljava/lang/Math;->max(II)I + invoke-static {v0, v3}, Ljava/lang/Math;->max(II)I move-result v6 @@ -1351,34 +1365,34 @@ move-result v7 - neg-int v1, v1 + neg-int v3, v3 .line 1935 - invoke-static {v0, v1}, Ljava/lang/Math;->max(II)I + invoke-static {v0, v3}, Ljava/lang/Math;->max(II)I - move-result v1 + move-result v3 .line 1936 invoke-virtual {v5}, Landroid/view/View;->getMeasuredWidth()I move-result v5 - add-int/2addr p2, v5 + add-int/2addr v4, v5 - add-int/2addr p2, v6 + add-int/2addr v4, v6 - add-int/2addr v4, p2 + add-int/2addr v1, v4 - add-int/lit8 v3, v3, 0x1 + add-int/lit8 p2, p2, 0x1 - move p2, v1 + move v4, v3 - move v1, v7 + move v3, v7 goto :goto_0 :cond_0 - return v4 + return v1 .end method .method private isChildOrHidden(Landroid/view/View;)Z @@ -1946,6 +1960,11 @@ .method public canShowOverflowMenu()Z .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 507 invoke-virtual {p0}, Landroid/support/v7/widget/Toolbar;->getVisibility()I @@ -2064,6 +2083,8 @@ iput-object v0, p0, Landroid/support/v7/widget/Toolbar;->mCollapseButtonView:Landroid/widget/ImageButton; .line 1374 + iget-object v0, p0, Landroid/support/v7/widget/Toolbar;->mCollapseButtonView:Landroid/widget/ImageButton; + iget-object v1, p0, Landroid/support/v7/widget/Toolbar;->mCollapseIcon:Landroid/graphics/drawable/Drawable; invoke-virtual {v0, v1}, Landroid/widget/ImageButton;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V @@ -2577,6 +2598,8 @@ .method public getNavigationContentDescription()Ljava/lang/CharSequence; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 889 iget-object v0, p0, Landroid/support/v7/widget/Toolbar;->mNavButtonView:Landroid/widget/ImageButton; @@ -2598,6 +2621,8 @@ .method public getNavigationIcon()Landroid/graphics/drawable/Drawable; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 981 iget-object v0, p0, Landroid/support/v7/widget/Toolbar;->mNavButtonView:Landroid/widget/ImageButton; @@ -2628,6 +2653,8 @@ .method public getOverflowIcon()Landroid/graphics/drawable/Drawable; .locals 1 + .annotation build Landroid/support/annotation/Nullable; + .end annotation .line 1028 invoke-direct {p0}, Landroid/support/v7/widget/Toolbar;->ensureMenu()V @@ -2716,6 +2743,11 @@ .method public getWrapper()Landroid/support/v7/widget/DecorToolbar; .locals 2 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 2111 iget-object v0, p0, Landroid/support/v7/widget/Toolbar;->mWrapper:Landroid/support/v7/widget/ToolbarWidgetWrapper; @@ -2788,6 +2820,10 @@ .method public inflateMenu(I)V .locals 2 + .param p1 # I + .annotation build Landroid/support/annotation/MenuRes; + .end annotation + .end param .line 1071 invoke-direct {p0}, Landroid/support/v7/widget/Toolbar;->getMenuInflater()Landroid/view/MenuInflater; @@ -2805,6 +2841,11 @@ .method public isOverflowMenuShowPending()Z .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 523 iget-object v0, p0, Landroid/support/v7/widget/Toolbar;->mMenuView:Landroid/support/v7/widget/ActionMenuView; @@ -2855,6 +2896,11 @@ .method public isTitleTruncated()Z .locals 5 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 593 iget-object v0, p0, Landroid/support/v7/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView; @@ -2975,7 +3021,7 @@ .end method .method protected onLayout(ZIIII)V - .locals 19 + .locals 18 move-object/from16 v0, p0 @@ -3353,44 +3399,43 @@ move/from16 v16, v4 :goto_9 - if-nez v13, :cond_10 + if-nez v13, :cond_f if-eqz v14, :cond_e goto :goto_b :cond_e - move/from16 v18, v6 + move/from16 v17, v6 move/from16 p3, v12 - :cond_f :goto_a - const/4 v1, 0x0 + const/4 v7, 0x0 goto/16 :goto_17 - :cond_10 + :cond_f :goto_b - if-eqz v13, :cond_11 + if-eqz v13, :cond_10 .line 1793 iget-object v4, v0, Landroid/support/v7/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView; goto :goto_c - :cond_11 + :cond_10 iget-object v4, v0, Landroid/support/v7/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView; :goto_c - if-eqz v14, :cond_12 + if-eqz v14, :cond_11 .line 1794 iget-object v7, v0, Landroid/support/v7/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView; goto :goto_d - :cond_12 + :cond_11 iget-object v7, v0, Landroid/support/v7/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView; .line 1795 @@ -3408,7 +3453,7 @@ check-cast v7, Landroid/support/v7/widget/Toolbar$LayoutParams; - if-eqz v13, :cond_13 + if-eqz v13, :cond_12 .line 1797 iget-object v15, v0, Landroid/support/v7/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView; @@ -3417,10 +3462,10 @@ move-result v15 - if-gtz v15, :cond_14 + if-gtz v15, :cond_13 - :cond_13 - if-eqz v14, :cond_15 + :cond_12 + if-eqz v14, :cond_14 iget-object v15, v0, Landroid/support/v7/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView; @@ -3429,31 +3474,35 @@ move-result v15 - if-lez v15, :cond_15 + if-lez v15, :cond_14 - :cond_14 - const/16 v17, 0x1 + :cond_13 + move/from16 v17, v6 + + const/4 v15, 0x1 goto :goto_e - :cond_15 - const/16 v17, 0x0 + :cond_14 + move/from16 v17, v6 + + const/4 v15, 0x0 .line 1800 :goto_e - iget v15, v0, Landroid/support/v7/widget/Toolbar;->mGravity:I + iget v6, v0, Landroid/support/v7/widget/Toolbar;->mGravity:I - and-int/lit8 v15, v15, 0x70 + and-int/lit8 v6, v6, 0x70 - move/from16 v18, v6 + move/from16 p3, v12 - const/16 v6, 0x30 + const/16 v12, 0x30 - if-eq v15, v6, :cond_19 + if-eq v6, v12, :cond_18 - const/16 v6, 0x50 + const/16 v12, 0x50 - if-eq v15, v6, :cond_18 + if-eq v6, v12, :cond_17 sub-int v6, v5, v8 @@ -3465,26 +3514,26 @@ div-int/lit8 v6, v6, 0x2 .line 1808 - iget v15, v4, Landroid/support/v7/widget/Toolbar$LayoutParams;->topMargin:I + iget v12, v4, Landroid/support/v7/widget/Toolbar$LayoutParams;->topMargin:I - move/from16 p3, v12 + move/from16 p5, v2 - iget v12, v0, Landroid/support/v7/widget/Toolbar;->mTitleMarginTop:I + iget v2, v0, Landroid/support/v7/widget/Toolbar;->mTitleMarginTop:I - add-int/2addr v15, v12 + add-int/2addr v12, v2 - if-ge v6, v15, :cond_16 + if-ge v6, v12, :cond_15 .line 1809 - iget v3, v4, Landroid/support/v7/widget/Toolbar$LayoutParams;->topMargin:I + iget v2, v4, Landroid/support/v7/widget/Toolbar$LayoutParams;->topMargin:I - iget v4, v0, Landroid/support/v7/widget/Toolbar;->mTitleMarginTop:I + iget v3, v0, Landroid/support/v7/widget/Toolbar;->mTitleMarginTop:I - add-int v6, v3, v4 + add-int v6, v2, v3 goto :goto_f - :cond_16 + :cond_15 sub-int/2addr v5, v9 sub-int/2addr v5, v3 @@ -3494,110 +3543,112 @@ sub-int/2addr v5, v8 .line 1813 - iget v3, v4, Landroid/support/v7/widget/Toolbar$LayoutParams;->bottomMargin:I + iget v2, v4, Landroid/support/v7/widget/Toolbar$LayoutParams;->bottomMargin:I - iget v4, v0, Landroid/support/v7/widget/Toolbar;->mTitleMarginBottom:I + iget v3, v0, Landroid/support/v7/widget/Toolbar;->mTitleMarginBottom:I - add-int/2addr v3, v4 + add-int/2addr v2, v3 - if-ge v5, v3, :cond_17 + if-ge v5, v2, :cond_16 .line 1814 - iget v3, v7, Landroid/support/v7/widget/Toolbar$LayoutParams;->bottomMargin:I + iget v2, v7, Landroid/support/v7/widget/Toolbar$LayoutParams;->bottomMargin:I - iget v4, v0, Landroid/support/v7/widget/Toolbar;->mTitleMarginBottom:I + iget v3, v0, Landroid/support/v7/widget/Toolbar;->mTitleMarginBottom:I - add-int/2addr v3, v4 + add-int/2addr v2, v3 - sub-int/2addr v3, v5 + sub-int/2addr v2, v5 - sub-int/2addr v6, v3 + sub-int/2addr v6, v2 - const/4 v3, 0x0 + const/4 v2, 0x0 - invoke-static {v3, v6}, Ljava/lang/Math;->max(II)I + invoke-static {v2, v6}, Ljava/lang/Math;->max(II)I move-result v6 - :cond_17 + :cond_16 :goto_f add-int/2addr v8, v6 goto :goto_10 - :cond_18 - move/from16 p3, v12 + :cond_17 + move/from16 p5, v2 sub-int/2addr v5, v9 .line 1821 - iget v4, v7, Landroid/support/v7/widget/Toolbar$LayoutParams;->bottomMargin:I + iget v2, v7, Landroid/support/v7/widget/Toolbar$LayoutParams;->bottomMargin:I - sub-int/2addr v5, v4 + sub-int/2addr v5, v2 - iget v4, v0, Landroid/support/v7/widget/Toolbar;->mTitleMarginBottom:I + iget v2, v0, Landroid/support/v7/widget/Toolbar;->mTitleMarginBottom:I - sub-int/2addr v5, v4 + sub-int/2addr v5, v2 sub-int v8, v5, v3 goto :goto_10 - :cond_19 - move/from16 p3, v12 + :cond_18 + move/from16 p5, v2 .line 1802 invoke-virtual/range {p0 .. p0}, Landroid/support/v7/widget/Toolbar;->getPaddingTop()I - move-result v3 + move-result v2 - iget v4, v4, Landroid/support/v7/widget/Toolbar$LayoutParams;->topMargin:I + iget v3, v4, Landroid/support/v7/widget/Toolbar$LayoutParams;->topMargin:I - add-int/2addr v3, v4 + add-int/2addr v2, v3 - iget v4, v0, Landroid/support/v7/widget/Toolbar;->mTitleMarginTop:I + iget v3, v0, Landroid/support/v7/widget/Toolbar;->mTitleMarginTop:I - add-int v8, v3, v4 + add-int v8, v2, v3 :goto_10 if-eqz v1, :cond_1d - if-eqz v17, :cond_1a + if-eqz v15, :cond_19 .line 1826 - iget v1, v0, Landroid/support/v7/widget/Toolbar;->mTitleMarginStart:I + iget v3, v0, Landroid/support/v7/widget/Toolbar;->mTitleMarginStart:I + + const/4 v1, 0x1 goto :goto_11 - :cond_1a - const/4 v1, 0x0 + :cond_19 + const/4 v1, 0x1 - :goto_11 - const/4 v3, 0x1 + const/4 v3, 0x0 - aget v4, v11, v3 + :goto_11 + aget v2, v11, v1 - sub-int/2addr v1, v4 + sub-int/2addr v3, v2 - const/4 v4, 0x0 + const/4 v2, 0x0 .line 1827 - invoke-static {v4, v1}, Ljava/lang/Math;->max(II)I + invoke-static {v2, v3}, Ljava/lang/Math;->max(II)I - move-result v5 + move-result v4 - sub-int/2addr v10, v5 + sub-int/2addr v10, v4 - neg-int v1, v1 + neg-int v3, v3 .line 1828 - invoke-static {v4, v1}, Ljava/lang/Math;->max(II)I + invoke-static {v2, v3}, Ljava/lang/Math;->max(II)I - move-result v1 + move-result v3 - aput v1, v11, v3 + aput v3, v11, v1 - if-eqz v13, :cond_1b + if-eqz v13, :cond_1a .line 1833 iget-object v1, v0, Landroid/support/v7/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView; @@ -3609,45 +3660,45 @@ check-cast v1, Landroid/support/v7/widget/Toolbar$LayoutParams; .line 1834 - iget-object v3, v0, Landroid/support/v7/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView; + iget-object v2, v0, Landroid/support/v7/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView; - invoke-virtual {v3}, Landroid/widget/TextView;->getMeasuredWidth()I + invoke-virtual {v2}, Landroid/widget/TextView;->getMeasuredWidth()I - move-result v3 + move-result v2 - sub-int v3, v10, v3 + sub-int v2, v10, v2 .line 1835 - iget-object v4, v0, Landroid/support/v7/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView; + iget-object v3, v0, Landroid/support/v7/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView; - invoke-virtual {v4}, Landroid/widget/TextView;->getMeasuredHeight()I + invoke-virtual {v3}, Landroid/widget/TextView;->getMeasuredHeight()I - move-result v4 + move-result v3 - add-int/2addr v4, v8 + add-int/2addr v3, v8 .line 1836 - iget-object v5, v0, Landroid/support/v7/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView; + iget-object v4, v0, Landroid/support/v7/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView; - invoke-virtual {v5, v3, v8, v10, v4}, Landroid/widget/TextView;->layout(IIII)V + invoke-virtual {v4, v2, v8, v10, v3}, Landroid/widget/TextView;->layout(IIII)V .line 1837 - iget v5, v0, Landroid/support/v7/widget/Toolbar;->mTitleMarginEnd:I + iget v4, v0, Landroid/support/v7/widget/Toolbar;->mTitleMarginEnd:I - sub-int/2addr v3, v5 + sub-int/2addr v2, v4 .line 1838 iget v1, v1, Landroid/support/v7/widget/Toolbar$LayoutParams;->bottomMargin:I - add-int v8, v4, v1 + add-int v8, v3, v1 goto :goto_12 - :cond_1b - move v3, v10 + :cond_1a + move v2, v10 :goto_12 - if-eqz v14, :cond_1c + if-eqz v14, :cond_1b .line 1841 iget-object v1, v0, Landroid/support/v7/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView; @@ -3659,229 +3710,232 @@ check-cast v1, Landroid/support/v7/widget/Toolbar$LayoutParams; .line 1842 - iget v4, v1, Landroid/support/v7/widget/Toolbar$LayoutParams;->topMargin:I + iget v3, v1, Landroid/support/v7/widget/Toolbar$LayoutParams;->topMargin:I - add-int/2addr v8, v4 + add-int/2addr v8, v3 .line 1843 - iget-object v4, v0, Landroid/support/v7/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView; + iget-object v3, v0, Landroid/support/v7/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView; - invoke-virtual {v4}, Landroid/widget/TextView;->getMeasuredWidth()I + invoke-virtual {v3}, Landroid/widget/TextView;->getMeasuredWidth()I - move-result v4 + move-result v3 - sub-int v4, v10, v4 + sub-int v3, v10, v3 .line 1844 - iget-object v5, v0, Landroid/support/v7/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView; + iget-object v4, v0, Landroid/support/v7/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView; - invoke-virtual {v5}, Landroid/widget/TextView;->getMeasuredHeight()I + invoke-virtual {v4}, Landroid/widget/TextView;->getMeasuredHeight()I - move-result v5 + move-result v4 - add-int/2addr v5, v8 + add-int/2addr v4, v8 .line 1845 - iget-object v6, v0, Landroid/support/v7/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView; + iget-object v5, v0, Landroid/support/v7/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView; - invoke-virtual {v6, v4, v8, v10, v5}, Landroid/widget/TextView;->layout(IIII)V + invoke-virtual {v5, v3, v8, v10, v4}, Landroid/widget/TextView;->layout(IIII)V .line 1846 - iget v4, v0, Landroid/support/v7/widget/Toolbar;->mTitleMarginEnd:I + iget v3, v0, Landroid/support/v7/widget/Toolbar;->mTitleMarginEnd:I - sub-int v4, v10, v4 + sub-int v3, v10, v3 .line 1847 iget v1, v1, Landroid/support/v7/widget/Toolbar$LayoutParams;->bottomMargin:I goto :goto_13 - :cond_1c - move v4, v10 + :cond_1b + move v3, v10 :goto_13 - if-eqz v17, :cond_f + if-eqz v15, :cond_1c .line 1850 - invoke-static {v3, v4}, Ljava/lang/Math;->min(II)I + invoke-static {v2, v3}, Ljava/lang/Math;->min(II)I move-result v1 move v10, v1 + :cond_1c + move/from16 v2, p5 + goto/16 :goto_a :cond_1d - if-eqz v17, :cond_1e + if-eqz v15, :cond_1e .line 1853 - iget v7, v0, Landroid/support/v7/widget/Toolbar;->mTitleMarginStart:I - - const/4 v1, 0x0 + iget v3, v0, Landroid/support/v7/widget/Toolbar;->mTitleMarginStart:I goto :goto_14 :cond_1e - const/4 v1, 0x0 + const/4 v3, 0x0 + :goto_14 const/4 v7, 0x0 - :goto_14 - aget v3, v11, v1 + aget v1, v11, v7 - sub-int/2addr v7, v3 + sub-int/2addr v3, v1 .line 1854 - invoke-static {v1, v7}, Ljava/lang/Math;->max(II)I + invoke-static {v7, v3}, Ljava/lang/Math;->max(II)I - move-result v3 + move-result v1 - add-int/2addr v2, v3 + add-int v2, p5, v1 - neg-int v3, v7 + neg-int v1, v3 .line 1855 - invoke-static {v1, v3}, Ljava/lang/Math;->max(II)I + invoke-static {v7, v1}, Ljava/lang/Math;->max(II)I - move-result v3 + move-result v1 - aput v3, v11, v1 + aput v1, v11, v7 if-eqz v13, :cond_1f .line 1860 - iget-object v3, v0, Landroid/support/v7/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView; + iget-object v1, v0, Landroid/support/v7/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView; - invoke-virtual {v3}, Landroid/widget/TextView;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams; + invoke-virtual {v1}, Landroid/widget/TextView;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams; - move-result-object v3 + move-result-object v1 - check-cast v3, Landroid/support/v7/widget/Toolbar$LayoutParams; + check-cast v1, Landroid/support/v7/widget/Toolbar$LayoutParams; .line 1861 - iget-object v4, v0, Landroid/support/v7/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView; + iget-object v3, v0, Landroid/support/v7/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView; - invoke-virtual {v4}, Landroid/widget/TextView;->getMeasuredWidth()I + invoke-virtual {v3}, Landroid/widget/TextView;->getMeasuredWidth()I - move-result v4 + move-result v3 - add-int/2addr v4, v2 + add-int/2addr v3, v2 .line 1862 - iget-object v5, v0, Landroid/support/v7/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView; + iget-object v4, v0, Landroid/support/v7/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView; - invoke-virtual {v5}, Landroid/widget/TextView;->getMeasuredHeight()I + invoke-virtual {v4}, Landroid/widget/TextView;->getMeasuredHeight()I - move-result v5 + move-result v4 - add-int/2addr v5, v8 + add-int/2addr v4, v8 .line 1863 - iget-object v6, v0, Landroid/support/v7/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView; + iget-object v5, v0, Landroid/support/v7/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView; - invoke-virtual {v6, v2, v8, v4, v5}, Landroid/widget/TextView;->layout(IIII)V + invoke-virtual {v5, v2, v8, v3, v4}, Landroid/widget/TextView;->layout(IIII)V .line 1864 - iget v6, v0, Landroid/support/v7/widget/Toolbar;->mTitleMarginEnd:I + iget v5, v0, Landroid/support/v7/widget/Toolbar;->mTitleMarginEnd:I - add-int/2addr v4, v6 + add-int/2addr v3, v5 .line 1865 - iget v3, v3, Landroid/support/v7/widget/Toolbar$LayoutParams;->bottomMargin:I + iget v1, v1, Landroid/support/v7/widget/Toolbar$LayoutParams;->bottomMargin:I - add-int v8, v5, v3 + add-int v8, v4, v1 goto :goto_15 :cond_1f - move v4, v2 + move v3, v2 :goto_15 if-eqz v14, :cond_20 .line 1868 - iget-object v3, v0, Landroid/support/v7/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView; + iget-object v1, v0, Landroid/support/v7/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView; - invoke-virtual {v3}, Landroid/widget/TextView;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams; + invoke-virtual {v1}, Landroid/widget/TextView;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams; - move-result-object v3 + move-result-object v1 - check-cast v3, Landroid/support/v7/widget/Toolbar$LayoutParams; + check-cast v1, Landroid/support/v7/widget/Toolbar$LayoutParams; .line 1869 - iget v5, v3, Landroid/support/v7/widget/Toolbar$LayoutParams;->topMargin:I + iget v4, v1, Landroid/support/v7/widget/Toolbar$LayoutParams;->topMargin:I - add-int/2addr v8, v5 + add-int/2addr v8, v4 .line 1870 - iget-object v5, v0, Landroid/support/v7/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView; + iget-object v4, v0, Landroid/support/v7/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView; - invoke-virtual {v5}, Landroid/widget/TextView;->getMeasuredWidth()I + invoke-virtual {v4}, Landroid/widget/TextView;->getMeasuredWidth()I - move-result v5 + move-result v4 - add-int/2addr v5, v2 + add-int/2addr v4, v2 .line 1871 - iget-object v6, v0, Landroid/support/v7/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView; + iget-object v5, v0, Landroid/support/v7/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView; - invoke-virtual {v6}, Landroid/widget/TextView;->getMeasuredHeight()I + invoke-virtual {v5}, Landroid/widget/TextView;->getMeasuredHeight()I - move-result v6 + move-result v5 - add-int/2addr v6, v8 + add-int/2addr v5, v8 .line 1872 - iget-object v7, v0, Landroid/support/v7/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView; + iget-object v6, v0, Landroid/support/v7/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView; - invoke-virtual {v7, v2, v8, v5, v6}, Landroid/widget/TextView;->layout(IIII)V + invoke-virtual {v6, v2, v8, v4, v5}, Landroid/widget/TextView;->layout(IIII)V .line 1873 - iget v6, v0, Landroid/support/v7/widget/Toolbar;->mTitleMarginEnd:I + iget v5, v0, Landroid/support/v7/widget/Toolbar;->mTitleMarginEnd:I - add-int/2addr v5, v6 + add-int/2addr v4, v5 .line 1874 - iget v3, v3, Landroid/support/v7/widget/Toolbar$LayoutParams;->bottomMargin:I + iget v1, v1, Landroid/support/v7/widget/Toolbar$LayoutParams;->bottomMargin:I goto :goto_16 :cond_20 - move v5, v2 + move v4, v2 :goto_16 - if-eqz v17, :cond_21 + if-eqz v15, :cond_21 .line 1877 - invoke-static {v4, v5}, Ljava/lang/Math;->max(II)I + invoke-static {v3, v4}, Ljava/lang/Math;->max(II)I move-result v2 .line 1885 :cond_21 :goto_17 - iget-object v3, v0, Landroid/support/v7/widget/Toolbar;->mTempViews:Ljava/util/ArrayList; + iget-object v1, v0, Landroid/support/v7/widget/Toolbar;->mTempViews:Ljava/util/ArrayList; - const/4 v4, 0x3 + const/4 v3, 0x3 - invoke-direct {v0, v3, v4}, Landroid/support/v7/widget/Toolbar;->addCustomViewsWithGravity(Ljava/util/List;I)V + invoke-direct {v0, v1, v3}, Landroid/support/v7/widget/Toolbar;->addCustomViewsWithGravity(Ljava/util/List;I)V .line 1886 - iget-object v3, v0, Landroid/support/v7/widget/Toolbar;->mTempViews:Ljava/util/ArrayList; + iget-object v1, v0, Landroid/support/v7/widget/Toolbar;->mTempViews:Ljava/util/ArrayList; - invoke-virtual {v3}, Ljava/util/ArrayList;->size()I + invoke-virtual {v1}, Ljava/util/ArrayList;->size()I - move-result v3 + move-result v1 - const/4 v7, 0x0 + move v3, v2 + + const/4 v2, 0x0 :goto_18 - if-ge v7, v3, :cond_22 + if-ge v2, v1, :cond_22 .line 1888 iget-object v4, v0, Landroid/support/v7/widget/Toolbar;->mTempViews:Ljava/util/ArrayList; - invoke-virtual {v4, v7}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v4, v2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; move-result-object v4 @@ -3889,11 +3943,11 @@ move/from16 v12, p3 - invoke-direct {v0, v4, v2, v11, v12}, Landroid/support/v7/widget/Toolbar;->layoutChildLeft(Landroid/view/View;I[II)I + invoke-direct {v0, v4, v3, v11, v12}, Landroid/support/v7/widget/Toolbar;->layoutChildLeft(Landroid/view/View;I[II)I - move-result v2 + move-result v3 - add-int/lit8 v7, v7, 0x1 + add-int/lit8 v2, v2, 0x1 goto :goto_18 @@ -3901,28 +3955,28 @@ move/from16 v12, p3 .line 1892 - iget-object v3, v0, Landroid/support/v7/widget/Toolbar;->mTempViews:Ljava/util/ArrayList; + iget-object v1, v0, Landroid/support/v7/widget/Toolbar;->mTempViews:Ljava/util/ArrayList; - const/4 v4, 0x5 + const/4 v2, 0x5 - invoke-direct {v0, v3, v4}, Landroid/support/v7/widget/Toolbar;->addCustomViewsWithGravity(Ljava/util/List;I)V + invoke-direct {v0, v1, v2}, Landroid/support/v7/widget/Toolbar;->addCustomViewsWithGravity(Ljava/util/List;I)V .line 1893 - iget-object v3, v0, Landroid/support/v7/widget/Toolbar;->mTempViews:Ljava/util/ArrayList; + iget-object v1, v0, Landroid/support/v7/widget/Toolbar;->mTempViews:Ljava/util/ArrayList; - invoke-virtual {v3}, Ljava/util/ArrayList;->size()I + invoke-virtual {v1}, Ljava/util/ArrayList;->size()I - move-result v3 + move-result v1 - const/4 v7, 0x0 + const/4 v2, 0x0 :goto_19 - if-ge v7, v3, :cond_23 + if-ge v2, v1, :cond_23 .line 1895 iget-object v4, v0, Landroid/support/v7/widget/Toolbar;->mTempViews:Ljava/util/ArrayList; - invoke-virtual {v4, v7}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v4, v2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; move-result-object v4 @@ -3932,82 +3986,82 @@ move-result v10 - add-int/lit8 v7, v7, 0x1 + add-int/lit8 v2, v2, 0x1 goto :goto_19 .line 1901 :cond_23 - iget-object v3, v0, Landroid/support/v7/widget/Toolbar;->mTempViews:Ljava/util/ArrayList; + iget-object v1, v0, Landroid/support/v7/widget/Toolbar;->mTempViews:Ljava/util/ArrayList; - const/4 v4, 0x1 + const/4 v2, 0x1 - invoke-direct {v0, v3, v4}, Landroid/support/v7/widget/Toolbar;->addCustomViewsWithGravity(Ljava/util/List;I)V + invoke-direct {v0, v1, v2}, Landroid/support/v7/widget/Toolbar;->addCustomViewsWithGravity(Ljava/util/List;I)V .line 1902 - iget-object v3, v0, Landroid/support/v7/widget/Toolbar;->mTempViews:Ljava/util/ArrayList; + iget-object v1, v0, Landroid/support/v7/widget/Toolbar;->mTempViews:Ljava/util/ArrayList; - invoke-direct {v0, v3, v11}, Landroid/support/v7/widget/Toolbar;->getViewListMeasuredWidth(Ljava/util/List;[I)I + invoke-direct {v0, v1, v11}, Landroid/support/v7/widget/Toolbar;->getViewListMeasuredWidth(Ljava/util/List;[I)I - move-result v3 + move-result v1 - sub-int v4, v16, v18 + sub-int v4, v16, v17 sub-int v4, v4, p4 .line 1903 div-int/lit8 v4, v4, 0x2 - add-int v6, v18, v4 + add-int v6, v17, v4 .line 1904 - div-int/lit8 v4, v3, 0x2 + div-int/lit8 v2, v1, 0x2 - sub-int/2addr v6, v4 + sub-int v2, v6, v2 - add-int/2addr v3, v6 + add-int/2addr v1, v2 - if-ge v6, v2, :cond_24 + if-ge v2, v3, :cond_24 goto :goto_1a :cond_24 - if-le v3, v10, :cond_25 + if-le v1, v10, :cond_25 - sub-int/2addr v3, v10 + sub-int/2addr v1, v10 - sub-int v2, v6, v3 + sub-int v3, v2, v1 goto :goto_1a :cond_25 - move v2, v6 + move v3, v2 .line 1913 :goto_1a - iget-object v3, v0, Landroid/support/v7/widget/Toolbar;->mTempViews:Ljava/util/ArrayList; + iget-object v1, v0, Landroid/support/v7/widget/Toolbar;->mTempViews:Ljava/util/ArrayList; - invoke-virtual {v3}, Ljava/util/ArrayList;->size()I + invoke-virtual {v1}, Ljava/util/ArrayList;->size()I - move-result v3 + move-result v1 :goto_1b - if-ge v1, v3, :cond_26 + if-ge v7, v1, :cond_26 .line 1915 - iget-object v4, v0, Landroid/support/v7/widget/Toolbar;->mTempViews:Ljava/util/ArrayList; + iget-object v2, v0, Landroid/support/v7/widget/Toolbar;->mTempViews:Ljava/util/ArrayList; - invoke-virtual {v4, v1}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v2, v7}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; - move-result-object v4 + move-result-object v2 - check-cast v4, Landroid/view/View; + check-cast v2, Landroid/view/View; - invoke-direct {v0, v4, v2, v11, v12}, Landroid/support/v7/widget/Toolbar;->layoutChildLeft(Landroid/view/View;I[II)I + invoke-direct {v0, v2, v3, v11, v12}, Landroid/support/v7/widget/Toolbar;->layoutChildLeft(Landroid/view/View;I[II)I - move-result v2 + move-result v3 - add-int/lit8 v1, v1, 0x1 + add-int/lit8 v7, v7, 0x1 goto :goto_1b @@ -4031,20 +4085,34 @@ .line 1578 invoke-static/range {p0 .. p0}, Landroid/support/v7/widget/ViewUtils;->isLayoutRtl(Landroid/view/View;)Z - move-result v9 + move-result v0 + + const/4 v1, 0x1 + + const/4 v9, 0x0 + + if-eqz v0, :cond_0 + + const/4 v10, 0x1 + + const/4 v11, 0x0 + + goto :goto_0 + :cond_0 const/4 v10, 0x0 - xor-int/lit8 v11, v9, 0x1 + const/4 v11, 0x1 .line 1589 + :goto_0 iget-object v0, v7, Landroid/support/v7/widget/Toolbar;->mNavButtonView:Landroid/widget/ImageButton; invoke-direct {v7, v0}, Landroid/support/v7/widget/Toolbar;->shouldLayout(Landroid/view/View;)Z move-result v0 - if-eqz v0, :cond_0 + if-eqz v0, :cond_1 .line 1590 iget-object v1, v7, Landroid/support/v7/widget/Toolbar;->mNavButtonView:Landroid/widget/ImageButton; @@ -4095,7 +4163,7 @@ add-int/2addr v1, v2 .line 1593 - invoke-static {v10, v1}, Ljava/lang/Math;->max(II)I + invoke-static {v9, v1}, Ljava/lang/Math;->max(II)I move-result v1 @@ -4108,7 +4176,7 @@ move-result v2 .line 1595 - invoke-static {v10, v2}, Landroid/view/View;->combineMeasuredStates(II)I + invoke-static {v9, v2}, Landroid/view/View;->combineMeasuredStates(II)I move-result v2 @@ -4116,9 +4184,9 @@ move v13, v2 - goto :goto_0 + goto :goto_1 - :cond_0 + :cond_1 const/4 v0, 0x0 const/4 v12, 0x0 @@ -4126,14 +4194,14 @@ const/4 v13, 0x0 .line 1599 - :goto_0 + :goto_1 iget-object v1, v7, Landroid/support/v7/widget/Toolbar;->mCollapseButtonView:Landroid/widget/ImageButton; invoke-direct {v7, v1}, Landroid/support/v7/widget/Toolbar;->shouldLayout(Landroid/view/View;)Z move-result v1 - if-eqz v1, :cond_1 + if-eqz v1, :cond_2 .line 1600 iget-object v1, v7, Landroid/support/v7/widget/Toolbar;->mCollapseButtonView:Landroid/widget/ImageButton; @@ -4203,7 +4271,7 @@ move-result v13 .line 1610 - :cond_1 + :cond_2 invoke-virtual/range {p0 .. p0}, Landroid/support/v7/widget/Toolbar;->getCurrentContentInsetStart()I move-result v1 @@ -4213,16 +4281,16 @@ move-result v2 - add-int v14, v10, v2 + add-int v14, v9, v2 sub-int/2addr v1, v0 .line 1612 - invoke-static {v10, v1}, Ljava/lang/Math;->max(II)I + invoke-static {v9, v1}, Ljava/lang/Math;->max(II)I move-result v0 - aput v0, v8, v9 + aput v0, v8, v10 .line 1615 iget-object v0, v7, Landroid/support/v7/widget/Toolbar;->mMenuView:Landroid/support/v7/widget/ActionMenuView; @@ -4231,7 +4299,7 @@ move-result v0 - if-eqz v0, :cond_2 + if-eqz v0, :cond_3 .line 1616 iget-object v1, v7, Landroid/support/v7/widget/Toolbar;->mMenuView:Landroid/support/v7/widget/ActionMenuView; @@ -4299,13 +4367,13 @@ move-result v13 - goto :goto_1 + goto :goto_2 - :cond_2 + :cond_3 const/4 v0, 0x0 .line 1625 - :goto_1 + :goto_2 invoke-virtual/range {p0 .. p0}, Landroid/support/v7/widget/Toolbar;->getCurrentContentInsetEnd()I move-result v1 @@ -4315,12 +4383,12 @@ move-result v2 - add-int/2addr v14, v2 + add-int v10, v14, v2 sub-int/2addr v1, v0 .line 1627 - invoke-static {v10, v1}, Ljava/lang/Math;->max(II)I + invoke-static {v9, v1}, Ljava/lang/Math;->max(II)I move-result v0 @@ -4333,7 +4401,7 @@ move-result v0 - if-eqz v0, :cond_3 + if-eqz v0, :cond_4 .line 1630 iget-object v1, v7, Landroid/support/v7/widget/Toolbar;->mExpandedActionView:Landroid/view/View; @@ -4344,7 +4412,7 @@ move/from16 v2, p1 - move v3, v14 + move v3, v10 move/from16 v4, p2 @@ -4354,7 +4422,7 @@ move-result v0 - add-int/2addr v14, v0 + add-int/2addr v10, v0 .line 1632 iget-object v0, v7, Landroid/support/v7/widget/Toolbar;->mExpandedActionView:Landroid/view/View; @@ -4391,14 +4459,14 @@ move-result v13 .line 1638 - :cond_3 + :cond_4 iget-object v0, v7, Landroid/support/v7/widget/Toolbar;->mLogoView:Landroid/widget/ImageView; invoke-direct {v7, v0}, Landroid/support/v7/widget/Toolbar;->shouldLayout(Landroid/view/View;)Z move-result v0 - if-eqz v0, :cond_4 + if-eqz v0, :cond_5 .line 1639 iget-object v1, v7, Landroid/support/v7/widget/Toolbar;->mLogoView:Landroid/widget/ImageView; @@ -4409,7 +4477,7 @@ move/from16 v2, p1 - move v3, v14 + move v3, v10 move/from16 v4, p2 @@ -4419,7 +4487,7 @@ move-result v0 - add-int/2addr v14, v0 + add-int/2addr v10, v0 .line 1641 iget-object v0, v7, Landroid/support/v7/widget/Toolbar;->mLogoView:Landroid/widget/ImageView; @@ -4456,18 +4524,22 @@ move-result v13 .line 1647 - :cond_4 + :cond_5 invoke-virtual/range {p0 .. p0}, Landroid/support/v7/widget/Toolbar;->getChildCount()I - move-result v9 + move-result v11 - const/4 v11, 0x0 + move v14, v12 - :goto_2 - if-ge v11, v9, :cond_7 + move v12, v10 + + const/4 v10, 0x0 + + :goto_3 + if-ge v10, v11, :cond_8 .line 1649 - invoke-virtual {v7, v11}, Landroid/support/v7/widget/Toolbar;->getChildAt(I)Landroid/view/View; + invoke-virtual {v7, v10}, Landroid/support/v7/widget/Toolbar;->getChildAt(I)Landroid/view/View; move-result-object v15 @@ -4481,17 +4553,17 @@ .line 1651 iget v0, v0, Landroid/support/v7/widget/Toolbar$LayoutParams;->mViewType:I - if-nez v0, :cond_6 + if-nez v0, :cond_7 invoke-direct {v7, v15}, Landroid/support/v7/widget/Toolbar;->shouldLayout(Landroid/view/View;)Z move-result v0 - if-nez v0, :cond_5 + if-nez v0, :cond_6 - goto :goto_3 + goto :goto_4 - :cond_5 + :cond_6 const/4 v5, 0x0 move-object/from16 v0, p0 @@ -4500,7 +4572,7 @@ move/from16 v2, p1 - move v3, v14 + move v3, v12 move/from16 v4, p2 @@ -4511,7 +4583,7 @@ move-result v0 - add-int/2addr v14, v0 + add-int/2addr v12, v0 .line 1658 invoke-virtual {v15}, Landroid/view/View;->getMeasuredHeight()I @@ -4524,7 +4596,7 @@ add-int/2addr v0, v1 - invoke-static {v12, v0}, Ljava/lang/Math;->max(II)I + invoke-static {v14, v0}, Ljava/lang/Math;->max(II)I move-result v0 @@ -4537,23 +4609,23 @@ move-result v1 - move v12, v0 + move v14, v0 move v13, v1 - :cond_6 - :goto_3 - add-int/lit8 v11, v11, 0x1 + :cond_7 + :goto_4 + add-int/lit8 v10, v10, 0x1 - goto :goto_2 + goto :goto_3 .line 1664 - :cond_7 + :cond_8 iget v0, v7, Landroid/support/v7/widget/Toolbar;->mTitleMarginTop:I iget v1, v7, Landroid/support/v7/widget/Toolbar;->mTitleMarginBottom:I - add-int v9, v0, v1 + add-int v10, v0, v1 .line 1665 iget v0, v7, Landroid/support/v7/widget/Toolbar;->mTitleMarginStart:I @@ -4569,12 +4641,12 @@ move-result v0 - if-eqz v0, :cond_8 + if-eqz v0, :cond_9 .line 1667 iget-object v1, v7, Landroid/support/v7/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView; - add-int v3, v14, v11 + add-int v3, v12, v11 move-object/from16 v0, p0 @@ -4582,7 +4654,7 @@ move/from16 v4, p2 - move v5, v9 + move v5, v10 move-object v6, v8 @@ -4635,9 +4707,9 @@ move v13, v0 - goto :goto_4 + goto :goto_5 - :cond_8 + :cond_9 move v6, v13 const/4 v13, 0x0 @@ -4645,21 +4717,21 @@ const/4 v15, 0x0 .line 1674 - :goto_4 + :goto_5 iget-object v0, v7, Landroid/support/v7/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView; invoke-direct {v7, v0}, Landroid/support/v7/widget/Toolbar;->shouldLayout(Landroid/view/View;)Z move-result v0 - if-eqz v0, :cond_9 + if-eqz v0, :cond_a .line 1675 iget-object v1, v7, Landroid/support/v7/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView; - add-int v3, v14, v11 + add-int v3, v12, v11 - add-int v5, v15, v9 + add-int v5, v15, v10 move-object/from16 v0, p0 @@ -4667,7 +4739,7 @@ move/from16 v4, p2 - move v9, v6 + move v10, v6 move-object v6, v8 @@ -4706,20 +4778,20 @@ move-result v0 .line 1681 - invoke-static {v9, v0}, Landroid/view/View;->combineMeasuredStates(II)I + invoke-static {v10, v0}, Landroid/view/View;->combineMeasuredStates(II)I move-result v6 - goto :goto_5 + goto :goto_6 - :cond_9 - move v9, v6 + :cond_a + move v10, v6 - :goto_5 - add-int/2addr v14, v13 + :goto_6 + add-int/2addr v12, v13 .line 1686 - invoke-static {v12, v15}, Ljava/lang/Math;->max(II)I + invoke-static {v14, v15}, Ljava/lang/Math;->max(II)I move-result v0 @@ -4734,7 +4806,7 @@ add-int/2addr v1, v2 - add-int/2addr v14, v1 + add-int/2addr v12, v1 .line 1691 invoke-virtual/range {p0 .. p0}, Landroid/support/v7/widget/Toolbar;->getPaddingTop()I @@ -4754,7 +4826,7 @@ move-result v1 - invoke-static {v14, v1}, Ljava/lang/Math;->max(II)I + invoke-static {v12, v1}, Ljava/lang/Math;->max(II)I move-result v1 @@ -4792,15 +4864,12 @@ move-result v2 - if-eqz v2, :cond_a + if-eqz v2, :cond_b - goto :goto_6 - - :cond_a - move v10, v0 + const/4 v0, 0x0 - :goto_6 - invoke-virtual {v7, v1, v10}, Landroid/support/v7/widget/Toolbar;->setMeasuredDimension(II)V + :cond_b + invoke-virtual {v7, v1, v0}, Landroid/support/v7/widget/Toolbar;->setMeasuredDimension(II)V return-void .end method @@ -5063,6 +5132,11 @@ .method public setCollapsible(Z)V .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 2150 iput-boolean p1, p0, Landroid/support/v7/widget/Toolbar;->mCollapsible:Z @@ -5163,6 +5237,10 @@ .method public setLogo(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .line 501 invoke-virtual {p0}, Landroid/support/v7/widget/Toolbar;->getContext()Landroid/content/Context; @@ -5244,6 +5322,10 @@ .method public setLogoDescription(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param .line 655 invoke-virtual {p0}, Landroid/support/v7/widget/Toolbar;->getContext()Landroid/content/Context; @@ -5287,6 +5369,11 @@ .method public setMenu(Landroid/support/v7/view/menu/MenuBuilder;Landroid/support/v7/widget/ActionMenuPresenter;)V .locals 3 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation if-nez p1, :cond_0 @@ -5404,6 +5491,11 @@ .method public setMenuCallbacks(Landroid/support/v7/view/menu/MenuPresenter$Callback;Landroid/support/v7/view/menu/MenuBuilder$Callback;)V .locals 1 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation .line 2160 iput-object p1, p0, Landroid/support/v7/widget/Toolbar;->mActionMenuPresenterCallback:Landroid/support/v7/view/menu/MenuPresenter$Callback; @@ -5425,6 +5517,10 @@ .method public setNavigationContentDescription(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param if-eqz p1, :cond_0 @@ -5450,6 +5546,10 @@ .method public setNavigationContentDescription(Ljava/lang/CharSequence;)V .locals 1 + .param p1 # Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 917 invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z @@ -5476,6 +5576,10 @@ .method public setNavigationIcon(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/DrawableRes; + .end annotation + .end param .line 940 invoke-virtual {p0}, Landroid/support/v7/widget/Toolbar;->getContext()Landroid/content/Context; @@ -5493,6 +5597,10 @@ .method public setNavigationIcon(Landroid/graphics/drawable/Drawable;)V .locals 2 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param if-eqz p1, :cond_0 @@ -5580,6 +5688,10 @@ .method public setOverflowIcon(Landroid/graphics/drawable/Drawable;)V .locals 1 + .param p1 # Landroid/graphics/drawable/Drawable; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 1017 invoke-direct {p0}, Landroid/support/v7/widget/Toolbar;->ensureMenu()V @@ -5594,6 +5706,10 @@ .method public setPopupTheme(I)V .locals 2 + .param p1 # I + .annotation build Landroid/support/annotation/StyleRes; + .end annotation + .end param .line 353 iget v0, p0, Landroid/support/v7/widget/Toolbar;->mPopupTheme:I @@ -5633,6 +5749,10 @@ .method public setSubtitle(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param .line 795 invoke-virtual {p0}, Landroid/support/v7/widget/Toolbar;->getContext()Landroid/content/Context; @@ -5676,6 +5796,8 @@ iput-object v1, p0, Landroid/support/v7/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView; .line 810 + iget-object v1, p0, Landroid/support/v7/widget/Toolbar;->mSubtitleTextView:Landroid/widget/TextView; + invoke-virtual {v1}, Landroid/widget/TextView;->setSingleLine()V .line 811 @@ -5768,6 +5890,10 @@ .method public setSubtitleTextAppearance(Landroid/content/Context;I)V .locals 1 + .param p2 # I + .annotation build Landroid/support/annotation/StyleRes; + .end annotation + .end param .line 848 iput p2, p0, Landroid/support/v7/widget/Toolbar;->mSubtitleTextAppearance:I @@ -5786,6 +5912,10 @@ .method public setSubtitleTextColor(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param .line 872 iput p1, p0, Landroid/support/v7/widget/Toolbar;->mSubtitleTextColor:I @@ -5804,6 +5934,10 @@ .method public setTitle(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/StringRes; + .end annotation + .end param .line 740 invoke-virtual {p0}, Landroid/support/v7/widget/Toolbar;->getContext()Landroid/content/Context; @@ -5847,6 +5981,8 @@ iput-object v1, p0, Landroid/support/v7/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView; .line 756 + iget-object v1, p0, Landroid/support/v7/widget/Toolbar;->mTitleTextView:Landroid/widget/TextView; + invoke-virtual {v1}, Landroid/widget/TextView;->setSingleLine()V .line 757 @@ -6008,6 +6144,10 @@ .method public setTitleTextAppearance(Landroid/content/Context;I)V .locals 1 + .param p2 # I + .annotation build Landroid/support/annotation/StyleRes; + .end annotation + .end param .line 837 iput p2, p0, Landroid/support/v7/widget/Toolbar;->mTitleTextAppearance:I @@ -6026,6 +6166,10 @@ .method public setTitleTextColor(I)V .locals 1 + .param p1 # I + .annotation build Landroid/support/annotation/ColorInt; + .end annotation + .end param .line 860 iput p1, p0, Landroid/support/v7/widget/Toolbar;->mTitleTextColor:I diff --git a/smali/android/support/v7/widget/ToolbarWidgetWrapper$1.smali b/smali/android/support/v7/widget/ToolbarWidgetWrapper$1.smali index 1db681ea..c0dd4a08 100644 --- a/smali/android/support/v7/widget/ToolbarWidgetWrapper$1.smali +++ b/smali/android/support/v7/widget/ToolbarWidgetWrapper$1.smali @@ -25,7 +25,7 @@ # direct methods .method constructor (Landroid/support/v7/widget/ToolbarWidgetWrapper;)V - .locals 8 + .locals 7 .line 182 iput-object p1, p0, Landroid/support/v7/widget/ToolbarWidgetWrapper$1;->this$0:Landroid/support/v7/widget/ToolbarWidgetWrapper; @@ -33,15 +33,19 @@ invoke-direct {p0}, Ljava/lang/Object;->()V .line 183 - new-instance v7, Landroid/support/v7/view/menu/ActionMenuItem; + new-instance p1, Landroid/support/v7/view/menu/ActionMenuItem; - iget-object v0, p1, Landroid/support/v7/widget/ToolbarWidgetWrapper;->mToolbar:Landroid/support/v7/widget/Toolbar; + iget-object v0, p0, Landroid/support/v7/widget/ToolbarWidgetWrapper$1;->this$0:Landroid/support/v7/widget/ToolbarWidgetWrapper; + + iget-object v0, v0, Landroid/support/v7/widget/ToolbarWidgetWrapper;->mToolbar:Landroid/support/v7/widget/Toolbar; invoke-virtual {v0}, Landroid/support/v7/widget/Toolbar;->getContext()Landroid/content/Context; move-result-object v1 - iget-object v6, p1, Landroid/support/v7/widget/ToolbarWidgetWrapper;->mTitle:Ljava/lang/CharSequence; + iget-object v0, p0, Landroid/support/v7/widget/ToolbarWidgetWrapper$1;->this$0:Landroid/support/v7/widget/ToolbarWidgetWrapper; + + iget-object v6, v0, Landroid/support/v7/widget/ToolbarWidgetWrapper;->mTitle:Ljava/lang/CharSequence; const/4 v2, 0x0 @@ -51,11 +55,11 @@ const/4 v5, 0x0 - move-object v0, v7 + move-object v0, p1 invoke-direct/range {v0 .. v6}, Landroid/support/v7/view/menu/ActionMenuItem;->(Landroid/content/Context;IIIILjava/lang/CharSequence;)V - iput-object v7, p0, Landroid/support/v7/widget/ToolbarWidgetWrapper$1;->mNavItem:Landroid/support/v7/view/menu/ActionMenuItem; + iput-object p1, p0, Landroid/support/v7/widget/ToolbarWidgetWrapper$1;->mNavItem:Landroid/support/v7/view/menu/ActionMenuItem; return-void .end method diff --git a/smali/android/support/v7/widget/ToolbarWidgetWrapper.smali b/smali/android/support/v7/widget/ToolbarWidgetWrapper.smali index b529d3e2..d2977b45 100644 --- a/smali/android/support/v7/widget/ToolbarWidgetWrapper.smali +++ b/smali/android/support/v7/widget/ToolbarWidgetWrapper.smali @@ -6,6 +6,14 @@ .implements Landroid/support/v7/widget/DecorToolbar; +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field private static final AFFECTS_LOGO_MASK:I = 0x3 @@ -1083,16 +1091,18 @@ if-eqz p1, :cond_1 .line 544 - iget v0, p0, Landroid/support/v7/widget/ToolbarWidgetWrapper;->mDisplayOpts:I + iget p1, p0, Landroid/support/v7/widget/ToolbarWidgetWrapper;->mDisplayOpts:I - and-int/lit8 v0, v0, 0x10 + and-int/lit8 p1, p1, 0x10 - if-eqz v0, :cond_1 + if-eqz p1, :cond_1 .line 545 - iget-object v0, p0, Landroid/support/v7/widget/ToolbarWidgetWrapper;->mToolbar:Landroid/support/v7/widget/Toolbar; + iget-object p1, p0, Landroid/support/v7/widget/ToolbarWidgetWrapper;->mToolbar:Landroid/support/v7/widget/Toolbar; - invoke-virtual {v0, p1}, Landroid/support/v7/widget/Toolbar;->addView(Landroid/view/View;)V + iget-object v0, p0, Landroid/support/v7/widget/ToolbarWidgetWrapper;->mCustomView:Landroid/view/View; + + invoke-virtual {p1, v0}, Landroid/support/v7/widget/Toolbar;->addView(Landroid/view/View;)V :cond_1 return-void @@ -1303,7 +1313,7 @@ .end method .method public setEmbeddedTabView(Landroid/support/v7/widget/ScrollingTabContainerView;)V - .locals 2 + .locals 3 .line 422 iget-object v0, p0, Landroid/support/v7/widget/ToolbarWidgetWrapper;->mTabView:Landroid/view/View; @@ -1339,9 +1349,11 @@ .line 427 iget-object v0, p0, Landroid/support/v7/widget/ToolbarWidgetWrapper;->mToolbar:Landroid/support/v7/widget/Toolbar; - const/4 v1, 0x0 + iget-object v1, p0, Landroid/support/v7/widget/ToolbarWidgetWrapper;->mTabView:Landroid/view/View; - invoke-virtual {v0, p1, v1}, Landroid/support/v7/widget/Toolbar;->addView(Landroid/view/View;I)V + const/4 v2, 0x0 + + invoke-virtual {v0, v1, v2}, Landroid/support/v7/widget/Toolbar;->addView(Landroid/view/View;I)V .line 428 iget-object v0, p0, Landroid/support/v7/widget/ToolbarWidgetWrapper;->mTabView:Landroid/view/View; @@ -1476,6 +1488,8 @@ iput-object v0, p0, Landroid/support/v7/widget/ToolbarWidgetWrapper;->mActionMenuPresenter:Landroid/support/v7/widget/ActionMenuPresenter; .line 367 + iget-object v0, p0, Landroid/support/v7/widget/ToolbarWidgetWrapper;->mActionMenuPresenter:Landroid/support/v7/widget/ActionMenuPresenter; + sget v1, Landroid/support/v7/appcompat/R$id;->action_menu_presenter:I invoke-virtual {v0, v1}, Landroid/support/v7/widget/ActionMenuPresenter;->setId(I)V diff --git a/smali/android/support/v7/widget/TooltipCompat.smali b/smali/android/support/v7/widget/TooltipCompat.smali index 787bc303..f61415ba 100644 --- a/smali/android/support/v7/widget/TooltipCompat.smali +++ b/smali/android/support/v7/widget/TooltipCompat.smali @@ -15,6 +15,14 @@ .method public static setTooltipText(Landroid/view/View;Ljava/lang/CharSequence;)V .locals 2 + .param p0 # Landroid/view/View; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p1 # Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/Nullable; + .end annotation + .end param .line 41 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/android/support/v7/widget/TooltipCompatHandler.smali b/smali/android/support/v7/widget/TooltipCompatHandler.smali index 6f748524..c29aae13 100644 --- a/smali/android/support/v7/widget/TooltipCompatHandler.smali +++ b/smali/android/support/v7/widget/TooltipCompatHandler.smali @@ -8,6 +8,14 @@ .implements Landroid/view/View$OnAttachStateChangeListener; +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field private static final HOVER_HIDE_TIMEOUT_MS:J = 0x3a98L @@ -69,29 +77,36 @@ .line 110 iput-object p2, p0, Landroid/support/v7/widget/TooltipCompatHandler;->mTooltipText:Ljava/lang/CharSequence; + .line 111 + iget-object p1, p0, Landroid/support/v7/widget/TooltipCompatHandler;->mAnchor:Landroid/view/View; + .line 112 invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context; - move-result-object p2 + move-result-object p1 - invoke-static {p2}, Landroid/view/ViewConfiguration;->get(Landroid/content/Context;)Landroid/view/ViewConfiguration; + invoke-static {p1}, Landroid/view/ViewConfiguration;->get(Landroid/content/Context;)Landroid/view/ViewConfiguration; - move-result-object p2 + move-result-object p1 .line 111 - invoke-static {p2}, Landroid/support/v4/view/ViewConfigurationCompat;->getScaledHoverSlop(Landroid/view/ViewConfiguration;)I + invoke-static {p1}, Landroid/support/v4/view/ViewConfigurationCompat;->getScaledHoverSlop(Landroid/view/ViewConfiguration;)I - move-result p2 + move-result p1 - iput p2, p0, Landroid/support/v7/widget/TooltipCompatHandler;->mHoverSlop:I + iput p1, p0, Landroid/support/v7/widget/TooltipCompatHandler;->mHoverSlop:I .line 113 invoke-direct {p0}, Landroid/support/v7/widget/TooltipCompatHandler;->clearAnchorPos()V .line 115 + iget-object p1, p0, Landroid/support/v7/widget/TooltipCompatHandler;->mAnchor:Landroid/view/View; + invoke-virtual {p1, p0}, Landroid/view/View;->setOnLongClickListener(Landroid/view/View$OnLongClickListener;)V .line 116 + iget-object p1, p0, Landroid/support/v7/widget/TooltipCompatHandler;->mAnchor:Landroid/view/View; + invoke-virtual {p1, p0}, Landroid/view/View;->setOnHoverListener(Landroid/view/View$OnHoverListener;)V return-void @@ -158,6 +173,9 @@ :cond_0 sput-object p0, Landroid/support/v7/widget/TooltipCompatHandler;->sPendingHandler:Landroid/support/v7/widget/TooltipCompatHandler; + .line 214 + sget-object p0, Landroid/support/v7/widget/TooltipCompatHandler;->sPendingHandler:Landroid/support/v7/widget/TooltipCompatHandler; + if-eqz p0, :cond_1 .line 215 @@ -533,19 +551,21 @@ iput-boolean p1, p0, Landroid/support/v7/widget/TooltipCompatHandler;->mFromTouch:Z .line 173 - new-instance v1, Landroid/support/v7/widget/TooltipPopup; + new-instance p1, Landroid/support/v7/widget/TooltipPopup; - iget-object p1, p0, Landroid/support/v7/widget/TooltipCompatHandler;->mAnchor:Landroid/view/View; + iget-object v0, p0, Landroid/support/v7/widget/TooltipCompatHandler;->mAnchor:Landroid/view/View; - invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context; + invoke-virtual {v0}, Landroid/view/View;->getContext()Landroid/content/Context; - move-result-object p1 + move-result-object v0 - invoke-direct {v1, p1}, Landroid/support/v7/widget/TooltipPopup;->(Landroid/content/Context;)V + invoke-direct {p1, v0}, Landroid/support/v7/widget/TooltipPopup;->(Landroid/content/Context;)V - iput-object v1, p0, Landroid/support/v7/widget/TooltipCompatHandler;->mPopup:Landroid/support/v7/widget/TooltipPopup; + iput-object p1, p0, Landroid/support/v7/widget/TooltipCompatHandler;->mPopup:Landroid/support/v7/widget/TooltipPopup; .line 174 + iget-object v1, p0, Landroid/support/v7/widget/TooltipCompatHandler;->mPopup:Landroid/support/v7/widget/TooltipPopup; + iget-object v2, p0, Landroid/support/v7/widget/TooltipCompatHandler;->mAnchor:Landroid/view/View; iget v3, p0, Landroid/support/v7/widget/TooltipCompatHandler;->mAnchorX:I diff --git a/smali/android/support/v7/widget/TooltipPopup.smali b/smali/android/support/v7/widget/TooltipPopup.smali index 16099440..9040b87a 100644 --- a/smali/android/support/v7/widget/TooltipPopup.smali +++ b/smali/android/support/v7/widget/TooltipPopup.smali @@ -3,6 +3,14 @@ .source "TooltipPopup.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field private static final TAG:Ljava/lang/String; = "TooltipPopup" @@ -25,7 +33,7 @@ # direct methods .method constructor (Landroid/content/Context;)V - .locals 4 + .locals 2 .line 58 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -38,98 +46,112 @@ iput-object v0, p0, Landroid/support/v7/widget/TooltipPopup;->mLayoutParams:Landroid/view/WindowManager$LayoutParams; .line 54 - new-instance v1, Landroid/graphics/Rect; + new-instance v0, Landroid/graphics/Rect; - invoke-direct {v1}, Landroid/graphics/Rect;->()V + invoke-direct {v0}, Landroid/graphics/Rect;->()V - iput-object v1, p0, Landroid/support/v7/widget/TooltipPopup;->mTmpDisplayFrame:Landroid/graphics/Rect; + iput-object v0, p0, Landroid/support/v7/widget/TooltipPopup;->mTmpDisplayFrame:Landroid/graphics/Rect; - const/4 v1, 0x2 - - new-array v2, v1, [I + const/4 v0, 0x2 .line 55 - iput-object v2, p0, Landroid/support/v7/widget/TooltipPopup;->mTmpAnchorPos:[I + new-array v1, v0, [I - new-array v1, v1, [I + iput-object v1, p0, Landroid/support/v7/widget/TooltipPopup;->mTmpAnchorPos:[I .line 56 - iput-object v1, p0, Landroid/support/v7/widget/TooltipPopup;->mTmpAppPos:[I + new-array v0, v0, [I + + iput-object v0, p0, Landroid/support/v7/widget/TooltipPopup;->mTmpAppPos:[I .line 59 iput-object p1, p0, Landroid/support/v7/widget/TooltipPopup;->mContext:Landroid/content/Context; .line 61 + iget-object p1, p0, Landroid/support/v7/widget/TooltipPopup;->mContext:Landroid/content/Context; + invoke-static {p1}, Landroid/view/LayoutInflater;->from(Landroid/content/Context;)Landroid/view/LayoutInflater; - move-result-object v1 + move-result-object p1 - sget v2, Landroid/support/v7/appcompat/R$layout;->abc_tooltip:I + sget v0, Landroid/support/v7/appcompat/R$layout;->abc_tooltip:I - const/4 v3, 0x0 + const/4 v1, 0x0 - invoke-virtual {v1, v2, v3}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;)Landroid/view/View; + invoke-virtual {p1, v0, v1}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;)Landroid/view/View; - move-result-object v1 + move-result-object p1 - iput-object v1, p0, Landroid/support/v7/widget/TooltipPopup;->mContentView:Landroid/view/View; + iput-object p1, p0, Landroid/support/v7/widget/TooltipPopup;->mContentView:Landroid/view/View; .line 62 - sget v2, Landroid/support/v7/appcompat/R$id;->message:I + iget-object p1, p0, Landroid/support/v7/widget/TooltipPopup;->mContentView:Landroid/view/View; - invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View; + sget v0, Landroid/support/v7/appcompat/R$id;->message:I - move-result-object v1 + invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View; + + move-result-object p1 - check-cast v1, Landroid/widget/TextView; + check-cast p1, Landroid/widget/TextView; - iput-object v1, p0, Landroid/support/v7/widget/TooltipPopup;->mMessageView:Landroid/widget/TextView; + iput-object p1, p0, Landroid/support/v7/widget/TooltipPopup;->mMessageView:Landroid/widget/TextView; .line 64 + iget-object p1, p0, Landroid/support/v7/widget/TooltipPopup;->mLayoutParams:Landroid/view/WindowManager$LayoutParams; + invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class; - move-result-object v1 + move-result-object v0 - invoke-virtual {v1}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String; + invoke-virtual {v0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String; - move-result-object v1 + move-result-object v0 - invoke-virtual {v0, v1}, Landroid/view/WindowManager$LayoutParams;->setTitle(Ljava/lang/CharSequence;)V + invoke-virtual {p1, v0}, Landroid/view/WindowManager$LayoutParams;->setTitle(Ljava/lang/CharSequence;)V .line 65 - invoke-virtual {p1}, Landroid/content/Context;->getPackageName()Ljava/lang/String; + iget-object p1, p0, Landroid/support/v7/widget/TooltipPopup;->mLayoutParams:Landroid/view/WindowManager$LayoutParams; - move-result-object p1 + iget-object v0, p0, Landroid/support/v7/widget/TooltipPopup;->mContext:Landroid/content/Context; - iput-object p1, v0, Landroid/view/WindowManager$LayoutParams;->packageName:Ljava/lang/String; + invoke-virtual {v0}, Landroid/content/Context;->getPackageName()Ljava/lang/String; + + move-result-object v0 - const/16 p1, 0x3ea + iput-object v0, p1, Landroid/view/WindowManager$LayoutParams;->packageName:Ljava/lang/String; .line 66 - iput p1, v0, Landroid/view/WindowManager$LayoutParams;->type:I + iget-object p1, p0, Landroid/support/v7/widget/TooltipPopup;->mLayoutParams:Landroid/view/WindowManager$LayoutParams; - const/4 p1, -0x2 + const/16 v0, 0x3ea + + iput v0, p1, Landroid/view/WindowManager$LayoutParams;->type:I + + const/4 v0, -0x2 .line 67 - iput p1, v0, Landroid/view/WindowManager$LayoutParams;->width:I + iput v0, p1, Landroid/view/WindowManager$LayoutParams;->width:I .line 68 - iput p1, v0, Landroid/view/WindowManager$LayoutParams;->height:I + iput v0, p1, Landroid/view/WindowManager$LayoutParams;->height:I - const/4 p1, -0x3 + const/4 v0, -0x3 .line 69 - iput p1, v0, Landroid/view/WindowManager$LayoutParams;->format:I + iput v0, p1, Landroid/view/WindowManager$LayoutParams;->format:I .line 70 - sget p1, Landroid/support/v7/appcompat/R$style;->Animation_AppCompat_Tooltip:I - - iput p1, v0, Landroid/view/WindowManager$LayoutParams;->windowAnimations:I + sget v0, Landroid/support/v7/appcompat/R$style;->Animation_AppCompat_Tooltip:I - const/16 p1, 0x18 + iput v0, p1, Landroid/view/WindowManager$LayoutParams;->windowAnimations:I .line 71 - iput p1, v0, Landroid/view/WindowManager$LayoutParams;->flags:I + iget-object p1, p0, Landroid/support/v7/widget/TooltipPopup;->mLayoutParams:Landroid/view/WindowManager$LayoutParams; + + const/16 v0, 0x18 + + iput v0, p1, Landroid/view/WindowManager$LayoutParams;->flags:I return-void .end method @@ -342,29 +364,31 @@ aput v4, p1, v2 - const/4 v6, 0x1 + const/4 v4, 0x1 .line 160 - aget v7, p1, v6 + aget v6, p1, v4 - aget v5, v5, v6 + aget v5, v5, v4 - sub-int/2addr v7, v5 + sub-int/2addr v6, v5 - aput v7, p1, v6 - - add-int/2addr v4, p2 + aput v6, p1, v4 .line 163 + aget p1, p1, v2 + + add-int/2addr p1, p2 + invoke-virtual {v3}, Landroid/view/View;->getWidth()I - move-result p1 + move-result p2 - div-int/lit8 p1, p1, 0x2 + div-int/lit8 p2, p2, 0x2 - sub-int/2addr v4, p1 + sub-int/2addr p1, p2 - iput v4, p5, Landroid/view/WindowManager$LayoutParams;->x:I + iput p1, p5, Landroid/view/WindowManager$LayoutParams;->x:I .line 165 invoke-static {v2, v2}, Landroid/view/View$MeasureSpec;->makeMeasureSpec(II)I @@ -386,13 +410,16 @@ .line 169 iget-object p2, p0, Landroid/support/v7/widget/TooltipPopup;->mTmpAnchorPos:[I - aget p2, p2, v6 + aget v2, p2, v4 - add-int/2addr p3, p2 + add-int/2addr v2, p3 - sub-int/2addr p3, v0 + sub-int/2addr v2, v0 + + sub-int/2addr v2, p1 - sub-int/2addr p3, p1 + .line 170 + aget p2, p2, v4 add-int/2addr p2, v1 @@ -400,10 +427,10 @@ if-eqz p4, :cond_7 - if-ltz p3, :cond_6 + if-ltz v2, :cond_6 .line 173 - iput p3, p5, Landroid/view/WindowManager$LayoutParams;->y:I + iput v2, p5, Landroid/view/WindowManager$LayoutParams;->y:I goto :goto_4 @@ -417,13 +444,13 @@ add-int/2addr p1, p2 .line 178 - iget-object p4, p0, Landroid/support/v7/widget/TooltipPopup;->mTmpDisplayFrame:Landroid/graphics/Rect; + iget-object p3, p0, Landroid/support/v7/widget/TooltipPopup;->mTmpDisplayFrame:Landroid/graphics/Rect; - invoke-virtual {p4}, Landroid/graphics/Rect;->height()I + invoke-virtual {p3}, Landroid/graphics/Rect;->height()I - move-result p4 + move-result p3 - if-gt p1, p4, :cond_8 + if-gt p1, p3, :cond_8 .line 179 iput p2, p5, Landroid/view/WindowManager$LayoutParams;->y:I @@ -432,7 +459,7 @@ .line 181 :cond_8 - iput p3, p5, Landroid/view/WindowManager$LayoutParams;->y:I + iput v2, p5, Landroid/view/WindowManager$LayoutParams;->y:I :goto_4 return-void diff --git a/smali/android/support/v7/widget/VectorEnabledTintResources.smali b/smali/android/support/v7/widget/VectorEnabledTintResources.smali index 72fb2aef..faa85be2 100644 --- a/smali/android/support/v7/widget/VectorEnabledTintResources.smali +++ b/smali/android/support/v7/widget/VectorEnabledTintResources.smali @@ -3,6 +3,14 @@ .source "VectorEnabledTintResources.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field public static final MAX_SDK_WHERE_REQUIRED:I = 0x14 @@ -30,6 +38,14 @@ .method public constructor (Landroid/content/Context;Landroid/content/res/Resources;)V .locals 2 + .param p1 # Landroid/content/Context; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .param p2 # Landroid/content/res/Resources; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param .line 55 invoke-virtual {p2}, Landroid/content/res/Resources;->getAssets()Landroid/content/res/AssetManager; diff --git a/smali/android/support/v7/widget/ViewStubCompat.smali b/smali/android/support/v7/widget/ViewStubCompat.smali index 2b5e996b..595ccd41 100644 --- a/smali/android/support/v7/widget/ViewStubCompat.smali +++ b/smali/android/support/v7/widget/ViewStubCompat.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroid/support/v7/widget/ViewStubCompat$OnInflateListener; @@ -116,6 +122,11 @@ .method public draw(Landroid/graphics/Canvas;)V .locals 0 + .annotation build Landroid/annotation/SuppressLint; + value = { + "MissingSuperCall" + } + .end annotation return-void .end method diff --git a/smali/android/support/v7/widget/ViewUtils.smali b/smali/android/support/v7/widget/ViewUtils.smali index 13eea8f4..574172be 100644 --- a/smali/android/support/v7/widget/ViewUtils.smali +++ b/smali/android/support/v7/widget/ViewUtils.smali @@ -3,6 +3,14 @@ .source "ViewUtils.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field private static final TAG:Ljava/lang/String; = "ViewUtils" @@ -49,6 +57,8 @@ sput-object v0, Landroid/support/v7/widget/ViewUtils;->sComputeFitSystemWindowsMethod:Ljava/lang/reflect/Method; .line 46 + sget-object v0, Landroid/support/v7/widget/ViewUtils;->sComputeFitSystemWindowsMethod:Ljava/lang/reflect/Method; + invoke-virtual {v0}, Ljava/lang/reflect/Method;->isAccessible()Z move-result v0 @@ -96,6 +106,7 @@ const/4 v1, 0x2 + .line 68 :try_start_0 new-array v1, v1, [Ljava/lang/Object; @@ -107,7 +118,6 @@ aput-object p2, v1, p1 - .line 68 invoke-virtual {v0, p0, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; :try_end_0 .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0 @@ -192,10 +202,10 @@ .line 86 invoke-virtual {v2, v3}, Ljava/lang/reflect/Method;->setAccessible(Z)V + .line 88 :cond_0 new-array v3, v4, [Ljava/lang/Object; - .line 88 invoke-virtual {v2, p0, v3}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object; :try_end_0 .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_2 diff --git a/smali/android/support/v7/widget/WithHint.smali b/smali/android/support/v7/widget/WithHint.smali index ff8fd602..096b09e6 100644 --- a/smali/android/support/v7/widget/WithHint.smali +++ b/smali/android/support/v7/widget/WithHint.smali @@ -3,6 +3,16 @@ .source "WithHint.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # virtual methods .method public abstract getHint()Ljava/lang/CharSequence; + .annotation build Landroid/support/annotation/Nullable; + .end annotation .end method diff --git a/smali/androidx/core/graphics/drawable/IconCompatParcelizer.smali b/smali/androidx/core/graphics/drawable/IconCompatParcelizer.smali index 3ec1e0dc..0306b836 100644 --- a/smali/androidx/core/graphics/drawable/IconCompatParcelizer.smali +++ b/smali/androidx/core/graphics/drawable/IconCompatParcelizer.smali @@ -3,6 +3,14 @@ .source "IconCompatParcelizer.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # direct methods .method public constructor ()V .locals 0 diff --git a/smali/androidx/core/internal/package-info.smali b/smali/androidx/core/internal/package-info.smali index ecf68fe3..dbc13dba 100644 --- a/smali/androidx/core/internal/package-info.smali +++ b/smali/androidx/core/internal/package-info.smali @@ -1,3 +1,11 @@ .class interface abstract synthetic Landroidx/core/internal/package-info; .super Ljava/lang/Object; .source "package-info.java" + + +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation diff --git a/smali/androidx/versionedparcelable/CustomVersionedParcelable.smali b/smali/androidx/versionedparcelable/CustomVersionedParcelable.smali index 47c6da18..028ffc20 100644 --- a/smali/androidx/versionedparcelable/CustomVersionedParcelable.smali +++ b/smali/androidx/versionedparcelable/CustomVersionedParcelable.smali @@ -6,6 +6,14 @@ .implements Landroidx/versionedparcelable/VersionedParcelable; +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # direct methods .method public constructor ()V .locals 0 @@ -20,12 +28,22 @@ # virtual methods .method public onPostParceling()V .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation return-void .end method .method public onPreParceling(Z)V .locals 0 + .annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } + .end annotation return-void .end method diff --git a/smali/androidx/versionedparcelable/NonParcelField.smali b/smali/androidx/versionedparcelable/NonParcelField.smali index 1c83f58b..ea5dccc5 100644 --- a/smali/androidx/versionedparcelable/NonParcelField.smali +++ b/smali/androidx/versionedparcelable/NonParcelField.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation runtime Ljava/lang/annotation/Retention; value = .enum Ljava/lang/annotation/RetentionPolicy;->SOURCE:Ljava/lang/annotation/RetentionPolicy; .end annotation diff --git a/smali/androidx/versionedparcelable/ParcelField.smali b/smali/androidx/versionedparcelable/ParcelField.smali index efd9fdb5..a3c2f5b9 100644 --- a/smali/androidx/versionedparcelable/ParcelField.smali +++ b/smali/androidx/versionedparcelable/ParcelField.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation runtime Ljava/lang/annotation/Retention; value = .enum Ljava/lang/annotation/RetentionPolicy;->SOURCE:Ljava/lang/annotation/RetentionPolicy; .end annotation diff --git a/smali/androidx/versionedparcelable/ParcelImpl.smali b/smali/androidx/versionedparcelable/ParcelImpl.smali index 2dc7c191..26a81efd 100644 --- a/smali/androidx/versionedparcelable/ParcelImpl.smali +++ b/smali/androidx/versionedparcelable/ParcelImpl.smali @@ -6,6 +6,14 @@ .implements Landroid/os/Parcelable; +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field public static final CREATOR:Landroid/os/Parcelable$Creator; .annotation system Ldalvik/annotation/Signature; diff --git a/smali/androidx/versionedparcelable/ParcelUtils.smali b/smali/androidx/versionedparcelable/ParcelUtils.smali index 642de258..da8191b4 100644 --- a/smali/androidx/versionedparcelable/ParcelUtils.smali +++ b/smali/androidx/versionedparcelable/ParcelUtils.smali @@ -3,6 +3,14 @@ .source "ParcelUtils.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # direct methods .method private constructor ()V .locals 0 diff --git a/smali/androidx/versionedparcelable/R.smali b/smali/androidx/versionedparcelable/R.smali index 22d8174c..7733ea4a 100644 --- a/smali/androidx/versionedparcelable/R.smali +++ b/smali/androidx/versionedparcelable/R.smali @@ -1,11 +1,13 @@ .class public final Landroidx/versionedparcelable/R; .super Ljava/lang/Object; +.source "R.java" # direct methods .method private constructor ()V .locals 0 + .line 10 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/androidx/versionedparcelable/VersionedParcel.smali b/smali/androidx/versionedparcelable/VersionedParcel.smali index 88025349..b9b9857e 100644 --- a/smali/androidx/versionedparcelable/VersionedParcel.smali +++ b/smali/androidx/versionedparcelable/VersionedParcel.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroidx/versionedparcelable/VersionedParcel$ParcelException; @@ -226,13 +232,13 @@ const/4 v1, 0x2 + .line 1486 new-array v1, v1, [Ljava/lang/Object; const/4 v2, 0x0 aput-object v0, v1, v2 - .line 1486 invoke-virtual {p0}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String; move-result-object v0 @@ -261,6 +267,12 @@ .method protected static getRootCause(Ljava/lang/Throwable;)Ljava/lang/Throwable; .locals 1 + .param p0 # Ljava/lang/Throwable; + .annotation build Landroid/support/annotation/NonNull; + .end annotation + .end param + .annotation build Landroid/support/annotation/NonNull; + .end annotation .line 1114 :goto_0 @@ -544,35 +556,37 @@ .end annotation .line 1438 + :try_start_0 const-class v0, Landroidx/versionedparcelable/VersionedParcel; - :try_start_0 invoke-virtual {v0}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader; - move-result-object v1 + move-result-object v0 - const/4 v2, 0x1 + const/4 v1, 0x1 - invoke-static {p0, v2, v1}, Ljava/lang/Class;->forName(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class; + invoke-static {p0, v1, v0}, Ljava/lang/Class;->forName(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class; move-result-object p0 - const-string v1, "read" + const-string v0, "read" - new-array v3, v2, [Ljava/lang/Class; + .line 1439 + new-array v2, v1, [Ljava/lang/Class; + + const-class v3, Landroidx/versionedparcelable/VersionedParcel; const/4 v4, 0x0 - aput-object v0, v3, v4 + aput-object v3, v2, v4 - .line 1439 - invoke-virtual {p0, v1, v3}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method; + invoke-virtual {p0, v0, v2}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method; move-result-object p0 const/4 v0, 0x0 - new-array v1, v2, [Ljava/lang/Object; + new-array v1, v1, [Ljava/lang/Object; aput-object p1, v1, v4 @@ -960,9 +974,9 @@ const/4 v2, 0x2 + .line 1461 new-array v3, v2, [Ljava/lang/Class; - .line 1461 invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class; move-result-object v4 @@ -2115,6 +2129,9 @@ .method public readSize(Landroid/util/Size;I)Landroid/util/Size; .locals 1 + .annotation build Landroid/support/annotation/RequiresApi; + api = 0x15 + .end annotation .line 1162 invoke-virtual {p0, p2}, Landroidx/versionedparcelable/VersionedParcel;->readField(I)Z @@ -2158,6 +2175,9 @@ .method public readSizeF(Landroid/util/SizeF;I)Landroid/util/SizeF; .locals 1 + .annotation build Landroid/support/annotation/RequiresApi; + api = 0x15 + .end annotation .line 1178 invoke-virtual {p0, p2}, Landroidx/versionedparcelable/VersionedParcel;->readField(I)Z @@ -3173,6 +3193,9 @@ .method public writeSize(Landroid/util/Size;I)V .locals 0 + .annotation build Landroid/support/annotation/RequiresApi; + api = 0x15 + .end annotation .line 478 invoke-virtual {p0, p2}, Landroidx/versionedparcelable/VersionedParcel;->setOutputField(I)V @@ -3212,6 +3235,9 @@ .method public writeSizeF(Landroid/util/SizeF;I)V .locals 0 + .annotation build Landroid/support/annotation/RequiresApi; + api = 0x15 + .end annotation .line 492 invoke-virtual {p0, p2}, Landroidx/versionedparcelable/VersionedParcel;->setOutputField(I)V diff --git a/smali/androidx/versionedparcelable/VersionedParcelParcel.smali b/smali/androidx/versionedparcelable/VersionedParcelParcel.smali index 9d382394..bd41c3f3 100644 --- a/smali/androidx/versionedparcelable/VersionedParcelParcel.smali +++ b/smali/androidx/versionedparcelable/VersionedParcelParcel.smali @@ -3,6 +3,14 @@ .source "VersionedParcelParcel.java" +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + + # static fields .field private static final DEBUG:Z = false @@ -63,6 +71,11 @@ .line 42 iput v0, p0, Landroidx/versionedparcelable/VersionedParcelParcel;->mCurrentField:I + const/4 v0, 0x0 + + .line 43 + iput v0, p0, Landroidx/versionedparcelable/VersionedParcelParcel;->mNextRead:I + .line 50 iput-object p1, p0, Landroidx/versionedparcelable/VersionedParcelParcel;->mParcel:Landroid/os/Parcel; @@ -73,7 +86,9 @@ iput p3, p0, Landroidx/versionedparcelable/VersionedParcelParcel;->mEnd:I .line 53 - iput p2, p0, Landroidx/versionedparcelable/VersionedParcelParcel;->mNextRead:I + iget p1, p0, Landroidx/versionedparcelable/VersionedParcelParcel;->mOffset:I + + iput p1, p0, Landroidx/versionedparcelable/VersionedParcelParcel;->mNextRead:I .line 54 iput-object p4, p0, Landroidx/versionedparcelable/VersionedParcelParcel;->mPrefix:Ljava/lang/String; diff --git a/smali/androidx/versionedparcelable/VersionedParcelStream$FieldBuffer.smali b/smali/androidx/versionedparcelable/VersionedParcelStream$FieldBuffer.smali index cf7d4169..c2dc00b6 100644 --- a/smali/androidx/versionedparcelable/VersionedParcelStream$FieldBuffer.smali +++ b/smali/androidx/versionedparcelable/VersionedParcelStream$FieldBuffer.smali @@ -39,11 +39,13 @@ iput-object v0, p0, Landroidx/versionedparcelable/VersionedParcelStream$FieldBuffer;->mOutput:Ljava/io/ByteArrayOutputStream; .line 484 - new-instance v1, Ljava/io/DataOutputStream; + new-instance v0, Ljava/io/DataOutputStream; - invoke-direct {v1, v0}, Ljava/io/DataOutputStream;->(Ljava/io/OutputStream;)V + iget-object v1, p0, Landroidx/versionedparcelable/VersionedParcelStream$FieldBuffer;->mOutput:Ljava/io/ByteArrayOutputStream; - iput-object v1, p0, Landroidx/versionedparcelable/VersionedParcelStream$FieldBuffer;->mDataStream:Ljava/io/DataOutputStream; + invoke-direct {v0, v1}, Ljava/io/DataOutputStream;->(Ljava/io/OutputStream;)V + + iput-object v0, p0, Landroidx/versionedparcelable/VersionedParcelStream$FieldBuffer;->mDataStream:Ljava/io/DataOutputStream; .line 489 iput p1, p0, Landroidx/versionedparcelable/VersionedParcelStream$FieldBuffer;->mFieldId:I diff --git a/smali/androidx/versionedparcelable/VersionedParcelStream$InputBuffer.smali b/smali/androidx/versionedparcelable/VersionedParcelStream$InputBuffer.smali index 8d613a5d..f08d452e 100644 --- a/smali/androidx/versionedparcelable/VersionedParcelStream$InputBuffer.smali +++ b/smali/androidx/versionedparcelable/VersionedParcelStream$InputBuffer.smali @@ -41,7 +41,9 @@ iput p1, p0, Landroidx/versionedparcelable/VersionedParcelStream$InputBuffer;->mFieldId:I .line 513 - new-array p1, p2, [B + iget p1, p0, Landroidx/versionedparcelable/VersionedParcelStream$InputBuffer;->mSize:I + + new-array p1, p1, [B .line 514 invoke-virtual {p3, p1}, Ljava/io/DataInputStream;->readFully([B)V diff --git a/smali/androidx/versionedparcelable/VersionedParcelStream.smali b/smali/androidx/versionedparcelable/VersionedParcelStream.smali index 6f2d2d18..dce60e2c 100644 --- a/smali/androidx/versionedparcelable/VersionedParcelStream.smali +++ b/smali/androidx/versionedparcelable/VersionedParcelStream.smali @@ -4,6 +4,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/MemberClasses; value = { Landroidx/versionedparcelable/VersionedParcelStream$InputBuffer;, @@ -127,10 +133,14 @@ iput-object v0, p0, Landroidx/versionedparcelable/VersionedParcelStream;->mMasterOutput:Ljava/io/DataOutputStream; .line 74 - iput-object v1, p0, Landroidx/versionedparcelable/VersionedParcelStream;->mCurrentInput:Ljava/io/DataInputStream; + iget-object p1, p0, Landroidx/versionedparcelable/VersionedParcelStream;->mMasterInput:Ljava/io/DataInputStream; + + iput-object p1, p0, Landroidx/versionedparcelable/VersionedParcelStream;->mCurrentInput:Ljava/io/DataInputStream; .line 75 - iput-object v0, p0, Landroidx/versionedparcelable/VersionedParcelStream;->mCurrentOutput:Ljava/io/DataOutputStream; + iget-object p1, p0, Landroidx/versionedparcelable/VersionedParcelStream;->mMasterOutput:Ljava/io/DataOutputStream; + + iput-object p1, p0, Landroidx/versionedparcelable/VersionedParcelStream;->mCurrentOutput:Ljava/io/DataOutputStream; return-void .end method @@ -264,9 +274,9 @@ :pswitch_a const/4 p1, 0x0 + .line 442 new-array p1, p1, [Ljava/lang/String; - .line 442 invoke-virtual {p0, p1}, Landroidx/versionedparcelable/VersionedParcelStream;->readArray([Ljava/lang/Object;)[Ljava/lang/Object; move-result-object p1 @@ -1111,7 +1121,9 @@ iput-object v0, p0, Landroidx/versionedparcelable/VersionedParcelStream;->mFieldBuffer:Landroidx/versionedparcelable/VersionedParcelStream$FieldBuffer; .line 143 - iget-object p1, v0, Landroidx/versionedparcelable/VersionedParcelStream$FieldBuffer;->mDataStream:Ljava/io/DataOutputStream; + iget-object p1, p0, Landroidx/versionedparcelable/VersionedParcelStream;->mFieldBuffer:Landroidx/versionedparcelable/VersionedParcelStream$FieldBuffer; + + iget-object p1, p1, Landroidx/versionedparcelable/VersionedParcelStream$FieldBuffer;->mDataStream:Ljava/io/DataOutputStream; iput-object p1, p0, Landroidx/versionedparcelable/VersionedParcelStream;->mCurrentOutput:Ljava/io/DataOutputStream; @@ -1235,13 +1247,9 @@ invoke-direct {v0, p1}, Landroidx/versionedparcelable/VersionedParcel$ParcelException;->(Ljava/lang/Throwable;)V - goto :goto_2 - - :goto_1 throw v0 - :goto_2 - goto :goto_1 + return-void .end method .method public writeByteArray([B)V diff --git a/smali/androidx/versionedparcelable/VersionedParcelable.smali b/smali/androidx/versionedparcelable/VersionedParcelable.smali index 4b6078e6..1ca0e7e8 100644 --- a/smali/androidx/versionedparcelable/VersionedParcelable.smali +++ b/smali/androidx/versionedparcelable/VersionedParcelable.smali @@ -1,3 +1,11 @@ .class public interface abstract Landroidx/versionedparcelable/VersionedParcelable; .super Ljava/lang/Object; .source "VersionedParcelable.java" + + +# annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation diff --git a/smali/androidx/versionedparcelable/VersionedParcelize.smali b/smali/androidx/versionedparcelable/VersionedParcelize.smali index 83b45cee..b70be85e 100644 --- a/smali/androidx/versionedparcelable/VersionedParcelize.smali +++ b/smali/androidx/versionedparcelable/VersionedParcelize.smali @@ -7,6 +7,12 @@ # annotations +.annotation build Landroid/support/annotation/RestrictTo; + value = { + .enum Landroid/support/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroid/support/annotation/RestrictTo$Scope; + } +.end annotation + .annotation system Ldalvik/annotation/AnnotationDefault; value = .subannotation Landroidx/versionedparcelable/VersionedParcelize; allowSerialization = false diff --git a/smali/com/android/js/R$anim.smali b/smali/com/android/js/R$anim.smali index 166aaf0f..d2c254c1 100644 --- a/smali/com/android/js/R$anim.smali +++ b/smali/com/android/js/R$anim.smali @@ -1,5 +1,6 @@ .class public final Lcom/android/js/R$anim; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -43,6 +44,7 @@ .method private constructor ()V .locals 0 + .line 13 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/com/android/js/R$attr.smali b/smali/com/android/js/R$attr.smali index dac20dc3..7823178e 100644 --- a/smali/com/android/js/R$attr.smali +++ b/smali/com/android/js/R$attr.smali @@ -1,5 +1,6 @@ .class public final Lcom/android/js/R$attr; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -563,6 +564,7 @@ .method private constructor ()V .locals 0 + .line 29 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/com/android/js/R$bool.smali b/smali/com/android/js/R$bool.smali index 9b919f4d..0c54296c 100644 --- a/smali/com/android/js/R$bool.smali +++ b/smali/com/android/js/R$bool.smali @@ -1,5 +1,6 @@ .class public final Lcom/android/js/R$bool; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -25,6 +26,7 @@ .method private constructor ()V .locals 0 + .line 305 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/com/android/js/R$color.smali b/smali/com/android/js/R$color.smali index 876c77bd..6de0d356 100644 --- a/smali/com/android/js/R$color.smali +++ b/smali/com/android/js/R$color.smali @@ -1,5 +1,6 @@ .class public final Lcom/android/js/R$color; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -187,6 +188,7 @@ .method private constructor ()V .locals 0 + .line 312 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/com/android/js/R$dimen.smali b/smali/com/android/js/R$dimen.smali index 6fec8e3a..ff21ee32 100644 --- a/smali/com/android/js/R$dimen.smali +++ b/smali/com/android/js/R$dimen.smali @@ -1,5 +1,6 @@ .class public final Lcom/android/js/R$dimen; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -247,6 +248,7 @@ .method private constructor ()V .locals 0 + .line 400 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/com/android/js/R$drawable.smali b/smali/com/android/js/R$drawable.smali index 0de69791..7803ef44 100644 --- a/smali/com/android/js/R$drawable.smali +++ b/smali/com/android/js/R$drawable.smali @@ -1,5 +1,6 @@ .class public final Lcom/android/js/R$drawable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -215,6 +216,7 @@ .method private constructor ()V .locals 0 + .line 518 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/com/android/js/R$id.smali b/smali/com/android/js/R$id.smali index 3a4f9b2b..c7a54999 100644 --- a/smali/com/android/js/R$id.smali +++ b/smali/com/android/js/R$id.smali @@ -1,5 +1,6 @@ .class public final Lcom/android/js/R$id; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -231,6 +232,7 @@ .method private constructor ()V .locals 0 + .line 620 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/com/android/js/R$integer.smali b/smali/com/android/js/R$integer.smali index 99e7cb74..8ab9b153 100644 --- a/smali/com/android/js/R$integer.smali +++ b/smali/com/android/js/R$integer.smali @@ -1,5 +1,6 @@ .class public final Lcom/android/js/R$integer; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -29,6 +30,7 @@ .method private constructor ()V .locals 0 + .line 730 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/com/android/js/R$layout.smali b/smali/com/android/js/R$layout.smali index 519fddcf..85b40d89 100644 --- a/smali/com/android/js/R$layout.smali +++ b/smali/com/android/js/R$layout.smali @@ -1,5 +1,6 @@ .class public final Lcom/android/js/R$layout; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -95,6 +96,7 @@ .method private constructor ()V .locals 0 + .line 739 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/com/android/js/R$string.smali b/smali/com/android/js/R$string.smali index 29b04104..bcd10e6b 100644 --- a/smali/com/android/js/R$string.smali +++ b/smali/com/android/js/R$string.smali @@ -1,5 +1,6 @@ .class public final Lcom/android/js/R$string; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -103,6 +104,7 @@ .method private constructor ()V .locals 0 + .line 781 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/com/android/js/R$style.smali b/smali/com/android/js/R$style.smali index 04921a5d..3927d053 100644 --- a/smali/com/android/js/R$style.smali +++ b/smali/com/android/js/R$style.smali @@ -1,5 +1,6 @@ .class public final Lcom/android/js/R$style; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -711,6 +712,7 @@ .method private constructor ()V .locals 0 + .line 827 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/com/android/js/R$styleable.smali b/smali/com/android/js/R$styleable.smali index 77dd6004..05c47b78 100644 --- a/smali/com/android/js/R$styleable.smali +++ b/smali/com/android/js/R$styleable.smali @@ -1,5 +1,6 @@ .class public final Lcom/android/js/R$styleable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -934,11 +935,12 @@ # direct methods -.method public static constructor ()V +.method static constructor ()V .locals 10 const/16 v0, 0x1d + .line 1179 new-array v1, v0, [I fill-array-data v1, :array_0 @@ -947,39 +949,44 @@ const/4 v1, 0x1 + .line 1209 new-array v2, v1, [I - const v3, 0x10100b3 + const/4 v3, 0x0 - const/4 v4, 0x0 + const v4, 0x10100b3 - aput v3, v2, v4 + aput v4, v2, v3 sput-object v2, Lcom/android/js/R$styleable;->ActionBarLayout:[I + .line 1211 new-array v2, v1, [I - const v3, 0x101013f + const v4, 0x101013f - aput v3, v2, v4 + aput v4, v2, v3 sput-object v2, Lcom/android/js/R$styleable;->ActionMenuItemView:[I - new-array v2, v4, [I + .line 1213 + new-array v2, v3, [I sput-object v2, Lcom/android/js/R$styleable;->ActionMenuView:[I const/4 v2, 0x6 - new-array v3, v2, [I + .line 1214 + new-array v4, v2, [I - fill-array-data v3, :array_1 + fill-array-data v4, :array_1 - sput-object v3, Lcom/android/js/R$styleable;->ActionMode:[I + sput-object v4, Lcom/android/js/R$styleable;->ActionMode:[I - const/4 v3, 0x2 + const/4 v4, 0x2 - new-array v5, v3, [I + .line 1221 + new-array v5, v4, [I fill-array-data v5, :array_2 @@ -987,19 +994,22 @@ const/16 v5, 0x8 + .line 1224 new-array v6, v5, [I fill-array-data v6, :array_3 sput-object v6, Lcom/android/js/R$styleable;->AlertDialog:[I + .line 1233 new-array v6, v2, [I fill-array-data v6, :array_4 sput-object v6, Lcom/android/js/R$styleable;->AnimatedStateListDrawableCompat:[I - new-array v6, v3, [I + .line 1240 + new-array v6, v4, [I fill-array-data v6, :array_5 @@ -1007,18 +1017,21 @@ const/4 v6, 0x4 + .line 1243 new-array v7, v6, [I fill-array-data v7, :array_6 sput-object v7, Lcom/android/js/R$styleable;->AnimatedStateListDrawableTransition:[I + .line 1248 new-array v7, v6, [I fill-array-data v7, :array_7 sput-object v7, Lcom/android/js/R$styleable;->AppCompatImageView:[I + .line 1253 new-array v7, v6, [I fill-array-data v7, :array_8 @@ -1027,6 +1040,7 @@ const/4 v7, 0x7 + .line 1258 new-array v8, v7, [I fill-array-data v8, :array_9 @@ -1035,6 +1049,7 @@ const/16 v8, 0xb + .line 1266 new-array v8, v8, [I fill-array-data v8, :array_a @@ -1043,52 +1058,60 @@ const/16 v8, 0x79 + .line 1278 new-array v8, v8, [I fill-array-data v8, :array_b sput-object v8, Lcom/android/js/R$styleable;->AppCompatTheme:[I + .line 1400 new-array v8, v1, [I const v9, 0x7f020026 - aput v9, v8, v4 + aput v9, v8, v3 sput-object v8, Lcom/android/js/R$styleable;->ButtonBarLayout:[I const/4 v8, 0x3 + .line 1402 new-array v9, v8, [I fill-array-data v9, :array_c sput-object v9, Lcom/android/js/R$styleable;->ColorStateListItem:[I + .line 1406 new-array v9, v8, [I fill-array-data v9, :array_d sput-object v9, Lcom/android/js/R$styleable;->CompoundButton:[I - new-array v9, v3, [I + .line 1410 + new-array v9, v4, [I fill-array-data v9, :array_e sput-object v9, Lcom/android/js/R$styleable;->CoordinatorLayout:[I + .line 1413 new-array v7, v7, [I fill-array-data v7, :array_f sput-object v7, Lcom/android/js/R$styleable;->CoordinatorLayout_Layout:[I + .line 1421 new-array v5, v5, [I fill-array-data v5, :array_10 sput-object v5, Lcom/android/js/R$styleable;->DrawerArrowToggle:[I + .line 1430 new-array v5, v2, [I fill-array-data v5, :array_11 @@ -1097,6 +1120,7 @@ const/16 v5, 0xa + .line 1437 new-array v5, v5, [I fill-array-data v5, :array_12 @@ -1105,13 +1129,15 @@ const/16 v5, 0xc + .line 1448 new-array v5, v5, [I fill-array-data v5, :array_13 sput-object v5, Lcom/android/js/R$styleable;->GradientColor:[I - new-array v5, v3, [I + .line 1461 + new-array v5, v4, [I fill-array-data v5, :array_14 @@ -1119,24 +1145,28 @@ const/16 v5, 0x9 + .line 1464 new-array v7, v5, [I fill-array-data v7, :array_15 sput-object v7, Lcom/android/js/R$styleable;->LinearLayoutCompat:[I + .line 1474 new-array v6, v6, [I fill-array-data v6, :array_16 sput-object v6, Lcom/android/js/R$styleable;->LinearLayoutCompat_Layout:[I - new-array v6, v3, [I + .line 1479 + new-array v6, v4, [I fill-array-data v6, :array_17 sput-object v6, Lcom/android/js/R$styleable;->ListPopupWindow:[I + .line 1482 new-array v6, v2, [I fill-array-data v6, :array_18 @@ -1145,70 +1175,80 @@ const/16 v6, 0x17 + .line 1489 new-array v6, v6, [I fill-array-data v6, :array_19 sput-object v6, Lcom/android/js/R$styleable;->MenuItem:[I + .line 1513 new-array v5, v5, [I fill-array-data v5, :array_1a sput-object v5, Lcom/android/js/R$styleable;->MenuView:[I + .line 1523 new-array v5, v8, [I fill-array-data v5, :array_1b sput-object v5, Lcom/android/js/R$styleable;->PopupWindow:[I + .line 1527 new-array v5, v1, [I const v6, 0x7f020173 - aput v6, v5, v4 + aput v6, v5, v3 sput-object v5, Lcom/android/js/R$styleable;->PopupWindowBackgroundState:[I - new-array v3, v3, [I + .line 1529 + new-array v4, v4, [I - fill-array-data v3, :array_1c + fill-array-data v4, :array_1c - sput-object v3, Lcom/android/js/R$styleable;->RecycleListView:[I + sput-object v4, Lcom/android/js/R$styleable;->RecycleListView:[I - const/16 v3, 0x11 + const/16 v4, 0x11 - new-array v3, v3, [I + .line 1532 + new-array v4, v4, [I - fill-array-data v3, :array_1d + fill-array-data v4, :array_1d - sput-object v3, Lcom/android/js/R$styleable;->SearchView:[I + sput-object v4, Lcom/android/js/R$styleable;->SearchView:[I - const/4 v3, 0x5 + const/4 v4, 0x5 - new-array v5, v3, [I + .line 1550 + new-array v5, v4, [I fill-array-data v5, :array_1e sput-object v5, Lcom/android/js/R$styleable;->Spinner:[I + .line 1556 new-array v2, v2, [I fill-array-data v2, :array_1f sput-object v2, Lcom/android/js/R$styleable;->StateListDrawable:[I + .line 1563 new-array v1, v1, [I const v2, 0x1010199 - aput v2, v1, v4 + aput v2, v1, v3 sput-object v1, Lcom/android/js/R$styleable;->StateListDrawableItem:[I const/16 v1, 0xe + .line 1565 new-array v1, v1, [I fill-array-data v1, :array_20 @@ -1217,30 +1257,35 @@ const/16 v1, 0xd + .line 1580 new-array v1, v1, [I fill-array-data v1, :array_21 sput-object v1, Lcom/android/js/R$styleable;->TextAppearance:[I + .line 1594 new-array v0, v0, [I fill-array-data v0, :array_22 sput-object v0, Lcom/android/js/R$styleable;->Toolbar:[I - new-array v0, v3, [I + .line 1624 + new-array v0, v4, [I fill-array-data v0, :array_23 sput-object v0, Lcom/android/js/R$styleable;->View:[I + .line 1630 new-array v0, v8, [I fill-array-data v0, :array_24 sput-object v0, Lcom/android/js/R$styleable;->ViewBackgroundHelper:[I + .line 1634 new-array v0, v8, [I fill-array-data v0, :array_25 @@ -1815,6 +1860,7 @@ .method private constructor ()V .locals 0 + .line 1177 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/com/android/js/R.smali b/smali/com/android/js/R.smali index bc929450..195251ea 100644 --- a/smali/com/android/js/R.smali +++ b/smali/com/android/js/R.smali @@ -1,22 +1,23 @@ .class public final Lcom/android/js/R; .super Ljava/lang/Object; +.source "R.java" # annotations .annotation system Ldalvik/annotation/MemberClasses; value = { - Lcom/android/js/R$anim;, - Lcom/android/js/R$attr;, - Lcom/android/js/R$bool;, - Lcom/android/js/R$color;, - Lcom/android/js/R$dimen;, - Lcom/android/js/R$drawable;, - Lcom/android/js/R$id;, - Lcom/android/js/R$integer;, - Lcom/android/js/R$layout;, - Lcom/android/js/R$string;, + Lcom/android/js/R$styleable;, Lcom/android/js/R$style;, - Lcom/android/js/R$styleable; + Lcom/android/js/R$string;, + Lcom/android/js/R$layout;, + Lcom/android/js/R$integer;, + Lcom/android/js/R$id;, + Lcom/android/js/R$drawable;, + Lcom/android/js/R$dimen;, + Lcom/android/js/R$color;, + Lcom/android/js/R$bool;, + Lcom/android/js/R$attr;, + Lcom/android/js/R$anim; } .end annotation @@ -25,6 +26,7 @@ .method private constructor ()V .locals 0 + .line 10 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/com/android/js/api/App$1.smali b/smali/com/android/js/api/App$1.smali deleted file mode 100644 index c2d6da9c..00000000 --- a/smali/com/android/js/api/App$1.smali +++ /dev/null @@ -1,62 +0,0 @@ -.class Lcom/android/js/api/App$1; -.super Ljava/lang/Object; -.source "App.java" - -# interfaces -.implements Ljava/lang/Runnable; - - -# annotations -.annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/android/js/api/App;->setDefaultFontSize(I)V -.end annotation - -.annotation system Ldalvik/annotation/InnerClass; - accessFlags = 0x0 - name = null -.end annotation - - -# instance fields -.field final synthetic this$0:Lcom/android/js/api/App; - -.field final synthetic val$fontSize:I - - -# direct methods -.method constructor (Lcom/android/js/api/App;I)V - .locals 0 - - .line 66 - iput-object p1, p0, Lcom/android/js/api/App$1;->this$0:Lcom/android/js/api/App; - - iput p2, p0, Lcom/android/js/api/App$1;->val$fontSize:I - - invoke-direct {p0}, Ljava/lang/Object;->()V - - return-void -.end method - - -# virtual methods -.method public run()V - .locals 2 - - .line 69 - iget-object v0, p0, Lcom/android/js/api/App$1;->this$0:Lcom/android/js/api/App; - - invoke-static {v0}, Lcom/android/js/api/App;->access$000(Lcom/android/js/api/App;)Landroid/webkit/WebView; - - move-result-object v0 - - invoke-virtual {v0}, Landroid/webkit/WebView;->getSettings()Landroid/webkit/WebSettings; - - move-result-object v0 - - .line 70 - iget v1, p0, Lcom/android/js/api/App$1;->val$fontSize:I - - invoke-virtual {v0, v1}, Landroid/webkit/WebSettings;->setDefaultFontSize(I)V - - return-void -.end method diff --git a/smali/com/android/js/api/App.smali b/smali/com/android/js/api/App.smali index bc34d2d3..4b52ab16 100644 --- a/smali/com/android/js/api/App.smali +++ b/smali/com/android/js/api/App.smali @@ -6,34 +6,20 @@ # instance fields .field private activity:Landroid/app/Activity; -.field private webView:Landroid/webkit/WebView; - # direct methods -.method public constructor (Landroid/app/Activity;Landroid/webkit/WebView;)V +.method public constructor (Landroid/app/Activity;)V .locals 0 - .line 23 + .line 19 invoke-direct {p0}, Ljava/lang/Object;->()V - .line 24 + .line 20 iput-object p1, p0, Lcom/android/js/api/App;->activity:Landroid/app/Activity; - .line 25 - iput-object p2, p0, Lcom/android/js/api/App;->webView:Landroid/webkit/WebView; - return-void .end method -.method static synthetic access$000(Lcom/android/js/api/App;)Landroid/webkit/WebView; - .locals 0 - - .line 19 - iget-object p0, p0, Lcom/android/js/api/App;->webView:Landroid/webkit/WebView; - - return-object p0 -.end method - # virtual methods .method public getPath(Ljava/lang/String;)Ljava/lang/String; @@ -41,14 +27,14 @@ const-string v0, "root" - .line 29 + .line 24 invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v0 if-eqz v0, :cond_0 - .line 30 + .line 25 invoke-static {}, Landroid/os/Environment;->getRootDirectory()Ljava/io/File; move-result-object p1 @@ -62,14 +48,14 @@ :cond_0 const-string v0, "data" - .line 31 + .line 26 invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v0 if-eqz v0, :cond_1 - .line 32 + .line 27 invoke-static {}, Landroid/os/Environment;->getDataDirectory()Ljava/io/File; move-result-object p1 @@ -83,14 +69,14 @@ :cond_1 const-string v0, "cache" - .line 33 + .line 28 invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v0 if-eqz v0, :cond_2 - .line 34 + .line 29 invoke-static {}, Landroid/os/Environment;->getDownloadCacheDirectory()Ljava/io/File; move-result-object p1 @@ -104,14 +90,14 @@ :cond_2 const-string v0, "storage" - .line 35 + .line 30 invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v0 if-eqz v0, :cond_3 - .line 36 + .line 31 invoke-static {}, Landroid/os/Environment;->getExternalStorageDirectory()Ljava/io/File; move-result-object p1 @@ -125,14 +111,14 @@ :cond_3 const-string v0, "alarms" - .line 37 + .line 32 invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v0 if-eqz v0, :cond_4 - .line 38 + .line 33 sget-object p1, Landroid/os/Environment;->DIRECTORY_ALARMS:Ljava/lang/String; invoke-static {p1}, Landroid/os/Environment;->getExternalStoragePublicDirectory(Ljava/lang/String;)Ljava/io/File; @@ -148,14 +134,14 @@ :cond_4 const-string v0, "dcim" - .line 39 + .line 34 invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v0 if-eqz v0, :cond_5 - .line 40 + .line 35 sget-object p1, Landroid/os/Environment;->DIRECTORY_DCIM:Ljava/lang/String; invoke-static {p1}, Landroid/os/Environment;->getExternalStoragePublicDirectory(Ljava/lang/String;)Ljava/io/File; @@ -171,14 +157,14 @@ :cond_5 const-string v0, "downloads" - .line 41 + .line 36 invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v0 if-eqz v0, :cond_6 - .line 42 + .line 37 sget-object p1, Landroid/os/Environment;->DIRECTORY_DOWNLOADS:Ljava/lang/String; invoke-static {p1}, Landroid/os/Environment;->getExternalStoragePublicDirectory(Ljava/lang/String;)Ljava/io/File; @@ -194,14 +180,14 @@ :cond_6 const-string v0, "movies" - .line 43 + .line 38 invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v0 if-eqz v0, :cond_7 - .line 44 + .line 39 sget-object p1, Landroid/os/Environment;->DIRECTORY_MOVIES:Ljava/lang/String; invoke-static {p1}, Landroid/os/Environment;->getExternalStoragePublicDirectory(Ljava/lang/String;)Ljava/io/File; @@ -217,14 +203,14 @@ :cond_7 const-string v0, "music" - .line 45 + .line 40 invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v0 if-eqz v0, :cond_8 - .line 46 + .line 41 sget-object p1, Landroid/os/Environment;->DIRECTORY_MUSIC:Ljava/lang/String; invoke-static {p1}, Landroid/os/Environment;->getExternalStoragePublicDirectory(Ljava/lang/String;)Ljava/io/File; @@ -240,14 +226,14 @@ :cond_8 const-string v0, "notifications" - .line 47 + .line 42 invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v0 if-eqz v0, :cond_9 - .line 48 + .line 43 sget-object p1, Landroid/os/Environment;->DIRECTORY_NOTIFICATIONS:Ljava/lang/String; invoke-static {p1}, Landroid/os/Environment;->getExternalStoragePublicDirectory(Ljava/lang/String;)Ljava/io/File; @@ -263,14 +249,14 @@ :cond_9 const-string v0, "pictures" - .line 49 + .line 44 invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v0 if-eqz v0, :cond_a - .line 50 + .line 45 sget-object p1, Landroid/os/Environment;->DIRECTORY_PICTURES:Ljava/lang/String; invoke-static {p1}, Landroid/os/Environment;->getExternalStoragePublicDirectory(Ljava/lang/String;)Ljava/io/File; @@ -286,14 +272,14 @@ :cond_a const-string v0, "podcasts" - .line 51 + .line 46 invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v0 if-eqz v0, :cond_b - .line 52 + .line 47 sget-object p1, Landroid/os/Environment;->DIRECTORY_PODCASTS:Ljava/lang/String; invoke-static {p1}, Landroid/os/Environment;->getExternalStoragePublicDirectory(Ljava/lang/String;)Ljava/io/File; @@ -309,14 +295,14 @@ :cond_b const-string v0, "ringtones" - .line 53 + .line 48 invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v0 if-eqz v0, :cond_c - .line 54 + .line 49 sget-object p1, Landroid/os/Environment;->DIRECTORY_RINGTONES:Ljava/lang/String; invoke-static {p1}, Landroid/os/Environment;->getExternalStoragePublicDirectory(Ljava/lang/String;)Ljava/io/File; @@ -332,14 +318,14 @@ :cond_c const-string v0, "appData" - .line 55 + .line 50 invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v0 if-eqz v0, :cond_d - .line 56 + .line 51 iget-object p1, p0, Lcom/android/js/api/App;->activity:Landroid/app/Activity; invoke-virtual {p1}, Landroid/app/Activity;->getFilesDir()Ljava/io/File; @@ -355,14 +341,14 @@ :cond_d const-string v0, "userData" - .line 57 + .line 52 invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result p1 if-eqz p1, :cond_e - .line 58 + .line 53 iget-object p1, p0, Lcom/android/js/api/App;->activity:Landroid/app/Activity; const/4 v0, 0x0 @@ -382,24 +368,3 @@ return-object p1 .end method - -.method public setDefaultFontSize(I)V - .locals 2 - - .line 65 - iget-object v0, p0, Lcom/android/js/api/App;->webView:Landroid/webkit/WebView; - - if-nez v0, :cond_0 - - return-void - - .line 66 - :cond_0 - new-instance v1, Lcom/android/js/api/App$1; - - invoke-direct {v1, p0, p1}, Lcom/android/js/api/App$1;->(Lcom/android/js/api/App;I)V - - invoke-virtual {v0, v1}, Landroid/webkit/WebView;->post(Ljava/lang/Runnable;)Z - - return-void -.end method diff --git a/smali/com/android/js/api/Contact.smali b/smali/com/android/js/api/Contact.smali index 9faffd6b..bc7f7747 100644 --- a/smali/com/android/js/api/Contact.smali +++ b/smali/com/android/js/api/Contact.smali @@ -48,19 +48,19 @@ move-result-object v1 - const-string v2, "account_type" + const/4 v2, 0x0 - const/4 v3, 0x0 + const-string v3, "account_type" .line 53 - invoke-virtual {v1, v2, v3}, Landroid/content/ContentProviderOperation$Builder;->withValue(Ljava/lang/String;Ljava/lang/Object;)Landroid/content/ContentProviderOperation$Builder; + invoke-virtual {v1, v3, v2}, Landroid/content/ContentProviderOperation$Builder;->withValue(Ljava/lang/String;Ljava/lang/Object;)Landroid/content/ContentProviderOperation$Builder; move-result-object v1 - const-string v2, "account_name" + const-string v3, "account_name" .line 54 - invoke-virtual {v1, v2, v3}, Landroid/content/ContentProviderOperation$Builder;->withValue(Ljava/lang/String;Ljava/lang/Object;)Landroid/content/ContentProviderOperation$Builder; + invoke-virtual {v1, v3, v2}, Landroid/content/ContentProviderOperation$Builder;->withValue(Ljava/lang/String;Ljava/lang/Object;)Landroid/content/ContentProviderOperation$Builder; move-result-object v1 diff --git a/smali/com/android/js/api/Hotspot$1.smali b/smali/com/android/js/api/Hotspot$1.smali index 729caa00..081327b3 100644 --- a/smali/com/android/js/api/Hotspot$1.smali +++ b/smali/com/android/js/api/Hotspot$1.smali @@ -43,6 +43,11 @@ .method public onStarted(Landroid/net/wifi/WifiManager$LocalOnlyHotspotReservation;)V .locals 1 + .annotation build Landroid/annotation/SuppressLint; + value = { + "SetTextI18n" + } + .end annotation .line 45 invoke-super {p0, p1}, Landroid/net/wifi/WifiManager$LocalOnlyHotspotCallback;->onStarted(Landroid/net/wifi/WifiManager$LocalOnlyHotspotReservation;)V diff --git a/smali/com/android/js/api/Hotspot.smali b/smali/com/android/js/api/Hotspot.smali index 46d0aacf..b0a2604e 100644 --- a/smali/com/android/js/api/Hotspot.smali +++ b/smali/com/android/js/api/Hotspot.smali @@ -22,6 +22,8 @@ iput-object p1, p0, Lcom/android/js/api/Hotspot;->activity:Landroid/app/Activity; .line 26 + iget-object p1, p0, Lcom/android/js/api/Hotspot;->activity:Landroid/app/Activity; + invoke-virtual {p1}, Landroid/app/Activity;->getApplicationContext()Landroid/content/Context; move-result-object p1 @@ -300,8 +302,8 @@ move-result v0 :try_end_0 - .catchall {:try_start_0 .. :try_end_0} :catchall_0 + .catch Ljava/lang/Throwable; {:try_start_0 .. :try_end_0} :catch_0 - :catchall_0 + :catch_0 return v0 .end method diff --git a/smali/com/android/js/api/Location.smali b/smali/com/android/js/api/Location.smali index d0cd9cdc..92ec1981 100644 --- a/smali/com/android/js/api/Location.smali +++ b/smali/com/android/js/api/Location.smali @@ -30,9 +30,11 @@ .line 21 iput-object p1, p0, Lcom/android/js/api/Location;->activity:Landroid/app/Activity; + .line 22 + iget-object p1, p0, Lcom/android/js/api/Location;->activity:Landroid/app/Activity; + const-string v0, "location" - .line 22 invoke-virtual {p1, v0}, Landroid/app/Activity;->getSystemService(Ljava/lang/String;)Ljava/lang/Object; move-result-object p1 @@ -122,16 +124,21 @@ if-eqz v1, :cond_1 + .line 43 :try_start_1 + iget-object v1, p0, Lcom/android/js/api/Location;->locationManager:Landroid/location/LocationManager; + const-string v3, "gps" - .line 43 invoke-virtual {v1, v3}, Landroid/location/LocationManager;->getLastKnownLocation(Ljava/lang/String;)Landroid/location/Location; move-result-object v1 iput-object v1, p0, Lcom/android/js/api/Location;->location:Landroid/location/Location; + .line 44 + iget-object v1, p0, Lcom/android/js/api/Location;->location:Landroid/location/Location; + if-eqz v1, :cond_1 .line 45 diff --git a/smali/com/android/js/api/MobileData.smali b/smali/com/android/js/api/MobileData.smali index 8fa3dc39..fcb44747 100644 --- a/smali/com/android/js/api/MobileData.smali +++ b/smali/com/android/js/api/MobileData.smali @@ -19,9 +19,11 @@ .line 12 iput-object p1, p0, Lcom/android/js/api/MobileData;->activity:Landroid/app/Activity; + .line 13 + iget-object p1, p0, Lcom/android/js/api/MobileData;->activity:Landroid/app/Activity; + const-string v0, "phone" - .line 13 invoke-virtual {p1, v0}, Landroid/app/Activity;->getSystemService(Ljava/lang/String;)Ljava/lang/Object; move-result-object p1 diff --git a/smali/com/android/js/api/Notification.smali b/smali/com/android/js/api/Notification.smali index d7c284dc..a4d28b5b 100644 --- a/smali/com/android/js/api/Notification.smali +++ b/smali/com/android/js/api/Notification.smali @@ -24,6 +24,11 @@ # direct methods .method public constructor (Landroid/app/Activity;ILjava/lang/String;)V .locals 1 + .annotation build Landroid/annotation/SuppressLint; + value = { + "PrivateApi" + } + .end annotation .line 25 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -31,9 +36,11 @@ .line 26 iput-object p1, p0, Lcom/android/js/api/Notification;->activity:Landroid/app/Activity; + .line 27 + iget-object p1, p0, Lcom/android/js/api/Notification;->activity:Landroid/app/Activity; + const-string v0, "notification" - .line 27 invoke-virtual {p1, v0}, Landroid/app/Activity;->getSystemService(Ljava/lang/String;)Ljava/lang/Object; move-result-object p1 @@ -102,9 +109,11 @@ iput-object p1, p0, Lcom/android/js/api/Notification;->notification_channel:Landroid/app/NotificationChannel; + .line 39 + iget-object p1, p0, Lcom/android/js/api/Notification;->notification_channel:Landroid/app/NotificationChannel; + const-string p2, "androidjs.notification.channel" - .line 39 invoke-virtual {p1, p2}, Landroid/app/NotificationChannel;->setDescription(Ljava/lang/String;)V .line 40 @@ -131,6 +140,8 @@ iput-object v0, p0, Lcom/android/js/api/Notification;->inbox_style:Landroid/support/v4/app/NotificationCompat$InboxStyle; .line 67 + iget-object v0, p0, Lcom/android/js/api/Notification;->inbox_style:Landroid/support/v4/app/NotificationCompat$InboxStyle; + invoke-virtual {v0, p1}, Landroid/support/v4/app/NotificationCompat$InboxStyle;->setBigContentTitle(Ljava/lang/CharSequence;)Landroid/support/v4/app/NotificationCompat$InboxStyle; const/4 p1, 0x0 @@ -193,6 +204,8 @@ iput-object v1, p0, Lcom/android/js/api/Notification;->notification_builder:Landroid/support/v4/app/NotificationCompat$Builder; .line 51 + iget-object v1, p0, Lcom/android/js/api/Notification;->notification_builder:Landroid/support/v4/app/NotificationCompat$Builder; + invoke-virtual {v1, p1}, Landroid/support/v4/app/NotificationCompat$Builder;->setContentTitle(Ljava/lang/CharSequence;)Landroid/support/v4/app/NotificationCompat$Builder; .line 52 diff --git a/smali/com/android/js/api/Wifi.smali b/smali/com/android/js/api/Wifi.smali index 3e788f78..39b2c774 100644 --- a/smali/com/android/js/api/Wifi.smali +++ b/smali/com/android/js/api/Wifi.smali @@ -20,6 +20,8 @@ iput-object p1, p0, Lcom/android/js/api/Wifi;->activity:Landroid/app/Activity; .line 21 + iget-object p1, p0, Lcom/android/js/api/Wifi;->activity:Landroid/app/Activity; + invoke-virtual {p1}, Landroid/app/Activity;->getApplicationContext()Landroid/content/Context; move-result-object p1 @@ -68,6 +70,7 @@ const/4 v1, 0x1 + .line 72 new-array v2, v1, [Ljava/lang/Object; const/4 v3, 0x0 @@ -76,7 +79,6 @@ const-string p1, "\"%s\"" - .line 72 invoke-static {p1, v2}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String; move-result-object v2 @@ -99,12 +101,12 @@ goto :goto_0 + .line 76 :cond_0 new-array v2, v1, [Ljava/lang/Object; aput-object p2, v2, v3 - .line 76 invoke-static {p1, v2}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String; move-result-object p1 diff --git a/smali/com/android/js/common/JavaWebviewBridge.smali b/smali/com/android/js/common/JavaWebviewBridge.smali index d8392d8f..b2b9cab2 100644 --- a/smali/com/android/js/common/JavaWebviewBridge.smali +++ b/smali/com/android/js/common/JavaWebviewBridge.smali @@ -37,7 +37,7 @@ # direct methods .method public constructor (Landroid/app/Activity;Landroid/webkit/WebView;ILjava/lang/String;)V - .locals 1 + .locals 0 .line 39 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -49,46 +49,46 @@ iput-object p2, p0, Lcom/android/js/common/JavaWebviewBridge;->myWebView:Landroid/webkit/WebView; .line 42 - new-instance v0, Lcom/android/js/api/Notification; + new-instance p2, Lcom/android/js/api/Notification; - invoke-direct {v0, p1, p3, p4}, Lcom/android/js/api/Notification;->(Landroid/app/Activity;ILjava/lang/String;)V + invoke-direct {p2, p1, p3, p4}, Lcom/android/js/api/Notification;->(Landroid/app/Activity;ILjava/lang/String;)V - iput-object v0, p0, Lcom/android/js/common/JavaWebviewBridge;->notification:Lcom/android/js/api/Notification; + iput-object p2, p0, Lcom/android/js/common/JavaWebviewBridge;->notification:Lcom/android/js/api/Notification; .line 43 - new-instance v0, Lcom/android/js/api/Call; + new-instance p2, Lcom/android/js/api/Call; - invoke-direct {v0, p1}, Lcom/android/js/api/Call;->(Landroid/app/Activity;)V + invoke-direct {p2, p1}, Lcom/android/js/api/Call;->(Landroid/app/Activity;)V - iput-object v0, p0, Lcom/android/js/common/JavaWebviewBridge;->call:Lcom/android/js/api/Call; + iput-object p2, p0, Lcom/android/js/common/JavaWebviewBridge;->call:Lcom/android/js/api/Call; .line 44 - new-instance v0, Lcom/android/js/api/Wifi; + new-instance p2, Lcom/android/js/api/Wifi; - invoke-direct {v0, p1}, Lcom/android/js/api/Wifi;->(Landroid/app/Activity;)V + invoke-direct {p2, p1}, Lcom/android/js/api/Wifi;->(Landroid/app/Activity;)V - iput-object v0, p0, Lcom/android/js/common/JavaWebviewBridge;->wifi:Lcom/android/js/api/Wifi; + iput-object p2, p0, Lcom/android/js/common/JavaWebviewBridge;->wifi:Lcom/android/js/api/Wifi; .line 45 - new-instance v0, Lcom/android/js/api/Hotspot; + new-instance p2, Lcom/android/js/api/Hotspot; - invoke-direct {v0, p1}, Lcom/android/js/api/Hotspot;->(Landroid/app/Activity;)V + invoke-direct {p2, p1}, Lcom/android/js/api/Hotspot;->(Landroid/app/Activity;)V - iput-object v0, p0, Lcom/android/js/common/JavaWebviewBridge;->hotspot:Lcom/android/js/api/Hotspot; + iput-object p2, p0, Lcom/android/js/common/JavaWebviewBridge;->hotspot:Lcom/android/js/api/Hotspot; .line 46 - new-instance v0, Lcom/android/js/api/Toast; + new-instance p2, Lcom/android/js/api/Toast; - invoke-direct {v0, p1}, Lcom/android/js/api/Toast;->(Landroid/app/Activity;)V + invoke-direct {p2, p1}, Lcom/android/js/api/Toast;->(Landroid/app/Activity;)V - iput-object v0, p0, Lcom/android/js/common/JavaWebviewBridge;->toast:Lcom/android/js/api/Toast; + iput-object p2, p0, Lcom/android/js/common/JavaWebviewBridge;->toast:Lcom/android/js/api/Toast; .line 47 - new-instance v0, Lcom/android/js/api/App; + new-instance p2, Lcom/android/js/api/App; - invoke-direct {v0, p1, p2}, Lcom/android/js/api/App;->(Landroid/app/Activity;Landroid/webkit/WebView;)V + invoke-direct {p2, p1}, Lcom/android/js/api/App;->(Landroid/app/Activity;)V - iput-object v0, p0, Lcom/android/js/common/JavaWebviewBridge;->app:Lcom/android/js/api/App; + iput-object p2, p0, Lcom/android/js/common/JavaWebviewBridge;->app:Lcom/android/js/api/App; .line 48 new-instance p2, Lcom/android/js/api/Contact; @@ -128,6 +128,9 @@ .line 53 iput p3, p0, Lcom/android/js/common/JavaWebviewBridge;->iconId:I + .line 54 + iput-object p4, p0, Lcom/android/js/common/JavaWebviewBridge;->className:Ljava/lang/String; + .line 55 iput-object p4, p0, Lcom/android/js/common/JavaWebviewBridge;->className:Ljava/lang/String; @@ -519,19 +522,6 @@ return-object p1 .end method -.method public setDefaultFontSize(I)V - .locals 1 - .annotation runtime Landroid/webkit/JavascriptInterface; - .end annotation - - .line 190 - iget-object v0, p0, Lcom/android/js/common/JavaWebviewBridge;->app:Lcom/android/js/api/App; - - invoke-virtual {v0, p1}, Lcom/android/js/api/App;->setDefaultFontSize(I)V - - return-void -.end method - .method public showNotification(I)V .locals 1 .annotation runtime Landroid/webkit/JavascriptInterface; diff --git a/smali/com/android/js/other/PermissionRequest.smali b/smali/com/android/js/other/PermissionRequest.smali index 1c60a65a..ccf1dc23 100644 --- a/smali/com/android/js/other/PermissionRequest.smali +++ b/smali/com/android/js/other/PermissionRequest.smali @@ -36,7 +36,7 @@ .end method .method private static checkAndAskForPermissionsHelper(Landroid/app/Activity;Landroid/content/Context;)[Ljava/lang/String; - .locals 22 + .locals 20 move-object/from16 v0, p1 @@ -56,615 +56,508 @@ const/4 v5, 0x0 :goto_0 - if-ge v5, v3, :cond_10 + if-ge v5, v3, :cond_3 aget-object v6, v1, v5 .line 27 invoke-virtual {v6}, Ljava/lang/String;->hashCode()I - invoke-virtual {v6}, Ljava/lang/String;->hashCode()I - move-result v8 - const-string v9, "android.permission.CAMERA" - - const-string v10, "android.permission.READ_CONTACTS" + const-string v9, "android.permission.READ_CONTACTS" - const-string v11, "android.permission.RECORD_AUDIO" + const-string v10, "android.permission.RECORD_AUDIO" - const-string v12, "android.permission.ACCESS_WIFI_STATE" + const-string v11, "android.permission.ACCESS_WIFI_STATE" - const-string v13, "android.permission.WRITE_EXTERNAL_STORAGE" + const-string v12, "android.permission.WRITE_EXTERNAL_STORAGE" - const-string v14, "android.permission.ACCESS_NETWORK_STATE" + const-string v13, "android.permission.ACCESS_NETWORK_STATE" - const-string v15, "android.permission.CHANGE_WIFI_STATE" + const-string v14, "android.permission.CHANGE_WIFI_STATE" - const-string v4, "android.permission.WRITE_CONTACTS" + const-string v15, "android.permission.WRITE_CONTACTS" - const-string v7, "android.permission.CALL_PHONE" + const-string v4, "android.permission.CALL_PHONE" - move-object/from16 v17, v1 + const-string v7, "android.permission.SEND_SMS" - const-string v1, "android.permission.SEND_SMS" + move-object/from16 v16, v1 - move/from16 v18, v3 + const-string v1, "android.permission.ACCESS_COARSE_LOCATION" - const-string v3, "android.permission.ACCESS_COARSE_LOCATION" + move/from16 v17, v3 - move/from16 v19, v5 + const-string v3, "android.permission.READ_EXTERNAL_STORAGE" - const-string v5, "android.permission.READ_EXTERNAL_STORAGE" + move/from16 v18, v5 - move-object/from16 v20, v2 + const-string v5, "android.permission.MODIFY_AUDIO_SETTINGS" - const-string v2, "android.permission.MODIFY_AUDIO_SETTINGS" + move-object/from16 v19, v2 - const-string v0, "android.permission.ACCESS_FINE_LOCATION" - - move-object/from16 v21, v0 + const-string v2, "android.permission.ACCESS_FINE_LOCATION" const-string v0, "android.permission.WRITE_SETTINGS" sparse-switch v8, :sswitch_data_0 - :goto_1 - move-object/from16 v8, v21 - - :goto_2 - const/16 v16, -0x1 - - goto/16 :goto_4 + goto/16 :goto_1 :sswitch_0 - invoke-virtual {v6, v10}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v6, v9}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v6 - if-nez v6, :cond_0 - - goto :goto_1 + if-eqz v6, :cond_0 - :cond_0 - const/16 v6, 0xe - - move-object/from16 v8, v21 - - const/16 v16, 0xe + const/16 v6, 0xc - goto/16 :goto_4 + goto/16 :goto_2 :sswitch_1 - invoke-virtual {v6, v11}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v6, v10}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v6 - if-nez v6, :cond_1 - - goto :goto_1 + if-eqz v6, :cond_0 - :cond_1 - const/16 v6, 0xd - - move-object/from16 v8, v21 - - const/16 v16, 0xd + const/4 v6, 0x6 - goto/16 :goto_4 + goto/16 :goto_2 :sswitch_2 - invoke-virtual {v6, v12}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v6, v11}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v6 - if-nez v6, :cond_2 - - goto :goto_1 + if-eqz v6, :cond_0 - :cond_2 - const/16 v6, 0xc - - move-object/from16 v8, v21 - - const/16 v16, 0xc + const/16 v6, 0x9 - goto/16 :goto_4 + goto/16 :goto_2 :sswitch_3 - invoke-virtual {v6, v13}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v6, v12}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v6 - if-nez v6, :cond_3 - - goto :goto_1 + if-eqz v6, :cond_0 - :cond_3 - const/16 v6, 0xb - - move-object/from16 v8, v21 - - const/16 v16, 0xb + const/4 v6, 0x4 - goto/16 :goto_4 + goto/16 :goto_2 :sswitch_4 - invoke-virtual {v6, v9}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z - - move-result v6 + const-string v8, "android.permission.CAMERA" - if-nez v6, :cond_4 - - goto :goto_1 + invoke-virtual {v6, v8}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z - :cond_4 - const/16 v6, 0xa + move-result v6 - move-object/from16 v8, v21 + if-eqz v6, :cond_0 - const/16 v16, 0xa + const/4 v6, 0x0 - goto/16 :goto_4 + goto :goto_2 :sswitch_5 - invoke-virtual {v6, v14}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v6, v13}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v6 - if-nez v6, :cond_5 - - goto :goto_1 - - :cond_5 - const/16 v6, 0x9 - - move-object/from16 v8, v21 + if-eqz v6, :cond_0 - const/16 v16, 0x9 + const/4 v6, 0x1 - goto/16 :goto_4 + goto :goto_2 :sswitch_6 - invoke-virtual {v6, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v6, v14}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v6 - if-nez v6, :cond_6 - - goto :goto_1 + if-eqz v6, :cond_0 - :cond_6 - const/16 v6, 0x8 - - move-object/from16 v8, v21 - - const/16 v16, 0x8 + const/16 v6, 0xa - goto/16 :goto_4 + goto :goto_2 :sswitch_7 - invoke-virtual {v6, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v6, v15}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v6 - if-nez v6, :cond_7 - - goto :goto_1 - - :cond_7 - const/4 v6, 0x7 - - move-object/from16 v8, v21 + if-eqz v6, :cond_0 - const/16 v16, 0x7 + const/16 v6, 0xd - goto/16 :goto_4 + goto :goto_2 :sswitch_8 - invoke-virtual {v6, v7}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v6, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v6 - if-nez v6, :cond_8 - - goto/16 :goto_1 - - :cond_8 - const/4 v6, 0x6 - - move-object/from16 v8, v21 + if-eqz v6, :cond_0 - const/16 v16, 0x6 + const/16 v6, 0x8 - goto :goto_4 + goto :goto_2 :sswitch_9 - invoke-virtual {v6, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v6, v7}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v6 - if-nez v6, :cond_9 - - goto/16 :goto_1 - - :cond_9 - const/4 v6, 0x5 - - move-object/from16 v8, v21 + if-eqz v6, :cond_0 - const/16 v16, 0x5 + const/16 v6, 0xe - goto :goto_4 + goto :goto_2 :sswitch_a - invoke-virtual {v6, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v6, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v6 - if-nez v6, :cond_a - - goto/16 :goto_1 - - :cond_a - const/4 v6, 0x4 - - move-object/from16 v8, v21 + if-eqz v6, :cond_0 - const/16 v16, 0x4 + const/4 v6, 0x2 - goto :goto_4 + goto :goto_2 :sswitch_b - invoke-virtual {v6, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v6, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v6 - if-nez v6, :cond_b - - goto/16 :goto_1 - - :cond_b - const/4 v6, 0x3 + if-eqz v6, :cond_0 - move-object/from16 v8, v21 - - const/16 v16, 0x3 + const/4 v6, 0x5 - goto :goto_4 + goto :goto_2 :sswitch_c - invoke-virtual {v6, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v6, v5}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v6 - if-nez v6, :cond_c - - goto/16 :goto_1 - - :cond_c - const/4 v6, 0x2 - - move-object/from16 v8, v21 + if-eqz v6, :cond_0 - const/16 v16, 0x2 + const/4 v6, 0x7 - goto :goto_4 + goto :goto_2 :sswitch_d - move-object/from16 v8, v21 - - invoke-virtual {v6, v8}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z + invoke-virtual {v6, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v6 - if-nez v6, :cond_d - - goto :goto_3 + if-eqz v6, :cond_0 - :cond_d - const/4 v6, 0x1 - - const/16 v16, 0x1 + const/4 v6, 0x3 - goto :goto_4 + goto :goto_2 :sswitch_e - move-object/from16 v8, v21 - invoke-virtual {v6, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z move-result v6 - if-nez v6, :cond_e + if-eqz v6, :cond_0 - :goto_3 - goto/16 :goto_2 + const/16 v6, 0xb - :cond_e - const/16 v16, 0x0 + goto :goto_2 - :goto_4 - packed-switch v16, :pswitch_data_0 + :cond_0 + :goto_1 + const/4 v6, -0x1 + + :goto_2 + packed-switch v6, :pswitch_data_0 - move-object/from16 v6, p1 + move-object/from16 v0, p1 - move-object/from16 v8, v20 + :cond_1 + move-object/from16 v8, v19 - goto/16 :goto_5 + goto/16 :goto_3 :pswitch_0 - move-object/from16 v6, p1 + move-object/from16 v0, p1 - .line 90 - invoke-static {v6, v10}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I + .line 100 + invoke-static {v0, v7}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I - move-result v0 + move-result v1 - move-object/from16 v8, v20 + if-eqz v1, :cond_1 - if-eqz v0, :cond_f + move-object/from16 v8, v19 - .line 91 - invoke-virtual {v8, v10}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + .line 101 + invoke-virtual {v8, v7}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z - goto/16 :goto_5 + goto/16 :goto_3 :pswitch_1 - move-object/from16 v6, p1 + move-object/from16 v0, p1 - move-object/from16 v8, v20 + move-object/from16 v8, v19 - .line 60 - invoke-static {v6, v11}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I + .line 95 + invoke-static {v0, v15}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I - move-result v0 + move-result v1 - if-eqz v0, :cond_f + if-eqz v1, :cond_2 - .line 61 - invoke-virtual {v8, v11}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + .line 96 + invoke-virtual {v8, v15}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z - goto/16 :goto_5 + goto/16 :goto_3 :pswitch_2 - move-object/from16 v6, p1 + move-object/from16 v0, p1 - move-object/from16 v8, v20 + move-object/from16 v8, v19 - .line 75 - invoke-static {v6, v12}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I + .line 90 + invoke-static {v0, v9}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I - move-result v0 + move-result v1 - if-eqz v0, :cond_f + if-eqz v1, :cond_2 - .line 76 - invoke-virtual {v8, v12}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + .line 91 + invoke-virtual {v8, v9}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z - goto/16 :goto_5 + goto/16 :goto_3 :pswitch_3 - move-object/from16 v6, p1 + move-object v6, v0 - move-object/from16 v8, v20 + move-object/from16 v8, v19 - .line 50 - invoke-static {v6, v13}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I + move-object/from16 v0, p1 - move-result v0 + .line 85 + invoke-static {v0, v6}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I - if-eqz v0, :cond_f + move-result v1 - .line 51 - invoke-virtual {v8, v13}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + if-eqz v1, :cond_2 - goto/16 :goto_5 + .line 86 + invoke-virtual {v8, v6}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z - :pswitch_4 - move-object/from16 v6, p1 + goto/16 :goto_3 - move-object/from16 v8, v20 + :pswitch_4 + move-object/from16 v0, p1 - const-string v0, "Manigest" + move-object/from16 v8, v19 - .line 29 - invoke-static {v6, v0}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I + .line 80 + invoke-static {v0, v14}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I - move-result v0 + move-result v1 - if-eqz v0, :cond_f + if-eqz v1, :cond_2 - .line 30 - invoke-virtual {v8, v9}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + .line 81 + invoke-virtual {v8, v14}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z - goto/16 :goto_5 + goto/16 :goto_3 :pswitch_5 - move-object/from16 v6, p1 + move-object/from16 v0, p1 - move-object/from16 v8, v20 + move-object/from16 v8, v19 - .line 35 - invoke-static {v6, v14}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I + .line 75 + invoke-static {v0, v11}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I - move-result v0 + move-result v1 - if-eqz v0, :cond_f + if-eqz v1, :cond_2 - .line 36 - invoke-virtual {v8, v14}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + .line 76 + invoke-virtual {v8, v11}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z - goto/16 :goto_5 + goto/16 :goto_3 :pswitch_6 - move-object/from16 v6, p1 + move-object/from16 v0, p1 - move-object/from16 v8, v20 + move-object/from16 v8, v19 - .line 80 - invoke-static {v6, v15}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I + .line 70 + invoke-static {v0, v4}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I - move-result v0 + move-result v1 - if-eqz v0, :cond_f + if-eqz v1, :cond_2 - .line 81 - invoke-virtual {v8, v15}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + .line 71 + invoke-virtual {v8, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z - goto/16 :goto_5 + goto/16 :goto_3 :pswitch_7 - move-object/from16 v6, p1 + move-object/from16 v0, p1 - move-object/from16 v8, v20 + move-object/from16 v8, v19 - .line 95 - invoke-static {v6, v4}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I + .line 65 + invoke-static {v0, v5}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I - move-result v0 + move-result v1 - if-eqz v0, :cond_f + if-eqz v1, :cond_2 - .line 96 - invoke-virtual {v8, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + .line 66 + invoke-virtual {v8, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z - goto/16 :goto_5 + goto/16 :goto_3 :pswitch_8 - move-object/from16 v6, p1 + move-object/from16 v0, p1 - move-object/from16 v8, v20 + move-object/from16 v8, v19 - .line 70 - invoke-static {v6, v7}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I + .line 60 + invoke-static {v0, v10}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I - move-result v0 + move-result v1 - if-eqz v0, :cond_f + if-eqz v1, :cond_2 - .line 71 - invoke-virtual {v8, v7}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + .line 61 + invoke-virtual {v8, v10}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z - goto :goto_5 + goto :goto_3 :pswitch_9 - move-object/from16 v6, p1 + move-object/from16 v0, p1 - move-object/from16 v8, v20 + move-object/from16 v8, v19 - .line 100 - invoke-static {v6, v1}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I + .line 55 + invoke-static {v0, v3}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I - move-result v0 + move-result v1 - if-eqz v0, :cond_f + if-eqz v1, :cond_2 - .line 101 - invoke-virtual {v8, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + .line 56 + invoke-virtual {v8, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z - goto :goto_5 + goto :goto_3 :pswitch_a - move-object/from16 v6, p1 + move-object/from16 v0, p1 - move-object/from16 v8, v20 + move-object/from16 v8, v19 - .line 40 - invoke-static {v6, v3}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I + .line 50 + invoke-static {v0, v12}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I - move-result v0 + move-result v1 - if-eqz v0, :cond_f + if-eqz v1, :cond_2 - .line 41 - invoke-virtual {v8, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + .line 51 + invoke-virtual {v8, v12}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z - goto :goto_5 + goto :goto_3 :pswitch_b - move-object/from16 v6, p1 + move-object/from16 v0, p1 - move-object/from16 v8, v20 + move-object/from16 v8, v19 - .line 55 - invoke-static {v6, v5}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I + .line 45 + invoke-static {v0, v2}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I - move-result v0 + move-result v1 - if-eqz v0, :cond_f + if-eqz v1, :cond_2 - .line 56 - invoke-virtual {v8, v5}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + .line 46 + invoke-virtual {v8, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z - goto :goto_5 + goto :goto_3 :pswitch_c - move-object/from16 v6, p1 + move-object/from16 v0, p1 - move-object/from16 v8, v20 + move-object/from16 v8, v19 - .line 65 - invoke-static {v6, v2}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I + .line 40 + invoke-static {v0, v1}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I - move-result v0 + move-result v2 - if-eqz v0, :cond_f + if-eqz v2, :cond_2 - .line 66 - invoke-virtual {v8, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + .line 41 + invoke-virtual {v8, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z - goto :goto_5 + goto :goto_3 :pswitch_d - move-object/from16 v6, p1 - - move-object v0, v8 + move-object/from16 v0, p1 - move-object/from16 v8, v20 + move-object/from16 v8, v19 - .line 45 - invoke-static {v6, v0}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I + .line 35 + invoke-static {v0, v13}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I move-result v1 - if-eqz v1, :cond_f + if-eqz v1, :cond_2 - .line 46 - invoke-virtual {v8, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + .line 36 + invoke-virtual {v8, v13}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z - goto :goto_5 + goto :goto_3 :pswitch_e - move-object/from16 v6, p1 + move-object/from16 v0, p1 - move-object/from16 v8, v20 + move-object/from16 v8, v19 - .line 85 - invoke-static {v6, v0}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I + const-string v1, "Manigest" + + .line 29 + invoke-static {v0, v1}, Landroid/support/v4/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I move-result v1 - if-eqz v1, :cond_f + if-eqz v1, :cond_2 - .line 86 - invoke-virtual {v8, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + const-string v1, "android.permission.CAMERA" - :cond_f - :goto_5 - add-int/lit8 v5, v19, 0x1 + .line 30 + invoke-virtual {v8, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z - move-object v0, v6 + :cond_2 + :goto_3 + add-int/lit8 v5, v18, 0x1 move-object v2, v8 - move-object/from16 v1, v17 + move-object/from16 v1, v16 - move/from16 v3, v18 + move/from16 v3, v17 goto/16 :goto_0 - :cond_10 + :cond_3 move-object v8, v2 .line 106 @@ -674,37 +567,37 @@ new-array v0, v0, [Ljava/lang/String; - const/4 v4, 0x0 + const/4 v1, 0x0 .line 107 - :goto_6 + :goto_4 invoke-virtual {v8}, Ljava/util/ArrayList;->size()I - move-result v1 + move-result v2 - if-ge v4, v1, :cond_11 + if-ge v1, v2, :cond_4 .line 108 - invoke-virtual {v8, v4}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v8, v1}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; - move-result-object v1 + move-result-object v2 - check-cast v1, Ljava/lang/String; + check-cast v2, Ljava/lang/String; - aput-object v1, v0, v4 + aput-object v2, v0, v1 .line 109 - sget-object v1, Ljava/lang/System;->out:Ljava/io/PrintStream; + sget-object v2, Ljava/lang/System;->out:Ljava/io/PrintStream; - aget-object v2, v0, v4 + aget-object v3, v0, v1 - invoke-virtual {v1, v2}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V + invoke-virtual {v2, v3}, Ljava/io/PrintStream;->println(Ljava/lang/String;)V - add-int/lit8 v4, v4, 0x1 + add-int/lit8 v1, v1, 0x1 - goto :goto_6 + goto :goto_4 - :cond_11 + :cond_4 return-object v0 nop diff --git a/smali/com/android/js/other/Utils.smali b/smali/com/android/js/other/Utils.smali index f89c512b..df0f030c 100644 --- a/smali/com/android/js/other/Utils.smali +++ b/smali/com/android/js/other/Utils.smali @@ -103,12 +103,14 @@ .line 55 array-length v3, v2 - const/4 v5, 0x0 + const/4 v4, 0x0 + + const/4 v5, 0x1 :goto_0 - if-ge v5, v3, :cond_1 + if-ge v4, v3, :cond_1 - aget-object v6, v2, v5 + aget-object v6, v2, v4 .line 56 new-instance v7, Ljava/lang/StringBuilder; @@ -145,14 +147,14 @@ :try_end_0 .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0 - and-int/2addr v4, v6 + and-int/2addr v5, v6 - add-int/lit8 v5, v5, 0x1 + add-int/lit8 v4, v4, 0x1 goto :goto_0 :cond_1 - move p0, v4 + move p0, v5 :goto_1 return p0 @@ -176,6 +178,7 @@ const/16 v0, 0x400 + .line 88 new-array v0, v0, [B .line 90 @@ -214,12 +217,14 @@ const/4 v3, 0x1 - const/4 v4, 0x0 + const/4 v3, 0x0 + + const/4 v4, 0x1 :goto_0 - if-ge v4, v2, :cond_1 + if-ge v3, v2, :cond_1 - aget-object v5, v1, v4 + aget-object v5, v1, v3 .line 29 invoke-virtual {v5}, Ljava/io/File;->isDirectory()Z @@ -242,9 +247,9 @@ move-result v5 :goto_1 - and-int/2addr v3, v5 + and-int/2addr v4, v5 - add-int/lit8 v4, v4, 0x1 + add-int/lit8 v3, v3, 0x1 goto :goto_0 @@ -256,7 +261,7 @@ :try_end_0 .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0 - and-int/2addr p0, v3 + and-int/2addr p0, v4 return p0 @@ -552,42 +557,42 @@ .end method .method public static wasAPKUpdated(Landroid/content/Context;)Z - .locals 6 + .locals 5 - const-string v0, "NODEJS_MOBILE_PREFS" + const/4 v0, 0x0 - const/4 v1, 0x0 + const-string v1, "NODEJS_MOBILE_PREFS" .line 96 - invoke-virtual {p0, v0, v1}, Landroid/content/Context;->getSharedPreferences(Ljava/lang/String;I)Landroid/content/SharedPreferences; + invoke-virtual {p0, v1, v0}, Landroid/content/Context;->getSharedPreferences(Ljava/lang/String;I)Landroid/content/SharedPreferences; - move-result-object v0 + move-result-object v1 const-string v2, "NODEJS_MOBILE_APK_LastUpdateTime" const-wide/16 v3, 0x0 .line 97 - invoke-interface {v0, v2, v3, v4}, Landroid/content/SharedPreferences;->getLong(Ljava/lang/String;J)J + invoke-interface {v1, v2, v3, v4}, Landroid/content/SharedPreferences;->getLong(Ljava/lang/String;J)J - move-result-wide v2 + move-result-wide v1 .line 100 :try_start_0 invoke-virtual {p0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager; - move-result-object v0 + move-result-object v3 invoke-virtual {p0}, Landroid/content/Context;->getPackageName()Ljava/lang/String; move-result-object p0 - invoke-virtual {v0, p0, v1}, Landroid/content/pm/PackageManager;->getPackageInfo(Ljava/lang/String;I)Landroid/content/pm/PackageInfo; + invoke-virtual {v3, p0, v0}, Landroid/content/pm/PackageManager;->getPackageInfo(Ljava/lang/String;I)Landroid/content/pm/PackageInfo; move-result-object p0 .line 101 - iget-wide v4, p0, Landroid/content/pm/PackageInfo;->lastUpdateTime:J + iget-wide v3, p0, Landroid/content/pm/PackageInfo;->lastUpdateTime:J :try_end_0 .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_0 @@ -599,15 +604,15 @@ .line 103 invoke-virtual {p0}, Landroid/content/pm/PackageManager$NameNotFoundException;->printStackTrace()V - const-wide/16 v4, 0x1 + const-wide/16 v3, 0x1 :goto_0 - cmp-long p0, v4, v2 + cmp-long p0, v3, v1 if-eqz p0, :cond_0 - const/4 v1, 0x1 + const/4 v0, 0x1 :cond_0 - return v1 + return v0 .end method diff --git a/smali/com/android/js/react_native/api/App.smali b/smali/com/android/js/react_native/api/App.smali index ed99bca8..df526963 100644 --- a/smali/com/android/js/react_native/api/App.smali +++ b/smali/com/android/js/react_native/api/App.smali @@ -11,7 +11,7 @@ # direct methods .method public constructor (Lcom/facebook/react/bridge/ReactApplicationContext;)V - .locals 2 + .locals 1 .line 12 invoke-direct {p0, p1}, Lcom/facebook/react/bridge/ReactContextBaseJavaModule;->(Lcom/facebook/react/bridge/ReactApplicationContext;)V @@ -26,9 +26,7 @@ move-result-object p1 - const/4 v1, 0x0 - - invoke-direct {v0, p1, v1}, Lcom/android/js/api/App;->(Landroid/app/Activity;Landroid/webkit/WebView;)V + invoke-direct {v0, p1}, Lcom/android/js/api/App;->(Landroid/app/Activity;)V iput-object v0, p0, Lcom/android/js/react_native/api/App;->app:Lcom/android/js/api/App; diff --git a/smali/com/android/js/staticsdk/AndroidJSActivity$1.smali b/smali/com/android/js/staticsdk/AndroidJSActivity$1.smali index 73138b12..eb4b7240 100644 --- a/smali/com/android/js/staticsdk/AndroidJSActivity$1.smali +++ b/smali/com/android/js/staticsdk/AndroidJSActivity$1.smali @@ -96,6 +96,9 @@ .method public onPermissionRequest(Landroid/webkit/PermissionRequest;)V .locals 1 + .annotation build Landroid/annotation/TargetApi; + value = 0x15 + .end annotation .line 56 invoke-virtual {p1}, Landroid/webkit/PermissionRequest;->getResources()[Ljava/lang/String; diff --git a/smali/com/android/js/staticsdk/AndroidJSActivity.smali b/smali/com/android/js/staticsdk/AndroidJSActivity.smali index 5020281b..709953fc 100644 --- a/smali/com/android/js/staticsdk/AndroidJSActivity.smali +++ b/smali/com/android/js/staticsdk/AndroidJSActivity.smali @@ -65,6 +65,8 @@ invoke-virtual {p1, v0}, Landroid/webkit/WebSettings;->setAllowFileAccess(Z)V .line 38 + iget-object p1, p0, Lcom/android/js/staticsdk/AndroidJSActivity;->myWebView:Landroid/webkit/WebView; + invoke-static {v0}, Landroid/webkit/WebView;->setWebContentsDebuggingEnabled(Z)V .line 39 diff --git a/smali/com/android/js/webview/AndroidJSActivity$2.smali b/smali/com/android/js/webview/AndroidJSActivity$2.smali index 49f5dd40..fdfb5dc7 100644 --- a/smali/com/android/js/webview/AndroidJSActivity$2.smali +++ b/smali/com/android/js/webview/AndroidJSActivity$2.smali @@ -96,6 +96,9 @@ .method public onPermissionRequest(Landroid/webkit/PermissionRequest;)V .locals 1 + .annotation build Landroid/annotation/TargetApi; + value = 0x15 + .end annotation .line 100 invoke-virtual {p1}, Landroid/webkit/PermissionRequest;->getResources()[Ljava/lang/String; diff --git a/smali/com/android/js/webview/AndroidJSActivity.smali b/smali/com/android/js/webview/AndroidJSActivity.smali index 15a4ee1e..383f01e4 100644 --- a/smali/com/android/js/webview/AndroidJSActivity.smali +++ b/smali/com/android/js/webview/AndroidJSActivity.smali @@ -90,6 +90,8 @@ invoke-virtual {p1, v0}, Landroid/webkit/WebSettings;->setAllowFileAccess(Z)V .line 82 + iget-object p1, p0, Lcom/android/js/webview/AndroidJSActivity;->myWebView:Landroid/webkit/WebView; + invoke-static {v0}, Landroid/webkit/WebView;->setWebContentsDebuggingEnabled(Z)V .line 83 diff --git a/smali/com/android/js/webview/BuildConfig.smali b/smali/com/android/js/webview/BuildConfig.smali index 8a9010c1..d4f498b5 100644 --- a/smali/com/android/js/webview/BuildConfig.smali +++ b/smali/com/android/js/webview/BuildConfig.smali @@ -10,6 +10,8 @@ .field public static final DEBUG:Z = false +.field public static final FLAVOR:Ljava/lang/String; = "" + .field public static final VERSION_CODE:I = 0x1 .field public static final VERSION_NAME:Ljava/lang/String; = "1.0" diff --git a/smali/com/android/js/webview/MainActivity.smali b/smali/com/android/js/webview/MainActivity.smali index 382a6232..b424169b 100644 --- a/smali/com/android/js/webview/MainActivity.smali +++ b/smali/com/android/js/webview/MainActivity.smali @@ -7,7 +7,7 @@ .method public constructor ()V .locals 0 - .line 11 + .line 10 invoke-direct {p0}, Lcom/android/js/webview/AndroidJSActivity;->()V return-void @@ -18,15 +18,15 @@ .method protected onCreate(Landroid/os/Bundle;)V .locals 1 - .line 17 + .line 16 invoke-super {p0, p1}, Lcom/android/js/webview/AndroidJSActivity;->onCreate(Landroid/os/Bundle;)V const p1, 0x7f09001c - .line 18 + .line 17 invoke-virtual {p0, p1}, Lcom/android/js/webview/MainActivity;->setContentView(I)V - .line 21 + .line 20 sget-object p1, Ljava/lang/System;->out:Ljava/io/PrintStream; invoke-static {}, Landroid/os/Environment;->getRootDirectory()Ljava/io/File; @@ -35,15 +35,15 @@ invoke-virtual {p1, v0}, Ljava/io/PrintStream;->println(Ljava/lang/Object;)V - .line 22 + .line 21 invoke-static {p0, p0}, Lcom/android/js/other/PermissionRequest;->checkAndAskForPermissions(Landroid/app/Activity;Landroid/content/Context;)V - .line 26 + .line 25 invoke-virtual {p0, p0}, Lcom/android/js/webview/MainActivity;->start_node(Landroid/app/Activity;)V const p1, 0x7f0700d3 - .line 30 + .line 29 invoke-virtual {p0, p1}, Lcom/android/js/webview/MainActivity;->findViewById(I)Landroid/view/View; move-result-object p1 @@ -54,7 +54,7 @@ const/high16 p1, 0x7f0a0000 - .line 32 + .line 31 invoke-virtual {p0, p1}, Lcom/android/js/webview/MainActivity;->configureWebview(I)V return-void diff --git a/smali/com/android/js/webview/R$anim.smali b/smali/com/android/js/webview/R$anim.smali index d6d26de1..05034cbd 100644 --- a/smali/com/android/js/webview/R$anim.smali +++ b/smali/com/android/js/webview/R$anim.smali @@ -1,5 +1,6 @@ .class public final Lcom/android/js/webview/R$anim; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -40,9 +41,10 @@ # direct methods -.method private constructor ()V +.method public constructor ()V .locals 0 + .line 11 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/com/android/js/webview/R$attr.smali b/smali/com/android/js/webview/R$attr.smali index e64cc4c4..86f97405 100644 --- a/smali/com/android/js/webview/R$attr.smali +++ b/smali/com/android/js/webview/R$attr.smali @@ -1,5 +1,6 @@ .class public final Lcom/android/js/webview/R$attr; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -845,6 +846,9 @@ .field public static final titleMarginTop:I = 0x7f02019e .field public static final titleMargins:I = 0x7f02019f + .annotation runtime Ljava/lang/Deprecated; + .end annotation +.end field .field public static final titleTextAppearance:I = 0x7f0201a0 @@ -930,9 +934,10 @@ # direct methods -.method private constructor ()V +.method public constructor ()V .locals 0 + .line 25 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/com/android/js/webview/R$bool.smali b/smali/com/android/js/webview/R$bool.smali index 40498536..11f29a14 100644 --- a/smali/com/android/js/webview/R$bool.smali +++ b/smali/com/android/js/webview/R$bool.smali @@ -1,5 +1,6 @@ .class public final Lcom/android/js/webview/R$bool; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -22,9 +23,10 @@ # direct methods -.method private constructor ()V +.method public constructor ()V .locals 0 + .line 4062 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/com/android/js/webview/R$color.smali b/smali/com/android/js/webview/R$color.smali index 9ee70389..83da604e 100644 --- a/smali/com/android/js/webview/R$color.smali +++ b/smali/com/android/js/webview/R$color.smali @@ -1,5 +1,6 @@ .class public final Lcom/android/js/webview/R$color; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -190,9 +191,10 @@ # direct methods -.method private constructor ()V +.method public constructor ()V .locals 0 + .line 4067 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/com/android/js/webview/R$dimen.smali b/smali/com/android/js/webview/R$dimen.smali index b032d692..cab83083 100644 --- a/smali/com/android/js/webview/R$dimen.smali +++ b/smali/com/android/js/webview/R$dimen.smali @@ -1,5 +1,6 @@ .class public final Lcom/android/js/webview/R$dimen; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -244,9 +245,10 @@ # direct methods -.method private constructor ()V +.method public constructor ()V .locals 0 + .line 4156 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/com/android/js/webview/R$drawable.smali b/smali/com/android/js/webview/R$drawable.smali index bc95c54e..20a5aed2 100644 --- a/smali/com/android/js/webview/R$drawable.smali +++ b/smali/com/android/js/webview/R$drawable.smali @@ -1,5 +1,6 @@ .class public final Lcom/android/js/webview/R$drawable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -212,9 +213,10 @@ # direct methods -.method private constructor ()V +.method public constructor ()V .locals 0 + .line 4272 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/com/android/js/webview/R$id.smali b/smali/com/android/js/webview/R$id.smali index 9ca4471a..c6d62b49 100644 --- a/smali/com/android/js/webview/R$id.smali +++ b/smali/com/android/js/webview/R$id.smali @@ -1,5 +1,6 @@ .class public final Lcom/android/js/webview/R$id; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -446,9 +447,10 @@ # direct methods -.method private constructor ()V +.method public constructor ()V .locals 0 + .line 4372 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/com/android/js/webview/R$integer.smali b/smali/com/android/js/webview/R$integer.smali index d42803e4..e1e1ba72 100644 --- a/smali/com/android/js/webview/R$integer.smali +++ b/smali/com/android/js/webview/R$integer.smali @@ -1,5 +1,6 @@ .class public final Lcom/android/js/webview/R$integer; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -26,9 +27,10 @@ # direct methods -.method private constructor ()V +.method public constructor ()V .locals 0 + .line 4589 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/com/android/js/webview/R$layout.smali b/smali/com/android/js/webview/R$layout.smali index 1254391b..d18ea9f6 100644 --- a/smali/com/android/js/webview/R$layout.smali +++ b/smali/com/android/js/webview/R$layout.smali @@ -1,5 +1,6 @@ .class public final Lcom/android/js/webview/R$layout; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -94,9 +95,10 @@ # direct methods -.method private constructor ()V +.method public constructor ()V .locals 0 + .line 4596 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/com/android/js/webview/R$mipmap.smali b/smali/com/android/js/webview/R$mipmap.smali index 196474d4..a283035a 100644 --- a/smali/com/android/js/webview/R$mipmap.smali +++ b/smali/com/android/js/webview/R$mipmap.smali @@ -1,5 +1,6 @@ .class public final Lcom/android/js/webview/R$mipmap; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -20,9 +21,10 @@ # direct methods -.method private constructor ()V +.method public constructor ()V .locals 0 + .line 4637 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/com/android/js/webview/R$string.smali b/smali/com/android/js/webview/R$string.smali index 56278c9b..9745225f 100644 --- a/smali/com/android/js/webview/R$string.smali +++ b/smali/com/android/js/webview/R$string.smali @@ -1,5 +1,6 @@ .class public final Lcom/android/js/webview/R$string; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -100,9 +101,10 @@ # direct methods -.method private constructor ()V +.method public constructor ()V .locals 0 + .line 4641 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/com/android/js/webview/R$style.smali b/smali/com/android/js/webview/R$style.smali index a392dba7..7f00b51b 100644 --- a/smali/com/android/js/webview/R$style.smali +++ b/smali/com/android/js/webview/R$style.smali @@ -1,5 +1,6 @@ .class public final Lcom/android/js/webview/R$style; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -710,9 +711,10 @@ # direct methods -.method private constructor ()V +.method public constructor ()V .locals 0 + .line 4685 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/com/android/js/webview/R$styleable.smali b/smali/com/android/js/webview/R$styleable.smali index 9d8c6ac8..e00b454c 100644 --- a/smali/com/android/js/webview/R$styleable.smali +++ b/smali/com/android/js/webview/R$styleable.smali @@ -1,5 +1,6 @@ .class public final Lcom/android/js/webview/R$styleable; .super Ljava/lang/Object; +.source "R.java" # annotations @@ -1945,6 +1946,9 @@ .field public static final TextAppearance_textAllCaps:I = 0xc .field public static final Toolbar:[I + .annotation runtime Ljava/lang/Deprecated; + .end annotation +.end field .field public static final Toolbar_android_gravity:I = 0x0 @@ -1999,6 +2003,9 @@ .field public static final Toolbar_titleMarginTop:I = 0x19 .field public static final Toolbar_titleMargins:I = 0x1a + .annotation runtime Ljava/lang/Deprecated; + .end annotation +.end field .field public static final Toolbar_titleTextAppearance:I = 0x1b @@ -2094,11 +2101,12 @@ # direct methods -.method public static constructor ()V +.method static constructor ()V .locals 13 const/16 v0, 0x1d + .line 5106 new-array v1, v0, [I fill-array-data v1, :array_0 @@ -2107,39 +2115,44 @@ const/4 v1, 0x1 + .line 5538 new-array v2, v1, [I - const v3, 0x10100b3 + const/4 v3, 0x0 - const/4 v4, 0x0 + const v4, 0x10100b3 - aput v3, v2, v4 + aput v4, v2, v3 sput-object v2, Lcom/android/js/webview/R$styleable;->ActionBarLayout:[I + .line 5581 new-array v2, v1, [I - const v3, 0x101013f + const v4, 0x101013f - aput v3, v2, v4 + aput v4, v2, v3 sput-object v2, Lcom/android/js/webview/R$styleable;->ActionMenuItemView:[I - new-array v2, v4, [I + .line 5597 + new-array v2, v3, [I sput-object v2, Lcom/android/js/webview/R$styleable;->ActionMenuView:[I const/4 v2, 0x6 - new-array v3, v2, [I + .line 5620 + new-array v4, v2, [I - fill-array-data v3, :array_1 + fill-array-data v4, :array_1 - sput-object v3, Lcom/android/js/webview/R$styleable;->ActionMode:[I + sput-object v4, Lcom/android/js/webview/R$styleable;->ActionMode:[I - const/4 v3, 0x2 + const/4 v4, 0x2 - new-array v5, v3, [I + .line 5719 + new-array v5, v4, [I fill-array-data v5, :array_2 @@ -2147,19 +2160,22 @@ const/16 v5, 0x8 + .line 5775 new-array v6, v5, [I fill-array-data v6, :array_3 sput-object v6, Lcom/android/js/webview/R$styleable;->AlertDialog:[I + .line 5895 new-array v6, v2, [I fill-array-data v6, :array_4 sput-object v6, Lcom/android/js/webview/R$styleable;->AnimatedStateListDrawableCompat:[I - new-array v6, v3, [I + .line 5986 + new-array v6, v4, [I fill-array-data v6, :array_5 @@ -2167,18 +2183,21 @@ const/4 v6, 0x4 + .line 6033 new-array v7, v6, [I fill-array-data v7, :array_6 sput-object v7, Lcom/android/js/webview/R$styleable;->AnimatedStateListDrawableTransition:[I + .line 6104 new-array v7, v6, [I fill-array-data v7, :array_7 sput-object v7, Lcom/android/js/webview/R$styleable;->AppCompatImageView:[I + .line 6192 new-array v7, v6, [I fill-array-data v7, :array_8 @@ -2187,6 +2206,7 @@ const/4 v7, 0x7 + .line 6282 new-array v8, v7, [I fill-array-data v8, :array_9 @@ -2195,6 +2215,7 @@ const/16 v8, 0xb + .line 6421 new-array v9, v8, [I fill-array-data v9, :array_a @@ -2203,28 +2224,32 @@ const/16 v9, 0x79 + .line 6856 new-array v9, v9, [I fill-array-data v9, :array_b sput-object v9, Lcom/android/js/webview/R$styleable;->AppCompatTheme:[I + .line 8542 new-array v9, v1, [I const v10, 0x7f020026 - aput v10, v9, v4 + aput v10, v9, v3 sput-object v9, Lcom/android/js/webview/R$styleable;->ButtonBarLayout:[I const/4 v9, 0x3 + .line 8572 new-array v10, v9, [I fill-array-data v10, :array_c sput-object v10, Lcom/android/js/webview/R$styleable;->ColorStateListItem:[I + .line 8621 new-array v10, v9, [I fill-array-data v10, :array_d @@ -2233,6 +2258,7 @@ const/16 v10, 0x6d + .line 8902 new-array v10, v10, [I fill-array-data v10, :array_e @@ -2241,13 +2267,15 @@ const/16 v10, 0x5a + .line 10657 new-array v10, v10, [I fill-array-data v10, :array_f sput-object v10, Lcom/android/js/webview/R$styleable;->ConstraintLayout_Layout:[I - new-array v10, v3, [I + .line 11982 + new-array v10, v4, [I fill-array-data v10, :array_10 @@ -2255,18 +2283,21 @@ const/16 v10, 0x6f + .line 12246 new-array v10, v10, [I fill-array-data v10, :array_11 sput-object v10, Lcom/android/js/webview/R$styleable;->ConstraintSet:[I - new-array v10, v3, [I + .line 13847 + new-array v10, v4, [I fill-array-data v10, :array_12 sput-object v10, Lcom/android/js/webview/R$styleable;->CoordinatorLayout:[I + .line 13909 new-array v7, v7, [I fill-array-data v7, :array_13 @@ -2275,18 +2306,21 @@ const/16 v7, 0x9 + .line 14091 new-array v10, v7, [I fill-array-data v10, :array_14 sput-object v10, Lcom/android/js/webview/R$styleable;->CustomAttribute:[I + .line 14217 new-array v5, v5, [I fill-array-data v5, :array_15 sput-object v5, Lcom/android/js/webview/R$styleable;->DrawerArrowToggle:[I + .line 14349 new-array v5, v2, [I fill-array-data v5, :array_16 @@ -2295,6 +2329,7 @@ const/16 v5, 0xa + .line 14485 new-array v10, v5, [I fill-array-data v10, :array_17 @@ -2303,18 +2338,21 @@ const/16 v10, 0xc + .line 14654 new-array v11, v10, [I fill-array-data v11, :array_18 sput-object v11, Lcom/android/js/webview/R$styleable;->GradientColor:[I - new-array v11, v3, [I + .line 14838 + new-array v11, v4, [I fill-array-data v11, :array_19 sput-object v11, Lcom/android/js/webview/R$styleable;->GradientColorItem:[I + .line 14891 new-array v11, v7, [I fill-array-data v11, :array_1a @@ -2323,6 +2361,7 @@ const/16 v11, 0x12 + .line 15030 new-array v11, v11, [I fill-array-data v11, :array_1b @@ -2331,36 +2370,43 @@ const/16 v11, 0x14 + .line 15297 new-array v12, v11, [I fill-array-data v12, :array_1c sput-object v12, Lcom/android/js/webview/R$styleable;->KeyCycle:[I - new-array v12, v4, [I + .line 15551 + new-array v12, v3, [I sput-object v12, Lcom/android/js/webview/R$styleable;->KeyFrame:[I - new-array v12, v4, [I + .line 15553 + new-array v12, v3, [I sput-object v12, Lcom/android/js/webview/R$styleable;->KeyFramesAcceleration:[I - new-array v12, v4, [I + .line 15555 + new-array v12, v3, [I sput-object v12, Lcom/android/js/webview/R$styleable;->KeyFramesVelocity:[I + .line 15590 new-array v12, v10, [I fill-array-data v12, :array_1d sput-object v12, Lcom/android/js/webview/R$styleable;->KeyPosition:[I + .line 15808 new-array v11, v11, [I fill-array-data v11, :array_1e sput-object v11, Lcom/android/js/webview/R$styleable;->KeyTimeCycle:[I + .line 16083 new-array v5, v5, [I fill-array-data v5, :array_1f @@ -2369,30 +2415,35 @@ const/16 v5, 0x43 + .line 16339 new-array v5, v5, [I fill-array-data v5, :array_20 sput-object v5, Lcom/android/js/webview/R$styleable;->Layout:[I + .line 17361 new-array v5, v7, [I fill-array-data v5, :array_21 sput-object v5, Lcom/android/js/webview/R$styleable;->LinearLayoutCompat:[I + .line 17531 new-array v5, v6, [I fill-array-data v5, :array_22 sput-object v5, Lcom/android/js/webview/R$styleable;->LinearLayoutCompat_Layout:[I - new-array v5, v3, [I + .line 17631 + new-array v5, v4, [I fill-array-data v5, :array_23 sput-object v5, Lcom/android/js/webview/R$styleable;->ListPopupWindow:[I + .line 17683 new-array v5, v2, [I fill-array-data v5, :array_24 @@ -2401,89 +2452,103 @@ const/16 v5, 0x17 + .line 17830 new-array v5, v5, [I fill-array-data v5, :array_25 sput-object v5, Lcom/android/js/webview/R$styleable;->MenuItem:[I + .line 18207 new-array v5, v7, [I fill-array-data v5, :array_26 sput-object v5, Lcom/android/js/webview/R$styleable;->MenuView:[I + .line 18351 new-array v5, v2, [I fill-array-data v5, :array_27 sput-object v5, Lcom/android/js/webview/R$styleable;->MockView:[I + .line 18439 new-array v5, v2, [I fill-array-data v5, :array_28 sput-object v5, Lcom/android/js/webview/R$styleable;->Motion:[I - new-array v5, v3, [I + .line 18547 + new-array v5, v4, [I fill-array-data v5, :array_29 sput-object v5, Lcom/android/js/webview/R$styleable;->MotionHelper:[I + .line 18591 new-array v5, v2, [I fill-array-data v5, :array_2a sput-object v5, Lcom/android/js/webview/R$styleable;->MotionLayout:[I - new-array v5, v3, [I + .line 18680 + new-array v5, v4, [I fill-array-data v5, :array_2b sput-object v5, Lcom/android/js/webview/R$styleable;->MotionScene:[I + .line 18724 new-array v5, v9, [I fill-array-data v5, :array_2c sput-object v5, Lcom/android/js/webview/R$styleable;->MotionTelltales:[I - new-array v5, v3, [I + .line 18779 + new-array v5, v4, [I fill-array-data v5, :array_2d sput-object v5, Lcom/android/js/webview/R$styleable;->OnClick:[I + .line 18847 new-array v5, v10, [I fill-array-data v5, :array_2e sput-object v5, Lcom/android/js/webview/R$styleable;->OnSwipe:[I + .line 19031 new-array v5, v9, [I fill-array-data v5, :array_2f sput-object v5, Lcom/android/js/webview/R$styleable;->PopupWindow:[I + .line 19083 new-array v5, v1, [I const v6, 0x7f020173 - aput v6, v5, v4 + aput v6, v5, v3 sput-object v5, Lcom/android/js/webview/R$styleable;->PopupWindowBackgroundState:[I const/4 v5, 0x5 + .line 19116 new-array v6, v5, [I fill-array-data v6, :array_30 sput-object v6, Lcom/android/js/webview/R$styleable;->PropertySet:[I - new-array v6, v3, [I + .line 19196 + new-array v6, v4, [I fill-array-data v6, :array_31 @@ -2491,48 +2556,55 @@ const/16 v6, 0x11 + .line 19271 new-array v6, v6, [I fill-array-data v6, :array_32 sput-object v6, Lcom/android/js/webview/R$styleable;->SearchView:[I + .line 19576 new-array v6, v5, [I fill-array-data v6, :array_33 sput-object v6, Lcom/android/js/webview/R$styleable;->Spinner:[I - new-array v3, v3, [I + .line 19672 + new-array v4, v4, [I - fill-array-data v3, :array_34 + fill-array-data v4, :array_34 - sput-object v3, Lcom/android/js/webview/R$styleable;->State:[I + sput-object v4, Lcom/android/js/webview/R$styleable;->State:[I + .line 19720 new-array v2, v2, [I fill-array-data v2, :array_35 sput-object v2, Lcom/android/js/webview/R$styleable;->StateListDrawable:[I + .line 19809 new-array v2, v1, [I - const v3, 0x1010199 + const v4, 0x1010199 - aput v3, v2, v4 + aput v4, v2, v3 sput-object v2, Lcom/android/js/webview/R$styleable;->StateListDrawableItem:[I + .line 19837 new-array v1, v1, [I const v2, 0x7f020081 - aput v2, v1, v4 + aput v2, v1, v3 sput-object v1, Lcom/android/js/webview/R$styleable;->StateSet:[I const/16 v1, 0xe + .line 19889 new-array v1, v1, [I fill-array-data v1, :array_36 @@ -2541,48 +2613,56 @@ const/16 v1, 0xd + .line 20133 new-array v1, v1, [I fill-array-data v1, :array_37 sput-object v1, Lcom/android/js/webview/R$styleable;->TextAppearance:[I + .line 20383 new-array v0, v0, [I fill-array-data v0, :array_38 sput-object v0, Lcom/android/js/webview/R$styleable;->Toolbar:[I + .line 20839 new-array v0, v8, [I fill-array-data v0, :array_39 sput-object v0, Lcom/android/js/webview/R$styleable;->Transform:[I + .line 20998 new-array v0, v8, [I fill-array-data v0, :array_3a sput-object v0, Lcom/android/js/webview/R$styleable;->Transition:[I + .line 21185 new-array v0, v5, [I fill-array-data v0, :array_3b sput-object v0, Lcom/android/js/webview/R$styleable;->Variant:[I + .line 21272 new-array v0, v5, [I fill-array-data v0, :array_3c sput-object v0, Lcom/android/js/webview/R$styleable;->View:[I + .line 21371 new-array v0, v9, [I fill-array-data v0, :array_3d sput-object v0, Lcom/android/js/webview/R$styleable;->ViewBackgroundHelper:[I + .line 21443 new-array v0, v9, [I fill-array-data v0, :array_3e @@ -3804,9 +3884,10 @@ .end array-data .end method -.method private constructor ()V +.method public constructor ()V .locals 0 + .line 5034 invoke-direct {p0}, Ljava/lang/Object;->()V return-void diff --git a/smali/com/android/js/webview/R.smali b/smali/com/android/js/webview/R.smali index 68a8810c..7e2a106e 100644 --- a/smali/com/android/js/webview/R.smali +++ b/smali/com/android/js/webview/R.smali @@ -1,31 +1,33 @@ .class public final Lcom/android/js/webview/R; .super Ljava/lang/Object; +.source "R.java" # annotations .annotation system Ldalvik/annotation/MemberClasses; value = { - Lcom/android/js/webview/R$anim;, - Lcom/android/js/webview/R$attr;, - Lcom/android/js/webview/R$bool;, - Lcom/android/js/webview/R$color;, - Lcom/android/js/webview/R$dimen;, - Lcom/android/js/webview/R$drawable;, - Lcom/android/js/webview/R$id;, - Lcom/android/js/webview/R$integer;, - Lcom/android/js/webview/R$layout;, - Lcom/android/js/webview/R$mipmap;, - Lcom/android/js/webview/R$string;, + Lcom/android/js/webview/R$styleable;, Lcom/android/js/webview/R$style;, - Lcom/android/js/webview/R$styleable; + Lcom/android/js/webview/R$string;, + Lcom/android/js/webview/R$mipmap;, + Lcom/android/js/webview/R$layout;, + Lcom/android/js/webview/R$integer;, + Lcom/android/js/webview/R$id;, + Lcom/android/js/webview/R$drawable;, + Lcom/android/js/webview/R$dimen;, + Lcom/android/js/webview/R$color;, + Lcom/android/js/webview/R$bool;, + Lcom/android/js/webview/R$attr;, + Lcom/android/js/webview/R$anim; } .end annotation # direct methods -.method private constructor ()V +.method public constructor ()V .locals 0 + .line 10 invoke-direct {p0}, Ljava/lang/Object;->()V return-void
()V + invoke-direct {v9}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v7, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v9, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v7, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v9, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v9}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v4 + move-result-object v6 .line 840 - iget-object v7, p1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->start:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; + iget-object v9, p1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->start:Landroid/support/constraint/solver/widgets/analyzer/DependencyNode; - iget-boolean v7, v7, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolved:Z + iget-boolean v9, v9, Landroid/support/constraint/solver/widgets/analyzer/DependencyNode;->resolved:Z - if-eqz v7, :cond_2 + if-eqz v9, :cond_3 .line 841 - new-instance v7, Ljava/lang/StringBuilder; + new-instance v9, Ljava/lang/StringBuilder; - invoke-direct {v7}, Ljava/lang/StringBuilder;->()V + invoke-direct {v9}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v7, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v9, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v7, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v9, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v9}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v4 + move-result-object v6 .line 843 - :cond_2 - new-instance v7, Ljava/lang/StringBuilder; + :cond_3 + new-instance v9, Ljava/lang/StringBuilder; - invoke-direct {v7}, Ljava/lang/StringBuilder;->()V + invoke-direct {v9}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v7, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v9, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v4, " PORT=\"LEFT\" BORDER=\"1\">Lappend(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v9, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v9}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v4 + move-result-object v6 .line 855 - iget-object v7, p1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->dimension:Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency; + iget-object v9, p1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->dimension:Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency; - iget-boolean v7, v7, Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency;->resolved:Z + iget-boolean v9, v9, Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency;->resolved:Z - if-eqz v7, :cond_5 + if-eqz v9, :cond_6 - iget-object v7, p1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->widget:Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object v9, p1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->widget:Landroid/support/constraint/solver/widgets/ConstraintWidget; - iget-boolean v7, v7, Landroid/support/constraint/solver/widgets/ConstraintWidget;->measured:Z + iget-boolean v9, v9, Landroid/support/constraint/solver/widgets/ConstraintWidget;->measured:Z - if-nez v7, :cond_5 + if-nez v9, :cond_6 .line 856 - new-instance v7, Ljava/lang/StringBuilder; + new-instance v9, Ljava/lang/StringBuilder; - invoke-direct {v7}, Ljava/lang/StringBuilder;->()V + invoke-direct {v9}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v7, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v9, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v4, " BGCOLOR=\"green\" " + const-string v6, " BGCOLOR=\"green\" " - invoke-virtual {v7, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v9, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v9}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v4 + move-result-object v6 - goto :goto_3 + goto :goto_4 .line 857 - :cond_5 - iget-object v7, p1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->dimension:Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency; + :cond_6 + iget-object v9, p1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->dimension:Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency; - iget-boolean v7, v7, Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency;->resolved:Z + iget-boolean v9, v9, Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency;->resolved:Z - if-eqz v7, :cond_6 + if-eqz v9, :cond_7 - iget-object v7, p1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->widget:Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object v9, p1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->widget:Landroid/support/constraint/solver/widgets/ConstraintWidget; - iget-boolean v7, v7, Landroid/support/constraint/solver/widgets/ConstraintWidget;->measured:Z + iget-boolean v9, v9, Landroid/support/constraint/solver/widgets/ConstraintWidget;->measured:Z - if-eqz v7, :cond_6 + if-eqz v9, :cond_7 .line 858 - new-instance v7, Ljava/lang/StringBuilder; + new-instance v9, Ljava/lang/StringBuilder; - invoke-direct {v7}, Ljava/lang/StringBuilder;->()V + invoke-direct {v9}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v7, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v9, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v4, " BGCOLOR=\"lightgray\" " + const-string v6, " BGCOLOR=\"lightgray\" " - invoke-virtual {v7, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v9, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v9}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v4 + move-result-object v6 - goto :goto_3 + goto :goto_4 .line 859 - :cond_6 - iget-object v7, p1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->dimension:Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency; + :cond_7 + iget-object v9, p1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->dimension:Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency; - iget-boolean v7, v7, Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency;->resolved:Z + iget-boolean v9, v9, Landroid/support/constraint/solver/widgets/analyzer/DimensionDependency;->resolved:Z - if-nez v7, :cond_7 + if-nez v9, :cond_8 - iget-object v7, p1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->widget:Landroid/support/constraint/solver/widgets/ConstraintWidget; + iget-object v9, p1, Landroid/support/constraint/solver/widgets/analyzer/WidgetRun;->widget:Landroid/support/constraint/solver/widgets/ConstraintWidget; - iget-boolean v7, v7, Landroid/support/constraint/solver/widgets/ConstraintWidget;->measured:Z + iget-boolean v9, v9, Landroid/support/constraint/solver/widgets/ConstraintWidget;->measured:Z - if-eqz v7, :cond_7 + if-eqz v9, :cond_8 .line 860 - new-instance v7, Ljava/lang/StringBuilder; + new-instance v9, Ljava/lang/StringBuilder; - invoke-direct {v7}, Ljava/lang/StringBuilder;->()V + invoke-direct {v9}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v7, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v9, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v4, " BGCOLOR=\"yellow\" " + const-string v6, " BGCOLOR=\"yellow\" " - invoke-virtual {v7, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v9, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v9}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v4 + move-result-object v6 .line 862 - :cond_7 - :goto_3 - sget-object v7, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; + :cond_8 + :goto_4 + sget-object v9, Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour;->MATCH_CONSTRAINT:Landroid/support/constraint/solver/widgets/ConstraintWidget$DimensionBehaviour; - if-ne v2, v7, :cond_8 + if-ne v4, v9, :cond_9 .line 863 - new-instance v2, Ljava/lang/StringBuilder; + new-instance v4, Ljava/lang/StringBuilder; - invoke-direct {v2}, Ljava/lang/StringBuilder;->()V + invoke-direct {v4}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v4, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v4, "style=\"dashed\"" + const-string v6, "style=\"dashed\"" - invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v4, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v4 + move-result-object v6 - :cond_8 - if-eqz v3, :cond_9 + :cond_9 + if-eqz v5, :cond_a .line 867 - new-instance v2, Ljava/lang/StringBuilder; + new-instance v4, Ljava/lang/StringBuilder; - invoke-direct {v2}, Ljava/lang/StringBuilder;->()V + invoke-direct {v4}, Ljava/lang/StringBuilder;->()V - const-string v7, " [" + const-string v9, " [" - invoke-virtual {v2, v7}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v4, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - iget v3, v3, Landroid/support/constraint/solver/widgets/analyzer/RunGroup;->groupIndex:I + iget v5, v5, Landroid/support/constraint/solver/widgets/analyzer/RunGroup;->groupIndex:I - add-int/lit8 v3, v3, 0x1 + add-int/2addr v5, v1 - invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; + invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; - const-string v3, "/" + const-string v1, "/" - invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v4, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - sget v3, Landroid/support/constraint/solver/widgets/analyzer/RunGroup;->index:I + sget v1, Landroid/support/constraint/solver/widgets/analyzer/RunGroup;->index:I - invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; + invoke-virtual {v4, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; - const-string v3, "]" + const-string v1, "]" - invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v4, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v2 + move-result-object v1 - goto :goto_4 + goto :goto_5 - :cond_9 - const-string v2, "" + :cond_a + const-string v1, "" .line 869 - :goto_4 - new-instance v3, Ljava/lang/StringBuilder; + :goto_5 + new-instance v4, Ljava/lang/StringBuilder; - invoke-direct {v3}, Ljava/lang/StringBuilder;->()V + invoke-direct {v4}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v4, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v4, ">" + const-string v5, ">" - invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v4, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v4, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; const-string v1, "