Commit Graph

10728 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
732418cc07 Merge \"Update the OEM unlock preference summary to reflect the disable reason\" into nyc-mr1-dev
am: dbb8cab438

Change-Id: Ib90a577fdef5fad79c0bf84b8b50d35f2ff688ed
2016-06-27 19:20:10 +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
TreeHugger Robot
43703b78bd Merge "Import translations. DO NOT MERGE" 2016-06-27 17:28:58 +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
8dc82cb436 Merge \"Add explanatory text displayed when \'Always-on\' switch is greyed-out for VPN apps w/targetSdk<24\" into nyc-mr1-dev
am: 4ffd7552a3

Change-Id: Id90c39eba4f3ce589dd29fe59177f45e7b684c2f
2016-06-27 17:19:41 +00:00
Doris Ling
fe4481899e Merge \"Update UI for the Gestures settings.\" into nyc-mr1-dev
am: 8661620b3a

Change-Id: I9391b922b539cd1d096389c671634f700831ae62
2016-06-27 17:19:40 +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
d2b3809cae Merge \"When offline show a list of countries with phone support.\" into nyc-mr1-dev
am: e9fcb2c930

Change-Id: Ic97ecb3c2da78209e58b4a01f5adfbb23d32b32f
2016-06-27 15:48:27 +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
Bill Yi
e016863c33 Import translations. DO NOT MERGE
Change-Id: I2d819a9b21bbfb288820594955e7b17be7c78e61
Auto-generated-cl: translation import
2016-06-27 07:43:13 -07:00
Ricky Wai
3029bb9eb7 Set message id in notification redaction activity
Bug: 29633162
Change-Id: I803789ba719d4f40629a8da49b47cf4548c072f0
2016-06-27 15:02:19 +01:00
Bill Yi
cfc13dd889 Import translations. DO NOT MERGE
Change-Id: I0a563c30d5cc2265c446a4c5c8651821044f73d1
Auto-generated-cl: translation import
2016-06-27 06:58:29 -07: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
Maurice Lam
ff56688d64 Merge \"Remove setup specific FP find sensor layout\" into nyc-mr1-dev
am: 17eb2e2ec4

Change-Id: I9914bce9a3c8e4f7e87692a27df87bd2d6532a1a
2016-06-25 01:35:26 +00:00
Maurice Lam
17eb2e2ec4 Merge "Remove setup specific FP find sensor layout" into nyc-mr1-dev 2016-06-25 01:28:42 +00:00
Evan Rosky
c3efefb027 Merge "Option to hide swipe method" 2016-06-24 21:36: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
TreeHugger Robot
9439574d34 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-24 06:32:53 +00:00
TreeHugger Robot
6514567bfb Merge "Import translations. DO NOT MERGE" 2016-06-24 05:51:00 +00:00
Bill Yi
94e8b660ad Import translations. DO NOT MERGE
Change-Id: I34aedbc52d5223b977ea7ef5899a54bae1bbf51a
Auto-generated-cl: translation import
2016-06-23 22:11:31 -07:00
Bill Yi
dedb3c54d5 Import translations. DO NOT MERGE
Change-Id: Id00cbd78f8d8c7e508811a30afac4d73a9fc6d2b
Auto-generated-cl: translation import
2016-06-23 21:27:14 -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
5edd0b945c Merge \"Use colorSecondary for switch bar backgrounds.\" into nyc-mr1-dev
am: da926355c0

Change-Id: I0f5a0fe312bb922ddeb709e1bf480f2d03fcd27d
2016-06-23 18:45:03 +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
6485952e26 Merge \"Display operation hours when support is closed.\" into nyc-mr1-dev
am: c3a0a18f77

Change-Id: I85feefab029eeb7e7101ec7f25e28d3653b07852
2016-06-23 17:38:23 +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
e91548ab38 Re-add a string to fix a build breakage.
am: be42f8bb61

Change-Id: I569479a635f407427a1877724d25101dde77602f
2016-06-23 01:48:55 +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
4938a9a470 Merge \"Remove the Deletion Helper and Automatic Storage Management jobs.\" into nyc-mr1-dev
am: de17410d37

Change-Id: I8b7cc9e6b3f6579f0ea0ebca827967a39a562697
2016-06-22 23:59:02 +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
078f579871 Merge \"Add Debug Toggles for Video and WiFI Calling Provisioning\" into nyc-mr1-dev
am: d63c3e7854

Change-Id: I64b93ca2cd6faef81023c6b196cac16a09c247b4
2016-06-22 23:26:50 +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
61c34c0556 Merge \"Update Settings to use DeviceDefault.Settings.\" into nyc-mr1-dev
am: 70ff5f8fa1

Change-Id: I3b556a3f7b0146deadf59b7c8fb244580b060fdf
2016-06-21 23:49:59 +00:00
Andrew Sapperstein
70ff5f8fa1 Merge "Update Settings to use DeviceDefault.Settings." into nyc-mr1-dev 2016-06-21 23:02:13 +00:00