Commit Graph

15016 Commits

Author SHA1 Message Date
Daisuke Miyakawa
0b8c710d06 Reflects framework change.
See I4062a70e11600d87e889b40d30796387c7069e21

Change-Id: I29685118467bd2a68b80abcf234f91098839be0b
2010-09-15 08:42:29 -07:00
Irfan Sheriff
cc2c684c71 Merge "Add static IP UI" 2010-09-15 08:31:44 -07:00
Brad Fitzpatrick
eaea841be0 am f8a473c3: am c5c8dad0: Use new apply() instead of commit().
Merge commit 'f8a473c3985d7c818dc24f94330f210e1d56a409'

* commit 'f8a473c3985d7c818dc24f94330f210e1d56a409':
  Use new apply() instead of commit().
2010-09-15 07:08:52 -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
Dianne Hackborn
e2fc49ac1b am 5c2a4684: Merge "Supercalifragilisticexpialidocious." into gingerbread
Merge commit '5c2a46848133c0ad6b2197aa1d6f5ae2ba9c8119' into gingerbread-plus-aosp

* commit '5c2a46848133c0ad6b2197aa1d6f5ae2ba9c8119':
  Supercalifragilisticexpialidocious.
2010-09-14 12:33:38 -07:00
Dianne Hackborn
5c2a468481 Merge "Supercalifragilisticexpialidocious." into gingerbread 2010-09-14 12:31:20 -07:00
Dianne Hackborn
44178e2801 Supercalifragilisticexpialidocious.
Change-Id: Ifaece97c80b859cb455eab56230e076eca916f4a
2010-09-14 12:29:32 -07:00
Brad Fitzpatrick
f8a473c398 am c5c8dad0: Use new apply() instead of commit().
Merge commit 'c5c8dad0afb84bda9495a0aa1f7d6a3db28de5cb' into gingerbread-plus-aosp

* commit 'c5c8dad0afb84bda9495a0aa1f7d6a3db28de5cb':
  Use new apply() instead of commit().
2010-09-14 10:29:35 -07:00
Brad Fitzpatrick
c5c8dad0af Use new apply() instead of commit().
apply() starts an async disk write and doesn't have a return
value but is otherwise identical in observable effects.

Change-Id: I0f528607319d7eb5136bb11fce0b24d8741ccdf9
2010-09-14 09:26:51 -07:00
Daisuke Miyakawa
29e812f299 Check null of getActivity() when needed.
Some bloadcast is thrown when Activity isn't ready.

onResume() correctly update time so we don't need to
call updateTimeAndDateDisplay() when Activity is null.

Change-Id: Iea8feaa1111bb87e66462ed0f95fde9d07f2c68d
2010-09-13 16:50:57 -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
b68e0f1d7d Merge "Fragmentize UserDictionary." 2010-09-13 15:48:16 -07:00
Daisuke Miyakawa
26ed96c0a5 Merge "Fragmentize ProxySettings." 2010-09-13 15:47:42 -07:00
Daisuke Miyakawa
f58090d522 Fragmentize UserDictionary.
Depending on I2c962726b0adc8811c18dd6df7ff7bdc93c31a07, which
implements DialogCreatable.

Change-Id: I9857e592218731bfbddc578c15180cc681fa4d20
2010-09-13 15:46:28 -07:00
Jaikumar Ganesh
470ae03ec1 am 1647d472: am e714898a: Merge "OutOfband pairing user dialog." into gingerbread
Merge commit '1647d472a8c04069a0aab22730a54ec374185ea5'

* commit '1647d472a8c04069a0aab22730a54ec374185ea5':
  OutOfband pairing user dialog.
2010-09-13 14:42:36 -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
Daisuke Miyakawa
a41a9286ab Remove unnecessary comment.
Change-Id: I4532a3b042f3dfee4f1a1fe3c26111ed8b00d023
2010-09-12 20:35:06 -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
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
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
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
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
Dianne Hackborn
0b4dc9fd6f am 16339b6f: am 5774d5d3: Show correct process dependency for providers.
Merge commit '16339b6f3515684cc02c422c52ec189eda0d30b3'

* commit '16339b6f3515684cc02c422c52ec189eda0d30b3':
  Show correct process dependency for providers.
2010-08-31 19:06:15 -07:00
Dianne Hackborn
16339b6f35 am 5774d5d3: Show correct process dependency for providers.
Merge commit '5774d5d34b2339135feab01b998fcd111ebdde4d' into gingerbread-plus-aosp

* commit '5774d5d34b2339135feab01b998fcd111ebdde4d':
  Show correct process dependency for providers.
2010-08-31 19:03:31 -07:00
Dianne Hackborn
5774d5d34b Show correct process dependency for providers.
Use the new API that allows us to always retrieve the desired
provider info.

Change-Id: I9265d8f169ee34c87f0ca89315ee78bb2ae49674
2010-08-31 18:59:09 -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
Robert Greenwalt
ae04c1a912 Use change of NetworkProperties to LinkProperties
Change-Id: Ib792cec1d210151fe904f892663ff59ae4e88f54
2010-08-30 15:54:10 -07:00
Brad Fitzpatrick
362eabf8d1 am 6442f0b4: am 22aa2130: Merge "Make power control widget be more responsive. Fix StrictMode violations." into gingerbread
Merge commit '6442f0b466c64f1cf61f3f4c89ce205c4030963e'

* commit '6442f0b466c64f1cf61f3f4c89ce205c4030963e':
  Make power control widget be more responsive.  Fix StrictMode violations.
2010-08-30 13:29:29 -07:00