OSDN Git Service
Jeff Sharkey [Tue, 15 May 2012 18:39:17 +0000 (11:39 -0700)]
Merge "Enforce READ_EXTERNAL in Developer Options." into jb-dev
Irfan Sheriff [Tue, 15 May 2012 18:39:02 +0000 (11:39 -0700)]
Merge "Push wifi direct to overflow menu" into jb-dev
Irfan Sheriff [Tue, 15 May 2012 18:29:51 +0000 (11:29 -0700)]
Push wifi direct to overflow menu
Bug:
6469022
Change-Id: I62e4b4372416a5fbaf43a52be71f7291b761997b
Jeff Sharkey [Tue, 15 May 2012 03:51:05 +0000 (20:51 -0700)]
Enforce READ_EXTERNAL in Developer Options.
Move from Storage to Developer Options, and add interstitial dialog
with more details.
Bug:
6461446
Change-Id: I6d3d8fdc61a3e920ed58ab4d726949ac3c31feab
Jim Miller [Tue, 15 May 2012 02:59:04 +0000 (19:59 -0700)]
Merge "Fix
6110711: Fix buttons on ChooseLockPattern for landscape layout" into jb-dev
Jim Miller [Sat, 7 Apr 2012 01:01:46 +0000 (18:01 -0700)]
Fix
6110711: Fix buttons on ChooseLockPattern for landscape layout
Change-Id: Ia4086dcc09ae609be85703ba0ea3f1d6ae13b01f
Amith Yamasani [Tue, 15 May 2012 00:53:28 +0000 (17:53 -0700)]
Merge "Fix NPE in Display Settings." into jb-dev
Amith Yamasani [Tue, 15 May 2012 00:46:23 +0000 (17:46 -0700)]
Fix NPE in Display Settings.
Handle occasional race in delivering change notifications.
Bug:
6012882
Change-Id: Ic9eff72920ff65a2c8ab85f4af59ba438cd8f99f
Eric Laurent [Mon, 14 May 2012 23:30:41 +0000 (16:30 -0700)]
Merge "Implement new volume display policy." into jb-dev
Danielle Millett [Mon, 14 May 2012 23:24:42 +0000 (16:24 -0700)]
Merge "Removing the blink checkbox and strings" into jb-dev
Eric Fischer [Mon, 14 May 2012 22:24:25 +0000 (15:24 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Daisuke Miyakawa [Sat, 12 May 2012 00:54:42 +0000 (17:54 -0700)]
Modify menu layout for sound setting
- Move notification setting to "System" section
- Modify strings for category titles
- Change strings' names too to reflect their contents
-- sound_category_calls_and_notification_title
-> sound_category_call_ringtone_vibrate_title
-- soud_category_feedback_title
-> sound_category_system_title
Bug:
6036529
Change-Id: I7aaa83571ae3d69212e9debaec4f3b4ec60a281c
Danielle Millett [Mon, 14 May 2012 21:19:40 +0000 (17:19 -0400)]
Removing the blink checkbox and strings
Change-Id: Ifc7b6e185bf47cb7d11c120afd18d2e29c68bc3a
Eric Fischer [Mon, 14 May 2012 21:38:36 +0000 (14:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic2c20ff6f93efac3f30ac08aec1a69d0a49edcc0
Eric Laurent [Mon, 14 May 2012 21:06:23 +0000 (14:06 -0700)]
Implement new volume display policy.
Whenever a stream type is muted, the progress bar in volume preference
is at 0.
If a stream is muted by ringer mode and does not control ringer mode,
the progress bar is disabled.
Change-Id: I29a5e459754f989369dc80504c18ce7ca08ed891
Amith Yamasani [Mon, 14 May 2012 18:58:24 +0000 (11:58 -0700)]
Merge "Fix up-navigation for different levels of Settings screens." into jb-dev
Amith Yamasani [Fri, 11 May 2012 22:22:04 +0000 (15:22 -0700)]
Fix up-navigation for different levels of Settings screens.
No up affordance for 2-pane screens since there's already
a fragment breadcrumb for navigating up.
Bug:
6452961
Change-Id: Iad9a5c2d0b68cc8f2aec7d5ed8e2ab14d023d48c
Eric Fischer [Mon, 14 May 2012 17:40:43 +0000 (10:40 -0700)]
Fix "boumds" typo.
Change-Id: Ideec0c8688c9ee9677039038825b5473aaaed7ba
Dianne Hackborn [Sun, 13 May 2012 22:25:14 +0000 (15:25 -0700)]
Merge "Implement issue #
6477793: Add "restore" button to manage apps" into jb-dev
Dianne Hackborn [Sun, 13 May 2012 22:19:57 +0000 (15:19 -0700)]
Implement issue #
6477793: Add "restore" button to manage apps
Added!
Change-Id: I1b4ffdd24a1c5878ae3acf3970f9364304eb5250
Jeff Brown [Sat, 12 May 2012 02:33:09 +0000 (19:33 -0700)]
Merge "Update references to PowerManager constants that have moved." into jb-dev
Jeff Brown [Sat, 12 May 2012 01:39:30 +0000 (18:39 -0700)]
Update references to PowerManager constants that have moved.
Bug:
6435382
Change-Id: Ieea857644dc0cf758e0ff4fd595c6a0115457df0
Kenny Root [Fri, 11 May 2012 22:49:31 +0000 (15:49 -0700)]
Merge "WiFi: only send engine setting when key_id is set" into jb-dev
Eric Fischer [Fri, 11 May 2012 22:37:09 +0000 (15:37 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Fri, 11 May 2012 22:10:41 +0000 (15:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I94d8cef2d5740b708313cc1f94b169824a3ea06e
Amith Yamasani [Fri, 11 May 2012 19:52:52 +0000 (12:52 -0700)]
Merge "Add a tablet-specific string to describe NFC checkbox." into jb-dev
Kenny Root [Fri, 11 May 2012 17:02:36 +0000 (10:02 -0700)]
Strip off phase2 prefix when setting spinner
The writing and reading code for phase2 settings were asymmetric so the
phase2 spinner would always be set as "None". This change strips off the
prefix to set the spinner.
Bug:
6482316
Change-Id: Iaaa1088ec22625f1b8e3974c8a9610cccf0dda90
Amith Yamasani [Fri, 11 May 2012 17:16:11 +0000 (10:16 -0700)]
Add a tablet-specific string to describe NFC checkbox.
Bug:
6480832
Change-Id: I94e7baeba52528819ace8db7750ff2b7e114938a
Kenny Root [Fri, 11 May 2012 16:08:23 +0000 (09:08 -0700)]
WiFi: only send engine setting when key_id is set
For EAP methods that don't need a key, don't set the engine settings or
else wpa_supplicant will have an error. Instead, look to see whether
key_id is set and use that to indicate when the engine should be
set.
Additionally, don't require keystore when key_id is not null but is
still an empty string.
Bug:
6480500
Change-Id: I137de47dfcbbd3da24d693701e249e15d7528228
satok [Fri, 11 May 2012 09:37:39 +0000 (18:37 +0900)]
Fix the crash during opning the illegal settings of the spell checker
Bug:
5591245
Change-Id: I4ff61a59b0622c74b34bc50a00fc9773c04a6395
Amith Yamasani [Thu, 10 May 2012 22:53:47 +0000 (15:53 -0700)]
Merge "Use Spinner instead of Tabs, so that a 4th entry doesn't disappear off the screen." into jb-dev
Eric Fischer [Thu, 10 May 2012 22:40:45 +0000 (15:40 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Amith Yamasani [Thu, 3 May 2012 19:46:53 +0000 (12:46 -0700)]
Use Spinner instead of Tabs, so that a 4th entry doesn't disappear off the screen.
This is for the 3 to 4 lists that you can switch between in the Settings->Apps
screen.
Bug:
6375122
Change-Id: I8a4e46b8aa3e06bc79edb5f65400462060fe5a29
Eric Fischer [Thu, 10 May 2012 21:30:18 +0000 (14:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie7165c02d6c1dff54464cdaa4121cc7364db0891
Russell Brenner [Thu, 10 May 2012 16:47:55 +0000 (09:47 -0700)]
Change title to "Select Wi-Fi"
Bug:
6471984
Change-Id: I91f9d49e61a4a6e0ee177a7a6304613324357426
Jean Chalard [Thu, 10 May 2012 09:08:07 +0000 (18:08 +0900)]
Fix breadcrumbs for user dictionary settings on tablets.
Bug:
6026080
Change-Id: I1c0fa796c8f60e0c0f406e277d9e29fc09a44742
Jean Chalard [Thu, 10 May 2012 06:08:17 +0000 (15:08 +0900)]
Fix a bug with adding a word
It was possible to insert a word without a shortcut while the same
word used to be present with a shortcut. This change fixes that.
Bug:
6026080
Change-Id: I3be98bf450aad8e2eb38336e8f77aedab39d5797
Jean Chalard [Thu, 10 May 2012 04:05:17 +0000 (13:05 +0900)]
Implement the "more locales" feature.
Bug:
6026080
Change-Id: I051a734321793e9130dc2cc77d4e7f670d2ce93d
Jean Chalard [Thu, 10 May 2012 07:29:21 +0000 (00:29 -0700)]
Merge "Fix a bug with a duplicate entry" into jb-dev
Jean Chalard [Thu, 10 May 2012 07:28:15 +0000 (00:28 -0700)]
Merge "Implement the delete button for user words" into jb-dev
Russell Brenner [Thu, 10 May 2012 05:53:59 +0000 (22:53 -0700)]
Merge "Include Add Network button for Setup Wizard" into jb-dev
Russell Brenner [Thu, 10 May 2012 05:48:38 +0000 (22:48 -0700)]
Merge "Change title to "Wi-Fi network"" into jb-dev
Russell Brenner [Thu, 10 May 2012 01:42:09 +0000 (18:42 -0700)]
Include Add Network button for Setup Wizard
To allow first-time users to set up on networks with hidden SSID,
include this button on the action bar. Temporarily using
placeholder text until artwork is available.
Bug:
6446220
Change-Id: I437ad3f37b42b93f7a0c6838cbb0c5090073e32d
Jean Chalard [Wed, 9 May 2012 11:30:02 +0000 (20:30 +0900)]
Fix a bug with a duplicate entry
When going to the "all languages" dictionary and opening an
entry, the "all languages" entry would be listed twice.
Change-Id: Ie8cd7e9e824e95c05899b956905af6590b8929bc
Jean Chalard [Wed, 9 May 2012 11:15:06 +0000 (20:15 +0900)]
Implement the delete button for user words
Bug:
6026080
Change-Id: I43345874edb0a1b51dfcac9c99e74c345eeef7e6
Russell Brenner [Thu, 10 May 2012 01:15:20 +0000 (18:15 -0700)]
Change title to "Wi-Fi network"
Bug:
6471984
Change-Id: I1b4a1b838f1751bf128978a17e1e01618cd3a26d
Dianne Hackborn [Wed, 9 May 2012 23:32:55 +0000 (16:32 -0700)]
Remove auto-brightness adjustment setting.
Not yet ready for release.
Change-Id: I4668e890080d63a29aeeeab4daad6a6466ae36af
Dianne Hackborn [Wed, 9 May 2012 21:03:26 +0000 (14:03 -0700)]
Tweak development settings to report system property changes.
Uses the new IBinder hack to tell all registered system services
about the property change. This should get most processes of
interest... some of them many times over, even.
This implementation does the broadcast for every debug property
change, though currently the only ones handling it are the
trace and layout bounds debugging properties.
Change-Id: Ibe3a10a40184751b8b2ed00021a224182d8f3f30
Amith Yamasani [Wed, 9 May 2012 20:30:48 +0000 (13:30 -0700)]
Merge "Apps tabs align to title on 2-pane settings." into jb-dev
Amith Yamasani [Wed, 9 May 2012 16:43:33 +0000 (09:43 -0700)]
Apps tabs align to title on 2-pane settings.
Pad the lists in Apps screen.
Pad the color bar to align with the list.
Bug:
6449489
Change-Id: I28c39e2aae04a1fe36c6b7dc447ae19da575edaf
Daisuke Miyakawa [Wed, 9 May 2012 17:16:14 +0000 (10:16 -0700)]
Merge "Introduce new "vibrate when ringing"" into jb-dev
Andrew Flynn [Wed, 9 May 2012 17:10:34 +0000 (10:10 -0700)]
Merge "Allow WiFi picker to exit after a valid connection is made" into jb-dev
Vikram Aggarwal [Wed, 9 May 2012 16:20:51 +0000 (09:20 -0700)]
Merge "Delay audio notification on user interaction" into jb-dev
Jean Chalard [Wed, 9 May 2012 10:51:20 +0000 (19:51 +0900)]
Rework the de-duplication scheme for shortcuts.
Bug:
4646172
Change-Id: I88966f3e910f51711ce49336fb9134d0953930de
Jean Chalard [Wed, 9 May 2012 09:39:36 +0000 (18:39 +0900)]
Pass the shortcut to the user dictionary provider.
Bug:
6026080
Change-Id: I87b7c8b1ae89856f393871e6d3440b43efc22a29
Jean Chalard [Wed, 9 May 2012 08:47:17 +0000 (17:47 +0900)]
Rework the list interface
Display the shortcut in the list, and remove the cross button.
Bug:
6026080
Change-Id: I7f594f07a84e4df3ad5b8160129d92d1a4b0fc28
Jean Chalard [Tue, 8 May 2012 11:39:46 +0000 (20:39 +0900)]
Small cleanup
Change-Id: Id8e8352b725d2259c70690a1a7dfe29fab9b6eb0
Jean Chalard [Tue, 8 May 2012 11:33:54 +0000 (20:33 +0900)]
Improve encapsulation
Change-Id: I30d28c3a62cc5de3432f04b6469eca077ee3eff6
Jean Chalard [Tue, 8 May 2012 11:25:00 +0000 (20:25 +0900)]
Remove the useless parts in the 'add word' dialog.
Bug:
6026080
Change-Id: Ic2bf6dcfc2abfe5fc07759530042299cc6a0b503
Jean Chalard [Tue, 8 May 2012 11:08:39 +0000 (20:08 +0900)]
Move the spinner code to the fragment.
Bug:
6026080
Change-Id: I49e1aa1839266ca169982b6a4800ee9923451be5
Jean Chalard [Tue, 8 May 2012 10:59:15 +0000 (19:59 +0900)]
Cut a helper method to increase encapsulation.
Change-Id: Ie47503a99d455f7266e281914e92ed680b993551
Dianne Hackborn [Wed, 9 May 2012 01:55:30 +0000 (18:55 -0700)]
Merge "Settings to control traces." into jb-dev
Daisuke Miyakawa [Tue, 8 May 2012 19:26:23 +0000 (12:26 -0700)]
Introduce new "vibrate when ringing"
We once removed "vibrate and ring" option with
I7168ed140266a7c754fb3d7209cf12e73041c306, while we still need
vibration setting which only affects Phone app.
This depends on I850d27629a75615647883fdaa2933f337c4824d1
See also I3a4ed2bd5e4bde05dfb97c7bb20b9284d1c6f13f for Phone app
side change.
Bug:
6036529
Change-Id: Idb0453e187f8025565d6744cd774613531e7cb8b
Carlos Valdivia [Wed, 9 May 2012 00:28:44 +0000 (17:28 -0700)]
Merge "Occlude syncs without provider info." into jb-dev
Kenny Root [Tue, 8 May 2012 23:56:00 +0000 (16:56 -0700)]
Merge "Allow movement of forward-locked apps to SD" into jb-dev
Kenny Root [Tue, 8 May 2012 23:54:58 +0000 (16:54 -0700)]
Merge "Revert "Make verifier device id information visible"" into jb-dev
Carlos Valdivia [Tue, 8 May 2012 23:39:15 +0000 (16:39 -0700)]
Occlude syncs without provider info.
Bug: 934147
Change-Id: Ib3413efda07432cfc52cb5b1a20350ed5c7655a8
Amith Yamasani [Tue, 8 May 2012 23:37:31 +0000 (16:37 -0700)]
Merge "Appease the monkey gods." into jb-dev
Kenny Root [Tue, 8 May 2012 23:25:38 +0000 (16:25 -0700)]
Revert "Make verifier device id information visible"
This reverts commit
498fbe470e8201ed6d4a1677025b274d9ca65e0b.
Conflicts:
res/xml/development_prefs.xml
src/com/android/settings/DevelopmentSettings.java
Bug:
6438155
Change-Id: I3ab866d0a269e355388bb3ef41737a7d097df8f6
Kenny Root [Thu, 12 Apr 2012 21:27:21 +0000 (14:27 -0700)]
Allow movement of forward-locked apps to SD
Forward-locked apps are now in ASEC containers which can exist on both
SD card and internal storage. Merry Christmas.
Change-Id: If793cf76858395bfc67cd18ab18f488a83757d5f
Vikram Aggarwal [Tue, 8 May 2012 20:52:30 +0000 (13:52 -0700)]
Delay audio notification on user interaction
Fix the eng pieces of bug
6445429.
Change-Id: I1963d2e701e4b4639cdc75cc3161668d0601747d
Andrew Flynn [Sun, 6 May 2012 21:59:11 +0000 (14:59 -0700)]
Allow WiFi picker to exit after a valid connection is made
Choice is passed in via boolean extra and has two effects:
* A valid network connection exits the picker.
* The next button (if there is one) is hidden.
This functionality will be used for SetupWizard initially.
Bug:
6428046
Change-Id: Ieeed3a9f1013cccd76bd4762131747a57a38ce9c
Dianne Hackborn [Tue, 8 May 2012 00:52:07 +0000 (17:52 -0700)]
Settings to control traces.
Also some re-organization of the debug options, and check for
the case where the global debug setting is turned off but there
are some debug options turned on (in which case we just switch
to the global option being on).
Change-Id: I710e3a009e2be9c7c1a1879a853ac736abf1d8d8
Eric Laurent [Tue, 8 May 2012 22:27:05 +0000 (15:27 -0700)]
Merge "Changes for new vibration policy." into jb-dev
Andrew Flynn [Tue, 8 May 2012 22:24:21 +0000 (15:24 -0700)]
Merge "Hide Back button when requesting intent says to" into jb-dev
Andrew Flynn [Tue, 8 May 2012 20:50:53 +0000 (13:50 -0700)]
Hide Back button when requesting intent says to
Change-Id: I79ed35843500f20367568510ea8df3afe543ede8
Amith Yamasani [Tue, 8 May 2012 19:22:22 +0000 (12:22 -0700)]
Merge "Avoid split action bar on phones." into jb-dev
Jeff Sharkey [Tue, 8 May 2012 18:42:49 +0000 (11:42 -0700)]
Avoid split action bar on phones.
Change-Id: I6cf8400a09562eb905568cd6681773e94df556d8
Jean Chalard [Tue, 8 May 2012 10:45:24 +0000 (19:45 +0900)]
Move the word commit code to UserDictionaryAddWordContent.
...and call it from the fragment too.
Bug:
6026080
Change-Id: Icb83fd60ed33dfa593124ed0af6b9fff4b63f1f5
Jean Chalard [Tue, 8 May 2012 10:11:49 +0000 (19:11 +0900)]
Factor some code
Bug:
6026080
Change-Id: I38475a95b1d421162099390244dbda09658346f5
Jean Chalard [Tue, 8 May 2012 07:35:53 +0000 (16:35 +0900)]
Implement the "add word" screen according to new spec
This is only the interface. It doesn't do anything yet, so as to
avoid a too large change.
Bug:
6026080
Change-Id: I0c7f0c09f71e01b18fcb3566a3c6c4b0f0b2a0fc
Jean Chalard [Tue, 8 May 2012 04:09:06 +0000 (13:09 +0900)]
Fix a janky transition
Bug:
6026080
Change-Id: I75bd244b2b09c371805a67057d2a9c45dc12f3db
Amith Yamasani [Tue, 8 May 2012 01:11:28 +0000 (18:11 -0700)]
Merge "Reduce the amount of I/O done on the UI thread." into jb-dev
Amith Yamasani [Fri, 4 May 2012 17:30:18 +0000 (10:30 -0700)]
Reduce the amount of I/O done on the UI thread.
There was unnecessary saving of IME settings when changing the state
of the checkboxes, causing ANRs when monkeys are switching between
Settings fragments quickly while other background activity is using
I/O as well. In fact, all I/O should be removed, but this change at least
reduces some of it.
Potential fix for:
Bug:
6414289
Change-Id: Ice96f0f9d921128b27ddbe26519a6791d9f01c75
Eric Laurent [Tue, 8 May 2012 00:32:49 +0000 (17:32 -0700)]
Changes for new vibration policy.
Select silent icon based on mAudioManager.getRingerMode() since AudioManager.shouldVibrate()
is deprecated.
Change-Id: Iaa474dbb8c1b5fb8fc3b6eeb3426fde3e7b879c3
Irfan Sheriff [Tue, 8 May 2012 00:15:21 +0000 (17:15 -0700)]
Merge "Remove poor connection UI with watchdog disabled" into jb-dev
Irfan Sheriff [Mon, 7 May 2012 23:23:09 +0000 (16:23 -0700)]
Remove poor connection UI with watchdog disabled
Bug:
6449324
Change-Id: I8ddd486ce433b30dd76d385680fdb79d2b90e8eb
Irfan Sheriff [Mon, 7 May 2012 23:37:16 +0000 (16:37 -0700)]
Merge "Remove NSD checkbox" into jb-dev
Eric Fischer [Mon, 7 May 2012 23:00:06 +0000 (16:00 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Irfan Sheriff [Mon, 7 May 2012 22:51:37 +0000 (15:51 -0700)]
Remove NSD checkbox
Bug:
6449478
Change-Id: Ic4aa44cb08843819c3290b16d906c989ee306727
Eric Fischer [Mon, 7 May 2012 21:00:55 +0000 (14:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5755d0e1a36dab74c96e27361421b0be4dc4d8b9
Amith Yamasani [Fri, 4 May 2012 21:50:43 +0000 (14:50 -0700)]
Appease the monkey gods.
Bug:
6443925
Change-Id: Ia36a154d63763d7a3f826a80a5d1ae678b94208e
Gilles Debunne [Mon, 7 May 2012 18:18:44 +0000 (11:18 -0700)]
Merge "Removed the no longer needed font size span flag fix" into jb-dev
Russell Brenner [Sun, 6 May 2012 19:45:01 +0000 (12:45 -0700)]
Add WPS Push Button back into Setup Wizard Wi-Fi
This isn't yet the image button shown in the UX flows, but pending
artwork and some potential tricky Preference layout changes, this
will give access to the WPS functionality.
Bug:
6449333
Change-Id: Ibda0e48cf972dad10c7e92a7482fca9b3c104559
Gilles Debunne [Fri, 4 May 2012 22:36:19 +0000 (15:36 -0700)]
Removed the no longer needed font size span flag fix
Related to bug
6448052
A text replacement (as opposed to a deletion) should (and will) not removei
the EXCLUSIVE_EXCLUSIVE spans that have limits identical to the replaced
range of charcters.
Change-Id: Iefaeab9e5119e7223ef6800c55ff0c741976e138
Vikram Aggarwal [Fri, 4 May 2012 22:46:10 +0000 (15:46 -0700)]
Merge "Center clock on phones" into jb-dev
Vikram Aggarwal [Fri, 4 May 2012 21:54:37 +0000 (14:54 -0700)]
Merge "Write the airplane setting in addition to sending the Intent." into jb-dev
Eric Fischer [Fri, 4 May 2012 21:27:35 +0000 (14:27 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Vikram Aggarwal [Fri, 4 May 2012 21:09:52 +0000 (14:09 -0700)]
Write the airplane setting in addition to sending the Intent.
dab was right. :)
Fix b/
6006192 in association with https://android-git.corp.google.com/g/187160
Change-Id: I3edfb3191ab35a4e5de1b18f3e2e1dae5f882354
Vikram Aggarwal [Fri, 4 May 2012 21:05:49 +0000 (14:05 -0700)]
Merge "Go into airplane mode in minimal boot mode." into jb-dev