PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,261 Commits 1 Branch 0 Tags
b0d54ca66083e945d0b51a3801e36873dd24c466
Commit Graph

3957 Commits

Author SHA1 Message Date
Mathias Agopian
9f869d1198 Revert "Fix bug3119318, missing Mount USB storage strings" 
This reverts commit af06d7a94a.
 2010-10-21 16:37:59 -07:00
Roy West
c1267a9883 am af06d7a9: Fix bug3119318, missing Mount USB storage strings 
Merge commit 'af06d7a94a69d82ef5f2d8082e75c368f4204afb' into gingerbread-plus-aosp

* commit 'af06d7a94a69d82ef5f2d8082e75c368f4204afb':
  Fix bug3119318, missing Mount USB storage strings
 2010-10-21 15:57:35 -07:00
Roy West
af06d7a94a Fix bug3119318, missing Mount USB storage strings 
Change-Id: Iefebd97d85ad4a51f604e9a7fa709ba84c94239d
 2010-10-21 15:47:14 -07:00
Jean-Baptiste Queru
c4ddcbd347 Fix build 
This was causing a resource conflict in open-source crespo builds

Change-Id: I7b683d735c851b830fdbab90c78096736ca4f5dd
 2010-10-19 16:49:14 -07:00
Brad Fitzpatrick
4453ecaca4 am 17001cea: NFC: async enabling/disabling, ala Bluewooth & Wifi. 
Merge commit '17001cea9e198228c55111871518ebdf710f8544'

* commit '17001cea9e198228c55111871518ebdf710f8544':
  NFC: async enabling/disabling, ala Bluewooth & Wifi.
 2010-10-19 10:43:38 -07:00
Roy West
cfcb55d3f5 resolved conflicts for merge of 98f3aff3 to master 
Change-Id: Icfc107998728e8571cf1e887027ab0067f3d40f8
 2010-10-18 19:57:59 -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
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
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
Kenny Root
4965e889cf resolved conflicts for merge of 2a612605 to master 
Change-Id: Ia897f03502ea1529b6d8475183b01abff9b795be
 2010-10-15 14:22:09 -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
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
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
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
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
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
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
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
Roy West
825db2da05 Update storage names to 10-13 decision; add USB erase nugget 
Change-Id: I9df5e217a9f6f4b26fea6d1ed865e359833e53ce
 2010-10-14 05:07:45 -07:00
Roy West
9c8732896c am f233ec77: am 30186392: With luck, final take on bug3076083, re back up settting 
Merge commit 'f233ec77eb359aebd0276a27b09c0abe8e0f67ea'

* commit 'f233ec77eb359aebd0276a27b09c0abe8e0f67ea':
  With luck, final take on bug3076083, re back up settting
 2010-10-13 15:58:36 -07:00
Nick Pelly
f4e4319f41 am 083310d3: Update NFC settings description, and fix polarity. 
Merge commit '083310d316059c6592120c32e1c0b736e85b83c0' into gingerbread-plus-aosp

* commit '083310d316059c6592120c32e1c0b736e85b83c0':
  Update NFC settings description, and fix polarity.
 2010-10-12 21:27:48 -07:00
Nick Pelly
083310d316 Update NFC settings description, and fix polarity. 
Change-Id: I0d45652113617230e04536a7cc2ff148dd52595a
 2010-10-12 21:22:54 -07:00
Jean-Baptiste Queru
ac3af83f69 am 80455f36: am b84291bb: Merge "Support showing "Cold" battery health." 
Merge commit '80455f367f968f64037dd32b3857891c9681664b'

* commit '80455f367f968f64037dd32b3857891c9681664b':
  Support showing "Cold" battery health.
 2010-10-11 17:49:52 -07:00
Roy West
f233ec77eb am 30186392: With luck, final take on bug3076083, re back up settting 
Merge commit '3018639200a3f04d274166e26c98307ab07fc3b9' into gingerbread-plus-aosp

* commit '3018639200a3f04d274166e26c98307ab07fc3b9':
  With luck, final take on bug3076083, re back up settting
 2010-10-11 17:39:34 -07:00
