OSDN Git Service
Bill Yi [Tue, 5 Apr 2016 03:22:40 +0000 (03:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Tue, 5 Apr 2016 01:10:36 +0000 (18:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I38d52ee3540f9b1e593d482d2eccb180d7936212
Auto-generated-cl: translation import
Udam Saini [Mon, 4 Apr 2016 20:06:29 +0000 (20:06 +0000)]
Merge "Adds a multi line preference class." into nyc-dev
Julia Reynolds [Mon, 4 Apr 2016 19:39:26 +0000 (19:39 +0000)]
Merge "Show fewer filters on notifications page." into nyc-dev
Julia Reynolds [Mon, 4 Apr 2016 19:39:13 +0000 (19:39 +0000)]
Merge "Fix ringtone persistance after device rotation." into nyc-dev
Jason Monk [Mon, 4 Apr 2016 19:29:55 +0000 (19:29 +0000)]
Merge "Add moar dividers" into nyc-dev
Julia Reynolds [Fri, 1 Apr 2016 14:58:34 +0000 (10:58 -0400)]
Show fewer filters on notifications page.
Bug:
27834480
Change-Id: Ibdc9924a7ea1b1db7be089507485de5c4fd41b58
Julia Reynolds [Fri, 1 Apr 2016 18:45:58 +0000 (14:45 -0400)]
Fix ringtone persistance after device rotation.
Bug:
26122624
Change-Id: I187fe673dea250e93c6e9603239f01845ed378a3
Maurice Lam [Mon, 4 Apr 2016 17:57:52 +0000 (17:57 +0000)]
Merge "Set LinkMovementMethod in LinkTextView" into nyc-dev
Yohei Yukawa [Mon, 4 Apr 2016 17:28:22 +0000 (17:28 +0000)]
Merge "Fix PhysicalKeyboardFragment crash bug." into nyc-dev
Jason Monk [Mon, 4 Apr 2016 17:20:59 +0000 (13:20 -0400)]
Add moar dividers
Bug:
27834471
Change-Id: I575040edcdf76124f21a667e64762acb86a65cb2
Julia Reynolds [Mon, 4 Apr 2016 13:52:35 +0000 (13:52 +0000)]
Merge "Hide repeat callers instead of disabling." into nyc-dev
Julia Reynolds [Mon, 4 Apr 2016 13:52:27 +0000 (13:52 +0000)]
Merge "Lowercase s." into nyc-dev
Clara Bayarri [Mon, 4 Apr 2016 12:17:00 +0000 (12:17 +0000)]
Merge "Remove fullstop at end of phrases" into nyc-dev
Jeff Sharkey [Sun, 3 Apr 2016 03:59:21 +0000 (03:59 +0000)]
Merge "Mark UI components for tests to find." into nyc-dev
Jeff Sharkey [Sat, 2 Apr 2016 05:12:45 +0000 (23:12 -0600)]
Mark UI components for tests to find.
Bug:
26498834
Change-Id: Id8ade0b9230a946c7facf8ebaf9700c196b31ee3
Yohei Yukawa [Sat, 2 Apr 2016 02:35:14 +0000 (02:35 +0000)]
Merge "Revert "Fix no keyboard on N builds"" into nyc-dev
Yohei Yukawa [Sat, 2 Apr 2016 00:20:37 +0000 (17:20 -0700)]
Revert "Fix no keyboard on N builds"
This reverts the previous commit [1] since the keyboard shows up without
such a workaround. Presumably someone might have fixed something in
somewhere.
[1]: Ifd588bf7db76f9ea5d6a90854f8e92f86f4c2910
250faf9243a3e7981695be5274f3352ac1fd41bd.
Bug:
25942488
Bug:
26190615
Change-Id: Ie0e0ead960473a3504fc88a4f7d4d18108ef0e18
Maurice Lam [Sat, 2 Apr 2016 00:09:56 +0000 (17:09 -0700)]
Set LinkMovementMethod in LinkTextView
With ag/899084 TextView no longer automatically sets the
LinkMovementMethod when setText is called with a ClickableSpan.
So in LinkTextView we do that manually instead.
Bug:
27973982
Change-Id: I86626bd71bf2ca41cb7e73d479ba764e809b0190
Jim Miller [Fri, 1 Apr 2016 22:14:44 +0000 (22:14 +0000)]
Merge "Fix crash in ConfirmDeviceCredentials" into nyc-dev
Amit Mahajan [Fri, 1 Apr 2016 18:58:25 +0000 (18:58 +0000)]
Merge "MVNO value is not grayed out when MVNO type is none" into nyc-dev
Wei Huang [Thu, 17 Apr 2014 05:10:50 +0000 (14:10 +0900)]
MVNO value is not grayed out when MVNO type is none
MVNO type is judged as none by comparing key string to "None",
but this logic does not work when language setting is non English
because key is not "None" due to translation.
Bug:
27267663
Change-Id: Ic39a084cd77f661f833b13106dc28444926487d8
Tyler Gunn [Fri, 1 Apr 2016 15:43:08 +0000 (15:43 +0000)]
Merge "Adding "wifi only" option for wifi calling." into nyc-dev
Tyler Gunn [Fri, 1 Apr 2016 15:41:18 +0000 (08:41 -0700)]
Adding "wifi only" option for wifi calling.
- Added "wifi-only" option to the list of wifi calling modes.
- Added code in settings initialization to check whether the carrier
supports including the wifi-only option. If it does not, changes the
entries/values to a ser which does not include the wifi-only option.
Bug:
27858149
Change-Id: Ib02a97afcf6f2722c28b7a4d9c241774944c52d0
Julia Reynolds [Fri, 1 Apr 2016 14:54:34 +0000 (10:54 -0400)]
Hide repeat callers instead of disabling.
Bug:
27724390
Change-Id: I4f538138d010f306ce6467122c8aef89eaa81ed5
Julia Reynolds [Fri, 1 Apr 2016 14:53:10 +0000 (10:53 -0400)]
Lowercase s.
Bug:
27853578
Change-Id: I1c0b3a7fc00ba4f5e8330885213d641aec9518f7
Julia Reynolds [Fri, 1 Apr 2016 13:47:32 +0000 (09:47 -0400)]
Add null checks on filters.
Bug:
27496323
Change-Id: If8883279af11218042f420509c3a8e7b168c815f
Clara Bayarri [Wed, 30 Mar 2016 13:58:27 +0000 (14:58 +0100)]
Remove fullstop at end of phrases
Requested by UX
Bug:
27913794
Change-Id: Ieb6ace1236787128825e39c310331603f574a32b
Yohei Yukawa [Fri, 1 Apr 2016 10:53:34 +0000 (03:53 -0700)]
Fix PhysicalKeyboardFragment crash bug.
The root cause of crash bug #
27749932 is that the state mismatch between
when a Loader is created and when the Loader object finishes background
task. We can easily reproduce this crash by:
1. Pair two hardware keyboard A and B.
2. Open Physical Keyboard settings.
3. Press the power button to turn off the display.
4. Move keyboard A far away so that it is unpaired.
5. Press the power button to turn on the display.
6. Unlock the device.
One of the reasons PhysicalKeyboardFragment was unstable is that loader
ID reuse. PhysicalKeyboardFragment starts background data loading
because of many events such as #onResume() and #onInputDeviceAdded() but
there are chances that loader ID was reused because we specified
hardware keyboard device index as the loader ID. This was dangerous
also because device index can change when a device is added and removed.
With his CL each loader object has an unique ID and
PhysicalKeyboardFragment keeps tracking the list of active Loader IDs
only from which PhysicalKeyboardFragment should accept data.
Also, this CL removes dependencies on PhysicalKeyboardFragment from each
loader object so that we can have a clear boundary of responsibility
between data loader and data consumer.
Bug:
27749932
Change-Id: I53fcb2426d028a492c775bb2b4ec6a5419e33bb4
Clara Bayarri [Fri, 1 Apr 2016 11:18:24 +0000 (11:18 +0000)]
Merge "Change Work Challenge background image" into nyc-dev
Yohei Yukawa [Fri, 1 Apr 2016 05:58:33 +0000 (22:58 -0700)]
Fix jank when dismissing InputMethodAndSubtypeEnabler.
InputMethodAndSubtypeUtil#saveInputMethodSubtypeList() has a bug that
it saves implicitly enabled subtypes when "Use system languages" is
checked. Implicitly enabled subtypes are transient data and the system
should have only a null data (0) in the persistent strage. The root
cause of this bug is that the method in question has not checked whether
the preference item is in enabled (not grayed-out). If it is
grayed-out, its checked state does not mean that the user manually
checked that subtype but it is just an indicator for the user.
The strange UI jank when dismissing InputMethodAndSubtypeEnabler is one
of the victim of the above bug because we have worked around it by
actually changing checked state before calling the method in question.
With this CL we no longer need to update preference items in
InputMethodAndSubtypeEnabler#onPause().
Bug:
27867966
Change-Id: Ifc291d77ea41a988438765b9ba16bc5d18a15e1b
Udam Saini [Thu, 31 Mar 2016 20:30:28 +0000 (20:30 +0000)]
Merge "Fixes graybar as status bar and unshifts header view." into nyc-dev
Udam Saini [Thu, 31 Mar 2016 20:13:39 +0000 (20:13 +0000)]
Merge "Prevents users from being added if device is not provisioned" into nyc-dev
Chris Tate [Thu, 31 Mar 2016 19:24:41 +0000 (19:24 +0000)]
Merge "Track in-progress wallpaper API changes" into nyc-dev
Robin Lee [Thu, 31 Mar 2016 18:44:21 +0000 (18:44 +0000)]
Merge "DISALLOW_CONFIG_CREDENTIALS blocks user credentials" into nyc-dev
Jason Monk [Thu, 31 Mar 2016 18:00:54 +0000 (18:00 +0000)]
Merge "Fix missing summaries" into nyc-dev
Jason Monk [Thu, 31 Mar 2016 17:59:46 +0000 (13:59 -0400)]
Fix missing summaries
Handle non-cached tiles by doing lookup from component name.
Change-Id: I979e2df2eed4a065f290c5c0e66276d08b4fb0af
Fixes:
27942733
Robin Lee [Fri, 11 Mar 2016 16:22:23 +0000 (16:22 +0000)]
DISALLOW_CONFIG_CREDENTIALS blocks user credentials
All settings preferences related to credentials of any kind should be
stopped by this user restriction.
Bug:
26879958
Change-Id: I983c6e58081bd4022bb006942499cba4b74954e7
Maria Garcia Puyol [Thu, 31 Mar 2016 17:38:55 +0000 (17:38 +0000)]
Merge "Use same task for Settings>Users and EmergencyInfo" into nyc-dev
Victor Chang [Thu, 31 Mar 2016 17:04:53 +0000 (17:04 +0000)]
Merge "Show notification when failing to turn on always-on vpn" into nyc-dev
Christopher Tate [Thu, 31 Mar 2016 16:56:37 +0000 (09:56 -0700)]
Track in-progress wallpaper API changes
FLAG_*, not FLAG_SET_*
Bug
27365822
Change-Id: I5cb4dbfd251519a80997a86d3010f19240b9ff23
Victor Chang [Mon, 21 Mar 2016 22:57:59 +0000 (22:57 +0000)]
Show notification when failing to turn on always-on vpn
- Notification icon is Settings icon
- VpnName is obtained as the same way as AppPreference
- Post notification as the current user with PendingIntent to VpnSettings to parent user
- Auto-cancel when user taps on the notification
- This implementation posts notification only when the failure happens sychronously
(Assume ConnectivityService only unset always-on package immediately after calling setAlwaysOnVpnPackageForUser)
Bug:
27374485
Change-Id: I0aee38498c8cc300dd8eb9687adcae5f9dc4f8af
Jason Monk [Thu, 31 Mar 2016 14:36:44 +0000 (14:36 +0000)]
Merge "Fix categeries being read out on settings dashboard" into nyc-dev
Jason Monk [Thu, 31 Mar 2016 14:35:03 +0000 (10:35 -0400)]
Fix categeries being read out on settings dashboard
Change-Id: Ica0eec62a532fa40b57553e8e3d9fba1cba3bd4e
Fixes:
26125682
Jason Monk [Thu, 31 Mar 2016 13:56:51 +0000 (13:56 +0000)]
Merge "Fix cell data preference in single sim case" into nyc-dev
Jason Monk [Thu, 31 Mar 2016 13:55:25 +0000 (09:55 -0400)]
Fix cell data preference in single sim case
Change-Id: Ic956d4a7a4935bcdbeaf868f978e23ba11919f9c
Fixes:
27653690
Jason Monk [Thu, 31 Mar 2016 13:47:32 +0000 (13:47 +0000)]
Merge changes from topic 'SettingsMetrics' into nyc-dev
* changes:
Add metrics for suggestions
Add metrics for settings conditionals
Bill Yi [Thu, 31 Mar 2016 13:23:36 +0000 (13:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Yohei Yukawa [Thu, 31 Mar 2016 06:13:54 +0000 (06:13 +0000)]
Merge changes Ieea9a13a,Id2ae6151 into nyc-dev
* changes:
Remove gear icon from InputMethodPreference.
Update title to "Add or edit virtual keyboards".
Bill Yi [Thu, 31 Mar 2016 05:29:47 +0000 (22:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I942bbb8156f204723bf2b421702ecf6a1ddbd7cf
Auto-generated-cl: translation import
mariagpuyol [Thu, 31 Mar 2016 01:04:54 +0000 (18:04 -0700)]
Use same task for Settings>Users and EmergencyInfo
Bug:
27859534
Change-Id: I0ea4e56e4f6daacfd478336444aceeb84d8bfe5d
Noah Wang [Thu, 31 Mar 2016 00:37:02 +0000 (00:37 +0000)]
Merge "Fix crashing of font size settings screen due to the timing of initialization of ExploreByTouchHelper Bug:
27674946" into nyc-dev
Daichi Hirono [Wed, 30 Mar 2016 23:59:05 +0000 (23:59 +0000)]
Merge "Change the dialog text in USB device tyep chooser." into nyc-dev
Mihai Niță [Wed, 30 Mar 2016 22:37:53 +0000 (22:37 +0000)]
Merge "Fix missing dot in the remove language confirmation message" into nyc-dev
Udam Saini [Wed, 30 Mar 2016 20:38:05 +0000 (13:38 -0700)]
Fixes graybar as status bar and unshifts header view.
StickyHeaderListView will not layout all the way to the top of the screen
if fitsSystemWindows is true.
bug:
27875272
Change-Id: I4150dc183778284df2f07f3a6220e0c0b2607774
Mihai Nita [Wed, 30 Mar 2016 21:55:30 +0000 (14:55 -0700)]
Fix missing dot in the remove language confirmation message
Bug:
27709559
Change-Id: Ie0f4ecf01578a1f6317b058dfed288dcbfa28d92
Noah Wang [Wed, 30 Mar 2016 21:41:42 +0000 (21:41 +0000)]
Merge "Make preview screens in font/display size settings scrollable Bug:
27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82" into nyc-dev
Udam Saini [Wed, 30 Mar 2016 21:39:42 +0000 (14:39 -0700)]
Adds a multi line preference class.
Some preferences (namely inside the encryption interstitial) can flow
passed a single line when the font size is set to largest. We should
allow for this to extend to another line instead of using ellipsis.
bug:
27875272
Change-Id: I2697ae37bfe39a4890298f82cf80fc70b93881df
Anna Galusza [Wed, 30 Mar 2016 21:39:05 +0000 (21:39 +0000)]
Merge "Fix issues with wrong configuration being used to inflate layouts. Bug:
27700406" into nyc-dev
Noah Wang [Wed, 24 Feb 2016 01:26:13 +0000 (17:26 -0800)]
Make preview screens in font/display size settings scrollable
Bug:
27274145
Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82
Amith Yamasani [Wed, 30 Mar 2016 20:43:03 +0000 (20:43 +0000)]
Merge "Don't prompt twice to uninstall updates" into nyc-dev
Jason Monk [Wed, 30 Mar 2016 20:24:19 +0000 (20:24 +0000)]
Merge "Fix wifi animation issues" into nyc-dev
Jason Monk [Wed, 30 Mar 2016 20:22:39 +0000 (16:22 -0400)]
Fix wifi animation issues
There are still some remaining animation issues on the wifi screen.
To avoid regressions from M, just disable animations on the entire
wifi screen.
Change-Id: Iabf8ace731638ae7af483c6f3887ca351b17ac60
Fixes:
26271353
Udam Saini [Wed, 30 Mar 2016 20:05:45 +0000 (20:05 +0000)]
Merge "Wait for fingerprints to be removed (Partial fix)." into nyc-dev
Jason Monk [Wed, 30 Mar 2016 20:05:29 +0000 (16:05 -0400)]
Add metrics for suggestions
Bug:
27851236
Change-Id: Ia5aa1d42a40ba09a19db3c3790f0a7342660e613
Noah Wang [Wed, 30 Mar 2016 20:03:38 +0000 (20:03 +0000)]
Merge "Adding contentDescription to ViewPager in font/display size settings. Bug:
27326035" into nyc-dev
Noah Wang [Wed, 30 Mar 2016 20:03:13 +0000 (20:03 +0000)]
Merge "Set minimum height for preview screen of font/display size settings Bug:
27699996" into nyc-dev
Jason Monk [Wed, 30 Mar 2016 19:46:26 +0000 (15:46 -0400)]
Add metrics for settings conditionals
Bug:
27851236
Change-Id: I400716457d3f628419410a02c2a457d41d19a067
Jason Monk [Wed, 30 Mar 2016 19:11:18 +0000 (19:11 +0000)]
Merge "Fix keywords for default home app" into nyc-dev
Jason Monk [Wed, 30 Mar 2016 19:09:20 +0000 (15:09 -0400)]
Fix keywords for default home app
Change-Id: I38851f70d34168f906cf9b7223772bb3442852db
Fixes:
27826745
Jason Monk [Wed, 30 Mar 2016 18:53:31 +0000 (18:53 +0000)]
Merge "Only show enabled/disabled filters in main app list" into nyc-dev
Jason Monk [Wed, 30 Mar 2016 18:51:52 +0000 (14:51 -0400)]
Only show enabled/disabled filters in main app list
Change-Id: I8d7c94098b71f5893b08786a4caa90d9c191da99
Fixes:
27921850
Yohei Yukawa [Wed, 30 Mar 2016 18:45:00 +0000 (11:45 -0700)]
Remove gear icon from InputMethodPreference.
Per comment from UX, we do not show gear icons on InputMethodPreference
because there is no difference between tapping the item itself and
tapping the gear icon.
Bug:
27543291
Change-Id: Ieea9a13a4b7af9c90c3a2a8f365bd318663998b1
Yohei Yukawa [Wed, 30 Mar 2016 18:40:30 +0000 (11:40 -0700)]
Update title to "Add or edit virtual keyboards".
Per comment from UX, we replace "Add virtual keyboard" with
"Add or edit virtual keyboards" because the user is able to not only
enable but also disable virtual keyboards.
Bug:
27543291
Change-Id: Id2ae61519152bbe622aa5915f728a4cbbc49e078
Jason Monk [Wed, 30 Mar 2016 17:26:55 +0000 (17:26 +0000)]
Merge "Fix bridged app list saved scroll state" into nyc-dev
Jason Monk [Wed, 30 Mar 2016 17:24:37 +0000 (13:24 -0400)]
Fix bridged app list saved scroll state
(don't clear the list when we have the info)
Fixes:
27185911
Change-Id: Ieda4fd0fc6dd662741da9a1805c1435d4473490d
Muyuan Li [Fri, 25 Mar 2016 22:46:12 +0000 (15:46 -0700)]
Intent to start app memory usage page.
Start the app with intent: android.settings.APP_MEMORY_USAGE will bring
up this page.
Bug:
26820467
Change-Id: I50690c71e8182735ea14fdf42a4812573f650e1b
(cherry picked from commit
b816812a4f68a1841703da5d29b32ccafd0896f6)
Amith Yamasani [Wed, 30 Mar 2016 16:52:33 +0000 (09:52 -0700)]
Don't prompt twice to uninstall updates
PackageInstaller is going to ask again, so skip
asking in Settings when user wants to uninstall
updates to a system app.
Bug:
26694521
Change-Id: I4335a4e9bfe54985eb58ba19a890caba06705bef
Jason Monk [Wed, 30 Mar 2016 16:36:26 +0000 (16:36 +0000)]
Merge "Fix sim pin settings" into nyc-dev
Jason Monk [Wed, 30 Mar 2016 16:31:34 +0000 (16:31 +0000)]
Merge "Revert "Rename more to other networks"" into nyc-dev
Jason Monk [Wed, 30 Mar 2016 15:41:45 +0000 (11:41 -0400)]
Fix sim pin settings
Change-Id: I8fba2a367958da5831efd04f599ba7a363d11a1f
Fixes:
27419276
Fixes:
27529989
Clara Bayarri [Wed, 30 Mar 2016 13:57:58 +0000 (14:57 +0100)]
Change Work Challenge background image
As requested by UX
Bug:
27829562
Change-Id: Ib893dca102cdccf46102fa45e3501d43fd17b558
Yohei Yukawa [Wed, 30 Mar 2016 06:00:24 +0000 (06:00 +0000)]
Merge "Use word "languages" in favor of multi-locale support." into nyc-dev
Noah Wang [Wed, 30 Mar 2016 04:32:18 +0000 (21:32 -0700)]
Adding contentDescription to ViewPager in font/display size settings.
Bug:
27326035
Change-Id: I416c05f2fc7c9238a61b8d512f09cb834f8ec537
Noah Wang [Wed, 30 Mar 2016 04:02:37 +0000 (21:02 -0700)]
Set minimum height for preview screen of font/display size settings
Bug:
27699996
Change-Id: I1e2e16a355993f058301c57d29857f6fca8ec858
Yohei Yukawa [Wed, 30 Mar 2016 03:44:01 +0000 (20:44 -0700)]
Use word "languages" in favor of multi-locale support.
In Android N, the user is able to select multiple languages. Hence
in the IME subtype enabler "Use system language" should be updated to
"Use system languages".
Bug:
27722513
Change-Id: Idcc2fa7eecd1316feac04774ff18c42614a0dc9a
Noah Wang [Wed, 30 Mar 2016 03:23:29 +0000 (20:23 -0700)]
Fix crashing of font size settings screen due to the timing
of initialization of ExploreByTouchHelper
Bug:
27674946
Change-Id: Ief92b5db975861aa31029712854e78edf4454eb5
Jim Miller [Wed, 30 Mar 2016 01:34:53 +0000 (18:34 -0700)]
Fix crash in ConfirmDeviceCredentials
This reverts the workaround for bug
23849216 which has since
been fixed.
Fixes bug
27138063
Change-Id: Ifab4d072d0c95bb121bf3a9d852f2b16e92b7144
Daichi Hirono [Wed, 30 Mar 2016 00:38:52 +0000 (09:38 +0900)]
Change the dialog text in USB device tyep chooser.
Updates the texts to the new ones from UX.
Change-Id: Id741a9685c230e005019fe4b57933617fa67d257
Fixed:
27843605
Chris Tate [Wed, 30 Mar 2016 00:13:58 +0000 (00:13 +0000)]
Merge "Improve notes on "Opening links" and related strings" into nyc-dev
Christopher Tate [Wed, 30 Mar 2016 00:09:41 +0000 (17:09 -0700)]
Improve notes on "Opening links" and related strings
Bug
27857777
Change-Id: Ie4c70bca29c7b93c6bb9989b3bb3dc80bae6d805
Mihai Niță [Tue, 29 Mar 2016 23:33:21 +0000 (23:33 +0000)]
Merge "Fix locale reorder jank" into nyc-dev
Udam Saini [Tue, 29 Mar 2016 21:38:30 +0000 (14:38 -0700)]
Wait for fingerprints to be removed (Partial fix).
This is a partial fix for b/
27903189.
When we remove the lock screen and remove all fingerprints, wait for
them to all be removed before finishing the activity. This will let
the security screen accurately show how many fingerprints are available.
bug:
27903189
Change-Id: I30908dbefb7a858f6d99e532841ed4ff894bfe62
Noah Wang [Tue, 29 Mar 2016 21:56:13 +0000 (21:56 +0000)]
Merge "Replace "A" icon with underline with simple "A" icon on font size settings screen Bug:
27694339" into nyc-dev
Udam Saini [Tue, 29 Mar 2016 19:42:27 +0000 (19:42 +0000)]
Merge "Fixes back button on action bar on some fragments." into nyc-dev
Victor Chang [Tue, 29 Mar 2016 18:51:33 +0000 (18:51 +0000)]
Merge "Remove VPN Overflow menu" into nyc-dev
Udam Saini [Mon, 28 Mar 2016 23:35:13 +0000 (16:35 -0700)]
Fixes back button on action bar on some fragments.
SettingsPreferenceFragment has this already set so that the drawer
layout will work when the menu doesn't exist. However, some fragments
are not preference fragments, and we need to set setHasOptionsMenu
manually.
bug:
27879503
Change-Id: I6faadeb56dab00af611ac413109800822038c66d
Jason Monk [Tue, 29 Mar 2016 17:23:32 +0000 (17:23 +0000)]
Merge "Fix crash when clearing preference screen" into nyc-dev
Jason Monk [Tue, 29 Mar 2016 17:21:48 +0000 (13:21 -0400)]
Fix crash when clearing preference screen
Bug:
27892359
Change-Id: I96cd167e8173bf0345c3e186fa11c2e613b63e6f
Jason Monk [Tue, 29 Mar 2016 17:12:56 +0000 (17:12 +0000)]
Revert "Rename more to other networks"
Bug:
27638488
This reverts commit
34ed8a243b799c65c393f51b6628e997cb3d5949.
Change-Id: I5e10e11d40d24ae26c8605f832c43bd41c62c1dc