OSDN Git Service
Baligh Uddin [Thu, 22 Aug 2013 18:02:26 +0000 (11:02 -0700)]
am
06de3680: (-s ours) am
56c597c1: (-s ours) am
bf65bf49: (-s ours) Import translations. DO NOT MERGE
* commit '
06de3680673eef2ac62dd4e17bb5ce118e88d5aa':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 Aug 2013 17:59:08 +0000 (10:59 -0700)]
am
f3381a80: (-s ours) am
f23da91e: (-s ours) Import translations. DO NOT MERGE
* commit '
f3381a80bd97af42c17bbcc5470804b5c6ada191':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 Aug 2013 17:59:01 +0000 (10:59 -0700)]
am
56c597c1: (-s ours) am
bf65bf49: (-s ours) Import translations. DO NOT MERGE
* commit '
56c597c1b3c5a7d7d2f4e6e26c76c77b9e36120e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 Aug 2013 17:55:45 +0000 (10:55 -0700)]
am
bf65bf49: (-s ours) Import translations. DO NOT MERGE
* commit '
bf65bf49cba2addbcfef81dcea87b27593b9e083':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 Aug 2013 17:55:44 +0000 (10:55 -0700)]
am
f23da91e: (-s ours) Import translations. DO NOT MERGE
* commit '
f23da91e52169b920fb21a10ff76d617117d5f95':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 Aug 2013 17:52:33 +0000 (17:52 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Jonathan Dixon [Thu, 22 Aug 2013 05:00:20 +0000 (05:00 +0000)]
Merge "Add an Are you Sure to experiemental webview" into klp-dev
David Christie [Thu, 22 Aug 2013 04:14:56 +0000 (04:14 +0000)]
Merge "Update power widget to represent gps instead of location " into klp-dev
Jonathan Dixon [Thu, 22 Aug 2013 00:21:27 +0000 (17:21 -0700)]
Add an Are you Sure to experiemental webview
Bug:
10427705
Not bothering to translate strings as this will be deleted soon
Change-Id: I26721e606649d267d1b6507bc1a16ce91a63276a
David Christie [Thu, 22 Aug 2013 00:18:51 +0000 (17:18 -0700)]
Update power widget to represent gps instead of location
Change-Id: I62f701b612db2e31f9ad8b016dbf37ed7fd4ef26
Lifu Tang [Wed, 21 Aug 2013 02:40:44 +0000 (19:40 -0700)]
Sort "Location services" alphabetically
* Sort "Location services" items by title
* Throttle the rate of loading status messages
Change-Id: Iecb039a4ab94a810e11ef3e426e4a4b5c8c75c37
Baligh Uddin [Wed, 21 Aug 2013 23:08:45 +0000 (16:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1f4834979c234fd3a3b2238bc4e3e5da68d033db
Auto-generated-cl: translation import
Baligh Uddin [Wed, 21 Aug 2013 23:04:35 +0000 (16:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iac08e7012b0da2da09077d0eaeda93b42473d14f
Auto-generated-cl: translation import
Baligh Uddin [Wed, 21 Aug 2013 23:03:04 +0000 (16:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idc054aa50da72b31b8c75270bff2739ef541af01
Auto-generated-cl: translation import
Alan Viverette [Wed, 21 Aug 2013 20:58:07 +0000 (13:58 -0700)]
Update caption preferences to use SubtitleView
Change-Id: I02230669c5e7be36006e04bb7110446265f122d9
Romain Guy [Wed, 21 Aug 2013 18:54:29 +0000 (11:54 -0700)]
Add Deuteranomaly color set to overdraw debugging
Change-Id: I27e48f54653f24383ab85c0e500fdd79cec28cc3
David Christie [Wed, 21 Aug 2013 17:40:56 +0000 (17:40 +0000)]
Merge "Switch location Settings and Power widget to use new Settings api." into klp-dev
Tom O'Neill [Wed, 21 Aug 2013 14:53:18 +0000 (14:53 +0000)]
Merge "Move UPDATE_INTENT to SettingsInjectorService" into klp-dev
Alan Viverette [Wed, 21 Aug 2013 01:14:33 +0000 (18:14 -0700)]
Allow the framework to recycle ApnPreference views
BUG:
10079104
Change-Id: Iaa4f155da12a141f16300076cc820d47e0c5779a
Alan Viverette [Tue, 20 Aug 2013 23:46:20 +0000 (23:46 +0000)]
Merge "Fix background and line wrapping in CaptionTextView" into klp-dev
Alan Viverette [Tue, 20 Aug 2013 22:58:38 +0000 (15:58 -0700)]
Fix background and line wrapping in CaptionTextView
Also fixes where two style names were accidentally switched,
makes the font sizes larger, and cleans up the CaptionTextView
styling APIs in preparation for moving it into the framework.
BUG:
10396663
Change-Id: I00999723a67bce2659d913b70dd4420ed32f955c
David Christie [Tue, 20 Aug 2013 22:24:21 +0000 (15:24 -0700)]
Switch location Settings and Power widget to use new Settings api.
Change-Id: I06b7a2e21876a18d9ad42fda2a6c6d4c7b6add48
Amith Yamasani [Tue, 20 Aug 2013 20:33:24 +0000 (20:33 +0000)]
Merge "Select max timeout, if it's in the timeout list" into klp-dev
Lifu Tang [Fri, 16 Aug 2013 19:44:54 +0000 (12:44 -0700)]
Launches the Location setting as fragment
Change-Id: I0fb04a346236676ce9483a0c4d1fc3b2b590b08c
Lifu Tang [Sun, 18 Aug 2013 07:34:20 +0000 (00:34 -0700)]
Sort recent apps, show message when no recent apps
Change-Id: I70bb1913435b46fc87aec10075e43f98ef07ef62
Lifu Tang [Mon, 19 Aug 2013 21:33:22 +0000 (21:33 +0000)]
Merge "Supress Location button when coming from Location" into klp-dev
Christopher Tate [Mon, 19 Aug 2013 21:19:11 +0000 (21:19 +0000)]
Merge "Don't crash when procstats has data for a now-disused uid" into klp-dev
Lifu Tang [Sun, 18 Aug 2013 08:23:45 +0000 (01:23 -0700)]
Supress Location button when coming from Location
Change-Id: Ie1f1aed17206530ec7c8a1cde43a4380b7232823
Tom O'Neill [Wed, 14 Aug 2013 20:35:28 +0000 (13:35 -0700)]
Move UPDATE_INTENT to SettingsInjectorService
Change-Id: I657c799b791e49e4af097f3cc4afdaa8f48325ac
Baligh Uddin [Mon, 19 Aug 2013 20:09:43 +0000 (13:09 -0700)]
am
1df37ff1: (-s ours) am
2b851859: (-s ours) am
b09878b8: (-s ours) Import translations. DO NOT MERGE
* commit '
1df37ff1b1761ed6124e1ff1abcfb4c0d60f6c77':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 19 Aug 2013 20:06:15 +0000 (13:06 -0700)]
am
5c601791: (-s ours) am
8485f115: (-s ours) Import translations. DO NOT MERGE
* commit '
5c601791074c2275bd42ad8c6798ef39b13e0a6d':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 19 Aug 2013 20:06:14 +0000 (13:06 -0700)]
am
21cbd017: (-s ours) am
e37538b1: (-s ours) am
8c6de9e0: (-s ours) Import translations. DO NOT MERGE
* commit '
21cbd017a3201639097cda31c59f769d1cc2b739':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 19 Aug 2013 20:04:58 +0000 (13:04 -0700)]
am
2b851859: (-s ours) am
b09878b8: (-s ours) Import translations. DO NOT MERGE
* commit '
2b85185988eec44b6fdd3ee072d44b0a7a72d432':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 19 Aug 2013 20:01:53 +0000 (13:01 -0700)]
am
b09878b8: (-s ours) Import translations. DO NOT MERGE
* commit '
b09878b85044df1032eb4612b3165216388165ac':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 19 Aug 2013 20:00:37 +0000 (13:00 -0700)]
am
8485f115: (-s ours) Import translations. DO NOT MERGE
* commit '
8485f115d25968c0fa3ab9d1ea42d2751422feb5':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 19 Aug 2013 20:00:36 +0000 (13:00 -0700)]
am
e37538b1: (-s ours) am
8c6de9e0: (-s ours) Import translations. DO NOT MERGE
* commit '
e37538b122199f316b8b8eb76a6445de6f5c83be':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 19 Aug 2013 19:08:24 +0000 (12:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ice096be39ce880f1a777c969b0bfb7e2987ec888
Auto-generated-cl: translation import
Baligh Uddin [Mon, 19 Aug 2013 19:04:34 +0000 (12:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id76ef34b16fb0979b5b86c5e04b60e0d3088c54a
Auto-generated-cl: translation import
Baligh Uddin [Mon, 19 Aug 2013 19:03:06 +0000 (12:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3c136ce6349c35f3cec69d12f355daaf1e8912b5
Auto-generated-cl: translation import
Christopher Tate [Mon, 19 Aug 2013 00:26:48 +0000 (17:26 -0700)]
Don't crash when procstats has data for a now-disused uid
That is, PackageManager.getPackagesForUid(uid) can return null,
so deal with it.
Bug
10374656
Change-Id: I4eacd48c809b778e131d37dba0e86c583553e41f
Amith Yamasani [Fri, 16 Aug 2013 23:35:54 +0000 (16:35 -0700)]
Select max timeout, if it's in the timeout list
Bug:
10192592
Change-Id: I21ec208abf0c8659233cdb5219d9b226528aa1d4
Amith Yamasani [Fri, 16 Aug 2013 01:04:51 +0000 (01:04 +0000)]
Merge "Don't apply encryption password requirements for secondary users" into klp-dev
Baligh Uddin [Fri, 16 Aug 2013 00:54:13 +0000 (17:54 -0700)]
am
a7238c18: (-s ours) am
dbf26e70: (-s ours) Import translations. DO NOT MERGE
* commit '
a7238c18b0b5a4500bc0b7a93ddcf4068d45fcd1':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Aug 2013 00:48:11 +0000 (17:48 -0700)]
am
8c6de9e0: (-s ours) Import translations. DO NOT MERGE
* commit '
8c6de9e052810aeec7a347bd015e7e8bf2c337cc':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Aug 2013 00:48:05 +0000 (17:48 -0700)]
am
dbf26e70: (-s ours) Import translations. DO NOT MERGE
* commit '
dbf26e70a1f546f9e198a72b2218ae99b015c9e6':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Aug 2013 00:44:53 +0000 (00:44 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Zhihai Xu [Fri, 16 Aug 2013 00:22:33 +0000 (00:22 +0000)]
Merge "LE: Add support for the HID-over-GATT profile (3/3)" into klp-dev
Amith Yamasani [Thu, 15 Aug 2013 22:35:49 +0000 (15:35 -0700)]
Don't apply encryption password requirements for secondary users
Bug:
10314289
Change-Id: I54a54f910c914b41abd3e18963b4bd0c3cddb34a
Andre Eisenbach [Fri, 8 Mar 2013 02:05:12 +0000 (18:05 -0800)]
LE: Add support for the HID-over-GATT profile (3/3)
bug:
8330048
Change-Id: I0999c3af999939aec88eba4c38bca4358c554e69
Lifu Tang [Mon, 12 Aug 2013 23:34:45 +0000 (16:34 -0700)]
Linked the recent location apps to battery page
* Extracted BatteryStatsHelper from PowerUsageSummary
* Dropped the "pause" and "resume" method from the
RadioButtonPreference
* Opening battery usage page when the user clicks the recent location
apps item
Change-Id: I5a2d03271434765780154265976d8caa7f8060d8
Lifu Tang [Thu, 15 Aug 2013 19:13:42 +0000 (19:13 +0000)]
Merge "Shows "App Info" for system apps" into klp-dev
Lifu Tang [Thu, 15 Aug 2013 00:25:12 +0000 (17:25 -0700)]
Shows "App Info" for system apps
If a specific Uid contains only one package, we show the "App Info"
button, even if it's a system app
Change-Id: Ie39b6d90e62ae432c636d50729f0aa45405ce67c
Baligh Uddin [Wed, 14 Aug 2013 21:46:29 +0000 (14:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3504c607a35636c6e0455571e9e7006244564b95
Auto-generated-cl: translation import
Baligh Uddin [Wed, 14 Aug 2013 21:44:15 +0000 (14:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9d761d078fd6bc6a07998e3e439242eab9ea0c14
Auto-generated-cl: translation import
Baligh Uddin [Wed, 14 Aug 2013 21:42:52 +0000 (14:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia45a89a6f426413ccca221aba0d34e597cdb4ec7
Auto-generated-cl: translation import
Martijn Coenen [Wed, 14 Aug 2013 15:58:06 +0000 (15:58 +0000)]
Merge "NFC: Allow to get result from tap-pay default dialog." into klp-dev
Martijn Coenen [Wed, 14 Aug 2013 15:57:11 +0000 (08:57 -0700)]
NFC: Allow to get result from tap-pay default dialog.
Change-Id: Ic9e88dca5577a4f553dca56e0ff387c1e96f2ed2
Tom O'Neill [Wed, 14 Aug 2013 00:30:30 +0000 (00:30 +0000)]
Merge "Settings app supports location settings injection" into klp-dev
Maggie Benthall [Tue, 13 Aug 2013 17:00:24 +0000 (17:00 +0000)]
Merge "Fix bug when sharing to bluetooth." into klp-dev
Przemyslaw Szczepaniak [Tue, 13 Aug 2013 12:05:48 +0000 (13:05 +0100)]
Fix for TTS settings crash.
Play an example is wrongly enabled before TTS engine is initialized.
Bug:
10288565
Change-Id: I9204d8dda7f8de5c67aba2bb73b25589eeac5cef
Baligh Uddin [Tue, 13 Aug 2013 07:48:30 +0000 (00:48 -0700)]
am
508997ad: (-s ours) am
728da455: (-s ours) am
03ae9bf0: (-s ours) Import translations. DO NOT MERGE
* commit '
508997ad0729e16eb04c475f9be3e33ca5ed60cf':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 Aug 2013 07:45:32 +0000 (00:45 -0700)]
am
728da455: (-s ours) am
03ae9bf0: (-s ours) Import translations. DO NOT MERGE
* commit '
728da4558087e5b3fe25fad7eedb4f5de5c4068f':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 Aug 2013 07:44:04 +0000 (00:44 -0700)]
am
08f1d439: (-s ours) am
05404105: (-s ours) Import translations. DO NOT MERGE
* commit '
08f1d439c7a278b0cd9afd60f2ba41e846f40543':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 Aug 2013 07:42:15 +0000 (00:42 -0700)]
am
03ae9bf0: (-s ours) Import translations. DO NOT MERGE
* commit '
03ae9bf0e90c02ec1afcd13c9993d2d9672eb36f':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 Aug 2013 07:42:11 +0000 (00:42 -0700)]
am
05404105: (-s ours) Import translations. DO NOT MERGE
* commit '
054041058f9706c95b3d72ca421fcb656ad59d1e':
Import translations. DO NOT MERGE
Tom O'Neill [Mon, 12 Aug 2013 23:22:48 +0000 (16:22 -0700)]
Settings app supports location settings injection
- Partial fix for b/
10287745
Change-Id: Ia5eb05670957125e70717c86a686a54b77b22455
Maggie Benthall [Mon, 12 Aug 2013 22:40:45 +0000 (18:40 -0400)]
Fix bug when sharing to bluetooth.
Bug:
10259347
Change-Id: I860a758333947c4207d7acda41e43b8bd1d671df
Baligh Uddin [Mon, 12 Aug 2013 18:51:11 +0000 (11:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6770486a959f0bd90fe6621ba8e6348f7f5381f0
Auto-generated-cl: translation import
Baligh Uddin [Mon, 12 Aug 2013 18:48:59 +0000 (11:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic75004da530d9dd114beb02d72928b2204f07b0e
Auto-generated-cl: translation import
Baligh Uddin [Mon, 12 Aug 2013 18:47:40 +0000 (11:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1f8effde31afbf4145ae6b234f0e02e08f9cb882
Auto-generated-cl: translation import
Zhihai Xu [Sat, 10 Aug 2013 01:46:22 +0000 (01:46 +0000)]
Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev
Dianne Hackborn [Fri, 9 Aug 2013 23:17:27 +0000 (16:17 -0700)]
Proc stats UI improvements.
Now have a chart showing the memory state, and text showing the
current memory state. Trying to do better at picking the application
to blame for a process hosting multiple apps. Start of infrastructure
for more detailed reporting.
Change-Id: I93ca7ecf2fd0bc01e3be8d28b80212ac78fe7607
Matthew Xie [Fri, 19 Jul 2013 00:16:27 +0000 (17:16 -0700)]
Bluetooth MAP profile - sms and mms support initial check-in
bug:
10116530
Change-Id: I3f50e66420e53bf21a1ecba06aed6b8261ff3064
Martijn Coenen [Fri, 9 Aug 2013 20:37:38 +0000 (13:37 -0700)]
Instantiate correct classes for tap&say settings.
Change-Id: I59b08fb8093ec1f9798dc41d8069eccdfc0b2098
Geoffrey Borggaard [Fri, 9 Aug 2013 15:44:42 +0000 (11:44 -0400)]
Allow navigation to TrustedCredentials User Certs by intent.
Adds an activity, and an entry in the AndroidManifest.xml
Change-Id: Ic3cfa1f3bdc3f2eefc290195679011c224496d63
Dianne Hackborn [Fri, 9 Aug 2013 19:13:59 +0000 (19:13 +0000)]
Merge "Improve process stats UI." into klp-dev
Alan Viverette [Fri, 9 Aug 2013 19:11:25 +0000 (19:11 +0000)]
Merge "Update captioning settings to match final design" into klp-dev
Dianne Hackborn [Fri, 9 Aug 2013 19:08:54 +0000 (12:08 -0700)]
Improve process stats UI.
Now roll up multiple process stats to have at least a
day of data, change the visualization to have the bars show
"weight" (duration*pss) and the text the percent of total
time running, add label to show how much time the stats
are over.
Change-Id: I73763cb6a66d03d856ea4bf517eac0fe39c79c52
Amith Yamasani [Fri, 9 Aug 2013 00:28:48 +0000 (00:28 +0000)]
Merge "Fix inconsistent text in Settings>Security>Screen lock" into klp-dev
Amith Yamasani [Fri, 9 Aug 2013 00:27:23 +0000 (17:27 -0700)]
Fix inconsistent text in Settings>Security>Screen lock
Bug:
10157179
Change-Id: Ib508b161d87248679fb9b8f3dae1584f73f18dcb
Amith Yamasani [Thu, 8 Aug 2013 23:13:58 +0000 (23:13 +0000)]
Merge "Potential fix for Bug:
10241642" into klp-dev
Amith Yamasani [Thu, 8 Aug 2013 23:06:39 +0000 (16:06 -0700)]
Potential fix for Bug:
10241642
Check if the fragment is running before handling click.
Change-Id: I78ab3db5c5d0b3e041cff7525239698c361fd5fb
Dianne Hackborn [Thu, 8 Aug 2013 19:57:53 +0000 (12:57 -0700)]
Initial rough stab at a proc stats UI.
You see procs, and you see some stats.
Change-Id: I91c86d198fd5e64a41c72901e150466b3c602caf
Baligh Uddin [Thu, 8 Aug 2013 21:14:17 +0000 (14:14 -0700)]
am
7256942b: (-s ours) am
d01ca3ce: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '
7256942bb757bfaa14db128386c0ecb363b26935':
Import translations. DO NOT MERGE
The Android Open Source Project [Thu, 8 Aug 2013 21:14:12 +0000 (14:14 -0700)]
am
f4316f6d: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
f4316f6d5b9a87cd366af4f0f22ab8713ac1b8ad':
Import translations. DO NOT MERGE
Fix issue #
10190597: "Any permission restrictions" is displayed after a...
Reset app preferences now resets all app ops.
Import translations. DO NOT MERGE
Fix issue #
10190597: "Any permission restrictions" is displayed after a...
Reset app preferences now resets all app ops.
Revert "Completely remove app ops activity."
Completely remove app ops activity.
Baligh Uddin [Thu, 8 Aug 2013 21:14:02 +0000 (14:14 -0700)]
am
b4d720f9: (-s ours) am
9a53339d: (-s ours) am
e211fd11: (-s ours) Import translations. DO NOT MERGE
* commit '
b4d720f9d739f5618d6acef9bd87837700c908eb':
Import translations. DO NOT MERGE
Amith Yamasani [Thu, 8 Aug 2013 20:46:24 +0000 (20:46 +0000)]
Merge "Developer option to force RTL layout direction" into klp-dev
David Christie [Thu, 8 Aug 2013 20:19:05 +0000 (20:19 +0000)]
Merge "Modify Power Widget Gps Icon To Represent Location. Instead of directly controlling gps on/off, it will control master location switch on/off." into klp-dev
Alan Viverette [Thu, 8 Aug 2013 17:38:50 +0000 (10:38 -0700)]
Update captioning settings to match final design
BUG:
9926077
Change-Id: I058c05643f33aca89327f23bcdee53dd8afb3bbb
Svetoslav [Thu, 8 Aug 2013 19:35:36 +0000 (12:35 -0700)]
Fix a crash in accessibiility settings.
Change-Id: I27920668191742ab032de7b71c8f71cc35432e9f
David Christie [Wed, 7 Aug 2013 01:20:33 +0000 (18:20 -0700)]
Modify Power Widget Gps Icon To Represent Location.
Instead of directly controlling gps on/off, it will
control master location switch on/off.
Change-Id: I12a20fb77c12b5099172167821ff7ed00ba9ea7c
Amith Yamasani [Thu, 8 Aug 2013 03:14:44 +0000 (20:14 -0700)]
Developer option to force RTL layout direction
Sets a global setting and system property and forces a config change
when developer selects to force RTL screen layout direction.
Bug:
10244047
Change-Id: Id91e52be5e492515ff1eef3cbccfb08e944bfc92
Lifu Tang [Wed, 7 Aug 2013 18:18:16 +0000 (11:18 -0700)]
Displays a list of most recent location apps
Change-Id: I8e34ca8c30f308744022f17fac2444a496abd9e6
(cherry picked from commit
16ab0eca74751c331c1c74612548a27735a450b7)
Lifu Tang [Thu, 8 Aug 2013 00:55:39 +0000 (00:55 +0000)]
Merge "Finished the location settings"
Lifu Tang [Tue, 6 Aug 2013 20:31:50 +0000 (13:31 -0700)]
Finished the location settings
Change-Id: I333fcc74ad387ef6edaa558656d3eaa91feb8fe9
Jason Monk [Wed, 7 Aug 2013 19:10:42 +0000 (19:10 +0000)]
Merge "Restriction pin changes."
Geoffrey Borggaard [Wed, 7 Aug 2013 18:57:43 +0000 (14:57 -0400)]
Restriction pin changes.
Fixed bug in WirelessSettings where it was asking users for a PIN when
they weren't restricted. Did this by refactoring the preference level
pin checking into the superclass, where it checks for the restricted mode first.
Also pin protected changes to certificates for restricted users.
Change-Id: I8310fd39f0862159668318fc1360ec6859cc00d5
Baligh Uddin [Wed, 7 Aug 2013 17:28:43 +0000 (10:28 -0700)]
am
d01ca3ce: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '
d01ca3ce4a5b93dc0dad46ad0674d6b28d89b0ee':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 7 Aug 2013 17:26:15 +0000 (17:26 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 7 Aug 2013 17:24:07 +0000 (17:24 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev