PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,493 Commits 1 Branch 0 Tags
838c0f2ad07d12f315b51b7ada99281bfbad8f2c
Commit Graph

2493 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad Fitzpatrick
4036e768d0 am d36d650a: NFC: async enabling/disabling, ala Bluewooth & Wifi. 
Merge commit 'd36d650a8132e8aea375239e6dfff92708771b7a' into gingerbread-plus-aosp

* commit 'd36d650a8132e8aea375239e6dfff92708771b7a':
  NFC: async enabling/disabling, ala Bluewooth & Wifi.
 2010-10-18 17:04:16 -07:00
Brad Fitzpatrick
17001cea9e NFC: async enabling/disabling, ala Bluewooth & Wifi. 
Don't ANR when toggling.

Bug: 3097279
Change-Id: Ief09a5a4d023f32b02b2f3b72ac701e8089254c8
 2010-10-18 17:03:44 -07:00
Dan Morrill
82884deb0e Merge commit 'b7eb8cdad900fc0ddd2d6a7fd79ab7a716c62841' into mergefix 
Conflicts:
	res/values/strings.xml

Change-Id: I5da845de77ffd95c5008fdc081cc1e3abef4fad5
 2010-10-18 16:11:35 -07:00
Brad Fitzpatrick
d36d650a81 NFC: async enabling/disabling, ala Bluewooth & Wifi. 
Don't ANR when toggling.

Bug: 3097279
Change-Id: Ief09a5a4d023f32b02b2f3b72ac701e8089254c8
 2010-10-18 15:25:49 -07:00
Dan Morrill
45e3000666 Merge commit '593a7049f52d46a4e47162e2e3f2c5730e8ccfd8' into mergefix 
Conflicts:
	res/values/strings.xml
	src/com/android/settings/deviceinfo/Memory.java

Change-Id: Id481ad234f2e74bdef66ea9485a548f11f0cab84
 2010-10-18 15:23:16 -07:00
Roy West
98f3aff3c5 am dd49624e: Del "erase" from new unmount setting subtext 
Merge commit 'dd49624ed049d6f2f9946f71381bcde83f19e5e0' into gingerbread-plus-aosp

* commit 'dd49624ed049d6f2f9946f71381bcde83f19e5e0':
  Del "erase" from new unmount setting subtext
 2010-10-18 11:33:34 -07:00
Kenny Root
5565b9ee03 am ea86bcd1: (-s ours) am 3594b1b7: Import revised translations DO NOT MERGE 
Merge commit 'ea86bcd12bed863ec6d5109ea84572f355c88609'

* commit 'ea86bcd12bed863ec6d5109ea84572f355c88609':
  Import revised translations DO NOT MERGE
 2010-10-18 10:32:46 -07:00
Roy West
dd49624ed0 Del "erase" from new unmount setting subtext 
Change-Id: I4beca53892d446578f36a7c32847465dcc7999f3
 2010-10-18 03:12:57 -07:00
Roy West
b7eb8cdad9 am 8abc40bb: Correct some typos, impose more consistency. 
Merge commit '8abc40bb11690125fa441775041e0a64c79acc43' into gingerbread-plus-aosp

* commit '8abc40bb11690125fa441775041e0a64c79acc43':
  Correct some typos, impose more consistency.
 2010-10-17 14:04:25 -07:00
Nick Pelly
e0b6d45386 am fb515337: am e1a9ca68: Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread 
Merge commit 'fb515337c2c8ceefe47b7387ebffa2b3185ef2ba'

* commit 'fb515337c2c8ceefe47b7387ebffa2b3185ef2ba':
  Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.
 2010-10-17 11:15:48 -07:00
Roy West
8abc40bb11 Correct some typos, impose more consistency. 
Change-Id: Id2532a8eb619c38a8c683e77ae449b740d7b9bda
 2010-10-17 09:19:34 -07:00
Dianne Hackborn
593a7049f5 am 1337d0f7: Implement issue #3094621 and #3094609 - wipe sd card 
Merge commit '1337d0f70b18dd732c6a617be83e5be0bb8f2f87' into gingerbread-plus-aosp

