Commit Graph

237 Commits

Author SHA1 Message Date
Nick Pelly
72ce892dd9 Move NFC setting lower down the Setting's list.
Change-Id: I585d060a5b65df05d62c2bf156f5af76b3bf60e0
2010-10-13 12:22:37 -07:00
Adam Lesinski
e684399717 Added widget preview image. NOTE: This image should be replaced by a custom graphic.
Change-Id: Ia8abd993b399a9fed567266f699874baa67a09f9
2010-10-04 16:40:29 -07:00
Ken Wakasa
6d5b8951b1 Merge commit '47ad0cf3' into manualmerge
Conflicts:
	res/xml/language_settings.xml
	src/com/android/settings/LanguageSettings.java

Change-Id: I0dbfd4ee51682e2b55cad0af1caa90bbedd598a2
2010-09-30 11:54:31 +09:00
Nick Pelly
d83aaf28bc resolved conflicts for merge of 1ff9ad3f to master
Change-Id: I55137a241e13ec7da1d413cf9b7fd1c1fdd8c4d1
2010-09-29 12:10:35 -07:00
Ken Wakasa
47ad0cf3bc am d2c3f37f: Revise the Language & keyboard settings layout.
Merge commit 'd2c3f37fa445130c8cce0f16347d61f66b4b0025' into gingerbread-plus-aosp

* commit 'd2c3f37fa445130c8cce0f16347d61f66b4b0025':
  Revise the Language & keyboard settings layout.
2010-09-29 09:58:01 -07:00
Ken Wakasa
d2c3f37fa4 Revise the Language & keyboard settings layout.
bug: 2954950
Change-Id: Ie5815023654c3ee45f73fb6ec08266b11e7ff017
2010-09-29 23:52:02 +09:00
David Pettersson
4c8c96a4f5 Changed the text input type of APN name to plain text
Changed the input type of the APN name text field
from email adress to plain text to facilitate the
input method choosing input after locale and not
restricting the input to latin characters. There is
no reason to restrict the APN name to latin
characters only.

Change-Id: Ib85fa980407a67112fd91e744b0dc0632d5c907e
2010-09-29 09:47:00 +02:00
Nick Pelly
1ff9ad3fb4 am 48ad5dfe: Merge "Add NFC checkbox to Settings app." into gingerbread
Merge commit '48ad5dfe3189534cc3c9b8cb6f84758db19524c4' into gingerbread-plus-aosp

* commit '48ad5dfe3189534cc3c9b8cb6f84758db19524c4':
  Add NFC checkbox to Settings app.
2010-09-28 22:34:42 -07:00
Nick Pelly
ad50ba065d Add NFC checkbox to Settings app.
Based on Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)

Heavily modified to remove dead code.

Change-Id: I9e5f0bf2d32105feff4d68f03adebe87d2e9d900
2010-09-28 21:26:50 -07:00
Amith Yamasani
1bb6db5267 Add an Automatic Time Zone setting to Date & Time settings.
User can now enable auto-time but disable auto-timezone, especially
if we don't have NITZ time from the cell network (or wifi only)
and only have NTP time that gives us date and time.
2010-09-22 11:33:04 -07:00
Amith Yamasani
02cf71a591 Use PreferenceActivity and FragmentBreadCrumbs as they offer the same capabilities now.
Also fix: 2997438 and a similar bug in Tether Settings
Show + menu item for User Dictionary
2010-09-21 15:48:52 -07:00
Bjorn Bringert
e2b102de67 am 28580b4d: Remove Search from the system Settings app DO NOT MERGE
Merge commit '28580b4d9a36bb15e75423bc95747b9a746ea8b9' into gingerbread-plus-aosp

* commit '28580b4d9a36bb15e75423bc95747b9a746ea8b9':
  Remove Search from the system Settings app DO NOT MERGE
2010-09-21 03:05:25 -07:00
Bjorn Bringert
28580b4d9a Remove Search from the system Settings app DO NOT MERGE
The search settings acitivity lives in the system search app,
which is build-dependent. Also, since the Browser no longer
looks at the SHOW_WEB_SUGGESTIONS system preference, none
of the search settings affect the behavior of any other
platform apps.

The search settings will henceforth only be
available from within the search app (e.g. QuickSearchBox).

This is a cherry-pick of change I08f3979cd8cdc0742efbc49be95aa59753c94c0d
to gingerbread.

Bug: 3017365
Change-Id: I55df30e3a0e1f307ad6f23900f54d3018efda59f
2010-09-21 10:51:45 +01:00
Daisuke Miyakawa
a2633d0232 Move ManageAccountsSettings into Settings.
- Add activity-alias for the Activity.
- Copy the Activity from AccountsAndSyncSettings.
- Fragmentize ManageAccountsSettings.
- Remove dependency toward AccountPreferenceBase, which is
  used in AccountsAndSyncSettings widely.
