OSDN Git Service
The Android Automerger [Wed, 5 Jan 2011 15:26:30 +0000 (07:26 -0800)]
merge in honeycomb-release history after reset to master
Eric Fischer [Tue, 4 Jan 2011 22:48:25 +0000 (14:48 -0800)]
Merge changes Ia9338cf2,I5ef641b5
* changes:
Import revised translations.
Remove unreferenced layout that used two deleted strings.
Jaikumar Ganesh [Tue, 4 Jan 2011 21:41:29 +0000 (13:41 -0800)]
Merge "Listen to Input device connection state intents."
Jaikumar Ganesh [Tue, 4 Jan 2011 20:27:46 +0000 (12:27 -0800)]
Listen to Input device connection state intents.
Change-Id: I99addef820438c9c34bfccf2877578b06e14a00c
Daisuke Miyakawa [Tue, 4 Jan 2011 19:44:09 +0000 (11:44 -0800)]
Add missing id.
If29bb34fce04eab5adc9b5180b70dbfd718cc709 added
proxy_settings_title, which should be available in Setup Wizard
flow.
Bug:
3321533
Change-Id: I4c2590dc728dde573502b91e5ef5b7bd8323bc97
Amith Yamasani [Tue, 4 Jan 2011 18:47:07 +0000 (10:47 -0800)]
Merge "Save and restore brightness on orientation changes."
The Android Automerger [Tue, 4 Jan 2011 15:31:39 +0000 (07:31 -0800)]
merge in honeycomb-release history after reset to master
Amith Yamasani [Mon, 3 Jan 2011 23:15:41 +0000 (15:15 -0800)]
Save and restore brightness on orientation changes.
Bug:
2524213
Robert Greenwalt [Thu, 30 Dec 2010 00:26:35 +0000 (16:26 -0800)]
Merge "Hide http proxy UI"
Robert Greenwalt [Wed, 29 Dec 2010 00:11:12 +0000 (16:11 -0800)]
Hide http proxy UI
We don't have support in the media code so rather than confuse the users
with some apps using proxies and some not we'll just turn it off for all
for now.
bug:
3283883
Change-Id: If29bb34fce04eab5adc9b5180b70dbfd718cc709
Amith Yamasani [Wed, 29 Dec 2010 20:31:33 +0000 (12:31 -0800)]
Merge "Unregister the listener in onStop() instead of onDestroy()"
Amith Yamasani [Wed, 29 Dec 2010 20:29:23 +0000 (12:29 -0800)]
Unregister the listener in onStop() instead of onDestroy()
Bug:
3259661
Daisuke Miyakawa [Tue, 28 Dec 2010 21:48:50 +0000 (13:48 -0800)]
Hide CalendarView in SetupWizard
Bug:
3271797
Change-Id: Ie8f63504a9360e19817040284a95dc7112f1c6c6
Daisuke Miyakawa [Tue, 28 Dec 2010 20:11:34 +0000 (12:11 -0800)]
Merge "Refresh layouts for SetupWizard."
Daisuke Miyakawa [Tue, 28 Dec 2010 20:06:08 +0000 (12:06 -0800)]
Refresh layouts for SetupWizard.
- DateTimeSettingsSetupWizardXL
- WifiSettingsForSetupWizardXL
Bug:
3308677,
3137755
Change-Id: Ifdf67aa7521de7ef0286fea2b15ce693fbf5d5ce
Jean-Baptiste Queru [Tue, 28 Dec 2010 20:04:44 +0000 (12:04 -0800)]
am
9a10fb0b: am
e8531ff6: Merge "Changed the text input type of APN name to plain text"
* commit '
9a10fb0bbca164a5cf453b19522e369188b50c85':
Changed the text input type of APN name to plain text
Jean-Baptiste Queru [Tue, 28 Dec 2010 20:02:44 +0000 (12:02 -0800)]
am
e8531ff6: Merge "Changed the text input type of APN name to plain text"
* commit '
e8531ff6a03a0542b7b1531ddd469befed9bab85':
Changed the text input type of APN name to plain text
Jean-Baptiste Queru [Tue, 28 Dec 2010 19:52:15 +0000 (11:52 -0800)]
Merge "Changed the text input type of APN name to plain text"
Daisuke Miyakawa [Tue, 28 Dec 2010 17:22:24 +0000 (09:22 -0800)]
Check null on Wifi setup screen.
Bug:
3313432
Change-Id: Id475dbca81be9e8f9a7d61cda062095358a725c1
satok [Tue, 21 Dec 2010 14:50:38 +0000 (23:50 +0900)]
Add a preference for selecting subtypes automatically
bug:
3142286
Change-Id: I9129df7671252d7ccc611a2892a4ba96e1dacdaf
Eric Fischer [Thu, 23 Dec 2010 22:18:00 +0000 (14:18 -0800)]
Import revised translations.
Change-Id: Ia9338cf200345ea00eb0179ca06770a9c47c16d8
Eric Fischer [Thu, 23 Dec 2010 21:44:59 +0000 (13:44 -0800)]
Remove unreferenced layout that used two deleted strings.
Change-Id: I5ef641b5c82ba1af5055b42748fc6713d31dd775
Jim Miller [Wed, 22 Dec 2010 06:03:06 +0000 (22:03 -0800)]
Fix
3148496: Update LockPatternTutorial to be one screen.
This combines the two activities ChooseLockPatternExample and
ChooseLockPatternTutorial into one activity and makes use of the
built-in LockPatternView animation to show an example view.
Change-Id: If3a4b236a15a6d99b1c0b5c11e5e923267fa30d3
Jake Hamby [Fri, 17 Dec 2010 02:33:28 +0000 (18:33 -0800)]
Enable reverse tethering in BT settings screen.
- Enable support for reverse tethering in BT settings.
- Add string resource for "Auto connect" preference.
- Remove unused imports and other minor cleanups.
- Add isConnectable() and isAutoConnectable() methods to Profile
enum type and remove isConnectableProfile() method.
Change-Id: Ie606db04028a8278e98231f0671a388671f2f067
The Android Automerger [Wed, 22 Dec 2010 16:09:00 +0000 (08:09 -0800)]
merge in honeycomb-release history after reset to master
Jim Miller [Sat, 18 Dec 2010 02:23:23 +0000 (18:23 -0800)]
Fix
3281395: Use breadcrumb area to display title for LockScreen
Change-Id: Icd631b4c70e7b9f6b9a8c24dd513aed259a22d6a
The Android Automerger [Tue, 21 Dec 2010 16:14:57 +0000 (08:14 -0800)]
merge in honeycomb-release history after reset to master
Amith Yamasani [Mon, 20 Dec 2010 21:13:13 +0000 (13:13 -0800)]
Update capitalization in a string.
Remove an unused string.
Bug:
3267633
Change-Id: Icaf162ab6a39da2ef28ef89ed1245b9f3bae34fd
The Android Automerger [Mon, 20 Dec 2010 15:38:53 +0000 (07:38 -0800)]
Merge branch 'master' into honeycomb-release
* master:
Fix a null pointer exception when disabledSystemIMEs is null.
Add minTickWidth for the bar chart
Add a scroll view to proxy settings so that it isn't obscured by the keyboard.
fix the TooManyDeletes to show up again
Refactor memory measurement
satok [Mon, 20 Dec 2010 03:35:00 +0000 (19:35 -0800)]
Merge "Fix a null pointer exception when disabledSystemIMEs is null."
satok [Mon, 20 Dec 2010 03:27:55 +0000 (12:27 +0900)]
Fix a null pointer exception when disabledSystemIMEs is null.
Bug:
3298244
Change-Id: Ifb3349def052bd50633b0cfe04e5636e22115245
Kenny Root [Fri, 17 Dec 2010 22:56:10 +0000 (14:56 -0800)]
Merge "Add minTickWidth for the bar chart"
Kenny Root [Fri, 17 Dec 2010 19:57:14 +0000 (11:57 -0800)]
Add minTickWidth for the bar chart
At jsharkey's request.
Change-Id: Ic489e534fe793fc7ec3fd2bedc5bb256be99daec
The Android Automerger [Fri, 17 Dec 2010 21:44:53 +0000 (13:44 -0800)]
Merge branch 'master' into honeycomb-release
* master:
Implement new design for settings of InputMethods
Tweak Privacy settings to match latest mocks
fix wifi checkbox status update
Change BT pairing UI PIN dialog string for clarity.
Show "not configurable" screen in EAP
Use different text in unsecured network.
Amith Yamasani [Fri, 17 Dec 2010 20:10:56 +0000 (12:10 -0800)]
Merge "Add a scroll view to proxy settings so that it isn't obscured by the keyboard."
Amith Yamasani [Fri, 17 Dec 2010 20:08:43 +0000 (12:08 -0800)]
Add a scroll view to proxy settings so that it isn't obscured by the keyboard.
Bug:
3267408
Change-Id: I06ab34538a741aa76301048ccbeb80a6e70219f3
Fred Quintana [Thu, 16 Dec 2010 21:59:56 +0000 (13:59 -0800)]
fix the TooManyDeletes to show up again
It was moved so it was no longer in the location that
SyncManager expected. I fixed it by (a) moving it to the
SyncManager directory and by (b) changing the SyncManager to
refer to it by class rather than by class name, which means
it will now check for it at compile time, not run time.
Bug:
3289922
Change-Id: I93fb78432e66ff14e1f750b06f79425c457399c2
Kenny Root [Tue, 14 Dec 2010 00:23:57 +0000 (16:23 -0800)]
Refactor memory measurement
Move out all the memory measurement to a separate class that can cache
all of its data through orientation changes.
Tweak the display to make it draw large squares for the legend instead
of a 1x1 square. Add padding to the percentage bar chart.
Change-Id: I4cd5bc4ba31a422a55740e8f58e5e571cf9866a5
satok [Tue, 14 Dec 2010 19:57:24 +0000 (04:57 +0900)]
Implement new design for settings of InputMethods
Change-Id: I82392e4a028abe2d588622a7e89fd035966f603a
Christopher Tate [Fri, 17 Dec 2010 01:42:24 +0000 (17:42 -0800)]
Merge "Tweak Privacy settings to match latest mocks"
Christopher Tate [Fri, 17 Dec 2010 01:25:46 +0000 (17:25 -0800)]
Tweak Privacy settings to match latest mocks
"Configure backup" => "Backup account" etc.
Bug
3293714
Change-Id: I1c3a3729e0198c5148496a846ab035d4daddc214
Irfan Sheriff [Thu, 16 Dec 2010 23:52:12 +0000 (15:52 -0800)]
Merge "fix wifi checkbox status update"
Irfan Sheriff [Thu, 16 Dec 2010 22:58:02 +0000 (14:58 -0800)]
fix wifi checkbox status update
Bug:
3277268
Change-Id: Idfabf1be41c5e54cd93695de1bb06164760d7fad
Jake Hamby [Mon, 13 Dec 2010 23:06:01 +0000 (15:06 -0800)]
Change BT pairing UI PIN dialog string for clarity.
When pairing with a Bluetooth keyboard, the user may not realize
that the PIN should be entered on the keyboard as well as the device.
Added "You may need to enter the same PIN on the Bluetooth device."
to pairing dialog string. Also, remove unused Bluetooth device info
debug strings.
Bug:
3270429
Change-Id: I6d7fa70cf7b12c1feafb8347f356c568b10ae646
Daisuke Miyakawa [Wed, 15 Dec 2010 20:27:59 +0000 (12:27 -0800)]
Show "not configurable" screen in EAP
Bug:
3175016
Change-Id: If67c0cbf41adee205c8b3eec410e39bc29c2f04d
Daisuke Miyakawa [Wed, 15 Dec 2010 23:21:25 +0000 (15:21 -0800)]
Use different text in unsecured network.
We don't show any config UI when network is unsecured, while
Previously we've shown "Enter network configuration" anyway.
Also stop showing network status on StatusText (above
AccessPoint). New network status often appears and instructions
are removed unexpectedly.
Bug:
3175016
Change-Id: I3aa288930a8643e178f7c3897b326b7e00964361
The Android Automerger [Thu, 16 Dec 2010 15:39:04 +0000 (07:39 -0800)]
Merge branch 'master' into honeycomb-release
* master:
Fixes a regression in launching certain settings activities.
Fix bug #
3248308 (On account set up, turn on sync for all apps by default; delay sync until after user selects Finish)
Revert: Add checkbox to enable PTP USB mode.
Fix
3148496: Update LockScreen layouts on large device
Remove skip button from datetime settings
Fix an NPE for monkey stability.
Amith Yamasani [Wed, 15 Dec 2010 22:12:43 +0000 (14:12 -0800)]
Fixes a regression in launching certain settings activities.
Some undocumented settings and class names are being used by NotificationManagerService.
Added compatibility activities to handle them.
Bug:
3258668
Fabrice Di Meglio [Wed, 15 Dec 2010 22:44:00 +0000 (14:44 -0800)]
Merge "Fix bug #
3248308 (On account set up, turn on sync for all apps by default; delay sync until after user selects Finish)"
Jim Miller [Wed, 15 Dec 2010 22:37:33 +0000 (14:37 -0800)]
Merge "Fix
3148496: Update LockScreen layouts on large device"
Fabrice Di Meglio [Wed, 15 Dec 2010 03:45:11 +0000 (19:45 -0800)]
Fix bug #
3248308 (On account set up, turn on sync for all apps by default; delay sync until after user selects Finish)
- reuse code by making AccountSyncSettings work in two modes: either use SyncManager or not
Change-Id: I29fc6820aa41ad4689745ed97d38248474033e7e
Mike Lockwood [Wed, 15 Dec 2010 22:26:46 +0000 (14:26 -0800)]
Merge "Revert: Add checkbox to enable PTP USB mode."
Mike Lockwood [Tue, 31 Aug 2010 18:38:44 +0000 (14:38 -0400)]
Revert: Add checkbox to enable PTP USB mode.
Change-Id: I7c00c3c3c5da66a31a68fe0767302d2cdda526a1
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jim Miller [Wed, 15 Dec 2010 18:07:16 +0000 (10:07 -0800)]
Fix
3148496: Update LockScreen layouts on large device
This updates the layouts to conform to the latest UX spec on
large devices and fixes a bug where the IME shown for PIN
selection was the QWERTY keyboard.
Change-Id: Ib9f0b1631f11c8eff6898bfff9447d3dad75cc42
Daisuke Miyakawa [Wed, 15 Dec 2010 19:56:35 +0000 (11:56 -0800)]
Remove skip button from datetime settings
Also force landscape mode in XLarge screen.
Bug:
3285153
Change-Id: I9f4a0de6a36d0be2b5f80b734a4910f4bb154905
Amith Yamasani [Wed, 15 Dec 2010 17:58:15 +0000 (09:58 -0800)]
Merge "Fix an NPE for monkey stability."
Amith Yamasani [Wed, 15 Dec 2010 17:43:44 +0000 (09:43 -0800)]
Fix an NPE for monkey stability.
Bug:
3283484
The Android Automerger [Wed, 15 Dec 2010 15:31:27 +0000 (07:31 -0800)]
Merge branch 'master' into honeycomb-release
Eric Fischer [Wed, 15 Dec 2010 01:36:44 +0000 (17:36 -0800)]
Merge "Import revised translations."
android-merger [Tue, 14 Dec 2010 23:30:29 +0000 (15:30 -0800)]
Amith Yamasani [Tue, 14 Dec 2010 22:38:16 +0000 (14:38 -0800)]
Handle fragment breadcrumbs for deep-linked settings launches.
This adds meta-data to the manifest for specifying the parent fragment and enabling a link
in the breadcrumbs to navigate "up" a level even if the parent is not in the back-stack.
Bug:
3236568
Fix a monkey issue in VpnSettings.
Eric Fischer [Tue, 14 Dec 2010 21:59:18 +0000 (13:59 -0800)]
Import revised translations.
Change-Id: Ic03653ba9e447830ec3d4b3ae5d9c7b4472d6170
Jake Hamby [Tue, 14 Dec 2010 21:40:10 +0000 (13:40 -0800)]
Remove Bluetooth tethering settings screen.
Remove obsolete Bluetooth tethering settings screen. BT tethering can
be turned on and off, but the connection must be initiated by the
remote device. For reverse tethering, there will be a checkbox for
that profile in the regular Bluetooth device settings screen.
Bug:
3283928
Change-Id: Ic25139f8862b305feb0381e61c24b7783fad2366
The Android Automerger [Tue, 14 Dec 2010 15:29:41 +0000 (07:29 -0800)]
Merge branch 'master' into honeycomb-release
Irfan Sheriff [Wed, 8 Dec 2010 19:28:25 +0000 (11:28 -0800)]
Use WpsConfiguration for new API
Change-Id: I4c1544178bcb29e751db56edb781faf9145cdf86
Nick Pelly [Mon, 13 Dec 2010 21:44:10 +0000 (13:44 -0800)]
Fix master build. WirelessSettings is a fragment in
Change-Id: I9ad1104605558859d90dd1ecc083e9ef35bf3fa0
Jaikumar Ganesh [Mon, 13 Dec 2010 21:43:00 +0000 (13:43 -0800)]
Merge "Add ability to connect to only headset profile."
Nick Pelly [Mon, 13 Dec 2010 20:30:40 +0000 (12:30 -0800)]
am
934c1b9f: am
c1286804: Merge "Update Settings for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread
* commit '
934c1b9f4b475112e635989fb3d1a9d191a9c9e7':
Update Settings for new NfcAdapter.getDefaultAdapter(Context)
The Android Automerger [Mon, 13 Dec 2010 15:53:39 +0000 (07:53 -0800)]
Merge branch 'master' into honeycomb-release
Chung-yih Wang [Mon, 13 Dec 2010 09:18:43 +0000 (17:18 +0800)]
Fix the retry the vpn connection issue.
Fix the issue of vpn connection retry if back button is pressed
and the profile state is still in connecting.
bug:
3278489
Change-Id: I8b51fdd65b2fdd8cbe4fb43afd916f1966b77b67
Jaikumar Ganesh [Sat, 11 Dec 2010 01:51:52 +0000 (17:51 -0800)]
Add ability to connect to only headset profile.
Fix some SDP records issues.
Change-Id: I42816527b1ae0749b4b59b7947f1acb9d2e6f001
Svetoslav Ganov [Sat, 11 Dec 2010 01:28:26 +0000 (17:28 -0800)]
Merge "
3244931 ANR while in settings attempting to enable Accessibility->Talkabout (IKXEVEREST-1847)"
Svetoslav Ganov [Thu, 9 Dec 2010 22:53:02 +0000 (14:53 -0800)]
3244931 ANR while in settings attempting to enable Accessibility->Talkabout (IKXEVEREST-1847)
Change-Id: Ifea9324671d0e80a417f4b2fe6dbbe981f8b0679
Nick Pelly [Sat, 11 Dec 2010 01:22:30 +0000 (17:22 -0800)]
am
c1286804: Merge "Update Settings for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread
* commit '
c1286804cc839ec7006d6e9651c73ec7b3180157':
Update Settings for new NfcAdapter.getDefaultAdapter(Context)
Nick Pelly [Sat, 11 Dec 2010 01:18:54 +0000 (17:18 -0800)]
Merge "Update Settings for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread
Amith Yamasani [Fri, 10 Dec 2010 22:25:14 +0000 (14:25 -0800)]
Merge "Move Voice input/output settings to Language & keyboard"
Amith Yamasani [Fri, 10 Dec 2010 21:17:34 +0000 (13:17 -0800)]
Move Voice input/output settings to Language & keyboard
Bug:
3267042
Change-Id: I127a2e9d11fb70283812e68979bdde3976e32cf9
The Android Automerger [Fri, 10 Dec 2010 20:02:15 +0000 (12:02 -0800)]
Merge branch 'master' into honeycomb-release
Eric Fischer [Fri, 10 Dec 2010 18:57:28 +0000 (10:57 -0800)]
Merge "Import revised translations."
Eric Fischer [Fri, 10 Dec 2010 18:06:14 +0000 (10:06 -0800)]
am
5721cb1d: (-s ours) am
99d2471d: Import revised translations. DO NOT MERGE
* commit '
5721cb1d528b097bd2f95dc3cf5cdcb6fec00a8e':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 10 Dec 2010 18:03:51 +0000 (10:03 -0800)]
am
99d2471d: Import revised translations. DO NOT MERGE
* commit '
99d2471d8d6c2a8cc0eb8e4540ba9090d46693d8':
Import revised translations. DO NOT MERGE
Jean-Baptiste Queru [Fri, 10 Dec 2010 16:54:09 +0000 (08:54 -0800)]
am
9b9c61f6: am
2a7c5425: reconcile with open-source gingerbread
* commit '
9b9c61f6154cfb39c280837698da5834714cab90':
Jean-Baptiste Queru [Fri, 10 Dec 2010 16:49:47 +0000 (08:49 -0800)]
am
2a7c5425: reconcile with open-source gingerbread
* commit '
2a7c542594e37f61e25fec7f441eb0a8dc14fd62':
Mike Lockwood [Fri, 10 Dec 2010 06:34:07 +0000 (22:34 -0800)]
Rename android.hardware.Usb to UsbManager
Change-Id: Id0c0659c29190609bf9ccf4acb56b9402157f41a
Signed-off-by: Mike Lockwood <lockwood@android.com>
Nick Pelly [Fri, 10 Dec 2010 03:39:58 +0000 (19:39 -0800)]
Update Settings for new NfcAdapter.getDefaultAdapter(Context)
Change-Id: I3321d9ebd90313f98664d66b53bb36690808911a
Eric Fischer [Fri, 10 Dec 2010 00:57:40 +0000 (16:57 -0800)]
Import revised translations. DO NOT MERGE
Bug
3272618
Change-Id: Id1c49e216342247bf8574db0bf2a53f8e15bdc6e
Jake Hamby [Wed, 8 Dec 2010 00:27:21 +0000 (16:27 -0800)]
Implement BT settings functionality for new UI.
- Removed context menu logic for long press (no longer used).
- Converted device picker to run in its own Activity, using a dialog
theme on large screen devices and full-screen on phones.
- Removed unused resources.
- Add device to "Paired devices" list when pairing is initiated by the
remote device.
- Return to Bluetooth settings pane after successfully pairing a new
device from the "Find nearby device" pane.
- Add support for renaming devices (TODO: persist the custom name and
update the "bread crumb" in the action bar to the new device name).
- Add support for incoming file transfer and auto connect checkboxes
in DeviceProfilesSettings.
- Show available and connected device profiles as icons instead of
summary text. Available but disconnected profiles are drawn in gray.
- Fixed bluetooth_notif_message to include the device name as a parameter
instead of appending the name to the end of the localized string.
- Changed some fields from private to package scope for more efficient
access from inner classes.
Bug:
3137982
Change-Id: Ic2d6ee5be60c9c5b3f3a8a58846d58efedfa5c93
Eric Fischer [Fri, 10 Dec 2010 00:08:56 +0000 (16:08 -0800)]
Import revised translations.
Change-Id: I58f1a7d3da4c09ad3e00a94bc5353393b99f7d6d
Jeff Brown [Thu, 9 Dec 2010 23:02:18 +0000 (15:02 -0800)]
Merge "Show quick launch settings always."
Christopher Tate [Thu, 9 Dec 2010 21:07:05 +0000 (13:07 -0800)]
Merge "Add backup configuration action to Privacy settings"
Christopher Tate [Thu, 9 Dec 2010 02:46:38 +0000 (18:46 -0800)]
Add backup configuration action to Privacy settings
Settings now queries the backup manager for a configuration Intent and
text descriptive of the state of the currently-active transport. These
are used by a new Intent PreferenceScreen within the backup section of
the Privacy settings UI.
When touched, the Configure item launches the Intent supplied by the
transport; when no such Intent is available, the item is disabled. The
summary text describing the current backup state is also supplied by
the transport.
Bug:
2753632
Change-Id: I3d8fb3d4b08a2b6fa8d3ad8f9e02a66430948423
Jean-Baptiste Queru [Thu, 9 Dec 2010 18:48:44 +0000 (10:48 -0800)]
am
bd73c736: (-s ours) am
1acfef82: merge from gingerbread
* commit '
bd73c73666e906bca888fb3d206a1b5a583e8447':
Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
Jean-Baptiste Queru [Thu, 9 Dec 2010 18:45:31 +0000 (10:45 -0800)]
am
1acfef82: merge from gingerbread
* commit '
1acfef82bd464fdbd3765321a051e59728b4d72b':
Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
Jean-Baptiste Queru [Thu, 9 Dec 2010 18:18:44 +0000 (10:18 -0800)]
reconcile with open-source gingerbread
Change-Id: I2c27148958dbc2c47121d4874e1108389da804c0
Andy Stadler [Wed, 8 Dec 2010 23:57:18 +0000 (15:57 -0800)]
Allow Device Admins to refresh (re-request) activation
* ACTION_ADD_DEVICE_ADMIN now works on already-added admins
Bug:
3253179
Change-Id: I2090339c1fb61295e728bc61ca977ff6028a68dd
Jean-Baptiste Queru [Thu, 9 Dec 2010 17:11:15 +0000 (09:11 -0800)]
merge from gingerbread
Change-Id: Icee740e130b9ebd21446de79b63435f5d1d046e4
Jake Hamby [Sat, 4 Dec 2010 01:02:02 +0000 (17:02 -0800)]
Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
The maximum Bluetooth device name length is 248 bytes. There are bugs in
Bluez and D-Bus that can cause the Bluetooth service to go into a reboot
loop when the device name is set to the maximum length. Changed Settings
app to limit the device name length to 246 bytes.
Bug:
3246147
Change-Id: I2f46303cf44951f0b3907c43d4b096736f08765b
The Android Automerger [Thu, 9 Dec 2010 15:21:54 +0000 (07:21 -0800)]
Merge branch 'master' into honeycomb-release
Amith Yamasani [Thu, 9 Dec 2010 14:07:12 +0000 (06:07 -0800)]
Keep the settings title as "Settings" even if launching a shortcut.
Handle clicks on Settings icon in top-left.
Also fix a bug where Tethering settings was changing the title.
Jeff Brown [Thu, 9 Dec 2010 01:12:11 +0000 (17:12 -0800)]
Show quick launch settings always.
Since external keyboards can be connected, we should always show the
quick launch settings. Unfortunately they still need to be fragmentized.
Change-Id: I1342ef3892a8b1b465ecc5c1346049f8b1ff73cd