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
Disabling the activate button when paused
[android-x86/packages-apps-Settings.git]
/
src
/
com
/
android
/
settings
/
DeviceAdminAdd.java
2017-08-15
Suprabh Shukla
Disabling the activate button when paused
blob
|
commitdiff
2014-04-03
Adrian Roos
am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20...
blob
|
commitdiff
|
diff to current
2014-02-05
Amith Yamasani
am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123...
blob
|
commitdiff
|
diff to current
2013-09-27
Amith Yamasani
am b4881f79: am 451d8225: am 49187c94: am 53a56ad8...
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 5d3ef571: am a1454529: Merge "Dont enable Wi-Fi...
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 add37ef4: am 5f6e4339: Merge "Use SimpleDateFormat...
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 b17fef80: am 02e23fb0: Merge "Clamp date setting...
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-11
Vinit Deshapnde
Merge "Fix an NPE in WifiP2pSettings UI"
blob
|
commitdiff
|
diff to current
2013-06-11
Amith Yamasani
Merge "Remove Battery settings if battery is not present"
blob
|
commitdiff
|
diff to current
2013-06-10
The Android Automerger
merge in master-release history after reset to master
blob
|
commitdiff
|
diff to current
2013-06-09
The Android Automerger
merge in jb-mr2-zeroday-release history after reset...
blob
|
commitdiff
|
diff to current
2013-06-07
Alex Klyubin
resolved conflicts for merge of 5d21820a to jb-mr2-dev
blob
|
commitdiff
|
diff to current
2013-06-07
Amith Yamasani
Merge "Don't show ApnEditor as a dialog" into jb-mr2-dev
blob
|
commitdiff
|
diff to current
2013-06-07
Baligh Uddin
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
blob
|
commitdiff
|
diff to current
2013-06-07
Amith Yamasani
Merge "Allow hidden apps to opt-out" into jb-mr2-dev
blob
|
commitdiff
|
diff to current
2013-06-07
Baligh Uddin
Merge "Import translations. DO NOT MERGE"
blob
|
commitdiff
|
diff to current
2013-06-07
Chong Zhang
Merge "wifi-display: grey out display if it's unavailable"
blob
|
commitdiff
|
diff to current
2013-06-07
Alex Klyubin
am 3c862fb5: am 681b21f3: resolved conflicts for merge...
blob
|
commitdiff
|
diff to current
2013-06-07
Alex Klyubin
am 681b21f3: resolved conflicts for merge of 5d21820a...
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 a65fa934: am 8bfb859e: am 8d5aeffa: am 089d1615...
blob
|
commitdiff
|
diff to current
2013-06-06
Alex Klyubin
am 8bfb859e: am 8d5aeffa: am 089d1615: am 01dbfbf9...
blob
|
commitdiff
|
diff to current
2013-06-06
Alex Klyubin
am 8d5aeffa: am 089d1615: am 01dbfbf9: am efd88e2c...
blob
|
commitdiff
|
diff to current
2013-06-06
Alex Klyubin
am 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit...
blob
|
commitdiff
|
diff to current
2013-06-06
Alex Klyubin
am 01dbfbf9: am efd88e2c: Merge "Permit deactivation...
blob
|
commitdiff
|
diff to current
2013-06-06
Alex Klyubin
am efd88e2c: Merge "Permit deactivation of malformed...
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
Permit deactivation of malformed Device Admins.
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-06-06
Dianne Hackborn
am a9a28d2f: am f96a86c9: am 6d80d477: am 0bccd7e7...
blob
|
commitdiff
|
diff to current
2013-06-06
Dianne Hackborn
am f96a86c9: am 6d80d477: am 0bccd7e7: am 5f28c77b...
blob
|
commitdiff
|
diff to current
2013-06-06
Dianne Hackborn
am 6d80d477: am 0bccd7e7: am 5f28c77b: am d6086125...
blob
|
commitdiff
|
diff to current
2013-06-06
Dianne Hackborn
am 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #90742...
blob
|
commitdiff
|
diff to current
2013-06-06
Dianne Hackborn
am 5f28c77b: am d6086125: Fix issue #9074296: Device...
blob
|
commitdiff
|
diff to current
2013-06-06
Dianne Hackborn
am d6086125: Fix issue #9074296: Device Admins can...
blob
|
commitdiff
|
diff to current
2013-06-05
Dianne Hackborn
Fix issue #9074296: Device Admins can activate in a...
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
Merge "Ensure all active Device Admins are listed....
blob
|
commitdiff
|
diff to current
2013-05-22
Dianne Hackborn
am eeeccdc6: am 8274b677: Fix issue #9074296: Device...
blob
|
commitdiff
|
diff to current
2013-05-22
Dianne Hackborn
am 8274b677: Fix issue #9074296: Device Admins can...
blob
|
commitdiff
|
diff to current
2013-05-22
Dianne Hackborn
Fix issue #9074296: Device Admins can activate in a...
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-11
Amith Yamasani
Merge "Fix: Text is cut in Edit word edit box when...
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
2011-04-28
Eric Fischer
am 643e48b7: (-s ours) am 7c284c2c: Import revised...
blob
|
commitdiff
|
diff to current
2011-04-27
Conley Owens
Ignoring empty list test in favor of commented out...
blob
|
commitdiff
|
diff to current
2011-04-14
Eric Fischer
am 4ba98d53: (-s ours) Import revised translations...
blob
|
commitdiff
|
diff to current
2011-04-12
Simon Wilson
am f927cccd: (-s ours) am 37063d6a: DO NOT MERGE Clarif...
blob
|
commitdiff
|
diff to current
2011-04-11
Eric Fischer
am 84c90053: (-s ours) am fcb089c9: Merge "Reimport...
blob
|
commitdiff
|
diff to current
2011-04-11
Simon Wilson
am 2ca7add5: (-s ours) am ca572fb6: Merge "DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2011-04-11
Eric Fischer
am 6735ae14: (-s ours) am b4bd78f5: Revert "Import...
blob
|
commitdiff
|
diff to current
2011-04-05
Eric Fischer
am dfb78827: (-s ours) am 955ab98f: Import revised...
blob
|
commitdiff
|
diff to current
2011-03-30
Park Sanghyun
am 2b2959b3: (-s ours) am e5da8565: DO NOT MERGE Add...
blob
|
commitdiff
|
diff to current
2011-03-30
Kenny Root
resolved conflicts for merge of 70a1ff03 to honeycomb...
blob
|
commitdiff
|
diff to current
2011-03-29
Eric Fischer
am 429687b9: (-s ours) Import revised translations...
blob
|
commitdiff
|
diff to current
2011-03-18
Eric Fischer
am 9567622d: (-s ours) am c4eeeb29: Import revised...
blob
|
commitdiff
|
diff to current
2011-03-17
TK MUN
am 8c2a02de: (-s ours) am e0e845fe: DO NOT MERGE Do...
blob
|
commitdiff
|
diff to current
2011-03-15
Mike Lockwood
am 61487da6: (-s ours) am e6c7e45f: DO NOT MERGE: IUsbM...
blob
|
commitdiff
|
diff to current
2011-03-10
TK MUN
am f018bd8c: (-s ours) am 36469186: DO NOT MERGE WiMAX...
blob
|
commitdiff
|
diff to current
2011-03-09
Jaikumar Ganesh
Merge "Return profile state disconnected when not yet...
blob
|
commitdiff
|
diff to current
2011-03-08
Amith Yamasani
am 35bc6b5f: Wifi disconnect policy summary text should...
blob
|
commitdiff
|
diff to current
2011-03-07
Vasu Nori
Merge "bug:3514023 fix strings" into honeycomb-mr1
blob
|
commitdiff
|
diff to current
2011-03-05
Dianne Hackborn
am 3f1d3919: Merge "Cherry-pick from master: Fix issue...
blob
|
commitdiff
|
diff to current
2011-03-05
Dianne Hackborn
Merge "Cherry-pick from master: Fix issue #3324032...
blob
|
commitdiff
|
diff to current
2011-03-05
Dianne Hackborn
Cherry-pick from master: Fix issue #3324032:
blob
|
commitdiff
|
diff to current
2011-03-05
Dianne Hackborn
Merge "Fix issue #3324032: It is possible to create...
blob
|
commitdiff
|
diff to current
2011-03-04
Lorenzo Colitti
resolved conflicts for merge of a4fb8c86 to honeycomb...
blob
|
commitdiff
|
diff to current
2011-03-03
Dianne Hackborn
Fix issue #3324032: It is possible to create an app...
blob
|
commitdiff
|
diff to current
2011-03-03
Mike Lockwood
am 9d768735: (-s ours) am 0552d336: DO NOT MERGE: Insta...
blob
|
commitdiff
|
diff to current
2011-02-22
Eric Fischer
am 058f62ba: (-s ours) am bd044818: Import revised...
blob
|
commitdiff
|
diff to current
2011-02-11
Amith Yamasani
am 255fa0e9: (-s ours) am aae04e43: Prevent monkeys...
blob
|
commitdiff
|
diff to current
2011-02-10
Eric Fischer
am d422079a: (-s ours) am 47d2ecd0: Import revised...
blob
|
commitdiff
|
diff to current
2011-02-05
Jake Hamby
am 47cb1753: (-s ours) am 1798fc04: Merge "Fixed a...
blob
|
commitdiff
|
diff to current
next