OSDN Git Service
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
Eric Fischer [Fri, 4 May 2012 20:57:33 +0000 (13:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia8f1965490d5e34f0354724471feb2da0ee3b310
Jeff Sharkey [Fri, 4 May 2012 19:04:18 +0000 (12:04 -0700)]
Merge "Avoid animation flashing and fix padding." into jb-dev
Jeff Sharkey [Fri, 4 May 2012 18:47:29 +0000 (11:47 -0700)]
Avoid animation flashing and fix padding.
Bug:
6446203
Change-Id: Icea64d5d30d894a6438af9278bc2d10b8b921d29
Jeff Sharkey [Fri, 4 May 2012 18:15:29 +0000 (11:15 -0700)]
Merge "Better messaging when Wi-Fi disabled." into jb-dev
Jeff Sharkey [Fri, 4 May 2012 17:26:46 +0000 (10:26 -0700)]
Better messaging when Wi-Fi disabled.
Bug:
6443166
Change-Id: I262e559e5c209d3f1959d5d2ab9a2aebb8180c59
Vikram Aggarwal [Fri, 4 May 2012 17:20:45 +0000 (10:20 -0700)]
Center clock on phones
Fix b/
5579000
Change-Id: I80431999939fbecdf693649d58ad2031c03208b0
Vikram Aggarwal [Thu, 3 May 2012 22:35:03 +0000 (15:35 -0700)]
Go into airplane mode in minimal boot mode.
Fix b/
6006192
Change-Id: Ied4d9b51aac4e8ac1d2114aa1e95d4ebbe93413b
satok [Fri, 4 May 2012 05:15:03 +0000 (22:15 -0700)]
Merge "Always on the valid system default ime" into jb-dev
Eric Fischer [Thu, 3 May 2012 23:01:16 +0000 (16:01 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Thu, 3 May 2012 22:55:12 +0000 (15:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifb5adb2d887e6264aca0e664a119e9421739b2e5
Jeff Sharkey [Thu, 3 May 2012 22:13:49 +0000 (15:13 -0700)]
Merge "Fall back to Wi-Fi data when SIM missing." into jb-dev
Jeff Sharkey [Thu, 3 May 2012 22:02:06 +0000 (15:02 -0700)]
Fall back to Wi-Fi data when SIM missing.
Bug:
6427657
Change-Id: I0613b4b89ddbea1cde2fd96ce6dd4bacb0fb4eaa
Vikram Aggarwal [Wed, 2 May 2012 23:29:10 +0000 (16:29 -0700)]
UI fixes for tablets
1. Center the clock on Xoom and large tablets. Fix b/
5579000
2. Correctly remove the emergency call button if the device (*cough*
Nakasi *cough*) does not have telephone capability.
Change-Id: Ib7552dc35392a1b9d6c0381c6167949e2b163ddc
Vikram Aggarwal [Wed, 2 May 2012 23:19:10 +0000 (16:19 -0700)]
Merge "Include the clock in landscape on Xoom" into jb-dev
Vikram Aggarwal [Wed, 2 May 2012 23:07:14 +0000 (16:07 -0700)]
Merge "Notification alert every 5s and start after 30s." into jb-dev
Vikram Aggarwal [Wed, 2 May 2012 22:08:38 +0000 (15:08 -0700)]
Include the clock in landscape on Xoom
1. R.id.status was defined twice and was used inconsistently in code:
(visibility set to enabled, but only on portrait...) This code removes
the bad view.
2. The TextView date was never used, either by another layout or by
code. Deleting this view too.
3. Including a standard status layout on smallest-width-600px, which includes
a clock and a status message on Xoom.
Fix b/
6061076
Change-Id: Ibb492e89f6a4a38ac6a22398ec9c14bbe3fb7e3d
Eric Fischer [Wed, 2 May 2012 21:11:40 +0000 (14:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie7a0ad55aa358abded6d5fe7d9d75b34dfc1c450
Vikram Aggarwal [Tue, 1 May 2012 23:46:06 +0000 (16:46 -0700)]
Notification alert every 5s and start after 30s.
Justification: Most users will not need prompting, so for them a
notification will be an annoyance. So we only notify if the no
password has been entered for 30 seconds.
Once a notification sound is made, we need to make it frequently so
the user can locate the device.
Change-Id: Ibf531aec89b5e3b3c72eaa36016bcc4cac1d6493
satok [Wed, 2 May 2012 11:51:49 +0000 (20:51 +0900)]
Always on the valid system default ime
Bug:
6422390
Change-Id: I9af4065e4b9f9332f3b0db168dea5546727d5951
Amith Yamasani [Tue, 1 May 2012 23:15:25 +0000 (16:15 -0700)]
Merge "Fix NPE in ManageApps when switching orientation." into jb-dev
Vikram Aggarwal [Tue, 1 May 2012 22:37:30 +0000 (15:37 -0700)]
Notify user when waiting for decryption password
1. Disable back presses from physical keyboard during encryption: Fix b/
6139810
2. Keep screen on when waiting for password. Fix b/
6153213 and b/
6149606
3. Alert the user with sound when waiting for password. Fix b/
6149606
4. Add debugging feature to display the password screen without having to reboot the device.
Change-Id: I588aa7d96e1140f95a6fa91e0281117907f666f7
Amith Yamasani [Tue, 1 May 2012 21:28:22 +0000 (14:28 -0700)]
Fix NPE in ManageApps when switching orientation.
Bug:
6394351
Change-Id: Ia66ab18195325b024223cdbce19756150e1d6c8c
Eric Fischer [Tue, 1 May 2012 20:49:40 +0000 (13:49 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Tue, 1 May 2012 20:32:21 +0000 (13:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie838fa4a75d736bb941cf0a626f0d1d017562dfa
Brian Carlstrom [Tue, 1 May 2012 18:17:02 +0000 (11:17 -0700)]
Do not reuse master_clear_gesture_* strings for credential installation confirmation
Bug: http://code.google.com/p/android/issues/detail?id=29367
Change-Id: I3b651bc84f22b48d651802115600ab4e256bb3a6
Vikram Aggarwal [Tue, 1 May 2012 18:09:39 +0000 (11:09 -0700)]
Enable back in CryptKeeper
Fix b/
6280906
Change-Id: I38d75c4b4c928c77c20bf8eca2649bf6eaa95507
Irfan Sheriff [Tue, 1 May 2012 00:12:33 +0000 (17:12 -0700)]
Merge "Add wifi direct menu only for supported devices" into jb-dev
Jeff Brown [Mon, 30 Apr 2012 23:49:26 +0000 (16:49 -0700)]
Merge "Fix manual brightness adjustment." into jb-dev
Irfan Sheriff [Mon, 30 Apr 2012 23:26:20 +0000 (16:26 -0700)]
Add wifi direct menu only for supported devices
Bug:
6421096
Change-Id: Iaf0ad85e97be8d750dd74808f840c6731d8130fd
Jeff Brown [Mon, 30 Apr 2012 23:19:46 +0000 (16:19 -0700)]
Fix manual brightness adjustment.
getBrightness() was calculating the brightness ratio the wrong
way, resulting in brightness fractions always greater than 1.0
being produced (maximum brightness).
Bug:
6377115
Change-Id: Ia2fbae505ffdc382005722d25301bfb689b585fb
Eric Fischer [Mon, 30 Apr 2012 21:59:39 +0000 (14:59 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Gilles Debunne [Mon, 30 Apr 2012 21:32:35 +0000 (14:32 -0700)]
Merge "Fixed inconsistent gray background in Running app detail" into jb-dev
Eric Fischer [Mon, 30 Apr 2012 20:41:01 +0000 (13:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8ea710c8a4a09a1e8a144d9b713e1fe9738c987d
Amith Yamasani [Mon, 30 Apr 2012 20:37:32 +0000 (13:37 -0700)]
Merge "Move tether settings help to menu and remove local assets." into jb-dev
Gilles Debunne [Mon, 30 Apr 2012 19:47:31 +0000 (12:47 -0700)]
Fixed inconsistent gray background in Running app detail
This is a cherry pick of https://android-review.googlesource.com/#/c/35200/
Checked with UI that this backgroud color was not wanted.
Change-Id: I10cd6757ed17fd3cf34f04e5d14e6f210f78ab2c
Irfan Sheriff [Sat, 28 Apr 2012 17:51:18 +0000 (10:51 -0700)]
Merge "Fix WPS string" into jb-dev
Eric Fischer [Sat, 28 Apr 2012 03:51:35 +0000 (20:51 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Irfan Sheriff [Sat, 28 Apr 2012 03:30:24 +0000 (20:30 -0700)]
Fix WPS string
Change-Id: I5d45863c868c627fc48eefe1e15cb737b694d8ac