* commit '1337d0f70b18dd732c6a617be83e5be0bb8f2f87':
  Implement issue #3094621 and #3094609 - wipe sd card
 2010-10-16 16:55:30 -07:00
Dianne Hackborn
1337d0f70b Implement issue #3094621 and #3094609 - wipe sd card 
3094621: add "wipe sd card" option to factory data reset
3094609: collapse unmount/format into one command

Implements requested UI changes.  Also some final tweaks to
Manage Applications.

Change-Id: I0219195dd0c74d8c003ef1c3f6e09714859d7f89
 2010-10-16 16:27:25 -07:00
Amith Yamasani
346ca43eeb am 8de45a66: am 1bdb7874: Make summary appear for both checked and unchecked NFC checkbox in Settings. 
Merge commit '8de45a6686b298d09c5195e332f202223a555b91'

* commit '8de45a6686b298d09c5195e332f202223a555b91':
  Make summary appear for both checked and unchecked NFC checkbox in Settings.
 2010-10-16 09:43:15 -07:00
Roy West
38f0481c21 am d3c1749b: am 2c489973: Change USB tab to USB storage if it fits 
Merge commit 'd3c1749b779397612f82e347bb0d886b1d9a35bc'

* commit 'd3c1749b779397612f82e347bb0d886b1d9a35bc':
  Change USB tab to USB storage if it fits
 2010-10-16 09:13:43 -07:00
Roy West
a054d533af am cfcad4e4: am d3abea0d: Fix a few more cases of USB storage missed at 4am pass... 
Merge commit 'cfcad4e45f422606b5ce5e09a6e53ba58e790f63'

* commit 'cfcad4e45f422606b5ce5e09a6e53ba58e790f63':
  Fix a few more cases of USB storage missed at 4am pass...
 2010-10-16 08:59:43 -07:00
Jaikumar Ganesh
cf7ef7cbd6 am 7805fa99: am 022299df: Merge "Disconnect dock only if its connected." into gingerbread 
Merge commit '7805fa99ffce21bb9b016ffdd5375d331b9a8a54'

* commit '7805fa99ffce21bb9b016ffdd5375d331b9a8a54':
  Disconnect dock only if its connected.
 2010-10-16 08:52:36 -07:00
Kenny Root
ea86bcd12b am 3594b1b7: Import revised translations DO NOT MERGE 
Merge commit '3594b1b73d022d5815bcdef78e6143cfd63ee354' into gingerbread-plus-aosp

* commit '3594b1b73d022d5815bcdef78e6143cfd63ee354':
  Import revised translations DO NOT MERGE
 2010-10-15 18:41:47 -07:00
Nick Pelly
fb515337c2 am e1a9ca68: Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread 
Merge commit 'e1a9ca686249ebe7c85a98d467bb705e4c3eed2f' into gingerbread-plus-aosp

* commit 'e1a9ca686249ebe7c85a98d467bb705e4c3eed2f':
  Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.
 2010-10-15 18:21:06 -07:00
Kenny Root
d8fff3dc92 am c915d16a: (-s ours) am b5848295: Merge "Import revised translations" into gingerbread 
Merge commit 'c915d16a909cdb69b8de2fa957a388025f022de7'

* commit 'c915d16a909cdb69b8de2fa957a388025f022de7':
  Import revised translations
 2010-10-15 16:49:33 -07:00
Kenny Root
3594b1b73d Import revised translations DO NOT MERGE 
Change-Id: I04e726f28a0ee4b249618c5e485d480ba6f340a9
 2010-10-15 15:24:57 -07:00
Kenny Root
987e8a615a Merge "resolved conflicts for merge of 2a612605 to master" 2010-10-15 14:22:24 -07:00
Kenny Root
4965e889cf resolved conflicts for merge of 2a612605 to master 
Change-Id: Ia897f03502ea1529b6d8475183b01abff9b795be
 2010-10-15 14:22:09 -07:00
Jim Miller
bd8e697338 Fix 3100926: Prevent proguard from stripping OwnerInfo 
This just renames OwnerInfo to OwnerInfoSettings so the existing
proguard rule picks it up.

