Commit Graph

569 Commits

Author SHA1 Message Date
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
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
Daisuke Miyakawa
3b6aa41cce Improve UI of WifiSettingsForXL
Change-Id: Idd25251581577246ff3fb6820b9c569454292593
2010-09-29 16:09:42 -07:00
Nick Pelly
d83aaf28bc resolved conflicts for merge of 1ff9ad3f to master
Change-Id: I55137a241e13ec7da1d413cf9b7fd1c1fdd8c4d1
2010-09-29 12:10:35 -07:00
Eric Fischer
5698a75f15 Split strings with SD card references into variations.
Change-Id: I75263d57928817a211fbaf6ed45f828936f8d1be
2010-09-29 12:09:06 -07:00
Ken Wakasa
d2c3f37fa4 Revise the Language & keyboard settings layout.
bug: 2954950
Change-Id: Ie5815023654c3ee45f73fb6ec08266b11e7ff017
2010-09-29 23:52:02 +09: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
Daisuke Miyakawa
86eaa09aa4 Modify implementation around SetupWizard XL
Bug: 3005211
Change-Id: Ia01957725956d570370aceeab01750d77069001a
2010-09-24 11:06:30 -07:00
Irfan Sheriff
e82a459392 Fix string usage for static IP UI
Static IP selection uses strings to match, use
ids instead.

Also, add CHAR LIMIT to the new strings added

Change-Id: I7d632cfd672527be3a9676634b9ac4ea6983b626
2010-09-23 14:44:01 -07:00
Irfan Sheriff
b3024fa6a0 Add UI for WPS
The WPS available option is shown
for networks in scan results. Upon
selecting a network, the user has
the option of manually entering passwords
or choosing WPS for connection

Bug: 2277571
Change-Id: Ia12eb1742f1bf17128d51fa09e56dc4c3f067fa5
2010-09-23 07:18:07 -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
Imre Sunyi
524146698f Support showing "Cold" battery health.
The Linux kernel supports reporting "cold" battery health to sysfs.
Android framework has not implemented this and it defaults to "unknown"
This adds handling the cold battery health.

Change-Id: Idfc7029fabcdfdaaf2b5c95977c11e0eb3fd76a7
2010-09-20 18:02:28 +02:00
Dianne Hackborn
5ba2640003 am 7222997e: am cb818619: Update power usage UI to follow WIFI data changes.
Merge commit '7222997e342920efb45edc312318fc5751c9a0ef'

* commit '7222997e342920efb45edc312318fc5751c9a0ef':
  Update power usage UI to follow WIFI data changes.
2010-09-17 18:14:00 -07:00
Dianne Hackborn
cb818619c6 Update power usage UI to follow WIFI data changes.
Now handles WIFI start times being distributed across applications,
and collapses all work done in WIFI uid procs (esp that supplicant
thing) into the apps and overall WIFI category.

Change-Id: I341e5d63c45eeb0fb4121beed62474d947f9de11
2010-09-17 11:28:08 -07: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
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
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
71cc548f7e Implement DateTimeSetings for Setup Wizard XL.
Make the orientation "behind", as XL would require landscape.

TODO:
- Automatic Time Zone should be available.
- Layout is immature: need to have better theme and layout xml.

Change-Id: Iafe141223a227643ca774f4df5e5b7fde9520d31
2010-09-09 16:51:57 -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
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
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
Jean-Michel Trivi
1361255899 am b3d90b60: am a457719c: Add new string for the notification to be displayed when the user installs a new TTS engine.
Merge commit 'b3d90b604b37dd9c32799832c43882a4cbf3199d'

* commit 'b3d90b604b37dd9c32799832c43882a4cbf3199d':
  Add new string for the notification to be displayed when the user
2010-08-25 17:34:36 -07:00
Jean-Michel Trivi
a457719c50 Add new string for the notification to be displayed when the user
installs a new TTS engine.

Change-Id: If370cc40b0da858ec838711190d6b660b1c34ebf
2010-08-25 17:18:37 -07:00
Kenny Root
ebd93b52e6 resolved conflicts for merge of dbdbd152 to master
Change-Id: Icb172e3d8c2eaec8156bdc37d12efb238054b507
2010-08-24 10:13:00 -07:00
Dianne Hackborn
e55b0e2e88 Fix issue #2895310: Please fix problems with your strings
Make up some numbers.

Change-Id: Ib3d1018282efd4979be8ef22384c9d64e67456e4
2010-08-20 15:10:26 -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
Dianne Hackborn
e5b148ba29 am 343158c7: am be5994d2: Some improvements to the battery usage UI:
Merge commit '343158c797ea12f3f43df2a0ec70c65ada9e6daa'

* commit '343158c797ea12f3f43df2a0ec70c65ada9e6daa':
  Some improvements to the battery usage UI:
2010-08-16 15:17:36 -07:00
Dianne Hackborn
be5994d201 Some improvements to the battery usage UI:
- Show wake lock usage in the battery history.
- Show WIFI usage in the battery history.
- Show the amount an app has held a wake lock in the app details.
- Also fix service run time computation in running services.

Change-Id: I5aa959857f83808fbc709f65204f59bbfb73935b
2010-08-13 14:22:34 -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
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
Dianne Hackborn
3205412109 am 77ba65ea: am 49f4ba4a: Various small UI cleanup in settings.
Merge commit '77ba65eaec3587ad9fcdeea5e6937c8821838add'

* commit '77ba65eaec3587ad9fcdeea5e6937c8821838add':
  Various small UI cleanup in settings.
2010-07-26 12:29:40 -07:00
Dianne Hackborn
27fe995f02 am 4d4ccc9a: am 9db5ee35: Add facility to disable system packages.
Merge commit '4d4ccc9acbf9c46c930129fcb98230886dac5b9f'

* commit '4d4ccc9acbf9c46c930129fcb98230886dac5b9f':
  Add facility to disable system packages.
2010-07-26 12:29:38 -07:00
Dianne Hackborn
b48e46c7d5 am e5d948f3: am cbaf6ceb: Add battery history details activity.
Merge commit 'e5d948f333b78061076c7764d641b84c8751b2c9'

* commit 'e5d948f333b78061076c7764d641b84c8751b2c9':
  Add battery history details activity.
2010-07-26 12:29:35 -07:00
Dianne Hackborn
49f4ba4adc Various small UI cleanup in settings.
- Remove title bar in various places where it is not useful.
- Tighten up some text to avoid spilling across lines.
- Remove strong wording about turning off GPS to save battery.

Change-Id: Ieed9f8f3a3cf6a892a49362677594b447a266925
2010-07-24 17:51:23 -07:00