OSDN Git Service

Disabling the activate button when paused
[android-x86/packages-apps-Settings.git] / src / com / android / settings / DeviceAdminAdd.java
2017-08-15 Suprabh ShuklaDisabling the activate button when paused
2014-04-03 Adrian Roosam 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20...
2014-02-05 Amith Yamasaniam 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123...
2013-09-27 Amith Yamasaniam b4881f79: am 451d8225: am 49187c94: am 53a56ad8...
2013-07-19 Robert Greenwaltresolved conflicts for merge of 4d9f670b to stage-aosp...
2013-06-28 Robert Greenwaltam 5d3ef571: am a1454529: Merge "Dont enable Wi-Fi...
2013-06-28 Robert Greenwaltam a1454529: Merge "Dont enable Wi-Fi if it\'s not...
2013-06-27 Elliott Hughesam add37ef4: am 5f6e4339: Merge "Use SimpleDateFormat...
2013-06-27 Elliott Hughesam 5f6e4339: Merge "Use SimpleDateFormat for time zone...
2013-06-25 Elliott Hughesam b17fef80: am 02e23fb0: Merge "Clamp date setting...
2013-06-25 Elliott Hughesam 02e23fb0: Merge "Clamp date setting for the SetupWiz...
2013-06-11 Vinit DeshapndeMerge "Fix an NPE in WifiP2pSettings UI"
2013-06-11 Amith YamasaniMerge "Remove Battery settings if battery is not present"
2013-06-10 The Android Automergermerge in master-release history after reset to master
2013-06-09 The Android Automergermerge in jb-mr2-zeroday-release history after reset...
2013-06-07 Alex Klyubinresolved conflicts for merge of 5d21820a to jb-mr2-dev
2013-06-07 Amith YamasaniMerge "Don't show ApnEditor as a dialog" into jb-mr2-dev
2013-06-07 Baligh UddinMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-06-07 Amith YamasaniMerge "Allow hidden apps to opt-out" into jb-mr2-dev
2013-06-07 Baligh UddinMerge "Import translations. DO NOT MERGE"
2013-06-07 Chong ZhangMerge "wifi-display: grey out display if it's unavailable"
2013-06-07 Alex Klyubinam 3c862fb5: am 681b21f3: resolved conflicts for merge...
2013-06-07 Alex Klyubinam 681b21f3: resolved conflicts for merge of 5d21820a...
2013-06-06 Alex Klyubinresolved conflicts for merge of 5d21820a to jb-mr2-dev
2013-06-06 Alex Klyubinam 5aa3f878: (-s ours) am 0c32da7e: am 6f28e342: am...
2013-06-06 Alex Klyubinam a65fa934: am 8bfb859e: am 8d5aeffa: am 089d1615...
2013-06-06 Alex Klyubinam 8bfb859e: am 8d5aeffa: am 089d1615: am 01dbfbf9...
2013-06-06 Alex Klyubinam 8d5aeffa: am 089d1615: am 01dbfbf9: am efd88e2c...
2013-06-06 Alex Klyubinam 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit...
2013-06-06 Alex Klyubinam 01dbfbf9: am efd88e2c: Merge "Permit deactivation...
2013-06-06 Alex Klyubinam efd88e2c: Merge "Permit deactivation of malformed...
2013-06-06 Alex KlyubinMerge "Permit deactivation of malformed Device Admins...
2013-06-06 Alex KlyubinPermit deactivation of malformed Device Admins.
2013-06-06 Dianne Hackbornam 9cd1d5e2: (-s ours) am a9a28d2f: am f96a86c9: am...
2013-06-06 Dianne Hackbornam a9a28d2f: am f96a86c9: am 6d80d477: am 0bccd7e7...
2013-06-06 Dianne Hackbornam f96a86c9: am 6d80d477: am 0bccd7e7: am 5f28c77b...
2013-06-06 Dianne Hackbornam 6d80d477: am 0bccd7e7: am 5f28c77b: am d6086125...
2013-06-06 Dianne Hackbornam 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #90742...
2013-06-06 Dianne Hackbornam 5f28c77b: am d6086125: Fix issue #9074296: Device...
2013-06-06 Dianne Hackbornam d6086125: Fix issue #9074296: Device Admins can...
2013-06-05 Dianne HackbornFix issue #9074296: Device Admins can activate in a...
2013-05-30 Jean-Baptiste QueruIgnore 81476405 from AOSP
2013-05-29 SvetoslavMerge "Remove Auto-rotate screen setting if a required...
2013-05-28 Russell BrennerMerge "Improved logic for Skip warning message" into...
2013-05-27 The Android Automergermerge in master-release history after reset to master
2013-05-23 The Android Automergermerge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-22 Amith YamasaniMerge "Update strings for clarity about restricted...
2013-05-22 Alex KlyubinMerge "Ensure all active Device Admins are listed....
2013-05-22 Dianne Hackbornam eeeccdc6: am 8274b677: Fix issue #9074296: Device...
2013-05-22 Dianne Hackbornam 8274b677: Fix issue #9074296: Device Admins can...
2013-05-22 Dianne HackbornFix issue #9074296: Device Admins can activate in a...
2011-09-14 The Android Open... Reconcile with gingerbread-mr4-release
2011-09-09 Jean-Baptiste QueruReconcile with gingerbread-release gingerbread-mr4...
2011-08-30 Ryan PC Gibsonam 9fe36302: (-s ours) am 9cb97c44: Merge "DO NOT MERGE...
2011-08-12 Amith Yamasaniam d7d6c7ff: am 34d9b03f: Merge "Fix wrong behavior...
2011-08-12 Amith Yamasaniam b3f6116e: am fd73824d: Merge "Fix: Text is cut in...
2011-08-11 Amith YamasaniMerge "Fix: Text is cut in Edit word edit box when...
2011-08-05 The Android Open... Reconcile with gingerbread-release gingerbread-mr4...
2011-07-14 Dianne Hackbornam 7d19d795: am b41b85dc: am c74500f4: Merge "Fix NPE...
2011-06-27 Eric Fischeram 6a078ed3: (-s ours) am a18484fb: Import new translat...
2011-06-24 The Android Open... Reconcile with gingerbread-release
2011-06-21 Jaikumar Ganesham 38ae9125: (-s ours) am 7ab66973: Merge "DO NOT MERGE...
2011-06-20 Jaikumar Ganesham a7bb204a: am c6f14410: Merge "Remove CHAR LIMIT...
2011-06-20 Jaikumar Ganesham f3670df2: am 2c85966d: Merge "New strings for Blueto...
2011-06-16 Eric Fischeram 3c75fbc5: (-s ours) am 5bdc3e91: Import revised...
2011-06-09 Jean-Baptiste QueruReconcile with gingerbread-release
2011-06-07 Jaikumar Ganesham a6daa21d: (-s ours) am 015788ca: Merge "Import trans...
2011-06-07 Jaikumar Ganesham bd34e568: (-s ours) am eddb21a2: Merge "Changes...
2011-06-07 Jaikumar Ganesham aeca1851: (-s ours) am c955d8ee: Merge "Allow users...
2011-06-06 Marco Nelissenresolved conflicts for merge of 531bed61 to honeycomb...
2011-05-20 The Android Open... Reconcile with gingerbread-release honeycomb-release
2011-04-28 Eric Fischeram 643e48b7: (-s ours) am 7c284c2c: Import revised...
2011-04-27 Conley OwensIgnoring empty list test in favor of commented out...
2011-04-14 Eric Fischeram 4ba98d53: (-s ours) Import revised translations...
2011-04-12 Simon Wilsonam f927cccd: (-s ours) am 37063d6a: DO NOT MERGE Clarif...
2011-04-11 Eric Fischeram 84c90053: (-s ours) am fcb089c9: Merge "Reimport...
2011-04-11 Simon Wilsonam 2ca7add5: (-s ours) am ca572fb6: Merge "DO NOT MERGE...
2011-04-11 Eric Fischeram 6735ae14: (-s ours) am b4bd78f5: Revert "Import...
2011-04-05 Eric Fischeram dfb78827: (-s ours) am 955ab98f: Import revised...
2011-03-30 Park Sanghyunam 2b2959b3: (-s ours) am e5da8565: DO NOT MERGE Add...
2011-03-30 Kenny Rootresolved conflicts for merge of 70a1ff03 to honeycomb...
2011-03-29 Eric Fischeram 429687b9: (-s ours) Import revised translations...
2011-03-18 Eric Fischeram 9567622d: (-s ours) am c4eeeb29: Import revised...
2011-03-17 TK MUNam 8c2a02de: (-s ours) am e0e845fe: DO NOT MERGE Do...
2011-03-15 Mike Lockwoodam 61487da6: (-s ours) am e6c7e45f: DO NOT MERGE: IUsbM...
2011-03-10 TK MUNam f018bd8c: (-s ours) am 36469186: DO NOT MERGE WiMAX...
2011-03-09 Jaikumar GaneshMerge "Return profile state disconnected when not yet...
2011-03-08 Amith Yamasaniam 35bc6b5f: Wifi disconnect policy summary text should...
2011-03-07 Vasu NoriMerge "bug:3514023 fix strings" into honeycomb-mr1
2011-03-05 Dianne Hackbornam 3f1d3919: Merge "Cherry-pick from master: Fix issue...
2011-03-05 Dianne HackbornMerge "Cherry-pick from master: Fix issue #3324032...
2011-03-05 Dianne HackbornCherry-pick from master: Fix issue #3324032:
2011-03-05 Dianne HackbornMerge "Fix issue #3324032: It is possible to create...
2011-03-04 Lorenzo Colittiresolved conflicts for merge of a4fb8c86 to honeycomb...
2011-03-03 Dianne HackbornFix issue #3324032: It is possible to create an app...
2011-03-03 Mike Lockwoodam 9d768735: (-s ours) am 0552d336: DO NOT MERGE: Insta...
2011-02-22 Eric Fischeram 058f62ba: (-s ours) am bd044818: Import revised...
2011-02-11 Amith Yamasaniam 255fa0e9: (-s ours) am aae04e43: Prevent monkeys...
2011-02-10 Eric Fischeram d422079a: (-s ours) am 47d2ecd0: Import revised...
2011-02-05 Jake Hambyam 47cb1753: (-s ours) am 1798fc04: Merge "Fixed a...
next