Commit Graph

1374 Commits

Author SHA1 Message Date
Daisuke Miyakawa
21c1abcef7 Fragmentize ProxySettings.
Change-Id: I2c962726b0adc8811c18dd6df7ff7bdc93c31a07
2010-09-12 17:43:10 -07:00
Amith Yamasani
b61cf51d85 Breadcrumbs in the action bar for navigating up one level and showing current title.
Change-Id: I595e06549b888bd67c6dddd599a4cc77416c3a41
2010-09-12 11:47:26 -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
Erik Ljungberg
74cb5b8098 am 40230c14: am 33319b12: Bluetooth PIN is not password style
Merge commit '40230c1490712b52416e67d0256881db4decb4ef'

* commit '40230c1490712b52416e67d0256881db4decb4ef':
  Bluetooth PIN is not password style
2010-09-10 16:22:16 -07:00
Erik Ljungberg
40230c1490 am 33319b12: Bluetooth PIN is not password style
Merge commit '33319b1228d8af25797e1371b088fc8491349c21' into gingerbread-plus-aosp

* commit '33319b1228d8af25797e1371b088fc8491349c21':
  Bluetooth PIN is not password style
2010-09-10 15:47:18 -07:00
Eric Fischer
4a8608af64 Import revised translations.
Change-Id: I518b97a1bb56438dddf7ea42b836d298f65b1c87
2010-09-10 15:46:25 -07:00
Eric Fischer
a27ffa47aa am be45f642: Import revised translations. DO NOT MERGE
Merge commit 'be45f642cafdd27e5ffeb79b13aa3e33a83ae823' into gingerbread-plus-aosp

* commit 'be45f642cafdd27e5ffeb79b13aa3e33a83ae823':
  Import revised translations.  DO NOT MERGE
2010-09-10 13:24:06 -07:00
Eric Fischer
be45f642ca Import revised translations. DO NOT MERGE
Change-Id: I3a1f1eeb653d982ddc30c765a4a530aa48a364bf
2010-09-10 13:07:48 -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
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
Eric Fischer
11bf335adb am 1a886f80: Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread
Merge commit '1a886f805be579ed2f32c861870e35aba37111bd' into gingerbread-plus-aosp

* commit '1a886f805be579ed2f32c861870e35aba37111bd':
  Preserve old translations for changed strings.  DO NOT MERGE
2010-09-07 11:11:00 -07:00
Eric Fischer
1a886f805b Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread 2010-09-07 11:04:17 -07:00
Erik Ljungberg
33319b1228 Bluetooth PIN is not password style
Bluetooth PIN is changed to password style to
comform with how passwords are normally shown
in the UI.

Change-Id: I293e94cf3766f9b5b82b9bb89e5aed4bd494ef71
2010-09-06 18:19:36 +02:00
Eric Fischer
8f32a38393 Preserve old translations for changed strings. DO NOT MERGE
Change-Id: I7ce80a0d57a6ff09dd12abab5ba6df9019d740ca
2010-09-03 17:42:59 -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
Daisuke Miyakawa
cbe749e412 Merge "Use LocalePicker fragment in framework." 2010-09-02 10:50:48 -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
cdadb56644 Use LocalePicker fragment in framework.
We move basic logics in LocalePicker from Settings to framework,
so that the other components can use it.
See also I1364c4810a115958662ca5d6e6e7f29c0c9b2569 for more
information.

Currently new LocalePicker in this package inherits that
in framework. The name should be same to accept activity-alias
naturally.

Depends on I8a398b9b77601cf88ea8a3840b92dcf7441e6103

Change-Id: Ib27d0638d80fdbc808cd5841df2b2f5df9a8474f
2010-09-01 19:47:09 -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
a9959423b2 Merge "Add checkbox to enable PTP USB mode." 2010-08-31 13:47:29 -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
Eric Fischer
ce4e0ede2a Import revised translations
Change-Id: I5ff43233cd7017d36238fe17384585cb3938e081
2010-08-30 13:40:26 -07:00
Eric Fischer
27521a0def am 92669a51: Import revised translations. DO NOT MERGE
Merge commit '92669a512a80fb99b71cbdf22aca9d91ae006b01' into gingerbread-plus-aosp

* commit '92669a512a80fb99b71cbdf22aca9d91ae006b01':
  Import revised translations.  DO NOT MERGE
