OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 12 Jul 2016 16:18:53 +0000 (16:18 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoMerge "Correct logic for showing overide dnd field." into nyc-mr1-dev
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

7 years agoRemove KeyboardView in ChooseLockPassword
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

7 years agoVisualize password requirements and their fulfillment
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

7 years agoUpdate work challenge strings
Tony Mak [Tue, 5 Jul 2016 06:48:53 +0000 (07:48 +0100)]
Update work challenge strings

Change-Id: I9c938c9a9547ec92d7ba7b452861db174e421068
Fix: 29358023

7 years agoMerge "Update button styles for fingerprint" into nyc-mr1-dev
Maurice Lam [Tue, 12 Jul 2016 01:51:11 +0000 (01:51 +0000)]
Merge "Update button styles for fingerprint" into nyc-mr1-dev

7 years agoMerge "Disable Gestures Settings by default." into nyc-mr1-dev
Doris Ling [Mon, 11 Jul 2016 22:21:25 +0000 (22:21 +0000)]
Merge "Disable Gestures Settings by default." into nyc-mr1-dev

7 years agoMerge "Fix PIN screen title" 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

7 years agoImport translations. DO NOT MERGE
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

7 years agoDisable Gestures Settings by default.
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

7 years agoMerge "Restore "reset ShortcutManager rate limiting" dev option" into nyc-mr1-dev
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

7 years agoFix PIN screen title
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

7 years agoMerge "Fix always-on is not turned off when user forgets vpn" into nyc-mr1-dev
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

7 years agoCorrect logic for showing overide dnd field.
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

7 years agoMerge "Add handling for gesture settings for double twist for camera flip." into...
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

7 years agoMerge "Change gesture settings for Ambient Display from nudge to double tap." into...
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

7 years agoMerge "Add summary for Settings->Gestures." 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

7 years agoChange gesture settings for Ambient Display from nudge to double tap.
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

7 years agoAdd summary for Settings->Gestures.
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

7 years agoMerge "Add Night display settings" into nyc-mr1-dev
Justin Klaassen [Fri, 8 Jul 2016 21:07:47 +0000 (21:07 +0000)]
Merge "Add Night display settings" into nyc-mr1-dev

7 years agoAdd Night display settings
Justin Klaassen [Wed, 22 Jun 2016 01:32:04 +0000 (18:32 -0700)]
Add Night display settings

Bug: 28615069
Change-Id: I2e8a374a00c06c06d419a6ff46cd3b5d544c1d3e

7 years agoAdd handling for gesture settings for double twist for camera flip.
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

7 years agoUI updates for support tab.
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

7 years agoRestore "reset ShortcutManager rate limiting" dev option
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

7 years agoMerge "Wrap bluetooth edit content in a scrollview." into nyc-mr1-dev
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

7 years agoMerge "Add padding for the animation in the gestures settings." 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

7 years agoFix strings for support tab.
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

7 years agoWrap bluetooth edit content in a scrollview.
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

7 years agoMerge "Use phone number as summary for 'About Phone'." into nyc-mr1-dev
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

7 years agoUse phone number as summary for 'About Phone'.
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

7 years agoMerge "Fix layout transition from Display->Ambient Display to Gestures" into nyc...
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

7 years agoAdd padding for the animation in the gestures settings.
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

7 years agoMerge "Add logging when click tollfree/tolled phone support button" into nyc-mr1-dev
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

7 years agoFix layout transition from Display->Ambient Display to Gestures
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

7 years agoMerge "Show 'up arrow' in About phone->Status menu." into nyc-mr1-dev
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

7 years agoMerge "Remove search in support tab." 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

7 years agoUpdate button styles for fingerprint
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

7 years agoFix always-on is not turned off when user forgets vpn
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

7 years agoRemove search in support tab.
Fan Zhang [Thu, 30 Jun 2016 20:20:12 +0000 (13:20 -0700)]
Remove search in support tab.

Bug: 29397123
Change-Id: Id2d43724696c04e890adba562b5476e1834779da

7 years agoMerge "Don't show always-on option connecting PPTP vpn" into nyc-mr1-dev
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

7 years agoMerge "Show info icon when RestrictedListPreference is disabled" 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

7 years agoImport translations. DO NOT MERGE
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

7 years agoImport translations. DO NOT MERGE
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

7 years agoImport translations. DO NOT MERGE
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

7 years agoShow info icon when RestrictedListPreference is disabled
Tony Mak [Tue, 28 Jun 2016 15:30:38 +0000 (16:30 +0100)]
Show info icon when RestrictedListPreference is disabled

Fix: 29766349

7 years agoShow 'up arrow' in About phone->Status menu.
Fan Zhang [Fri, 1 Jul 2016 23:46:51 +0000 (16:46 -0700)]
Show 'up arrow' in About phone->Status menu.

Bug: 27970152

Status should be a Submenu to have up arrow. Also cleaned up
AndroidManifest for this fragment as it doesn't need to run in a
separate process.

Change-Id: I0610314b3baa3d5f1f70d255b4657c805c534373

7 years agoMerge "Update Backup & reset settings to launch the configured activity." into nyc...
Doris Ling [Fri, 1 Jul 2016 20:15:59 +0000 (20:15 +0000)]
Merge "Update Backup & reset settings to launch the configured activity." into nyc-mr1-dev

7 years agoUpdate Backup & reset settings to launch the configured activity.
Doris Ling [Thu, 16 Jun 2016 01:16:09 +0000 (18:16 -0700)]
Update Backup & reset settings to launch the configured activity.

Check for configured backup settings activity to be used for
Settings->Backup & reset.

Bug: 28942163
Change-Id: I8b937fde5b400afdb81463c9c278b3e3ad42688b

7 years agoAdd logging when click tollfree/tolled phone support button
Fan Zhang [Fri, 1 Jul 2016 00:30:29 +0000 (17:30 -0700)]
Add logging when click tollfree/tolled phone support button

Bug: 29105266
Change-Id: Ide67c74b6c072c937f97269ad33800cca68a672d

7 years agoMerge "Update escalation cards layout and data binding." into nyc-mr1-dev
Fan Zhang [Fri, 1 Jul 2016 18:17:38 +0000 (18:17 +0000)]
Merge "Update escalation cards layout and data binding." into nyc-mr1-dev

7 years agoMerge "Remove dead code that could have a memory leak" into nyc-mr1-dev
TreeHugger Robot [Fri, 1 Jul 2016 16:00:34 +0000 (16:00 +0000)]
Merge "Remove dead code that could have a memory leak" into nyc-mr1-dev

7 years agoRemove dead code that could have a memory leak
Jason Monk [Fri, 1 Jul 2016 14:28:34 +0000 (10:28 -0400)]
Remove dead code that could have a memory leak

Change-Id: I0a4994f1397160e479cee7eaa1e334e002d28c8c
Fixes: 29115509

7 years agoProtect against null carrier config
Jason Monk [Fri, 1 Jul 2016 13:55:44 +0000 (09:55 -0400)]
Protect against null carrier config

Change-Id: Ida60ead4a85017c29cc8ad3c3e7a462a9e3c720b
Fixes: 28085042

7 years agoMerge "Update strings to match the latest mocks." into nyc-mr1-dev
Daniel Nishi [Thu, 30 Jun 2016 23:50:47 +0000 (23:50 +0000)]
Merge "Update strings to match the latest mocks." into nyc-mr1-dev

7 years agoMerge "Fix ugly flash between boot animation and setup wizard (1/2)" into nyc-mr1-dev
TreeHugger Robot [Thu, 30 Jun 2016 22:58:09 +0000 (22:58 +0000)]
Merge "Fix ugly flash between boot animation and setup wizard (1/2)" into nyc-mr1-dev

7 years agoMerge "Add text to the Manage Settings page to show freed storage." into nyc-mr1-dev
Daniel Nishi [Thu, 30 Jun 2016 21:17:17 +0000 (21:17 +0000)]
Merge "Add text to the Manage Settings page to show freed storage." into nyc-mr1-dev

7 years agoUpdate strings to match the latest mocks.
Daniel Nishi [Thu, 30 Jun 2016 21:05:22 +0000 (14:05 -0700)]
Update strings to match the latest mocks.

Bug: 29877906
Change-Id: I96338cb42f8e53b0d642e1ad13064fa86cbdc5ba

7 years agoUpdate escalation cards layout and data binding.
Fan Zhang [Thu, 30 Jun 2016 16:36:37 +0000 (09:36 -0700)]
Update escalation cards layout and data binding.

Bug: 29397123

- Updated the UI for support escalation cards so different state have
  the same height and text/button shows up at roughly same place.
- Split data model for escalation cards from SupportData. The data and
  UI between escalation cards and support tiles are different enough
  that it no longer makes sense to share the same data object.

Change-Id: I328cc33961b9638e5e5fc2cad3ebf443991f4d0c

7 years agoMerge "Add help url for gestures settings." into nyc-mr1-dev
Doris Ling [Thu, 30 Jun 2016 19:59:20 +0000 (19:59 +0000)]
Merge "Add help url for gestures settings." into nyc-mr1-dev

7 years agoAdd help url for gestures settings.
Doris Ling [Wed, 29 Jun 2016 23:39:36 +0000 (16:39 -0700)]
Add help url for gestures settings.

Override getHelpResource() in GestureSettings and added corresponding
resource string for the help url.

Bug: 29792538
Change-Id: I2f2d93fc25b63266504bd13b954fefa5692e9ddf

7 years agoMerge "Fix some bluetooth theming issues." into nyc-mr1-dev
Andrew Sapperstein [Thu, 30 Jun 2016 17:17:19 +0000 (17:17 +0000)]
Merge "Fix some bluetooth theming issues." into nyc-mr1-dev

7 years agoFix some bluetooth theming issues.
Andrew Sapperstein [Wed, 29 Jun 2016 21:53:57 +0000 (14:53 -0700)]
Fix some bluetooth theming issues.

The ic_lockscreen_ime wasn't being appropriately colored due to
the (now deleted) override of the assets defined in SettingsLib
that were hardcoded teal. By deleting these, the vector drawable
that's tinted with the accent color is used.

Also fixes the pairing dialog to use DeviceDefault themes.

Fixes: 29837825

Change-Id: I66cd57c00f1eec00346d7d10a86cd9be79d6cf5c

7 years agoMerge "Fix a bug where selected country is reset." into nyc-mr1-dev
TreeHugger Robot [Thu, 30 Jun 2016 16:51:55 +0000 (16:51 +0000)]
Merge "Fix a bug where selected country is reset." into nyc-mr1-dev

7 years agoMerge "Update UI for support tab." into nyc-mr1-dev
Fan Zhang [Thu, 30 Jun 2016 15:22:02 +0000 (15:22 +0000)]
Merge "Update UI for support tab." into nyc-mr1-dev

7 years agoDon't show always-on option connecting PPTP vpn
Robin Lee [Mon, 20 Jun 2016 17:22:39 +0000 (18:22 +0100)]
Don't show always-on option connecting PPTP vpn

Support for this kind has been taken out so it shouldn't be an option
when connecting (it's already not an option when editing).

Bug: 28807474
Change-Id: Id3e7be390c6813d091e7f897ac82aaf29042beb8
(cherry picked from commit ca75deb7af290745680e8859a0f8da0770802f6e)

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 30 Jun 2016 03:28:30 +0000 (03:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 30 Jun 2016 03:12:28 +0000 (03:12 +0000)]
Import translations. DO NOT MERGE
am: ea1e82088e  -s ours

Change-Id: I442e044b8a5e2027a409feae9b597fae850d7979

7 years agoMerge "WiFiCallingSettings: "Update Emergency Address" shouldn't be disabled." into...
TreeHugger Robot [Thu, 30 Jun 2016 02:38:12 +0000 (02:38 +0000)]
Merge "WiFiCallingSettings: "Update Emergency Address" shouldn't be disabled." into nyc-mr1-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 30 Jun 2016 01:43:51 +0000 (18:43 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ibe485796993fc2bfad19b2da2ad0b7942a1fd460
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 30 Jun 2016 01:34:49 +0000 (18:34 -0700)]
Import translations. DO NOT MERGE

Change-Id: Idaf99e158ee704e8017b7cb832e7f2dda16ff7bd
Auto-generated-cl: translation import

7 years agoWiFiCallingSettings: "Update Emergency Address" shouldn't be disabled.
Meng Wang [Mon, 27 Jun 2016 23:26:33 +0000 (16:26 -0700)]
WiFiCallingSettings: "Update Emergency Address" shouldn't be disabled.

Bug: 29875773
Change-Id: I3a0277c865c12793ffd9039a9724a1a253b461c9

7 years agoFix ugly flash between boot animation and setup wizard (1/2)
Jorim Jaggi [Wed, 29 Jun 2016 23:33:39 +0000 (16:33 -0700)]
Fix ugly flash between boot animation and setup wizard (1/2)

When FallbackHome is displayed before the setup wizard, we need to
match the last frame of the boot animation in FallbackHome.

Bug: 29054814
Change-Id: I4f0096d398341c3749820177cebc26dea85cea05

7 years agoAdd text to the Manage Settings page to show freed storage.
Daniel Nishi [Fri, 24 Jun 2016 22:53:14 +0000 (15:53 -0700)]
Add text to the Manage Settings page to show freed storage.

Bug: 29643106
Change-Id: Id05dc70e36a690e27cab67fecf921257ed7baf15

7 years agoMerge "Update the deletion helper intent string." into nyc-mr1-dev
Daniel Nishi [Wed, 29 Jun 2016 21:37:05 +0000 (21:37 +0000)]
Merge "Update the deletion helper intent string." into nyc-mr1-dev

7 years agoMerge "UI Tweak: update setting dashboard cards background color." into nyc-mr1-dev
Fan Zhang [Wed, 29 Jun 2016 18:18:32 +0000 (18:18 +0000)]
Merge "UI Tweak: update setting dashboard cards background color." into nyc-mr1-dev

7 years agoMerge "Update listener for animation in Gesture Settings." into nyc-mr1-dev
Doris Ling [Wed, 29 Jun 2016 17:49:50 +0000 (17:49 +0000)]
Merge "Update listener for animation in Gesture Settings." into nyc-mr1-dev

7 years agoUpdate UI for support tab.
Fan Zhang [Wed, 29 Jun 2016 15:53:30 +0000 (08:53 -0700)]
Update UI for support tab.

Bug: 29397123
Bug: 29832054

- Increase spinner dropdown width to contain country names.
- Reduce suggestion counter's right padding.
- Tweak paddings in travel abroad phone dialog.
- Update icon and text for help&feedback / tips&tricks.

Change-Id: Ide52c6f8198d1a13a0fdeb000d7cb9e8c03688ca

7 years agoFix a bug where selected country is reset.
Fan Zhang [Wed, 29 Jun 2016 16:39:37 +0000 (09:39 -0700)]
Fix a bug where selected country is reset.

Bug: 29397123

Bug caused by a bad merge.

Change-Id: I6cf4ea8796f712b3d2d9354a9845e9e95eda69b9

7 years agoMerge "Setup up print settings fragments in onCreateView instead of onCreate." into...
Philip P. Moltmann [Wed, 29 Jun 2016 14:58:02 +0000 (14:58 +0000)]
Merge "Setup up print settings fragments in onCreateView instead of onCreate." into nyc-mr1-dev

7 years agoMerge "Lockdown settings in retail demo mode" into nyc-mr1-dev
Fyodor Kupolov [Tue, 28 Jun 2016 23:08:46 +0000 (23:08 +0000)]
Merge "Lockdown settings in retail demo mode" into nyc-mr1-dev

7 years agoMerge changes from topics 'offline_operation_hours_part5', 'offline_operation_hours_p...
TreeHugger Robot [Tue, 28 Jun 2016 19:20:02 +0000 (19:20 +0000)]
Merge changes from topics 'offline_operation_hours_part5', 'offline_operation_hours_part4' into nyc-mr1-dev

* changes:
  Show a static title/summary if country doesn't have support
  By default select current country in support phone list.

7 years agoUpdate listener for animation in Gesture Settings.
Doris Ling [Tue, 28 Jun 2016 18:55:20 +0000 (11:55 -0700)]
Update listener for animation in Gesture Settings.

Use onClick listener instead of onTouch listener for handling playback
for the animation video.

Bug: 29779942
Change-Id: Ia30c0c49635fedd7f5afd4873ed1971529b99dcc

7 years agoMerge "Show operation hours for selected country's support phone" into nyc-mr1-dev
Fan Zhang [Tue, 28 Jun 2016 18:10:31 +0000 (18:10 +0000)]
Merge "Show operation hours for selected country's support phone" into nyc-mr1-dev

7 years agoMerge "Show tolled support number when click travel abroad." into nyc-mr1-dev
Fan Zhang [Tue, 28 Jun 2016 18:07:52 +0000 (18:07 +0000)]
Merge "Show tolled support number when click travel abroad." into nyc-mr1-dev

7 years agoMerge "Update UI for Storage settings." into nyc-mr1-dev
Doris Ling [Tue, 28 Jun 2016 17:08:09 +0000 (17:08 +0000)]
Merge "Update UI for Storage settings." into nyc-mr1-dev

7 years agoUI Tweak: update setting dashboard cards background color.
Fan Zhang [Tue, 28 Jun 2016 01:09:18 +0000 (18:09 -0700)]
UI Tweak: update setting dashboard cards background color.

Bug: 29397123
Change-Id: Ie503fa6ae390db3c9e651d8b95e5c86f29bca46c

7 years agoMerge "Restore selected country when rotating screen." into nyc-mr1-dev
Fan Zhang [Tue, 28 Jun 2016 15:12:16 +0000 (15:12 +0000)]
Merge "Restore selected country when rotating screen." into nyc-mr1-dev

7 years agoMerge "Set message id in notification redaction activity" into nyc-mr1-dev
Ricky Wai [Tue, 28 Jun 2016 10:36:43 +0000 (10:36 +0000)]
Merge "Set message id in notification redaction activity" into nyc-mr1-dev

7 years agoMerge "Refresh screenlock UI after password verification failed" into nyc-mr1-dev
Ricky Wai [Tue, 28 Jun 2016 10:36:19 +0000 (10:36 +0000)]
Merge "Refresh screenlock UI after password verification failed" into nyc-mr1-dev

7 years agoShow a static title/summary if country doesn't have support
Fan Zhang [Mon, 27 Jun 2016 22:55:34 +0000 (15:55 -0700)]
Show a static title/summary if country doesn't have support

Bug: 29105266
Change-Id: I874fbb1172ab2faf9372362cf0e1f933046c621c

7 years agoBy default select current country in support phone list.
Fan Zhang [Mon, 27 Jun 2016 21:58:34 +0000 (14:58 -0700)]
By default select current country in support phone list.

Bug: 29105266
Change-Id: I78027e5c817aae5e2220bc974e03282d937c33c6

7 years agoShow operation hours for selected country's support phone
Fan Zhang [Fri, 24 Jun 2016 22:17:09 +0000 (15:17 -0700)]
Show operation hours for selected country's support phone

Bug: 28827790
Change-Id: Idddaefa33cf1a128b70c517b1acb61a2b7bab288

7 years agoShow tolled support number when click travel abroad.
Fan Zhang [Fri, 24 Jun 2016 18:33:35 +0000 (11:33 -0700)]
Show tolled support number when click travel abroad.

Bug: 29105266
Change-Id: I3020039bafe26e8a494075ad2f192dba07ab6dd0

7 years agoUpdate UI for Storage settings.
Doris Ling [Mon, 27 Jun 2016 21:23:17 +0000 (14:23 -0700)]
Update UI for Storage settings.

Change the text color for the used storage number to colorAccent and increase the
height of the storage bar graph to match that in Memory settings.

Bug: 29417812
Change-Id: I2a2f6a3fb39c4c23e51a8be8e6feefa101d74797

7 years agoSetup up print settings fragments in onCreateView instead of onCreate.
Philip P. Moltmann [Mon, 27 Jun 2016 20:45:25 +0000 (13:45 -0700)]
Setup up print settings fragments in onCreateView instead of onCreate.

Otherwise some of the layout is not yet set up.

Fixes: 29764546
Change-Id: Ia0716dd0603d66e8bf68494e426756bd553f1afd

7 years agoMerge "Update the OEM unlock preference summary to reflect the disable reason" into...
Steven Ng [Mon, 27 Jun 2016 19:14:37 +0000 (19:14 +0000)]
Merge "Update the OEM unlock preference summary to reflect the disable reason" into nyc-mr1-dev

7 years agoMerge "Disable "disable" button for the device provision app in the Settings app...
Steven Ng [Mon, 27 Jun 2016 18:50:00 +0000 (18:50 +0000)]
Merge "Disable "disable" button for the device provision app in the Settings app" into nyc-mr1-dev

7 years agoMerge \"Fix DND conditional null state\" into nyc-dev
Jason Monk [Mon, 27 Jun 2016 18:42:15 +0000 (18:42 +0000)]
Merge \"Fix DND conditional null state\" into nyc-dev
am: 733649c2fa

Change-Id: Icd64312b660dc1c098772f97731241a9c9a6032c

7 years agoMerge "Fix DND conditional null state" into nyc-dev
Jason Monk [Mon, 27 Jun 2016 18:36:21 +0000 (18:36 +0000)]
Merge "Fix DND conditional null state" into nyc-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 27 Jun 2016 17:50:21 +0000 (17:50 +0000)]
Import translations. DO NOT MERGE
am: 5a9f7d6c9a  -s ours

Change-Id: I5007277d9a3e980671925b717d4ae2376f1d37f7