Commit Graph

7484 Commits

Author SHA1 Message Date
Gilles Debunne
a6660211b3 am a48d2dbe: am 98289826: Merge "New assets (wifi, bluetooth...)" into gingerbread
Merge commit 'a48d2dbeb2691744ec42c3c9fc64f7d17fda357e'

* commit 'a48d2dbeb2691744ec42c3c9fc64f7d17fda357e':
  New assets (wifi, bluetooth...)
2010-09-30 11:00:10 -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
bc692e83c4 am 2d6c0b0d: Update strings for physical keyboard settings.
Merge commit '2d6c0b0d7750237caf5e4b679ed14786fe81fde1' into gingerbread-plus-aosp

* commit '2d6c0b0d7750237caf5e4b679ed14786fe81fde1':
  Update strings for physical keyboard settings.
2010-09-30 10:10:29 -07:00
Gilles Debunne
345fbf926a am a63b08d9: New assets for power widget: gps, sync
Merge commit 'a63b08d9c8ae698960e3da502046e0cd09bc0a85' into gingerbread-plus-aosp

* commit 'a63b08d9c8ae698960e3da502046e0cd09bc0a85':
  New assets for power widget: gps, sync
2010-09-30 10:08:43 -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
Gilles Debunne
a63b08d9c8 New assets for power widget: gps, sync
Change-Id: Ie075549d7d0dd3193a53b75350340285d3ec80ad
2010-09-29 16:21:19 -07:00
Daisuke Miyakawa
3b6aa41cce Improve UI of WifiSettingsForXL
Change-Id: Idd25251581577246ff3fb6820b9c569454292593
2010-09-29 16:09:42 -07:00
Eric Fischer
3388aac10a Import revised translations. DO NOT MERGE
Change-Id: I9ea6e351c10191e58ed1d1c2784022f3d099c84b
2010-09-29 14:36:34 -07:00
Gilles Debunne
a48d2dbeb2 am 98289826: Merge "New assets (wifi, bluetooth...)" into gingerbread
Merge commit '98289826e6a36dcb9f6df7b8f407195b2760e3b4' into gingerbread-plus-aosp

* commit '98289826e6a36dcb9f6df7b8f407195b2760e3b4':
  New assets (wifi, bluetooth...)
2010-09-29 12:20:36 -07:00
Gilles Debunne
98289826e6 Merge "New assets (wifi, bluetooth...)" into gingerbread 2010-09-29 12:18:13 -07:00
Eric Fischer
cf18672acf am 5698a75f: Split strings with SD card references into variations.
Merge commit '5698a75f15526a38ee8e0b647d05e4ee358c575a' into gingerbread-plus-aosp

* commit '5698a75f15526a38ee8e0b647d05e4ee358c575a':
  Split strings with SD card references into variations.
2010-09-29 12:17:20 -07:00
Gilles Debunne
5fb48a2539 New assets (wifi, bluetooth...)
Change-Id: I1b6c3a7049348aa63dddbacaf615b9ff5d630583
2010-09-29 12:10:37 -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
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
48ad5dfe31 Merge "Add NFC checkbox to Settings app." into gingerbread 2010-09-28 22:32:51 -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
Chris Palmer
3e126474e9 am e2ab4597: am 88fdee27: Merge "Improve the add-device-admin layout." into gingerbread
Merge commit 'e2ab45972af13c30bb98848813313603670c8965'

* commit 'e2ab45972af13c30bb98848813313603670c8965':
  Improve the add-device-admin layout.
2010-09-28 13:58:03 -07:00
Chris Palmer
e2ab45972a am 88fdee27: Merge "Improve the add-device-admin layout." into gingerbread
Merge commit '88fdee27e97900173be2b1f4f86c25a7c381969c' into gingerbread-plus-aosp

* commit '88fdee27e97900173be2b1f4f86c25a7c381969c':
  Improve the add-device-admin layout.