2010-08-30 12:33:01 -07: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
Eric Fischer
92669a512a Import revised translations. DO NOT MERGE
Change-Id: I258c6a8b900eae6e101ad910b9414e5ba857246d
2010-08-27 17:17:47 -07:00
Daisuke Miyakawa
53cbd6846b Merge "Fragmentize WifiSettings." 2010-08-25 17:52:30 -07: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
b3d90b604b am a457719c: Add new string for the notification to be displayed when the user installs a new TTS engine.
Merge commit 'a457719c5042f944540f76c03b5e61ecd0ffae39' into gingerbread-plus-aosp

* commit 'a457719c5042f944540f76c03b5e61ecd0ffae39':
  Add new string for the notification to be displayed when the user
2010-08-25 17:31:26 -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
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
Kenny Root
ebd93b52e6 resolved conflicts for merge of dbdbd152 to master
Change-Id: Icb172e3d8c2eaec8156bdc37d12efb238054b507
2010-08-24 10:13:00 -07:00
Dianne Hackborn
999d66df26 am 4962c855: am a712c3b7: A couple small settings fixes:
Merge commit '4962c855b871f1657ca6d90817567203e6863551'

* commit '4962c855b871f1657ca6d90817567203e6863551':
  A couple small settings fixes:
2010-08-21 09:35:38 -07:00
Dianne Hackborn
dbdbd15296 am e55b0e2e: Fix issue #2895310: Please fix problems with your strings
Merge commit 'e55b0e2e88adc2be5958d0ae4ea310997aa2002f' into gingerbread-plus-aosp

* commit 'e55b0e2e88adc2be5958d0ae4ea310997aa2002f':
  Fix issue #2895310: Please fix problems with your strings
2010-08-20 15:15:49 -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
Eric Fischer
641ec835c4 Merge "Import Romansh translations." 2010-08-19 12:01:34 -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
Dianne Hackborn
4962c855b8 am a712c3b7: A couple small settings fixes:
Merge commit 'a712c3b7b5a17129d016ede082e3e3b2bbd31f9a' into gingerbread-plus-aosp

* commit 'a712c3b7b5a17129d016ede082e3e3b2bbd31f9a':
  A couple small settings fixes:
2010-08-18 18:42:18 -07:00
Dianne Hackborn
a712c3b7b5 A couple small settings fixes:
- Correctly position WIFI/GPS charts.
- Start out with running services hidden in case we need to show
  the progress bar.

Change-Id: I8852f334f68f4e9122b5d688d9fd57d0f94d94d8
2010-08-18 17:47:39 -07:00
Eric Fischer
dbd31f29d9 Import Romansh translations.
Change-Id: I71df0c212e4ef30c94bc36d048226c3216f79e9b
2010-08-18 16:26:49 -07:00
Eric Fischer
e86ec30f3f am f8a91b53: Import revised translations. DO NOT MERGE
Merge commit 'f8a91b535b05619061dad5870db2318b012bbc0b' into gingerbread-plus-aosp

* commit 'f8a91b535b05619061dad5870db2318b012bbc0b':
  Import revised translations.  DO NOT MERGE
2010-08-18 13:36:36 -07:00
Danica Chang
32711b6752 bluetooth tethering
Change-Id: I8dfb1c85bb8b963d2937b8bc4a4c9f0cf641785d
2010-08-17 19:07:07 -07:00
Eric Fischer
4216902ba3 Import revised translations.
Change-Id: I22bb0d58dabccd19a4726c5abf97710f1970c211
2010-08-17 16:56:21 -07:00
Eric Fischer
f8a91b535b Import revised translations. DO NOT MERGE
Change-Id: If954fbc7c9ff4898e76e6e4dcde4f9dffdd7cbf2
2010-08-17 16:45:27 -07:00
Dianne Hackborn
c94e7d1954 am 6ca1da8c: am ff3673c7: Make running services initial update async.
Merge commit '6ca1da8c97f76f1b07fc70846ae31e22fb72c160'

* commit '6ca1da8c97f76f1b07fc70846ae31e22fb72c160':
  Make running services initial update async.
2010-08-16 15:18:30 -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
6ca1da8c97 am ff3673c7: Make running services initial update async.
Merge commit 'ff3673c7f477b1d78e64a8bc28754552dcdc8826' into gingerbread-plus-aosp

* commit 'ff3673c7f477b1d78e64a8bc28754552dcdc8826':
  Make running services initial update async.
2010-08-15 17:37:14 -07:00