OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
am 7805fa99: am 022299df: Merge "Disconnect dock only if its connected." into gingerbread
[android-x86/packages-apps-Settings.git] / src / com / android / settings / bluetooth / DockService.java
2010-10-16 Jaikumar Ganesham 7805fa99: am 022299df: Merge "Disconnect dock only... blob | commitdiff
2010-10-15 Kenny Rootam c915d16a: (-s ours) am b5848295: Merge "Import revis... blob | commitdiff | diff to current
2010-10-15 Kenny Rootresolved conflicts for merge of 2a612605 to master blob | commitdiff | diff to current
2010-10-15 Jake Hambyam 8028cea1: (-s ours) am 8021537f: BT settings wait... blob | commitdiff | diff to current
2010-10-15 Nick Pellyam da08f31f: am 792d4356: Merge "Move NFC setting lower... blob | commitdiff | diff to current
2010-10-15 Jaikumar Ganesham 836b4297: (-s ours) am 03403712: Merge "DO NOT MERGE... blob | commitdiff | diff to current
2010-10-15 Nick Pellyam f4e4319f: am 083310d3: Update NFC settings descripti... blob | commitdiff | diff to current
2010-10-15 Jaikumar Ganesham 0d5e320c: am bdf13107: Merge "Call disconnect /... blob | commitdiff | diff to current
2010-10-15 Nick Pellyam b3c4365d: am cd99332f: Merge "Update settings app... blob | commitdiff | diff to current
2010-10-14 Jaikumar Ganesham 022299df: Merge "Disconnect dock only if its connect... blob | commitdiff | diff to current
2010-10-14 Jaikumar GaneshMerge "Disconnect dock only if its connected." into... blob | commitdiff | diff to current
2010-10-14 Jaikumar GaneshDisconnect dock only if its connected. blob | commitdiff | diff to current
2010-10-14 Kenny Rootam 52e8542d: am 737e91ef: Merge "Don\'t show the sort... blob | commitdiff | diff to current
2010-10-14 Freeman Ngresolved conflicts for merge of 59561e0a to master blob | commitdiff | diff to current
2010-10-13 Roy Westam f233ec77: am 30186392: With luck, final take on... blob | commitdiff | diff to current
2010-10-12 Jake Hambyam d7f7213a: am 4c0ff2c7: Merge "Fix bug where car... blob | commitdiff | diff to current
2010-10-12 Irfan Sheriffam 52ad3f2f: am 566b5bb0: Improve password hint visibility blob | commitdiff | diff to current
2010-10-12 Jean-Baptiste Queruam 80455f36: am b84291bb: Merge "Support showing "Cold... blob | commitdiff | diff to current
2010-10-11 Roy Westam 81635077: am effdd53f: Fix bug3076083 re backup... blob | commitdiff | diff to current
2010-10-11 Jean-Baptiste Queruam b84291bb: Merge "Support showing "Cold" battery... blob | commitdiff | diff to current
2010-10-10 Roy Westam 83caf0b2: (-s ours) am 82d2908b: do not merge blob | commitdiff | diff to current
2010-10-10 Roy Westam 60d9b33f: (-s ours) am e3b0bda2: do not merge blob | commitdiff | diff to current
2010-10-10 Eric Fischeram 5e51c769: (-s ours) am d86f58a9: Merge "Import revis... blob | commitdiff | diff to current
2010-10-10 Jean-Baptiste Queruresolved conflicts for merge of 10ebf928 to master blob | commitdiff | diff to current
2010-10-10 Jean-Baptiste Queruresolved conflicts for merge of 0eb550ef to master blob | commitdiff | diff to current
2010-10-09 Eric Fischeram 27db062d: (-s ours) am 84c8c175: Import revised... blob | commitdiff | diff to current
2010-10-07 Dianne Hackbornam 3e15e4e9: am 6dc1bf84: Manage apps "on SD card"... blob | commitdiff | diff to current
2010-10-01 Eric Fischeram 25c52b70: am 340c5c42: Separate the Settings activit... blob | commitdiff | diff to current
2010-10-01 Dianne Hackbornam 3cda486c: am 95d7a702: Merge "Fix android:allowClear... blob | commitdiff | diff to current
2010-10-01 Eric Fischeram ddaf8f49: (-s ours) am f20931bc: Merge "Import revis... blob | commitdiff | diff to current
2010-09-30 Ken Wakasaam bc692e83: am 2d6c0b0d: Update strings for physical... blob | commitdiff | diff to current
2010-09-30 Gilles Debunneam 345fbf92: am a63b08d9: New assets for power widget... blob | commitdiff | diff to current
2010-09-30 Gilles Debunneam a48d2dbe: am 98289826: Merge "New assets (wifi,... blob | commitdiff | diff to current
2010-09-30 Eric Fischerresolved conflicts for merge of cf18672a to master blob | commitdiff | diff to current
2010-09-30 Ken WakasaMerge commit '47ad0cf3' into manualmerge blob | commitdiff | diff to current
2010-09-29 Nick Pellyresolved conflicts for merge of 1ff9ad3f to master blob | commitdiff | diff to current
2010-09-29 Jaikumar GaneshUpdate code for public Bluetooth APIs blob | commitdiff | diff to current
2010-09-27 Jean-Baptiste Querureconcile froyo-release into gingerbread blob | commitdiff | diff to current
2010-09-26 Jean-Baptiste Queruam 3f1ba01d: Merge "BT: The Phone doesn\'t "wake up... blob | commitdiff | diff to current
2010-09-20 Bjorn Bringertam f4d359d3: (-s ours) Remove Search from the system... blob | commitdiff | diff to current
2010-09-17 Jaikumar GaneshMerge "Don't disconnect the same device before connecti... blob | commitdiff | diff to current
2010-09-16 Daisuke MiyakawaMerge "Check null of getActivity() when needed." blob | commitdiff | diff to current
2010-09-15 Irfan SheriffMerge "Add static IP UI" blob | commitdiff | diff to current
2010-09-15 Brad Fitzpatrickam f8a473c3: am c5c8dad0: Use new apply() instead of... blob | commitdiff | diff to current
2010-09-14 Dianne HackbornMerge "Supercalifragilisticexpialidocious." into ginger... blob | commitdiff | diff to current
2010-09-14 Brad Fitzpatrickam c5c8dad0: Use new apply() instead of commit(). blob | commitdiff | diff to current
2010-09-14 Brad FitzpatrickUse new apply() instead of commit(). blob | commitdiff | diff to current
2010-09-10 Jean-Baptiste Queruam 16502e94: Merge "Allow users to create shortcuts... blob | commitdiff | diff to current
2010-09-10 Erik Ljungbergam 33319b12: Bluetooth PIN is not password style blob | commitdiff | diff to current
2010-08-24 Jean-Baptiste Querumerge -s ours from froyo-release so that upgrading... blob | commitdiff | diff to current
2010-08-19 Jake Hambyam 2fcfb289: Merge " Fix Bluetooth Settings activity... blob | commitdiff | diff to current
2010-08-17 Ben Clarkam 0008d219: Refactor to remove multiple in-loop Object... blob | commitdiff | diff to current
2010-07-26 Jean-Baptiste Queruam 46c0a5b1: Merge "Remove unused imports in SecuritySe... blob | commitdiff | diff to current
2010-07-22 Ben Clarkam f7f47d00: Removed unused import android.widget.Linea... blob | commitdiff | diff to current
2010-07-19 The Android Open... merge from open-source master blob | commitdiff | diff to current
2010-07-19 The Android Open... merge from open-source master blob | commitdiff | diff to current
2010-06-25 The Android Open... merge from froyo-plus-aosp blob | commitdiff | diff to current
2010-06-21 Kenny Rootam 4e012037: (-s ours) Import revised translations blob | commitdiff | diff to current
2010-06-21 Kenny Rootam db751db4: (-s ours) Import revised translations 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 froyo-plus-aosp 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-06-10 Kenny Rootam dc2fdd09: (-s ours) Import revised translations blob | commitdiff | diff to current
2010-06-10 Kenny Rootam a791e2d6: (-s ours) Import revised translations blob | commitdiff | diff to current
2010-06-04 Kenny Rootam e4c0cd6d: am 365ef4a0: Update strings for backup blob | commitdiff | diff to current
2010-06-03 Kenny Rootam 273464d5: am aa1f8aee: Clarify backup setting blob | commitdiff | diff to current
2010-06-03 Irfan Sheriffam a4966840: am de3e5665: Add phase2 authentication... blob | commitdiff | diff to current
2010-05-28 Jeff Brownam 7c5717c0: am b0bcf9f7: Fix NPE in InstalledAppDetail... blob | commitdiff | diff to current
2010-05-28 Michael Chanam fa5d73fd: Merge "b/2680057 Fixed a bug where bt... blob | commitdiff | diff to current
2010-05-28 Michael ChanMerge "b/2680057 Fixed a bug where bt won't connect... blob | commitdiff | diff to current
2010-05-28 Michael Chanb/2680057 Fixed a bug where bt won't connect when the... 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-04-07 Charles ChenMerge "Fix for bug #2577984 - Settings app was trying... blob | commitdiff | diff to current
2010-04-07 Michael Chanam 746fac2d: am d9db9e76: Merge "b/2498180 b/2568119... blob | commitdiff | diff to current
2010-04-07 Michael Chanam d9db9e76: Merge "b/2498180 b/2568119 Retry if BT... blob | commitdiff | diff to current
2010-04-07 Michael ChanMerge "b/2498180 b/2568119 Retry if BT dock disconnects... blob | commitdiff | diff to current
2010-04-06 Michael Chanb/2498180 b/2568119 Retry if BT dock disconnects unexpe... blob | commitdiff | diff to current
2010-02-05 The Android Open... reconcile main tree with open-source eclair blob | commitdiff | diff to current
2010-01-26 Mike LeBeauMerge "Add a new "Voice input & output" top-level secti... blob | commitdiff | diff to current
2010-01-26 Michael Chanam 3a6b2df2: am 324ab848: Merge "b/2370089 Pop the... blob | commitdiff | diff to current
2010-01-25 Charles ChenMerge "Changing TextToSpeechSettings to query for the... blob | commitdiff | diff to current
2010-01-25 Bjorn BringertMerge "Fix GoogleSettings check in PrivacySettings" blob | commitdiff | diff to current
2010-01-23 Michael Chanam fcd4e7fe: am 04bdae75: Merge "b/2332395 Fixed a... blob | commitdiff | diff to current
2010-01-22 Michael Chanam 97ed3f4b: am 3fe86a34: b/2332395 Disable BT when... blob | commitdiff | diff to current
2010-01-21 Michael Chanam 324ab848: Merge "b/2370089 Pop the dock dialog above... blob | commitdiff | diff to current
2010-01-21 Michael ChanMerge "b/2370089 Pop the dock dialog above the keyguard... blob | commitdiff | diff to current
2010-01-20 Michael Chanb/2370089 Pop the dock dialog above the keyguard blob | commitdiff | diff to current
2010-01-20 Jim MillerMerge "Fix 2385283: Add DevicePolicyManager calls to... blob | commitdiff | diff to current
2010-01-20 Michael Chanam 49efbf8b: am c9b9f650: Merge "b/2367861 Auto connect... blob | commitdiff | diff to current
2010-01-20 Michael Chanam 04bdae75: Merge "b/2332395 Fixed a bug where BT... blob | commitdiff | diff to current
2010-01-20 Michael ChanMerge "b/2332395 Fixed a bug where BT is not disabled... blob | commitdiff | diff to current
2010-01-20 Michael Chanam 3fe86a34: b/2332395 Disable BT when undocked if... blob | commitdiff | diff to current
2010-01-20 Amith YamasaniMerge "Add dock icon for top-level settings. #2367275... blob | commitdiff | diff to current
next
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help