OSDN Git Service

Merge "Zen Condition text and primary click changes"
[android-x86/packages-apps-Settings.git] / src / com / android / settings / dashboard / conditional / ConditionAdapter.java
2018-02-02 Beverly TaiMerge "Zen Condition text and primary click changes"
2018-02-02 Jin DongMerge "Fix memory leak of page "Languages & input"...
2018-02-01 TreeHugger RobotMerge "Hide "Phone number" from About page if not call...
2018-02-01 TreeHugger RobotMerge "Enforce disallow switch user in user settings"
2018-02-01 TreeHugger RobotMerge "Handle the Settings.DEVICE_NAME_SETTINGS intent."
2018-02-01 Dmitry ShmidtMerge "Fix dev settings crash when no OEM unlock servic...
2018-01-31 Jerry ZhangMerge "Add new USB details screen for Connected Devices...
2018-01-31 TreeHugger RobotMerge "Use SystemUpdateManager to provide system update...
2018-01-31 TreeHugger RobotMerge "Remove suggestion UI v1 codes."
2018-01-31 Doris LingRemove suggestion UI v1 codes.
2018-01-29 TreeHugger RobotMerge "Move AccessPointPreference.generateApKey."
2018-01-29 Sudheer ShankaMerge "Add policy transparency for metered data related...
2018-01-29 Jin DongMerge "Fix memory leak of DataSaverPreference" am:...
2018-01-27 Bill YiImport translations. DO NOT MERGE am: 31abbee452 ...
2018-01-27 Pavlin RadoslavovMerge "Updated the Bluetooth Settings owners list"...
2018-01-27 Pavlin RadoslavovMerge "Add support for Multi-A2DP state machines per...
2018-01-26 Pavlin RadoslavovMerge "Add Settings support for Bluetooth Multi-A2DP...
2018-01-25 TreeHugger RobotMerge "Refactor the DataUsageBase"
2018-01-25 TreeHugger RobotMerge "Fix the UniquePreferenceTest."
2018-01-25 TreeHugger RobotMerge "Prevent crash in recent app list"
2018-01-25 TreeHugger RobotMerge "Fix null pointer from PowerUsageFeatureProvider"
2018-01-25 TreeHugger RobotMerge "Move injected tiles under debug section"
2018-01-25 TreeHugger RobotMerge "Remove location mode menu from location settings"
2018-01-25 TreeHugger RobotMerge "AR/FR: Updated resources to confirm via component."
2018-01-25 Leif WildenMerge "Migrate to use instrumentation classes from...
2018-01-24 TreeHugger RobotMerge "Update layout config for suggestion card."
2018-01-24 Leif Hendrik WildenMigrate to use instrumentation classes from settingslib.
2018-01-24 TreeHugger RobotMerge "Add bluetooth as a supported Slice"
2018-01-24 Dianne HackbornMerge "Fix issue #72116995: Add permission guarding...
2018-01-24 TreeHugger RobotMerge "Add EID into SIM status dialog"
2018-01-24 TreeHugger RobotMerge "Update strings for suggestions."
2018-01-24 TreeHugger RobotMerge "Turn on new battery settings page"
2018-01-24 Maggie WangMerge "Remove location_modes_previous references"
2018-01-23 Ningyuan WangMerge "Wifi Settings: Add auto option for softap"
2018-01-23 Adrian RoosMerge "DisplayCutout: Add support for multiple cutout...
2018-01-23 TreeHugger RobotMerge "Display recent apps in notification settings"
2018-01-23 TreeHugger RobotMerge "Add a new About Phone page."
2018-01-23 Jong Wook KimMerge "Wifi MAC Randomization: Developer Options"
2018-01-23 TreeHugger RobotMerge "Policy transparency for mandatory backups."
2018-01-23 TreeHugger RobotMerge "Finished initial implementation of StorageAccess...
2018-01-23 TreeHugger RobotMerge "Add checkbox to let user wipe eSIM data together...
2018-01-23 TreeHugger RobotMerge "Revert "Migrate to use instrumentation classes...
2018-01-22 Leif WildenRevert "Migrate to use instrumentation classes from...
2018-01-22 TreeHugger RobotMerge "Remove reference to missing string."
2018-01-20 Qingxi LiMerge "Add checkbox for erase esim under network reset...
2018-01-19 TreeHugger RobotMerge "Block sleep options in Settings app when DISALLO...
2018-01-19 TreeHugger RobotMerge "Unregister hotspot receiver in TetherService."
2018-01-19 Lei YuMerge "Add restrict app detail page"
2018-01-19 TreeHugger RobotMerge "Include instant apps in Recently opened apps...
2018-01-19 TreeHugger RobotMerge "Fix FakeUid implementation"
2018-01-19 TreeHugger RobotMerge "Zen automatic rule page ui changes"
2018-01-19 TreeHugger RobotMerge "Only show app action button if it is not instant...
2018-01-19 Leif WildenMerge "Migrate to use instrumentation classes from...
2018-01-18 Leif Hendrik WildenMigrate to use instrumentation classes from settingslib.
2017-12-18 Treehugger RobotMerge "Launch new Home app when selecting Home app...
2017-12-05 Antony SargentReword bluetooth confirmation dialog am: e14d38a383...
2017-12-01 Antony SargentFix BluetoothPairingDialogTest to not expect device...
2017-11-03 Fan ZhangMerge "Set device credential's Window flag to be SECURE...
2017-10-31 Fan ZhangMerge "Set device credential's Window flag to be SECURE...
2017-10-31 Fan ZhangMerge "Set device credential's Window flag to be SECURE...
2017-10-31 Fan ZhangMerge "Set device credential's Window flag to be SECURE...
2017-10-24 Fan ZhangMerge "Fix wrong position of cursor in OwnerInfoSettings"
2017-10-24 Bill YiMerge remote-tracking branch 'goog/stage-aosp-master...
2017-10-20 Jack YuMerge "Refactored area update info support"
2017-10-20 Ben SchwartzMerge "Add a developer option for controlling DNS over...
2017-10-19 tiansimingMerge "Fix wrong position of cursor in IccLockSettings"
2017-10-18 Jeff SharkeyDO NOT MERGE. ActivityPicker shouldn't grant permission...
2017-10-18 Jeff SharkeyDO NOT MERGE. ActivityPicker shouldn't grant permission...
2017-10-16 Cai, Min1Merge "Refresh payment preference while resume"
2017-10-16 Maurice Lamresolve merge conflicts of f36b25c2df to stage-aosp...
2017-10-15 Daniel NishiMerge "Fix PrivateVolumeSettings be launched repeatedly"
2017-10-11 Jeff SharkeyDO NOT MERGE. ActivityPicker shouldn't grant permission...
2017-10-11 Jeff SharkeyDO NOT MERGE. ActivityPicker shouldn't grant permission...
2017-10-11 Jeff SharkeyDO NOT MERGE. ActivityPicker shouldn't grant permission...
2017-10-11 Jeff SharkeyDO NOT MERGE. ActivityPicker shouldn't grant permission...
2017-10-11 Jeff SharkeyMerge "DO NOT MERGE. ActivityPicker shouldn't grant...
2017-10-11 Fan ZhangMerge "Move SettingsRobolectricTestRunner to testutils."
2017-10-11 Jeff SharkeyDO NOT MERGE. ActivityPicker shouldn't grant permission...
2017-10-02 Carsten HaugeMerge "Avoid NullPointerException when updating prefere...
2017-09-29 songkailunMerge "Fix wrong format in AndroidManifest.xml"
2017-09-26 Lei YangMerge "Fix "Set up Wi-Fi NFC Tag" dialog cannot be...
2017-09-26 Colin CrossMerge "Remove unnecessary core-oj library"
2017-09-21 Doris LingMerge "Fix NPE crash in UsageAccessDetails"
2017-09-15 Doris LingMerge "Default apps settings disappear when switching...
2017-09-14 edgar.huangMerge "Don't need to authenticate fingerprint when...
2017-09-14 Erik KlineMerge changes Icd3d09aa,I4b070964
2017-09-11 debesay guadadMerge "Add ims registration status"
2017-09-11 Amit MahajanMerge "Change to disable mvno data field in ApnEditor...
2017-09-08 daqiMerge "Fix TrustedCredentialsSettings NPE"
2017-09-06 edgar.huangMerge "Settings is crashed high probability when doing...
2017-08-31 Colin CrossMerge "Fix errorprone build"
2017-08-31 Maurice LamMerge "Fix Settings crashes after tapping "Learn more...
2017-08-30 Phil Weaverresolve merge conflicts of 94c5202965 to oc-dr1-dev
2017-08-22 Amit MahajanMerge "Change to not cache user entered apn type as...
2017-08-22 TreeHugger RobotMerge changes from topic "Read dun APNs from apn db...
2017-08-18 Bill YiImport translations. DO NOT MERGE am: 4ced4787ce ...
2017-08-16 Suprabh ShuklaDisabling the activate button when paused am: de5df8b09...
2017-08-16 Suprabh ShuklaDisabling the activate button when paused am: 9ffee0d53...
2017-08-16 Suprabh ShuklaDisabling the activate button when paused am: af5d8b9b0...
2017-08-16 Suprabh ShuklaDisabling the activate button when paused am: de5df8b09...
next