Commit Graph

2816 Commits

Author SHA1 Message Date
Daisuke Miyakawa
f1ad699dce Merge "Remove unnecessary Activity." 2010-09-13 12:09:06 -07:00
Jaikumar Ganesh
1647d472a8 am e714898a: Merge "OutOfband pairing user dialog." into gingerbread
Merge commit 'e714898a1abfd828a239e1be7b3f75e2a3cc2120' into gingerbread-plus-aosp

* commit 'e714898a1abfd828a239e1be7b3f75e2a3cc2120':
  OutOfband pairing user dialog.
2010-09-13 11:52:15 -07:00
Jaikumar Ganesh
e714898a1a Merge "OutOfband pairing user dialog." into gingerbread 2010-09-13 11:43:01 -07:00
Daisuke Miyakawa
48d753c58a Remove unnecessary Activity.
Change-Id: I9e1a66feec6364c97ca85df26ac4fc1e61aee1cb
2010-09-13 11:38:07 -07:00
Eric Fischer
ac2ee01f88 Merge "Import revised translations." 2010-09-13 10:09:00 -07:00
Daisuke Miyakawa
8d4e5ee5da Merge "Remove unnecessary comment." 2010-09-12 20:35:35 -07:00
Daisuke Miyakawa
a41a9286ab Remove unnecessary comment.
Change-Id: I4532a3b042f3dfee4f1a1fe3c26111ed8b00d023
2010-09-12 20:35:06 -07:00
Chung-yih Wang
3443b9a041 Merge "resolved conflicts for merge of 2af8a007 to master" 2010-09-12 19:40:53 -07:00
Daisuke Miyakawa
21c1abcef7 Fragmentize ProxySettings.
Change-Id: I2c962726b0adc8811c18dd6df7ff7bdc93c31a07
2010-09-12 17:43:10 -07:00
Daisuke Miyakawa
2712fb5d79 Merge "Simplify the logic for LanguageSettings." 2010-09-12 13:52:09 -07:00
Daisuke Miyakawa
c88c6bbcd0 Simplify the logic for LanguageSettings.
Change-Id: Id065df20fc9a94dd03612eecdcdb310bc033bb4d
2010-09-12 13:51:54 -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
Chung-yih Wang
56f56a1f99 resolved conflicts for merge of 2af8a007 to master
Change-Id: I4a9aed673b0b57789d61f95129ca882dc46b415a
2010-09-11 11:51:53 +08:00
Chung-yih Wang
2af8a0076e am e5e4282a: Enable the call setting when the VoIP feature is supported.
Merge commit 'e5e4282af1d2d4277c8e2c13a312be0187f44257' into gingerbread-plus-aosp

* commit 'e5e4282af1d2d4277c8e2c13a312be0187f44257':
  Enable the call setting when the VoIP feature is supported.
2010-09-10 19:52:31 -07:00
Chung-yih Wang
e5e4282af1 Enable the call setting when the VoIP feature is supported.
If the VoIP feature is included, the user need to be able to
configure the internet call settings even if it is in airplan mode.

Change-Id: I00d73fb0d9213162b8a9887cad0f800418446787
2010-09-11 10:24:46 +08:00
Jean-Baptiste Queru
cc0e4db618 am 8ce1853f: am 16502e94: Merge "Allow users to create shortcuts to the VPN settings on the Home Screen."
Merge commit '8ce1853fffd8950f7f3588af28d5e064c20cd29f'

* commit '8ce1853fffd8950f7f3588af28d5e064c20cd29f':
  Allow users to create shortcuts to the VPN settings on the Home Screen.
2010-09-10 16:22:20 -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
Jean-Baptiste Queru
8ce1853fff am 16502e94: Merge "Allow users to create shortcuts to the VPN settings on the Home Screen."
Merge commit '16502e9479f96e3fc484192e0cd4c852c4fc8ea6' into gingerbread-plus-aosp

