OSDN Git Service

resolve merge conflicts of 3964c51bf2 to nyc-dev
[android-x86/packages-apps-Settings.git] / src / com / android / settings / ConfirmDeviceCredentialBaseActivity.java
2016-09-06 Maurice Lam[Fingerprint] Remove learn more link if not provisioned...
2016-09-06 Maurice Lam[Fingerprint] Remove learn more link if not provisioned...
2016-07-15 Jason MonkPre-setup restrictions DO NOT MERGE am: e6ad6e866b...
2016-07-15 Jason MonkPre-setup restrictions DO NOT MERGE
2016-06-02 Wei WangMerge "Revert "Add an entry in developer options for...
2016-05-31 Roozbeh PournaderMerge "Show only up to two locales in Settings" into...
2016-05-27 Roozbeh PournaderMerge "Force dashboard summary to single-line and ellip...
2016-05-26 Maurice LamMerge "Add activity label to encryption interstitial...
2016-05-26 TreeHugger RobotMerge "Import translations. DO NOT MERGE" into nyc-dev
2016-05-26 Ricky WaiMerge "Use LockPatternUtils.resetKeyStore() to clear...
2016-05-26 Victor ChangMerge "Fix Work Challenge / personal confirm credential...
2016-05-24 Victor ChangFix Work Challenge / personal confirm credential is...
2016-04-13 Sudheer ShankaMerge "Add new section in Apps screen to show app insta...
2016-04-13 Yohei YukawaMerge "Revert "Revert "Fix no keyboard on N builds...
2016-04-12 Sudheer ShankaMerge "Auto-link web urls in support messages." into...
2016-04-12 Udam SainiMerge "Increase string char limit." into nyc-dev
2016-04-08 Suprabh ShuklaMerge "Moving HelpUtils to SettingsLib" into nyc-dev
2016-04-07 Nicolas PrévotMerge "Ask the user to unlock the work profile before...
2016-04-07 Suprabh ShuklaMerge "Fix user photo popup layout for RTL" into nyc-dev
2016-04-07 Andres MoralesMerge "handle devices that don't support FLASH_LOCK_STA...
2016-04-06 Maurice LamMerge "Update fingerprint strings during setup" into...
2016-04-06 Anna GaluszaMerge "Revert "Fix issues with wrong configuration...
2016-04-06 Alan ViveretteMerge "Use normal button style for Clear data / cache...
2016-04-06 Oleksandr PeletskyiMerge "Block "Screen lock" menu for Work Challenge...
2016-04-05 Sanket AgarwalMerge "PBAP Pairing Permission" into nyc-dev
2016-04-05 Anna GaluszaMerge "Add Tron Logging to portion of A11y SUW that...
2016-04-04 Udam SainiMerge "Adds a multi line preference class." into nyc-dev
2016-04-04 Maurice LamMerge "Set LinkMovementMethod in LinkTextView" into...
2016-04-04 Yohei YukawaMerge "Fix PhysicalKeyboardFragment crash bug." into...
2016-04-04 Julia ReynoldsMerge "Hide repeat callers instead of disabling." into...
2016-04-04 Julia ReynoldsMerge "Lowercase s." into nyc-dev
2016-04-04 Clara BayarriMerge "Remove fullstop at end of phrases" into nyc-dev
2016-04-03 Jeff SharkeyMerge "Mark UI components for tests to find." into...
2016-04-02 Yohei YukawaMerge "Revert "Fix no keyboard on N builds"" into nyc-dev
2016-04-01 Jim MillerMerge "Fix crash in ConfirmDeviceCredentials" into...
2016-03-30 Jim MillerFix crash in ConfirmDeviceCredentials
2016-02-29 Sanket PadaweResolve merge conflicts of b9e837bc78 to nyc-dev
2016-02-20 Samuel TanWifiConfigController: set ca_path and ca_cert to null...
2016-02-17 Geoff MendalImport translations. DO NOT MERGE
2016-02-17 Lorenzo Colittiresolve merge conflicts of c408ab3de6 to nyc-dev
2016-02-17 Nathan HaroldUpdate BandMode Names to support full list, fix off...
2016-02-15 Geoff MendalImport translations. DO NOT MERGE
2016-02-14 SvetoslavDO NOT MERGE Modify system settings: incorrect UI state...
2016-02-10 Geoff MendalImport translations. DO NOT MERGE
2016-02-09 Samuel TanAllow trusted system certificates to be used in EAP...
2016-02-05 Samuel TanCorrectly load saved EAP CA cert and user cert options
2016-02-03 Jason MonkMerge "Change receiver name attribute for DISCOVERABLE_...
2016-02-03 Geoff MendalImport translations. DO NOT MERGE am: 10a758b8b7 ...
2016-02-03 Geoff MendalImport translations. DO NOT MERGE am: dd33e41c5a ...
2016-02-03 Oleksandr PeletskyiMerge "Gray out Wallpapers menu item when setting of...
2016-02-02 Ritesh ReddyMerge "Calling dataChanged() for Net Policy Restriction...
2016-02-02 Samuel TanAllow domain suffix match to be set in UI for EAP confi...
2016-02-02 Geoff MendalImport translations. DO NOT MERGE am: 49a9587ade ...
2016-02-02 Geoff MendalImport translations. DO NOT MERGE am: 0873f057db ...
2016-02-01 Geoff MendalImport translations. DO NOT MERGE am: 66382c5667 ...
2016-02-01 Geoff MendalImport translations. DO NOT MERGE am: 67603ccc01 ...
2016-01-27 Samuel TanDisplay warning if users does not provide CA cert in...
2016-01-27 Samuel TanAdd menu options for not specifying a EAP CA cert and...
2016-01-27 Samuel TanDisable configuring EAP-TLS without user certificate.
2016-01-27 Sanket Padawe[DO NOT MERGE] Disable configuring EAP-TLS/TTLS/PEAP...
2016-01-27 Geoff MendalImport translations. DO NOT MERGE am: 963c4b3d41 ...
2016-01-27 Geoff MendalImport translations. DO NOT MERGE am: 9c57679b0e ...
2016-01-27 Rubin Xuresolve merge conflicts of 55d7fcbfc2 to master.
2016-01-26 Philip P. MoltmannMerge "Settings: Handle non-nullness of PrintJobId...
2016-01-26 Shishir AgrawalDO NOT MERGE : Unhiding MSIM APIs.
2016-01-25 Tony MantlerMerge "Move AccessPointPreference to SettingsLib"
2016-01-25 Geoff MendalMerge "Import translations. DO NOT MERGE" into mnc...
2016-01-25 Geoff MendalImport translations. DO NOT MERGE am: 13391af4fc ...
2016-01-25 Benjamin FranzMerge "Change build targets for settings tests"
2016-01-23 Steve Pfetschresolve merge conflicts of 259b6a8029 to master.
2016-01-22 Oleksandr PeletskyiMerge "Added check of the restriction if a user is...
2016-01-22 Anna GaluszaMerge "Make A11y SUW launchable from SUW and small...
2016-01-22 Maurice LamMerge "Use RestrictedRadioButton in SetupRedactionInter...
2016-01-22 Benjamin FranzMerge "Add background image for work challenge"
2016-01-21 Benjamin FranzAdd background image for work challenge
2016-01-13 Geoff MendalImport translations. DO NOT MERGE
2016-01-11 Sudheer Shankaam 3ad534aa: am bc956309: Update warning dialog on...
2016-01-11 Geoff Mendalam 0baeee0c: (-s ours) am 79670bbe: (-s ours) Import...
2016-01-11 Alan Viveretteam fb7827f3: am d4988442: Point to Material.Settings...
2016-01-11 Yorke Leeam 80848e20: am 169f824b: Merge "Rename setDefaultDiale...
2016-01-11 Jorim Jaggiam 80134266: am 4a2423ba: Move fingerprint enroll logic...
2016-01-11 Jorim Jaggiam 6ecd1005: am 11eae045: Allow incremental builds...
2016-01-11 Maurice Lamam ab82d2fd: am 9fab5c1d: Merge "[LockSetup] Hide back...
2016-01-11 Maurice Lamam 824b09cb: am 80ca2687: Merge "[WifiSetup] Show progr...
2016-01-11 Jason Monkam e5f7ba7f: am 70c5472f: Merge "Move process stats...
2016-01-11 Geoff Mendalam 6d53b908: (-s ours) am d1b9edab: (-s ours) Import...
2016-01-11 Geoff Mendalam 3eb3af9d: (-s ours) am c5184ff1: (-s ours) Import...
2015-11-17 Russell BrennerMerge "Block developer settings during SUW" into lmp...
2015-11-17 Russell Brenner[DO NOT MERGE] Preserve FRP lock if wiped during SUW...
2015-11-17 Russell BrennerMerge "Block developer settings during SUW" into lmp...
2015-11-17 Russell Brenner[DO NOT MERGE] Preserve FRP lock if wiped during SUW...
2015-11-17 Russell BrennerMerge "Preserve FRP lock if wiped during SUW" into...
2015-11-17 Sanket PadaweUncheck checkbox for contact sharing by default for...
2015-11-13 Robin LeeMerge "VPN settings: grey out policy-restricted menus"
2015-10-20 Michael WrightMerge "Always show pairing dialog for device-specific...
2015-10-19 Geoff Mendalam 99131cf6: (-s ours) am f191953c: (-s ours) Import...
2015-10-19 Geoff Mendalam f191953c: (-s ours) Import translations. DO NOT...
2015-10-14 Geoff Mendalam 67b0ffc8: (-s ours) am 8b6b589d: (-s ours) am cec2a6...
2015-10-14 Geoff Mendalam 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb54...
2015-10-14 Geoff Mendalam c6d5ac0f: (-s ours) am 974dfc1f: (-s ours) Import...
next