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

1167 Commits

Author SHA1 Message Date
Daisuke Miyakawa
c05efc1df7 UI refresh 
Bug: 3110575
Change-Id: Ia6ffef6de8882920b89372052b5e29968bedfe5f
 2010-10-19 10:12:50 -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
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
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
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
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
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
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
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
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
da08f31f79 am 792d4356: Merge "Move NFC setting lower down the Setting\'s list." into gingerbread 
Merge commit '792d43560bdbf2f9982eb918cd841672ecfcf9de' into gingerbread-plus-aosp

* commit '792d43560bdbf2f9982eb918cd841672ecfcf9de':
  Move NFC setting lower down the Setting's list.
 2010-10-13 14:23:05 -07:00
Nick Pelly
72ce892dd9 Move NFC setting lower down the Setting's list. 
Change-Id: I585d060a5b65df05d62c2bf156f5af76b3bf60e0
 2010-10-13 12:22:37 -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
Irfan Sheriff
8b324d9957 am 52ad3f2f: am 566b5bb0: Improve password hint visibility 
Merge commit '52ad3f2f6c7da700b135b1d2e1fc7f507e4f2bf2'

* commit '52ad3f2f6c7da700b135b1d2e1fc7f507e4f2bf2':
  Improve password hint visibility
 2010-10-12 09:49:14 -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
Irfan Sheriff
52ad3f2f6c am 566b5bb0: Improve password hint visibility 
Merge commit '566b5bb0f91224069bbc98ea7042d22c8929aa59' into gingerbread-plus-aosp

* commit '566b5bb0f91224069bbc98ea7042d22c8929aa59':
  Improve password hint visibility
 2010-10-11 10:30:17 -07:00
Irfan Sheriff
566b5bb0f9 Improve password hint visibility 
Bug: 3083095
Change-Id: I9fcf9d529c598ad75dd438ef0e7a896c6568cbab
 2010-10-11 10:26:14 -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