2010-09-28 10:44:16 -07:00
Chris Palmer
51794a05ad Improve the add-device-admin layout.
Make it so that the app's explanation comes before the list of possible
policies. This gives the app a chance to explain itself instead of having
the explanation hidden below the fold. To avoid situations in which one
bunch of text items can obscure the other, use an expandable/ellipsizable
TextView with an indicator image. This resolves b/2992594.

Change-Id: I0eb0d0c46bb4be2ec2e019d741915537e1fcc592
2010-09-28 10:32:49 -07:00
Eric Fischer
2d68f1b56b am 54e21852: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
Merge commit '54e21852f221c183eba12e1706650cdc7e0a395f' into gingerbread-plus-aosp

* commit '54e21852f221c183eba12e1706650cdc7e0a395f':
  Trim unwanted whitespace from translations.  DO NOT MERGE
2010-09-27 12:33:33 -07:00
Eric Fischer
b9e77aacd1 Trim unwanted whitespace from translations. DO NOT MERGE
Change-Id: I63529a6379e74b15cca02519445616225f5bd2f7
2010-09-27 12:21:49 -07:00
Daisuke Miyakawa
2aae224a94 Modify title color.
Change-Id: I3b0ab29ec33aadc5940ed2d8aa54dfffea2d55e6
2010-09-24 15:10:41 -07:00
Eric Fischer
16b81c667d Merge "Import revised translations." 2010-09-24 13:20:38 -07:00
Daisuke Miyakawa
eb04789db8 Add missing icon.
Change-Id: I3747f65bea5ddfb2b050f8da9bcbcd3fd2f9acc4
2010-09-24 13:00:38 -07:00
Eric Fischer
5dc3028f28 Import revised translations.
Change-Id: Iaf1681fd1e93df389d6028cf41d6f830f509b7ce
2010-09-24 12:28:13 -07:00
Daisuke Miyakawa
f5a71f8f63 Merge "Modify implementation around SetupWizard XL" 2010-09-24 11:09:21 -07:00
Eric Fischer
4cc41d87f6 am b2fa8719: Import revised translations. DO NOT MERGE
Merge commit 'b2fa8719a483a3ab36a8d919641714551c470bb8' into gingerbread-plus-aosp

* commit 'b2fa8719a483a3ab36a8d919641714551c470bb8':
  Import revised translations.  DO NOT MERGE
2010-09-24 11:08:52 -07:00
Daisuke Miyakawa
86eaa09aa4 Modify implementation around SetupWizard XL
Bug: 3005211
Change-Id: Ia01957725956d570370aceeab01750d77069001a
2010-09-24 11:06:30 -07:00
Eric Fischer
b2fa8719a4 Import revised translations. DO NOT MERGE
Change-Id: Iad9da8a6c0559c93c87a3b9f7e8a9258d677705b
2010-09-24 10:26:20 -07:00
Amith Yamasani
6f62b675e5 Merge "Add a delete button to quickly delete a word in the user dictionary." 2010-09-23 17:16:10 -07:00
Amith Yamasani
e2ac72b4bc Add a delete button to quickly delete a word in the user dictionary. 2010-09-23 17:15:01 -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
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
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
7222997e34 am cb818619: Update power usage UI to follow WIFI data changes.
Merge commit 'cb818619c669d4257a4df969dd03eff479ba84d0' into gingerbread-plus-aosp

* commit 'cb818619c669d4257a4df969dd03eff479ba84d0':
  Update power usage UI to follow WIFI data changes.
2010-09-17 15:20:06 -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
Daisuke Miyakawa
3b2afb04f4 Merge "Fragmentize VoiceOutputSettings." 2010-09-17 11:05:31 -07:00
Irfan Sheriff
001eb90b72 Merge "Fix NPE in wifi setup wizard" 2010-09-17 10:12:16 -07:00
Irfan Sheriff
e4cb9e426c Fix NPE in wifi setup wizard
Add static wifi IP UI xml layout for set up wizard

Bug: 3009285
Change-Id: I8161f290c6ee66117ae37da68de1d52fc42d5f61
2010-09-16 19:39:50 -07:00