Commit Graph

3828 Commits

Author SHA1 Message Date
Amith Yamasani
e53cb16d3b am 6d41da5f: am 580c80f8: Conditionally remove Dock settings shortcut and Power control widget.
* commit '6d41da5ff5730287e93fbb0758743f3980648f31':
  Conditionally remove Dock settings shortcut and Power control widget.
2011-01-09 12:10:18 -08:00
Amith Yamasani
6d41da5ff5 am 580c80f8: Conditionally remove Dock settings shortcut and Power control widget.
* commit '580c80f853747741ae74fbb6f670315077586208':
  Conditionally remove Dock settings shortcut and Power control widget.
2011-01-09 12:08:41 -08:00
Amith Yamasani
580c80f853 Conditionally remove Dock settings shortcut and Power control widget.
Bug: 3258028
Bug: 3248740

Change-Id: Id37787cc9562cde13048e8dfba957599219d94b5
2011-01-09 12:03:45 -08:00
Eric Fischer
13bfcff7fd am 18f2cc8f: am 40bcf565: (-s ours) am 6418d373: Import translations for additional languages.
* commit '18f2cc8f21ad8294e111aea178d9c7f41a151ecd':
  Import translations for additional languages.
2011-01-08 13:15:07 -08:00
Eric Fischer
18f2cc8f21 am 40bcf565: (-s ours) am 6418d373: Import translations for additional languages.
* commit '40bcf565d3613dd8e7530aafa3ece68a47e19a10':
  Import translations for additional languages.
2011-01-08 05:32:35 -08:00
Fabrice Di Meglio
efdb39ca4f am ce9f77bb: Fix for bug #3325868 (add accounts should not use the settings activity as part of its flow)
* commit 'ce9f77bb558434b9daa40304d3eb8a7201865ac8':
  Fix for bug #3325868 (add accounts should not use the settings activity as part of its flow)
2011-01-08 04:40:11 -08:00
Fabrice Di Meglio
ce9f77bb55 Fix for bug #3325868 (add accounts should not use the settings activity as part of its flow)
- suppress non needed AccountSyncSettingsInAddAccount class

Change-Id: I27ba9ea2d45a5e2c9ec1d2ed6033f6d68e100a3f
2011-01-07 17:47:59 -08:00
Vasu Nori
d0da8c3838 am b1a234ef: Merge "bug:3276501 set CHAR_LIMIT for i18n purposes" into honeycomb
* commit 'b1a234ef46dffa625acc37dac3d612a52149ba2d':
  bug:3276501 set CHAR_LIMIT for i18n purposes
2011-01-07 16:12:57 -08:00
Amith Yamasani
fcbd5ac1a6 am 9587121f: Merge "Use a resizable dialog for wifi configuration." into honeycomb
* commit '9587121fe56484105fa7b4776beafc772f86f7cf':
  Use a resizable dialog for wifi configuration.
2011-01-07 16:12:54 -08:00
Vasu Nori
b1a234ef46 Merge "bug:3276501 set CHAR_LIMIT for i18n purposes" into honeycomb 2011-01-07 15:41:11 -08:00
Amith Yamasani
9587121fe5 Merge "Use a resizable dialog for wifi configuration." into honeycomb 2011-01-07 15:35:31 -08:00
Amith Yamasani
25b69ebccc Use a resizable dialog for wifi configuration.
Bug: 3175152

Use a custom theme that allows the dialog to resize.

Change-Id: I004b91c58d0d1810df50f9bdee9430698f51f8ab
2011-01-07 15:31:35 -08:00
Amith Yamasani
7ab5bdcd40 am 167f72ba: Merge "Don\'t add wifi entries twice, when returning from another activity." into honeycomb
* commit '167f72ba7c2a1e0797253766d4447a24a7d244c2':
  Don't add wifi entries twice, when returning from another activity.