Change-Id: Ie5682d77e8efe22a922bf750d4689cafd50e7a65
 2010-10-15 12:42:00 -07:00
Nick Pelly
e1a9ca6862 Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread 2010-10-15 10:56:05 -07:00
Amith Yamasani
8de45a6686 am 1bdb7874: Make summary appear for both checked and unchecked NFC checkbox in Settings. 
Merge commit '1bdb7874adf52b0fc2fe6ec40913a0562cf585ed' into gingerbread-plus-aosp

* commit '1bdb7874adf52b0fc2fe6ec40913a0562cf585ed':
  Make summary appear for both checked and unchecked NFC checkbox in Settings.
 2010-10-15 10:06:18 -07:00
Amith Yamasani
1bdb7874ad Make summary appear for both checked and unchecked NFC checkbox in Settings. 
And remove the extra "Tag" in the summary.

Bug: 3083079
Change-Id: I998c2556a88180098a060d43b720276a7619a368
 2010-10-15 10:00:40 -07:00
Jake Hamby
6d3aa67bda am 8028cea1: (-s ours) am 8021537f: BT settings wait for HS service before connect. DO NOT MERGE 
Merge commit '8028cea196968a4744ac4b095f6fe6bc32467375'

* commit '8028cea196968a4744ac4b095f6fe6bc32467375':
  BT settings wait for HS service before connect.  DO NOT MERGE
 2010-10-15 09:11:05 -07:00
Roy West
d3c1749b77 am 2c489973: Change USB tab to USB storage if it fits 
Merge commit '2c4899737be92b858a9e2d9d743709cae310149b' into gingerbread-plus-aosp

* commit '2c4899737be92b858a9e2d9d743709cae310149b':
  Change USB tab to USB storage if it fits
 2010-10-15 08:54:08 -07:00
Nick Pelly
a3757ca27a am da08f31f: am 792d4356: Merge "Move NFC setting lower down the Setting\'s list." into gingerbread 
Merge commit 'da08f31f791f77be6d0fa2aa67096c3f6e1d8a1c'

* commit 'da08f31f791f77be6d0fa2aa67096c3f6e1d8a1c':
  Move NFC setting lower down the Setting's list.
 2010-10-15 08:31:26 -07:00
Roy West
2c4899737b Change USB tab to USB storage if it fits 
Change-Id: I7d0c5388b2673e5f513d05700f4f10650cf1a2b5
 2010-10-15 05:18:04 -07:00
Nick Pelly
a57eacef3c Use NfcAdapter.getDefaultAdapter() to check for NFC prescence. 
Change-Id: I518389a317a4e9ab9009fd33330a91f7c35edc2a
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-10-15 02:15:27 -07:00
Dianne Hackborn
0ceae1cbdc Merge "Turn on hardware acceleration of rendering." 2010-10-15 01:08:37 -07:00
Jaikumar Ganesh
0d711637a2 am 836b4297: (-s ours) am 03403712: Merge "DO NOT MERGE Add null check before disconnecting a device." into gingerbread 
Merge commit '836b4297ccde47ae6356b2a805394d3285368144'

* commit '836b4297ccde47ae6356b2a805394d3285368144':
  DO NOT MERGE Add null check before disconnecting a device.
 2010-10-15 00:06:02 -07:00
Nick Pelly
38964d8937 am f4e4319f: am 083310d3: Update NFC settings description, and fix polarity. 
Merge commit 'f4e4319f4162c5dca14a9acc00bb5a2df0e452b3'

* commit 'f4e4319f4162c5dca14a9acc00bb5a2df0e452b3':
  Update NFC settings description, and fix polarity.
 2010-10-14 22:14:34 -07:00
Jaikumar Ganesh
c0a2044b9a am 0d5e320c: am bdf13107: Merge "Call disconnect / connect without checking the current status" into gingerbread 
Merge commit '0d5e320cdd9cbd76012c0a1aec157e358d05891e'

* commit '0d5e320cdd9cbd76012c0a1aec157e358d05891e':
  Call disconnect / connect without checking the current status
 2010-10-14 19:30:08 -07:00