- Add missing implementation derived from AccountPrefernceBase.
- Copy dependent drawables.
- Copy dependent xmls
- Copy AccountPrefernce.java.
- Copy strings, adding CHAR LIMIT.
- Remove the logic which remove the preference when its destination
  Activity is missing. We already have the destination as
  Fragment, and it never disappear.

Change-Id: Id41c63d7064aebeaae31bcd84bf4fd20a5636dfe
2010-09-17 11:22:02 -07:00
Daisuke Miyakawa
3b2afb04f4 Merge "Fragmentize VoiceOutputSettings." 2010-09-17 11:05:31 -07:00
Svetoslav Ganov
3d64653d1f WebView accessibility support - Adding opt-in setting for enabling accessibility script injection from Google
Change-Id: I1676f34c30a0e9414d51060ad4fb2c9c502b09c3
2010-09-16 12:45:19 -07:00
Daisuke Miyakawa
49a305ec54 Fragmentize VoiceOutputSettings.
Change-Id: Ifc8f9a8169cf43f53dc122342d95eac6058e6c88
2010-09-16 10:37:28 -07:00
Daisuke Miyakawa
b5647c5720 Fragmentize VpnSettings and relevant Activities.
Add startFragment() to SettingsFragmentPreference.

Change-Id: Ifab93b2e68892d5f6da559f337c94d62629780c8
2010-09-15 16:48:25 -07:00
Irfan Sheriff
f027ce5e02 Add static IP UI
Remove the existing UI and add per network static IP config option

Change-Id: I9b8636e1559de9691144fdb54e20d40985896650
2010-09-14 17:02:21 -07:00
Daisuke Miyakawa
6ebf8619d7 Fragmentize BluetoothSettings.
Add UserLeaveHintListener.java, so that the settings won't use
its implementation around Activity#onUserLeaveHint().

Also fragmentize bluetooth tethering screen.

Change-Id: Id06ae3161fbdb5854ddb7a257f464fb16ea9b089
2010-09-13 16:18:05 -07:00
Daisuke Miyakawa
f58090d522 Fragmentize UserDictionary.
Depending on I2c962726b0adc8811c18dd6df7ff7bdc93c31a07, which
implements DialogCreatable.

Change-Id: I9857e592218731bfbddc578c15180cc681fa4d20
2010-09-13 15:46:28 -07:00
Daisuke Miyakawa
21c1abcef7 Fragmentize ProxySettings.
Change-Id: I2c962726b0adc8811c18dd6df7ff7bdc93c31a07
2010-09-12 17:43:10 -07:00
Amith Yamasani
60133dd036 Conditionally remove settings that aren't required on the tablet.
Bug: 2985267

Changes not done : SD card related stuff, as we need some way still
to figure out if there is a real SD card in the device.

Change-Id: I21c41f18ebe6c050981918481a7f6d69f04b65d0
2010-09-11 14:58:01 -07:00
Daisuke Miyakawa
9c602c4789 Fragmentize TetherSettings and WifiApSettings.
PreferenceScreen for BT tethering isn't fragmentized yet.
We'll need to do so in the near future.

Change-Id: I5a84fecaf84d55b59b6efa8151f2549ad37ca5db
2010-09-10 12:07:58 -07:00
Daisuke Miyakawa
0f4f2f3a81 Fragmentize ZoneList, which is needed in DateTimeSettings refactoring.
- remove old ZonePicker and rename ZoneList to ZonePicker, as
  the name is really confusing (see LocalePicker)
- Make the new ZonePicker fragment.
- remove dependency toward "ZoneList" class.
-- AndroidManifest.xml does not allow the other components to
   access ZoneList directly, so it would be ok to remove without
   using activity-alias.
-- Noticed there is a significant code duplication between
   DateTimeSettings and DateTimeSettingsActivity. I'll work on it
   later.
- add DateTimeSettingsSetupWizardXL class, which is not used yet,
  but will be in the near future.
-- It is not recognized by AndroidManifest.xml

Change-Id: Id26152a3d560f9e0bd84afdf3e1c5101f0e166b4
2010-09-08 16:15:44 -07:00
Dianne Hackborn
d4ff0b7339 am 356102e3: am 02930093: Fix issue #2905454: Crash observed while accessing Battery history page on passion/GRG40
Merge commit '356102e39ae5997393ef82eee5f7f78b7ec4fdcb'

* commit '356102e39ae5997393ef82eee5f7f78b7ec4fdcb':
  Fix issue #2905454: Crash observed while accessing Battery history page on passion/GRG40
