Commit Graph

27286 Commits

Author SHA1 Message Date
TreeHugger Robot
9711521e3c Merge "Fix ugly flash between boot animation and setup wizard (1/2)" into nyc-mr1-dev 2016-06-30 22:58:09 +00:00
Daniel Nishi
8c8791a807 Merge "Add text to the Manage Settings page to show freed storage." into nyc-mr1-dev 2016-06-30 21:17:19 +00:00
Daniel Nishi
9a761788b0 Update strings to match the latest mocks.
Bug: 29877906
Change-Id: I96338cb42f8e53b0d642e1ad13064fa86cbdc5ba
2016-06-30 14:05:22 -07:00
Fan Zhang
016bd60491 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
2016-06-30 13:57:22 -07:00
Doris Ling
0a7300b8d1 Merge "Add help url for gestures settings." into nyc-mr1-dev 2016-06-30 19:59:21 +00:00
Doris Ling
ec208fdb8f Add help url for gestures settings.
Override getHelpResource() in GestureSettings and added corresponding
resource string for the help url.

Bug: 29792538
Change-Id: I2f2d93fc25b63266504bd13b954fefa5692e9ddf
2016-06-30 10:53:07 -07:00
Andrew Sapperstein
6e1336bff1 Merge "Fix some bluetooth theming issues." into nyc-mr1-dev 2016-06-30 17:17:19 +00:00
Jason Monk
fab3a5ba85 Pre-setup restrictions
- Don't let user settings run

Bug: 29194585
Change-Id: Ia9c46c7ba04ce2809304bebe8a4c5cdac2108611
2016-06-30 13:16:20 -04:00
Andrew Sapperstein
294469e09a 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
2016-06-30 10:01:59 -07:00
TreeHugger Robot
57824d5aaa Merge "Fix a bug where selected country is reset." into nyc-mr1-dev 2016-06-30 16:51:55 +00:00
Jason Monk
e6ad6e866b Pre-setup restrictions DO NOT MERGE
- Prevent external tiles from system apps
 - Don't let user settings run
 - Disable help

Bug: 29194585
Change-Id: I74ab8aaab62d62cc4dbbdf3164429a503f3a572b
2016-06-30 12:50:44 -04:00
Fan Zhang
0293fb40f2 Merge "Update UI for support tab." into nyc-mr1-dev 2016-06-30 15:22:02 +00:00
Robin Lee
07127d83a6 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 ca75deb7af)
2016-06-30 09:05:58 +00:00
TreeHugger Robot
ebed4797b1 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-30 03:28:31 +00:00
Bill Yi
6c22b54c97 Import translations. DO NOT MERGE
am: ea1e82088e  -s ours

Change-Id: I442e044b8a5e2027a409feae9b597fae850d7979
2016-06-30 03:12:28 +00:00
TreeHugger Robot
b831223dea Merge "WiFiCallingSettings: "Update Emergency Address" shouldn't be disabled." into nyc-mr1-dev 2016-06-30 02:38:12 +00:00
Bill Yi
f29de0854e Import translations. DO NOT MERGE
Change-Id: Ibe485796993fc2bfad19b2da2ad0b7942a1fd460
Auto-generated-cl: translation import
2016-06-29 18:43:51 -07:00
Bill Yi
ea1e82088e Import translations. DO NOT MERGE
Change-Id: Idaf99e158ee704e8017b7cb832e7f2dda16ff7bd
Auto-generated-cl: translation import
2016-06-29 18:34:49 -07:00
Meng Wang
b97b16da91 WiFiCallingSettings: "Update Emergency Address" shouldn't be disabled.
Bug: 29875773
Change-Id: I3a0277c865c12793ffd9039a9724a1a253b461c9
2016-06-29 18:07:55 -07:00
Jorim Jaggi
a616a0dd02 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
2016-06-29 16:57:33 -07:00
Daniel Nishi
1b9afaff2b Add text to the Manage Settings page to show freed storage.
Bug: 29643106
Change-Id: Id05dc70e36a690e27cab67fecf921257ed7baf15
2016-06-29 14:48:50 -07:00
Daniel Nishi
148a56f156 Merge "Update the deletion helper intent string." into nyc-mr1-dev 2016-06-29 21:37:08 +00:00
Fan Zhang
e5b195b37a Merge "UI Tweak: update setting dashboard cards background color." into nyc-mr1-dev 2016-06-29 18:18:33 +00:00
Doris Ling
b63679157b Merge "Update listener for animation in Gesture Settings." into nyc-mr1-dev 2016-06-29 17:49:50 +00:00
Fan Zhang
d89d60d9ca 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
2016-06-29 10:02:09 -07:00
Fan Zhang
242a7ef1e8 Fix a bug where selected country is reset.
Bug: 29397123

