{"push_id":638417108,"size":10,"distinct_size":10,"ref":"refs/heads/5.1","head":"8eca9cf6a757e518d33329dc7721a7a2e4092cb0","before":"2ff0effdf83057e92ec14315d15adef893ec022f","commits":[{"sha":"beaa885a1d8c6d2162095c71d39d038ff9a7e8e4","author":{"email":"8ea8b6b289c5c67df1876baf01cd5de39db85df3@gmail.com","name":"CPA-Poke"},"message":"rro: squash revert (2/2)\n\nRevert \"Layers: Exposed expanded desktop text color for theming\"\n\nThis reverts commit 950ceda41cd6283cf466f509059510243c10951b.\n\nRevert \"Layers_: Add exposed values for Data Usage Chart\"\n\nThis reverts commit ffa678ec0c049b7e10adcaab0e0054f45e7a0465.\n\nRevert \"Exposing hard coded resources for type 2 overlay access [2/6]\"\n\nThis reverts commit 00e2d0d304b22403bd0a859608ae893a7e04bc3c.\n\nRevert \"Layers: Exposed expanded desktop text color for theming\"\n\nThis reverts commit 3155cd07bb19e6525eeccb0a679ba8c4786be638.\n\nChange-Id: Id4c6dfa8ff59bf7ebcfc1214b3c3b4d6916ddf0d","distinct":true,"url":"https://api.github.com/repos/LiquidSmooth/android_packages_apps_Settings/commits/beaa885a1d8c6d2162095c71d39d038ff9a7e8e4"},{"sha":"dbff6902d3869a5b69ce8454dbd24e15d8b51099","author":{"email":"e3579b1e47f273529f0f929453e939a68ede9fd1@cyngn.com","name":"Andy Mast"},"message":"Themes: Port to Liquid [3/5]\n\nExpose hardcoded and @android colors from layouts\n\nThis will allow theme designers better flexibility with the themes\nthey design for Settings.  There are probably other resources we\nneed to expose but this is a good start.\n\nChange-Id: Ifec5a55657fafb5864184db0783b2b47ad1b5ccc","distinct":true,"url":"https://api.github.com/repos/LiquidSmooth/android_packages_apps_Settings/commits/dbff6902d3869a5b69ce8454dbd24e15d8b51099"},{"sha":"6afb9a4f8e7a7cf44a0a763bd38a1651f556ab37","author":{"email":"7fa5f62b09738798c214462f33afad2e3ebac833@gmail.com","name":"Jason H Weitzel"},"message":"Revert \"PGM: Ask user on single click if he really wants to fast enable PG\"\n\nThis reverts commit 272b2e55b3063e68944ec6031333ab8f91b097a2.\n\n\tmodified:   res/values/slim_strings.xml\n\tmodified:   src/com/android/settings/applications/AppOpsDetails.java\n\tmodified:   src/com/android/settings/slim/privacyguard/PrivacyGuardManager.java","distinct":true,"url":"https://api.github.com/repos/LiquidSmooth/android_packages_apps_Settings/commits/6afb9a4f8e7a7cf44a0a763bd38a1651f556ab37"},{"sha":"be1b646c3d1bf7128de7d053550587f6b408e908","author":{"email":"7fa5f62b09738798c214462f33afad2e3ebac833@gmail.com","name":"Jason H Weitzel"},"message":"Revert \"Setttings: Finish activity on AppOpsDetails if user press the back button\"\n\nThis reverts commit 62223c9d7146240511dd34b16215cff6793c699c.\n\n\tmodified:   src/com/android/settings/applications/AppOpsDetails.java","distinct":true,"url":"https://api.github.com/repos/LiquidSmooth/android_packages_apps_Settings/commits/be1b646c3d1bf7128de7d053550587f6b408e908"},{"sha":"91699354cc42689923429b1c78f42c8a559095aa","author":{"email":"7fa5f62b09738798c214462f33afad2e3ebac833@gmail.com","name":"Jason H Weitzel"},"message":"Revert \"Settings: some fixes and addaptions to LP for PGM\"\n\nThis reverts commit d39b89940c6cf0afbe468bdb53d119ce3f8192ca.\n\nConflicts:\n\tres/drawable-hdpi/ic_settings_reset.png\n\tres/drawable-mdpi/ic_settings_reset.png\n\tres/drawable-xhdpi/ic_settings_reset.png\n\tres/drawable-xxhdpi/ic_settings_reset.png\n\tsrc/com/android/settings/SecuritySettings.java\n\n\tmodified:   src/com/android/settings/SecuritySettings.java\n\tmodified:   src/com/android/settings/applications/AppOpsDetails.java\n\tmodified:   src/com/android/settings/applications/AppOpsState.java\n\tmodified:   src/com/android/settings/slim/privacyguard/PrivacyGuardManager.java\n\nChange-Id: Ie27a441958b3107cd909ddcdc8b3cca1ce0fd056","distinct":true,"url":"https://api.github.com/repos/LiquidSmooth/android_packages_apps_Settings/commits/91699354cc42689923429b1c78f42c8a559095aa"},{"sha":"a08973f215be703302a76c0f5caabcf7a5a71fec","author":{"email":"7fa5f62b09738798c214462f33afad2e3ebac833@gmail.com","name":"Jason H Weitzel"},"message":"Revert \"Privacy Guard Slim version (2/2)\"\n\nThis reverts commit f0dc97b1d2996ea54d7e2b8e43e0855d5359d240.\n\nConflicts:\n\tres/drawable-hdpi/ic_settings_privacy_guard.png\n\tres/drawable-mdpi/ic_settings_privacy_guard.png\n\tres/drawable-xhdpi/ic_settings_privacy_guard.png\n\tres/drawable-xxhdpi/ic_settings_privacy_guard.png\n\tres/layout/privacy_guard_manager.xml\n\tres/menu/privacy_guard_manager.xml\n\tres/values/slim_strings.xml\n\tsrc/com/android/settings/SecuritySettings.java\n\tsrc/com/android/settings/slim/privacyguard/PrivacyGuardAppListAdapter.java\n\n\tmodified:   AndroidManifest.xml\n\tmodified:   res/layout/app_ops_details.xml\n\tmodified:   res/layout/app_ops_details_item.xml\n\tdeleted:    res/layout/app_ops_no_item.xml\n\tmodified:   res/layout/installed_app_details.xml\n\tmodified:   res/layout/manage_applications_item.xml\n\tdeleted:    res/layout/privacy_guard_manager_list_row.xml\n\tmodified:   res/values/slim_strings.xml\n\tdeleted:    res/xml/privacy_guard_prefs.xml\n\tdeleted:    res/xml/security_settings_app_slim.xml\n\tmodified:   src/com/android/settings/SecuritySettings.java\n\tmodified:   src/com/android/settings/applications/AppOpsDetails.java\n\tdeleted:    src/com/android/settings/applications/AppOpsDetailsTop.java\n\tmodified:   src/com/android/settings/applications/InstalledAppDetails.java\n\tdeleted:    src/com/android/settings/slim/privacyguard/PrivacyGuardAppListAdapter.java\n\tdeleted:    src/com/android/settings/slim/privacyguard/PrivacyGuardManager.java\n\tdeleted:    src/com/android/settings/slim/privacyguard/PrivacyGuardPrefs.java\n\nChange-Id: If807914ea3f00dd97525ab20d63f51771daed241","distinct":true,"url":"https://api.github.com/repos/LiquidSmooth/android_packages_apps_Settings/commits/a08973f215be703302a76c0f5caabcf7a5a71fec"},{"sha":"3121bbe17aff4ab091f90fd2a87cb53becf795f9","author":{"email":"7fa5f62b09738798c214462f33afad2e3ebac833@gmail.com","name":"Jason H Weitzel"},"message":"Revert \"Offer to \"merge\" subscribers for data usage.\"\n\nThis reverts commit 4e2d16cdc068ccf9f2b8e98b266a50edc97b6eee.\n\n\tmodified:   src/com/android/settings/DataUsageSummary.java\n\tmodified:   src/com/android/settings/net/NetworkPolicyEditor.java","distinct":true,"url":"https://api.github.com/repos/LiquidSmooth/android_packages_apps_Settings/commits/3121bbe17aff4ab091f90fd2a87cb53becf795f9"},{"sha":"d8aed72c1ab4ef752d6a3d68aae532bf95d01311","author":{"email":"f16bed56189e249fe4ca8ed10a1ecae60e8ceac0@mortimer.me.uk","name":"Sam Mortimer"},"message":"[1/2] Settings AppOps: show/hide app type and allow/deny counters\n\nSquash of:\n\nAuthor: Sam Mortimer <sam@mortimer.me.uk>\nDate:   Thu Oct 3 13:51:31 2013 -0700\nAppOps: menu options to show/hide user and system apps\nChange-Id: Ia55364c361db949a891e4b53a757ee4dff519eb6\n\nAuthor: Sam Mortimer <sam@mortimer.me.uk>\nAuthor: Danny Baumann <dannybaumann@web.de>\nDate:   Wed Oct 2 22:24:14 2013 -0700\n[1/2] AppOps: Show allowed/ignored counts\nChange-Id: Ia27737155c33e934df9a2a1fcff88379240fd096\n\nAuthor: Sam Mortimer <sam@mortimer.me.uk>\nDate:   Sun Dec 1 21:39:07 2013 -0800\nAppOps: only apply app type filters to summary screen\n    *) If buildState() is called for a single package, do\n       not apply hide user/system app filters.\n    *) Fixes show detail display when called via\n       long press in privacyguard and an AppOp hide\n       filter is ticked.\nChange-Id: If31d094fb989836ab6829daeefe820695032c0ed\n\nChange-Id: I4d6f37b3923eb9bc98d67101d6f0ef481a427682\n\nConflicts:\n\tres/layout/app_ops_details_item.xml\n\tres/values/slim_strings.xml\n\tsrc/com/android/settings/applications/AppOpsState.java\n\n\tmodified:   res/layout/app_ops_details_item.xml\n\tnew file:   res/menu/appops_manager.xml\n\tnew file:   res/values/slim_plurals.xml\n\tmodified:   res/values/slim_strings.xml\n\tmodified:   src/com/android/settings/applications/AppOpsDetails.java\n\tmodified:   src/com/android/settings/applications/AppOpsState.java\n\tmodified:   src/com/android/settings/applications/AppOpsSummary.java","distinct":true,"url":"https://api.github.com/repos/LiquidSmooth/android_packages_apps_Settings/commits/d8aed72c1ab4ef752d6a3d68aae532bf95d01311"},{"sha":"fa02996370c394739b07b59a66e8c85737baa415","author":{"email":"f16bed56189e249fe4ca8ed10a1ecae60e8ceac0@mortimer.me.uk","name":"Sam Mortimer"},"message":"[2/2] Settings: Privacy Guard\n\nPS2: * add ic_privacy_guard*.png from frameworks/base\n     * rebase\n\nPS3: * enable AppOpsSummaryActivity\n     * use SubSettings on longclick\n\nPS4: * move privacyguard settings category to just\n       below security\n\nPS5: * rebase\n\nPulled together mostly (if not all) from:\n\nAuthor: Steve Kondik <shade@chemlab.org>\nDate:   Tue Feb 25 14:02:16 2014 +0100\nsettings: Relocate Privacy Guard icons to framework\n* So we can use them in the permission dialog for MODE_ASK\nChange-Id: Ia9bac7dff0bbe91ae48db5d4b0d8f46feb9fdf86\n\nAuthor: DvTonder <david.vantonder@gmail.com>\nDate:   Thu Jan 16 19:01:23 2014 -0500\nSettings: Fix up top level \"Privacy\" section\nChange-Id: Id4dbda10a891c793bc6eb3c42807cc0e3f6092cc\n\nAuthor: Danny Baumann <dannybaumann@web.de>\nDate:   Fri Nov 8 13:37:07 2013 +0100\nAdd back privacy guard manager.\nChange-Id: Ic9fbbae137bb8425fe72a6cdb2f17117351b5709\n\nAuthor: Chirayu Desai <cdesai@cyanogenmod.org>\nDate:   Sat Dec 28 18:51:46 2013 +0530\nPrivacyGuard: Specify a default value in Settings.getInt method call\n* While privacy guard is enabled by default, the default value specified\n  here is returned only when the setting is not defined or not an integer.\nChange-Id: Iaedffcc76a23a310aa7915f6a42ccce83ba5d2a6\n\nAuthor: Matt Mower <mowerm@gmail.com>\nDate:   Wed Feb 5 19:40:37 2014 -0600\nPrivacyGuard: confirm permissions reset\nThe button to reset all application permissions to enabled looks\nsuspiciously like a refresh button. Prompt the user with a confirmation\ndialog to make sure they know what they've pressed.\nChange-Id: I0444c5bf8e9533feccf890055d34d3200609c6f6\n\nConflicts:\n\tAndroidManifest.xml\n\tres/values/cm_strings.xml\n\tsrc/com/android/settings/SettingsActivity.java\n\nChange-Id: I2e10cb4d395e2e7e5141d2fadada9e9b21cd7fbf\n\nDO NOT MERGE: Privacy Guard UI tweaks\n\n  * Moving from settings to settings/security\n  * It compiles\nps2:\n  * Fix FC in settings/security\n  * TODO: remove entry from settings/ and tweak strings\nps3:\n  * Removed entry in settings\n  * TODO: tweak strings\n\nChange-Id: I2e10cb4d395e2e7e5141d2fadada9e9b21cd7fbf\nSigned-off-by: Josue Rivera <prbassplayer@gmail.com>\n\nConflicts:\n\tAndroidManifest.xml\n\tres/layout/privacy_guard_manager.xml\n\tres/menu/privacy_guard_manager.xml\n\tres/values/slim_strings.xml\n\n\tmodified:   AndroidManifest.xml\n\tmodified:   proguard.flags\n\tnew file:   res/drawable-hdpi/ic_privacy_guard.png\n\tnew file:   res/drawable-hdpi/ic_privacy_guard_off.png\n\tnew file:   res/drawable-hdpi/ic_settings_privacy.png\n\tnew file:   res/drawable-mdpi/ic_privacy_guard.png\n\tnew file:   res/drawable-mdpi/ic_privacy_guard_off.png\n\tnew file:   res/drawable-mdpi/ic_settings_privacy.png\n\tnew file:   res/drawable-xhdpi/ic_privacy_guard.png\n\tnew file:   res/drawable-xhdpi/ic_privacy_guard_off.png\n\tnew file:   res/drawable-xhdpi/ic_settings_privacy.png\n\tnew file:   res/drawable-xxhdpi/ic_privacy_guard.png\n\tnew file:   res/drawable-xxhdpi/ic_privacy_guard_off.png\n\tnew file:   res/drawable-xxhdpi/ic_settings_privacy.png\n\tmodified:   res/layout/privacy_guard_manager.xml\n\tnew file:   res/layout/privacy_guard_manager_list_row.xml\n\tmodified:   res/menu/privacy_guard_manager.xml\n\tmodified:   res/values/slim_strings.xml\n\tnew file:   res/xml/privacy_guard_prefs.xml\n\tnew file:   res/xml/security_settings_app_slim.xml\n\tmodified:   src/com/android/settings/SecuritySettings.java\n\tnew file:   src/com/android/settings/privacyguard/PrivacyGuardAppListAdapter.java\n\tnew file:   src/com/android/settings/privacyguard/PrivacyGuardManager.java\n\tnew file:   src/com/android/settings/privacyguard/PrivacyGuardPrefs.java","distinct":true,"url":"https://api.github.com/repos/LiquidSmooth/android_packages_apps_Settings/commits/fa02996370c394739b07b59a66e8c85737baa415"},{"sha":"8eca9cf6a757e518d33329dc7721a7a2e4092cb0","author":{"email":"7fa5f62b09738798c214462f33afad2e3ebac833@gmail.com","name":"Jason H Weitzel"},"message":"fix qs\n\tdeleted:    res/values-rtl/slim_arrays.xml\n\tmodified:   res/values/slim_plurals.xml\n\nChange-Id: If02676d2d2bb7369edbe11dc6036c94aaa02967c","distinct":true,"url":"https://api.github.com/repos/LiquidSmooth/android_packages_apps_Settings/commits/8eca9cf6a757e518d33329dc7721a7a2e4092cb0"}]}