Commit Graph

1104 Commits

Author SHA1 Message Date
Dianne Hackborn
ee2937941d Further manage apps fragmentization.
All of the UI under manage apps should now be working.  Various
cleanup through new framework APIs.  Fragmentized developer settings.

Change-Id: I2b42a2dd0d015e0fdcde497579ddad3dceea9da2
2010-11-01 14:48:22 -07:00
satok
0417e40947 Move classes related to input method to com.android.settings.inputmethod
- Updated proguard.flags

Change-Id: I198761b0f0ad5288c8c807a7a3c2e965731fcee5
2010-11-01 19:07:44 +09:00
Dianne Hackborn
3c672b4254 Merge "Start fragmentizing Manage Applications." 2010-10-29 18:24:24 -07:00
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
Dianne Hackborn
f4eb85bc3c Start fragmentizing Manage Applications.
Change-Id: I0c3d6a358d0236893aba7257537ec32bfad4170d
2010-10-29 17:48:26 -07:00
Daisuke Miyakawa
58524fc53d Merge "Fix layout for WifiSettingsForXL" 2010-10-29 16:04:43 -07:00
Daisuke Miyakawa
150d4aaef1 Fix layout for WifiSettingsForXL
Change-Id: I99b503005d199084062b63a2de1e049926b212a9
2010-10-29 16:03:23 -07:00
Amith Yamasani
99d71d5718 Remove extra labels from Volume settings.
Bug: 3013561
2010-10-29 10:27:26 -07:00
Amith Yamasani
281a6b67a3 Merge "Bluetooth settings revamp" 2010-10-27 16:27:15 -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
Eric Fischer
9446b7fe50 Import revised translations.
Change-Id: I0d19c79e3e0ac76527671d181bb77e8944ec4a5f
2010-10-27 14:36:03 -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
Eric Fischer
c26cfa35b8 am 873a27c3: Import revised translations. DO NOT MERGE
Merge commit '873a27c399a50cb2a4703cc895c1601124ae208d' into gingerbread-plus-aosp

* commit '873a27c399a50cb2a4703cc895c1601124ae208d':
  Import revised translations.  DO NOT MERGE
2010-10-25 16:16:14 -07:00
Eric Fischer
873a27c399 Import revised translations. DO NOT MERGE
Change-Id: I0cb51009ba4b9954dd673d7f653f0e0b8376ca72
2010-10-25 15:46:11 -07:00
Roy West
1e8d29868d Fix bug3100739 re dev admin settings strings
Change-Id: Ica5cc926fb8a3ec3af9d4925f086ded0ac683c3a
2010-10-25 07:33:41 -07:00
Eric Fischer
0b655575d9 am 901f4fbe: Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-22 16:03:49 -07:00
Eric Fischer
901f4fbe29 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-22 16:01:29 -07:00
Eric Fischer
e6d4ba594c Import revised translations. DO NOT MERGE
Change-Id: I3edc02925b4d8bc149dd8a76056f86f3b5130e4e
2010-10-22 15:31:13 -07:00
Dianne Hackborn
2d968c6d84 am 8731cb1b: am 5e34f239: Fix issue #3124528: Mange applications is including cache files in storage size 2010-10-22 13:01:02 -07:00
Dianne Hackborn
8731cb1b6a am 5e34f239: Fix issue #3124528: Mange applications is including cache files in storage size 2010-10-22 12:59:31 -07:00
Dianne Hackborn
5e34f23986 Fix issue #3124528: Mange applications is including cache files in storage size
Change-Id: If26aeaed7572354feca7b8e65b7451a024a10266
2010-10-22 12:18:16 -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
Dianne Hackborn
50ee821003 am 149fec6a: am 7a519955: Merge "Fix issue #3114356: Storage visualization in Manage Apps is confusing" into gingerbread
Merge commit '149fec6a899079eba30743e7055834969c138d52'

* commit '149fec6a899079eba30743e7055834969c138d52':
  Fix issue #3114356: Storage visualization in Manage Apps is confusing
2010-10-21 13:47:00 -07:00
Dianne Hackborn
149fec6a89 am 7a519955: Merge "Fix issue #3114356: Storage visualization in Manage Apps is confusing" into gingerbread
Merge commit '7a51995581128a9ade44682abe064d9fcca79aa6' into gingerbread-plus-aosp

* commit '7a51995581128a9ade44682abe064d9fcca79aa6':
  Fix issue #3114356: Storage visualization in Manage Apps is confusing
2010-10-20 17:05:19 -07:00
Dianne Hackborn
d2be882d8f Fix issue #3114356: Storage visualization in Manage Apps is confusing
Also fixes issue #3097388: If you launch Manage Applications when SD
card app info isn't available, incomplete information gets cached

Change-Id: If3377a965653590e5bc1df25e38764a83e96b820
2010-10-20 16:54:41 -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
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