OSDN Git Service
Jason Monk [Fri, 15 Jul 2016 14:11:30 +0000 (14:11 +0000)]
Pre-setup restrictions DO NOT MERGE am:
e6ad6e866b am:
2d21d1b9cf am:
68d53c0481 am:
e67f458667 -s ours
am:
2703570242
Change-Id: I0e3964b7a1b7398ae96a798de892a40d05be0add
Jason Monk [Fri, 15 Jul 2016 14:08:40 +0000 (14:08 +0000)]
Pre-setup restrictions DO NOT MERGE am:
e6ad6e866b am:
2d21d1b9cf am:
68d53c0481
am:
e67f458667 -s ours
Change-Id: Ic5c066a81be1fe3b884cf1c9ead6c7c276a12fd1
Jason Monk [Fri, 15 Jul 2016 14:05:59 +0000 (14:05 +0000)]
Pre-setup restrictions DO NOT MERGE am:
e6ad6e866b am:
2d21d1b9cf
am:
68d53c0481
Change-Id: Ic501eb9b08f18eb3e9f3e95d64aae511815db268
Jason Monk [Fri, 15 Jul 2016 14:03:03 +0000 (14:03 +0000)]
Pre-setup restrictions DO NOT MERGE am:
e6ad6e866b
am:
2d21d1b9cf
Change-Id: I1fc62827de765434ac88a7cb75d63febb074b565
Jason Monk [Fri, 15 Jul 2016 13:59:59 +0000 (13:59 +0000)]
Pre-setup restrictions DO NOT MERGE
am:
e6ad6e866b
Change-Id: I0bfc276c9bf0e3d6320cc9aa8c77f77899b69e04
Tony Mak [Fri, 15 Jul 2016 03:42:07 +0000 (03:42 +0000)]
Merge "Disable instead of hiding add account preference" into nyc-mr1-dev
TreeHugger Robot [Thu, 14 Jul 2016 20:14:21 +0000 (20:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 14 Jul 2016 13:49:58 +0000 (13:49 +0000)]
Merge "Open Security Patch Bulletin" into nyc-mr1-dev
Bill Yi [Thu, 14 Jul 2016 06:07:59 +0000 (23:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9230fd1dacce710c8cb39946a65ed3550b6d2e0a
Auto-generated-cl: translation import
Tony Mak [Thu, 14 Jul 2016 05:42:50 +0000 (13:42 +0800)]
Disable instead of hiding add account preference
Bug:
29236399
Change-Id: Ieb1af7f31a54b1502ae99682fc423e37c86a2353
Jeff Sharkey [Thu, 14 Jul 2016 04:31:35 +0000 (04:31 +0000)]
Merge "Preemptively add string for direct boot dialogs." into nyc-mr1-dev
Jeff Sharkey [Wed, 13 Jul 2016 22:41:59 +0000 (16:41 -0600)]
Preemptively add string for direct boot dialogs.
Bug:
27196876
Change-Id: Ieb65b4b7b4e075c1de2e502d0272f8f113c1c34b
Doris Ling [Thu, 14 Jul 2016 03:34:00 +0000 (03:34 +0000)]
Merge "Revert equal check in DashboardAdapter.setCondition()." into nyc-mr1-dev
Andrew Sapperstein [Thu, 14 Jul 2016 01:27:43 +0000 (18:27 -0700)]
Open Security Patch Bulletin
When in device settings, in about phone, we show the current
security patch. Now, we'll also fire and intent to open a link
to the security bulletin page so users can see details about
their security patch.
Change-Id: I59c9e6ac0aecb0398992942a0fee4cb0a3cf268e
Fixes:
29828303
Tony Mak [Thu, 14 Jul 2016 01:22:52 +0000 (01:22 +0000)]
Merge "Hide Set Wallpaper in Settings suggestion if it is not allowed" into nyc-mr1-dev
TreeHugger Robot [Wed, 13 Jul 2016 23:29:46 +0000 (23:29 +0000)]
Merge "Add content description to escalation card title." into nyc-mr1-dev
Doris Ling [Wed, 13 Jul 2016 19:56:18 +0000 (12:56 -0700)]
Revert equal check in DashboardAdapter.setCondition().
1. Remove the equality check for the conditions list which causes
"Airplane mode is on" to be shown always even when airplane mode is
turned off.
2. Also add mIsShowingAll and mSuggestionMode to instance state.
Bug:
30055644
Change-Id: I0709e9a1b0139e80cdb834cb76a9334dce753e14
TreeHugger Robot [Wed, 13 Jul 2016 22:13:26 +0000 (22:13 +0000)]
Merge "Change "ringer volume" to "ring volume"" into nyc-mr1-dev
TreeHugger Robot [Wed, 13 Jul 2016 22:01:18 +0000 (22:01 +0000)]
Merge "Rename Night display to Night Light" into nyc-mr1-dev
Doris Ling [Wed, 13 Jul 2016 21:13:53 +0000 (21:13 +0000)]
Merge "Change launch method for preference Display->Ambient Display." into nyc-mr1-dev
Matthew Fritze [Wed, 13 Jul 2016 21:03:33 +0000 (21:03 +0000)]
Merge "Update summary and title strings for Settings Suggestions" into nyc-mr1-dev
Matthew Fritze [Wed, 13 Jul 2016 20:52:45 +0000 (20:52 +0000)]
Merge "Update Safety & Regulatory Information link text" into nyc-mr1-dev
Fan Zhang [Wed, 13 Jul 2016 18:50:09 +0000 (11:50 -0700)]
Add content description to escalation card title.
Bug:
30079904
In strings like "We're here for you 24/7", to avoid talkback read 24/7
as 24/7ths, we need to provide a custom content description.
Change-Id: If51586d97a376e7a859658d7a6dc48108094ddc2
Mike Tsao [Wed, 13 Jul 2016 19:52:32 +0000 (12:52 -0700)]
Change "ringer volume" to "ring volume"
Bug:
29565896
Changes all occurrences of "ringer volume" to "ring volume" in
Settings string file, including in comments.
Change-Id: Iad197dbbbbec16120fcd3ac835c1647a7f4c0c32
TreeHugger Robot [Wed, 13 Jul 2016 19:46:01 +0000 (19:46 +0000)]
Merge "Cross fade escalation card when content changes." into nyc-mr1-dev
Mike Tsao [Wed, 13 Jul 2016 19:31:38 +0000 (12:31 -0700)]
Rename Night display to Night Light
Bug:
30069874
Bug:
29584858
Renames generic "Night display" to "Night Light." Also changes feature
description to emphasize suitability for reading at night.
Change-Id: Ib54a22d7683853d7aadf4fe48795aaaa990b0333
TreeHugger Robot [Wed, 13 Jul 2016 18:51:54 +0000 (18:51 +0000)]
Merge "Tweak layouts to make support UI look better." into nyc-mr1-dev
Doris Ling [Wed, 13 Jul 2016 00:45:57 +0000 (17:45 -0700)]
Change launch method for preference Display->Ambient Display.
Change to launch using intent to maintain the activity title when
launching Moves from Display->Ambient Display.
Bug:
30034039
Change-Id: I7e8df04a5c6722320b342e09ea1977b5ba7a8ded
Fan Zhang [Wed, 13 Jul 2016 16:49:03 +0000 (09:49 -0700)]
Cross fade escalation card when content changes.
Fixes:
30079520
Whenever escalation card needs to change content:
- Instead of rebuilding entire data set, rebuild just escalation data.
- Instead of notify entire data set change, only notify the position
change for escalation card.
This triggers the cross-fade animation in RecyclerView's
DefaultItemAnimator.
Change-Id: Ia19593d852fa6a1c366aecf9330d8274d7295e85
Fan Zhang [Wed, 13 Jul 2016 16:22:04 +0000 (09:22 -0700)]
Tweak layouts to make support UI look better.
Fixes:
30087623
- Removed some padding and hide empty textviews.
Change-Id: Id8476aa3870d796c5f5a34c2f3fa6db34918691b
Doris Ling [Wed, 13 Jul 2016 17:13:05 +0000 (17:13 +0000)]
Merge "Reduce the number of times that dataset changed is triggerd in DashboardAdapter" into nyc-mr1-dev
Daniel Nishi [Wed, 13 Jul 2016 16:26:04 +0000 (16:26 +0000)]
Merge "Log when the storage manager is toggled on and off." into nyc-mr1-dev
Mahaver Chopra [Wed, 13 Jul 2016 12:27:00 +0000 (12:27 +0000)]
Merge "Use UM.DISALLOW_OEM_UNLOCK instead of Global.OEM_UNLOCK_DISALLOWED" into nyc-mr1-dev
Tony Mak [Wed, 13 Jul 2016 09:57:33 +0000 (17:57 +0800)]
Hide Set Wallpaper in Settings suggestion if it is not allowed
Change-Id: I8030389f3fe945c3df241f347d58b8da04622d9e
Fix:
30089761
TreeHugger Robot [Tue, 12 Jul 2016 21:42:03 +0000 (21:42 +0000)]
Update summary and title strings for Settings Suggestions
Setting Suggestion messages have new strings for NDR.
Change-Id: I5e76e669fac91b61a2207bb2937c107c952768c0
Fixes:
30067406
TreeHugger Robot [Wed, 13 Jul 2016 01:13:01 +0000 (01:13 +0000)]
Merge "Request support rules to refresh when account changes." into nyc-mr1-dev
Doris Ling [Tue, 12 Jul 2016 01:09:15 +0000 (18:09 -0700)]
Reduce the number of times that dataset changed is triggerd in DashboardAdapter
1. Save the suggestion list and the category list into the instance
state so that it will be available on warm start, and avoid the need
to reload the data.
2. Add the condition list to the constructor parameters for
DashboardAdapter, so that it does not need to setConditions()
separately which will trigger notifyDataSetChanged()
Bug:
30055644
Change-Id: Ia04fa3a25b13d2dacf6baf5f412d662a595fb6dd
Maurice Lam [Wed, 13 Jul 2016 00:00:54 +0000 (00:00 +0000)]
Merge "Center find-sensor graphic in landscape" into nyc-mr1-dev
TreeHugger Robot [Tue, 12 Jul 2016 23:43:46 +0000 (23:43 +0000)]
Merge "Add ripples to negative buttons" into nyc-mr1-dev
Fan Zhang [Tue, 12 Jul 2016 21:10:22 +0000 (14:10 -0700)]
Request support rules to refresh when account changes.
Bug:
30079512
When account is added, operation rule can potentially change. Request a
refresh to make sure user sees the latest UI.
Change-Id: I89e9d97bec22d612ca3602d86cc63f8f06355a39
Doris Ling [Tue, 12 Jul 2016 23:38:02 +0000 (23:38 +0000)]
Merge "Update preference ordering in Gestures settings." into nyc-mr1-dev
Doris Ling [Tue, 12 Jul 2016 23:37:38 +0000 (23:37 +0000)]
Merge "Update resource string for gestures settings." into nyc-mr1-dev
Maurice Lam [Tue, 12 Jul 2016 21:43:18 +0000 (14:43 -0700)]
Add ripples to negative buttons
For the negative buttons (buttons on the left side) of screen lock setup
and fingerprint setup screens, instead of theming it like a text link,
inherit from the borderless button and set the highlight color to color
accent.
Bug:
29905448
Change-Id: I4a3d28d4a0658740d0cb622e40031ab0ca22e6a0
TreeHugger Robot [Tue, 12 Jul 2016 21:42:03 +0000 (21:42 +0000)]
Merge "Don't show the Fingerprint suggestion if it is disabled." into nyc-mr1-dev
TreeHugger Robot [Tue, 12 Jul 2016 21:26:11 +0000 (21:26 +0000)]
Merge "Use app name as summary in default home app setting." into nyc-mr1-dev
Daniel Nishi [Tue, 12 Jul 2016 20:55:41 +0000 (13:55 -0700)]
Log when the storage manager is toggled on and off.
Bug:
30095915
Change-Id: I9fe16f842f2c2944582ec231803aa957573abead
Daniel Nishi [Mon, 11 Jul 2016 22:27:16 +0000 (15:27 -0700)]
Don't show the Fingerprint suggestion if it is disabled.
Bug:
27202317
Change-Id: I8e97e47f711961cf127fc2135dd06812236829b8
Fan Zhang [Mon, 11 Jul 2016 22:25:03 +0000 (15:25 -0700)]
Use app name as summary in default home app setting.
Bug:
27834147
Condition: Only use app name as summary if there is only 1 launcher app
installed.
Change-Id: Idb9b55d5618bbdbea6446758f2fcd09d0d6309af
Doris Ling [Tue, 12 Jul 2016 18:25:47 +0000 (11:25 -0700)]
Update preference ordering in Gestures settings.
Swapped the fingerprint swipe and ambient display preference in
Settings->Gestures, and updated the summary text in Display->Ambient
display
Bug:
30073941
Change-Id: Ifc386b4ab9b0e7317f1ee0e477f9670e8a49b0f9
Matthew Fritze [Mon, 11 Jul 2016 19:45:07 +0000 (12:45 -0700)]
Update Safety & Regulatory Information link text
The link to Safety & Regulatory Information now reads:
Safety & regulatory manual
Bug:
30037999
Change-Id: Ib72efba96b8a9a9f38bcf9686e2563d1877620a8
Bill Yi [Tue, 12 Jul 2016 16:35:07 +0000 (16:35 +0000)]
Import translations. DO NOT MERGE
am:
fdb2a9ab61 -s ours
Change-Id: I9e66dac2b329ad2f6065a5208b8da471b14f66e7
TreeHugger Robot [Tue, 12 Jul 2016 16:18:53 +0000 (16:18 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Mahaver Chopra [Sun, 10 Jul 2016 15:38:24 +0000 (16:38 +0100)]
Use UM.DISALLOW_OEM_UNLOCK instead of Global.OEM_UNLOCK_DISALLOWED
Currently we used global setting to restrict user from enabling oem
unlock. As global settings can be chagned using adb, using user
restrictions instead.
Bug:
29893399
Change-Id: Icaffb080979a447d1e0f7f0d72f92c9db83ac10c
Julia Reynolds [Tue, 12 Jul 2016 14:03:12 +0000 (14:03 +0000)]
Merge "Correct logic for showing overide dnd field." into nyc-mr1-dev
Tony Mak [Fri, 1 Jul 2016 12:55:47 +0000 (13:55 +0100)]
Remove KeyboardView in ChooseLockPassword
1. We actually use user installed keyboard
2. Request focus on the edittext instead of the keyboard
Bug:
24900754
Change-Id: I6257a592ad34875d46c5c05349098b891ef37d98
Tony Mak [Tue, 12 Jul 2016 10:19:45 +0000 (11:19 +0100)]
Visualize password requirements and their fulfillment
1. Aggregate policies and generate the requirements
2. When user modifies the password, check is each requirement fulfilled
Update the view accordingly.
Change-Id: I962ed3b81ce844006be1024a493e94ce52a3fdec
Fix:
24900754
Tony Mak [Tue, 5 Jul 2016 06:48:53 +0000 (07:48 +0100)]
Update work challenge strings
Change-Id: I9c938c9a9547ec92d7ba7b452861db174e421068
Fix:
29358023
Maurice Lam [Tue, 12 Jul 2016 03:14:49 +0000 (20:14 -0700)]
Center find-sensor graphic in landscape
Center the find-sensor graphic in landscape so it can occupy the
space next to the title as well, preventing it from being cropped
when the font-size and display size is set to maximum.
Bug:
29516872
Change-Id: I3d2a6d0852ec725c99ba5709a97e532cd0338778
Maurice Lam [Tue, 12 Jul 2016 01:51:11 +0000 (01:51 +0000)]
Merge "Update button styles for fingerprint" into nyc-mr1-dev
Doris Ling [Mon, 11 Jul 2016 23:36:16 +0000 (16:36 -0700)]
Update resource string for gestures settings.
Update the summary text for the gestures settings.
Bug:
30074265
Change-Id: I5e4313f2764aa64af8bd7b984189f2d0782a0a70
Doris Ling [Mon, 11 Jul 2016 22:21:25 +0000 (22:21 +0000)]
Merge "Disable Gestures Settings by default." into nyc-mr1-dev
Maurice Lam [Mon, 11 Jul 2016 21:33:04 +0000 (21:33 +0000)]
Merge "Fix PIN screen title" into nyc-mr1-dev
Bill Yi [Mon, 11 Jul 2016 19:53:47 +0000 (12:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7b972f861006fd59590ca433f16f6f794c792161
Auto-generated-cl: translation import
Bill Yi [Mon, 11 Jul 2016 19:42:47 +0000 (12:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I945ac4865ce29fb45b0e0935cadbdc0dd3ab3ce7
Auto-generated-cl: translation import
Doris Ling [Mon, 11 Jul 2016 19:00:18 +0000 (12:00 -0700)]
Disable Gestures Settings by default.
Add a config boolean to determine if the gesture settings is enabled or
not.
Bug:
30022840
Change-Id: Ie7ae8bedbfc128b64999d33a3d626d4e311e5e3e
Makoto Onuki [Mon, 11 Jul 2016 17:54:27 +0000 (17:54 +0000)]
Merge "Restore "reset ShortcutManager rate limiting" dev option" into nyc-mr1-dev
Maurice Lam [Sat, 9 Jul 2016 01:38:48 +0000 (18:38 -0700)]
Fix PIN screen title
Set the header text of the screen after Activity.setTitle is called,
so that the PIN screen will show the PIN text as header, as opposed to
the default which is always "password".
Bug:
30041779
Change-Id: I525bd4e5c51252410fdeb0424329bbfbd86e5b7d
Victor Chang [Mon, 11 Jul 2016 13:56:07 +0000 (13:56 +0000)]
Merge "Fix always-on is not turned off when user forgets vpn" into nyc-mr1-dev
Julia Reynolds [Mon, 11 Jul 2016 13:05:44 +0000 (09:05 -0400)]
Correct logic for showing overide dnd field.
Change-Id: Iae1d053d3816ccdae9f6d9bc6a16622b50e07440
Fixes:
29995563
Doris Ling [Fri, 8 Jul 2016 23:58:45 +0000 (23:58 +0000)]
Merge "Add handling for gesture settings for double twist for camera flip." into nyc-mr1-dev
Doris Ling [Fri, 8 Jul 2016 23:16:36 +0000 (23:16 +0000)]
Merge "Change gesture settings for Ambient Display from nudge to double tap." into nyc-mr1-dev
Doris Ling [Fri, 8 Jul 2016 22:56:45 +0000 (22:56 +0000)]
Merge "Add summary for Settings->Gestures." into nyc-mr1-dev
Doris Ling [Fri, 8 Jul 2016 19:42:13 +0000 (12:42 -0700)]
Change gesture settings for Ambient Display from nudge to double tap.
Change the description text and animation video to double tap the device
instead of nudge movement. Also update the summary text in
Display->Ambient Display to match the gesture description.
Bug:
30034987
Change-Id: If95e7a417b472dd677174a8187a83594e06e0eee
Doris Ling [Fri, 8 Jul 2016 18:35:27 +0000 (11:35 -0700)]
Add summary for Settings->Gestures.
Add summary text for gesture settings.
Bug:
30034888
Change-Id: I15128b6e533b279ca5da98bf4f0e042dd93a0d02
Justin Klaassen [Fri, 8 Jul 2016 21:07:47 +0000 (21:07 +0000)]
Merge "Add Night display settings" into nyc-mr1-dev
Justin Klaassen [Wed, 22 Jun 2016 01:32:04 +0000 (18:32 -0700)]
Add Night display settings
Bug:
28615069
Change-Id: I2e8a374a00c06c06d419a6ff46cd3b5d544c1d3e
Doris Ling [Wed, 6 Jul 2016 20:44:26 +0000 (13:44 -0700)]
Add handling for gesture settings for double twist for camera flip.
Add handling for updating the secure settings for camera double twist
when user updates the on/off toggle, and move
SYSTEM_NAVIGATION_KEYS_ENABLED from Global to Secure.
Bug:
29869445
Change-Id: Iebb937509a661b012688a3eb36efe08d2292ff26
Fan Zhang [Thu, 7 Jul 2016 23:44:05 +0000 (16:44 -0700)]
UI updates for support tab.
Fixes:
29999181
Fixes:
29397123
- Reduce support tile min height to 48dp.
- Add a 8dp spacer between escalation card and first support tile.
- Show different off-hour support escalation title when support hour is
always avaiable.
Change-Id: I4dacf2b375734c4819b9b19b68fc84faf083c0d4
Makoto Onuki [Fri, 8 Jul 2016 16:17:25 +0000 (09:17 -0700)]
Restore "reset ShortcutManager rate limiting" dev option
Bug
30031093
Change-Id: I28cbf56e61937b15eb5806823f40e43d6bac4e72
Fan Zhang [Thu, 7 Jul 2016 20:30:00 +0000 (20:30 +0000)]
Merge "Wrap bluetooth edit content in a scrollview." into nyc-mr1-dev
Doris Ling [Thu, 7 Jul 2016 16:58:40 +0000 (16:58 +0000)]
Merge "Add padding for the animation in the gestures settings." into nyc-mr1-dev
Fan Zhang [Thu, 7 Jul 2016 00:07:37 +0000 (17:07 -0700)]
Fix strings for support tab.
Bug:
29105266
- Fix typos in string and comments
- Use 2 different strings for off-hour and off-line cases.
Change-Id: I63859605ff7185d5f8cc66fd31b56f1d09ed11aa
Fan Zhang [Wed, 6 Jul 2016 23:40:34 +0000 (16:40 -0700)]
Wrap bluetooth edit content in a scrollview.
Bug:
28914094
In split screen the dialog content is too tall to fit in viewport. Wrap
content in a scrollview so user can scroll vertically for different
options, and have a visual indication that content is scrollable.
Change-Id: Ia304dca6747cec6f31e86ccf89003ef6890e0640
TreeHugger Robot [Thu, 7 Jul 2016 00:14:07 +0000 (00:14 +0000)]
Merge "Use phone number as summary for 'About Phone'." into nyc-mr1-dev
Fan Zhang [Wed, 6 Jul 2016 19:17:54 +0000 (12:17 -0700)]
Use phone number as summary for 'About Phone'.
Bug:
28419411
Change-Id: I3ac57a770bf4d7416459dadedf91c3d6cefbc6b4
Doris Ling [Wed, 6 Jul 2016 22:08:08 +0000 (22:08 +0000)]
Merge "Fix layout transition from Display->Ambient Display to Gestures" into nyc-mr1-dev
Doris Ling [Wed, 6 Jul 2016 21:59:33 +0000 (14:59 -0700)]
Add padding for the animation in the gestures settings.
Add padding around the animation video in landscape mode to make it look
more proportional.
Bug:
29792743
Change-Id: I52cfcecd680a118741d8ced18afd9fc811a33d94
TreeHugger Robot [Wed, 6 Jul 2016 20:44:04 +0000 (20:44 +0000)]
Merge "Add logging when click tollfree/tolled phone support button" into nyc-mr1-dev
Doris Ling [Fri, 1 Jul 2016 01:58:40 +0000 (18:58 -0700)]
Fix layout transition from Display->Ambient Display to Gestures
1. Add handling in Gestures settings to scroll to the corresponding
preference when launching from Display->Ambient Display
2. Remove the bitmap creation for the video preview image
3. Use a custom aspect ration framee layout to hold the animation
instead to avoid resizing of the animation view.
Bug:
29795707
Change-Id: I67209ba2508a93da4fc46ff20986309dbe5a83d5
TreeHugger Robot [Wed, 6 Jul 2016 20:09:43 +0000 (20:09 +0000)]
Merge "Show 'up arrow' in About phone->Status menu." into nyc-mr1-dev
Fan Zhang [Wed, 6 Jul 2016 20:09:10 +0000 (20:09 +0000)]
Merge "Remove search in support tab." into nyc-mr1-dev
Maurice Lam [Mon, 27 Jun 2016 19:59:12 +0000 (12:59 -0700)]
Update button styles for fingerprint
Use button styles instead of list style because of UX spec change.
Bug:
29421687
Change-Id: Icf178c881c2325b6183de8667a5657b3d2088f72
Victor Chang [Wed, 6 Jul 2016 17:27:55 +0000 (18:27 +0100)]
Fix always-on is not turned off when user forgets vpn
Change-Id: Iad285ff06abde71ef040cbb29f740bcf20c3bbb7
Fix:
29991174
Fan Zhang [Thu, 30 Jun 2016 20:20:12 +0000 (13:20 -0700)]
Remove search in support tab.
Bug:
29397123
Change-Id: Id2d43724696c04e890adba562b5476e1834779da
Robin Lee [Wed, 6 Jul 2016 10:30:12 +0000 (10:30 +0000)]
Merge "Don't show always-on option connecting PPTP vpn" into nyc-mr1-dev
Tony Mak [Wed, 6 Jul 2016 09:01:37 +0000 (09:01 +0000)]
Merge "Show info icon when RestrictedListPreference is disabled" into nyc-mr1-dev
Bill Yi [Wed, 6 Jul 2016 04:26:32 +0000 (04:26 +0000)]
Import translations. DO NOT MERGE
am:
271f042229 -s ours
Change-Id: I2286ee629008672002f36dcca7f505898a40d1dd
Bill Yi [Wed, 6 Jul 2016 02:52:46 +0000 (19:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3df812343b69d4e10d3fa2876913a4c7f5698c89
Auto-generated-cl: translation import
Bill Yi [Wed, 6 Jul 2016 02:42:12 +0000 (19:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idce951754c8e74f8e6370dc1ad03cebfce4db3c6
Auto-generated-cl: translation import
Tony Mak [Tue, 28 Jun 2016 15:30:38 +0000 (16:30 +0100)]
Show info icon when RestrictedListPreference is disabled
Fix:
29766349