2011-01-07 15:30:08 -08:00
Amith Yamasani
167f72ba7c Merge "Don't add wifi entries twice, when returning from another activity." into honeycomb 2011-01-07 15:24:47 -08:00
Vasu Nori
450bcb32ea bug:3276501 set CHAR_LIMIT for i18n purposes
Change-Id: I0e230f3f935d3a657bff5e2092ff20ca8d0f8e95
2011-01-07 14:48:46 -08:00
Jim Miller
8c74072e9c Fix 3281395: Fix duplicate title in LockScreen Settings.
Change-Id: I3c53d1864e521f4245b94d39664266891a728615
2011-01-07 13:37:30 -08:00
Amith Yamasani
935d6e9309 Don't add wifi entries twice, when returning from another activity.
Bug: 3209730
Change-Id: I7408a56fc10359e508be5a1d27492da2227335ce
2011-01-07 13:13:24 -08:00
Eric Fischer
6986495bcb am 9765a444: Merge "Import some unabbreviated translations for large screens." into honeycomb
* commit '9765a444cdda6594338b726d3948d07f3f1f6393':
  Import some unabbreviated translations for large screens.
2011-01-07 13:08:25 -08:00
Eric Fischer
9765a444cd Merge "Import some unabbreviated translations for large screens." into honeycomb 2011-01-07 12:58:37 -08:00
Jason parks
ff893241cc Merge "Add a setting to enable encryption." 2011-01-07 11:52:06 -08:00
Jason parks
1533eb826b Add a setting to enable encryption.
This isn't final and it will wipe your device.

Change-Id: I3449f04514a430f11f353543fdb78e17df16fba3
2011-01-07 13:43:01 -06:00
Jake Hamby
99bdf2ce23 Merge "Don't auto connect reverse tethering after pairing." into honeycomb 2011-01-07 10:54:05 -08:00
Jake Hamby
5777bd0113 Merge "Use holographic style for BT pairing dialogs." into honeycomb 2011-01-07 10:53:52 -08:00
Svetoslav Ganov
994acfe348 Merge "3328848 Script injection property is enabled when accessibility is disabled" into honeycomb 2011-01-07 09:25:48 -08:00
Jake Hamby
4bd7cb0e07 Don't auto connect reverse tethering after pairing.
Added boolean param to connect() method in CachedBluetoothDevice
to specify whether to connect PAN profile. This is set to true when
the user clicks on a device in the paired devices list, but false
when auto connecting profiles after pairing and other circumstances.

Bug: 3330207
Change-Id: I6d8d50abb65a8cb24f87ad93c01693923991b6ef
2011-01-06 21:01:30 -08:00
Eric Fischer
40bcf565d3 am 6418d373: Import translations for additional languages.
* commit '6418d373679ef0b73701bacc1de34f68f1c9ade8':
  Import translations for additional languages.
2011-01-06 20:30:09 -08:00
Jake Hamby
2df30b2f07 Use holographic style for BT pairing dialogs.
Use holographic style for BT pairing dialogs.

Bug: 3321504
Change-Id: I111b3112318eff86d44dc81909a5220661e33e79
2011-01-06 20:19:01 -08:00
Eric Fischer
b3ebcd8eeb Import some unabbreviated translations for large screens.
Change-Id: I87158f97c12d779d749c8c05c6b2436bb349bacc
2011-01-06 17:47:49 -08:00
Svetoslav Ganov
c04e3480aa 3328848 Script injection property is enabled when accessibility is disabled
Change-Id: I23da008eea88f3e96a7de4823a6f6ff9d8e21ee0
2011-01-06 16:01:46 -08:00
Jaikumar Ganesh
586fa0264c Merge "Add new pairing dialog for keyboard pairings." into honeycomb 2011-01-06 14:26:57 -08:00
Jaikumar Ganesh
da23ae88d1 Add new pairing dialog for keyboard pairings.
Change-Id: I672a3d874a7876fca6bd38091444dc9c5fb3a2f1
2011-01-06 13:38:09 -08:00
Daisuke Miyakawa
8630cde72b Remove unnecessary codes around WifiSettings.
Bug: 3321110
Change-Id: Iaac35a507b8e46e2d4702f0e5cda7b515a57db67
2011-01-06 13:27:36 -08:00
Eric Fischer
6418d37367 Import translations for additional languages.
Change-Id: Ic94b9ae9229478ad7d0a49d3af9a954b50c8fdf5
2011-01-06 10:39:31 -08:00
Jim Miller
5fe9222304 Merge "Fix 3315401: Prevent pattern confirmation screen from asking twice" 2011-01-05 19:46:05 -08:00
Jim Miller
1bafb6e019 Fix 3315401: Prevent pattern confirmation screen from asking twice
This fixes a bug where changing from PIN to pattern caused
the lock pattern tutorial to ask for the PIN twice and ultimately
crash due to ConfirmLockPattern getting into the wrong state.

