OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
resolve merge conflicts of 3964c51bf2 to nyc-dev
[android-x86/packages-apps-Settings.git]
/
src
/
com
/
android
/
settings
/
accounts
/
ManageAccountsSettings.java
2017-03-09
Dmitry Dementyev
resolve merge conflicts of 3964c51bf2 to nyc-dev
blob
|
commitdiff
2016-09-06
Maurice Lam
[Fingerprint] Remove learn more link if not provisioned...
blob
|
commitdiff
|
diff to current
2016-07-15
Jason Monk
Pre-setup restrictions DO NOT MERGE am: e6ad6e866b...
blob
|
commitdiff
|
diff to current
2016-02-29
Sanket Padawe
Resolve merge conflicts of b9e837bc78 to nyc-dev
blob
|
commitdiff
|
diff to current
2016-02-20
Samuel Tan
WifiConfigController: set ca_path and ca_cert to null...
blob
|
commitdiff
|
diff to current
2016-02-17
Geoff Mendal
Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2016-02-17
Lorenzo Colitti
resolve merge conflicts of c408ab3de6 to nyc-dev
blob
|
commitdiff
|
diff to current
2016-02-17
Nathan Harold
Update BandMode Names to support full list, fix off...
blob
|
commitdiff
|
diff to current
2016-02-15
Geoff Mendal
Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2016-02-14
Svetoslav
DO NOT MERGE Modify system settings: incorrect UI state...
blob
|
commitdiff
|
diff to current
2016-02-10
Geoff Mendal
Import translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2016-02-09
Samuel Tan
Allow trusted system certificates to be used in EAP...
blob
|
commitdiff
|
diff to current
2016-02-05
Samuel Tan
Correctly load saved EAP CA cert and user cert options
blob
|
commitdiff
|
diff to current
2016-02-03
Jason Monk
Merge "Change receiver name attribute for DISCOVERABLE_...
blob
|
commitdiff
|
diff to current
2016-02-03
Geoff Mendal
Import translations. DO NOT MERGE am: 10a758b8b7 ...
blob
|
commitdiff
|
diff to current
2016-02-03
Geoff Mendal
Import translations. DO NOT MERGE am: dd33e41c5a ...
blob
|
commitdiff
|
diff to current
2016-02-03
Oleksandr Peletskyi
Merge "Gray out Wallpapers menu item when setting of...
blob
|
commitdiff
|
diff to current
2016-02-02
Ritesh Reddy
Merge "Calling dataChanged() for Net Policy Restriction...
blob
|
commitdiff
|
diff to current
2016-02-02
Jeremy Klein
Merge "Add unit tests for TetherService."
blob
|
commitdiff
|
diff to current
2016-02-02
Samuel Tan
Allow domain suffix match to be set in UI for EAP confi...
blob
|
commitdiff
|
diff to current
2016-02-02
Geoff Mendal
Import translations. DO NOT MERGE am: 49a9587ade ...
blob
|
commitdiff
|
diff to current
2016-02-02
Geoff Mendal
Import translations. DO NOT MERGE am: 0873f057db ...
blob
|
commitdiff
|
diff to current
2016-02-01
Geoff Mendal
Import translations. DO NOT MERGE am: 66382c5667 ...
blob
|
commitdiff
|
diff to current
2016-02-01
Geoff Mendal
Import translations. DO NOT MERGE am: 67603ccc01 ...
blob
|
commitdiff
|
diff to current
2016-01-29
Noah Wang
Merge "Adding placeholder for preview screens for scree...
blob
|
commitdiff
|
diff to current
2016-01-28
Daniel Sandler
Merge "Revert "Add Emergency Info preference to user...
blob
|
commitdiff
|
diff to current
2016-01-28
Adam Lesinski
Merge "Update FakeUid to match new methods in BatterySt...
blob
|
commitdiff
|
diff to current
2016-01-27
Samuel Tan
Display warning if users does not provide CA cert in...
blob
|
commitdiff
|
diff to current
2016-01-27
Samuel Tan
Add menu options for not specifying a EAP CA cert and...
blob
|
commitdiff
|
diff to current
2016-01-27
Samuel Tan
Disable configuring EAP-TLS without user certificate.
blob
|
commitdiff
|
diff to current
2016-01-27
Sanket Padawe
[DO NOT MERGE] Disable configuring EAP-TLS/TTLS/PEAP...
blob
|
commitdiff
|
diff to current
2016-01-27
Noah Wang
Merge "Reflect settings change right after interaction"
blob
|
commitdiff
|
diff to current
2016-01-27
Udam Saini
Merge "Adds screen lock as a suggested activity"
blob
|
commitdiff
|
diff to current
2016-01-27
Tony Mak
Merge "Default apps setting for managed profile"
blob
|
commitdiff
|
diff to current
2016-01-27
Geoff Mendal
Import translations. DO NOT MERGE am: 963c4b3d41 ...
blob
|
commitdiff
|
diff to current
2016-01-27
Geoff Mendal
Import translations. DO NOT MERGE am: 9c57679b0e ...
blob
|
commitdiff
|
diff to current
2016-01-27
Chris Wren
port settings over to new metrics enum
blob
|
commitdiff
|
diff to current
2016-01-27
Rubin Xu
resolve merge conflicts of 55d7fcbfc2 to master.
blob
|
commitdiff
|
diff to current
2016-01-26
Shishir Agrawal
DO NOT MERGE : Unhiding MSIM APIs.
blob
|
commitdiff
|
diff to current
2016-01-25
Geoff Mendal
Merge "Import translations. DO NOT MERGE" into mnc...
blob
|
commitdiff
|
diff to current
2016-01-25
Geoff Mendal
Import translations. DO NOT MERGE am: 13391af4fc ...
blob
|
commitdiff
|
diff to current
2016-01-23
Steve Pfetsch
resolve merge conflicts of 259b6a8029 to master.
blob
|
commitdiff
|
diff to current
2016-01-22
Kenny Root
resolve merge conflicts of bdc6074276 to master.
blob
|
commitdiff
|
diff to current
2016-01-20
Geoff Mendal
Import translations. DO NOT MERGE am: ffb0eb03a7 ...
blob
|
commitdiff
|
diff to current
2016-01-20
Geoff Mendal
Import translations. DO NOT MERGE am: bcefb0397f ...
blob
|
commitdiff
|
diff to current
2016-01-18
Geoff Mendal
Import translations. DO NOT MERGE am: c123a6a923 ...
blob
|
commitdiff
|
diff to current
2016-01-18
Geoff Mendal
Import translations. DO NOT MERGE am: bd620a7de1 ...
blob
|
commitdiff
|
diff to current
2016-01-15
Stephen Li
Merge -s ours commit 'dcd4a64f66'
blob
|
commitdiff
|
diff to current
2016-01-15
Jason Monk
Merge "Settings Hooks launch wrong activity" am: 69704608f4
blob
|
commitdiff
|
diff to current
2016-01-14
Bart Sears
resolve merge conflicts of 7e0586b7a6 to master.
blob
|
commitdiff
|
diff to current
2016-01-13
Geoff Mendal
Import translations. DO NOT MERGE am: 6a52aca8ea ...
blob
|
commitdiff
|
diff to current
2016-01-12
Pavel Zhamaitsiak
resolve merge conflicts of 5a1e5edeb7 to master.
blob
|
commitdiff
|
diff to current
2016-01-11
Sudheer Shanka
am 3ad534aa: am bc956309: Update warning dialog on...
blob
|
commitdiff
|
diff to current
2016-01-11
Geoff Mendal
am 0baeee0c: (-s ours) am 79670bbe: (-s ours) Import...
blob
|
commitdiff
|
diff to current
2016-01-11
Alan Viverette
am fb7827f3: am d4988442: Point to Material.Settings...
blob
|
commitdiff
|
diff to current
2016-01-11
Yorke Lee
am 80848e20: am 169f824b: Merge "Rename setDefaultDiale...
blob
|
commitdiff
|
diff to current
2016-01-11
Jorim Jaggi
am 80134266: am 4a2423ba: Move fingerprint enroll logic...
blob
|
commitdiff
|
diff to current
2016-01-11
Jorim Jaggi
am 6ecd1005: am 11eae045: Allow incremental builds...
blob
|
commitdiff
|
diff to current
2016-01-11
Maurice Lam
am ab82d2fd: am 9fab5c1d: Merge "[LockSetup] Hide back...
blob
|
commitdiff
|
diff to current
2016-01-11
Maurice Lam
am 824b09cb: am 80ca2687: Merge "[WifiSetup] Show progr...
blob
|
commitdiff
|
diff to current
2016-01-11
Jason Monk
am e5f7ba7f: am 70c5472f: Merge "Move process stats...
blob
|
commitdiff
|
diff to current
2016-01-11
Geoff Mendal
am 6d53b908: (-s ours) am d1b9edab: (-s ours) Import...
blob
|
commitdiff
|
diff to current
2016-01-11
Geoff Mendal
am 3eb3af9d: (-s ours) am c5184ff1: (-s ours) Import...
blob
|
commitdiff
|
diff to current
2016-01-08
Mark Salyzyn
Merge "whitelist "snet_event_log" when turning logs...
blob
|
commitdiff
|
diff to current
2016-01-07
Alex Klyubin
Merge "[2/3] Remove unnecessary throws statement in...
blob
|
commitdiff
|
diff to current
2016-01-06
Mark Salyzyn
Merge "Settings: switch to using ctl.start property...
blob
|
commitdiff
|
diff to current
2016-01-05
Jeff Sharkey
Merge "Some text are missing in eject sdcard warning...
blob
|
commitdiff
|
diff to current
2016-01-05
Amith Yamasani
Merge "Fix "division by zero" crash after USB mass...
blob
|
commitdiff
|
diff to current
2016-01-04
Jason Monk
Merge "fix out of memory with continuous entry and...
blob
|
commitdiff
|
diff to current
2015-12-28
Mark Salyzyn
resolve merge conflicts of 94ab88228e to master.
blob
|
commitdiff
|
diff to current
2015-12-24
Alex Cheung
Use "merge -s ours origin/mirror-partner-mm-wireless...
blob
|
commitdiff
|
diff to current
2015-12-23
Nick Kralevich
Merge "Hide usb mode chooser dialog after disconnected...
blob
|
commitdiff
|
diff to current
2015-12-22
Svetoslav
DO NOT MERGE Modify system settings: incorrect UI state...
blob
|
commitdiff
|
diff to current
2015-12-13
Geoff Mendal
Import translations. DO NOT MERGE am: 1cb1ad2c55 ...
blob
|
commitdiff
|
diff to current
2015-12-13
Geoff Mendal
Revert "Import translations. DO NOT MERGE" am: 7bafd5ee...
blob
|
commitdiff
|
diff to current
2015-12-13
Geoff Mendal
Import translations. DO NOT MERGE am: df57be8aef ...
blob
|
commitdiff
|
diff to current
2015-12-09
Amit Mahajan
Merge "Validate the uri received in ApnEditor."
blob
|
commitdiff
|
diff to current
2015-12-07
Hyejin Kim
Add IMS settings to Network setting reset am: 623852f6c...
blob
|
commitdiff
|
diff to current
2015-12-03
Svetoslav Ganov
Merge "[DO NOT MERGE] Modify system settings: incorrect...
blob
|
commitdiff
|
diff to current
2015-11-26
Andrei Stingaceanu
Merge "Wire in device owner information into SecuritySe...
blob
|
commitdiff
|
diff to current
2015-11-20
Geoff Mendal
Import translations. DO NOT MERGE am: 2102350ea3 ...
blob
|
commitdiff
|
diff to current
2015-11-20
Geoff Mendal
Import translations. DO NOT MERGE am: 2102350ea3 ...
blob
|
commitdiff
|
diff to current
2015-11-19
Jim Miller
Merge "Revert "Auto advance fingerprint enrollment...
blob
|
commitdiff
|
diff to current
2015-11-19
Maurice Lam
Merge "[Fingerprint] Define margins in fingerprint...
blob
|
commitdiff
|
diff to current
2015-11-18
Russell Brenner
resolve merge conflicts of 549379737d to master.
blob
|
commitdiff
|
diff to current
2015-11-18
Russell Brenner
[DO NOT MERGE] Preserve FRP lock if wiped during SUW...
blob
|
commitdiff
|
diff to current
2015-11-18
Russell Brenner
resolve merge conflicts of 7285e2c2fc to master.
blob
|
commitdiff
|
diff to current
2015-11-18
Tony Mantler
Merge "Move AnimatedImageView and AuthenticatorHelper...
blob
|
commitdiff
|
diff to current
2015-11-18
Sanket Padawe
Uncheck checkbox for contact sharing by default for...
blob
|
commitdiff
|
diff to current
2015-11-17
Tony Mantler
Move AnimatedImageView and AuthenticatorHelper to Setti...
blob
|
commitdiff
|
diff to current
2015-11-17
Russell Brenner
Merge "Block developer settings during SUW" into lmp...
blob
|
commitdiff
|
diff to current
2015-11-17
Russell Brenner
[DO NOT MERGE] Preserve FRP lock if wiped during SUW...
blob
|
commitdiff
|
diff to current
2015-11-16
Tony Mantler
Merge "Move some methods to DeviceInfoUtils in SettingsLib"
blob
|
commitdiff
|
diff to current
2015-11-13
Robin Lee
Merge "VPN settings: grey out policy-restricted menus...
blob
|
commitdiff
|
diff to current
2015-11-13
Sanket Padawe
Uncheck checkbox for contact sharing by default for...
blob
|
commitdiff
|
diff to current
2015-11-10
Jason Monk
Merge "Fix account problems"
blob
|
commitdiff
|
diff to current
2015-11-10
Jason Monk
Fix account problems
blob
|
commitdiff
|
diff to current
2015-11-09
Jason Monk
Null check queryIntentServices am: a4c9492b50 am: e27ca...
blob
|
commitdiff
|
diff to current
2015-11-05
Baligh Uddin
Import translations. DO NOT MERGE am: 7b9f79bb6e ...
blob
|
commitdiff
|
diff to current
2015-11-04
Jason Monk
Merge "Don\'t show MIDI USB option if not supported...
blob
|
commitdiff
|
diff to current
next