φ(｀д´)ﾒﾓﾒﾓ…
【framework-mod】2011 4.1.B.0.587 xperia の音量長押し曲送り 適用後の適用分差分。
各リソースIDは任意。
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 | diff --git a/app/Settings.apk/res/values-ja/strings.xml b/app/Settings.apk/res/values-ja/strings.xml index 7a5f171..bf8c89b 100644 --- a/app/Settings.apk/res/values-ja/strings.xml +++ b/app/Settings.apk/res/values-ja/strings.xml @@ -1587,4 +1587,6 @@ PINが正しくない可能性があります。"</string> この場合、外部機器が未接続でも通信が発生し、通信料が高額となる場合がありますので、利用が終了次第、本機能を無効にすることを強くお勧めします。"</string> <string name="tethering_warning_txt">メディア転送、携帯電話のソフトウェアアップデート、バックアップと復元など、進行中の操作はすべて中断されます</string> <string name="location_based_wifi">エリア連動Wi-Fi</string> + <string name="kill_app_longpress_back">長押しでアプリを終了</string> + <string name="kill_app_longpress_back_summary">戻るボタンを長押しすることでフォアグラウンドアプリケーションを終了させる</string> </resources> diff --git a/app/Settings.apk/res/values/public.xml b/app/Settings.apk/res/values/public.xml index 9050ebc..9e7811d 100644 --- a/app/Settings.apk/res/values/public.xml +++ b/app/Settings.apk/res/values/public.xml @@ -2608,6 +2608,8 @@ <public type="string" name="wps_popup_message" id="0x7f0b0653" /> <public type="string" name="wps_popup_pin" id="0x7f0b0654" /> <public type="string" name="wps_popup_timer" id="0x7f0b0655" /> + <public type="string" name="kill_app_longpress_back" id="0x7f0b0656" /> + <public type="string" name="kill_app_longpress_back_summary" id="0x7f0b0657" /> <public type="dimen" name="device_memory_usage_button_width" id="0x7f0c0000" /> <public type="dimen" name="device_memory_usage_button_height" id="0x7f0c0001" /> <public type="dimen" name="action_bar_switch_padding" id="0x7f0c0002" /> diff --git a/app/Settings.apk/res/values/strings.xml b/app/Settings.apk/res/values/strings.xml index 3378228..3ca52a3 100644 --- a/app/Settings.apk/res/values/strings.xml +++ b/app/Settings.apk/res/values/strings.xml @@ -1663,4 +1663,6 @@ In this case, packet communication charges may apply even when external devices <string name="wps_popup_message">Press the WPS button on the selected access point and wait for connection</string> <string name="wps_popup_pin">Wait until the connection with the access point is established</string> <string name="wps_popup_timer">Time remaining: %1$s</string> + <string name="kill_app_longpress_back">Kill app back button</string> + <string name="kill_app_longpress_back_summary">Kill the foreground app by long-pressing the back key</string> </resources> diff --git a/app/Settings.apk/res/xml/development_prefs.xml b/app/Settings.apk/res/xml/development_prefs.xml index 9280e31..9e72d24 100644 --- a/app/Settings.apk/res/xml/development_prefs.xml +++ b/app/Settings.apk/res/xml/development_prefs.xml @@ -23,5 +23,6 @@ <CheckBoxPreference android:title="@string/immediately_destroy_activities" android:key="immediately_destroy_activities" android:summary="@string/immediately_destroy_activities_summary" /> <ListPreference android:persistent="false" android:entries="@array/app_process_limit_entries" android:title="@string/app_process_limit_title" android:key="app_process_limit" android:entryValues="@array/app_process_limit_values" /> <CheckBoxPreference android:title="@string/show_all_anrs" android:key="show_all_anrs" android:summary="@string/show_all_anrs_summary" /> + <CheckBoxPreference android:title="@string/kill_app_longpress_back" android:key="kill_app_longpress_back" android:summary="@string/kill_app_longpress_back_summary" /> </PreferenceCategory> </PreferenceScreen> \ No newline at end of file diff --git a/app/Settings.apk/smali/com/android/settings/DevelopmentSettings.smali b/app/Settings.apk/smali/com/android/settings/DevelopmentSettings.smali index 35b7f44..9a5b9a8 100644 --- a/app/Settings.apk/smali/com/android/settings/DevelopmentSettings.smali +++ b/app/Settings.apk/smali/com/android/settings/DevelopmentSettings.smali @@ -23,6 +23,8 @@ .field private mKeepScreenOn:Landroid/preference/CheckBoxPreference; +.field private mKillAppLongpressBack:Landroid/preference/CheckBoxPreference; + .field private mOkClicked:Z .field private mOkDialog:Landroid/app/Dialog; @@ -723,6 +725,40 @@ return-void .end method +.method private updateKillAppLongpressBackOptions()V + .locals 4 + + .prologue + const/4 v0, 0x0 + + .line 475 + iget-object v1, p0, Lcom/android/settings/DevelopmentSettings;->mKillAppLongpressBack:Landroid/preference/CheckBoxPreference; + + invoke-virtual {p0}, Lcom/android/settings/DevelopmentSettings;->getActivity()Landroid/app/Activity; + + move-result-object v2 + + invoke-virtual {v2}, Landroid/app/Activity;->getContentResolver()Landroid/content/ContentResolver; + + move-result-object v2 + + const-string v3, "kill_app_longpress_back" + + invoke-static {v2, v3, v0}, Landroid/provider/Settings$Secure;->getInt(Landroid/content/ContentResolver;Ljava/lang/String;I)I + + move-result v2 + + if-eqz v2, :cond_0 + + const/4 v0, 0x1 + + :cond_0 + invoke-virtual {v1, v0}, Landroid/preference/CheckBoxPreference;->setChecked(Z)V + + .line 477 + return-void +.end method + .method private updatePasswordSummary()V .locals 2 @@ -1189,6 +1225,44 @@ goto :goto_0 .end method +.method private writeKillAppLongpressBackOptions()V + .locals 3 + + .prologue + .line 469 + invoke-virtual {p0}, Lcom/android/settings/DevelopmentSettings;->getActivity()Landroid/app/Activity; + + move-result-object v0 + + invoke-virtual {v0}, Landroid/app/Activity;->getContentResolver()Landroid/content/ContentResolver; + + move-result-object v1 + + const-string v2, "kill_app_longpress_back" + + iget-object v0, p0, Lcom/android/settings/DevelopmentSettings;->mKillAppLongpressBack:Landroid/preference/CheckBoxPreference; + + invoke-virtual {v0}, Landroid/preference/CheckBoxPreference;->isChecked()Z + + move-result v0 + + if-eqz v0, :cond_0 + + const/4 v0, 0x1 + + :goto_0 + invoke-static {v1, v2, v0}, Landroid/provider/Settings$Secure;->putInt(Landroid/content/ContentResolver;Ljava/lang/String;I)Z + + .line 472 + return-void + + .line 469 + :cond_0 + const/4 v0, 0x0 + + goto :goto_0 +.end method + .method private writePointerLocationOptions()V .locals 3 @@ -1608,6 +1682,17 @@ iput-object v3, p0, Lcom/android/settings/DevelopmentSettings;->mShowAllANRs:Landroid/preference/CheckBoxPreference; + .line 139 + const-string v3, "kill_app_longpress_back" + + invoke-virtual {p0, v3}, Lcom/android/settings/DevelopmentSettings;->findPreference(Ljava/lang/CharSequence;)Landroid/preference/Preference; + + move-result-object v3 + + check-cast v3, Landroid/preference/CheckBoxPreference; + + iput-object v3, p0, Lcom/android/settings/DevelopmentSettings;->mKillAppLongpressBack:Landroid/preference/CheckBoxPreference; + .line 141 const-string v3, "verifier_device_identifier" @@ -2048,11 +2133,22 @@ .line 457 :cond_f + iget-object v0, p0, Lcom/android/settings/DevelopmentSettings;->mKillAppLongpressBack:Landroid/preference/CheckBoxPreference; + + if-ne p2, v0, :cond_10 + + .line 458 + invoke-direct {p0}, Lcom/android/settings/DevelopmentSettings;->writeKillAppLongpressBackOptions()V + + goto/16 :goto_0 + + .line 459 + :cond_10 iget-object v0, p0, Lcom/android/settings/DevelopmentSettings;->mForceHardwareUi:Landroid/preference/CheckBoxPreference; if-ne p2, v0, :cond_0 - .line 458 + .line 460 invoke-direct {p0}, Lcom/android/settings/DevelopmentSettings;->writeHardwareUiOptions()V goto/16 :goto_0 diff --git a/framework/android.policy.jar.out/smali/com/android/internal/policy/impl/PhoneWindowManager$25.smali b/framework/android.policy.jar.out/smali/com/android/internal/policy/impl/PhoneWindowManager$25.smali new file mode 100644 index 0000000..fad9045 --- /dev/null +++ b/framework/android.policy.jar.out/smali/com/android/internal/policy/impl/PhoneWindowManager$25.smali @@ -0,0 +1,177 @@ +.class Lcom/android/internal/policy/impl/PhoneWindowManager$25; +.super Ljava/lang/Object; +.source "PhoneWindowManager.java" + +# interfaces +.implements Ljava/lang/Runnable; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingClass; + value = Lcom/android/internal/policy/impl/PhoneWindowManager; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x0 + name = null +.end annotation + + +# instance fields +.field final synthetic this$0:Lcom/android/internal/policy/impl/PhoneWindowManager; + + +# direct methods +.method constructor <init>(Lcom/android/internal/policy/impl/PhoneWindowManager;)V + .locals 0 + .parameter + + .prologue + .line 727 + iput-object p1, p0, Lcom/android/internal/policy/impl/PhoneWindowManager$25;->this$0:Lcom/android/internal/policy/impl/PhoneWindowManager; + + invoke-direct {p0}, Ljava/lang/Object;-><init>()V + + return-void +.end method + + +# virtual methods +.method public run()V + .locals 9 + + .prologue + .line 730 + :try_start_0 + iget-object v5, p0, Lcom/android/internal/policy/impl/PhoneWindowManager$25;->this$0:Lcom/android/internal/policy/impl/PhoneWindowManager; + + const/4 v6, 0x0 + + const/4 v7, 0x0 + + const/4 v8, 0x0 + + invoke-virtual {v5, v6, v7, v8}, Lcom/android/internal/policy/impl/PhoneWindowManager;->performHapticFeedbackLw(Landroid/view/WindowManagerPolicy$WindowState;IZ)Z + + .line 731 + invoke-static {}, Landroid/app/ActivityManagerNative;->getDefault()Landroid/app/IActivityManager; + + move-result-object v3 + + .line 732 + .local v3, mgr:Landroid/app/IActivityManager; + invoke-interface {v3}, Landroid/app/IActivityManager;->getRunningAppProcesses()Ljava/util/List; + + move-result-object v1 + + .line 733 + .local v1, apps:Ljava/util/List;,"Ljava/util/List<Landroid/app/ActivityManager$RunningAppProcessInfo;>;" + invoke-interface {v1}, Ljava/util/List;->iterator()Ljava/util/Iterator; + + move-result-object v2 + + .local v2, i$:Ljava/util/Iterator; + :cond_0 + invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z + + move-result v5 + + if-eqz v5, :cond_1 + + invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object; + + move-result-object v0 + + check-cast v0, Landroid/app/ActivityManager$RunningAppProcessInfo; + + .line 734 + .local v0, appInfo:Landroid/app/ActivityManager$RunningAppProcessInfo; + iget v4, v0, Landroid/app/ActivityManager$RunningAppProcessInfo;->uid:I + + .line 737 + .local v4, uid:I + const/16 v5, 0x2710 + + if-lt v4, v5, :cond_0 + + const v5, 0x1869f + + if-gt v4, v5, :cond_0 + + iget v5, v0, Landroid/app/ActivityManager$RunningAppProcessInfo;->importance:I + + const/16 v6, 0x64 + + if-ne v5, v6, :cond_0 + + .line 739 + iget-object v5, p0, Lcom/android/internal/policy/impl/PhoneWindowManager$25;->this$0:Lcom/android/internal/policy/impl/PhoneWindowManager; + + iget-object v5, v5, Lcom/android/internal/policy/impl/PhoneWindowManager;->mContext:Landroid/content/Context; + + const v6, 0x1040551 + + const/4 v7, 0x0 + + invoke-static {v5, v6, v7}, Landroid/widget/Toast;->makeText(Landroid/content/Context;II)Landroid/widget/Toast; + + move-result-object v5 + + invoke-virtual {v5}, Landroid/widget/Toast;->show()V + + .line 741 + iget-object v5, v0, Landroid/app/ActivityManager$RunningAppProcessInfo;->pkgList:[Ljava/lang/String; + + if-eqz v5, :cond_2 + + invoke-interface {v1}, Ljava/util/List;->size()I + + move-result v5 + + if-lez v5, :cond_2 + + .line 742 + iget-object v5, v0, Landroid/app/ActivityManager$RunningAppProcessInfo;->pkgList:[Ljava/lang/String; + + const/4 v6, 0x0 + + aget-object v5, v5, v6 + + invoke-interface {v3, v5}, Landroid/app/IActivityManager;->forceStopPackage(Ljava/lang/String;)V + + .line 752 + .end local v0 #appInfo:Landroid/app/ActivityManager$RunningAppProcessInfo; + .end local v1 #apps:Ljava/util/List;,"Ljava/util/List<Landroid/app/ActivityManager$RunningAppProcessInfo;>;" + .end local v2 #i$:Ljava/util/Iterator; + .end local v3 #mgr:Landroid/app/IActivityManager; + .end local v4 #uid:I + :cond_1 + :goto_0 + return-void + + .line 744 + .restart local v0 #appInfo:Landroid/app/ActivityManager$RunningAppProcessInfo; + .restart local v1 #apps:Ljava/util/List;,"Ljava/util/List<Landroid/app/ActivityManager$RunningAppProcessInfo;>;" + .restart local v2 #i$:Ljava/util/Iterator; + .restart local v3 #mgr:Landroid/app/IActivityManager; + .restart local v4 #uid:I + :cond_2 + iget v5, v0, Landroid/app/ActivityManager$RunningAppProcessInfo;->pid:I + + invoke-static {v5}, Landroid/os/Process;->killProcess(I)V + :try_end_0 + .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0 + + goto :goto_0 + + .line 749 + .end local v0 #appInfo:Landroid/app/ActivityManager$RunningAppProcessInfo; + .end local v1 #apps:Ljava/util/List;,"Ljava/util/List<Landroid/app/ActivityManager$RunningAppProcessInfo;>;" + .end local v2 #i$:Ljava/util/Iterator; + .end local v3 #mgr:Landroid/app/IActivityManager; + .end local v4 #uid:I + :catch_0 + move-exception v5 + + goto :goto_0 +.end method diff --git a/framework/android.policy.jar.out/smali/com/android/internal/policy/impl/PhoneWindowManager.smali b/framework/android.policy.jar.out/smali/com/android/internal/policy/impl/PhoneWindowManager.smali index 6880fcb..ac8b54e 100644 --- a/framework/android.policy.jar.out/smali/com/android/internal/policy/impl/PhoneWindowManager.smali +++ b/framework/android.policy.jar.out/smali/com/android/internal/policy/impl/PhoneWindowManager.smali @@ -173,6 +173,8 @@ .field final mAllowSystemUiDelay:Ljava/lang/Runnable; +.field mBackLongPress:Ljava/lang/Runnable; + .field mBootMsgDialog:Landroid/app/ProgressDialog; .field mBroadcastDone:Landroid/content/BroadcastReceiver; @@ -800,6 +802,12 @@ iput-object v0, p0, Lcom/android/internal/policy/impl/PhoneWindowManager;->mVolumeUpLongPress:Ljava/lang/Runnable; + new-instance v0, Lcom/android/internal/policy/impl/PhoneWindowManager$25; + + invoke-direct {v0, p0}, Lcom/android/internal/policy/impl/PhoneWindowManager$25;-><init>(Lcom/android/internal/policy/impl/PhoneWindowManager;)V + + iput-object v0, p0, Lcom/android/internal/policy/impl/PhoneWindowManager;->mBackLongPress:Ljava/lang/Runnable; + return-void .end method @@ -6566,13 +6574,38 @@ goto :goto_1 - .line 1566 + .line 1559 :cond_3 + const/16 v26, 0x4 + + move/from16 v0, v26 + + if-ne v13, v0, :cond_4 + + if-nez v6, :cond_4 + + .line 1560 + move-object/from16 v0, p0 + + iget-object v0, v0, Lcom/android/internal/policy/impl/PhoneWindowManager;->mHandler:Landroid/os/Handler; + + move-object/from16 v26, v0 + + move-object/from16 v0, p0 + + iget-object v0, v0, Lcom/android/internal/policy/impl/PhoneWindowManager;->mBackLongPress:Ljava/lang/Runnable; + + move-object/from16 v27, v0 + + invoke-virtual/range {v26 .. v27}, Landroid/os/Handler;->removeCallbacks(Ljava/lang/Runnable;)V + + .line 1566 + :cond_4 const/16 v26, 0x3 move/from16 v0, v26 - if-ne v13, v0, :cond_f + if-ne v13, v0, :cond_10 .line 1569 move-object/from16 v0, p0 @@ -6581,9 +6614,9 @@ move/from16 v26, v0 - if-eqz v26, :cond_7 + if-eqz v26, :cond_8 - if-nez v6, :cond_7 + if-nez v6, :cond_8 .line 1570 const/16 v26, 0x0 @@ -6595,7 +6628,7 @@ iput-boolean v0, v1, Lcom/android/internal/policy/impl/PhoneWindowManager;->mHomePressed:Z .line 1571 - if-nez v3, :cond_6 + if-nez v3, :cond_7 .line 1575 const/4 v10, 0x0 @@ -6609,7 +6642,7 @@ .line 1578 .local v21, telephonyService:Lcom/android/internal/telephony/ITelephony; - if-eqz v21, :cond_4 + if-eqz v21, :cond_5 .line 1579 invoke-interface/range {v21 .. v21}, Lcom/android/internal/telephony/ITelephony;->isRinging()Z @@ -6620,9 +6653,9 @@ .line 1585 .end local v21 #telephonyService:Lcom/android/internal/telephony/ITelephony; - :cond_4 + :cond_5 :goto_2 - if-eqz v10, :cond_5 + if-eqz v10, :cond_6 .line 1586 const-string v26, "WindowManager" @@ -6659,14 +6692,14 @@ .line 1588 .end local v7 #ex:Landroid/os/RemoteException; - :cond_5 + :cond_6 invoke-virtual/range {p0 .. p0}, Lcom/android/internal/policy/impl/PhoneWindowManager;->launchHomeFromHotKey()V goto :goto_3 .line 1591 .end local v10 #incomingRinging:Z - :cond_6 + :cond_7 const-string v26, "WindowManager" const-string v27, "Ignoring HOME; event canceled." @@ -6676,8 +6709,8 @@ goto :goto_3 .line 1598 - :cond_7 - if-eqz p1, :cond_9 + :cond_8 + if-eqz p1, :cond_a invoke-interface/range {p1 .. p1}, Landroid/view/WindowManagerPolicy$WindowState;->getAttrs()Landroid/view/WindowManager$LayoutParams; @@ -6686,7 +6719,7 @@ .line 1599 .local v2, attrs:Landroid/view/WindowManager$LayoutParams; :goto_4 - if-eqz v2, :cond_c + if-eqz v2, :cond_d .line 1600 iget v0, v2, Landroid/view/WindowManager$LayoutParams;->type:I @@ -6701,7 +6734,7 @@ move/from16 v1, v26 - if-eq v0, v1, :cond_8 + if-eq v0, v1, :cond_9 const/16 v26, 0x7d9 @@ -6709,10 +6742,10 @@ move/from16 v1, v26 - if-ne v0, v1, :cond_a + if-ne v0, v1, :cond_b .line 1604 - :cond_8 + :cond_9 const-wide/16 v26, 0x0 goto/16 :goto_1 @@ -6720,7 +6753,7 @@ .line 1598 .end local v2 #attrs:Landroid/view/WindowManager$LayoutParams; .end local v24 #type:I - :cond_9 + :cond_a const/4 v2, 0x0 goto :goto_4 @@ -6728,7 +6761,7 @@ .line 1606 .restart local v2 #attrs:Landroid/view/WindowManager$LayoutParams; .restart local v24 #type:I - :cond_a + :cond_b sget-object v26, Lcom/android/internal/policy/impl/PhoneWindowManager;->WINDOW_TYPES_WHERE_HOME_DOESNT_WORK:[I move-object/from16 v0, v26 @@ -6745,7 +6778,7 @@ :goto_5 move/from16 v0, v25 - if-ge v9, v0, :cond_c + if-ge v9, v0, :cond_d .line 1608 sget-object v26, Lcom/android/internal/policy/impl/PhoneWindowManager;->WINDOW_TYPES_WHERE_HOME_DOESNT_WORK:[I @@ -6756,7 +6789,7 @@ move/from16 v1, v26 - if-ne v0, v1, :cond_b + if-ne v0, v1, :cond_c .line 1610 const-wide/16 v26, -0x1 @@ -6764,7 +6797,7 @@ goto/16 :goto_1 .line 1607 - :cond_b + :cond_c add-int/lit8 v9, v9, 0x1 goto :goto_5 @@ -6773,11 +6806,11 @@ .end local v9 #i:I .end local v24 #type:I .end local v25 #typeCount:I - :cond_c - if-eqz v6, :cond_d + :cond_d + if-eqz v6, :cond_e .line 1616 - if-nez v18, :cond_e + if-nez v18, :cond_f .line 1617 const/16 v26, 0x1 @@ -6789,14 +6822,14 @@ iput-boolean v0, v1, Lcom/android/internal/policy/impl/PhoneWindowManager;->mHomePressed:Z .line 1624 - :cond_d + :cond_e :goto_6 const-wide/16 v26, -0x1 goto/16 :goto_1 .line 1618 - :cond_e + :cond_f invoke-virtual/range {p2 .. p2}, Landroid/view/KeyEvent;->getFlags()I move-result v26 @@ -6807,10 +6840,10 @@ move/from16 v26, v0 - if-eqz v26, :cond_d + if-eqz v26, :cond_e .line 1619 - if-nez v14, :cond_d + if-nez v14, :cond_e .line 1620 invoke-direct/range {p0 .. p0}, Lcom/android/internal/policy/impl/PhoneWindowManager;->handleLongPressOnHome()V @@ -6819,21 +6852,21 @@ .line 1625 .end local v2 #attrs:Landroid/view/WindowManager$LayoutParams; - :cond_f + :cond_10 const/16 v26, 0x52 move/from16 v0, v26 - if-ne v13, v0, :cond_10 + if-ne v13, v0, :cond_11 .line 1627 const/4 v5, 0x1 .line 1629 .local v5, chordBug:I - if-eqz v6, :cond_15 + if-eqz v6, :cond_16 - if-nez v18, :cond_15 + if-nez v18, :cond_16 .line 1630 move-object/from16 v0, p0 @@ -6842,7 +6875,7 @@ move/from16 v26, v0 - if-eqz v26, :cond_15 + if-eqz v26, :cond_16 and-int/lit8 v26, v15, 0x1 @@ -6852,7 +6885,7 @@ move/from16 v1, v27 - if-ne v0, v1, :cond_15 + if-ne v0, v1, :cond_16 .line 1631 new-instance v11, Landroid/content/Intent; @@ -6887,18 +6920,18 @@ .line 1651 .end local v5 #chordBug:I .end local v11 #intent:Landroid/content/Intent; - :cond_10 + :cond_11 const/16 v26, 0x54 move/from16 v0, v26 - if-ne v13, v0, :cond_13 + if-ne v13, v0, :cond_14 .line 1652 - if-eqz v6, :cond_12 + if-eqz v6, :cond_13 .line 1653 - if-nez v18, :cond_11 + if-nez v18, :cond_12 .line 1654 move-object/from16 v0, p0 @@ -6915,13 +6948,13 @@ iput-boolean v0, v1, Lcom/android/internal/policy/impl/PhoneWindowManager;->mConsumeShortcutKeyUp:Z .line 1664 - :cond_11 + :cond_12 const-wide/16 v26, 0x0 goto/16 :goto_1 .line 1657 - :cond_12 + :cond_13 move-object/from16 v0, p0 iget v0, v0, Lcom/android/internal/policy/impl/PhoneWindowManager;->mShortcutKeyPressed:I @@ -6930,7 +6963,7 @@ move/from16 v0, v26 - if-ne v13, v0, :cond_11 + if-ne v13, v0, :cond_12 .line 1658 const/16 v26, -0x1 @@ -6948,7 +6981,7 @@ move/from16 v26, v0 - if-eqz v26, :cond_11 + if-eqz v26, :cond_12 .line 1660 const/16 v26, 0x0 @@ -6965,17 +6998,17 @@ goto/16 :goto_1 .line 1665 - :cond_13 + :cond_14 const/16 v26, 0xbb move/from16 v0, v26 - if-ne v13, v0, :cond_15 + if-ne v13, v0, :cond_16 .line 1666 - if-eqz v6, :cond_14 + if-eqz v6, :cond_15 - if-nez v18, :cond_14 + if-nez v18, :cond_15 if-nez v14, :cond_14 @@ -7007,14 +7040,73 @@ invoke-static {v13, v14, v2}, Landroid/util/Slog;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I .line 1662 - :cond_14 + :cond_15 :goto_7 const-wide/16 v26, -0x1 goto/16 :goto_1 + .line 1670 + :cond_16 + const/16 v26, 0x4 + + move/from16 v0, v26 + + if-ne v13, v0, :cond_17 + + .line 1671 + move-object/from16 v0, p0 + + iget-object v0, v0, Lcom/android/internal/policy/impl/PhoneWindowManager;->mContext:Landroid/content/Context; + + move-object/from16 v26, v0 + + invoke-virtual/range {v26 .. v26}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver; + + move-result-object v26 + + const-string v27, "kill_app_longpress_back" + + const/16 v28, 0x0 + + invoke-static/range {v26 .. v28}, Landroid/provider/Settings$Secure;->getInt(Landroid/content/ContentResolver;Ljava/lang/String;I)I + + move-result v26 + + const/16 v27, 0x1 + + move/from16 v0, v26 + + move/from16 v1, v27 + + if-ne v0, v1, :cond_17 + + .line 1673 + if-eqz v6, :cond_17 + + if-nez v18, :cond_17 + + .line 1674 + move-object/from16 v0, p0 + + iget-object v0, v0, Lcom/android/internal/policy/impl/PhoneWindowManager;->mHandler:Landroid/os/Handler; + + move-object/from16 v26, v0 + + move-object/from16 v0, p0 + + iget-object v0, v0, Lcom/android/internal/policy/impl/PhoneWindowManager;->mBackLongPress:Ljava/lang/Runnable; + + move-object/from16 v27, v0 + + invoke-static {}, Landroid/view/ViewConfiguration;->getGlobalActionKeyTimeout()J + + move-result-wide v28 + + invoke-virtual/range {v26 .. v29}, Landroid/os/Handler;->postDelayed(Ljava/lang/Runnable;J)Z + .line 1677 - :cond_15 + :cond_17 move-object/from16 v0, p0 iget v0, v0, Lcom/android/internal/policy/impl/PhoneWindowManager;->mShortcutKeyPressed:I @@ -7027,7 +7119,7 @@ move/from16 v1, v27 - if-eq v0, v1, :cond_18 + if-eq v0, v1, :cond_1a .line 1678 invoke-virtual/range {p2 .. p2}, Landroid/view/KeyEvent;->getKeyCharacterMap()Landroid/view/KeyCharacterMap; @@ -7040,7 +7132,7 @@ move-result v26 - if-eqz v26, :cond_18 + if-eqz v26, :cond_1a .line 1680 const/16 v26, 0x1 @@ -7052,11 +7144,11 @@ iput-boolean v0, v1, Lcom/android/internal/policy/impl/PhoneWindowManager;->mConsumeShortcutKeyUp:Z .line 1681 - if-eqz v6, :cond_16 + if-eqz v6, :cond_18 - if-nez v18, :cond_16 + if-nez v18, :cond_18 - if-nez v14, :cond_16 + if-nez v14, :cond_18 .line 1682 move-object/from16 v0, p0 @@ -7073,7 +7165,7 @@ .line 1683 .local v20, shortcutIntent:Landroid/content/Intent; - if-eqz v20, :cond_17 + if-eqz v20, :cond_19 .line 1684 const/high16 v26, 0x1000 @@ -7102,7 +7194,7 @@ .line 1699 .end local v20 #shortcutIntent:Landroid/content/Intent; - :cond_16 + :cond_18 :goto_8 const-wide/16 v26, -0x1 @@ -7169,7 +7261,7 @@ .line 1694 .end local v7 #ex:Landroid/content/ActivityNotFoundException; - :cond_17 + :cond_19 const-string v26, "WindowManager" new-instance v27, Ljava/lang/StringBuilder; @@ -7221,16 +7313,16 @@ .line 1704 .end local v12 #kcm:Landroid/view/KeyCharacterMap; .end local v20 #shortcutIntent:Landroid/content/Intent; - :cond_18 - if-eqz v6, :cond_19 + :cond_1a + if-eqz v6, :cond_1b - if-nez v18, :cond_19 + if-nez v18, :cond_1b const/high16 v26, 0x1 and-int v26, v26, v15 - if-eqz v26, :cond_19 + if-eqz v26, :cond_1b .line 1706 invoke-virtual/range {p2 .. p2}, Landroid/view/KeyEvent;->getKeyCharacterMap()Landroid/view/KeyCharacterMap; @@ -7259,7 +7351,7 @@ .line 1710 .restart local v20 #shortcutIntent:Landroid/content/Intent; - if-eqz v20, :cond_19 + if-eqz v20, :cond_1b .line 1711 const/high16 v26, 0x1000 @@ -7334,10 +7426,10 @@ .end local v7 #ex:Landroid/content/ActivityNotFoundException; .end local v12 #kcm:Landroid/view/KeyCharacterMap; .end local v20 #shortcutIntent:Landroid/content/Intent; - :cond_19 - if-eqz v6, :cond_1a + :cond_1b + if-eqz v6, :cond_1c - if-nez v18, :cond_1a + if-nez v18, :cond_1c .line 1725 sget-object v26, Lcom/android/internal/policy/impl/PhoneWindowManager;->sApplicationLaunchKeyCategories:Landroid/util/SparseArray; @@ -7352,7 +7444,7 @@ .line 1726 .local v4, category:Ljava/lang/String; - if-eqz v4, :cond_1a + if-eqz v4, :cond_1c .line 1727 const-string v26, "android.intent.action.MAIN" @@ -7443,16 +7535,16 @@ .end local v4 #category:Ljava/lang/String; .end local v7 #ex:Landroid/content/ActivityNotFoundException; .end local v11 #intent:Landroid/content/Intent; - :cond_1a - if-eqz v6, :cond_1c + :cond_1c + if-eqz v6, :cond_1e - if-nez v18, :cond_1c + if-nez v18, :cond_1e const/16 v26, 0x3d move/from16 v0, v26 - if-ne v13, v0, :cond_1c + if-ne v13, v0, :cond_1e .line 1742 move-object/from16 v0, p0 @@ -7461,7 +7553,7 @@ move/from16 v26, v0 - if-nez v26, :cond_1d + if-nez v26, :cond_1f .line 1743 invoke-virtual/range {p2 .. p2}, Landroid/view/KeyEvent;->getModifiers()I @@ -7486,7 +7578,7 @@ move-result v26 - if-nez v26, :cond_1b + if-nez v26, :cond_1d const/high16 v26, 0x1 @@ -7498,10 +7590,10 @@ move-result v26 - if-eqz v26, :cond_1d + if-eqz v26, :cond_1f .line 1747 - :cond_1b + :cond_1d move/from16 v0, v19 move-object/from16 v1, p0 @@ -7524,8 +7616,8 @@ .line 1752 .end local v19 #shiftlessModifiers:I - :cond_1c - if-nez v6, :cond_1d + :cond_1e + if-nez v6, :cond_1f move-object/from16 v0, p0 @@ -7533,7 +7625,7 @@ move/from16 v26, v0 - if-eqz v26, :cond_1d + if-eqz v26, :cond_1f move-object/from16 v0, p0 @@ -7543,7 +7635,7 @@ and-int v26, v26, v15 - if-nez v26, :cond_1d + if-nez v26, :cond_1f .line 1754 const/16 v26, 0x0 @@ -7564,7 +7656,7 @@ invoke-virtual {v0, v1}, Lcom/android/internal/policy/impl/PhoneWindowManager;->showOrHideRecentAppsDialog(I)V .line 1760 - :cond_1d + :cond_1f invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J move-result-wide v16 @@ -7585,7 +7677,7 @@ cmp-long v26, v26, v28 - if-lez v26, :cond_1e + if-lez v26, :cond_20 .line 1764 const-string v26, "WindowManager" @@ -7600,7 +7692,7 @@ goto/16 :goto_1 .line 1769 - :cond_1e + :cond_20 const-wide/16 v26, 0x0 goto/16 :goto_1 diff --git a/framework/framework-res.apk/res/values-ja/strings.xml b/framework/framework-res.apk/res/values-ja/strings.xml index 3683696..9c56e36 100644 --- a/framework/framework-res.apk/res/values-ja/strings.xml +++ b/framework/framework-res.apk/res/values-ja/strings.xml @@ -1281,4 +1281,5 @@ <string name="recovery_confirm">再起動されます。</string> <string name="recovery_confirm_question">CWMへ再起動させますか？</string> <string name="global_action_screenshot">スクリーンショット</string> + <string name="app_killed_message">アプリケーションを終了しました</string> </resources> diff --git a/framework/framework-res.apk/res/values/public.xml b/framework/framework-res.apk/res/values/public.xml index 2380250..15f02c8 100644 --- a/framework/framework-res.apk/res/values/public.xml +++ b/framework/framework-res.apk/res/values/public.xml @@ -4257,6 +4257,7 @@ <public type="string" name="recovery_confirm" id="0x0104054e" /> <public type="string" name="recovery_confirm_question" id="0x0104054f" /> <public type="string" name="global_action_screenshot" id="0x01040550" /> + <public type="string" name="app_killed_message" id="0x01040551" /> <public type="dimen" name="app_icon_size" id="0x01050000" /> <public type="dimen" name="thumbnail_height" id="0x01050001" /> <public type="dimen" name="thumbnail_width" id="0x01050002" /> diff --git a/framework/framework-res.apk/res/values/strings.xml b/framework/framework-res.apk/res/values/strings.xml index 08ef148..42f9177 100644 --- a/framework/framework-res.apk/res/values/strings.xml +++ b/framework/framework-res.apk/res/values/strings.xml @@ -1384,4 +1384,5 @@ for account %s"</string> <string name="recovery_confirm">Your phone will reboot.</string> <string name="recovery_confirm_question">Would you like to reboot?</string> <string name="global_action_screenshot">Screenshot</string> + <string name="app_killed_message">Application killed</string> </resources> |