Roy West
3018639200 With luck, final take on bug3076083, re back up settting 
Change-Id: I236854b4f5d679bd1581d80baba2bd43af7313eb
 2010-10-11 17:34:27 -07:00
Roy West
f0fa3dff71 am 81635077: am effdd53f: Fix bug3076083 re backup setting strings 
Merge commit '816350778ad2da0024cbd5d1838ecbcea8f018be'

* commit '816350778ad2da0024cbd5d1838ecbcea8f018be':
  Fix bug3076083 re backup setting strings
 2010-10-11 10:03:48 -07:00
Jean-Baptiste Queru
80455f367f am b84291bb: Merge "Support showing "Cold" battery health." 
Merge commit 'b84291bbecb1ab8141cf8f56fd3d1523e5c707a6' into gingerbread-plus-aosp

* commit 'b84291bbecb1ab8141cf8f56fd3d1523e5c707a6':
  Support showing "Cold" battery health.
 2010-10-10 17:50:41 -07:00
Jean-Baptiste Queru
abe9ac919c resolved conflicts for merge of 10ebf928 to master 
Change-Id: I7da3cff9619aa6ecdc860a24d65b5ca9f0b898bc
 2010-10-10 09:05:02 -07:00
Roy West
effdd53ff8 Fix bug3076083 re backup setting strings 
Change-Id: I01939082d8179d28872a3367eb1691738595cb71
 2010-10-09 09:40:23 -07:00
Irfan Sheriff
34ce343004 Use LinkProperties in WifiSettings UI 
Change-Id: I6f59328173e9550a2822573a9b25517ebbec4024
 2010-10-08 14:00:21 -07:00
Roy West
82d2908b2e do not merge 
Change-Id: I97a2717227f18ab0c1a2688be65f444ef9d40521
 2010-10-07 15:15:45 -07:00
Roy West
e3b0bda234 do not merge 
Change-Id: I722fd2d58d6532b8fc241ada8e52a731b438f1b6
 2010-10-07 08:34:41 -07:00
Dianne Hackborn
b8f9c9cf7c Add confirmation when stopping system service, as per rwest. 
Change-Id: I1cca31a87d3acfc49ffb4562d922d4577c0b1cba
 2010-10-06 17:09:54 -07:00
Irfan Sheriff
c5361927f4 Add proxy UI for wifi 
bug: 3039302
Change-Id: I6fee69992ea78459f06ef270af5bf857eff93c44
 2010-10-06 10:40:44 -07:00
Eric Fischer
4e6466f5ef am 25c52b70: am 340c5c42: Separate the Settings activity name into two different strings. 
Merge commit '25c52b70faceb24cade0f5480c372de3f47bdf79'

* commit '25c52b70faceb24cade0f5480c372de3f47bdf79':
  Separate the Settings activity name into two different strings.
 2010-10-01 12:06:18 -07:00
Eric Fischer
340c5c4237 Separate the Settings activity name into two different strings. 
The German translators would like to be able to hyphenate the name
shown in the Launcher but to keep the name shown within the activity
as a single word.

Change-Id: I22402c41186fdcdaed2712933ddf0f215b3a3329
 2010-10-01 11:45:47 -07:00
Ken Wakasa
3cd9ddda0a am bc692e83: am 2d6c0b0d: Update strings for physical keyboard settings. 
Merge commit 'bc692e83c4b3bcd6c782935bcd1aff50d23143d0'

* commit 'bc692e83c4b3bcd6c782935bcd1aff50d23143d0':
  Update strings for physical keyboard settings.
 2010-09-30 11:29:31 -07:00
Eric Fischer
9fc1f468f4 resolved conflicts for merge of cf18672a to master 
Change-Id: I87a7ef635166f4f90205a4117cbdec8447471af1
 2010-09-30 10:56:10 -07:00
Ken Wakasa
2d6c0b0d77 Update strings for physical keyboard settings. 
bug: 2954950
Change-Id: I023de6dbe191ca6525cec51147a916eb746fb3e7
 2010-09-30 12:52:52 +09:00