Commit Graph

3828 Commits

Author SHA1 Message Date
Steven Ng
c5ba27b885 Merge \\"Update the OEM unlock preference summary to reflect the disable reason\\" into nyc-mr1-dev am: dbb8cab438
am: 732418cc07

Change-Id: I7a72b986dfa509a0aebc902ed9081f8ef6f3fdaa
2016-06-27 19:24:22 +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
Victor Chang
2d97a6a9fe Merge \\"Add explanatory text displayed when \\'Always-on\\' switch is greyed-out for VPN apps w/targetSdk<24\\" into nyc-mr1-dev am: 4ffd7552a3
am: 8dc82cb436

Change-Id: I826f79e845be20f687b96ba5ba551da13422fcee
2016-06-27 17:51:30 +00:00
Doris Ling
68da9b2f34 Merge \\"Update UI for the Gestures settings.\\" into nyc-mr1-dev am: 8661620b3a
am: fe4481899e

Change-Id: I073d6e7dbdd0cd6eb93fc4ba1b2dde3826b43bdb
2016-06-27 17:51:29 +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
Doris Ling
8661620b3a Merge "Update UI for the Gestures settings." into nyc-mr1-dev 2016-06-27 17:08:30 +00:00
Victor Chang
52247f69a5 Add explanatory text displayed when 'Always-on' switch is greyed-out for VPN apps w/targetSdk<24
Bug: 28413917
Change-Id: I3e7c079b4f91c02e5d0c0e8fda4ac6775dd0247b
2016-06-27 18:07:35 +01:00
Fan Zhang
990208aeed Merge \\"When offline show a list of countries with phone support.\\" into nyc-mr1-dev am: e9fcb2c930
am: d2b3809cae

Change-Id: I249439dfc1547b27d51bffae6ddacbac78526fd9
2016-06-27 15:52:22 +00:00
Fan Zhang
e9fcb2c930 Merge "When offline show a list of countries with phone support." into nyc-mr1-dev 2016-06-27 15:45:54 +00:00
Maurice Lam
a15b20a29c Merge \\"Remove setup specific FP find sensor layout\\" into nyc-mr1-dev am: 17eb2e2ec4
am: ff56688d64

Change-Id: Id3ef77e9f083efbbb33bbb22650c52fb9a7e0a4e
2016-06-25 01:38:39 +00:00
Fan Zhang
a44b1efbdc When offline show a list of countries with phone support.
Bug: 29105266

TODO:
- Support phones UI for international travel
- Selecting default country
- Show operation hours for selected country

Change-Id: I08a6780497dfcb9b9dc8670f2705d01df021c57b
2016-06-24 14:02:30 -07:00
Doris Ling
b4d41d8c71 Update UI for the Gestures settings.
1. Remove list divider
2. Set title background color to white
3. Set color filter on animation preview so that its color matches the
color of the video.

Bug: 28565958
Change-Id: I496915ebdb8e358a0f7682f6075d32a04d8d358a
2016-06-24 13:54:47 -07:00
Maurice Lam
204af97eb0 Remove setup specific FP find sensor layout
Remove the setup variant layout of fingerprint find sensor, because
the regular one is also GLIF themed, and positions the graphic
correctly.

Bug: 29421687
Change-Id: I20dee43c657434f63e73b5c32eb9a492d6786de5
2016-06-23 20:30:52 -07:00
Evan Rosky
bb70e4f696 Option to hide swipe method
Bug: 27502832
Change-Id: Ia61b63279fa6f831fdfa9209747b0cbcbf807d50
2016-06-23 19:51:26 +00:00
Andrew Sapperstein
90d2b0065a Merge \\"Use colorSecondary for switch bar backgrounds.\\" into nyc-mr1-dev am: da926355c0
am: 5edd0b945c

Change-Id: I278085d32cc6a2481f95a334e18af02a895ddda8
2016-06-23 19:10:04 +00:00
Andrew Sapperstein
da926355c0 Merge "Use colorSecondary for switch bar backgrounds." into nyc-mr1-dev 2016-06-23 18:37:42 +00:00
Fan Zhang
121b4d04a5 Merge \\"Display operation hours when support is closed.\\" into nyc-mr1-dev am: c3a0a18f77
am: 6485952e26

