git.osdn.net Git - android-x86/packages-apps-Settings.git/history - src/com/android/settings/bluetooth/LocalBluetoothManager.java

(root) / android-x86 / packages-apps-Settings.git / history

[android-x86/packages-apps-Settings.git] / src / com / android / settings / bluetooth / LocalBluetoothManager.java

2010-10-26	Jean-Baptiste Queru	am 28539897: am 8815f032: Merge "Always set right auth_...	blob \| commitdiff
2010-10-26	Jean-Baptiste Queru	am 8815f032: Merge "Always set right auth_type value...	blob \| commitdiff \| diff to current
2010-10-25	Eric Fischer	am c26cfa35: (-s ours) am 873a27c3: Import revised...	blob \| commitdiff
2010-10-24	Daisuke Miyakawa	Merge "Disable Wifi when a user press cancel in XL...	blob \| commitdiff
2010-10-22	Eric Fischer	am 0b655575: (-s ours) am 901f4fbe: Merge "Import revis...	blob \| commitdiff
2010-10-22	Dianne Hackborn	am 8731cb1b: am 5e34f239: Fix issue #3124528: Mange...	blob \| commitdiff
2010-10-22	Jaikumar Ganesh	Update BT APIs for change in return type.	blob \| commitdiff
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-11	Jean-Baptiste Queru	am b84291bb: Merge "Support showing "Cold" battery...	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
2010-10-01	Eric Fischer	am 25c52b70: am 340c5c42: Separate the Settings activit...	blob \| commitdiff \| diff to current
2010-10-01	Dianne Hackborn	am 3cda486c: am 95d7a702: Merge "Fix android:allowClear...	blob \| commitdiff \| diff to current
2010-10-01	Eric Fischer	am ddaf8f49: (-s ours) am f20931bc: Merge "Import revis...	blob \| commitdiff \| diff to current
2010-09-30	Ken Wakasa	am bc692e83: am 2d6c0b0d: Update strings for physical...	blob \| commitdiff \| diff to current
2010-09-30	Gilles Debunne	am 345fbf92: am a63b08d9: New assets for power widget...	blob \| commitdiff \| diff to current
2010-09-30	Gilles Debunne	am a48d2dbe: am 98289826: Merge "New assets (wifi,...	blob \| commitdiff \| diff to current
2010-09-30	Eric Fischer	resolved conflicts for merge of cf18672a to master	blob \| commitdiff \| diff to current
2010-09-30	Ken Wakasa	Merge commit '47ad0cf3' into manualmerge	blob \| commitdiff \| diff to current
2010-09-29	Nick Pelly	resolved conflicts for merge of 1ff9ad3f to master	blob \| commitdiff \| diff to current
2010-09-29	Jaikumar Ganesh	Update code for public Bluetooth APIs	blob \| commitdiff \| diff to current
2010-09-27	Eric Fischer	Merge "Trim unwanted whitespace from translations....	blob \| commitdiff \| diff to current
2010-09-27	Jean-Baptiste Queru	reconcile froyo-release into gingerbread	blob \| commitdiff \| diff to current
2010-09-26	Jean-Baptiste Queru	am 3f1ba01d: Merge "BT: The Phone doesn\'t "wake up...	blob \| commitdiff \| diff to current
2010-09-25	Jake Hamby	am 68c6188b: am dd79a33b: Auto-connect Bluetooth device...	blob \| commitdiff \| diff to current
2010-09-25	Jake Hamby	am dd79a33b: Auto-connect Bluetooth device only when...	blob \| commitdiff \| diff to current
2010-09-24	Jake Hamby	Auto-connect Bluetooth device only when user initiates...	blob \| commitdiff \| diff to current
2010-09-20	Bjorn Bringert	am f4d359d3: (-s ours) Remove Search from the system...	blob \| commitdiff \| diff to current
2010-09-17	Jaikumar Ganesh	Merge "Don't disconnect the same device before connecti...	blob \| commitdiff \| diff to current
2010-09-16	Daisuke Miyakawa	Merge "Check null of getActivity() when needed."	blob \| commitdiff \| diff to current
2010-09-15	Irfan Sheriff	Merge "Add static IP UI"	blob \| commitdiff \| diff to current
2010-09-15	Brad Fitzpatrick	am f8a473c3: am c5c8dad0: Use new apply() instead of...	blob \| commitdiff \| diff to current
2010-09-14	Dianne Hackborn	Merge "Supercalifragilisticexpialidocious." into ginger...	blob \| commitdiff \| diff to current
2010-09-14	Brad Fitzpatrick	am c5c8dad0: Use new apply() instead of commit().	blob \| commitdiff \| diff to current
2010-09-14	Brad Fitzpatrick	Use new apply() instead of commit().	blob \| commitdiff \| diff to current
2010-06-15	The Android Open...	merge from open-source master	blob \| commitdiff \| diff to current
2010-06-14	The Android Open...	ignore from open-source master	blob \| commitdiff \| diff to current
2010-06-14	The Android Open...	merge from open-source master	blob \| commitdiff \| diff to current
2010-06-14	The Android Open...	merge from open-source master	blob \| commitdiff \| diff to current
2010-06-11	The Android Open...	merge from open-source master	blob \| commitdiff \| diff to current
2010-05-19	The Android Open...	merge from open-source master	blob \| commitdiff \| diff to current
2010-05-19	The Android Open...	merge from open-source master	blob \| commitdiff \| diff to current
2010-05-12	The Android Open...	merge from open-source master	blob \| commitdiff \| diff to current
2010-05-12	The Android Open...	merge from open-source master	blob \| commitdiff \| diff to current
2010-04-21	The Android Open...	merge from open-source master	blob \| commitdiff \| diff to current
2010-03-04	Michael Chan	Merge "b/2310373 Show pairing dialogs if the device...	blob \| commitdiff \| diff to current
2010-03-03	Michael Chan	b/2310373 Show pairing dialogs if the device has been...	blob \| commitdiff \| diff to current
2010-02-05	The Android Open...	am 9f78ffb2: am 615f8446: reconcile main tree with...	blob \| commitdiff \| diff to current
2010-01-27	Irfan Sheriff	am 8e79fda8: am ad76f17a: Remove regulatory group setti...	blob \| commitdiff \| diff to current
2010-01-26	Michael Chan	am 3a6b2df2: am 324ab848: Merge "b/2370089 Pop the...	blob \| commitdiff \| diff to current
2010-01-25	Eric Fischer	am 6795dd59: (-s ours) am 359b2bcc: Check in translatio...	blob \| commitdiff \| diff to current
2010-01-23	Michael Chan	am fcd4e7fe: am 04bdae75: Merge "b/2332395 Fixed a...	blob \| commitdiff \| diff to current
2010-01-22	Amith Yamasani	am b9f29667: am 63c6a309: Merge "Add dock icon for...	blob \| commitdiff \| diff to current
2010-01-22	Michael Chan	am 97ed3f4b: am 3fe86a34: b/2332395 Disable BT when...	blob \| commitdiff \| diff to current
2010-01-22	Amith Yamasani	am 942feaa2: am 6ff80dcf: Fix #2377870 : NPE in Dock...	blob \| commitdiff \| diff to current
2010-01-22	Amith Yamasani	am 39c3d10b: am 0e2ab4f8: New top-level Dock in Setting...	blob \| commitdiff \| diff to current
2010-01-20	Amith Yamasani	am 3b7ffa5e: am 01a868d7: Merge "Strings for new Dock...	blob \| commitdiff \| diff to current
2010-01-20	Michael Chan	am 49efbf8b: am c9b9f650: Merge "b/2367861 Auto connect...	blob \| commitdiff \| diff to current
2010-01-13	Amith Yamasani	am 213c35c0: (-s ours) am d8d21279: Merge "Don\'t allow...	blob \| commitdiff \| diff to current
2010-01-12	The Android Open...	android-2.1_r1 snapshot	blob \| commitdiff \| diff to current
2010-01-12	Michael Chan	am d69a5ee2: am c5aa68f3: b/2367020 Enable bt profiles...	blob \| commitdiff \| diff to current
2010-01-11	Michael Chan	am 79270566: (-s ours) am d9d8ef26: Merge "b/2335780...	blob \| commitdiff \| diff to current
2010-01-09	Michael Chan	Merge "b/2335780 Fixed race conditions which causes...	blob \| commitdiff \| diff to current
next

packages/apps/Settings

RSS Atom

About OSDN

Find Software

Develop Software

Help