* commit '16502e9479f96e3fc484192e0cd4c852c4fc8ea6':
  Allow users to create shortcuts to the VPN settings on the Home Screen.
2010-09-10 15:47:21 -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
1ab61251d1 am a27ffa47: (-s ours) am be45f642: Import revised translations. DO NOT MERGE
Merge commit 'a27ffa47aa9bf2e7b99fcf2e2fb9bfbd8f9479aa'

* commit 'a27ffa47aa9bf2e7b99fcf2e2fb9bfbd8f9479aa':
  Import revised translations.  DO NOT MERGE
2010-09-10 15:03:38 -07:00
Jean-Baptiste Queru
16502e9479 Merge "Allow users to create shortcuts to the VPN settings on the Home Screen." 2010-09-10 14:27:49 -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
Jaikumar Ganesh
a197eea307 OutOfband pairing user dialog.
Change-Id: I2f996067b983ad4678814040eb0773fa3968be13
2010-09-09 15:29:03 -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
0cec40628b am 11bf335a: (-s ours) am 1a886f80: Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread
Merge commit '11bf335adb109a63ac3e1ea17ee9f61909708c0b'

* commit '11bf335adb109a63ac3e1ea17ee9f61909708c0b':
  Preserve old translations for changed strings.  DO NOT MERGE
2010-09-07 11:14:50 -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
dadf7c378e am 1cc3202d: am 2d5cd1df: Follow rename.
Merge commit '1cc3202d0e6b888b59a1d73039f73213c4a72849'

* commit '1cc3202d0e6b888b59a1d73039f73213c4a72849':
  Follow rename.
2010-09-03 14:13:09 -07:00
Dianne Hackborn
1cc3202d0e am 2d5cd1df: Follow rename.
Merge commit '2d5cd1dfbc635fef3321694f33faf38ffa993d3f' into gingerbread-plus-aosp

* commit '2d5cd1dfbc635fef3321694f33faf38ffa993d3f':
  Follow rename.
2010-09-03 13:29:51 -07:00
Dianne Hackborn
2d5cd1dfbc Follow rename.
Change-Id: I255df1429b999943d7b3d2ca2b453045f195fdb9
2010-09-03 12:53:20 -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
Jaikumar Ganesh
3bfcc6d407 Merge "Decouple enabling of tethering with SDP record." 2010-09-02 14:30:07 -07:00
Jaikumar Ganesh
d2bed6935f Decouple enabling of tethering with SDP record.
Change-Id: I50781bab52b28d7b3fe750fb055ffaeac5baf360
2010-09-02 12:11:06 -07:00
Daisuke Miyakawa
cbe749e412 Merge "Use LocalePicker fragment in framework." 2010-09-02 10:50:48 -07:00
Erik Ljungberg
df4a5b3ada am 6e6d0580: am 83c3b64f: BT: The Phone doesn\'t "wake up" when trying to pair with it.
Merge commit '6e6d05801e68e8d2cee2c708274dc8226f04f756'

* commit '6e6d05801e68e8d2cee2c708274dc8226f04f756':
  BT: The Phone doesn't "wake up" when trying to pair with it.
2010-09-01 22:07:22 -07:00
Erik Ljungberg
6e6d05801e am 83c3b64f: BT: The Phone doesn\'t "wake up" when trying to pair with it.
Merge commit '83c3b64ff7235e1382712a899ab0a269ce8a28d6' into gingerbread-plus-aosp

* commit '83c3b64ff7235e1382712a899ab0a269ce8a28d6':
  BT: The Phone doesn't "wake up" when trying to pair with it.
2010-09-01 22:04:59 -07:00
Erik Ljungberg
83c3b64ff7 BT: The Phone doesn't "wake up" when trying to pair with it.
To improve the pairing request usability:
- In the case where a notification shall be used the standard
  notification sound is added
- When the screen is off notification is always used.

Change-Id: I751a7913517c64de5d7ba06d7c17358197d002c5
2010-09-01 21:59: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