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 aeca1851: (-s ours) am c955d8ee: Merge "Allow users to change the length of BT...
[android-x86/packages-apps-Settings.git]
/
src
/
com
/
android
/
settings
/
RingerVolumePreference.java
2011-06-07
Jaikumar Ganesh
am aeca1851: (-s ours) am c955d8ee: Merge "Allow users...
blob
|
commitdiff
2011-06-06
Marco Nelissen
resolved conflicts for merge of 531bed61 to honeycomb...
blob
|
commitdiff
2011-04-28
Eric Fischer
am 643e48b7: (-s ours) am 7c284c2c: Import revised...
blob
|
commitdiff
2011-04-27
Conley Owens
Ignoring empty list test in favor of commented out...
blob
|
commitdiff
2011-04-12
Simon Wilson
am f927cccd: (-s ours) am 37063d6a: DO NOT MERGE Clarif...
blob
|
commitdiff
2011-04-11
Eric Fischer
am 84c90053: (-s ours) am fcb089c9: Merge "Reimport...
blob
|
commitdiff
2011-04-11
Simon Wilson
am 2ca7add5: (-s ours) am ca572fb6: Merge "DO NOT MERGE...
blob
|
commitdiff
2011-04-11
Eric Fischer
am 6735ae14: (-s ours) am b4bd78f5: Revert "Import...
blob
|
commitdiff
2011-04-05
Eric Fischer
am dfb78827: (-s ours) am 955ab98f: Import revised...
blob
|
commitdiff
2011-03-30
Park Sanghyun
am 2b2959b3: (-s ours) am e5da8565: DO NOT MERGE Add...
blob
|
commitdiff
2011-03-30
Kenny Root
resolved conflicts for merge of 70a1ff03 to honeycomb...
blob
|
commitdiff
2011-03-18
Eric Fischer
am 9567622d: (-s ours) am c4eeeb29: Import revised...
blob
|
commitdiff
2011-03-17
TK MUN
am 8c2a02de: (-s ours) am e0e845fe: DO NOT MERGE Do...
blob
|
commitdiff
2011-03-15
Mike Lockwood
am 61487da6: (-s ours) am e6c7e45f: DO NOT MERGE: IUsbM...
blob
|
commitdiff
2011-03-10
TK MUN
am f018bd8c: (-s ours) am 36469186: DO NOT MERGE WiMAX...
blob
|
commitdiff
2011-03-04
Lorenzo Colitti
resolved conflicts for merge of a4fb8c86 to honeycomb...
blob
|
commitdiff
2011-03-03
Mike Lockwood
am 9d768735: (-s ours) am 0552d336: DO NOT MERGE: Insta...
blob
|
commitdiff
2011-02-22
Eric Fischer
am 058f62ba: (-s ours) am bd044818: Import revised...
blob
|
commitdiff
2011-02-11
Amith Yamasani
am 255fa0e9: (-s ours) am aae04e43: Prevent monkeys...
blob
|
commitdiff
2011-02-10
Irfan Sheriff
Merge "Re-enable wifi proxy UI"
blob
|
commitdiff
2011-02-10
Eric Fischer
am d422079a: (-s ours) am 47d2ecd0: Import revised...
blob
|
commitdiff
2011-02-08
Alon Albert
Merge "Use main looper to post start animation commands...
blob
|
commitdiff
2011-02-08
Alon Albert
Merge "Remove Gmail Permissions"
blob
|
commitdiff
2011-02-07
Jim Miller
am 1d8c91fa: am 78713aed: Fix 3419077: implement new...
blob
|
commitdiff
2011-02-05
Jake Hamby
am 47cb1753: (-s ours) am 1798fc04: Merge "Fixed a...
blob
|
commitdiff
2011-02-04
Jim Miller
am 78713aed: Fix 3419077: implement new volume control...
blob
|
commitdiff
2011-02-04
Jim Miller
Fix 3419077: implement new volume control in Settings.
blob
|
commitdiff
2011-02-02
Jaikumar Ganesh
Merge "Changes for public API of Bluetooth Discoverabi...
blob
|
commitdiff
|
diff to current
2011-02-02
Jaikumar Ganesh
Merge "Allow users to change the length of Bluetooth...
blob
|
commitdiff
|
diff to current
2011-02-01
Amith Yamasani
am 7247e1a1: am 71863f3b: Merge "Use a custom media...
blob
|
commitdiff
|
diff to current
2011-02-01
Amith Yamasani
am 71863f3b: Merge "Use a custom media file for media...
blob
|
commitdiff
|
diff to current
2011-02-01
Amith Yamasani
Merge "Use a custom media file for media volume sample...
blob
|
commitdiff
|
diff to current
2011-02-01
Amith Yamasani
Use a custom media file for media volume sample.
blob
|
commitdiff
|
diff to current
2011-02-01
Eric Fischer
am 2b78f433: (-s ours) am 93580e22: Import revised...
blob
|
commitdiff
|
diff to current
2011-01-29
Eric Fischer
am 5a2bb8c0: (-s ours) Import revised translations...
blob
|
commitdiff
|
diff to current
2011-01-29
Eric Fischer
am 95112e5b: (-s ours) Import revised translations...
blob
|
commitdiff
|
diff to current
2011-01-29
Eric Fischer
am abdfaed8: (-s ours) am 5a2bb8c0: Import revised...
blob
|
commitdiff
|
diff to current
2011-01-29
Eric Fischer
am 0cd5e21a: (-s ours) am 95112e5b: Import revised...
blob
|
commitdiff
|
diff to current
2011-01-25
Eric Fischer
am 6418d373: (-s ours) Import translations for addition...
blob
|
commitdiff
|
diff to current
2011-01-18
Amith Yamasani
am 2768ae05: am f7fd4ca8: Merge "Disable change PIN...
blob
|
commitdiff
|
diff to current
2011-01-08
Eric Fischer
am 40bcf565: (-s ours) am 6418d373: Import translations...
blob
|
commitdiff
|
diff to current
2010-12-28
Jean-Baptiste Queru
am 9a10fb0b: am e8531ff6: Merge "Changed the text input...
blob
|
commitdiff
|
diff to current
2010-12-13
Nick Pelly
am 934c1b9f: am c1286804: Merge "Update Settings for...
blob
|
commitdiff
|
diff to current
2010-12-10
Eric Fischer
am 5721cb1d: (-s ours) am 99d2471d: Import revised...
blob
|
commitdiff
|
diff to current
2010-12-10
Jean-Baptiste Queru
am 9b9c61f6: am 2a7c5425: reconcile with open-source...
blob
|
commitdiff
|
diff to current
2010-12-09
Jean-Baptiste Queru
am bd73c736: (-s ours) am 1acfef82: 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
|
diff to current
2010-12-02
Irfan Sheriff
am ea04ee75: (-s ours) am fa04d89f: avoid view creation...
blob
|
commitdiff
|
diff to current
2010-12-01
Eric Fischer
am 39f8dba1: (-s ours) am e1e257f4: Import revised...
blob
|
commitdiff
|
diff to current
2010-11-30
Jean-Baptiste Queru
am b68b35dd: am 04b646df: Merge "Possible NumberFormatE...
blob
|
commitdiff
|
diff to current
2010-11-11
Eric Fischer
am 71d43248: (-s ours) am 5c205262: Merge "Import revis...
blob
|
commitdiff
|
diff to current
2010-11-11
Dianne Hackborn
am 969773aa: am 83d2698f: Merge "Fix issue #3177284...
blob
|
commitdiff
|
diff to current
2010-11-04
Nick Pelly
am b93b018a: am 91ba0709: Update settings text on succe...
blob
|
commitdiff
|
diff to current
2010-10-29
Daisuke Miyakawa
Merge "Fix layout for WifiSettingsForXL"
blob
|
commitdiff
|
diff to current
2010-10-29
Dianne Hackborn
am 5f301797: am 4e4ed14e: Fix issue #3146784: ANR in...
blob
|
commitdiff
|
diff to current
2010-10-29
Amith Yamasani
Remove extra labels from Volume settings.
blob
|
commitdiff
|
diff to current
2010-10-26
Jean-Baptiste Queru
am 28539897: am 8815f032: Merge "Always set right auth_...
blob
|
commitdiff
|
diff to current
2010-10-25
Eric Fischer
am c26cfa35: (-s ours) am 873a27c3: Import revised...
blob
|
commitdiff
|
diff to current
2010-10-22
Eric Fischer
am 0b655575: (-s ours) am 901f4fbe: Merge "Import revis...
blob
|
commitdiff
|
diff to current
2010-10-22
Dianne Hackborn
am 8731cb1b: am 5e34f239: Fix issue #3124528: Mange...
blob
|
commitdiff
|
diff to current
2010-10-22
Eric Fischer
resolved conflicts for merge of 92acdba0 to master
blob
|
commitdiff
|
diff to current
2010-10-22
Roy West
am d2927990: (-s ours) am 69827524: Try to fix bug31193...
blob
|
commitdiff
|
diff to current
2010-10-22
Jean-Baptiste Queru
Merge from gingerbread-plus-aosp
blob
|
commitdiff
|
diff to current
2010-10-21
Nick Pelly
am 26d6e470: am 781c0aa2: Merge "NFC Settings cleanup...
blob
|
commitdiff
|
diff to current
2010-10-21
Dianne Hackborn
am 149fec6a: am 7a519955: Merge "Fix issue #3114356...
blob
|
commitdiff
|
diff to current
2010-10-21
Nick Pelly
am 029f23c3: am ff8018dc: Merge "Fix NFC permission...
blob
|
commitdiff
|
diff to current
2010-10-21
Dianne Hackborn
am 5cfa7587: am 916adce0: Fix issue #3108683: GRH18...
blob
|
commitdiff
|
diff to current
2010-10-19
Brad Fitzpatrick
am 4036e768: am d36d650a: NFC: async enabling/disabling...
blob
|
commitdiff
|
diff to current
2010-10-19
Brad Fitzpatrick
am 17001cea: NFC: async enabling/disabling, ala Bluewoo...
blob
|
commitdiff
|
diff to current
2010-10-19
Roy West
resolved conflicts for merge of 98f3aff3 to master
blob
|
commitdiff
|
diff to current
2010-10-18
Dan Morrill
Merge commit 'b7eb8cdad900fc0ddd2d6a7fd79ab7a716c62841...
blob
|
commitdiff
|
diff to current
2010-10-18
Dan Morrill
Merge commit '593a7049f52d46a4e47162e2e3f2c5730e8ccfd8...
blob
|
commitdiff
|
diff to current
2010-10-18
Kenny Root
am ea86bcd1: (-s ours) am 3594b1b7: Import revised...
blob
|
commitdiff
|
diff to current
2010-10-17
Nick Pelly
am fb515337: am e1a9ca68: Merge "Use NfcAdapter.getDefa...
blob
|
commitdiff
|
diff to current
2010-10-16
Amith Yamasani
am 8de45a66: am 1bdb7874: Make summary appear for both...
blob
|
commitdiff
|
diff to current
2010-10-16
Roy West
am d3c1749b: am 2c489973: Change USB tab to USB storage...
blob
|
commitdiff
|
diff to current
2010-10-16
Roy West
am cfcad4e4: am d3abea0d: Fix a few more cases of USB...
blob
|
commitdiff
|
diff to current
2010-10-16
Jaikumar Ganesh
am 7805fa99: am 022299df: Merge "Disconnect dock only...
blob
|
commitdiff
|
diff to current
2010-10-15
Kenny Root
am c915d16a: (-s ours) am b5848295: Merge "Import revis...
blob
|
commitdiff
|
diff to current
2010-10-15
Kenny Root
resolved conflicts for merge of 2a612605 to master
blob
|
commitdiff
|
diff to current
2010-10-15
Jake Hamby
am 8028cea1: (-s ours) am 8021537f: BT settings wait...
blob
|
commitdiff
|
diff to current
2010-10-15
Nick Pelly
am da08f31f: am 792d4356: Merge "Move NFC setting lower...
blob
|
commitdiff
|
diff to current
2010-10-15
Jaikumar Ganesh
am 836b4297: (-s ours) am 03403712: Merge "DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2010-10-15
Nick Pelly
am f4e4319f: am 083310d3: Update NFC settings descripti...
blob
|
commitdiff
|
diff to current
2010-10-15
Jaikumar Ganesh
am 0d5e320c: am bdf13107: Merge "Call disconnect /...
blob
|
commitdiff
|
diff to current
2010-10-15
Nick Pelly
am b3c4365d: am cd99332f: Merge "Update settings app...
blob
|
commitdiff
|
diff to current
2010-10-14
Kenny Root
am 52e8542d: am 737e91ef: Merge "Don\'t show the sort...
blob
|
commitdiff
|
diff to current
2010-10-14
Freeman Ng
resolved conflicts for merge of 59561e0a to master
blob
|
commitdiff
|
diff to current
2010-10-13
Roy West
am f233ec77: am 30186392: With luck, final take on...
blob
|
commitdiff
|
diff to current
2010-10-12
Jake Hamby
am d7f7213a: am 4c0ff2c7: Merge "Fix bug where car...
blob
|
commitdiff
|
diff to current
2010-10-12
Irfan Sheriff
am 52ad3f2f: am 566b5bb0: Improve password hint visibility
blob
|
commitdiff
|
diff to current
2010-10-12
Jean-Baptiste Queru
am 80455f36: am b84291bb: Merge "Support showing "Cold...
blob
|
commitdiff
|
diff to current
2010-10-11
Roy West
am 81635077: am effdd53f: Fix bug3076083 re backup...
blob
|
commitdiff
|
diff to current
2010-10-10
Roy West
am 83caf0b2: (-s ours) am 82d2908b: do not merge
blob
|
commitdiff
|
diff to current
2010-10-10
Roy West
am 60d9b33f: (-s ours) am e3b0bda2: do not merge
blob
|
commitdiff
|
diff to current
2010-10-10
Eric Fischer
am 5e51c769: (-s ours) am d86f58a9: Merge "Import revis...
blob
|
commitdiff
|
diff to current
2010-10-10
Jean-Baptiste Queru
resolved conflicts for merge of 10ebf928 to master
blob
|
commitdiff
|
diff to current
2010-10-10
Jean-Baptiste Queru
resolved conflicts for merge of 0eb550ef to master
blob
|
commitdiff
|
diff to current
2010-10-09
Eric Fischer
am 27db062d: (-s ours) am 84c8c175: Import revised...
blob
|
commitdiff
|
diff to current
2010-10-07
Dianne Hackborn
am 3e15e4e9: am 6dc1bf84: Manage apps "on SD card"...
blob
|
commitdiff
|
diff to current
next