OSDN Git Service
Gilles Debunne [Thu, 30 Sep 2010 18:29:28 +0000 (11:29 -0700)]
am
345fbf92: am
a63b08d9: New assets for power widget: gps, sync
Merge commit '
345fbf926aba9dc743a58ace88545c030a1f43f4'
* commit '
345fbf926aba9dc743a58ace88545c030a1f43f4':
New assets for power widget: gps, sync
Gilles Debunne [Thu, 30 Sep 2010 18:00:10 +0000 (11:00 -0700)]
am
a48d2dbe: am
98289826: Merge "New assets (wifi, bluetooth...)" into gingerbread
Merge commit '
a48d2dbeb2691744ec42c3c9fc64f7d17fda357e'
* commit '
a48d2dbeb2691744ec42c3c9fc64f7d17fda357e':
New assets (wifi, bluetooth...)
Eric Fischer [Thu, 30 Sep 2010 17:54:13 +0000 (10:54 -0700)]
resolved conflicts for merge of
cf18672a to master
Change-Id: I87a7ef635166f4f90205a4117cbdec8447471af1
Gilles Debunne [Thu, 30 Sep 2010 17:08:43 +0000 (10:08 -0700)]
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
Ken Wakasa [Thu, 30 Sep 2010 02:39:09 +0000 (11:39 +0900)]
Merge commit '
47ad0cf3' into manualmerge
Conflicts:
res/xml/language_settings.xml
src/com/android/settings/LanguageSettings.java
Change-Id: I0dbfd4ee51682e2b55cad0af1caa90bbedd598a2
Gilles Debunne [Wed, 29 Sep 2010 23:02:13 +0000 (16:02 -0700)]
New assets for power widget: gps, sync
Change-Id: Ie075549d7d0dd3193a53b75350340285d3ec80ad
Daisuke Miyakawa [Wed, 29 Sep 2010 23:07:02 +0000 (16:07 -0700)]
Improve UI of WifiSettingsForXL
Change-Id: Idd25251581577246ff3fb6820b9c569454292593
Gilles Debunne [Wed, 29 Sep 2010 19:20:36 +0000 (12:20 -0700)]
am
98289826: Merge "New assets (wifi, bluetooth...)" into gingerbread
Merge commit '
98289826e6a36dcb9f6df7b8f407195b2760e3b4' into gingerbread-plus-aosp
* commit '
98289826e6a36dcb9f6df7b8f407195b2760e3b4':
New assets (wifi, bluetooth...)
Gilles Debunne [Wed, 29 Sep 2010 19:18:12 +0000 (12:18 -0700)]
Merge "New assets (wifi, bluetooth...)" into gingerbread
Eric Fischer [Wed, 29 Sep 2010 19:17:20 +0000 (12:17 -0700)]
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.
Gilles Debunne [Wed, 29 Sep 2010 19:10:37 +0000 (12:10 -0700)]
New assets (wifi, bluetooth...)
Change-Id: I1b6c3a7049348aa63dddbacaf615b9ff5d630583
Nick Pelly [Wed, 29 Sep 2010 19:10:35 +0000 (12:10 -0700)]
resolved conflicts for merge of
1ff9ad3f to master
Change-Id: I55137a241e13ec7da1d413cf9b7fd1c1fdd8c4d1
Eric Fischer [Tue, 28 Sep 2010 23:35:31 +0000 (16:35 -0700)]
Split strings with SD card references into variations.
Change-Id: I75263d57928817a211fbaf6ed45f828936f8d1be
Ken Wakasa [Wed, 29 Sep 2010 16:58:01 +0000 (09:58 -0700)]
am
d2c3f37f: Revise the Language & keyboard settings layout.
Merge commit '
d2c3f37fa445130c8cce0f16347d61f66b4b0025' into gingerbread-plus-aosp
* commit '
d2c3f37fa445130c8cce0f16347d61f66b4b0025':
Revise the Language & keyboard settings layout.
Ken Wakasa [Tue, 28 Sep 2010 10:01:17 +0000 (19:01 +0900)]
Revise the Language & keyboard settings layout.
bug:
2954950
Change-Id: Ie5815023654c3ee45f73fb6ec08266b11e7ff017
Nick Pelly [Wed, 29 Sep 2010 05:34:42 +0000 (22:34 -0700)]
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.
Nick Pelly [Wed, 29 Sep 2010 05:32:51 +0000 (22:32 -0700)]
Merge "Add NFC checkbox to Settings app." into gingerbread
Nick Pelly [Wed, 22 Sep 2010 17:55:13 +0000 (10:55 -0700)]
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
Jaikumar Ganesh [Thu, 19 Aug 2010 04:33:33 +0000 (21:33 -0700)]
Update code for public Bluetooth APIs
Change-Id: Iab22e4ae3206f9085b2d53b8b18dc2abd6197226
Daisuke Miyakawa [Tue, 28 Sep 2010 23:06:44 +0000 (16:06 -0700)]
Merge "Fix misc problems happening in SetupWizard XL"
Daisuke Miyakawa [Tue, 28 Sep 2010 23:02:11 +0000 (16:02 -0700)]
Fix misc problems happening in SetupWizard XL
Change-Id: I6ba0813f36625de3d86543953972869657be50be
Chris Palmer [Tue, 28 Sep 2010 20:58:03 +0000 (13:58 -0700)]
am
e2ab4597: am
88fdee27: Merge "Improve the add-device-admin layout." into gingerbread
Merge commit '
e2ab45972af13c30bb98848813313603670c8965'
* commit '
e2ab45972af13c30bb98848813313603670c8965':
Improve the add-device-admin layout.
Daisuke Miyakawa [Fri, 24 Sep 2010 18:29:31 +0000 (11:29 -0700)]
Remove OnStateListener and FragmentStarter.
Those interfaces aren't available any more, as we make Settings
inherit PreferenceActivity.
Bug:
3034757
Change-Id: I2f778a12168e3033291d6935bcc73637e7c78c0b
Amith Yamasani [Mon, 27 Sep 2010 19:03:59 +0000 (12:03 -0700)]
Fix launching of specific settings.
Chris Palmer [Tue, 28 Sep 2010 17:44:16 +0000 (10:44 -0700)]
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.
Chris Palmer [Tue, 28 Sep 2010 17:34:43 +0000 (10:34 -0700)]
Merge "Improve the add-device-admin layout." into gingerbread
Chris Palmer [Mon, 13 Sep 2010 22:14:55 +0000 (15:14 -0700)]
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
Winson Chung [Tue, 28 Sep 2010 04:03:10 +0000 (21:03 -0700)]
am
ca76166c: am
0adb8460: Merge "Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to default to All Apps tab" into gingerbread
Merge commit '
ca76166c705dc78e5a186a9a41f324ba70f0a938'
* commit '
ca76166c705dc78e5a186a9a41f324ba70f0a938':
Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to default to All Apps tab
Winson Chung [Mon, 27 Sep 2010 22:09:08 +0000 (15:09 -0700)]
am
0adb8460: Merge "Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to default to All Apps tab" into gingerbread
Merge commit '
0adb8460bcb736d67f87bf1b56150bfac9c9c130' into gingerbread-plus-aosp
* commit '
0adb8460bcb736d67f87bf1b56150bfac9c9c130':
Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to default to All Apps tab
Winson Chung [Mon, 27 Sep 2010 22:06:47 +0000 (15:06 -0700)]
Merge "Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to default to All Apps tab" into gingerbread
Eric Fischer [Mon, 27 Sep 2010 21:39:40 +0000 (14:39 -0700)]
am
2d68f1b5: (-s ours) am
54e21852: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
Merge commit '
2d68f1b56b4146c5203cd793fb64d8e3a8c2da8d'
* commit '
2d68f1b56b4146c5203cd793fb64d8e3a8c2da8d':
Trim unwanted whitespace from translations. DO NOT MERGE
Winson Chung [Mon, 27 Sep 2010 18:34:10 +0000 (11:34 -0700)]
Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to default to All Apps tab
Change-Id: I5c18b916b09979117e4b746f521a81ca554903b4
Eric Fischer [Mon, 27 Sep 2010 19:33:33 +0000 (12:33 -0700)]
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
Eric Fischer [Mon, 27 Sep 2010 19:27:55 +0000 (12:27 -0700)]
Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
Eric Fischer [Mon, 27 Sep 2010 19:21:49 +0000 (12:21 -0700)]
Trim unwanted whitespace from translations. DO NOT MERGE
Change-Id: I63529a6379e74b15cca02519445616225f5bd2f7
Amith Yamasani [Mon, 27 Sep 2010 19:08:23 +0000 (12:08 -0700)]
am
38f331be: am
f8093b33: Merge "Fix the indicators in the button bar. The middle ones were showing the left indicators incorrectly." into gingerbread
Merge commit '
38f331bece1e8c1c06ba51ee5a4a9ffc5615495b'
* commit '
38f331bece1e8c1c06ba51ee5a4a9ffc5615495b':
Fix the indicators in the button bar. The middle ones were showing the left indicators incorrectly.
Amith Yamasani [Mon, 27 Sep 2010 18:52:39 +0000 (11:52 -0700)]
am
f8093b33: Merge "Fix the indicators in the button bar. The middle ones were showing the left indicators incorrectly." into gingerbread
Merge commit '
f8093b330adf3f307b203fcc8b568ec7be9348b8' into gingerbread-plus-aosp
* commit '
f8093b330adf3f307b203fcc8b568ec7be9348b8':
Fix the indicators in the button bar. The middle ones were showing the left indicators incorrectly.
Amith Yamasani [Mon, 27 Sep 2010 18:20:52 +0000 (11:20 -0700)]
Merge "Fix the indicators in the button bar. The middle ones were showing the left indicators incorrectly." into gingerbread
Amith Yamasani [Sun, 26 Sep 2010 22:58:00 +0000 (15:58 -0700)]
Fix the indicators in the button bar. The middle ones were showing the left indicators incorrectly.
Earlier refactoring seems to have messed it up. Added a position value to the state trackers.
Bug:
2980926
Change-Id: I31df4b1ae0b835d801d67747154594299498c4cf
Daisuke Miyakawa [Mon, 27 Sep 2010 17:38:12 +0000 (10:38 -0700)]
Disable Status bar in SetupWizard XL.
Bug:
3005211
Change-Id: I468b7d45aceda8fbdc72f723c95c3818c8da20f5
Jean-Baptiste Queru [Mon, 27 Sep 2010 00:54:32 +0000 (17:54 -0700)]
am
4d34b227: (-s ours) am
32d54b19: reconcile froyo-release into gingerbread
Merge commit '
4d34b227b482b702b8640d7307cdb7358cd1c362'
* commit '
4d34b227b482b702b8640d7307cdb7358cd1c362':
Remove Search from the system Settings app DO NOT MERGE
Jean-Baptiste Queru [Mon, 27 Sep 2010 00:42:25 +0000 (17:42 -0700)]
am
32d54b19: reconcile froyo-release into gingerbread
Merge commit '
32d54b19367505547a67c2b717047fdab375db94' into gingerbread-plus-aosp
* commit '
32d54b19367505547a67c2b717047fdab375db94':
Remove Search from the system Settings app DO NOT MERGE
Jean-Baptiste Queru [Mon, 27 Sep 2010 00:30:50 +0000 (17:30 -0700)]
reconcile froyo-release into gingerbread
Change-Id: I2386774732d4d0d0e46a5791dfc1b8cbeb60494b
Jean-Baptiste Queru [Sun, 26 Sep 2010 15:46:24 +0000 (08:46 -0700)]
am
d3125293: am
3f1ba01d: Merge "BT: The Phone doesn\'t "wake up" when trying to pair with it."
Merge commit '
d312529325a553883f27d89f468fed68406f52bb'
* commit '
d312529325a553883f27d89f468fed68406f52bb':
BT: The Phone doesn't "wake up" when trying to pair with it.
Jean-Baptiste Queru [Sun, 26 Sep 2010 15:41:23 +0000 (08:41 -0700)]
am
3f1ba01d: Merge "BT: The Phone doesn\'t "wake up" when trying to pair with it."
Merge commit '
3f1ba01d552f03faeb1aa9796dce8d9bf66d8e13' into gingerbread-plus-aosp
* commit '
3f1ba01d552f03faeb1aa9796dce8d9bf66d8e13':
BT: The Phone doesn't "wake up" when trying to pair with it.
Jean-Baptiste Queru [Sun, 26 Sep 2010 15:05:46 +0000 (08:05 -0700)]
Merge "BT: The Phone doesn't "wake up" when trying to pair with it."
Jake Hamby [Sat, 25 Sep 2010 00:19:24 +0000 (17:19 -0700)]
am
68c6188b: am
dd79a33b: Auto-connect Bluetooth device only when user initiates pairing.
Merge commit '
68c6188b91ca4034caeff7527487513c8cb012f8'
* commit '
68c6188b91ca4034caeff7527487513c8cb012f8':
Auto-connect Bluetooth device only when user initiates pairing.
Jake Hamby [Sat, 25 Sep 2010 00:16:37 +0000 (17:16 -0700)]
am
dd79a33b: Auto-connect Bluetooth device only when user initiates pairing.
Merge commit '
dd79a33ba53fec530094f4d2fe37f0538530d9f8' into gingerbread-plus-aosp
* commit '
dd79a33ba53fec530094f4d2fe37f0538530d9f8':
Auto-connect Bluetooth device only when user initiates pairing.
Daisuke Miyakawa [Fri, 24 Sep 2010 22:10:41 +0000 (15:10 -0700)]
Modify title color.
Change-Id: I3b0ab29ec33aadc5940ed2d8aa54dfffea2d55e6
Jake Hamby [Fri, 24 Sep 2010 02:16:28 +0000 (19:16 -0700)]
Auto-connect Bluetooth device only when user initiates pairing.
Fix bug
2271901: do not auto-connect to services on a BT device
when pairing was initiated by the device (e.g. for OPP file transfer).
Also corrected some typos and removed an unneeded lock object in
LocalBluetoothManager (synchronize on .class object instead, like
android.bluetooth.BluetoothDevice.getService() does).
Change-Id: I121105c6eee2658129f6094786754bbc7932d324
Eric Fischer [Fri, 24 Sep 2010 20:20:38 +0000 (13:20 -0700)]
Merge "Import revised translations."
Daisuke Miyakawa [Fri, 24 Sep 2010 20:00:38 +0000 (13:00 -0700)]
Add missing icon.
Change-Id: I3747f65bea5ddfb2b050f8da9bcbcd3fd2f9acc4
Eric Fischer [Fri, 24 Sep 2010 19:28:13 +0000 (12:28 -0700)]
Import revised translations.
Change-Id: Iaf1681fd1e93df389d6028cf41d6f830f509b7ce
Eric Fischer [Fri, 24 Sep 2010 18:26:37 +0000 (11:26 -0700)]
am
4cc41d87: (-s ours) am
b2fa8719: Import revised translations. DO NOT MERGE
Merge commit '
4cc41d87f6906e26091982e4e0df7d9333915bfe'
* commit '
4cc41d87f6906e26091982e4e0df7d9333915bfe':
Import revised translations. DO NOT MERGE
Daisuke Miyakawa [Fri, 24 Sep 2010 18:09:21 +0000 (11:09 -0700)]
Merge "Modify implementation around SetupWizard XL"
Eric Fischer [Fri, 24 Sep 2010 18:08:52 +0000 (11:08 -0700)]
am
b2fa8719: Import revised translations. DO NOT MERGE
Merge commit '
b2fa8719a483a3ab36a8d919641714551c470bb8' into gingerbread-plus-aosp
* commit '
b2fa8719a483a3ab36a8d919641714551c470bb8':
Import revised translations. DO NOT MERGE
Daisuke Miyakawa [Fri, 24 Sep 2010 02:14:25 +0000 (19:14 -0700)]
Modify implementation around SetupWizard XL
Bug:
3005211
Change-Id: Ia01957725956d570370aceeab01750d77069001a
Eric Fischer [Fri, 24 Sep 2010 17:26:20 +0000 (10:26 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Iad9da8a6c0559c93c87a3b9f7e8a9258d677705b
Amith Yamasani [Fri, 24 Sep 2010 00:16:10 +0000 (17:16 -0700)]
Merge "Add a delete button to quickly delete a word in the user dictionary."
Amith Yamasani [Thu, 23 Sep 2010 22:41:50 +0000 (15:41 -0700)]
Add a delete button to quickly delete a word in the user dictionary.
Irfan Sheriff [Wed, 22 Sep 2010 20:41:41 +0000 (13:41 -0700)]
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
Irfan Sheriff [Thu, 23 Sep 2010 18:33:59 +0000 (11:33 -0700)]
Merge "Add UI for WPS"
Irfan Sheriff [Fri, 17 Sep 2010 00:53:59 +0000 (17:53 -0700)]
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
Jake Hamby [Thu, 23 Sep 2010 00:05:30 +0000 (17:05 -0700)]
am
5496db04: am
59091c08: Fix Bluetooth device name max length checking.
Merge commit '
5496db047df21a44280c56984dbc296e2a1d7968'
* commit '
5496db047df21a44280c56984dbc296e2a1d7968':
Fix Bluetooth device name max length checking.
Jake Hamby [Wed, 22 Sep 2010 23:26:02 +0000 (16:26 -0700)]
am
59091c08: Fix Bluetooth device name max length checking.
Merge commit '
59091c08f4d0ad8f42013f58ce9bd23ac3306336' into gingerbread-plus-aosp
* commit '
59091c08f4d0ad8f42013f58ce9bd23ac3306336':
Fix Bluetooth device name max length checking.
Jake Hamby [Thu, 16 Sep 2010 23:55:43 +0000 (16:55 -0700)]
Fix Bluetooth device name max length checking.
The Bluetooth device name has a maximum length of 248 bytes in UTF-8
encoding. The settings app previously limited the Bluetooth device
name entered by the user based on the number of characters, which is
incorrect when the name includes non-ASCII characters.
Created a new Utf8ByteLengthFilter class for BluetoothNamePreference
which counts UTF-8 bytes instead of Unicode characters, along with
unit tests.
We can move Utf8ByteLengthFilter into the framework in the future
if it would be useful elsewhere in the system or for applications.
Change-Id: I9debface09659f09d750f3bfe8ad6ddfd34c75c5
Daisuke Miyakawa [Wed, 22 Sep 2010 19:19:34 +0000 (12:19 -0700)]
Let SetupWizard XL use Auto_TIME_ZONE
Bug:
2989496
Change-Id: I37719a70783fc0505598ef9aaad1792d4a0ca1af
Amith Yamasani [Fri, 17 Sep 2010 20:34:47 +0000 (13:34 -0700)]
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.
Amith Yamasani [Wed, 22 Sep 2010 16:57:35 +0000 (09:57 -0700)]
Merge "Use PreferenceActivity and FragmentBreadCrumbs as they offer the same capabilities now."
Amith Yamasani [Tue, 21 Sep 2010 22:48:52 +0000 (15:48 -0700)]
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
Bjorn Bringert [Mon, 20 Sep 2010 11:40:57 +0000 (12:40 +0100)]
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).
Bug:
3017365
Change-Id: I08f3979cd8cdc0742efbc49be95aa59753c94c0d
Bjorn Bringert [Tue, 21 Sep 2010 17:44:19 +0000 (10:44 -0700)]
am
e2b102de: (-s ours) am
28580b4d: Remove Search from the system Settings app DO NOT MERGE
Merge commit '
e2b102de6723b06d26dd5df986884881f72335ea'
* commit '
e2b102de6723b06d26dd5df986884881f72335ea':
Remove Search from the system Settings app DO NOT MERGE
Bjorn Bringert [Tue, 21 Sep 2010 10:05:25 +0000 (03:05 -0700)]
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
Bjorn Bringert [Mon, 20 Sep 2010 11:40:57 +0000 (12:40 +0100)]
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
Dianne Hackborn [Tue, 21 Sep 2010 02:33:53 +0000 (19:33 -0700)]
am
7cad4e2c: am
3a6bb47d: Merge "Some improvements to the manage apps code:" into gingerbread
Merge commit '
7cad4e2c88949b8fffc3cb85de3bbf01f9749cbb'
* commit '
7cad4e2c88949b8fffc3cb85de3bbf01f9749cbb':
Some improvements to the manage apps code:
Dianne Hackborn [Tue, 21 Sep 2010 00:09:39 +0000 (17:09 -0700)]
am
3a6bb47d: Merge "Some improvements to the manage apps code:" into gingerbread
Merge commit '
3a6bb47d9f97ff55d75a23fac85c0febbabcb2eb' into gingerbread-plus-aosp
* commit '
3a6bb47d9f97ff55d75a23fac85c0febbabcb2eb':
Some improvements to the manage apps code:
Dianne Hackborn [Tue, 21 Sep 2010 00:06:58 +0000 (17:06 -0700)]
Merge "Some improvements to the manage apps code:" into gingerbread
Dianne Hackborn [Mon, 20 Sep 2010 18:40:46 +0000 (11:40 -0700)]
Some improvements to the manage apps code:
- Battery stats now aggregates bluetooth usage.
- Battery stats now uses new history iterator API.
- Battery stats chart is refectored to have the start of a
common facility for building tick charts.
- Manage apps will now asynchronously wait for the apps list
if it is taking >.25ms to build.
Change-Id: I568dd74beedf9a0a5a4c88ab567510cee9af8299
Bjorn Bringert [Mon, 20 Sep 2010 20:06:25 +0000 (13:06 -0700)]
am
2441c93d: (-s ours) am
8fdaff05: am
f4d359d3: (-s ours) Remove Search from the system Settings app DO NOT MERGE
Merge commit '
2441c93def76c398eb3615f6109606dc021c4f27'
* commit '
2441c93def76c398eb3615f6109606dc021c4f27':
Remove Search from the system Settings app DO NOT MERGE
Bjorn Bringert [Mon, 20 Sep 2010 19:58:42 +0000 (12:58 -0700)]
am
8fdaff05: am
f4d359d3: (-s ours) Remove Search from the system Settings app DO NOT MERGE
Merge commit '
8fdaff05d1154c93b467b9647b8fc2702eca1699' into gingerbread-plus-aosp
* commit '
8fdaff05d1154c93b467b9647b8fc2702eca1699':
Remove Search from the system Settings app DO NOT MERGE
Bjorn Bringert [Mon, 20 Sep 2010 19:48:11 +0000 (12:48 -0700)]
am
f4d359d3: (-s ours) Remove Search from the system Settings app DO NOT MERGE
Merge commit '
f4d359d3c83d0e84319603ecc0f4dce120708612' into gingerbread
* commit '
f4d359d3c83d0e84319603ecc0f4dce120708612':
Remove Search from the system Settings app DO NOT MERGE
Bjorn Bringert [Mon, 20 Sep 2010 11:40:57 +0000 (12:40 +0100)]
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).
Bug:
3017365
Change-Id: I08f3979cd8cdc0742efbc49be95aa59753c94c0d
Daisuke Miyakawa [Sun, 19 Sep 2010 19:12:11 +0000 (12:12 -0700)]
Use Light.Holo in SetupWizard related Settings.
Change-Id: I30e401731717f15567222b263134a2170a4838da
Dianne Hackborn [Sat, 18 Sep 2010 01:14:00 +0000 (18:14 -0700)]
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.
Dianne Hackborn [Fri, 17 Sep 2010 22:20:06 +0000 (15:20 -0700)]
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.
Irfan Sheriff [Fri, 17 Sep 2010 21:16:44 +0000 (14:16 -0700)]
Merge "fix add wifi network dialog"
Irfan Sheriff [Fri, 17 Sep 2010 21:11:30 +0000 (14:11 -0700)]
fix add wifi network dialog
On changing security type with the spinner,
the password/eap fields should change accordingly.
Due to a bug with checking of the spinner, this
was not happening. fix it.
Bug:
1654928
Change-Id: I9bb174448694671206293ccdc380a9aad14a3f12
Dianne Hackborn [Thu, 16 Sep 2010 08:29:54 +0000 (01:29 -0700)]
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
Daisuke Miyakawa [Thu, 16 Sep 2010 03:09:12 +0000 (20:09 -0700)]
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
Daisuke Miyakawa [Fri, 17 Sep 2010 18:06:30 +0000 (11:06 -0700)]
Merge "Fragmentize wifi.AdvancedSettings."
Daisuke Miyakawa [Fri, 17 Sep 2010 18:05:31 +0000 (11:05 -0700)]
Merge "Fragmentize VoiceOutputSettings."
Irfan Sheriff [Fri, 17 Sep 2010 17:12:16 +0000 (10:12 -0700)]
Merge "Fix NPE in wifi setup wizard"
Jaikumar Ganesh [Fri, 17 Sep 2010 06:24:15 +0000 (23:24 -0700)]
am
356745ec: am
213d579f: Merge "Don\'t disconnect the same device before connecting." into gingerbread
Merge commit '
356745ecc63419a2569345186e8612a5b0ced28d'
* commit '
356745ecc63419a2569345186e8612a5b0ced28d':
Don't disconnect the same device before connecting.
Jaikumar Ganesh [Fri, 17 Sep 2010 05:15:50 +0000 (22:15 -0700)]
am
213d579f: Merge "Don\'t disconnect the same device before connecting." into gingerbread
Merge commit '
213d579f98a83145989f11cfdbd47631b64de000' into gingerbread-plus-aosp
* commit '
213d579f98a83145989f11cfdbd47631b64de000':
Don't disconnect the same device before connecting.
Irfan Sheriff [Fri, 17 Sep 2010 02:35:03 +0000 (19:35 -0700)]
Fix NPE in wifi setup wizard
Add static wifi IP UI xml layout for set up wizard
Bug:
3009285
Change-Id: I8161f290c6ee66117ae37da68de1d52fc42d5f61
Jaikumar Ganesh [Fri, 17 Sep 2010 02:08:32 +0000 (19:08 -0700)]
Merge "Don't disconnect the same device before connecting." into gingerbread
Jaikumar Ganesh [Fri, 17 Sep 2010 01:24:42 +0000 (18:24 -0700)]
Don't disconnect the same device before connecting.
We Pair: Remote device sends incoming connection, we get connected.
We get BondingState change and we connect.
Settings app disconnects connected profiles and then connects
without checking whether we are disconnecting the same device itself.
How was it working before ? Settings app used to queue all
commands. The disconnect followed by the connect would work
but unnecessarily disconnect and then connect.
With the queuing moved to framework, the connect fails
since the disconnect status has not been broadcasted.
Settings app shouldn't be disconnecting connected profiles.
That logic should reside in the framework. There is an open bug
and when the new APIs get implemented this will get removed.
Change-Id: I32a7fa36ff3c3321691c55071498f985dcdcfe8e
Svetoslav Ganov [Wed, 30 Jun 2010 02:41:43 +0000 (19:41 -0700)]
WebView accessibility support - Adding opt-in setting for enabling accessibility script injection from Google
Change-Id: I1676f34c30a0e9414d51060ad4fb2c9c502b09c3
Daisuke Miyakawa [Tue, 14 Sep 2010 00:52:13 +0000 (17:52 -0700)]
Fragmentize VoiceOutputSettings.
Change-Id: Ifc8f9a8169cf43f53dc122342d95eac6058e6c88
Daisuke Miyakawa [Thu, 16 Sep 2010 16:38:44 +0000 (09:38 -0700)]
Refrain flickering in AccessibilitySettings.
Bug:
3006118
Change-Id: I40249340242323e23bbd3008a8fb50589e939096