Commit Graph

569 Commits

Author SHA1 Message Date
Daisuke Miyakawa
1dc3715e3a Reduce default settings in WifiSetup XL.
We don't want to show every configurations in default, while
we also don't want to complicate basic wifi logics. In order to
achive both goals, we first introduce tweaked xml file
(wifi_config_preference2.xml). It does contain all the
config components but almost all of them are in "gone" visibility.
Those components are still able to act as data storage, but never
be seen as actual UI components.

Change-Id: I4ad3c1b4cbbe77ca2b628b0be25e2b3eb9d645aa
2010-10-29 18:00:36 -07:00
Amith Yamasani
48e9000283 Bluetooth settings revamp
Added a separate scanning screen.
UI changes to not require long-press options.
Needs TODOs to be filled by BT team.

Bug: 3038327
2010-10-27 16:23:05 -07:00
satok
4a5f889f80 Copy InputMethodSubtypeEnabler from the framework
- TODO: remove InputMethodSubtypeEnabler from the framework

Change-Id: I751f3c73197c855c7f186ff64465d88ed1e2b603
2010-10-27 15:27:12 +09:00
Irfan Sheriff
e45e13f47a UI for wps pin from device
Bug: 3119043
Bug: 3112178
Change-Id: I573146ed0c834cb88d5f42c25fe0be3ed501a321
2010-10-26 09:58:58 -07:00
Roy West
1e8d29868d Fix bug3100739 re dev admin settings strings
Change-Id: Ica5cc926fb8a3ec3af9d4925f086ded0ac683c3a
2010-10-25 07:33:41 -07:00
Mathew Inwood
f8b25796f0 Add 'Use My Location for Google services'.
This interfaces to GSF to actually change the setting as Settings doesn't
have the permissions to do it directly. When GSF is not present on the device,
the setting will be hidden.

Depending on change: Ib3809571fe22f40ba34468d39fedfff70f0742ef
Bug: 3093036

Change-Id: I98596cce118f0fa5ebae45a7f8ab9c9f8a3bf2bc
2010-10-22 12:24:02 +01:00
Eric Fischer
d947937f4d resolved conflicts for merge of 92acdba0 to master
Change-Id: I3598e15091fdb2593a2d9d56f6bf646ddc87e879
2010-10-21 18:31:02 -07:00
Eric Fischer
92acdba01c am a640fb4f: Fix the build. A "--" token is not just text in an XML comment.
Merge commit 'a640fb4f97ee5e317ed51bd585c892d465b3da38' into gingerbread-plus-aosp

* commit 'a640fb4f97ee5e317ed51bd585c892d465b3da38':
  Fix the build.  A "--" token is not just text in an XML comment.
2010-10-21 18:22:09 -07:00
Eric Fischer
a640fb4f97 Fix the build. A "--" token is not just text in an XML comment.
Change-Id: Ifbc3de1dd209860f516920e5b9c1742813845380
2010-10-21 18:15:34 -07:00
Roy West
d2927990ff am 69827524: Try to fix bug3119318 without breaking the build this time
Merge commit '69827524365ae448d19b2089c46534e925cc2bfd' into gingerbread-plus-aosp

* commit '69827524365ae448d19b2089c46534e925cc2bfd':
  Try to fix bug3119318 without breaking the build this time
2010-10-21 17:53:37 -07:00
Roy West
6982752436 Try to fix bug3119318 without breaking the build this time
Change-Id: Ic89675546f3ab72588ce18fbe7740749da6f870c
2010-10-21 17:42:44 -07:00
Mathias Agopian
340db2bafa am 9f869d11: Revert "Fix bug3119318, missing Mount USB storage strings"
Merge commit '9f869d1198fcf1866ad2a6451df05f5d72653711' into gingerbread-plus-aosp

* commit '9f869d1198fcf1866ad2a6451df05f5d72653711':
  Revert "Fix bug3119318, missing Mount USB storage strings"
2010-10-21 17:07:11 -07:00
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