OSDN Git Service
PauloftheWest [Tue, 16 Dec 2014 18:00:50 +0000 (10:00 -0800)]
String fixes for Settings.
Bug:
18359513
Bug:
17659522
Change-Id: I4645c1e615661613c22b86981ede34327da51aab
Jim Miller [Fri, 20 Mar 2015 00:03:13 +0000 (00:03 +0000)]
Merge "FingerprintSettings improvements"
Stuart Scott [Thu, 19 Mar 2015 23:02:09 +0000 (16:02 -0700)]
Add null pointer check
Change-Id: I5f364e8010d61162ed57148658965b9730491050
Stuart Scott [Thu, 19 Mar 2015 21:57:32 +0000 (21:57 +0000)]
Merge "Add null pointer check"
Stuart Scott [Thu, 19 Mar 2015 21:48:37 +0000 (14:48 -0700)]
Add null pointer check
Change-Id: I770d9ff289da462ce644d9e9e7be2faecb4d17b7
Jim Miller [Fri, 13 Mar 2015 02:26:12 +0000 (19:26 -0700)]
FingerprintSettings improvements
- move fingerprint update notifications to a handler
- touching a known fingerprint now highlights the entry in Settings.
- cleanup - remove HashMap and add new FingerprintPreference class.
Bug
19592835
Change-Id: Ie94f825e34c14fe94648375762482f9243b7dd49
Jason Monk [Thu, 26 Feb 2015 16:33:22 +0000 (11:33 -0500)]
Start implementation of new app info storage page
Things are mostly in the right places, may need some minor location
adjustment on everything and styling for the buttons.
Bug:
19511439
Change-Id: If7730285d6ddc36e32cc8bc119885a8e215c0eb5
Jason Monk [Thu, 19 Mar 2015 18:00:54 +0000 (18:00 +0000)]
Merge "Only show 2 buttons in app info screen"
Sanket Padawe [Thu, 19 Mar 2015 17:26:40 +0000 (17:26 +0000)]
Merge "Fix crash while trying to connect to network in WiFi Settings."
Sanket Padawe [Wed, 18 Mar 2015 23:20:40 +0000 (16:20 -0700)]
Fix crash while trying to connect to network in WiFi Settings.
Bug:
19535465
Change-Id: Ibfc40a08e6c648681df5fd16e2334d9ec45b10f4
Geoff Mendal [Wed, 18 Mar 2015 22:33:25 +0000 (22:33 +0000)]
am
7adbdd5b: (-s ours) am
b9b1124c: (-s ours) am
ac8641ed: (-s ours) Import translations. DO NOT MERGE
* commit '
7adbdd5b00efa5cde1b3d446888a9b3142051bf7':
Import translations. DO NOT MERGE
John Spurlock [Wed, 18 Mar 2015 19:38:58 +0000 (15:38 -0400)]
Settings: Remove all unused imports.
Change-Id: Iebfa52cb849d69974c94902b0b020893cf5618a3
Jason Monk [Wed, 18 Mar 2015 14:06:13 +0000 (10:06 -0400)]
Only show 2 buttons in app info screen
They are disable or uninstall and force stop. When there is a third
action it gets pushed to the overflow menu.
Bug:
19511439
Change-Id: I1a0ee71662c09f191fd15524f1a123877eabbe90
Stuart Scott [Wed, 18 Mar 2015 18:28:23 +0000 (18:28 +0000)]
Merge "Add option to reset network settings to factory"
Geoff Mendal [Wed, 18 Mar 2015 18:24:08 +0000 (18:24 +0000)]
am
b9b1124c: (-s ours) am
ac8641ed: (-s ours) Import translations. DO NOT MERGE
* commit '
b9b1124cd7cd1109068d8bba1cf3a35c1626f32f':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Mar 2015 16:54:53 +0000 (16:54 +0000)]
am
ac8641ed: (-s ours) Import translations. DO NOT MERGE
* commit '
ac8641ede6c0c4d4062789ed019954c7e1f77d9b':
Import translations. DO NOT MERGE
Jason Monk [Wed, 18 Mar 2015 15:14:02 +0000 (15:14 +0000)]
Merge "Fix crash in app info"
Jason Monk [Wed, 18 Mar 2015 14:52:26 +0000 (10:52 -0400)]
Fix crash in app info
Bug:
19653600
Change-Id: Iddd2da2fcab284e34d40afe493c72bb469648380
Jason Monk [Wed, 18 Mar 2015 14:44:43 +0000 (14:44 +0000)]
Merge "Add data item to app info screen"
Jason Monk [Tue, 17 Mar 2015 14:06:58 +0000 (10:06 -0400)]
Add data item to app info screen
Add link from app info to directly viewing data usage for that app.
Also do some minor tweaks to get ordering and summaries right on
the app info screen.
Bug:
19511439
Change-Id: Ic50dc24bf9a5c1fe6a7aa076772915ba61168fac
Geoff Mendal [Wed, 18 Mar 2015 13:56:37 +0000 (13:56 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 18 Mar 2015 13:52:00 +0000 (06:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8ad128a937bfdcee9af796b930c5f316ecbb9154
Auto-generated-cl: translation import
Geoff Mendal [Wed, 18 Mar 2015 12:57:04 +0000 (12:57 +0000)]
am
a6b490e2: (-s ours) am
a03c39aa: (-s ours) Import translations. DO NOT MERGE
* commit '
a6b490e21d7987371484b01e1b82caa964b381f1':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Mar 2015 12:56:44 +0000 (05:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia82339bdeddcb2be2864732de532c5d669d9a286
Auto-generated-cl: translation import
Geoff Mendal [Wed, 18 Mar 2015 12:50:58 +0000 (12:50 +0000)]
am
a03c39aa: (-s ours) Import translations. DO NOT MERGE
* commit '
a03c39aae8309416364d6d0ccbb0ec89c009b05d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Mar 2015 12:45:01 +0000 (05:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I13ef4dce2edd63600d99c7234274f5b2daafd943
Auto-generated-cl: translation import
John Spurlock [Tue, 17 Mar 2015 19:47:14 +0000 (19:47 +0000)]
Merge "Settings: Add a 'Cast' entry point under Sound & notification."
John Spurlock [Tue, 17 Mar 2015 19:38:27 +0000 (15:38 -0400)]
Settings: Add a 'Cast' entry point under Sound & notification.
Bug:
19779557
Change-Id: I2d2a9e366eabfbc17f706813c9018275746d89b7
John Spurlock [Tue, 17 Mar 2015 19:24:42 +0000 (19:24 +0000)]
Merge "Settings: 'Cast screen' -> 'Cast'."
John Spurlock [Tue, 17 Mar 2015 18:24:33 +0000 (14:24 -0400)]
Settings: 'Cast screen' -> 'Cast'.
Bug:
19773357
Change-Id: Ie222166e4d7a0bd27ea2f34ac6a7e6ba759edd7e
Yohei Yukawa [Fri, 20 Feb 2015 18:06:51 +0000 (03:06 +0900)]
Stop using InputMethodUtils.isValidSystemDefaultIme
This is a follow up CL for a recent attempt to minimize
the number of default enabled IMEs.
- part1: I831502db502f4073c9c2f50ce7705a4e45e2e1e3
- part2: Ife93d909fb8a24471c425c903e2b7048826e17a3
- part3: I6571d464a46453934f0a8f5e79018a67a9a3c845
- part4: I871ccda787eb0f1099ba3574356c1da4b33681f3
In the above changes,
InputMethodUtils.isValidSystemDefaultIme was deprecated in favor
of InputMethodUtils.isSystemImeThatHasSubtypeOf.
With this CL, InputMethodUtils.isValidSystemDefaultIme is not
used by the setting app anymore and we can remove that method
from InputMethodUtils finally.
This is a pure code refactoring with preserving the current
logic. Hence no behavior change is intended.
Change-Id: Ie96b0d17745735db63eebe6fe1654f32d9b9a170
Jason Monk [Mon, 16 Mar 2015 19:45:06 +0000 (19:45 +0000)]
Merge "Merge profiles apps into app list"
Jason Monk [Thu, 26 Feb 2015 21:19:34 +0000 (16:19 -0500)]
Merge profiles apps into app list
Remove the spinner and add all apps into one list and badge the managed
items.
Bug:
19443900
Change-Id: I9ccacc1b503da2663b9a3945f4fd6051ae95e328
Geoff Mendal [Mon, 16 Mar 2015 14:02:52 +0000 (14:02 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 16 Mar 2015 13:39:11 +0000 (06:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2a5e2c22d16914aaaed29701a8a84efbf3dfe9e1
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Mar 2015 13:18:24 +0000 (13:18 +0000)]
am
7e760e5f: (-s ours) am
d28b6bae: (-s ours) am
01492de4: (-s ours) Import translations. DO NOT MERGE
* commit '
7e760e5f9c08555c9abeafcc3ab988710df238b4':
Import translations. DO NOT MERGE
Narayan Kamath [Mon, 16 Mar 2015 13:14:56 +0000 (13:14 +0000)]
Fix build harder.
The first build fix removed a missing comma due to a bad conflict
resolution. This one removes a reference to a non-existent
class.
Change-Id: Ie2fd7ac8141f3ec6c34ed5f09e08842d02e7e650
Geoff Mendal [Mon, 16 Mar 2015 13:10:47 +0000 (13:10 +0000)]
am
d28b6bae: (-s ours) am
01492de4: (-s ours) Import translations. DO NOT MERGE
* commit '
d28b6bae2491145241eb4e3a3384ed059f615234':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 13:03:30 +0000 (13:03 +0000)]
am
01492de4: (-s ours) Import translations. DO NOT MERGE
* commit '
01492de48d374833e8b4d304308e5fd394eeafcc':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 12:56:34 +0000 (12:56 +0000)]
am
79e7d174: (-s ours) am
d1e37422: (-s ours) Import translations. DO NOT MERGE
* commit '
79e7d1747ffde2a70fc709915c55f6e149d879e4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 12:49:26 +0000 (12:49 +0000)]
am
d1e37422: (-s ours) Import translations. DO NOT MERGE
* commit '
d1e37422b255a9417dfa5c6cb30e03e177fed5ad':
Import translations. DO NOT MERGE
Narayan Kamath [Mon, 16 Mar 2015 12:48:05 +0000 (12:48 +0000)]
Fix Settings build.
Broken due to a bogus merge conflict resolution.
Change-Id: Id4e3215ac964ebac792e29f50741b020c06d11f4
Geoff Mendal [Mon, 16 Mar 2015 12:44:27 +0000 (05:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I785caae50a0df960b25d862e06b2fa8010c1bd26
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Mar 2015 12:32:21 +0000 (05:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie8486278c1326c35e32e3c87323de45e7225c83e
Auto-generated-cl: translation import
Vinit Deshpande [Mon, 16 Mar 2015 07:55:25 +0000 (00:55 -0700)]
Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'
Change-Id: I6c9de433a224925961b484b400a89edf9059d2bd
Wale Ogunwale [Fri, 13 Mar 2015 15:52:35 +0000 (15:52 +0000)]
Merge "Remove multi-window developer setting from search index if disabled."
Zoltan Szatmary-Ban [Fri, 13 Mar 2015 09:28:45 +0000 (09:28 +0000)]
Merge "Make default user icons retrievable as cached bitmaps"
Jim Miller [Thu, 12 Mar 2015 21:21:03 +0000 (21:21 +0000)]
Merge "Add flag to hide disabled keyguard options."
Jim Miller [Thu, 12 Mar 2015 03:17:39 +0000 (20:17 -0700)]
Add flag to hide disabled keyguard options.
Normally keyguard options are disabled by things like credential
storage and device admins, so we show the reason in ChooseLockGeneric.
However, in the case of fingerprint we want to limit the scope
to just those options that have security (pin,password,pattern).
Bug
19592835
Change-Id: I6832ff692bad538adeec2f2575fca4f8f04f40cf
Wale Ogunwale [Thu, 12 Mar 2015 19:10:13 +0000 (12:10 -0700)]
Remove multi-window developer setting from search index if disabled.
Bug:
19494313
Change-Id: I6339d06a4b2ffe712ff8a2a3e72ddfdc63244d28
Jim Miller [Thu, 12 Mar 2015 17:57:50 +0000 (17:57 +0000)]
Merge "Don't reset fingerprint storage on devices without fingerprint hw."
Jim Miller [Thu, 12 Mar 2015 17:33:53 +0000 (10:33 -0700)]
Don't reset fingerprint storage on devices without fingerprint hw.
Fixes bug
19707354
Change-Id: I26144dc855bff83cdc9c9544c8ab7449274d7b5e
Geoff Mendal [Thu, 12 Mar 2015 17:25:27 +0000 (17:25 +0000)]
am
9f0b7264: (-s ours) am
feb731a2: (-s ours) am
dd07a862: (-s ours) Import translations. DO NOT MERGE
* commit '
9f0b7264e55ca2ba96cd09df0c307c169c58b56d':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 12 Mar 2015 17:25:26 +0000 (17:25 +0000)]
am
3335973a: (-s ours) am
f02db6b7: (-s ours) Import translations. DO NOT MERGE
* commit '
3335973a6710135a299a615c7a48555c51586e97':
Import translations. DO NOT MERGE
Jason Monk [Thu, 12 Mar 2015 14:32:00 +0000 (14:32 +0000)]
Merge "Follow-up on comments from splitting app info"
Jason Monk [Thu, 12 Mar 2015 14:23:51 +0000 (14:23 +0000)]
Merge "Support some changes to SettingsLib"
Jim Miller [Thu, 12 Mar 2015 01:20:17 +0000 (01:20 +0000)]
Merge "Implement additional fingerprint flows in Settings."
Jim Miller [Thu, 5 Mar 2015 02:07:32 +0000 (18:07 -0800)]
Implement additional fingerprint flows in Settings.
- new onboarding flow ("locate sensor")
- changed sensor location image
- changed in-app sensor icon
- remove fingerprint animation since it caused people to
want to tap on it.
- remove enrolled fingerprint templates when switching back to "none" or "slide"
- use real in-app icon for fingerprint
- much improved layout
- basic landscape layout working
- added 250ms delay to final enrollment step so it's not so jarring
- delete is now working
- rename wired, but not functional yet
Bug
19592835
Change-Id: Ie3e73a2fc8f834f1b90e2746c4cc841216aa6031
Maurice Lam [Wed, 11 Mar 2015 23:22:19 +0000 (23:22 +0000)]
Merge "[WifiSettings] Refactor Wi-Fi required info"
Maurice Lam [Thu, 5 Mar 2015 19:20:47 +0000 (11:20 -0800)]
[WifiSettings] Refactor Wi-Fi required info
Instead of using an invisible TextView in the layout itself, make the
required info a list header. This paves way for using the Setup
Wizard library by including all the required contents in the ListView
itself.
The required info is not shown since Lollipop, but can be tested with
adb shell am start -a "com.android.net.wifi.SETUP_WIFI_NETWORK" \
--es theme material_light \
--ez useImmersiveMode true \
--ez wifi_show_wifi_required_info true
Bug:
19698532
Change-Id: I5a7da726b2f49af7dd755b41c73e1a1b4349699c
Robin Lee [Wed, 11 Mar 2015 18:47:48 +0000 (18:47 +0000)]
Merge "Don't reset the keystore during password change"
Geoff Mendal [Wed, 11 Mar 2015 17:25:25 +0000 (17:25 +0000)]
am
feb731a2: (-s ours) am
dd07a862: (-s ours) Import translations. DO NOT MERGE
* commit '
feb731a2c94d2238587d1a84d0a2d09f99329612':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Mar 2015 17:25:11 +0000 (17:25 +0000)]
am
f02db6b7: (-s ours) Import translations. DO NOT MERGE
* commit '
f02db6b7e8fc774e64b812613cde7746d31aa10e':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Mar 2015 13:35:00 +0000 (06:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id8312d1b2f877c9236d1f517c5d92d5340f23d6e
Auto-generated-cl: translation import
Geoff Mendal [Wed, 11 Mar 2015 12:49:26 +0000 (12:49 +0000)]
am
dd07a862: (-s ours) Import translations. DO NOT MERGE
* commit '
dd07a86251dd79190bdc7bc811ae09c65eab89d2':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Mar 2015 12:40:13 +0000 (05:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia9a0856a78edd8afe8c540b8c68e88b063b34b1d
Auto-generated-cl: translation import
Geoff Mendal [Wed, 11 Mar 2015 12:28:40 +0000 (05:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia835e0d6c351a29462c1d8adcd002f6f1bec598b
Auto-generated-cl: translation import
Pavel Zhamaitsiak [Tue, 10 Mar 2015 19:34:18 +0000 (19:34 +0000)]
Merge "Show alerts in case of some IMS registration errors." into lmp-mr1-wfc-dev
automerge:
4c7a410
* commit '
4c7a4101ca87668341a998d17e929f66973c53f5':
Show alerts in case of some IMS registration errors.
Pavel Zhamaitsiak [Tue, 10 Mar 2015 19:27:31 +0000 (19:27 +0000)]
Merge "Show alerts in case of some IMS registration errors." into lmp-mr1-wfc-dev
Pavel Zhamaitsiak [Tue, 10 Mar 2015 16:57:44 +0000 (16:57 +0000)]
Update Wi-Fi Calling mode when WFC is enabled/disabled
automerge:
248b8fd
* commit '
248b8fd7bf46c80d06e36aa9328c6fd0e0d326ce':
Update Wi-Fi Calling mode when WFC is enabled/disabled
Geoff Mendal [Tue, 10 Mar 2015 15:47:28 +0000 (15:47 +0000)]
am
a3d28d9c: (-s ours) am
fd8f5459: (-s ours) am
0d8c3df4: (-s ours) Import translations. DO NOT MERGE
* commit '
a3d28d9cccaa743eb050a4c427d11de204525c98':
Import translations. DO NOT MERGE
Pavel Zhamaitsiak [Sat, 7 Mar 2015 00:02:53 +0000 (16:02 -0800)]
Show alerts in case of some IMS registration errors.
Change-Id: I7019c6f0bae66190d190babd83ebcdd780e5b8a0
Pavel Zhamaitsiak [Mon, 9 Mar 2015 23:58:39 +0000 (16:58 -0700)]
Update Wi-Fi Calling mode when WFC is enabled/disabled
Bug:
19644042
Change-Id: Ie9cfe8c7f416985e4f78d48159d83191a19ac599
Stuart Scott [Fri, 25 Jul 2014 02:22:06 +0000 (19:22 -0700)]
Add option to reset network settings to factory
bug:
16161518
Change-Id: I7c0cc58d5385352c6c9af2b27af23a744b5df977
Geoff Mendal [Mon, 9 Mar 2015 17:01:45 +0000 (17:01 +0000)]
am
fd8f5459: (-s ours) am
0d8c3df4: (-s ours) Import translations. DO NOT MERGE
* commit '
fd8f545977ae4b5826632d8de293b3d322ae9960':
Import translations. DO NOT MERGE
Zoltan Szatmary-Ban [Fri, 19 Dec 2014 16:27:45 +0000 (16:27 +0000)]
Make default user icons retrievable as cached bitmaps
Also invoke that method where formerly we did a UserIcon.convertBitmap(
UserIcon.getDefaultUserIcon(...)) call.
Bug:
19620707
Change-Id: I2ae3bbcee7d1c6515f0f6253925ef9837d8e3548
Geoff Mendal [Mon, 9 Mar 2015 15:49:34 +0000 (15:49 +0000)]
am
782d81bc: (-s ours) am
f91c51b1: (-s ours) Import translations. DO NOT MERGE
* commit '
782d81bc70e4bc5b1adbd86119fd70a935e617f6':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Mar 2015 15:45:14 +0000 (15:45 +0000)]
am
0d8c3df4: (-s ours) Import translations. DO NOT MERGE
* commit '
0d8c3df4d95ec000889e3406ea50475e5d299874':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Mar 2015 15:35:57 +0000 (15:35 +0000)]
am
f91c51b1: (-s ours) Import translations. DO NOT MERGE
* commit '
f91c51b13b750f5ccc62ee1d760bd470b78837bb':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Mar 2015 13:35:26 +0000 (06:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3136e17493fb2f0d42e1518c5445b48aa203aa90
Auto-generated-cl: translation import
Geoff Mendal [Mon, 9 Mar 2015 12:41:43 +0000 (05:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: If88c28e5bfe82169fa423ef04bc7cc4ee2aa9962
Auto-generated-cl: translation import
Geoff Mendal [Mon, 9 Mar 2015 12:30:12 +0000 (05:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9e9281f6e2d2e50882fcec514ffc28993787a62a
Auto-generated-cl: translation import
Vinit Deshpande [Fri, 6 Mar 2015 21:56:02 +0000 (13:56 -0800)]
am "Do not provide 5GHz option for softap if there is no country code available"
merged from partner/m-wireless-wifi-dev
d51b952 Do not provide 5GHz option for softap if there is no country code available
Vinit Deshpande [Fri, 6 Mar 2015 21:56:02 +0000 (13:56 -0800)]
am "set softAP on a specified band, including both 2.4 and 5 GHz band"
merged from partner/m-wireless-wifi-dev
82ff3d5 set softAP on a specified band, including both 2.4 and 5 GHz band
Robin Lee [Fri, 6 Mar 2015 12:12:03 +0000 (12:12 +0000)]
Don't reset the keystore during password change
There is absolutely no advantage to doing this.
Bug:
18817878
Change-Id: Ibb386696e67c316e65f53c28f9249ef2a2a48db6
Adrian Roos [Thu, 5 Mar 2015 19:05:31 +0000 (20:05 +0100)]
Ensure redaction settings are visible on narrow screens
Bug:
18599040
Change-Id: I852f8fa317927f6f786b33f965e9d1feab562518
Geoff Mendal [Wed, 4 Mar 2015 14:46:45 +0000 (14:46 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 4 Mar 2015 14:41:39 +0000 (06:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2ea337dfa70639c56d7e9bce0513f7550cac54f4
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Mar 2015 14:00:38 +0000 (14:00 +0000)]
am
a6315bde: (-s ours) am
a07520f6: (-s ours) am
ba5c9ed1: (-s ours) Import translations. DO NOT MERGE
* commit '
a6315bde9d4d696a1b23aa1d5be1511ec9a21aed':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:54:47 +0000 (13:54 +0000)]
am
a07520f6: (-s ours) am
ba5c9ed1: (-s ours) Import translations. DO NOT MERGE
* commit '
a07520f6888981f4e310aa3c3c49ff6ea04b51d0':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:47:20 +0000 (13:47 +0000)]
am
ba5c9ed1: (-s ours) Import translations. DO NOT MERGE
* commit '
ba5c9ed1835cb3eef7dcf6e2968be1b0e5316dc5':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:44:17 +0000 (13:44 +0000)]
am
d1c5ae48: (-s ours) am
b4ee938f: (-s ours) Import translations. DO NOT MERGE
* commit '
d1c5ae486dc09d10dffaf138c98ad6daed182993':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:41:50 +0000 (05:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: I51a7c7c78b210268bc543e3ca81e123b02c0e525
Auto-generated-cl: translation import
Geoff Mendal [Wed, 4 Mar 2015 13:37:29 +0000 (13:37 +0000)]
am
b4ee938f: (-s ours) Import translations. DO NOT MERGE
* commit '
b4ee938f74fdf6ffe3cad237342d7f5034a55053':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 4 Mar 2015 13:30:02 +0000 (05:30 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1e33ed430ca8680d04f1bccd0253b8e7620c28e3
Auto-generated-cl: translation import
Pavel Zhamaitsiak [Tue, 3 Mar 2015 23:41:33 +0000 (23:41 +0000)]
Wi-Fi calling settings cleanup
automerge:
7109932
* commit '
71099329cc0443ce4517480c86f81ed6b4e33ff2':
Wi-Fi calling settings cleanup
Wale Ogunwale [Tue, 3 Mar 2015 21:28:46 +0000 (21:28 +0000)]
Merge "Added Developer Options settings for multi-window mode."
Wale Ogunwale [Fri, 27 Feb 2015 22:22:04 +0000 (14:22 -0800)]
Added Developer Options settings for multi-window mode.
Enables/disables the development multi-windows UI under Recents UI.
Setting is hidden on -user builds.
Bug:
19494313
Change-Id: Id1ccec5d9552dfdc74cc8d0af26ba7e6c4456166
Julia Reynolds [Tue, 3 Mar 2015 18:42:13 +0000 (18:42 +0000)]
Merge "Prompt for lock pin on VPN screen when credential restriction is enabled."
Julia Reynolds [Tue, 3 Mar 2015 17:32:30 +0000 (12:32 -0500)]
Prompt for lock pin on VPN screen when credential restriction is enabled.
If there is no lock pin set.
Bug:
19569109
Change-Id: I9ca17b61e72576f7b90b1598b2ace6e9d79b263a