Commit Graph

2475 Commits

Author SHA1 Message Date
Dianne Hackborn
3eec44df27 am 3e15e4e9: am 6dc1bf84: Manage apps "on SD card" now shows all apps that can go on SD card.
Merge commit '3e15e4e91b69da9091310bf9aadb1bcffcb3137c'

* commit '3e15e4e91b69da9091310bf9aadb1bcffcb3137c':
  Manage apps "on SD card" now shows all apps that can go on SD card.
2010-10-06 17:08:02 -07:00
Irfan Sheriff
297da30060 Merge "Fix style for text colour settings" 2010-10-06 16:00:38 -07:00
Irfan Sheriff
30482aff01 Fix style for text colour settings
Bug: 3061128
Change-Id: I8ad81f829bb8c34d2d288a13ce49a14c6e97192d
2010-10-06 15:58:40 -07:00
Dianne Hackborn
4b21f7cd94 Fix issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider
Make the receiver private.  Also fix to correctly update when sync
status changes.

Change-Id: I35481bf5b473196b00427da4df49aa76f691d38b
2010-10-06 14:28:23 -07:00
Daisuke Miyakawa
fef4125d4e Disable buttons during first scan.
Also remove status manager code, as they should not be here.

Bug: 3069020
Change-Id: I6fcf8470066f96b7f608ceb519b0783e44307846
2010-10-06 13:34:18 -07:00
Eric Fischer
84c8c175c8 Import revised translations. DO NOT MERGE
Change-Id: I58d987d8ee9629e2d035a3bfddefedbe185daf8f
2010-10-06 11:56:08 -07:00
Irfan Sheriff
c5361927f4 Add proxy UI for wifi
bug: 3039302
Change-Id: I6fee69992ea78459f06ef270af5bf857eff93c44
2010-10-06 10:40:44 -07:00
Amith Yamasani
44ba0fa9d1 Merge "3053971 Accessibility settings are not using Fragment APIs for dialogs. + 3053903 Pressing back while showing disable accessibility warning disables accessibility with no explicit user consent." 2010-10-05 14:03:13 -07:00
Amith Yamasani
e0e4fc208b Remove singleTop, as it's causing serious problems on the phone. And...
Fix fragment launching from another app - pass along the fragment class name
and bundle from the original intent.

Bug: 3064432
Bug: 3059311 (partial fix)
2010-10-05 13:27:45 -07:00
Dianne Hackborn
3e15e4e91b am 6dc1bf84: Manage apps "on SD card" now shows all apps that can go on SD card.
Merge commit '6dc1bf84cf72dd72a2517878f6b280e8afdcf4c2' into gingerbread-plus-aosp

* commit '6dc1bf84cf72dd72a2517878f6b280e8afdcf4c2':
  Manage apps "on SD card" now shows all apps that can go on SD card.
2010-10-04 23:04:57 -07:00
Dianne Hackborn
6dc1bf84cf Manage apps "on SD card" now shows all apps that can go on SD card.
Change-Id: Icc413891b2b884bb1af340b4c09ab3935c8e51ca
2010-10-04 22:35:26 -07:00
Adam Lesinski
e684399717 Added widget preview image. NOTE: This image should be replaced by a custom graphic.
Change-Id: Ia8abd993b399a9fed567266f699874baa67a09f9
2010-10-04 16:40:29 -07:00
Eric Fischer
4e6466f5ef am 25c52b70: am 340c5c42: Separate the Settings activity name into two different strings.
Merge commit '25c52b70faceb24cade0f5480c372de3f47bdf79'

* commit '25c52b70faceb24cade0f5480c372de3f47bdf79':
  Separate the Settings activity name into two different strings.
2010-10-01 12:06:18 -07:00
Eric Fischer
25c52b70fa am 340c5c42: Separate the Settings activity name into two different strings.
Merge commit '340c5c42370eb9e9a8a1a84e7cf683dc7cf69c74' into gingerbread-plus-aosp

* commit '340c5c42370eb9e9a8a1a84e7cf683dc7cf69c74':
  Separate the Settings activity name into two different strings.
2010-10-01 12:04:08 -07:00
Eric Fischer
340c5c4237 Separate the Settings activity name into two different strings.
The German translators would like to be able to hyphenate the name
shown in the Launcher but to keep the name shown within the activity
as a single word.

Change-Id: I22402c41186fdcdaed2712933ddf0f215b3a3329
2010-10-01 11:45:47 -07:00
Daisuke Miyakawa
ce0a7b2df0 Disable Auto-timezone in SetupWizard
Also remove status bar code, as we shouldn't touch it here.

Bug: 3008295
Change-Id: I1ae3f118eae2cacd135d3ec61f1c27993fe2e166
2010-10-01 09:14:24 -07:00
Dianne Hackborn
3194754bfe am 3cda486c: am 95d7a702: Merge "Fix android:allowClearUserData." into gingerbread
Merge commit '3cda486cd23c3739d70681166979a3e0ea439ed3'

* commit '3cda486cd23c3739d70681166979a3e0ea439ed3':
  Fix android:allowClearUserData.
2010-09-30 22:14:41 -07:00
Svetoslav Ganov
cdd8e34b4f 3053971 Accessibility settings are not using Fragment APIs for dialogs. + 3053903 Pressing back while showing disable accessibility warning disables accessibility with no explicit user consent.
Change-Id: Iac7e7a96d8d9f37d1b39c29237b3e2c93381b39b
2010-09-30 20:19:07 -07:00
Dianne Hackborn
3cda486cd2 am 95d7a702: Merge "Fix android:allowClearUserData." into gingerbread
Merge commit '95d7a702c3a36ffe79da099b717dc76d62a5bab2' into gingerbread-plus-aosp

* commit '95d7a702c3a36ffe79da099b717dc76d62a5bab2':
  Fix android:allowClearUserData.
2010-09-30 19:14:28 -07:00
Dianne Hackborn
95d7a702c3 Merge "Fix android:allowClearUserData." into gingerbread 2010-09-30 19:03:55 -07:00
Dianne Hackborn
2f144fc07d Fix android:allowClearUserData.
Now respect this flag for system apps.

Change-Id: I496b0051a4998cb41b8c07fd0eb85e253de1eb97
2010-09-30 18:49:18 -07:00
Eric Fischer
0b5b53e9ed am ddaf8f49: (-s ours) am f20931bc: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit 'ddaf8f490f8099514c2e3d0767e0838440f3fd1c'

* commit 'ddaf8f490f8099514c2e3d0767e0838440f3fd1c':
  Import revised translations.  DO NOT MERGE
2010-09-30 18:13:01 -07:00
Freeman Ng
ab5c381222 keep screen on in setup wizard datetime and wifi settings activities
bug: 3052067

Change-Id: I5378a5f9afd90e6aaadb25e0284188c25dce6b2a
2010-09-30 17:32:01 -07:00
Eric Fischer
ddaf8f490f am f20931bc: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit 'f20931bc564774bbcae5f1f5f7c9aa35f612dad3' into gingerbread-plus-aosp

* commit 'f20931bc564774bbcae5f1f5f7c9aa35f612dad3':
  Import revised translations.  DO NOT MERGE
2010-09-30 15:58:20 -07:00
Eric Fischer
f20931bc56 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-09-30 15:48:14 -07:00
Ying Wang
c845c6db98 Fix proguard flag file dependency.
Change-Id: I32004f93fe66f54647f1c93125425a9646431070
2010-09-30 13:23:20 -07:00
Ken Wakasa
3cd9ddda0a am bc692e83: am 2d6c0b0d: Update strings for physical keyboard settings.
Merge commit 'bc692e83c4b3bcd6c782935bcd1aff50d23143d0'

* commit 'bc692e83c4b3bcd6c782935bcd1aff50d23143d0':
  Update strings for physical keyboard settings.
2010-09-30 11:29:31 -07:00
Gilles Debunne
e749ddb98d am 345fbf92: am a63b08d9: New assets for power widget: gps, sync
Merge commit '345fbf926aba9dc743a58ace88545c030a1f43f4'

* commit '345fbf926aba9dc743a58ace88545c030a1f43f4':
  New assets for power widget: gps, sync
2010-09-30 11:29:28 -07:00
Gilles Debunne
a6660211b3 am a48d2dbe: am 98289826: Merge "New assets (wifi, bluetooth...)" into gingerbread
Merge commit 'a48d2dbeb2691744ec42c3c9fc64f7d17fda357e'

* commit 'a48d2dbeb2691744ec42c3c9fc64f7d17fda357e':
  New assets (wifi, bluetooth...)
2010-09-30 11:00:10 -07:00
Eric Fischer
9fc1f468f4 resolved conflicts for merge of cf18672a to master
Change-Id: I87a7ef635166f4f90205a4117cbdec8447471af1
2010-09-30 10:56:10 -07:00
Ken Wakasa
bc692e83c4 am 2d6c0b0d: Update strings for physical keyboard settings.
Merge commit '2d6c0b0d7750237caf5e4b679ed14786fe81fde1' into gingerbread-plus-aosp

* commit '2d6c0b0d7750237caf5e4b679ed14786fe81fde1':
  Update strings for physical keyboard settings.
2010-09-30 10:10:29 -07:00
Gilles Debunne
345fbf926a 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
2010-09-30 10:08:43 -07:00
Ken Wakasa
2d6c0b0d77 Update strings for physical keyboard settings.
bug: 2954950
Change-Id: I023de6dbe191ca6525cec51147a916eb746fb3e7
2010-09-30 12:52:52 +09:00
Ken Wakasa
6d5b8951b1 Merge commit '47ad0cf3' into manualmerge
Conflicts:
	res/xml/language_settings.xml
	src/com/android/settings/LanguageSettings.java

Change-Id: I0dbfd4ee51682e2b55cad0af1caa90bbedd598a2
2010-09-30 11:54:31 +09:00
Gilles Debunne
a63b08d9c8 New assets for power widget: gps, sync
Change-Id: Ie075549d7d0dd3193a53b75350340285d3ec80ad
2010-09-29 16:21:19 -07:00
Daisuke Miyakawa
3b6aa41cce Improve UI of WifiSettingsForXL
Change-Id: Idd25251581577246ff3fb6820b9c569454292593
2010-09-29 16:09:42 -07:00
Jake Hamby
582f1f84bb Fix bug where car dock sometimes doesn't connect.
Attempt to connect to car/desk dock after pairing completes. This
fixes a bug where we didn't try to connect if we received the UUID
change intent before the bonding state change intent.

Change-Id: I7c12a4eb23d17d506e43a64bf2a3aa5241debcb9
2010-09-29 15:38:19 -07:00
Eric Fischer
3388aac10a Import revised translations. DO NOT MERGE
Change-Id: I9ea6e351c10191e58ed1d1c2784022f3d099c84b
2010-09-29 14:36:34 -07:00
Gilles Debunne
a48d2dbeb2 am 98289826: Merge "New assets (wifi, bluetooth...)" into gingerbread
Merge commit '98289826e6a36dcb9f6df7b8f407195b2760e3b4' into gingerbread-plus-aosp

* commit '98289826e6a36dcb9f6df7b8f407195b2760e3b4':
  New assets (wifi, bluetooth...)
2010-09-29 12:20:36 -07:00
Gilles Debunne
98289826e6 Merge "New assets (wifi, bluetooth...)" into gingerbread 2010-09-29 12:18:13 -07:00
Eric Fischer
cf18672acf 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.
2010-09-29 12:17:20 -07:00
Gilles Debunne
5fb48a2539 New assets (wifi, bluetooth...)
Change-Id: I1b6c3a7049348aa63dddbacaf615b9ff5d630583
2010-09-29 12:10:37 -07:00
Nick Pelly
d83aaf28bc resolved conflicts for merge of 1ff9ad3f to master
Change-Id: I55137a241e13ec7da1d413cf9b7fd1c1fdd8c4d1
2010-09-29 12:10:35 -07:00
Eric Fischer
5698a75f15 Split strings with SD card references into variations.
Change-Id: I75263d57928817a211fbaf6ed45f828936f8d1be
2010-09-29 12:09:06 -07:00
Ken Wakasa
47ad0cf3bc am d2c3f37f: Revise the Language & keyboard settings layout.
Merge commit 'd2c3f37fa445130c8cce0f16347d61f66b4b0025' into gingerbread-plus-aosp

* commit 'd2c3f37fa445130c8cce0f16347d61f66b4b0025':
  Revise the Language & keyboard settings layout.
2010-09-29 09:58:01 -07:00
Ken Wakasa
d2c3f37fa4 Revise the Language & keyboard settings layout.
bug: 2954950
Change-Id: Ie5815023654c3ee45f73fb6ec08266b11e7ff017
2010-09-29 23:52:02 +09:00
Nick Pelly
1ff9ad3fb4 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.
2010-09-28 22:34:42 -07:00
Nick Pelly
48ad5dfe31 Merge "Add NFC checkbox to Settings app." into gingerbread 2010-09-28 22:32:51 -07:00
Nick Pelly
ad50ba065d 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
2010-09-28 21:26:50 -07:00
Jaikumar Ganesh
5809d33296 Update code for public Bluetooth APIs
Change-Id: Iab22e4ae3206f9085b2d53b8b18dc2abd6197226
2010-09-28 17:53:02 -07:00