OSDN Git Service
Peter Ng [Fri, 21 Oct 2011 21:14:44 +0000 (14:14 -0700)]
Merge "Settings applications processes viewer color updates"
Eric Fischer [Fri, 21 Oct 2011 20:52:11 +0000 (13:52 -0700)]
am
388c9e2f: (-s ours) Import revised translations. DO NOT MERGE
* commit '
388c9e2f14c4b533ec9d19c1513e51353de89e75':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 21 Oct 2011 01:04:50 +0000 (18:04 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ib962f495098fdcffdcf5f75d5813bb5fb1e94d7c
Peter Ng [Thu, 20 Oct 2011 21:04:53 +0000 (14:04 -0700)]
Settings applications processes viewer color updates
Change-Id: I233bed85c331aa909aebcd3358f7b985d9eaa473
Eric Fischer [Thu, 20 Oct 2011 18:32:06 +0000 (11:32 -0700)]
am
49a681c4: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
49a681c4928d63b86fca0a546ee60b4f95d16669':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 20 Oct 2011 18:29:07 +0000 (11:29 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Eric Fischer [Thu, 20 Oct 2011 18:16:21 +0000 (11:16 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ic01568aa596d6aa3b36ee03d37f5d128e0744886
Danielle Millett [Wed, 19 Oct 2011 22:14:41 +0000 (15:14 -0700)]
am
8123493e: Fix
5428748: Added more options for biometric weak
* commit '
8123493ef905a210bd00b0c623459f4c86505298':
Fix
5428748: Added more options for biometric weak
Danielle Millett [Wed, 19 Oct 2011 17:58:30 +0000 (13:58 -0400)]
Fix
5428748: Added more options for biometric weak
Adding make pattern visible (for pattern backup only) and vibrate
on touch as options for when biometric weak is enabled.
Change-Id: I6319f4f321779ebc6cf4acbfc0dd49b5014c0c88
Chih-Chung Chang [Wed, 19 Oct 2011 10:33:46 +0000 (03:33 -0700)]
am
0bcd8a95: Fix
5352588: Accept view intent without URI.
* commit '
0bcd8a95a96566d9e2c97c3305ee0dccf758ca7a':
Fix
5352588: Accept view intent without URI.
Chih-Chung Chang [Tue, 18 Oct 2011 12:00:02 +0000 (20:00 +0800)]
Fix
5352588: Accept view intent without URI.
Change-Id: Ibfcf32a7d27c3ac2d3fa3695e430b3e29f3ecd20
Eric Fischer [Tue, 18 Oct 2011 23:35:18 +0000 (16:35 -0700)]
Merge "Import revised translations."
Eric Fischer [Tue, 18 Oct 2011 22:45:53 +0000 (15:45 -0700)]
Import revised translations.
Change-Id: I257f94325e7f588845bcf446e497ff827d4b2cec
Amith Yamasani [Tue, 18 Oct 2011 22:05:22 +0000 (15:05 -0700)]
Merge "Show IP address of current active link instead of just the WiFi IP address."
Dianne Hackborn [Tue, 18 Oct 2011 21:36:30 +0000 (14:36 -0700)]
am
644fa424: Work on issue #
5461497: Landed on Welcome screen after a tap on \'Next\' in Screen 500
* commit '
644fa4243b4c288c85845b3f86aab25135635729':
Work on issue #
5461497: Landed on Welcome screen after a tap on 'Next' in Screen 500
Dianne Hackborn [Tue, 18 Oct 2011 20:38:03 +0000 (13:38 -0700)]
Work on issue #
5461497: Landed on Welcome screen after a tap on 'Next' in Screen 500
With the corresponding change for the activity manager to allow the home
activity to finish itself, this activity can now be a little less dirty
and just call finish() when it finds it is not needed.
Change-Id: I1a449c7bec9fba659e27a9e918f8a9b0c55b2098
Svetoslav Ganov [Tue, 18 Oct 2011 20:16:59 +0000 (13:16 -0700)]
am
39b8eb6c: Merge "Accessibility service toggle setting state not preserved on screen rotation." into ics-mr0
* commit '
39b8eb6ce545287cd77bea465d280772669c68d1':
Accessibility service toggle setting state not preserved on screen rotation.
Svetoslav Ganov [Tue, 18 Oct 2011 20:14:38 +0000 (13:14 -0700)]
Merge "Accessibility service toggle setting state not preserved on screen rotation." into ics-mr0
Svetoslav Ganov [Tue, 18 Oct 2011 18:58:21 +0000 (11:58 -0700)]
Accessibility service toggle setting state not preserved on screen rotation.
The state of the toggle switch for enabling/disabling an accessibility service
is not preserved on screen rotation after its state has been changed once.
bug:
5478062
Change-Id: Ie453f78bc07dcd39d88bb4acf260768eccc73a74
Eric Fischer [Tue, 18 Oct 2011 18:33:36 +0000 (11:33 -0700)]
am
3d0b5254: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
3d0b525491559f59d65156fca5783f80f2bddc14':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 18 Oct 2011 18:31:06 +0000 (11:31 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Eric Fischer [Tue, 18 Oct 2011 18:13:37 +0000 (11:13 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Idddc20bec80db65304678bc5ad191cff3f2d2c5f
Peter Ng [Tue, 18 Oct 2011 17:45:34 +0000 (10:45 -0700)]
Merge "data usage color standardization"
Danielle Millett [Tue, 18 Oct 2011 17:29:48 +0000 (10:29 -0700)]
am
4c9a5fe6: Merge "Fix
5466557: Removed secondary screenlock settings labels" into ics-mr0
* commit '
4c9a5fe6a3765ecd7617b611463766cd72706458':
Fix
5466557: Removed secondary screenlock settings labels
Danielle Millett [Tue, 18 Oct 2011 17:27:41 +0000 (10:27 -0700)]
Merge "Fix
5466557: Removed secondary screenlock settings labels" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 16:33:09 +0000 (09:33 -0700)]
am
6ab0c12c: Updated bandwidth assets
* commit '
6ab0c12ca417aef49d2c287b8d215c9e66ae154d':
Updated bandwidth assets
Justin Ho [Tue, 18 Oct 2011 01:04:18 +0000 (18:04 -0700)]
Updated bandwidth assets
Change-Id: Ia180ff9dfb020ab2f3528638f522c38f11ea010f
Danielle Millett [Mon, 17 Oct 2011 23:21:19 +0000 (19:21 -0400)]
Fix
5466557: Removed secondary screenlock settings labels
Removed summary line from the screen lock picker and displaying
the about screen for face unlock every time instead of just the
first time
Change-Id: Iac572d2366acf28d32e632e8dcdde63475641e39
Peter Ng [Tue, 18 Oct 2011 00:34:58 +0000 (17:34 -0700)]
data usage color standardization
Change-Id: I7c46ecd5b0730dc524bc788cb941493f3534cb20
Amith Yamasani [Mon, 17 Oct 2011 23:41:00 +0000 (16:41 -0700)]
Show IP address of current active link instead of just the WiFi IP address.
Bug:
5359194
Show "Unavailable" only if there's no active link.
Change-Id: I82ba6bda3a08ea84080a8d8cda331f22d7c7a2bd
Justin Ho [Mon, 17 Oct 2011 23:34:41 +0000 (16:34 -0700)]
am
7a33de4c: Merge "Update wifi icons" into ics-mr0
* commit '
7a33de4c004c9093682b54afa3deab2fdf9ed5f6':
Update wifi icons
Justin Ho [Mon, 17 Oct 2011 23:33:07 +0000 (16:33 -0700)]
Merge "Update wifi icons" into ics-mr0
Justin Ho [Mon, 17 Oct 2011 23:04:31 +0000 (16:04 -0700)]
Update wifi icons
Change-Id: I7a82b96df6c44bc17d70631ef36dc5ad733515c4
John Huang [Mon, 17 Oct 2011 22:22:28 +0000 (15:22 -0700)]
am
7b21e97c: Merge "Add "Roaming protocol" to APN editor." into ics-mr0
* commit '
7b21e97c2a213afbb7ab0d2247e751e8194f89fc':
Add "Roaming protocol" to APN editor.
John Huang [Mon, 17 Oct 2011 22:20:28 +0000 (15:20 -0700)]
Merge "Add "Roaming protocol" to APN editor." into ics-mr0
Claudia de Veaux [Mon, 17 Oct 2011 21:20:29 +0000 (14:20 -0700)]
Merge "Restore Wi-Fi spelling; change "extra-large" to "huge". Bugs:
5467607,
5163232"
Claudia de Veaux [Mon, 17 Oct 2011 19:54:20 +0000 (12:54 -0700)]
Restore Wi-Fi spelling; change "extra-large" to "huge".
Bugs:
5467607,
5163232
Change-Id: Ia0085a085b6f2d1ec9d5a00d08dee4bb38b10f22
Eric Fischer [Mon, 17 Oct 2011 18:28:34 +0000 (11:28 -0700)]
Fix capitalization of Face Unlock.
Bug
5447766
Change-Id: I4a91bd00bb09251af170ca054a8aa0bd88c5eec0
satok [Mon, 17 Oct 2011 12:54:06 +0000 (21:54 +0900)]
Update enabled subtypes in the input method subtype enabler in "onResume"
Bug:
5446825
Change-Id: Iab52ecb8a7334b7be3a81350fbfc9b02d09e88d4
John Huang [Sun, 16 Oct 2011 05:41:11 +0000 (22:41 -0700)]
Add "Roaming protocol" to APN editor.
Field already exists in the APN database. Now it is user updatable.
Only enable it on CDMA for this release (means it is not really user
visible, but available for testing purposes). Will revisit enabling
for all in a future release.
Bug:
5420680
Change-Id: Ia2c551c48ae9ce47c57ad36ec73d152441a27284
Dianne Hackborn [Sun, 16 Oct 2011 18:49:00 +0000 (11:49 -0700)]
Fix issue #
5460725: Crespo does not fully boot after a wipe
Add a hack to relaunch whatever was supposed to be launched
(presumably home) when CryptKeeper discovers it shouldn't be
running.
Change-Id: I1406b8d6e8d484ed1c169fa4908a9e05e8c7c2ad
Jeff Sharkey [Fri, 14 Oct 2011 21:36:58 +0000 (14:36 -0700)]
Data usage chart fixes.
Always draw first data point at 0. Each point should include full
value of current bucket, instead of lagging behind by one.
Bug:
5404917,
5404861,
5178305
Change-Id: I5fa63bc84cc1f9c0403fb03effd5affd2f01ad4c
Jeff Sharkey [Thu, 13 Oct 2011 19:37:47 +0000 (12:37 -0700)]
Merge "Toast when finished pattern or password setup." into ics-mr0
Daniel Sandler [Thu, 13 Oct 2011 19:34:51 +0000 (12:34 -0700)]
Merge "Use new status bar disable flags." into ics-mr0
Jeff Sharkey [Wed, 12 Oct 2011 00:26:27 +0000 (17:26 -0700)]
Toast when finished pattern or password setup.
Bug:
5443781
Change-Id: I599ccbb9c535396e05a2a22ab6d3ef302fb9c623
Jim Miller [Thu, 13 Oct 2011 00:46:17 +0000 (17:46 -0700)]
Fix
5444675: Don't show "Vibrate on touch" in password lock options
Don't show "Vibrate on touch" for password lock screen options because
vibrate is controlled by the IME setting in this case.
Change-Id: Idc8c73048a0c396037457638faed02331ed104f3
Daniel Sandler [Wed, 12 Oct 2011 19:34:23 +0000 (15:34 -0400)]
Use new status bar disable flags.
Requires frameworks/base change I04eb2245.
Bug:
5380495
Change-Id: Ia9e5c25e224b38c1cdad4cd725fc425de90f8344
Jeff Sharkey [Tue, 11 Oct 2011 00:20:53 +0000 (17:20 -0700)]
Merge "Add disclaimer string."
Jeff Sharkey [Tue, 11 Oct 2011 00:04:12 +0000 (17:04 -0700)]
Add disclaimer string.
Bug:
5337015
Change-Id: Iabeb8490ed51f77e98f3c5317e31d30e4e780178
Eric Fischer [Mon, 10 Oct 2011 18:48:47 +0000 (11:48 -0700)]
Merge "Import revised translations."
Eric Fischer [Mon, 10 Oct 2011 18:25:09 +0000 (11:25 -0700)]
Import revised translations.
Change-Id: I064a55b4923fcc09ae2172e1b21cb81eee0db653
Jeff Sharkey [Sun, 9 Oct 2011 20:21:10 +0000 (13:21 -0700)]
Bring back network counters in battery stats.
Bug:
4902271
Change-Id: I0900c030407a86efb14a9d528ab355c56f54679e
Amith Yamasani [Fri, 7 Oct 2011 21:43:24 +0000 (14:43 -0700)]
Merge "Remove pending message when fragment is paused."
Amith Yamasani [Fri, 7 Oct 2011 20:58:39 +0000 (13:58 -0700)]
Remove pending message when fragment is paused.
Bug:
5422788
Converted the runnable to a message and removed any pending messages in onPause.
Change-Id: I048413ae2abd69a359b1fa2c648d98df3c3ae343
Peter Ng [Fri, 7 Oct 2011 19:32:13 +0000 (12:32 -0700)]
Merge "Data usage grid asset updates"
Peter Ng [Fri, 7 Oct 2011 01:35:13 +0000 (18:35 -0700)]
Data usage grid asset updates
Change-Id: I232e784c8552f4f185814f4d5b8082894438c500
Romain Guy [Thu, 6 Oct 2011 01:49:52 +0000 (18:49 -0700)]
Fix string for hdpi devices
Change-Id: Icfad64a4c7df0a6c68336cc361e60ec626b5d735
Irfan Sheriff [Thu, 6 Oct 2011 19:43:01 +0000 (12:43 -0700)]
Merge "Add mobile hotspot provisioning support"
Irfan Sheriff [Thu, 6 Oct 2011 18:45:45 +0000 (11:45 -0700)]
Add mobile hotspot provisioning support
Bug:
5346812
Change-Id: I3e117fb62039c1d8370440ab4109705894011928
Jeff Sharkey [Thu, 6 Oct 2011 05:57:19 +0000 (22:57 -0700)]
Merge "Third time is the charm."
Jeff Sharkey [Thu, 6 Oct 2011 05:54:52 +0000 (22:54 -0700)]
Third time is the charm.
Change-Id: Ic58a7f80e3be0c5d1a0531727f0abac0c8f96fba
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."