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
am cf911d10: Merge "Check for DeviceAdminInfo type before casting" into lmp-dev
[android-x86/packages-apps-Settings.git]
/
src
/
com
/
android
/
settings
/
DeviceAdminSettings.java
2014-09-11
Zoltan Szatmary-Ban
am cf911d10: Merge "Check for DeviceAdminInfo type...
blob
|
commitdiff
2014-09-11
Zoltan Szatmary-Ban
Merge "Check for DeviceAdminInfo type before casting...
blob
|
commitdiff
2014-09-09
Zoltan Szatmary-Ban
Merge "Update Trusted Credentials screen in settings...
blob
|
commitdiff
|
diff to current
2014-09-08
Elliott Hughes
Merge "Start cleaning up percentage formatting in Setti...
blob
|
commitdiff
|
diff to current
2014-09-08
PauloftheWest
Merge "Turning Bluetooth on will make the device discov...
blob
|
commitdiff
|
diff to current
2014-09-08
Alan Viverette
Merge "Use correct list index for search highlighting...
blob
|
commitdiff
|
diff to current
2014-09-08
vandwalle
Merge "prettify the wifi verbose logging string" into...
blob
|
commitdiff
|
diff to current
2014-09-08
Alexandra Gherghina
Merge "Splits out ACTION_MAIN intent filter for Setting...
blob
|
commitdiff
|
diff to current
2014-09-08
Jim Miller
Merge "Fix problem where rotating the device doesn...
blob
|
commitdiff
|
diff to current
2014-09-08
Alexandra Gherghina
Merge "Reset Settings task when using the user switcher...
blob
|
commitdiff
|
diff to current
2014-09-08
Alexandra Gherghina
Merge "Obeying Settings.EXTRA_AUTHORITIES extra for...
blob
|
commitdiff
|
diff to current
2014-09-07
Amith Yamasani
am 30c50b15: Use correct API for badging
blob
|
commitdiff
|
diff to current
2014-09-07
Amith Yamasani
Use correct API for badging
blob
|
commitdiff
|
diff to current
2014-09-05
Fabrice Di Meglio
Merge "Fix bug #15890188 wifi toggle on-off switch...
blob
|
commitdiff
|
diff to current
2014-09-05
PauloftheWest
Merge "Material design updates for Bluetooth Settings...
blob
|
commitdiff
|
diff to current
2014-09-05
Barnaby James
Merge "Remove intent filter for Airplane mode voice...
blob
|
commitdiff
|
diff to current
2014-09-05
Amith Yamasani
Merge "Follow API change for method name" into lmp-dev
blob
|
commitdiff
|
diff to current
2014-09-05
Svetoslav
am 527ecccc: Merge "Update Settings due to API changes...
blob
|
commitdiff
|
diff to current
2014-09-05
Svetoslav
Merge "Fix an occasional crash in print job state fragm...
blob
|
commitdiff
|
diff to current
2014-09-05
Svetoslav
Merge "Update Settings due to API changes." into lmp-dev
blob
|
commitdiff
|
diff to current
2014-09-05
Svetoslav
Update Settings due to API changes.
blob
|
commitdiff
|
diff to current
2014-08-28
Zoltan Szatmary-Ban
Check for DeviceAdminInfo type before casting
blob
|
commitdiff
|
diff to current
2014-08-16
Baligh Uddin
am 2719eebf: (-s ours) am b3b64705: (-s ours) Import...
blob
|
commitdiff
|
diff to current
2014-08-05
Sander Alewijnse
Merge "Prevent launcher switching in Settings app....
blob
|
commitdiff
|
diff to current
2014-08-05
Alexandra Gherghina
Merge "Clears previously added cross-profile-intents...
blob
|
commitdiff
|
diff to current
2014-08-01
Zoltan Szatmary-Ban
Update Device Admins Settings screen
blob
|
commitdiff
|
diff to current
2014-07-25
Fabrice Di Meglio
Merge "Fix bug #16306535 The arrows rotate in the oppos...
blob
|
commitdiff
|
diff to current
2014-07-25
Fabrice Di Meglio
Merge "Fix bug #16660819 Switchbar text should be white...
blob
|
commitdiff
|
diff to current
2014-07-25
Amith Yamasani
Merge "Implement SET_PROFILE_OWNER intent" into lmp-dev
blob
|
commitdiff
|
diff to current
2014-07-29
Amith Yamasani
Implement SET_PROFILE_OWNER intent
blob
|
commitdiff
|
diff to current
2014-07-29
Fabrice Di Meglio
Fix bug #16384201 Security > "Device administrators...
blob
|
commitdiff
|
diff to current
2014-07-24
Zoltan Szatmary-Ban
Merge "Fix refresh issue of badged icons in Battery...
blob
|
commitdiff
|
diff to current
2014-07-28
Fabrice Di Meglio
Merge "Fix bug #16384201 Security > "Device administrat...
blob
|
commitdiff
|
diff to current
2014-04-03
Adrian Roos
am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20...
blob
|
commitdiff
|
diff to current
2014-02-21
Jeff Sharkey
Merge "Settings: Fix the memory leak in Settings"
blob
|
commitdiff
|
diff to current
2014-02-06
Jeff Sharkey
Merge "Total and available fields missing in Settings...
blob
|
commitdiff
|
diff to current
2014-02-05
Amith Yamasani
am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123...
blob
|
commitdiff
|
diff to current
2013-12-04
Amith Yamasani
Merge "Fix switching running/cached apps with memory...
blob
|
commitdiff
|
diff to current
2013-09-27
Amith Yamasani
am b4881f79: am 451d8225: am 49187c94: am 53a56ad8...
blob
|
commitdiff
|
diff to current
2013-09-12
Amith Yamasani
Merge "Call to equals() comparing different types"
blob
|
commitdiff
|
diff to current
2013-07-19
Robert Greenwalt
resolved conflicts for merge of 4d9f670b to stage-aosp...
blob
|
commitdiff
|
diff to current
2013-06-28
Robert Greenwalt
am a1454529: Merge "Dont enable Wi-Fi if it\'s not...
blob
|
commitdiff
|
diff to current
2013-06-27
Elliott Hughes
am 5f6e4339: Merge "Use SimpleDateFormat for time zone...
blob
|
commitdiff
|
diff to current
2013-06-25
Elliott Hughes
am 02e23fb0: Merge "Clamp date setting for the SetupWiz...
blob
|
commitdiff
|
diff to current
2013-06-06
Alex Klyubin
resolved conflicts for merge of 5d21820a to jb-mr2-dev
blob
|
commitdiff
|
diff to current
2013-06-06
Alex Klyubin
am 5aa3f878: (-s ours) am 0c32da7e: am 6f28e342: am...
blob
|
commitdiff
|
diff to current
2013-06-06
Alex Klyubin
am 0c32da7e: am 6f28e342: am 9f6a1933: am 0ffbbad5...
blob
|
commitdiff
|
diff to current
2013-06-06
Alex Klyubin
am 6f28e342: am 9f6a1933: am 0ffbbad5: am 60544e74...
blob
|
commitdiff
|
diff to current
2013-06-06
Alex Klyubin
am 9f6a1933: am 0ffbbad5: am 60544e74: am 3dddd8cb...
blob
|
commitdiff
|
diff to current
2013-06-06
Alex Klyubin
am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all activ...
blob
|
commitdiff
|
diff to current
2013-06-06
Alex Klyubin
am 60544e74: am 3dddd8cb: Ensure all active Device...
blob
|
commitdiff
|
diff to current
2013-06-06
Alex Klyubin
am 3dddd8cb: Ensure all active Device Admins are listed.
blob
|
commitdiff
|
diff to current
2013-06-06
Alex Klyubin
Merge "Permit deactivation of malformed Device Admins...
blob
|
commitdiff
|
diff to current
2013-06-06
Alex Klyubin
Ensure all active Device Admins are listed.
blob
|
commitdiff
|
diff to current
2013-06-06
Dianne Hackborn
am 9cd1d5e2: (-s ours) am a9a28d2f: am f96a86c9: am...
blob
|
commitdiff
|
diff to current
2013-05-30
Jean-Baptiste Queru
Ignore 81476405 from AOSP
blob
|
commitdiff
|
diff to current
2013-05-29
Svetoslav
Merge "Remove Auto-rotate screen setting if a required...
blob
|
commitdiff
|
diff to current
2013-05-28
Russell Brenner
Merge "Improved logic for Skip warning message" into...
blob
|
commitdiff
|
diff to current
2013-05-27
The Android Automerger
merge in master-release history after reset to master
blob
|
commitdiff
|
diff to current
2013-05-23
The Android Automerger
merge in jb-mr2-release history after reset to jb-mr2-dev
blob
|
commitdiff
|
diff to current
2013-05-22
Amith Yamasani
Merge "Update strings for clarity about restricted...
blob
|
commitdiff
|
diff to current
2013-05-22
Alex Klyubin
am 1eb2064f: am 7229e29f: Merge "Ensure all active...
blob
|
commitdiff
|
diff to current
2013-05-22
Alex Klyubin
am 7229e29f: Merge "Ensure all active Device Admins...
blob
|
commitdiff
|
diff to current
2013-05-22
Alex Klyubin
Merge "Ensure all active Device Admins are listed....
blob
|
commitdiff
|
diff to current
2013-05-22
Alex Klyubin
Ensure all active Device Admins are listed.
blob
|
commitdiff
|
diff to current
2013-05-21
Amith Yamasani
am 4abe488a: Merge "No back icon in action bar of APN...
blob
|
commitdiff
|
diff to current
2013-04-30
Kenny Root
resolved conflicts for merge of 3c10f535 to jb-mr2...
blob
|
commitdiff
|
diff to current
2013-04-27
Kenny Root
am c814271f: Merge "Fix Clear Credentials item"
blob
|
commitdiff
|
diff to current
2013-04-16
Amith Yamasani
am c1e3983b: Merge "Fix NullPointerException at Running...
blob
|
commitdiff
|
diff to current
2013-04-16
Amith Yamasani
am 91b5fab9: Merge "Check if the Activity is finishing...
blob
|
commitdiff
|
diff to current
2013-04-08
Kenny Root
resolved conflicts for merge of 3a271718 to jb-mr2...
blob
|
commitdiff
|
diff to current
2013-04-05
Kristian Monsen
Merge "Adding developer toggle for using Chromium WebVi...
blob
|
commitdiff
|
diff to current
2013-04-02
Robert Greenwalt
Merge "pre-provide the mvno data of the edited apn...
blob
|
commitdiff
|
diff to current
2013-03-29
Kenny Root
am 43366b2c: Merge "Add KeyStore storage type to Settin...
blob
|
commitdiff
|
diff to current
2013-03-28
Eric Laurent
Merge "Display vibrate icon in volume menu" into jb...
blob
|
commitdiff
|
diff to current
2013-03-28
Kenny Root
am 0d52fc18: am 9dc478ec: Merge "Add ability to install...
blob
|
commitdiff
|
diff to current
2013-03-27
The Android Automerger
merge in master-release history after reset to master
blob
|
commitdiff
|
diff to current
2013-03-26
Irfan Sheriff
Merge "Allow wildcard for bypass proxy" into jb-mr2-dev
blob
|
commitdiff
|
diff to current
2013-03-26
Amith Yamasani
am 86ecd3c4: Merge "Device Admin Settings changes for...
blob
|
commitdiff
|
diff to current
2013-03-26
Amith Yamasani
Merge "Device Admin Settings changes for Device Owner...
blob
|
commitdiff
|
diff to current
2013-03-26
Amith Yamasani
Device Admin Settings changes for Device Owner
blob
|
commitdiff
|
diff to current
2011-09-14
The Android Open...
Reconcile with gingerbread-mr4-release
blob
|
commitdiff
|
diff to current
2011-09-09
Jean-Baptiste Queru
Reconcile with gingerbread-release gingerbread-mr4...
blob
|
commitdiff
|
diff to current
2011-08-30
Ryan PC Gibson
am 9fe36302: (-s ours) am 9cb97c44: Merge "DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2011-08-12
Amith Yamasani
am d7d6c7ff: am 34d9b03f: Merge "Fix wrong behavior...
blob
|
commitdiff
|
diff to current
2011-08-12
Amith Yamasani
am b3f6116e: am fd73824d: Merge "Fix: Text is cut in...
blob
|
commitdiff
|
diff to current
2011-08-05
The Android Open...
Reconcile with gingerbread-release gingerbread-mr4...
blob
|
commitdiff
|
diff to current
2011-07-14
Dianne Hackborn
am 7d19d795: am b41b85dc: am c74500f4: Merge "Fix NPE...
blob
|
commitdiff
|
diff to current
2011-06-27
Eric Fischer
am 6a078ed3: (-s ours) am a18484fb: Import new translat...
blob
|
commitdiff
|
diff to current
2011-06-24
The Android Open...
Reconcile with gingerbread-release
blob
|
commitdiff
|
diff to current
2011-06-21
Jaikumar Ganesh
am 38ae9125: (-s ours) am 7ab66973: Merge "DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2011-06-20
Jaikumar Ganesh
am a7bb204a: am c6f14410: Merge "Remove CHAR LIMIT...
blob
|
commitdiff
|
diff to current
2011-06-20
Jaikumar Ganesh
am f3670df2: am 2c85966d: Merge "New strings for Blueto...
blob
|
commitdiff
|
diff to current
2011-06-16
Eric Fischer
am 3c75fbc5: (-s ours) am 5bdc3e91: Import revised...
blob
|
commitdiff
|
diff to current
2011-06-09
Jean-Baptiste Queru
Reconcile with gingerbread-release
blob
|
commitdiff
|
diff to current
2011-06-07
Jaikumar Ganesh
am a6daa21d: (-s ours) am 015788ca: Merge "Import trans...
blob
|
commitdiff
|
diff to current
2011-06-07
Jaikumar Ganesh
am bd34e568: (-s ours) am eddb21a2: Merge "Changes...
blob
|
commitdiff
|
diff to current
2011-06-07
Jaikumar Ganesh
am aeca1851: (-s ours) am c955d8ee: Merge "Allow users...
blob
|
commitdiff
|
diff to current
2011-06-06
Marco Nelissen
resolved conflicts for merge of 531bed61 to honeycomb...
blob
|
commitdiff
|
diff to current
2011-05-20
The Android Open...
Reconcile with gingerbread-release honeycomb-release
blob
|
commitdiff
|
diff to current
next