OSDN Git Service
PauloftheWest [Tue, 2 Sep 2014 21:38:49 +0000 (21:38 +0000)]
am
ebe496ea: Merge "Fixed a crash when loading Bluetooth Settings." into lmp-dev
* commit '
ebe496ea7b18c5d702db4beee270046e43e491ad':
Fixed a crash when loading Bluetooth Settings.
PauloftheWest [Tue, 2 Sep 2014 21:31:22 +0000 (21:31 +0000)]
Merge "Fixed a crash when loading Bluetooth Settings." into lmp-dev
PauloftheWest [Wed, 27 Aug 2014 23:08:49 +0000 (16:08 -0700)]
Fixed a crash when loading Bluetooth Settings.
Bug:
17320674
Change-Id: Ibff0b5929b88b1a48c1fdd810fd8461bdb5f1274
Jason Monk [Tue, 2 Sep 2014 20:14:20 +0000 (20:14 +0000)]
am
dc4818ab: Merge "Bring back auto-rotate to settings" into lmp-dev
* commit '
dc4818ab7aa959143a1eb0b88bf0a4c9e6d19380':
Bring back auto-rotate to settings
Jason Monk [Tue, 2 Sep 2014 20:04:35 +0000 (20:04 +0000)]
Merge "Bring back auto-rotate to settings" into lmp-dev
Jason Monk [Wed, 20 Aug 2014 17:29:20 +0000 (13:29 -0400)]
Bring back auto-rotate to settings
Add a dropdown preference to the display settings screen that
controls whether auto-rotate is on.
Bug:
16636008
Change-Id: I71099a23793aa82b514bd0eebae183695415a92c
Paul Lawrence [Tue, 2 Sep 2014 19:44:56 +0000 (19:44 +0000)]
am
1f06a89f: Merge "Get correct factory reset reason from encryption failure" into lmp-dev
* commit '
1f06a89f468d7998a271b49dfbbdd7ea1f5b01a3':
Get correct factory reset reason from encryption failure
Paul Lawrence [Tue, 2 Sep 2014 19:33:25 +0000 (19:33 +0000)]
Merge "Get correct factory reset reason from encryption failure" into lmp-dev
Maurice Lam [Tue, 2 Sep 2014 19:01:46 +0000 (19:01 +0000)]
am
def48d60: Merge "[WifiSetup] Add shadow below header" into lmp-dev
* commit '
def48d605abe4fe597dbcea5e7c2f9ca93f1b237':
[WifiSetup] Add shadow below header
Maurice Lam [Tue, 2 Sep 2014 18:51:36 +0000 (18:51 +0000)]
Merge "[WifiSetup] Add shadow below header" into lmp-dev
PauloftheWest [Tue, 2 Sep 2014 18:27:20 +0000 (18:27 +0000)]
am
bde55601: Merge "Fixed a Null Pointer Exception when Wifi Settings is indexing." into lmp-dev
* commit '
bde55601ba5695894b7f9b8c7f61fd6694f9b459':
Fixed a Null Pointer Exception when Wifi Settings is indexing.
Paul Lawrence [Thu, 28 Aug 2014 22:56:38 +0000 (15:56 -0700)]
Get correct factory reset reason from encryption failure
Requires matching framework change
https://googleplex-android-review.git.corp.google.com/#/c/535832/
Bug:
17213613
Change-Id: Ia8006f4a9cb5909d83f1848d9acfbc3f1e0ab5fb
PauloftheWest [Tue, 2 Sep 2014 18:11:37 +0000 (18:11 +0000)]
Merge "Fixed a Null Pointer Exception when Wifi Settings is indexing." into lmp-dev
Fabrice Di Meglio [Tue, 2 Sep 2014 17:21:58 +0000 (17:21 +0000)]
am
de8c683f: Merge "Fix bug #
17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)" into lmp-dev
* commit '
de8c683f99b8db7289289016cf5d33016eea9dcd':
Fix bug #
17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)
Fabrice Di Meglio [Tue, 2 Sep 2014 17:13:41 +0000 (17:13 +0000)]
Merge "Fix bug #
17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)" into lmp-dev
Dan Sandler [Tue, 2 Sep 2014 15:40:13 +0000 (15:40 +0000)]
am
3eac072b: Merge "Switch to vibrate (or slash-bell) icon at ringer volume 0." into lmp-dev
* commit '
3eac072b1ad963007211d1b13ebb6d0bb0fc24a6':
Switch to vibrate (or slash-bell) icon at ringer volume 0.
Dan Sandler [Tue, 2 Sep 2014 15:32:41 +0000 (15:32 +0000)]
Merge "Switch to vibrate (or slash-bell) icon at ringer volume 0." into lmp-dev
PauloftheWest [Tue, 2 Sep 2014 13:48:03 +0000 (06:48 -0700)]
Fixed a Null Pointer Exception when Wifi Settings is indexing.
Bug:
17335468
Change-Id: I85293e882d90da4a54d4690ffec32fba7101b65e
PauloftheWest [Tue, 2 Sep 2014 13:12:01 +0000 (13:12 +0000)]
am
d6cfeba9: Merge "Updated Wifi Assistant to support RTL." into lmp-dev
* commit '
d6cfeba9f717fe043efc56d4bdf18a18e4bb9bff':
Updated Wifi Assistant to support RTL.
PauloftheWest [Tue, 2 Sep 2014 13:00:30 +0000 (13:00 +0000)]
Merge "Updated Wifi Assistant to support RTL." into lmp-dev
Dan Sandler [Mon, 1 Sep 2014 23:05:27 +0000 (01:05 +0200)]
Switch to vibrate (or slash-bell) icon at ringer volume 0.
Bug:
16900054
Change-Id: If94a18a7cac596c0f4c33421b642f96dcf0280fd
Baligh Uddin [Mon, 1 Sep 2014 21:43:55 +0000 (21:43 +0000)]
am
48d3f0fd: (-s ours) Import translations. DO NOT MERGE
* commit '
48d3f0fd612b740f92fc1c268c27eb9e55a2ef68':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 1 Sep 2014 21:31:28 +0000 (21:31 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Baligh Uddin [Mon, 1 Sep 2014 05:43:19 +0000 (22:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia06570df1e52b2dd91ac4dda2f56bb2d2f4333de
Auto-generated-cl: translation import
Baligh Uddin [Mon, 1 Sep 2014 05:40:04 +0000 (22:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icb08251fbb0bc518bde18c174fedf464b0635486
Auto-generated-cl: translation import
Wink Saville [Mon, 1 Sep 2014 02:21:02 +0000 (19:21 -0700)]
ksd to lmp-sprout-dev
Change-Id: I94eb65c62231b5831570bb0cbbbd9c916bee0a37
Fabrice Di Meglio [Sat, 30 Aug 2014 00:44:52 +0000 (17:44 -0700)]
Fix bug #
17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)
- do not care about getting a result for updating the Index as
there is no way to make it useful (the result will come later
when this is no more relevant)
- make a copy of the data to process and pass it to the AsyncTask
Change-Id: I6b8a08ecbe3d32cffac1314c03f682ebacfd64bf
Maurice Lam [Fri, 29 Aug 2014 22:17:42 +0000 (15:17 -0700)]
[WifiSetup] Add shadow below header
Added shadow for phone portrait and landscape layouts
Bug:
17136887
Change-Id: I65dc01d7387812681bbc99d5cc9440714a72ff60
Chris Wren [Fri, 29 Aug 2014 20:51:00 +0000 (20:51 +0000)]
Merge "Allow external packages to open the RedactionInsterstitial." into lmp-dev
Chris Wren [Fri, 29 Aug 2014 20:08:37 +0000 (20:08 +0000)]
Merge "default to lock_screen_notifications_summary_show." into lmp-dev
Chris Wren [Fri, 29 Aug 2014 20:07:44 +0000 (20:07 +0000)]
Merge "Don't allow users to set redaction on an insecure device." into lmp-dev
Andres Morales [Tue, 26 Aug 2014 20:54:12 +0000 (13:54 -0700)]
Throw up ProgressDialog when erasing PST partition
This needs to be done here, but we should let the user know
we're doing work.
Bug:
17185720
Change-Id: I0d71ae38145e0649a430a8231b7e3f250c003ee8
Chris Wren [Thu, 28 Aug 2014 19:45:31 +0000 (15:45 -0400)]
Allow external packages to open the RedactionInsterstitial.
Introduce RedactionSettingsStandalone, to supply the private setup
required by RedactionInsterstitial.
Bug:
15934899
Change-Id: Ie0bcc207c4f331def207e588bbad36b8986fe114
Chris Wren [Wed, 27 Aug 2014 18:16:48 +0000 (14:16 -0400)]
default to lock_screen_notifications_summary_show.
When the user selects a secure unlock method for the first time,
default to 'Show all notification content'.
Bug:
17010183
Change-Id: I4953e2b1e605bf6f13240ef0483a37265263ea8d
Chris Wren [Thu, 28 Aug 2014 21:52:39 +0000 (17:52 -0400)]
Don't allow users to set redaction on an insecure device.
Bug:
17106788
Change-Id: I05f8f4d920158fe99186fb8b879278d6780b8722
Maurice Lam [Fri, 29 Aug 2014 01:55:08 +0000 (01:55 +0000)]
Merge "[WifiSetup] Workaround for accessibility in landscape" into lmp-dev
Maurice Lam [Fri, 29 Aug 2014 01:21:52 +0000 (18:21 -0700)]
[WifiSetup] Workaround for accessibility in landscape
This change works around a bug that TalkBack doesn't work and keep
throwing out error logs in landscape mode.
Bug:
17320180
Change-Id: I952e8f828b6c7d67a7adfa0cb710e73a7e2864f1
Diego Pontoriero [Thu, 28 Aug 2014 22:38:46 +0000 (22:38 +0000)]
Merge "Change TelephonyManager method name to accurately reflect functionality." into lmp-dev
Selim Gurun [Thu, 28 Aug 2014 22:11:45 +0000 (22:11 +0000)]
Merge "Use GoogleSetting to override DRP setting if available" into lmp-dev
Diego Pontoriero [Thu, 28 Aug 2014 20:52:24 +0000 (13:52 -0700)]
Change TelephonyManager method name to accurately reflect functionality.
Bug:
17163860
Change-Id: I319b3dc19c171108963113aa821e50842654a61e
PauloftheWest [Thu, 21 Aug 2014 18:44:11 +0000 (11:44 -0700)]
Updated Wifi Assistant to support RTL.
Bug:
16798953
Change-Id: I9dc96a5a02fdc0e6b66a1ab5ddcaed95848b9c64
Maurice Lam [Thu, 28 Aug 2014 20:27:01 +0000 (20:27 +0000)]
Merge "[WifiSetup] Update illustration" into lmp-dev
Chris Wren [Thu, 28 Aug 2014 19:44:28 +0000 (19:44 +0000)]
Merge "Don't show nonesensical notification visibility value." into lmp-dev
Adam Lesinski [Thu, 28 Aug 2014 19:05:44 +0000 (19:05 +0000)]
Merge "Update UI for UsageStatsSettings" into lmp-dev
Christoph Studer [Thu, 28 Aug 2014 18:26:27 +0000 (18:26 +0000)]
Merge "Settings: Increase no&sounds char limit to 30" into lmp-dev
Jeff Davidson [Thu, 28 Aug 2014 17:25:58 +0000 (17:25 +0000)]
Merge "Fix crash in WifiSettings." into lmp-dev
Jing Zhao [Tue, 26 Aug 2014 19:44:02 +0000 (14:44 -0500)]
Test APNs
Add test APNs to carriers table.
Enable APN Setting editing for testing PLMNs.
Allow user to toggle carrier_enabled for test APNs.
Bug:
17136661
Change-Id: Ieabfac5ea02a5b9971c7050d8278ad0095863e3a
Christoph Studer [Thu, 28 Aug 2014 13:01:19 +0000 (15:01 +0200)]
Settings: Increase no&sounds char limit to 30
Bug:
17196576
Change-Id: I9baffcf19258e1d106b69a8738dbd387ec61def7
Sander Alewijnse [Thu, 28 Aug 2014 11:11:37 +0000 (11:11 +0000)]
Merge "Disable auto time checkbox if date/time locked down by DO." into lmp-dev
Selim Cinek [Thu, 28 Aug 2014 09:36:44 +0000 (09:36 +0000)]
Merge "Added colors to system notifications" into lmp-dev
Adam Lesinski [Thu, 28 Aug 2014 02:00:30 +0000 (19:00 -0700)]
Update UI for UsageStatsSettings
Bug:
16461070
Change-Id: I616421d5ff8124892a676b8f5302b2341773d6eb
Jeff Davidson [Thu, 28 Aug 2014 01:05:31 +0000 (18:05 -0700)]
Fix crash in WifiSettings.
SDK version is an int, not a long. (Also change SharedPreference key
to avoid issues for people who've already dismissed the Wifi Assistant
card).
Bug:
17304642
Change-Id: Ic959516b88e91edd53562703fa7db9c15ead20e4
Dianne Hackborn [Wed, 27 Aug 2014 23:35:04 +0000 (23:35 +0000)]
Merge "Fix issues #
16941902, #
16901402, and #
16135174." into lmp-dev
Maurice Lam [Wed, 27 Aug 2014 17:08:44 +0000 (10:08 -0700)]
[WifiSetup] Update illustration
Update the illustration assets and make the tablet illustration
always 256dp height according to mock.
Bug:
17133710
Change-Id: I6d84bbb25a9f443e4eb6bf4c1002d8a1438029ef
Dianne Hackborn [Wed, 27 Aug 2014 21:04:32 +0000 (14:04 -0700)]
Fix issues #
16941902, #
16901402, and #
16135174.
Issue #
16941902: Charged % of battery is mismatching between phone status
area(top right corner) and battery screen
Need to make sure the stats are updated when we come back to
the foreground.
Issue #
16901402: Crash in Settings observed after tap on Battery option
Don't allow us to have a null stats object.
Issue #
16135174: Apps page "smoke" gradient footer must be removed
Finish tweaking layout to match mocks.
Change-Id: I29d56b506a9468ec548feef7c3f9502a9b16ef4d
PauloftheWest [Wed, 27 Aug 2014 22:48:53 +0000 (15:48 -0700)]
Adding wifi empty state icon back for Setup Wizard.
Change-Id: Id20ee2a35512b7a9560db5d121fef5d0351fe051
PauloftheWest [Wed, 27 Aug 2014 21:41:27 +0000 (21:41 +0000)]
Merge "Greyed out SIM activities if only one SIM is present." into lmp-dev
PauloftheWest [Wed, 27 Aug 2014 21:40:08 +0000 (21:40 +0000)]
Merge "Removed the Wi-Fi icon shown when Wi-Fi is off." into lmp-dev
PauloftheWest [Wed, 27 Aug 2014 21:01:46 +0000 (21:01 +0000)]
Merge "Bluetooth Device picker will now scan for devices." into lmp-dev
PauloftheWest [Wed, 27 Aug 2014 18:49:59 +0000 (11:49 -0700)]
Bluetooth Device picker will now scan for devices.
Bug:
17157824
Change-Id: Ifcf17f55e942dbf6cdbe2a2ee30c90ddbd9c4bd8
PauloftheWest [Wed, 27 Aug 2014 20:40:37 +0000 (20:40 +0000)]
Merge "Applied Material Spec to Bluetooth pairing dialog." into lmp-dev
PauloftheWest [Wed, 27 Aug 2014 20:38:55 +0000 (20:38 +0000)]
Merge "Changed VPN add icon to white." into lmp-dev
Paul West [Wed, 27 Aug 2014 20:33:30 +0000 (20:33 +0000)]
Merge "Revert "Tapping a connected Bluetooth device now presents its settings dialog."" into lmp-dev
Paul West [Wed, 27 Aug 2014 20:31:38 +0000 (20:31 +0000)]
Revert "Tapping a connected Bluetooth device now presents its settings dialog."
This reverts commit
893be9cc34c37cba64856c8034f39dfbda05a459.
Change-Id: Idefe6a1972ca1130a687632f74051e5b5a2e54e1
PauloftheWest [Fri, 15 Aug 2014 13:05:42 +0000 (06:05 -0700)]
Applied Material Spec to Bluetooth pairing dialog.
Bug:
17018290
Change-Id: I621164245e6ad8213a689ea4919c619a9ee4f189
PauloftheWest [Wed, 27 Aug 2014 19:54:50 +0000 (12:54 -0700)]
Changed VPN add icon to white.
Bug:
17288198
Change-Id: I5d66f269583d1d4bdb3e68fe011721ae805317e1
Jeff Davidson [Wed, 27 Aug 2014 18:47:10 +0000 (18:47 +0000)]
Merge "Use NetworkScoreManager when disabling scoring." into lmp-dev
Jeff Davidson [Wed, 27 Aug 2014 18:20:09 +0000 (11:20 -0700)]
Use NetworkScoreManager when disabling scoring.
Otherwise previous scores will not be cleared and the SCORER_CHANGED
broadcast will not be sent.
Bug:
17299736
Change-Id: I57b0c44a7972d885cf084aacf74829cf7d391dae
PauloftheWest [Wed, 27 Aug 2014 17:24:40 +0000 (17:24 +0000)]
Merge "Entering Bluetooth in Settings will always initiate a scan." into lmp-dev
Maurice Lam [Wed, 27 Aug 2014 17:04:46 +0000 (17:04 +0000)]
Merge "[WifiSetup] Progress when wifi scanning" into lmp-dev
Baligh Uddin [Wed, 27 Aug 2014 16:23:19 +0000 (16:23 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Sander Alewijnse [Tue, 26 Aug 2014 10:20:27 +0000 (11:20 +0100)]
Disable auto time checkbox if date/time locked down by DO.
Bug:
16948504
Change-Id: I2a2b21684e17639233cd8c0dad7d3b44c4a2bd26
Selim Cinek [Wed, 20 Aug 2014 12:48:42 +0000 (14:48 +0200)]
Added colors to system notifications
Bug:
17128331
Change-Id: I0cf0fe76a97d9dd772cd23475eddf5bdb92b2cca
Baligh Uddin [Wed, 27 Aug 2014 03:49:33 +0000 (20:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8ac9cf419f62a3420117bcaaffe4dca023ee1c9d
Auto-generated-cl: translation import
Chris Wren [Tue, 26 Aug 2014 21:32:44 +0000 (17:32 -0400)]
Don't show nonesensical notification visibility value.
lock_screen_notifications_summary_hide doesn't make sense on insecure
lock screens, so don't show it, but make sure we can restore it if the
user re-enables a secure method.
Bug:
16649523
Change-Id: Ie295cd59f5e527da8402748834576bab97e9ad89
Sander Alewijnse [Tue, 26 Aug 2014 16:59:23 +0000 (16:59 +0000)]
Merge "Add extra to home settings starting intent." into lmp-dev
Alan Viverette [Mon, 25 Aug 2014 23:18:33 +0000 (23:18 +0000)]
Merge "Update material colors" into lmp-dev
Amith Yamasani [Mon, 25 Aug 2014 22:51:09 +0000 (22:51 +0000)]
Merge "Fix toggle button clickability in app restrictions" into lmp-dev
Alan Viverette [Mon, 25 Aug 2014 23:05:50 +0000 (16:05 -0700)]
Update material colors
BUG:
17212898
Change-Id: Idb1c391de3c1fb150f06c3cf744780be1404d2e5
Nancy Chen [Mon, 25 Aug 2014 22:24:14 +0000 (22:24 +0000)]
Merge "API Review PhoneManager -> TelecommManager. Rename methods (3/6)" into lmp-dev
Amith Yamasani [Mon, 25 Aug 2014 22:20:34 +0000 (15:20 -0700)]
Fix toggle button clickability in app restrictions
Also fix side padding
Bug:
17159406
Change-Id: Ic1d61d9a4a7ae6f3f7c451405a6e127791edbdaf
Paul Lawrence [Mon, 25 Aug 2014 21:59:26 +0000 (21:59 +0000)]
Merge "Honor hide pattern on crypto screen" into lmp-dev
Maurice Lam [Mon, 25 Aug 2014 01:29:40 +0000 (18:29 -0700)]
[WifiSetup] Progress when wifi scanning
Use a custom empty view to show the status while wifi is scanning
or off. Cannot use android.R.id.empty because in phone portrait
layout the illustration is the listview header, which will be hidden
if the list is empty and we use ListView.setEmptyView.
Bug:
17183006
Change-Id: Ie8598303f4e61f87e078008fb7a03918ba92c9ef
PauloftheWest [Mon, 25 Aug 2014 16:44:25 +0000 (16:44 +0000)]
Merge "Updated Tethering and portable hotspot to use switches." into lmp-dev
Baligh Uddin [Mon, 25 Aug 2014 16:21:03 +0000 (16:21 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
PauloftheWest [Mon, 25 Aug 2014 15:48:15 +0000 (15:48 +0000)]
Merge "Tapping a connected Bluetooth device now presents its settings dialog." into lmp-dev
PauloftheWest [Sun, 24 Aug 2014 18:59:35 +0000 (11:59 -0700)]
Updated Tethering and portable hotspot to use switches.
Bug:
17020102
Change-Id: I5da1745d4ea9545f8960c015ca6858fb0a34de0d
PauloftheWest [Sun, 24 Aug 2014 21:04:18 +0000 (14:04 -0700)]
Tapping a connected Bluetooth device now presents its settings dialog.
Bug:
14184769
Change-Id: I1de3110dd7460e0329dbe6df99abf3451d3041cc
PauloftheWest [Sun, 24 Aug 2014 19:28:43 +0000 (12:28 -0700)]
Greyed out SIM activities if only one SIM is present.
Bug:
17011861
Change-Id: I335e127e462719d6cd14a5a9d383b378dbf90490
Baligh Uddin [Sun, 24 Aug 2014 20:07:11 +0000 (13:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib13840b4fe07abc8aba474a3b0abf4b06fdb4405
Auto-generated-cl: translation import
Dianne Hackborn [Sun, 24 Aug 2014 18:53:16 +0000 (18:53 +0000)]
Merge "Tweak voice settings strings." into lmp-dev
Dianne Hackborn [Sat, 23 Aug 2014 21:11:12 +0000 (14:11 -0700)]
Tweak voice settings strings.
Change-Id: I4cb6badaf2d013d43d87bc8ecdc0763c4e5d6b50
Selim Gurun [Sat, 23 Aug 2014 15:32:09 +0000 (08:32 -0700)]
Use GoogleSetting to override DRP setting if available
Bug:
12492817
The developer setting will be deprecated and eventually will be
removed after the setting is moved to its new location.
This is the prep work for it.
Change-Id: If0b019b33a544b7d2e659161685fa33ca052f612
Amith Yamasani [Sat, 23 Aug 2014 01:07:02 +0000 (01:07 +0000)]
Merge "Don't index the ChooseLockGeneric screen" into lmp-dev
Jeff Davidson [Sat, 23 Aug 2014 00:55:38 +0000 (00:55 +0000)]
Merge "Restore legacy VPN stats dialog." into lmp-dev
Amith Yamasani [Fri, 22 Aug 2014 22:38:16 +0000 (15:38 -0700)]
Don't index the ChooseLockGeneric screen
This avoids indexing face unlock, which may not always exist or might
be disabled by policy.
Instead, add some of the relevant keywords up one level in Security
settings.
Bug:
17185326
Change-Id: I4fbae1c0384a97383707104a6fe283075edbf341
Jim Miller [Fri, 22 Aug 2014 22:25:15 +0000 (22:25 +0000)]
Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev
Nancy Chen [Fri, 22 Aug 2014 05:53:05 +0000 (22:53 -0700)]
API Review PhoneManager -> TelecommManager. Rename methods (3/6)
PhoneManager
- handlePinMMI docs should explain what a Pin is and what MMI is
- rename isInAPhoneCall to isInCall
- rename showCallScreen to showInCallScreen
- merge this class into TelecommManager, we don't need both
Bug:
16960458
Change-Id: I8285f15747b66fdfad93d203d848d4a62c0f9b2a
Elliott Hughes [Fri, 22 Aug 2014 20:42:37 +0000 (20:42 +0000)]
Merge "Settings psuedolocalization fixes." into lmp-dev
Jeff Davidson [Fri, 22 Aug 2014 20:12:01 +0000 (13:12 -0700)]
Restore legacy VPN stats dialog.
Was originally removed in ag/522961, but restoring to keep legacy VPN
behavior the same from within VpnSettings. This dialog is only
accesible from VpnSettings and so should only ever be shown for legacy
VPNs.
Bug:
17164793
Change-Id: I06c4e136e1023b8f84edfd15a15264d2e41d325b