OSDN Git Service
Jeff Sharkey [Thu, 6 Oct 2011 05:14:24 +0000 (22:14 -0700)]
Merge "Fix string breakage."
Jeff Sharkey [Thu, 6 Oct 2011 05:13:02 +0000 (22:13 -0700)]
Fix string breakage.
Change-Id: Ib81c1bfd9ef49f7e410887ab5c22e3e3cc31ca22
Jeff Sharkey [Thu, 6 Oct 2011 04:59:42 +0000 (21:59 -0700)]
Merge "Adjust data usage strings."
Danielle Millett [Thu, 6 Oct 2011 02:04:05 +0000 (19:04 -0700)]
Merge "Update string to match wireframe"
Danielle Millett [Thu, 6 Oct 2011 01:49:03 +0000 (21:49 -0400)]
Update string to match wireframe
Change-Id: If406ab1364451e28352d120b473a7a58a124bff4
Jeff Sharkey [Thu, 6 Oct 2011 00:43:06 +0000 (17:43 -0700)]
Adjust data usage strings.
Bug:
5337015
Change-Id: I55c7ea8175945a6d799845e196299d45bb412403
Jeff Brown [Wed, 5 Oct 2011 18:53:01 +0000 (11:53 -0700)]
Use WM APIs to change rotation preference.
Bug:
5371750
Changing the system setting directly results in inconsistent
behavior among the three different places where "auto-rotate"
settings appear in the UI. Use the WM APIs instead.
Change-Id: I1a8239af66b1cc3aeec8310383e72fc96c878d73
Narayan Kamath [Wed, 5 Oct 2011 12:11:09 +0000 (05:11 -0700)]
Merge "Don't hide TTS settings if no recognizer is found."
Narayan Kamath [Wed, 5 Oct 2011 11:26:31 +0000 (12:26 +0100)]
Don't hide TTS settings if no recognizer is found.
bug:
5412210
Change-Id: I6fdfda7f5f7bcd22acda2fd2b55e0d76f0fab1cd
satok [Wed, 5 Oct 2011 09:49:51 +0000 (18:49 +0900)]
Show a security warning dialog when switching a spell checker
Bug:
5402295
Change-Id: I021e6e923fa137248d23c8fa39e68afdf73fead9
Danielle Millett [Wed, 5 Oct 2011 01:45:03 +0000 (18:45 -0700)]
Merge "Showing tutorial for Face Unlock on first try"
Danielle Millett [Wed, 5 Oct 2011 01:00:07 +0000 (21:00 -0400)]
Showing tutorial for Face Unlock on first try
Change-Id: Idf072750e70a9e5bc7699675d8a7a9c57900eea3
Amith Yamasani [Tue, 4 Oct 2011 22:28:06 +0000 (15:28 -0700)]
Merge "Handle unexpected null cursor and don't forget to close it."
Eric Fischer [Tue, 4 Oct 2011 21:57:57 +0000 (14:57 -0700)]
Fix mismatched markup in Settings strings.
Revert "Revert "Settings strings cleanup per standards.""
Bugs:
5165745,
5163232,
5162668,
5162667,
5162328
Implementation of language and spelling changes requested by Design
such as WiFi. Also removed some dialog titles per Design.
Will file separate bug to have the titles removed properly;
for now I just made the string empty.
This reverts commit
e2db5875f6e84398a976135c321697a506aaf4df.
Change-Id: I0f865d1441d990e5e63f2a257a27ae521220af14
Amith Yamasani [Tue, 4 Oct 2011 22:00:21 +0000 (15:00 -0700)]
Handle unexpected null cursor and don't forget to close it.
Bug:
5406071
Change-Id: Ia40cf7e5a3e32d6f364e787ee66580c685507571
Amith Yamasani [Tue, 4 Oct 2011 21:03:47 +0000 (14:03 -0700)]
Merge "Introduce half-brightness icon in Power Control widget."
Adam Powell [Tue, 4 Oct 2011 20:53:06 +0000 (13:53 -0700)]
Merge "Bug
5126088 - update layout for activate device policy activity"
Adam Powell [Tue, 4 Oct 2011 20:48:50 +0000 (13:48 -0700)]
Bug
5126088 - update layout for activate device policy activity
Change-Id: Ifd5963adc0dc30c0a650bac822dbbd7cb938c144
Steven Ross [Tue, 4 Oct 2011 20:03:38 +0000 (13:03 -0700)]
Merge "Formatting fix"
Claudia de Veaux [Tue, 4 Oct 2011 19:52:16 +0000 (12:52 -0700)]
Merge "Revert "Settings strings cleanup per standards. Bugs:
5165745,
5163232,
5162668,
5162667,
5162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug to have the titl""
Claudia de Veaux [Tue, 4 Oct 2011 19:51:23 +0000 (12:51 -0700)]
Revert "Settings strings cleanup per standards. Bugs:
5165745,
5163232,
5162668,
5162667,
5162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug to have the titl"
This reverts commit
c9c29d90f7cb9db9158b6e3a7464f1db06084c1d
Dianne Hackborn [Tue, 4 Oct 2011 18:51:54 +0000 (11:51 -0700)]
Merge "Account for all wake lock usage."
Claudia de Veaux [Tue, 4 Oct 2011 18:30:03 +0000 (11:30 -0700)]
Merge "Settings strings cleanup per standards. Bugs:
5165745,
5163232,
5162668,
5162667,
5162328 Implementation of language and spelling changes requested by Design such as WiFi. Also removed some dialog titles per Design. Will file separate bug to have the titles removed properly; for now I just made the string empty."
Steven Ross [Tue, 4 Oct 2011 10:15:16 +0000 (03:15 -0700)]
Merge "Excluding ChooseLockGeneric from recents"
Dianne Hackborn [Tue, 4 Oct 2011 01:34:27 +0000 (18:34 -0700)]
Account for all wake lock usage.
Wake locks can be held outside of what we measure in battery stats,
by things not going through the power manager. Account for this by
computing the total wake time that is not covered by known wake locks
and screen on time, and blame this on Android OS.
Change-Id: Idf2907bc35f8c35f92155671c8dba521ae9ea804
Claudia de Veaux [Mon, 3 Oct 2011 22:30:33 +0000 (15:30 -0700)]
Settings strings cleanup per standards.
Bugs:
5165745,
5163232,
5162668,
5162667,
5162328
Implementation of language and spelling changes requested by Design
such as WiFi. Also removed some dialog titles per Design. Will
file separate bug to have the titles removed properly; for now I
just made the string empty.
Change-Id: I56b251a0d639f8d25f0908c636226e0d6e7da6a5
More changes to add <xliff:g/> around raw HTML per Eric Fischer.
Fixed redundant <string> tag caught in review.
Danielle Millett [Tue, 4 Oct 2011 00:38:41 +0000 (17:38 -0700)]
Merge "Reorganized the biometric weak check functions"
Amith Yamasani [Mon, 3 Oct 2011 18:54:16 +0000 (11:54 -0700)]
Introduce half-brightness icon in Power Control widget.
Bug:
5358696
Change-Id: Iae484e786f4dd7a5e88078b69053f01425b79aef
Jeff Hamilton [Fri, 30 Sep 2011 18:22:06 +0000 (13:22 -0500)]
Update settings strings.
Bug:
5350022
Change-Id: Ia507b886faa17283bb62fe5bd63afb04b490d015
Bjorn Bringert [Mon, 3 Oct 2011 15:22:21 +0000 (08:22 -0700)]
Merge "Fix ISO3 code for spanish in demo strings array."
Steven Ross [Mon, 3 Oct 2011 14:06:44 +0000 (10:06 -0400)]
Excluding ChooseLockGeneric from recents
This excludes ChooseLockGeneric from the list of recent activities,
so that the backup lock doesn't show up there.
This should only impact ChooseLockGeneric.
Change-Id: If9b9d7b7287191cec1a7f41221b1f0451593a5e8
Narayan Kamath [Mon, 3 Oct 2011 13:46:44 +0000 (14:46 +0100)]
Fix ISO3 code for spanish in demo strings array.
bug:
5399728
Change-Id: Ib001425c0ea0298720d9c65f5ece22ecd70ce471
Steven Ross [Mon, 3 Oct 2011 10:50:47 +0000 (06:50 -0400)]
Formatting fix
Change-Id: If2869f2d6d6bc788cfffc1187b4de1deb9cec83b
Eric Fischer [Fri, 30 Sep 2011 23:56:22 +0000 (16:56 -0700)]
Merge "Import revised translations."
Eric Fischer [Fri, 30 Sep 2011 23:46:13 +0000 (16:46 -0700)]
Import revised translations.
Change-Id: I8b8b4ce15c2a6a55c89fe3ca987db8e34526782b
Danielle Millett [Fri, 30 Sep 2011 17:49:14 +0000 (13:49 -0400)]
Reorganized the biometric weak check functions
Moved isBiometricSensorAvailable functionality into
isBiometricWeakInstalled (formerly called isBiometricEnabled). Settings
now only shows biometric weak if it's installed, if it's not installed
and the lock type is currently set to biometric weak, the backup lock
is shown as being set instead.
Change-Id: Icfe326a6598df33ee60d5fdc024273d94f115983
Steven Ross [Fri, 30 Sep 2011 19:50:34 +0000 (15:50 -0400)]
Delete the temp gallery on return from fallback
Change-Id: Id501302aa8c5606006f3e403e51bb01981bc173e
Steven Ross [Fri, 30 Sep 2011 18:08:58 +0000 (11:08 -0700)]
Merge "calling back SetupFaceLock to clean up temporary gallery"
Amith Yamasani [Thu, 29 Sep 2011 23:43:34 +0000 (16:43 -0700)]
Merge "Remove "Screen lock" category header as the title is sufficient."
Romain Guy [Thu, 29 Sep 2011 23:39:59 +0000 (16:39 -0700)]
Merge "Add developer setting to force hardware acceleration"
Romain Guy [Thu, 29 Sep 2011 23:39:31 +0000 (16:39 -0700)]
Add developer setting to force hardware acceleration
Change-Id: I1bb3da7db4602ce7cbdfb46799c5114ce63ffed2
Amith Yamasani [Mon, 26 Sep 2011 17:27:43 +0000 (10:27 -0700)]
Remove "Screen lock" category header as the title is sufficient.
Bug:
5203189
Insert a descriptive text as a header view when in weak biometric
fallback case.
Change-Id: Ic10cc7d276975b13c188bd15016fea2200ec0e5b
The Android Open Source Project [Thu, 29 Sep 2011 21:25:20 +0000 (14:25 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: Ic9b67f23461c79494602a31e6a671300b7943ee9
Steven Ross [Wed, 28 Sep 2011 19:43:41 +0000 (15:43 -0400)]
calling back SetupFaceLock to clean up temporary gallery
This is done when the backup lock is complete or canceled.
If successful, the permanent gallery is replaced with the new one.
The temporary gallery is always deleted
Also deletes the main gallery if the lock type is changed from facial recognition
Change-Id: Id7b066fd852c7ba188d6e46b47391a362cbab40f
Daisuke Miyakawa [Thu, 29 Sep 2011 19:20:34 +0000 (12:20 -0700)]
Merge "Set longer char limit for sync setting strings"
Gilles Debunne [Thu, 29 Sep 2011 17:21:08 +0000 (10:21 -0700)]
Merge "Bug
5353255: use a switch to toggle accounts & sync"
Daisuke Miyakawa [Thu, 29 Sep 2011 01:52:19 +0000 (18:52 -0700)]
Set longer char limit for sync setting strings
Translated strings cannot be accomodated while we can have
longer ones there.
Bug:
5376058
Change-Id: I83ec28964c3aa19cb16fa8fc648ef392e67d4f49
Gilles Debunne [Wed, 28 Sep 2011 22:09:01 +0000 (15:09 -0700)]
Bug
5353255: use a switch to toggle accounts & sync
Change-Id: I00821ba63651d713a148021f64bb95e7f69e6b88
Jeff Hamilton [Wed, 28 Sep 2011 19:54:57 +0000 (14:54 -0500)]
Fix the text color.
Bug:
5375784
Change-Id: I5307636b607f3e3a5e4afb34ece6f84320dc9cca
Jeff Hamilton [Wed, 28 Sep 2011 19:43:18 +0000 (12:43 -0700)]
Merge "Fix the text size."
Jeff Hamilton [Tue, 27 Sep 2011 21:23:20 +0000 (16:23 -0500)]
Fix the text size.
Bug:
5375784
Change-Id: I458be9e4a025c439088df22195301d48e94e1b90
The Android Automerger [Wed, 28 Sep 2011 13:10:26 +0000 (06:10 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
satok [Wed, 28 Sep 2011 03:01:22 +0000 (12:01 +0900)]
Fix the behavior of preference in IME Settings
Change-Id: I41f7c36fb73730248dcc98abbf4276ef6d772f36
Amith Yamasani [Wed, 28 Sep 2011 01:13:25 +0000 (18:13 -0700)]
Merge "Show in Settings->About if the device is an engineering sample."
Amith Yamasani [Tue, 27 Sep 2011 23:02:25 +0000 (16:02 -0700)]
Show in Settings->About if the device is an engineering sample.
Don't show anything additional for a production device.
Bug:
5380778
Change-Id: I82532c37b0fc71fe5ada91a7b945b3becffbc535
Mike Sipe [Wed, 28 Sep 2011 00:01:12 +0000 (17:01 -0700)]
Merge "Fix
5287113: rename "FaceLock" to "Face Unlock" in Settings"
Jim Miller [Tue, 27 Sep 2011 23:35:46 +0000 (16:35 -0700)]
Fix
5287113: rename "FaceLock" to "Face Unlock" in Settings
Change-Id: If42c7c12e5084f5c18d0959a1c1a0c538aed8ac0
Jeff Sharkey [Tue, 27 Sep 2011 23:27:56 +0000 (16:27 -0700)]
am
76ac6a9b: Merge "About." into ics-factoryrom
* commit '
76ac6a9bcb7cfc3be79e956a6207599e6910de8a':
About.
Jeff Sharkey [Tue, 27 Sep 2011 23:26:08 +0000 (16:26 -0700)]
Merge "About." into ics-factoryrom
Jeff Sharkey [Tue, 27 Sep 2011 22:12:51 +0000 (15:12 -0700)]
About.
Bug:
5337015
Change-Id: I41f302a6f329c54c9d6abb8925c228fee5cc716f
Eric Fischer [Tue, 27 Sep 2011 22:01:01 +0000 (15:01 -0700)]
am
22aca59e: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
* commit '
22aca59e80d2376b89262b598a486bdd3272d969':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 27 Sep 2011 21:57:23 +0000 (14:57 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
Eric Fischer [Tue, 27 Sep 2011 21:33:22 +0000 (14:33 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ib4fe1d2dd91618933614f68f6224c8ac48d31bc8
The Android Automerger [Tue, 27 Sep 2011 20:32:47 +0000 (13:32 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Amith Yamasani [Tue, 27 Sep 2011 20:10:47 +0000 (13:10 -0700)]
am
ae69755a: Disable USB connection type when monkeys are running.
* commit '
ae69755aa874dbac77e9874d9716ab891a144193':
Disable USB connection type when monkeys are running.
Amith Yamasani [Tue, 27 Sep 2011 18:33:17 +0000 (11:33 -0700)]
Disable USB connection type when monkeys are running.
Bug:
5375336
Also use the correct API for testing if monkeys are running.
(ActivityManager.isUserAMonkey())
Bug:
5375910
Change-Id: I2bf8e061ee5977d521de197d3a92095c1a98218d
Svetoslav Ganov [Tue, 27 Sep 2011 18:22:06 +0000 (11:22 -0700)]
Merge "Clarify install accessibility scripts wording."
Svetoslav Ganov [Tue, 27 Sep 2011 18:12:58 +0000 (11:12 -0700)]
Clarify install accessibility scripts wording.
1. Updated the wording according to tech writer feedback to be
more precise and avoid user confusion.
bug:
5374051
Change-Id: Ica54b91f475be1d271f1588f044a5a2b72a44e51
The Android Open Source Project [Tue, 27 Sep 2011 17:11:04 +0000 (10:11 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I412a835f2e84fb56191c0378cf5dc908935f7b8a
Danielle Millett [Tue, 27 Sep 2011 13:14:01 +0000 (06:14 -0700)]
Merge "Changed header to specify backup lock"
satok [Tue, 27 Sep 2011 08:52:00 +0000 (01:52 -0700)]
Merge "Fix the alignment of the preference in IME settings on Tablet"
satok [Tue, 27 Sep 2011 08:45:08 +0000 (17:45 +0900)]
Fix the alignment of the preference in IME settings on Tablet
Bug:
5366586
Change-Id: I2659415fb74cca2c65bdd3171217e786d4f41aac
satok [Tue, 27 Sep 2011 07:10:57 +0000 (00:10 -0700)]
Merge "Tweak IME settings"
satok [Tue, 27 Sep 2011 06:46:42 +0000 (15:46 +0900)]
Tweak IME settings
Change-Id: I13b044abdcb1215306ecfd5070d6e1a16e2d92d7
Eric Fischer [Tue, 27 Sep 2011 02:44:31 +0000 (19:44 -0700)]
am
0e5fd21b: (-s ours) Import revised translations. DO NOT MERGE
* commit '
0e5fd21beb33a39b4254d4c8dd6b60c0939dbee0':
Import revised translations. DO NOT MERGE
The Android Automerger [Mon, 26 Sep 2011 23:17:56 +0000 (16:17 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Jeff Sharkey [Mon, 26 Sep 2011 22:31:57 +0000 (15:31 -0700)]
Merge "Data usage strings, sweep touches, fixes."
Danielle Millett [Mon, 19 Sep 2011 23:16:29 +0000 (19:16 -0400)]
Changed header to specify backup lock
-Changed main header to show backup lock text
-Reworded normal header
-Changed instances of FacePass to FaceLock
Change-Id: I66cbd3ada87df30b6b7ceb1a784d365ba60a8f41
Eric Fischer [Mon, 26 Sep 2011 21:51:07 +0000 (14:51 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I287527c2b071e0babd191b47fc1b80c160232d74
Kenny Root [Mon, 26 Sep 2011 21:38:10 +0000 (14:38 -0700)]
Merge "Make verifier device id information visible"
The Android Open Source Project [Mon, 26 Sep 2011 19:11:47 +0000 (12:11 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: Ic66f78817e5ae10c997cf34a35e0d8b3abade1ba
Amith Yamasani [Mon, 26 Sep 2011 18:51:39 +0000 (11:51 -0700)]
Merge "Fixes to parent fragment names and other manifest issues."
Kenny Root [Sun, 25 Sep 2011 16:23:27 +0000 (09:23 -0700)]
Make verifier device id information visible
This makes the verifier device identifier information for this
particular device visible in the "Development" screen of
Settings.
Bug:
5205163
Change-Id: I55e0b32fe98f898e6e8d723ce6696529fdccffd0
Jeff Sharkey [Mon, 26 Sep 2011 01:22:48 +0000 (18:22 -0700)]
Data usage strings, sweep touches, fixes.
Change strings around limiting background data. Move limit/warning
sweeps above inspection sweeps, and teach about additional neighbors
on different axis.
Guard against DialogFragment.show(), fix pie chart to draw edges, and
remove data usage from battery UI.
Bug:
5341374,
5337650,
5337385,
5319465,
5236335
Change-Id: Iea8c2a2ab405b645d85abe34a0178d4b8874cdd5
The Android Automerger [Mon, 26 Sep 2011 01:16:31 +0000 (18:16 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Wink Saville [Sun, 25 Sep 2011 22:25:39 +0000 (15:25 -0700)]
am
426fc66a: Add persist.radio.ramdump.
* commit '
426fc66a8a9371e34d936d18d5b254fd002b4c11':
Add persist.radio.ramdump.
Amith Yamasani [Fri, 2 Sep 2011 16:47:18 +0000 (09:47 -0700)]
Fixes to parent fragment names and other manifest issues.
Bug:
5324865
Also, when jumping into a second+ level setting, make sure the header list
item is scrolled into view.
Change-Id: I714c1f80c8b20e23208763f1c30449a49f2a4082
Wink Saville [Sun, 25 Sep 2011 21:39:02 +0000 (14:39 -0700)]
Add persist.radio.ramdump.
A little refactoring to keep most everything for these "temporary"
flags in one place.
Bug:
5348373
Change-Id: I257aac616ae635e6f9d9dffd692357b4c08037e2
The Android Automerger [Sun, 25 Sep 2011 13:30:06 +0000 (06:30 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Svetoslav Ganov [Fri, 23 Sep 2011 23:57:32 +0000 (16:57 -0700)]
Merge "Settings may show enabled accessiiblity services after restore even if accessibility is off."
Svetoslav Ganov [Fri, 23 Sep 2011 23:47:31 +0000 (16:47 -0700)]
Settings may show enabled accessiiblity services after restore even if accessibility is off.
Now the state of accessibility is determined from the number of running, i.e. enabled and
installed, accessibility services - more than zero access is on else it is off. After a
restore the device may have some enabled and installed services but disabled accessibility
setting. In such case settings should respect the restored values and the services should
be displayed as disabled initially and then enabling one of them will enable accessibility.
bug:
5367404
Change-Id: If3756aba3f59e282000247e99f87ebff2b64c9fd
Eric Fischer [Fri, 23 Sep 2011 22:44:39 +0000 (15:44 -0700)]
am
86b49eea: (-s ours) Import revised translations. DO NOT MERGE
* commit '
86b49eea5e7735f72ed72069439cc74dbcc9a878':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 23 Sep 2011 22:28:41 +0000 (15:28 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Iebee5d29b6baa4e479a03ae7058e891f852968f6
The Android Automerger [Fri, 23 Sep 2011 18:36:19 +0000 (11:36 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Wink Saville [Fri, 23 Sep 2011 06:39:35 +0000 (23:39 -0700)]
am
fbea38fd: Merge "Add a button to enable/disable Mobile Terminated SMS over IMS" into ics-factoryrom
* commit '
fbea38fd2b458b59b0f2a7affa158b486cdc1df5':
Add a button to enable/disable Mobile Terminated SMS over IMS
Amith Yamasani [Fri, 23 Sep 2011 00:04:12 +0000 (17:04 -0700)]
Merge "Don't append list of accounts every time we return to this screen."
Wink Saville [Thu, 22 Sep 2011 22:29:19 +0000 (15:29 -0700)]
Merge "Add a button to enable/disable Mobile Terminated SMS over IMS" into ics-factoryrom
Wink Saville [Thu, 22 Sep 2011 22:17:00 +0000 (15:17 -0700)]
Add a button to enable/disable Mobile Terminated SMS over IMS
This toggles persist.radio.imsallowmtsms between 0/1 which can
be used during testing and bring up of SMS over IMS.
Change-Id: I4581bca76899445e825260e8af6a39903d029c44
Amith Yamasani [Thu, 22 Sep 2011 21:34:17 +0000 (14:34 -0700)]
Don't append list of accounts every time we return to this screen.
Bug:
5355920
Remove the contents of the layout before adding the accounts.
Change-Id: Ic9256140f892968b2388f47d982eaada720df892
The Android Open Source Project [Thu, 22 Sep 2011 17:57:43 +0000 (10:57 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I5c6e500d5a097aa638399321001fec81493cc0c4