Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android / packages / apps / Settings / 834735a955e0e3110a3103179b877cd00d8dcd1f
  1. 834735a am 029f23c3: am ff8018dc: Merge "Fix NFC permission." into gingerbread by Nick Pelly · 14 years ago
  2. 0fda1ad am 5cfa7587: am 916adce0: Fix issue #3108683: GRH18: Battery usage chart FCs by Dianne Hackborn · 14 years ago
  3. 029f23c am ff8018dc: Merge "Fix NFC permission." into gingerbread by Nick Pelly · 14 years ago
  4. ff8018d Merge "Fix NFC permission." into gingerbread by Nick Pelly · 14 years ago
  5. f2917ac Fix NFC permission. by Nick Pelly · 14 years ago
  6. 5cfa758 am 916adce0: Fix issue #3108683: GRH18: Battery usage chart FCs by Dianne Hackborn · 14 years ago
  7. c4ddcbd Fix build by Jean-Baptiste Queru · 14 years ago
  8. 916adce Fix issue #3108683: GRH18: Battery usage chart FCs by Dianne Hackborn · 14 years ago
  9. 9c8ba9f am 4036e768: am d36d650a: NFC: async enabling/disabling, ala Bluewooth & Wifi. by Brad Fitzpatrick · 14 years ago
  10. 4453eca am 17001cea: NFC: async enabling/disabling, ala Bluewooth & Wifi. by Brad Fitzpatrick · 14 years ago
  11. c05efc1 UI refresh by Daisuke Miyakawa · 14 years ago
  12. cfcb55d resolved conflicts for merge of 98f3aff3 to master by Roy West · 14 years ago
  13. 4036e76 am d36d650a: NFC: async enabling/disabling, ala Bluewooth & Wifi. by Brad Fitzpatrick · 14 years ago
  14. 17001ce NFC: async enabling/disabling, ala Bluewooth & Wifi. by Brad Fitzpatrick · 14 years ago
  15. 82884de Merge commit 'b7eb8cdad900fc0ddd2d6a7fd79ab7a716c62841' into mergefix by Dan Morrill · 14 years ago
  16. d36d650 NFC: async enabling/disabling, ala Bluewooth & Wifi. by Brad Fitzpatrick · 14 years ago
  17. 45e3000 Merge commit '593a7049f52d46a4e47162e2e3f2c5730e8ccfd8' into mergefix by Dan Morrill · 14 years ago
  18. 98f3aff am dd49624e: Del "erase" from new unmount setting subtext by Roy West · 14 years ago
  19. 5565b9e am ea86bcd1: (-s ours) am 3594b1b7: Import revised translations DO NOT MERGE by Kenny Root · 14 years ago
  20. dd49624 Del "erase" from new unmount setting subtext by Roy West · 14 years ago
  21. b7eb8cd am 8abc40bb: Correct some typos, impose more consistency. by Roy West · 14 years ago
  22. e0b6d45 am fb515337: am e1a9ca68: Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread by Nick Pelly · 14 years ago
  23. 8abc40b Correct some typos, impose more consistency. by Roy West · 14 years ago
  24. 593a704 am 1337d0f7: Implement issue #3094621 and #3094609 - wipe sd card by Dianne Hackborn · 14 years ago
  25. 1337d0f Implement issue #3094621 and #3094609 - wipe sd card by Dianne Hackborn · 14 years ago
  26. 346ca43 am 8de45a66: am 1bdb7874: Make summary appear for both checked and unchecked NFC checkbox in Settings. by Amith Yamasani · 14 years ago
  27. 38f0481 am d3c1749b: am 2c489973: Change USB tab to USB storage if it fits by Roy West · 14 years ago
  28. a054d53 am cfcad4e4: am d3abea0d: Fix a few more cases of USB storage missed at 4am pass... by Roy West · 14 years ago
  29. cf7ef7c am 7805fa99: am 022299df: Merge "Disconnect dock only if its connected." into gingerbread by Jaikumar Ganesh · 14 years ago
  30. ea86bcd am 3594b1b7: Import revised translations DO NOT MERGE by Kenny Root · 14 years ago
  31. fb51533 am e1a9ca68: Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread by Nick Pelly · 14 years ago
  32. d8fff3d am c915d16a: (-s ours) am b5848295: Merge "Import revised translations" into gingerbread by Kenny Root · 14 years ago
  33. 3594b1b Import revised translations DO NOT MERGE by Kenny Root · 14 years ago
  34. 987e8a6 Merge "resolved conflicts for merge of 2a612605 to master" by Kenny Root · 14 years ago
  35. 4965e88 resolved conflicts for merge of 2a612605 to master by Kenny Root · 14 years ago
  36. bd8e697 Fix 3100926: Prevent proguard from stripping OwnerInfo by Jim Miller · 14 years ago
  37. e1a9ca6 Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread by Nick Pelly · 14 years ago
  38. 8de45a6 am 1bdb7874: Make summary appear for both checked and unchecked NFC checkbox in Settings. by Amith Yamasani · 14 years ago
  39. 1bdb787 Make summary appear for both checked and unchecked NFC checkbox in Settings. by Amith Yamasani · 14 years ago
  40. 6d3aa67 am 8028cea1: (-s ours) am 8021537f: BT settings wait for HS service before connect. DO NOT MERGE by Jake Hamby · 14 years ago
  41. d3c1749 am 2c489973: Change USB tab to USB storage if it fits by Roy West · 14 years ago
  42. a3757ca am da08f31f: am 792d4356: Merge "Move NFC setting lower down the Setting\'s list." into gingerbread by Nick Pelly · 14 years ago
  43. 2c48997 Change USB tab to USB storage if it fits by Roy West · 14 years ago
  44. a57eace Use NfcAdapter.getDefaultAdapter() to check for NFC prescence. by Nick Pelly · 14 years ago
  45. 0ceae1c Merge "Turn on hardware acceleration of rendering." by Dianne Hackborn · 14 years ago
  46. 0d71163 am 836b4297: (-s ours) am 03403712: Merge "DO NOT MERGE Add null check before disconnecting a device." into gingerbread by Jaikumar Ganesh · 14 years ago
  47. 38964d8 am f4e4319f: am 083310d3: Update NFC settings description, and fix polarity. by Nick Pelly · 14 years ago
  48. c0a2044 am 0d5e320c: am bdf13107: Merge "Call disconnect / connect without checking the current status" into gingerbread by Jaikumar Ganesh · 14 years ago
  49. 2f54a66 am b3c4365d: am cd99332f: Merge "Update settings app for new NFC API." into gingerbread by Nick Pelly · 14 years ago
  50. cfcad4e am d3abea0d: Fix a few more cases of USB storage missed at 4am pass... by Roy West · 14 years ago
  51. 33b316e Turn on hardware acceleration of rendering. by Dianne Hackborn · 14 years ago
  52. d3abea0 Fix a few more cases of USB storage missed at 4am pass... by Roy West · 14 years ago
  53. 9d36ab5 Merge "Fix 3024528: Initial implementation of owner info to enable dogfooding" by Jim Miller · 14 years ago
  54. edfaaea Fix 3024528: Initial implementation of owner info to enable dogfooding by Jim Miller · 14 years ago
  55. 7805fa9 am 022299df: Merge "Disconnect dock only if its connected." into gingerbread by Jaikumar Ganesh · 14 years ago
  56. 022299d Merge "Disconnect dock only if its connected." into gingerbread by Jaikumar Ganesh · 14 years ago
  57. 9d03e98 Disconnect dock only if its connected. by Jaikumar Ganesh · 14 years ago
  58. c915d16 am b5848295: Merge "Import revised translations" into gingerbread by Kenny Root · 14 years ago
  59. b584829 Merge "Import revised translations" into gingerbread by Kenny Root · 14 years ago
  60. 2a61260 am 825db2da: Update storage names to 10-13 decision; add USB erase nugget by Roy West · 14 years ago
  61. 213494f limit max length of ssid and password by Irfan Sheriff · 14 years ago
  62. 4f6196a Import revised translations by Kenny Root · 14 years ago
  63. 825db2d Update storage names to 10-13 decision; add USB erase nugget by Roy West · 14 years ago
  64. 8d17bc8 am 52e8542d: am 737e91ef: Merge "Don\'t show the sort menu for running process list" into gingerbread by Kenny Root · 14 years ago
  65. 56a52c5 resolved conflicts for merge of 59561e0a to master by Freeman Ng · 14 years ago
  66. 5c9bd5f Merge "Fix NPE in BT Settings launch from a shortcut." by Amith Yamasani · 14 years ago
  67. 8028cea am 8021537f: BT settings wait for HS service before connect. DO NOT MERGE by Jake Hamby · 14 years ago
  68. 8021537 BT settings wait for HS service before connect. DO NOT MERGE by Jake Hamby · 14 years ago
  69. 9c87328 am f233ec77: am 30186392: With luck, final take on bug3076083, re back up settting by Roy West · 14 years ago
  70. da08f31 am 792d4356: Merge "Move NFC setting lower down the Setting\'s list." into gingerbread by Nick Pelly · 14 years ago
  71. 792d435 Merge "Move NFC setting lower down the Setting's list." into gingerbread by Nick Pelly · 14 years ago
  72. 290ba7c Fix NPE in BT Settings launch from a shortcut. by Amith Yamasani · 14 years ago
  73. 72ce892 Move NFC setting lower down the Setting's list. by Nick Pelly · 14 years ago
  74. 836b429 am 03403712: Merge "DO NOT MERGE Add null check before disconnecting a device." into gingerbread by Jaikumar Ganesh · 14 years ago
  75. 0340371 Merge "DO NOT MERGE Add null check before disconnecting a device." into gingerbread by Jaikumar Ganesh · 14 years ago
  76. 268d1f1 DO NOT MERGE Add null check before disconnecting a device. by Jaikumar Ganesh · 14 years ago
  77. f4e4319 am 083310d3: Update NFC settings description, and fix polarity. by Nick Pelly · 14 years ago
  78. 083310d Update NFC settings description, and fix polarity. by Nick Pelly · 14 years ago
  79. 0d5e320 am bdf13107: Merge "Call disconnect / connect without checking the current status" into gingerbread by Jaikumar Ganesh · 14 years ago
  80. b3c4365 am cd99332f: Merge "Update settings app for new NFC API." into gingerbread by Nick Pelly · 14 years ago
  81. bdf1310 Merge "Call disconnect / connect without checking the current status" into gingerbread by Jaikumar Ganesh · 14 years ago
  82. cd99332 Merge "Update settings app for new NFC API." into gingerbread by Nick Pelly · 14 years ago
  83. d3a460c Call disconnect / connect without checking the current status by Jaikumar Ganesh · 14 years ago
  84. 4747950 am d7f7213a: am 4c0ff2c7: Merge "Fix bug where car dock sometimes doesn\'t connect." into gingerbread by Jake Hamby · 14 years ago
  85. 454d2ef Update settings app for new NFC API. by Nick Pelly · 14 years ago
  86. 52e8542 am 737e91ef: Merge "Don\'t show the sort menu for running process list" into gingerbread by Kenny Root · 14 years ago
  87. 737e91e Merge "Don't show the sort menu for running process list" into gingerbread by Kenny Root · 14 years ago
  88. 59561e0 am 1054e489: Merge "Hide "System tutorial" option if there\'s no IME tutorial bug: 3074212" into gingerbread by Freeman Ng · 14 years ago
  89. 1054e48 Merge "Hide "System tutorial" option if there's no IME tutorial bug: 3074212" into gingerbread by Freeman Ng · 14 years ago
  90. 8b324d9 am 52ad3f2f: am 566b5bb0: Improve password hint visibility by Irfan Sheriff · 14 years ago
  91. 673085a Don't show the sort menu for running process list by Kenny Root · 14 years ago
  92. 2fc2ba1 Hide "System tutorial" option if there's no IME tutorial bug: 3074212 by Freeman Ng · 14 years ago
  93. ac3af83 am 80455f36: am b84291bb: Merge "Support showing "Cold" battery health." by Jean-Baptiste Queru · 14 years ago
  94. f233ec7 am 30186392: With luck, final take on bug3076083, re back up settting by Roy West · 14 years ago
  95. 3018639 With luck, final take on bug3076083, re back up settting by Roy West · 14 years ago
  96. d7f7213 am 4c0ff2c7: Merge "Fix bug where car dock sometimes doesn\'t connect." into gingerbread by Jake Hamby · 14 years ago
  97. 4c0ff2c Merge "Fix bug where car dock sometimes doesn't connect." into gingerbread by Jake Hamby · 14 years ago
  98. 52ad3f2 am 566b5bb0: Improve password hint visibility by Irfan Sheriff · 14 years ago
  99. 566b5bb Improve password hint visibility by Irfan Sheriff · 14 years ago
  100. f0fa3df am 81635077: am effdd53f: Fix bug3076083 re backup setting strings by Roy West · 14 years ago