OSDN Git Service
Eric Fischer [Fri, 2 Sep 2011 21:52:46 +0000 (14:52 -0700)]
Import revised translations.
Change-Id: I240c28df3578d9b8b25271c39c231d1b3af4c4ac
Jean Chalard [Fri, 2 Sep 2011 12:44:12 +0000 (21:44 +0900)]
Fix an NPE
It seems the user dictionary fragment does not tolerate being
called by name, and needs to be called only by action.
Bug:
5242122
Change-Id: I6b954db549b98d4d0076fdce8e00d336fc18b6e3
Irfan Sheriff [Fri, 2 Sep 2011 04:46:43 +0000 (21:46 -0700)]
Merge "Remove device name and display debug setting"
Ben Komalo [Thu, 1 Sep 2011 23:09:30 +0000 (16:09 -0700)]
Merge "Fix order of buttons for device admin toggle"
Ben Komalo [Thu, 1 Sep 2011 23:01:34 +0000 (16:01 -0700)]
Fix order of buttons for device admin toggle
Bug:
5156853
Change-Id: Ia70d5f42909d8983a0858ed67d32df12c049f420
Irfan Sheriff [Thu, 1 Sep 2011 16:54:32 +0000 (09:54 -0700)]
Remove device name and display debug setting
Device name in WifiP2pConfig is going away
Bug:
5247957
Change-Id: Ib6ada8420ed8e7fbfcab85eee5f1665e33e8f024
Amith Yamasani [Thu, 1 Sep 2011 21:49:08 +0000 (14:49 -0700)]
Merge "Ignore the volume hard keys in Volume settings screen."
Amith Yamasani [Thu, 1 Sep 2011 21:48:15 +0000 (14:48 -0700)]
Merge "Use the same empty message for user dictionary on tablets and phones."
Ben Komalo [Thu, 1 Sep 2011 21:19:18 +0000 (14:19 -0700)]
Merge "Misc UI fixes for settings (mostly cryptkeeper)"
Svetoslav Ganov [Thu, 1 Sep 2011 19:11:30 +0000 (12:11 -0700)]
Merge "Update of accessibility settings"
Ben Komalo [Thu, 1 Sep 2011 17:30:13 +0000 (10:30 -0700)]
Misc UI fixes for settings (mostly cryptkeeper)
- fix padding issues in a lot of cryptkeeper screens
- fix sizing of clock that didn't fit anymore with the new font
- change titles from green to the new holo blue
Bug:
5247866
Change-Id: Ib934e9661c32cce26e1af40eaff133bae11f78dc
Kenny Root [Thu, 1 Sep 2011 17:42:32 +0000 (10:42 -0700)]
Merge "Intent.getAction() can return null"
Svetoslav Ganov [Wed, 31 Aug 2011 23:47:57 +0000 (16:47 -0700)]
Update of accessibility settings
1. Removed the global toggle switch - now each accessibility
feature has to be turned on or off separately.
2. Added a setting for the screen rotation (same as Dispaly)
since most of blind users want that behavior.
bug:
5166161
bug:
5127475
Change-Id: I659aef62a8499461075f43520a3008fa7b8ff911
Justin Ho [Thu, 1 Sep 2011 16:40:10 +0000 (09:40 -0700)]
Merge "Remove unreferenced assets in Settings Bug:
5032006"
Kenny Root [Thu, 1 Sep 2011 16:39:30 +0000 (09:39 -0700)]
Intent.getAction() can return null
Make sure we don't rely on action being non-null when it could be. This
fixes some paths into this Settings screen.
Bug:
5246883
Change-Id: I13e247ff95f389a45f5031a559d5ca4914082af3
Robert Greenwalt [Thu, 1 Sep 2011 15:45:09 +0000 (08:45 -0700)]
Merge "Use the new isNetworkSupported api for wifi-only"
Justin Ho [Thu, 1 Sep 2011 15:35:46 +0000 (08:35 -0700)]
Remove unreferenced assets in Settings
Bug:
5032006
Change-Id: I61b02d1ff01f03903171cf0e3a343133360362c7
Jean Chalard [Thu, 1 Sep 2011 11:58:21 +0000 (20:58 +0900)]
Fix a string that was forgotten
Bug:
5066983
Change-Id: I3daa0d9b37b05c07280d24fdcac0b4342cc11831
Jean Chalard [Thu, 1 Sep 2011 11:40:13 +0000 (04:40 -0700)]
Merge "Update settings wording for ICS"
Jean Chalard [Wed, 31 Aug 2011 12:40:43 +0000 (21:40 +0900)]
Update settings wording for ICS
Bug:
5069983
Change-Id: I882aded067e8cc75197f6d3fa5c11388368b6996
Jake Hamby [Tue, 30 Aug 2011 22:24:35 +0000 (15:24 -0700)]
Fix unresponsive UI during scan and display of "No Bluetooth devices"
- When there are no available Bluetooth devices, we show
"No Bluetooth devices were found nearby" as a preference item after
the scan completes. Update the layout for this Preference item so
that the text is centered and doesn't highlight when touched.
- Fix slow responsiveness on scanning caused by repeated removal of
"No Bluetooth devices were found" preference item on every call to
onBindView().
- If no devices are paired, don't restart the scan on every rotation.
Bug:
5173935
Bug:
5055460
Change-Id: I52fb2d52f315c5e793f08499146842d54c5c3ead
Robert Greenwalt [Wed, 31 Aug 2011 18:17:47 +0000 (11:17 -0700)]
Use the new isNetworkSupported api for wifi-only
Didn't have an API for this before so people used a hacked system property (ro.carrier)
to determine if the device supported mobile data. Added new API and switching callsites.
bug:
5087537
Change-Id: Ibd799559be102a9e2fd552d1a23d1afbcf8f4614
Ben Komalo [Wed, 31 Aug 2011 22:05:07 +0000 (15:05 -0700)]
Merge "Misc fixes to CryptKeeper"
Irfan Sheriff [Wed, 31 Aug 2011 19:52:12 +0000 (12:52 -0700)]
Merge "Expose wifi p2p toggle switch to user"
Irfan Sheriff [Wed, 31 Aug 2011 18:51:17 +0000 (11:51 -0700)]
Expose wifi p2p toggle switch to user
We will not show the Wifi p2p settings to user but the turn on/off capability
is exposed to the user and applications will be expected to let user turn on
and turn off p2p at launch.
Remove the compound button integration from the settings page.
Bug:
5242230
Change-Id: I54ec307304256b051e85201b8bb829d0e5544bfc
Amith Yamasani [Wed, 31 Aug 2011 18:35:12 +0000 (11:35 -0700)]
Merge "Fix a bug in disabling wifi tethering on a wifi-only device."
Amith Yamasani [Wed, 31 Aug 2011 00:30:01 +0000 (17:30 -0700)]
Fix a bug in disabling wifi tethering on a wifi-only device.
Bug:
5116955
Change-Id: I924915efbd46f918bd94c124f10389912fddf41a
satok [Wed, 31 Aug 2011 12:15:53 +0000 (21:15 +0900)]
Add a functionality to disable the spell checker
Change-Id: I2c2663e8232c5ba4b7499fd17a173c8c65252cf3
satok [Wed, 31 Aug 2011 11:09:17 +0000 (20:09 +0900)]
Fix the visibility of preferences in the input method settings
Bug:
5129385
Change-Id: I1b01712995fd77e13b0e5935b8000ec09be489e4
Jeff Sharkey [Wed, 31 Aug 2011 03:36:06 +0000 (20:36 -0700)]
Data usage asset updates.
Change-Id: I163fe8cc539d1d7cf08bb35800fcd76669e5666f
Jeff Sharkey [Wed, 31 Aug 2011 02:59:36 +0000 (19:59 -0700)]
Sync asset drop and smoother animation.
Bug:
5233703
Change-Id: I3fa52da71b78dcfa7842047b427c5121d3ac7e68
Amith Yamasani [Wed, 31 Aug 2011 00:43:46 +0000 (17:43 -0700)]
Use the same empty message for user dictionary on tablets and phones.
Bug:
5237879
Change-Id: I93326ccf48d0d41a91a16f9a5d89ef5441f22115
Peter Ng [Tue, 30 Aug 2011 20:08:08 +0000 (13:08 -0700)]
Merge "Power control widget holofied"
Amith Yamasani [Tue, 30 Aug 2011 18:27:47 +0000 (11:27 -0700)]
Ignore the volume hard keys in Volume settings screen.
Bug:
5214785
Also brings that dialog in compliance with the new volume spec.
Change-Id: I68ce68887515193f1a73a5c8b1182dc290da05c6
Claudia de Veaux [Tue, 30 Aug 2011 18:05:40 +0000 (11:05 -0700)]
Merge "Shorten data usage settings label so it won't truncate. Bug:
5226216"
Peter Ng [Tue, 30 Aug 2011 04:08:57 +0000 (21:08 -0700)]
Power control widget holofied
-brightness needs to implement brightness_half_holo state
*fixed now in the patch { old assets should be removed also(any "appwidget" that doesn't have holo in it)}
Change-Id: I2c1e754f68cf321c5b3517ba92c8f235b418e696
Ryan PC Gibson [Tue, 30 Aug 2011 16:57:05 +0000 (09:57 -0700)]
am
57c88834: (-s ours) am
9fe36302: (-s ours) am
9cb97c44: Merge "DO NOT MERGE Fix crash when device is null in Connection Access Cancel." into gingerbread
* commit '
57c88834b7267381e8a6080e34971c37ea344be7':
DO NOT MERGE Fix crash when device is null in Connection Access Cancel.
Ryan PC Gibson [Tue, 30 Aug 2011 16:10:32 +0000 (09:10 -0700)]
am
9fe36302: (-s ours) am
9cb97c44: Merge "DO NOT MERGE Fix crash when device is null in Connection Access Cancel." into gingerbread
* commit '
9fe36302703f25f4b2798770a6aa0080ade8deb4':
DO NOT MERGE Fix crash when device is null in Connection Access Cancel.
Ryan PC Gibson [Tue, 30 Aug 2011 16:07:39 +0000 (09:07 -0700)]
am
9cb97c44: Merge "DO NOT MERGE Fix crash when device is null in Connection Access Cancel." into gingerbread
* commit '
9cb97c44eefff70fd0fc1c1b8dd7ba87f15ba9e6':
DO NOT MERGE Fix crash when device is null in Connection Access Cancel.
Ryan PC Gibson [Tue, 30 Aug 2011 16:04:44 +0000 (09:04 -0700)]
Merge "DO NOT MERGE Fix crash when device is null in Connection Access Cancel." into gingerbread
Claudia de Veaux [Tue, 30 Aug 2011 02:37:31 +0000 (19:37 -0700)]
Shorten data usage settings label so it won't truncate.
Bug:
5226216
Change-Id: I4e6444b3304869a6d8c5f7085632c4d6dd57ca28
Ben Komalo [Fri, 26 Aug 2011 21:40:18 +0000 (14:40 -0700)]
Misc fixes to CryptKeeper
- use standard IME, but force it into ASCII if it's the default IME
- provide an IME switcher if there are multiple IME's, in case the
ASCII-capable one is a different one
- make the IME shown by default
Bug:
5004456
Bug:
4698473
Change-Id: Id40a164cfe599bfdb67b81f60d4ab8a52208de88
Svetoslav Ganov [Mon, 29 Aug 2011 21:51:28 +0000 (14:51 -0700)]
Merge "Added accessibility tutorial-specific class name for instructions."
Jeff Brown [Mon, 29 Aug 2011 21:04:25 +0000 (14:04 -0700)]
Merge "Add a "show touches" option for demos and presentations. Bug:
4569045"
Dianne Hackborn [Mon, 29 Aug 2011 19:22:35 +0000 (12:22 -0700)]
Small improvements for issue #
5225666
Sort disabled apps to the bottom of the list to make them easier to
find together.
Also change the order of the tabs because with the new layout anything
after the third tab is buried so put all apps at the end so the running
tab is more visible.
Change-Id: Id022fdbf366505cf0da3fb9a6270c3f2e2704d51
Jean Chalard [Mon, 29 Aug 2011 10:21:23 +0000 (19:21 +0900)]
Fix a crash in settings if a hard keyboard is attached.
For some reason the type of the options was wrong, but
otherwise it seems to work.
Bug:
5004175
Change-Id: I668b8bba1933aee6ad1243e446bd66c479bd6944
Jeff Sharkey [Mon, 29 Aug 2011 07:40:51 +0000 (00:40 -0700)]
Merge "Data usage UI fixes; sweeps, combined history."
Jeff Sharkey [Sun, 28 Aug 2011 00:09:43 +0000 (17:09 -0700)]
Data usage UI fixes; sweeps, combined history.
Fix sweep z-order so that limit are always above inspection range,
and draw shadows behind sweep labels. Narrower margins for sweeps
with labels; push labels to keep from overlapping.
Generous touch targets on sweeps, and delegate touches to neighboring
sweep if nearer. Refresh sweep layout during axis zoom, and don't
allow zoom below default minimum. Let inspection sweeps move beyond
valid data ranges. Draw less-frequent tick marks when working with
large axis ranges.
Remove Wi-Fi policies but continue showing historical data. Write
NetworkPolicy if modified during read, and snapshot when async write
requested.
Handle combined UID histories for "Android OS."
Bug:
5191421,
5092579,
5225988,
5221101,
5221065,
5221005,
5150906,
5058025
Change-Id: Id51652e8a10bb90e1345f7a8af01bd70cb8ac677
Irfan Sheriff [Sun, 28 Aug 2011 20:12:04 +0000 (13:12 -0700)]
Merge "WifiSettings cleanup; emptyListi() instead of null"
Nick Pelly [Sat, 27 Aug 2011 00:31:31 +0000 (17:31 -0700)]
Merge "Rename {zeroclick, share_tap} -> ndef_push in code."
Jeff Brown [Sat, 27 Aug 2011 00:10:32 +0000 (17:10 -0700)]
Add a "show touches" option for demos and presentations.
Bug:
4569045
Change-Id: Ie074dbdc61c8e30222113edebdb2e4d5a83020e5
Nick Pelly [Wed, 24 Aug 2011 02:35:13 +0000 (19:35 -0700)]
Rename {zeroclick, share_tap} -> ndef_push in code.
Not sure what the product name will be, but ndef push seems to be a
nice neutral name for the code.
Text strings are left as "Share Tap" for now.
Change-Id: I9dbf82eda2273220c23f443710a340c2c93e8291
Eric Fischer [Fri, 26 Aug 2011 23:23:16 +0000 (16:23 -0700)]
Merge "Import revised translations."
Eric Fischer [Fri, 26 Aug 2011 21:59:45 +0000 (14:59 -0700)]
Import revised translations.
Change-Id: I0916afa3320093422451fbe98bf6d6a0386a302d
Isaac Levy [Fri, 26 Aug 2011 21:20:14 +0000 (14:20 -0700)]
WifiSettings cleanup; emptyListi() instead of null
Change-Id: I0fced1f00ff259aed98988f0913383c50a3c6427
Irfan Sheriff [Fri, 26 Aug 2011 21:06:05 +0000 (14:06 -0700)]
Merge "Speeding up WifiSettings AP list printout"
satok [Fri, 26 Aug 2011 08:36:47 +0000 (17:36 +0900)]
Add debug code to spell checker settings
Change-Id: Iab3bee33e4d6bd19c30e20591d6a2f08e1cff157
satok [Fri, 12 Aug 2011 03:43:42 +0000 (12:43 +0900)]
SpellChecker settings
Change-Id: I0d7af408d2b70e8e593e490484526dd8fffdc725
Isaac Levy [Wed, 24 Aug 2011 23:48:27 +0000 (16:48 -0700)]
Speeding up WifiSettings AP list printout
Change-Id: Idc82ba7320469e05984ba6ac9f7d2cf927dfaa00
Jake Hamby [Thu, 25 Aug 2011 22:14:47 +0000 (15:14 -0700)]
Merge "Bluetooth : fix for showing paired device list error"
Irfan Sheriff [Thu, 25 Aug 2011 21:04:03 +0000 (14:04 -0700)]
Merge "Fixed wifi refresh bug, b/
5021754"
Isaac Levy [Wed, 24 Aug 2011 23:41:10 +0000 (16:41 -0700)]
Fixed wifi refresh bug, b/
5021754
Change-Id: I93711094ceb1490accce1e466de4cc1541dffdff
Irfan Sheriff [Thu, 25 Aug 2011 18:50:46 +0000 (11:50 -0700)]
Merge "Update WifiP2pManager API use"
jhtop.kim [Mon, 8 Aug 2011 10:34:27 +0000 (19:34 +0900)]
Bluetooth : fix for showing paired device list error
- Pair one devie, then turn off BT then reboot the phone
and enter Bluetooth settings screen and turn on BT.
The last paired device will not be displayed in paired list.
- After onResume() is called, the list is shown.
- The reason is that mDevicePreferenceMap is not empty. The paired
devices are cached when BT is off and then skipped when BT is
turned on and updateContent() is called again.
- Make the mDevicePreferenceMap clear when updateContent() is called
and adapter state is BluetoothAdapter.STATE_ON.
Change-Id: Ia745e02bcb4e21a54ccc8477a4dfbad1fa5aed17
Signed-off-by: jhtop.kim <jhtop.kim@samsung.com>
jhtop.kim [Thu, 28 Jul 2011 10:50:58 +0000 (19:50 +0900)]
Bluetooth : fix for unnecessary device-scan starting
- When trying to pair with any device, if bond state changes
device scan will be started automatically.
- add some flag to check proper scan time and to prevent unnecessary device scanning.
Signed-off-by: jhtop.kim <jhtop.kim@samsung.com>
Change-Id: I4977ec122105f33cdd25a4f5c9fed59dda916379
Irfan Sheriff [Wed, 24 Aug 2011 21:19:29 +0000 (14:19 -0700)]
Update WifiP2pManager API use
Bug:
5002384
Change-Id: I6fb3564482061783429b433105ae5f2fa1cfafcc
Irfan Sheriff [Wed, 24 Aug 2011 20:33:13 +0000 (13:33 -0700)]
Merge "Fixing Wifi strings and pref ordering per ui"
Narayan Kamath [Wed, 24 Aug 2011 19:46:59 +0000 (12:46 -0700)]
Merge "Call setLanguage( ) on the TTS engine before the sample."
Narayan Kamath [Wed, 24 Aug 2011 19:12:26 +0000 (20:12 +0100)]
Call setLanguage( ) on the TTS engine before the sample.
This makes the sample play faster, and results in a reliable
return value from getLanguage().
bug:
5207139
Change-Id: Ic6ca4a2f4aed299d35c320ecc3f327579c66471b
Isaac Levy [Wed, 24 Aug 2011 18:37:39 +0000 (11:37 -0700)]
Fixing Wifi strings and pref ordering per ui
- also no longer disabling wifi_watchdog toggle when radio is off.
Change-Id: Ic52249afd619028fe2765f434ee166f3d36e14fd
Svetoslav Ganov [Wed, 24 Aug 2011 18:36:09 +0000 (11:36 -0700)]
Merge "Updated Accessibility tutorial strings."
Narayan Kamath [Wed, 24 Aug 2011 09:24:29 +0000 (02:24 -0700)]
Merge "Implement the new TTS settings UI."
Jaikumar Ganesh [Tue, 23 Aug 2011 22:10:57 +0000 (15:10 -0700)]
DO NOT MERGE Fix crash when device is null in Connection Access Cancel.
Bug:
5203970
Change-Id: Ic0604174c0ac9b40685e883f37e1a54070ee0463
Gilles Debunne [Tue, 23 Aug 2011 21:58:59 +0000 (14:58 -0700)]
Merge "Bug
5038721: battery info links to new location setting for GPS management."
Gilles Debunne [Tue, 23 Aug 2011 20:21:42 +0000 (13:21 -0700)]
Merge "Bug
5050590: wrong title for lock screen"
Irfan Sheriff [Tue, 23 Aug 2011 20:02:35 +0000 (13:02 -0700)]
Merge "Autojoin new unsecured networks without dialog"
Isaac Levy [Tue, 23 Aug 2011 04:09:12 +0000 (21:09 -0700)]
Autojoin new unsecured networks without dialog
Unsaved, open wifi networks will connect on single click
without opening the connect dialog box
Change-Id: I71da155aa8b711309f0ed7eca4bd22a254db28c5
Gilles Debunne [Tue, 23 Aug 2011 18:01:35 +0000 (11:01 -0700)]
Bug
5050590: wrong title for lock screen
Change-Id: Iba170a25ac56db4140ab91f4fd583c0f676b02b0
Narayan Kamath [Thu, 18 Aug 2011 16:55:41 +0000 (17:55 +0100)]
Implement the new TTS settings UI.
bug:
5149036
Change-Id: I81a9786d20be3e9bf87550d6a0cc04191409600c
Gilles Debunne [Tue, 23 Aug 2011 01:02:42 +0000 (18:02 -0700)]
Bug
5038721: battery info links to new location setting for GPS management.
Change-Id: I7063e0b93b6ef9f94cd783ce57206e302126bd9a
Gilles Debunne [Tue, 23 Aug 2011 00:39:21 +0000 (17:39 -0700)]
Merge "Bug
5161247: More... is aligned with other main menu entries"
Gilles Debunne [Tue, 23 Aug 2011 00:39:07 +0000 (17:39 -0700)]
Merge "Bug
5078738: some options moved to overflow menu"
Gilles Debunne [Sat, 20 Aug 2011 00:55:06 +0000 (17:55 -0700)]
Bug
5161247: More... is aligned with other main menu entries
Change-Id: I813d9f674f1bcff940e5e57051e4ced8b56911a6
Amith Yamasani [Mon, 22 Aug 2011 22:06:57 +0000 (15:06 -0700)]
Reduce the minimum size of buttons in App details screen.
The earlier reduction was not sufficient for all cases.
If the min width is totally removed, it makes the buttons too
small in portrait, causing wrapping. Forcing to 0.5 weight will
make it too wide in landscape.
Change-Id: I02a71a065f14d5f75bea68aab25c8b16941589e9
Eric Fischer [Mon, 22 Aug 2011 19:07:13 +0000 (12:07 -0700)]
Merge "Import revised translations."
Eric Fischer [Mon, 22 Aug 2011 18:34:42 +0000 (11:34 -0700)]
Import revised translations.
Change-Id: I90d6935c58330a986ce67086f7af4ae9eb96e8ba
Gilles Debunne [Fri, 19 Aug 2011 23:20:57 +0000 (16:20 -0700)]
Bug
5078738: some options moved to overflow menu
Change-Id: I4ea41dfcd2b0d05de870fb8af5a7614970538491
Irfan Sheriff [Fri, 19 Aug 2011 23:04:44 +0000 (16:04 -0700)]
Merge "Changing wifi connection dialog per UX"
Amith Yamasani [Fri, 19 Aug 2011 21:39:04 +0000 (14:39 -0700)]
Merge "Vertically center adjacent buttons in App Info screen."
Amith Yamasani [Fri, 19 Aug 2011 21:12:53 +0000 (14:12 -0700)]
Vertically center adjacent buttons in App Info screen.
Also reduce the min width of the buttons because the horizontal space
available has reduced.
Bug:
5156394
Change-Id: Ib7adfa208565503bbf537cb469e7d8feded2c5b8
Wink Saville [Fri, 19 Aug 2011 20:55:17 +0000 (13:55 -0700)]
Merge "Allow SIM PIN on CDMA LTE devices"
Jeff Sharkey [Fri, 19 Aug 2011 19:41:22 +0000 (12:41 -0700)]
Merge "More TabWidget and padding tweaks to match spec."
Wink Saville [Fri, 19 Aug 2011 00:09:38 +0000 (17:09 -0700)]
Allow SIM PIN on CDMA LTE devices
Bug:
5161360
Change-Id: I6f98da08e6be08403d9b3b08b02b02b9a63b14fe
Justin Ho [Fri, 19 Aug 2011 16:00:35 +0000 (09:00 -0700)]
Updated Settings icons for Backup and Security
Bug:
5174358
Change-Id: I0306d918fc85701b5278f82989883938457dd83b
Justin Ho [Fri, 19 Aug 2011 14:45:40 +0000 (07:45 -0700)]
Merge "Updates to screen security settings UI text per design. Bug:
5173985"
Isaac Levy [Tue, 16 Aug 2011 23:11:44 +0000 (16:11 -0700)]
Changing wifi connection dialog per UX
- Added an advanced options checkbox and moving WPS, DHCP, Proxy to there
- Minor string changes
Change-Id: I7a135a483435379692a54ea0ef2663136c468945
Ben Komalo [Fri, 19 Aug 2011 01:13:47 +0000 (18:13 -0700)]
Merge "Stop leaking wakelocks in cryptkeeper."
Claudia de Veaux [Thu, 18 Aug 2011 23:53:45 +0000 (16:53 -0700)]
Updates to screen security settings UI text per design.
Bug:
5173985
Change-Id: Icdb1873fd9867e3aed7752e90a00c2f725c1fa6a
Edit to lock_after_timeout_summary to rephrase so new option values will
read correctly.
Also, this change includes a fix for embarrassing spelling/grammar mistakes
in Accessibility hint text.
Bug:
5184517
Matthew Xie [Fri, 19 Aug 2011 00:12:33 +0000 (17:12 -0700)]
Merge "Remember user choice for phone book access permission dialog"
Matthew Xie [Tue, 9 Aug 2011 03:29:18 +0000 (20:29 -0700)]
Remember user choice for phone book access permission dialog
Change the always-allowed checkbox to be don't-ask-again checkbox to remember
user's decision so that user will not be bothered agian if he/she checks
the don't-ask-again checkbox
bug
5099661
Change-Id: If32ab8e93313bbd33ff040553083f0cf9359b69e