OSDN Git Service

resolve merge conflicts of f2801e4 to nyc-mr1-dev
[android-x86/packages-apps-Settings.git] / res / layout-land / confirm_lock_password.xml
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-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-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-10-19 Geoff Mendalam f191953c: (-s ours) Import translations. DO NOT...
2015-10-14 Geoff Mendalam 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb54...
2015-10-14 Geoff Mendalam 974dfc1f: (-s ours) Import translations. DO NOT...
2015-10-12 Geoff Mendalam 1bd19dd1: (-s ours) am 0e3ffe7c: (-s ours) am 5fa0a9...
2015-10-12 Geoff Mendalam f598d0bc: (-s ours) Import translations. DO NOT...
2015-10-07 Geoff Mendalam ad36aa0e: (-s ours) am 3963b980: (-s ours) am 793b2a...
2015-10-07 Geoff Mendalam b4a027d0: (-s ours) Import translations. DO NOT...
2015-10-05 Geoff Mendalam 03226257: (-s ours) am 45335b0c: (-s ours) am 0070fb...
2015-10-05 Geoff Mendalam 010d2fcd: (-s ours) Import translations. DO NOT...
2015-09-30 Geoff Mendalam dffcc532: (-s ours) am c7b0a816: (-s ours) am 49b491...
2015-09-30 Geoff Mendalam 77fc6ac5: (-s ours) Import translations. DO NOT...
2015-09-27 Baligh Uddinam 4fdde2b5: (-s ours) am 2b802ceb: (-s ours) am cd6e60...
2015-09-27 Baligh Uddinam ec981982: (-s ours) am 9b9d77f1: (-s ours) am 15243a...
2015-09-27 Baligh Uddinam ad7342ec: (-s ours) Import translations. DO NOT...
2015-09-21 Zach Jangam 7b2994d2: (-s ours) am 1304f47c: am 5cac8966: am...
2015-09-21 Zach Jangam 386c7763: (-s ours) am 564ec935: am 00721b4a: am...
2015-09-17 Zach Jangam b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO...
2015-08-05 Sanket Padaweam 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0...
2015-07-29 Fyodor Kupolovam 2731a18f: Merge "brightness status not refresh in...
2015-07-29 Fyodor Kupolovam 2731a18f: Merge "brightness status not refresh in...
2015-07-29 Sanket Padaweam df9b13af: am 74d85949: am e05f7143: Check for specia...
2015-07-14 Narayan Kamatham 83a25842: Merge "Lose some deprecated test annotations."
2015-07-14 Narayan Kamatham 83a25842: Merge "Lose some deprecated test annotations."
2015-06-12 Rubin XuMerge "Defensively load untrusted icons from account...
2015-06-11 Sanket PadaweMerge "String changes for Cellular data toggle summary...
2015-06-08 Neil Fulleram 7779ef1a: (-s ours) Merge "Revert "Stop showing...
2015-06-08 Neil Fulleram 91e20200: (-s ours) Merge "Stop showing long names...
2015-06-08 Martijn CoenenMerge "Add NFC payment "how it works" screens." into...
2015-06-08 Martijn CoenenMerge "NFC: don't use dynamic resources." into mnc-dev
2015-06-06 Ruben BrunkMerge "Add UI for camera + flashlight battery reporting...
2015-06-05 Jason MonkMerge "Fix some dark theme issues (Take 2)" into mnc-dev
2015-06-04 Tom O'NeillMerge commit '1542f9c7' into manualmerge
2015-06-04 Jason MonkMerge "Fix dashboard shadows on tablets" into mnc-dev
2015-06-04 Jason MonkMerge "Fix updates of the enable/disable button" into...
2015-06-04 Jason MonkMerge "Fix crash in battery screen" into mnc-dev
2015-06-04 Jason MonkMerge "Disable owner info when no lock screen" into...
2015-06-04 Jason MonkMerge "Protect against monkey crash" into mnc-dev
2015-06-04 The Android Automergermerge in mnc-release history after reset to mnc-dev
2015-06-04 Jim MillerMerge "Revert "Fix some dark theme issues"" into mnc-dev
2015-06-04 Stuart ScottMerge "Re-add a string which was accidently removed...
2015-06-03 Nicolas PrevotMerge "In Settings, don't allow to disable an app which...
2015-06-03 Xiyuan Xiaam b2508e10: am 3bab71f8: am d9e92ea5: Merge "Use acces...
2015-06-03 Sanket PadaweMerge "Fix Wifi Signal strength icon issues in WifiSett...
2015-06-03 Xiyuan Xiaam 3bab71f8: am d9e92ea5: Merge "Use accessibilityLiveR...
2015-06-03 Geoff MendalMerge "Import translations. DO NOT MERGE" into mnc-dev
2015-06-03 Xiyuan Xiaam d9e92ea5: Merge "Use accessibilityLiveRegion for...
next