summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge "Reset permissions and app links when clearing app preferences - settin...Svetoslav Ganov2015-07-231-1/+1
|\
| * Reset permissions and app links when clearing app preferences - settingsSvet Ganov2015-07-231-1/+1
* | Merge "Fix battery detail issues with "Android OS"" into mnc-devJason Monk2015-07-232-3/+7
|\ \
| * | Fix battery detail issues with "Android OS"Jason Monk2015-07-222-3/+7
* | | Merge "Don't show disabled apps in ignore optimizations" into mnc-devJason Monk2015-07-231-2/+7
|\ \ \
| * | | Don't show disabled apps in ignore optimizationsJason Monk2015-07-211-2/+7
| |/ /
* | | Prevent monkey from changing adoptable storage settingsGuang Zhu2015-07-232-2/+6
* | | Merge "Add or remove WFC setting when Wireless settings activity is resumed" ...Pavel Zhamaitsiak2015-07-231-5/+6
|\ \ \ | |_|/ |/| |
| * | Add or remove WFC setting when Wireless settings activity is resumedPavel Zhamaitsiak2015-07-231-5/+6
* | | Merge "Remove tuner from development settings" into mnc-devJason Monk2015-07-221-26/+0
|\ \ \
| * | | Remove tuner from development settingsJason Monk2015-07-161-26/+0
* | | | Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-devMaurice Lam2015-07-212-12/+17
|\ \ \ \
| * | | | [ScreenLock] Style encryption interstitial in SUWMaurice Lam2015-07-202-12/+17
| | |_|/ | |/| |
* | | | Merge "[Fingerprint] Send RESULT_CANCELED when back from Add another" into mn...Maurice Lam2015-07-213-1/+11
|\ \ \ \ | |_|_|/ |/| | |
| * | | [Fingerprint] Send RESULT_CANCELED when back from Add anotherMaurice Lam2015-07-213-1/+11
| |/ /
* | | Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." i...Billy Lau2015-07-212-26/+27
|\ \ \
| * | | Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...Billy Lau2015-07-212-26/+27
| |/ /
* | | Merge "Fix bug to force to close once change Bearer on APN" into mnc-devAmit Mahajan2015-07-211-1/+1
|\ \ \
| * | | Fix bug to force to close once change Bearer on APNSungmin Choi2015-07-201-1/+1
* | | | Make 'fingerprint' searchable in Settings.Julia Reynolds2015-07-212-1/+11
| |/ / |/| |
* | | Merge "[ScreenLock] Change title of encryption interstitial" into mnc-devMaurice Lam2015-07-211-17/+2
|\ \ \
| * | | [ScreenLock] Change title of encryption interstitialMaurice Lam2015-07-201-17/+2
* | | | Merge "[Fingerprint] Change message in encryption" into mnc-devMaurice Lam2015-07-214-3/+18
|\ \ \ \
| * | | | [Fingerprint] Change message in encryptionMaurice Lam2015-07-204-3/+18
* | | | | Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-devMaurice Lam2015-07-211-1/+3
|\ \ \ \ \
| * | | | | [ScreenLock] Change title for RedactionInterstitialMaurice Lam2015-07-201-1/+3
| | |/ / / | |/| | |
* | | | | Don't launch ConfirmDeviceCredentials multiple times.Jim Miller2015-07-201-6/+9
| |/ / / |/| | |
* | | | Merge "Handle monkey crash" into mnc-devJason Monk2015-07-201-1/+3
|\ \ \ \
| * | | | Handle monkey crashJason Monk2015-07-201-1/+3
| | |/ / | |/| |
* | | | Merge "Offer 'ask' as an available app-linking state" into mnc-devChristopher Tate2015-07-201-36/+60
|\ \ \ \ | |/ / / |/| | |
| * | | Offer 'ask' as an available app-linking stateChristopher Tate2015-07-171-36/+60
| |/ /
* | | Merge "Simplify FingerprintSettings" into mnc-devJim Miller2015-07-171-30/+46
|\ \ \
| * | | Simplify FingerprintSettingsJim Miller2015-07-171-30/+46
| |/ /
* | | Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)....Billy Lau2015-07-173-40/+28
|\ \ \ | |/ / |/| |
| * | Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...Billy Lau2015-07-173-40/+28
| |/
* | Intent filters need CATEGORY_BROWSABLE to be app-linking eligibleChristopher Tate2015-07-161-2/+3
|/
* Merge "Show disabled trust agents as off." into mnc-devKenny Guy2015-07-161-0/+1
|\
| * Show disabled trust agents as off.Kenny Guy2015-07-151-0/+1
* | Merge "Use common xml file for multi-tab settings." into mnc-devSanket Padawe2015-07-161-1/+1
|\ \
| * | Use common xml file for multi-tab settings.Sanket Padawe2015-07-141-1/+1
* | | Merge "Disable ignore battery optimization items that can't change" into mnc-devJason Monk2015-07-151-0/+11
|\ \ \
| * | | Disable ignore battery optimization items that can't changeJason Monk2015-07-151-0/+11
* | | | Merge "Change move storage from dropdown pref to dialog" into mnc-devJason Monk2015-07-151-21/+40
|\ \ \ \
| * | | | Change move storage from dropdown pref to dialogJason Monk2015-07-151-21/+40
| |/ / /
* | | | Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-devMaurice Lam2015-07-1511-23/+407
|\ \ \ \
| * | | | [Fingerprint] Add fingerprint enroll in setup wizardMaurice Lam2015-07-1511-23/+407
* | | | | Merge "[Fingerprint] Export FingerprintEnrollIntroduction" into mnc-devMaurice Lam2015-07-152-6/+6
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | [Fingerprint] Export FingerprintEnrollIntroductionMaurice Lam2015-07-152-6/+6
| |/ /
* | | Merge "Fix Help menu for PrivateVolumeSettings" into mnc-devJason Monk2015-07-151-0/+1
|\ \ \ | |/ / |/| |
| * | Fix Help menu for PrivateVolumeSettingsJason Monk2015-07-141-0/+1