2010-09-02 19:04:11 -07:00
Dianne Hackborn
356102e39a am 02930093: Fix issue #2905454: Crash observed while accessing Battery history page on passion/GRG40
Merge commit '0293009389eb3a4e8a3f2d08060e864f53f3c532' into gingerbread-plus-aosp

* commit '0293009389eb3a4e8a3f2d08060e864f53f3c532':
  Fix issue #2905454: Crash observed while accessing Battery history page on passion/GRG40
2010-09-02 19:02:47 -07:00
Dianne Hackborn
0293009389 Fix issue #2905454: Crash observed while accessing Battery history page on passion/GRG40
Change-Id: Ifd08744d909c2d87e5cdf4eedcc5af1a86548e60
2010-09-02 18:19:02 -07:00
Jim Miller
86624a2154 Fix 2579224: Add a separate timeout for lockscreen vs display
This change adds a second timeout to the SecuritySettings page
separate from the standard display timeout.

Change-Id: I033a3578d876148bd723dee5d1a2531be5d6b51d
2010-09-01 19:53:25 -07:00
Daisuke Miyakawa
5cd60eb8aa Add modifications which should have been in the change
I520d690d3301837d32f91dad54a973a379ce1989

Change-Id: Iecca6b4fef2ec42a62273035b096ccedcea94d78
2010-09-01 19:38:23 -07:00
Daisuke Miyakawa
d36699282c Add Wifi Setup screen for Setup Wizard with XL size screen.
* Add WifiSettingsForSetupWizardXL as a new Activity
The activity has WifiSettings fragment in it. It also contains
several buttons, texts around the fragment.

* Making configuration UI part of Preference list.
In Wifi Setup for Setup Wizard XL, WifiSettings fragment lets
a UI for configuring access points shown inside a
PregerenceCategory object, while it has been shown as Dialog.

To achieve this action, WifiDialog is decomposed into two parts:
- WifiConfigUiBase (Mainly UI part)
- WifiConfigController (Mainly Wifi controller part)

All codes for wifi configuration in WifiDialog is now in
WifiConfigController, which is reused from
WifiConfigPreference.

* Misc stuff
- Remove AccessPoint#compareTo(). Instead,
  AccessPoint.AccessPointComparater should be used when needed.

Change-Id: I520d690d3301837d32f91dad54a973a379ce1989
2010-09-01 16:17:51 -07:00
Mike Lockwood
3d713b162e Add checkbox to enable PTP USB mode.
Change-Id: Icb139cc3d1077565fb8dbe9917d87c7337f59797
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-31 14:38:44 -04:00
Daisuke Miyakawa
0cc35e444b Make LocalePicker Fragment.
The logic calling selectFirst() is removed as
- There's no comment why it is needed.
- Actually SetupWizard gets stack as that forces users to see
  WirelessSettings in SetupWizard.

The other changes:
- Move back LocalePickerFragment to LocalePicker.
- Make <activity> for LocalePicker in AndroidManifest <activity-alias>
- Add a short comment about how getComponent(), which should be a key
  for understanding how top-level settings work.
- Modify LanguageSettings so that it corectly points LocalePicker as
  a fragment.

Change-Id: I78d356e40af896ba1aab72fba12c90467371c7b0
2010-08-29 19:54:59 -07:00
Daisuke Miyakawa
9c8bde576a Fragmentize WifiSettings.
- Add button bar feature toward SettingsPreferenceFragment,
  which has existed in PreferenceActivity and has been used
  (probably) only by Settings app.
- super.onActivityCreated() is not called at the beggining of
  WifiSettings#onActivityCreated(), the parent method assumes
  the child should have prepared PreferenceScreen, while
  WifiSettings cannot do until the parent Activity is ready.
- Call SetHasOptionMenu() should be called AFTER the parent
  Activity is ready. It is not documented, so it would be better
  to file another bug.
- Add exception to proguard...

Change-Id: Iebd27f0cb0abdbee9b4b1cc9b00f4bf127f7815d
2010-08-25 16:03:33 -07:00
Amith Yamasani
d79934731c Refactor settings top level activities to use fragments.
Added a base class SettingsPreferenceFragment from which the settings activities should
be derived so that they can behave like fragments. It contains some commonly called
utility methods and dialog conversion to DialogFragment.

Some of the top-level activities can be launched directly without the left pane.
Settings.java acts as a proxy activity that contains just that settings fragment without
the left pane.