Change-Id: Ia66d9982a4cbdd6b3b2d5d45766dcb0cb446a34a
2016-06-23 17:44:38 +00:00
Fan Zhang
c3a0a18f77 Merge "Display operation hours when support is closed." into nyc-mr1-dev 2016-06-23 17:27:11 +00:00
Steven Ng
0998abfc8f Update the OEM unlock preference summary to reflect the disable reason
3 cases implemented:
1) Bootloader unlocked
2) Device SIM-locked
3) Device Configuration, such as SIM-lock, has not been retrieved.

Bug: 29047618
Change-Id: Idf5cc1c9b1d105a0efd408cc2aa0e229e874442e
2016-06-23 10:21:05 +01:00
Daniel Nishi
53bbada296 Re-add a string to fix a build breakage. am: be42f8bb61
am: e91548ab38

Change-Id: I6986367b31361d74e0efbd41d79da735cd555c24
2016-06-23 01:51:32 +00:00
Daniel Nishi
be42f8bb61 Re-add a string to fix a build breakage.
Change-Id: I079a5643634ffbf68f9414c639a9aba4a8a67d75
2016-06-22 18:41:04 -07:00
Daniel Nishi
b4a6067d66 Merge \\"Remove the Deletion Helper and Automatic Storage Management jobs.\\" into nyc-mr1-dev am: de17410d37
am: 4938a9a470

Change-Id: If4f17948cef697c6bc4cb0306a7506eb445f49d7
2016-06-23 00:05:43 +00:00
Daniel Nishi
de17410d37 Merge "Remove the Deletion Helper and Automatic Storage Management jobs." into nyc-mr1-dev 2016-06-22 23:52:23 +00:00
Nathan Harold
177f93eefb Merge \\"Add Debug Toggles for Video and WiFI Calling Provisioning\\" into nyc-mr1-dev am: d63c3e7854
am: 078f579871

Change-Id: Icb79d5f9d1236fde5884a1332d7d19664f6439b5
2016-06-22 23:29:21 +00:00
Nathan Harold
d63c3e7854 Merge "Add Debug Toggles for Video and WiFI Calling Provisioning" into nyc-mr1-dev 2016-06-22 23:20:09 +00:00
Fan Zhang
0bc42ab618 Display operation hours when support is closed.
Bug: 29105266
Change-Id: Id451b1aa820961fad4ece07fde5782a5aecaee68
2016-06-22 09:26:49 -07:00
Andrew Sapperstein
084322e4ee Merge \\"Update Settings to use DeviceDefault.Settings.\\" into nyc-mr1-dev am: 70ff5f8fa1
am: 61c34c0556

Change-Id: I765efb2be73d4791cac1f53d491efb533bbbe20e
2016-06-22 00:55:25 +00:00
Andrew Sapperstein
70ff5f8fa1 Merge "Update Settings to use DeviceDefault.Settings." into nyc-mr1-dev 2016-06-21 23:02:13 +00:00
Doris Ling
2d1def707f Merge \\"Add play icon to the gesture settings videos.\\" into nyc-mr1-dev am: 9ca0e6cc86
am: bdbd9e43d1

Change-Id: Icf9183067c66f8cb69a4c5804a62d3b0d0dd5f75
2016-06-21 19:07:11 +00:00
Doris Ling
9ca0e6cc86 Merge "Add play icon to the gesture settings videos." into nyc-mr1-dev 2016-06-21 18:55:54 +00:00
Andrew Sapperstein
e300b0fc1c Use colorSecondary for switch bar backgrounds.
Delete the private version in favor of using the platform's.

BUG: 28625050
Change-Id: I6bf0a13e5018f48f32a26a38307c30cf1aee0619
2016-06-21 11:50:20 -07:00
Andrew Sapperstein
5b66e143cc Update Settings to use DeviceDefault.Settings.
BUG: 28625050

Change-Id: Id283703a309cf27bb284147421614196e903c660
2016-06-21 11:23:39 -07:00
Fan Zhang
3b50d91ee9 Merge \\"Enable/disable support buttons based on operation hours.\\" into nyc-mr1-dev am: a00e3b78de
am: e4d1e73c87

Change-Id: I546c045c59316872907b41143a10c9482eca6e6a
2016-06-21 17:31:23 +00:00
Daniel Nishi
aad643caf2 Remove the Deletion Helper and Automatic Storage Management jobs.
The automatic storage management settings have been left in place
and updated to use the intent to get into the deletion helper.

Bug: 28965462
Change-Id: I736c8e741b519eceb89075b74d42b38c3aa5d0f4
2016-06-21 10:00:52 -07:00
Fan Zhang
841b13ac98 Enable/disable support buttons based on operation hours.
Also update support title based on whether support operation is
available.

