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 f018bd8c: (-s ours) am 36469186: DO NOT MERGE WiMAX settings menu
[android-x86/packages-apps-Settings.git]
/
src
/
com
/
android
/
settings
/
ProgressCategory.java
2011-03-10
TK MUN
am f018bd8c: (-s ours) am 36469186: DO NOT MERGE WiMAX...
blob
|
commitdiff
2011-03-10
TK MUN
am 36469186: DO NOT MERGE WiMAX settings menu
blob
|
commitdiff
|
diff to current
2011-03-04
Lorenzo Colitti
resolved conflicts for merge of a4fb8c86 to honeycomb...
blob
|
commitdiff
2011-03-04
Lorenzo Colitti
am f4393101: Merge "Support configuring the protocol...
blob
|
commitdiff
|
diff to current
2011-03-03
Mike Lockwood
am 9d768735: (-s ours) am 0552d336: DO NOT MERGE: Insta...
blob
|
commitdiff
2011-03-02
Mike Lockwood
am 0552d336: DO NOT MERGE: InstalledAppDetails: "Clear...
blob
|
commitdiff
|
diff to current
2011-02-22
Eric Fischer
am 058f62ba: (-s ours) am bd044818: Import revised...
blob
|
commitdiff
2011-02-18
Eric Fischer
am bd044818: Import revised translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2011-02-11
Amith Yamasani
am 255fa0e9: (-s ours) am aae04e43: Prevent monkeys...
blob
|
commitdiff
2011-02-11
Amith Yamasani
am aae04e43: Prevent monkeys from USB tethering. It...
blob
|
commitdiff
|
diff to current
2011-02-10
Eric Fischer
am d422079a: (-s ours) am 47d2ecd0: Import revised...
blob
|
commitdiff
2011-02-09
Eric Fischer
am 47d2ecd0: Import revised translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2011-02-05
Jake Hamby
am 47cb1753: (-s ours) am 1798fc04: Merge "Fixed a...
blob
|
commitdiff
2011-02-01
Eric Fischer
am 2b78f433: (-s ours) am 93580e22: Import revised...
blob
|
commitdiff
2011-02-01
Eric Fischer
am 93580e22: Import revised translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2011-01-29
Eric Fischer
am 5a2bb8c0: (-s ours) Import revised translations...
blob
|
commitdiff
2011-01-29
Eric Fischer
am 95112e5b: (-s ours) Import revised translations...
blob
|
commitdiff
2011-01-29
Eric Fischer
am abdfaed8: (-s ours) am 5a2bb8c0: Import revised...
blob
|
commitdiff
2011-01-29
Eric Fischer
am 0cd5e21a: (-s ours) am 95112e5b: Import revised...
blob
|
commitdiff
2011-01-28
Eric Fischer
am 5a2bb8c0: Import revised translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2011-01-27
Eric Fischer
am 95112e5b: Import revised translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2011-01-25
Eric Fischer
am 6418d373: (-s ours) Import translations for addition...
blob
|
commitdiff
2011-01-18
Amith Yamasani
am 2768ae05: am f7fd4ca8: Merge "Disable change PIN...
blob
|
commitdiff
2011-01-08
Eric Fischer
am 40bcf565: (-s ours) am 6418d373: Import translations...
blob
|
commitdiff
2011-01-07
Eric Fischer
am 6418d373: Import translations for additional languages.
blob
|
commitdiff
|
diff to current
2010-12-28
Jean-Baptiste Queru
am 9a10fb0b: am e8531ff6: Merge "Changed the text input...
blob
|
commitdiff
2010-12-13
Nick Pelly
am 934c1b9f: am c1286804: Merge "Update Settings for...
blob
|
commitdiff
2010-12-11
Nick Pelly
am c1286804: Merge "Update Settings for new NfcAdapter...
blob
|
commitdiff
|
diff to current
2010-12-10
Eric Fischer
am 5721cb1d: (-s ours) am 99d2471d: Import revised...
blob
|
commitdiff
2010-12-10
Eric Fischer
am 99d2471d: Import revised translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2010-12-10
Jean-Baptiste Queru
am 9b9c61f6: am 2a7c5425: reconcile with open-source...
blob
|
commitdiff
2010-12-10
Jean-Baptiste Queru
am 2a7c5425: reconcile with open-source gingerbread
blob
|
commitdiff
|
diff to current
2010-12-09
Jean-Baptiste Queru
am bd73c736: (-s ours) am 1acfef82: merge from gingerbread
blob
|
commitdiff
2010-12-09
Jean-Baptiste Queru
merge from gingerbread
blob
|
commitdiff
|
diff to current
2010-12-06
Jake Hamby
am 90b1f193: (-s ours) am b0fda6f5: Reduce max BT devic...
blob
|
commitdiff
2010-12-05
Jake Hamby
am b0fda6f5: Reduce max BT device length to 246 bytes...
blob
|
commitdiff
|
diff to current
2010-12-02
Irfan Sheriff
am ea04ee75: (-s ours) am fa04d89f: avoid view creation...
blob
|
commitdiff
2010-12-01
Irfan Sheriff
am fa04d89f: avoid view creation on orientation change
blob
|
commitdiff
|
diff to current
2010-12-01
Eric Fischer
am 39f8dba1: (-s ours) am e1e257f4: Import revised...
blob
|
commitdiff
2010-11-30
Eric Fischer
am e1e257f4: Import revised translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2010-11-30
Jean-Baptiste Queru
am b68b35dd: am 04b646df: Merge "Possible NumberFormatE...
blob
|
commitdiff
2010-11-11
Eric Fischer
am 71d43248: (-s ours) am 5c205262: Merge "Import revis...
blob
|
commitdiff
2010-11-11
Eric Fischer
am 5c205262: Merge "Import revised translations. DO...
blob
|
commitdiff
|
diff to current
2010-11-11
Dianne Hackborn
am 969773aa: am 83d2698f: Merge "Fix issue #3177284...
blob
|
commitdiff
2010-11-11
Dianne Hackborn
am 83d2698f: Merge "Fix issue #3177284: Account for...
blob
|
commitdiff
|
diff to current
2010-11-04
Nick Pelly
am b93b018a: am 91ba0709: Update settings text on succe...
blob
|
commitdiff
2010-11-04
Nick Pelly
am 91ba0709: Update settings text on success, so we...
blob
|
commitdiff
|
diff to current
2010-10-29
Dianne Hackborn
am 5f301797: am 4e4ed14e: Fix issue #3146784: ANR in...
blob
|
commitdiff
2010-10-29
Dianne Hackborn
am 4e4ed14e: Fix issue #3146784: ANR in manage applications
blob
|
commitdiff
|
diff to current
2010-10-26
Jean-Baptiste Queru
am 28539897: am 8815f032: Merge "Always set right auth_...
blob
|
commitdiff
2010-10-25
Eric Fischer
am c26cfa35: (-s ours) am 873a27c3: Import revised...
blob
|
commitdiff
2010-10-25
Eric Fischer
am 873a27c3: Import revised translations. DO NOT MERGE
blob
|
commitdiff
|
diff to current
2010-10-22
Eric Fischer
am 0b655575: (-s ours) am 901f4fbe: Merge "Import revis...
blob
|
commitdiff
2010-10-22
Eric Fischer
am 901f4fbe: Merge "Import revised translations. DO...
blob
|
commitdiff
|
diff to current
2010-10-22
Dianne Hackborn
am 8731cb1b: am 5e34f239: Fix issue #3124528: Mange...
blob
|
commitdiff
2010-10-22
Dianne Hackborn
am 5e34f239: Fix issue #3124528: Mange applications...
blob
|
commitdiff
|
diff to current
2010-10-22
Eric Fischer
resolved conflicts for merge of 92acdba0 to master
blob
|
commitdiff
2010-10-22
Eric Fischer
am a640fb4f: Fix the build. A "--" token is not just...
blob
|
commitdiff
|
diff to current
2010-10-22
Roy West
am d2927990: (-s ours) am 69827524: Try to fix bug31193...
blob
|
commitdiff
2010-10-22
Roy West
am 69827524: Try to fix bug3119318 without breaking...
blob
|
commitdiff
|
diff to current
2010-10-22
Jean-Baptiste Queru
Merge from gingerbread-plus-aosp
blob
|
commitdiff
2010-10-22
Mathias Agopian
am 9f869d11: Revert "Fix bug3119318, missing Mount...
blob
|
commitdiff
|
diff to current
2010-10-21
Roy West
am af06d7a9: Fix bug3119318, missing Mount USB storage...
blob
|
commitdiff
|
diff to current
2010-10-21
Nick Pelly
am 26d6e470: am 781c0aa2: Merge "NFC Settings cleanup...
blob
|
commitdiff
2010-10-21
Dianne Hackborn
am 149fec6a: am 7a519955: Merge "Fix issue #3114356...
blob
|
commitdiff
2010-10-21
Nick Pelly
am 029f23c3: am ff8018dc: Merge "Fix NFC permission...
blob
|
commitdiff
2010-10-21
Dianne Hackborn
am 5cfa7587: am 916adce0: Fix issue #3108683: GRH18...
blob
|
commitdiff
2010-10-21
Nick Pelly
am 781c0aa2: Merge "NFC Settings cleanup." into gingerbread
blob
|
commitdiff
|
diff to current
2010-10-21
Dianne Hackborn
am 7a519955: Merge "Fix issue #3114356: Storage visuali...
blob
|
commitdiff
|
diff to current
2010-10-20
Nick Pelly
am ff8018dc: Merge "Fix NFC permission." into gingerbread
blob
|
commitdiff
|
diff to current
2010-10-20
Dianne Hackborn
am 916adce0: Fix issue #3108683: GRH18: Battery usage...
blob
|
commitdiff
|
diff to current
2010-10-19
Brad Fitzpatrick
am 4036e768: am d36d650a: NFC: async enabling/disabling...
blob
|
commitdiff
2010-10-19
Brad Fitzpatrick
am 17001cea: NFC: async enabling/disabling, ala Bluewoo...
blob
|
commitdiff
2010-10-19
Roy West
resolved conflicts for merge of 98f3aff3 to master
blob
|
commitdiff
2010-10-19
Brad Fitzpatrick
am d36d650a: NFC: async enabling/disabling, ala Bluewoo...
blob
|
commitdiff
|
diff to current
2010-10-18
Dan Morrill
Merge commit 'b7eb8cdad900fc0ddd2d6a7fd79ab7a716c62841...
blob
|
commitdiff
2010-10-18
Dan Morrill
Merge commit '593a7049f52d46a4e47162e2e3f2c5730e8ccfd8...
blob
|
commitdiff
2010-10-18
Roy West
am dd49624e: Del "erase" from new unmount setting subtext
blob
|
commitdiff
|
diff to current
2010-10-18
Kenny Root
am ea86bcd1: (-s ours) am 3594b1b7: Import revised...
blob
|
commitdiff
2010-10-17
Roy West
am 8abc40bb: Correct some typos, impose more consistency.
blob
|
commitdiff
|
diff to current
2010-10-17
Nick Pelly
am fb515337: am e1a9ca68: Merge "Use NfcAdapter.getDefa...
blob
|
commitdiff
2010-10-16
Dianne Hackborn
am 1337d0f7: Implement issue #3094621 and #3094609...
blob
|
commitdiff
|
diff to current
2010-10-16
Amith Yamasani
am 8de45a66: am 1bdb7874: Make summary appear for both...
blob
|
commitdiff
2010-10-16
Roy West
am d3c1749b: am 2c489973: Change USB tab to USB storage...
blob
|
commitdiff
2010-10-16
Roy West
am cfcad4e4: am d3abea0d: Fix a few more cases of USB...
blob
|
commitdiff
2010-10-16
Jaikumar Ganesh
am 7805fa99: am 022299df: Merge "Disconnect dock only...
blob
|
commitdiff
2010-10-16
Kenny Root
am 3594b1b7: Import revised translations DO NOT MERGE
blob
|
commitdiff
|
diff to current
2010-10-16
Nick Pelly
am e1a9ca68: Merge "Use NfcAdapter.getDefaultAdapter...
blob
|
commitdiff
|
diff to current
2010-10-15
Kenny Root
am c915d16a: (-s ours) am b5848295: Merge "Import revis...
blob
|
commitdiff
2010-10-15
Kenny Root
resolved conflicts for merge of 2a612605 to master
blob
|
commitdiff
2010-10-15
Amith Yamasani
am 1bdb7874: Make summary appear for both checked and...
blob
|
commitdiff
|
diff to current
2010-10-15
Jake Hamby
am 8028cea1: (-s ours) am 8021537f: BT settings wait...
blob
|
commitdiff
2010-10-15
Roy West
am 2c489973: Change USB tab to USB storage if it fits
blob
|
commitdiff
|
diff to current
2010-10-15
Nick Pelly
am da08f31f: am 792d4356: Merge "Move NFC setting lower...
blob
|
commitdiff
2010-10-15
Jaikumar Ganesh
am 836b4297: (-s ours) am 03403712: Merge "DO NOT MERGE...
blob
|
commitdiff
2010-10-15
Nick Pelly
am f4e4319f: am 083310d3: Update NFC settings descripti...
blob
|
commitdiff
2010-10-15
Jaikumar Ganesh
am 0d5e320c: am bdf13107: Merge "Call disconnect /...
blob
|
commitdiff
2010-10-15
Nick Pelly
am b3c4365d: am cd99332f: Merge "Update settings app...
blob
|
commitdiff
2010-10-15
Roy West
am d3abea0d: Fix a few more cases of USB storage missed...
blob
|
commitdiff
|
diff to current
2010-10-14
Jaikumar Ganesh
am 022299df: Merge "Disconnect dock only if its connect...
blob
|
commitdiff
|
diff to current
next