Nick Pelly
2f54a66abd am b3c4365d: am cd99332f: Merge "Update settings app for new NFC API." into gingerbread 
Merge commit 'b3c4365d10047eae367b529d98d5a90d052f6393'

* commit 'b3c4365d10047eae367b529d98d5a90d052f6393':
  Update settings app for new NFC API.
 2010-10-14 19:29:44 -07:00
Roy West
cfcad4e45f am d3abea0d: Fix a few more cases of USB storage missed at 4am pass... 
Merge commit 'd3abea0d70648e77e694780b7e139b0ed36ba483' into gingerbread-plus-aosp

* commit 'd3abea0d70648e77e694780b7e139b0ed36ba483':
  Fix a few more cases of USB storage missed at 4am pass...
 2010-10-14 18:26:01 -07:00
Dianne Hackborn
33b316ee67 Turn on hardware acceleration of rendering. 
Change-Id: Iaa6de77738e097138d33d9d4c9e60eb471680d69
 2010-10-14 17:38:48 -07:00
Roy West
d3abea0d70 Fix a few more cases of USB storage missed at 4am pass... 
Change-Id: Ia955d4378f4f9003a659763d88312ea7d42b4a3c
 2010-10-14 15:59:33 -07:00
Jim Miller
9d36ab531b Merge "Fix 3024528: Initial implementation of owner info to enable dogfooding" 2010-10-14 15:55:04 -07:00
Jim Miller
edfaaeaed7 Fix 3024528: Initial implementation of owner info to enable dogfooding 
This is a quick UI implementation to allow owner info to be changed
on LockScreen for dogfooding.

Change-Id: I0dc781def594d1c921c44348c130f509798a71f4
 2010-10-14 15:50:15 -07:00
Jaikumar Ganesh
7805fa99ff am 022299df: Merge "Disconnect dock only if its connected." into gingerbread 
Merge commit '022299dfce6a705a8cbaff972a4309da6e90a8c2' into gingerbread-plus-aosp

* commit '022299dfce6a705a8cbaff972a4309da6e90a8c2':
  Disconnect dock only if its connected.
 2010-10-14 15:33:42 -07:00
Jaikumar Ganesh
022299dfce Merge "Disconnect dock only if its connected." into gingerbread 2010-10-14 15:30:55 -07:00
Jaikumar Ganesh
9d03e98d22 Disconnect dock only if its connected. 
Scenario: BT is off, device is paired with the desk dock.
Media is switched off. So when the user docks, it was trying to
disconnect even when BT was off and hence DBUS was crashing.

Bug: 3097224

Change-Id: I13e1dd4459c47d5ba9a403f2ae1cc8a131f02a08
 2010-10-14 15:09:57 -07:00
Kenny Root
c915d16a90 am b5848295: Merge "Import revised translations" into gingerbread 
Merge commit 'b5848295b346df619999458ad55ba8ce1f88bf4f' into gingerbread-plus-aosp

* commit 'b5848295b346df619999458ad55ba8ce1f88bf4f':
  Import revised translations
 2010-10-14 14:24:49 -07:00
Kenny Root
b5848295b3 Merge "Import revised translations" into gingerbread 2010-10-14 14:16:47 -07:00
Roy West
2a612605f5 am 825db2da: Update storage names to 10-13 decision; add USB erase nugget 
Merge commit '825db2da053598d36b5021b3468c7d599ee96a7c' into gingerbread-plus-aosp

* commit '825db2da053598d36b5021b3468c7d599ee96a7c':
  Update storage names to 10-13 decision; add USB erase nugget
 2010-10-14 12:03:12 -07:00
Irfan Sheriff
213494fa24 limit max length of ssid and password 
Bug: 2675734
Change-Id: I58bc6b095c3d03fd06e3768b23c32718dd964516
Signed-off-by: jmzhu <jmzhu@marvell.com>
 2010-10-14 11:42:12 -07:00
Kenny Root
4f6196a03d Import revised translations 
Change-Id: I1902e768bde862ab73e3ddd806bb778c2b1098de
 2010-10-14 09:46:33 -07:00