Bug caused by a bad merge.

Change-Id: I6cf4ea8796f712b3d2d9354a9845e9e95eda69b9
2016-06-29 09:39:37 -07:00
Philip P. Moltmann
0aad74a387 Merge "Setup up print settings fragments in onCreateView instead of onCreate." into nyc-mr1-dev 2016-06-29 14:58:03 +00:00
Fyodor Kupolov
cc1379bfea Merge "Lockdown settings in retail demo mode" into nyc-mr1-dev 2016-06-28 23:08:46 +00:00
TreeHugger Robot
734c550c59 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.
2016-06-28 19:20:03 +00:00
Doris Ling
5d1a512934 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
2016-06-28 11:55:20 -07:00
Fan Zhang
ab7a6cf828 Merge "Show operation hours for selected country's support phone" into nyc-mr1-dev 2016-06-28 18:10:32 +00:00
Fan Zhang
106ff4ff0c Merge "Show tolled support number when click travel abroad." into nyc-mr1-dev 2016-06-28 18:07:52 +00:00
Doris Ling
d65b27a02c Merge "Update UI for Storage settings." into nyc-mr1-dev 2016-06-28 17:08:09 +00:00
Fan Zhang
8f0a0ac8e7 UI Tweak: update setting dashboard cards background color.
Bug: 29397123
Change-Id: Ie503fa6ae390db3c9e651d8b95e5c86f29bca46c
2016-06-28 08:32:31 -07:00
Fan Zhang
53f5539b6b Merge "Restore selected country when rotating screen." into nyc-mr1-dev 2016-06-28 15:12:16 +00:00
Ricky Wai
a02e5f73ca Merge "Set message id in notification redaction activity" into nyc-mr1-dev 2016-06-28 10:36:43 +00:00
Ricky Wai
93071a4bc3 Merge "Refresh screenlock UI after password verification failed" into nyc-mr1-dev 2016-06-28 10:36:19 +00:00
Fan Zhang
2c9f35e98d Show a static title/summary if country doesn't have support
Bug: 29105266
Change-Id: I874fbb1172ab2faf9372362cf0e1f933046c621c
2016-06-27 17:38:03 -07:00
Fan Zhang
46da9be509 By default select current country in support phone list.
Bug: 29105266
Change-Id: I78027e5c817aae5e2220bc974e03282d937c33c6
2016-06-27 17:37:58 -07:00
Fan Zhang
2736ace057 Show operation hours for selected country's support phone
Bug: 28827790
Change-Id: Idddaefa33cf1a128b70c517b1acb61a2b7bab288
2016-06-27 15:56:20 -07:00
Fan Zhang
3737fabda4 Show tolled support number when click travel abroad.
Bug: 29105266
Change-Id: I3020039bafe26e8a494075ad2f192dba07ab6dd0
2016-06-27 15:56:20 -07:00
Doris Ling
05af648142 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
2016-06-27 14:23:17 -07:00
Philip P. Moltmann
23176395a5 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
2016-06-27 21:07:07 +00:00
Steven Ng
dbb8cab438 Merge "Update the OEM unlock preference summary to reflect the disable reason" into nyc-mr1-dev 2016-06-27 19:14:38 +00:00
Steven Ng
8aee45afb6 Merge "Disable "disable" button for the device provision app in the Settings app" into nyc-mr1-dev 2016-06-27 18:50:02 +00:00
Jason Monk
77fc052dd7 Merge \"Fix DND conditional null state\" into nyc-dev
am: 733649c2fa

Change-Id: Icd64312b660dc1c098772f97731241a9c9a6032c
2016-06-27 18:42:15 +00:00
Jason Monk
733649c2fa Merge "Fix DND conditional null state" into nyc-dev 2016-06-27 18:36:21 +00:00
Bill Yi
98fd2d2a82 Import translations. DO NOT MERGE
am: 5a9f7d6c9a  -s ours

Change-Id: I5007277d9a3e980671925b717d4ae2376f1d37f7
2016-06-27 17:50:21 +00:00
TreeHugger Robot
ee32cd8cd6 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-27 17:27:52 +00:00
Victor Chang
4ffd7552a3 Merge "Add explanatory text displayed when 'Always-on' switch is greyed-out for VPN apps w/targetSdk<24" into nyc-mr1-dev 2016-06-27 17:14:51 +00:00