Bug: 28827790
Change-Id: I65eb70d18ba16ccc263bce019fcbbe5e10ffa596
2016-06-20 11:18:51 -07:00
Fan Zhang
a659b1110a Merge \\"Add a \\"Do not show\\" checkbox in support disclaimer dialog.\\" into nyc-mr1-dev am: d04b49649e
am: 461b286de7

Change-Id: I7e06d1fe4be7d74b5a330be164d57f253b1a511f
2016-06-20 17:36:22 +00:00
Fan Zhang
d04b49649e Merge "Add a "Do not show" checkbox in support disclaimer dialog." into nyc-mr1-dev 2016-06-20 16:35:52 +00:00
Nathan Harold
12e1f55e92 Add Debug Toggles for Video and WiFI Calling Provisioning
-Add a debug toggle for Video Calling Provisioning
-Add a debug toggle for WiFi Calling Provisioning

Change-Id: I0cf3861ceabda48295181347b8997a2c8212de27
2016-06-17 19:09:33 -07:00
Doris Ling
f5cecb08fb Add play icon to the gesture settings videos.
1. Add a play button icon to show on top of the gesture videos when the
video is not playing.
2. Dynamically split the gesture video and description text in half
instead of using the hard coded value.
3. Hide the video view if animation is not available.
4. Delay removing the animation preview till the video starts drawing on
the surface texture.

Bug: 28565958
Change-Id: I8b954828d16286014404172d29efa4d2e00432b3
2016-06-17 17:53:35 -07:00
Fan Zhang
0beb695999 Add a "Do not show" checkbox in support disclaimer dialog.
Bug: 28762823
Change-Id: I8fe0a82efbb47c8b2f9e34480005fa108583b203
2016-06-17 12:56:35 -07:00
Maurice Lam
f438a1a423 Merge \\"Use GLIF theme for Settings > Security > Screen lock\\" into nyc-mr1-dev am: 223d45ea0e
am: 47e38646ed

Change-Id: If8a44dee9ba11281c9cc62b16b3599655c94724a
2016-06-17 18:54:51 +00:00
Maurice Lam
223d45ea0e Merge "Use GLIF theme for Settings > Security > Screen lock" into nyc-mr1-dev 2016-06-16 22:00:20 +00:00
Doris Ling
32d530d6cd Merge \\"Update gesture related settings in Display.\\" into nyc-mr1-dev am: 600a1eeec5
am: 6dc50f9de6

Change-Id: Id70a7c59d2d1df013d92ed93ea9307d80663c6d0
2016-06-16 19:17:44 +00:00
Maurice Lam
d189ac52a4 Use GLIF theme for Settings > Security > Screen lock
Bug: 24405946
Change-Id: I1fed96cbc228b6bb367637f83f9cd3bac2761417
2016-06-16 12:13:11 -07:00
Doris Ling
600a1eeec5 Merge "Update gesture related settings in Display." into nyc-mr1-dev 2016-06-16 18:52:31 +00:00
Doris Ling
d0c8fd724d Update gesture related settings in Display.
1. Remove "Press power button twice for camera. Toggle is now available
in Settings->Gestures.
2. Remove toggle from "Ambient Display" and make it point to
Settings->Gestures->Quick screen check.

Bug: 28565958
Change-Id: I32fd2253a40be76ac9843a627df153eb4f1307d8
2016-06-16 10:23:49 -07:00
Daniel Nishi
79b0925231 Merge \\"Show storage manager settings using a system property.\\" into nyc-mr1-dev am: 3d040e55d9
am: 4765fd9a4b

Change-Id: Id9137b84563bcd580c43a986fdb05f00f38150e5
2016-06-15 23:22:35 +00:00
Daniel Nishi
3d040e55d9 Merge "Show storage manager settings using a system property." into nyc-mr1-dev 2016-06-15 22:14:09 +00:00
Maurice Lam
e4f9b74924 resolve merge conflicts of c8466a3 to master
Change-Id: I2fce0f0eaa70bb5196faee0143dfbfbcc93659fa
2016-06-15 11:26:32 -07:00
Maurice Lam
45eb105f93 Merge \\"Fingerprint string updates\\" into nyc-mr1-dev am: e33872772c
am: b2f98a37c0

Change-Id: Iac3e46a38cee0463eeaa4d2515d634236b4afef8
2016-06-15 18:16:05 +00:00