Change-Id: Ia3b3186dcd56f2b47a09f54d7636436ee80aa13c
2011-01-05 17:41:31 -08:00
Patrick Dubroy
bc52e4c04f Merge "fix 3185231: Dragging app to info button doesn't work" 2011-01-05 15:43:21 -08:00
Patrick Dubroy
0c5b9ca58b fix 3185231: Dragging app to info button doesn't work
When dragging an app from all apps to the info button, it
is currently showing an empty dialog.
2011-01-05 15:28:21 -08:00
Amith Yamasani
ca3fcf1e0a Merge "Recheck the storage sizes when Storage settings is resumed." 2011-01-05 09:55:44 -08:00
Amith Yamasani
998da3332b Recheck the storage sizes when Storage settings is resumed.
Bug: 3312629

When the Storage fragment is displayed, invalidate the measurement
object so that it recomputes the used space on all partitions.
2011-01-05 09:09:23 -08:00
Joe Onorato
6d744519f5 Merge "Add the CHAR LIMIT annotation" 2011-01-04 18:55:24 -08:00
Joe Onorato
6c1eb53e26 Add the CHAR LIMIT annotation
Bug: 3196825
Change-Id: I64e8b757162000c69dfb61261112185dab651ed0
2011-01-04 18:52:17 -08:00
Chung-yih Wang
af5137bcac Fix the NPE bug due to the process/activity restart.
The active profile and its state were not stored if the setting process
was killed due to the resource. Here we add the state persistence
mechanism to fix this bug.

bug:3293236

Change-Id: I8b8068972237bde06ca4b3f73ecc48c02c4f0833
2011-01-05 10:40:31 +08:00
Eric Fischer
4625bb2af2 Merge changes Ia9338cf2,I5ef641b5
* changes:
  Import revised translations.
  Remove unreferenced layout that used two deleted strings.
2011-01-04 14:48:25 -08:00
Jaikumar Ganesh
9271acc512 Merge "Listen to Input device connection state intents." 2011-01-04 13:41:29 -08:00
Jaikumar Ganesh
bf724587be Listen to Input device connection state intents.
Change-Id: I99addef820438c9c34bfccf2877578b06e14a00c
2011-01-04 13:35:53 -08:00
Daisuke Miyakawa
5915d5d3c5 Add missing id.
If29bb34fce04eab5adc9b5180b70dbfd718cc709 added
proxy_settings_title, which should be available in Setup Wizard
flow.

Bug: 3321533
Change-Id: I4c2590dc728dde573502b91e5ef5b7bd8323bc97
2011-01-04 11:44:09 -08:00
Amith Yamasani
b2835ebdbd Merge "Save and restore brightness on orientation changes." 2011-01-04 10:47:07 -08:00
Gustaf Nilklint
00fa2f578e Fixed a memory leak in the bluetooth settings
Release resources in onPause rather than onResume to fix a memory leak.
Without this fix the app will crash if you are in Bluetooth settings
and tap "Device name" and then roate the device a few times.

Change-Id: I57a8346247c13f5113e7c4ea39dde5b29a7359bb
2011-01-04 07:56:45 +01:00
Amith Yamasani
a80cf2cbf5 Save and restore brightness on orientation changes.
Bug: 2524213
2011-01-03 15:15:41 -08:00
Robert Greenwalt
8a926aa499 Merge "Hide http proxy UI" 2010-12-29 16:26:35 -08:00