There are still a lot of second and third level activities that need to be fragmentized.
This is just the first pass to test the 2-pane layout.
2010-08-18 22:59:33 -07:00
Danica Chang
32711b6752 bluetooth tethering
Change-Id: I8dfb1c85bb8b963d2937b8bc4a4c9f0cf641785d
2010-08-17 19:07:07 -07:00
Oscar Montemayor
05411893af Enabling users toset the Global Proxy from wireless settings.
Change-Id: Ie9b37e4c8e042fab738d2181878e93d7d2645834
2010-08-04 14:52:21 -07:00
Dianne Hackborn
26d349815d am 6fce81a6: am 508fedc4: Improvements to manage apps / running services:
Merge commit '6fce81a69d7c2891d31618016c8ddc7b08deaa03'

* commit '6fce81a69d7c2891d31618016c8ddc7b08deaa03':
  Improvements to manage apps / running services:
2010-07-28 17:46:32 -07:00
Dianne Hackborn
6fce81a69d am 508fedc4: Improvements to manage apps / running services:
Merge commit '508fedc4102790dcd7004e4962e2b540967b714b' into gingerbread-plus-aosp

* commit '508fedc4102790dcd7004e4962e2b540967b714b':
  Improvements to manage apps / running services:
2010-07-28 17:44:19 -07:00
Dianne Hackborn
508fedc410 Improvements to manage apps / running services:
- Running services now keeps a single data structure to make
  switching through the UI a lot faster.
- Display text when there are no apps.
- Fix deadlock.
- Add new preference entry to view manage apps for storage use.
- Etc.

Change-Id: I0f5babf407ed7e84169f59584ddcb6cd0e9d67d9
2010-07-28 17:41:08 -07:00
Irfan Sheriff
97bdc93a3b am 40686ee8: am 15fe0e47: Merge "Allow soft AP settings config before bring up" into gingerbread
Merge commit '40686ee81f95699d7a83ccb1ef1be52c0c746d4f'

* commit '40686ee81f95699d7a83ccb1ef1be52c0c746d4f':
  Allow soft AP settings config before bring up
2010-06-25 19:53:30 -07:00
Irfan Sheriff
40686ee81f am 15fe0e47: Merge "Allow soft AP settings config before bring up" into gingerbread
Merge commit '15fe0e47958d248300c2f26a463172181b137aca' into gingerbread-plus-aosp

* commit '15fe0e47958d248300c2f26a463172181b137aca':
  Allow soft AP settings config before bring up
2010-06-25 19:51:46 -07:00
Irfan Sheriff
bb480bbb92 Allow soft AP settings config before bring up
Bug: 2538623
Change-Id: I4b927deb0e4981c164744b85e5c85c3fc95a31eb
2010-06-24 12:04:36 -07:00
The Android Open Source Project
fa3384898a am 73550d28: merge from froyo-plus-aosp
Merge commit '73550d28df4b7ee2faa39cc4b1b4cc854343632a'

* commit '73550d28df4b7ee2faa39cc4b1b4cc854343632a':
  Settings: Add a hook for operator or vendor specific settings.
  replaced deprecated getIntent with parseURI
2010-06-14 11:51:56 -07:00
The Android Open Source Project
73550d28df merge from froyo-plus-aosp
Change-Id: I6c6ee9c9567f5aef7e1beb585296c1e2fb884e9a
2010-06-14 11:48:15 -07:00
The Android Open Source Project
00c406364e merge from open-source master
Change-Id: I7d167c97600bbf25e2ed8872cffecd9fa5b1db7c
2010-06-11 13:31:28 -07:00
Anders Hammar1
b2dd90383b Settings: Add a hook for operator or vendor specific settings.
The Settings application now provides a hook that can be used by an
operator or a vendor specific application to add an activity of choice
in the settings menu.

Change-Id: Id55da9fd4262bbfc6a5abf863799c747b0d75b24
2010-06-11 14:27:29 +02:00
Dianne Hackborn
b364d0508e am 728ac353: New Running Services UI. 2010-06-07 12:57:00 -07:00
Dianne Hackborn
728ac35373 New Running Services UI.
This introduces a simplified (thanks, dsandler!) UI for Running Services,
collapsing the groups of apps and processes into single lines.  Tapping
on a line moves to a new activity showing details on that group, where the
stop functionality is now available.

This UI is now also integrated into Manage Applications, as the Running
tab.  You no longer get a really confusing, misleading, scary list of
every package that appears to be laying around for some reason.

The code was also re-organized, to put everything related to Manage
Applications and Running Services under its own package.

There is still some clean-up -- some performance improvements (such as
not re-computing the world when we switch to the details view), and if
this looks good then eradicating the old running services UI.

Change-Id: I3fc059c18060600742cab5b455d11ff74bf45ae3
2010-06-07 12:33:53 -07:00
Kenny Root
9517554534 am a262b5d1: am 273464d5: am aa1f8aee: Clarify backup setting 2010-06-03 15:10:59 -07:00