Commit Graph

2225 Commits

Author SHA1 Message Date
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
Eric Fischer
0667873336 Merge "Import revised translations" 2010-08-30 14:21:59 -07:00
Eric Fischer
ce4e0ede2a Import revised translations
Change-Id: I5ff43233cd7017d36238fe17384585cb3938e081
2010-08-30 13:40:26 -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
Eric Fischer
0384434ac2 am 27521a0d: (-s ours) am 92669a51: Import revised translations. DO NOT MERGE
Merge commit '27521a0defd769aa389b4bc56fbe02cb1a5ce092'

* commit '27521a0defd769aa389b4bc56fbe02cb1a5ce092':
  Import revised translations.  DO NOT MERGE
2010-08-30 13:29:25 -07:00
Brad Fitzpatrick
6442f0b466 am 22aa2130: Merge "Make power control widget be more responsive. Fix StrictMode violations." into gingerbread
Merge commit '22aa2130fe40952d477a998ba60dea99ada32711' into gingerbread-plus-aosp

* commit '22aa2130fe40952d477a998ba60dea99ada32711':
  Make power control widget be more responsive.  Fix StrictMode violations.
2010-08-30 12:33:48 -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
Brad Fitzpatrick
22aa2130fe Merge "Make power control widget be more responsive. Fix StrictMode violations." into gingerbread 2010-08-30 11:35:23 -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
Brad Fitzpatrick
ae0ff95272 Make power control widget be more responsive. Fix StrictMode violations.
Also use new location providers changed broadcast intent, and fix a bug
introduced in Froyo where we stopped observing the SYSTEM_CLOSE_DIALOGS
intent so we fell out of sync (more often) with the sync settings.

Now even responsive during the boot I/O storm!  (except for toggling
brightness, which still does disk writes from the UI thread...)

BUG=2956025

Change-Id: I77876ff6e0be2325c15d5f08bb2970edf233f839
2010-08-27 17:11:10 -07:00
Wink Saville
a9f163744a Use NetworkProperties instead of the accessor functions of phone.
Change-Id: I6e81bb8be25fc17c978da3900470061d82c3b3fb
2010-08-27 13:53:26 -07:00
Joe Onorato
b5498761f0 Fix the build.
Change-Id: I74c288fadd21c918aad379dbde1ad9725ad1c459
2010-08-27 15:20:32 -04: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
Jean-Baptiste Queru
e742d42d54 am 41357ba8: am 02e731fb: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Merge commit '41357ba8d6f2eae906a2af19a7296f47dbc6d286'

* commit '41357ba8d6f2eae906a2af19a7296f47dbc6d286':
  Import revised translations
2010-08-24 11:55:38 -07:00
Kenny Root
ebd93b52e6 resolved conflicts for merge of dbdbd152 to master
Change-Id: Icb172e3d8c2eaec8156bdc37d12efb238054b507
2010-08-24 10:13:00 -07:00
Jean-Baptiste Queru
41357ba8d6 am 02e731fb: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Merge commit '02e731fb6452df796d976cb9e407b210cfffcda5' into gingerbread-plus-aosp

* commit '02e731fb6452df796d976cb9e407b210cfffcda5':
  Import revised translations
2010-08-23 23:36:55 -07:00
Jean-Baptiste Queru
02e731fb64 merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Change-Id: I1d1d611f22f6d0bc9dbdd29a4b1eff497e1afd74
2010-08-23 19:09:14 -07:00
Jaikumar Ganesh
42b0443212 Merge "Match devices by Class for tethering." 2010-08-23 15:58:37 -07:00
Dianne Hackborn
3784d003b8 am 805ad7d1: am 4749fcf7: More tricksy.
Merge commit '805ad7d1aa3d5177b383af3ad49df20092d2ef9d'

* commit '805ad7d1aa3d5177b383af3ad49df20092d2ef9d':
  More tricksy.
2010-08-23 12:01:51 -07:00
Jaikumar Ganesh
8eb4986049 Match devices by Class for tethering.
Change-Id: I711de3c8d6f6b1dafeec4fb5dde4fa33d997bcca
2010-08-23 11:49:19 -07:00
Jake Hamby
2cd6aad561 am 2876ad62: am 2fcfb289: Merge " Fix Bluetooth Settings activity memory leak."
Merge commit '2876ad62082207e0e02cbc38b65ce9993cb121bf'

* commit '2876ad62082207e0e02cbc38b65ce9993cb121bf':
  Fix Bluetooth Settings activity memory leak.
2010-08-21 09:35:49 -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
Dianne Hackborn
805ad7d1aa am 4749fcf7: More tricksy.
Merge commit '4749fcf762de0e34ac28f927501d42555062c521' into gingerbread-plus-aosp

* commit '4749fcf762de0e34ac28f927501d42555062c521':
  More tricksy.
2010-08-19 18:37:35 -07:00
Dianne Hackborn
4749fcf762 More tricksy.
Change-Id: I4752344e0eea302ba28e907ff5bd5c20f74a82b7
2010-08-19 18:21:31 -07:00
Eric Fischer
641ec835c4 Merge "Import Romansh translations." 2010-08-19 12:01:34 -07:00
Amith Yamasani
7385d65817 Fix proguard flags for settings.
Bug: 2933151
2010-08-19 10:26:40 -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
Jake Hamby
2876ad6208 am 2fcfb289: Merge " Fix Bluetooth Settings activity memory leak."
Merge commit '2fcfb28982b84a6383774cfd50d6a963b1a985e1' into gingerbread-plus-aosp

* commit '2fcfb28982b84a6383774cfd50d6a963b1a985e1':
  Fix Bluetooth Settings activity memory leak.
2010-08-18 19:36:53 -07:00