Commit Graph

1708 Commits

Author SHA1 Message Date
Fan Zhang
fd82193e37 Merge \\"Show tolled support number when click travel abroad.\\" into nyc-mr1-dev am: 106ff4ff0c
am: 45eb3c04b5

Change-Id: I13303f7c82801212034dc2744adb009b6ce00e43
2016-06-28 18:16:26 +00:00
Fan Zhang
45eb3c04b5 Merge \"Show tolled support number when click travel abroad.\" into nyc-mr1-dev
am: 106ff4ff0c

Change-Id: I60c628afcc5d790a22a6baf9f90f9564f06d6b51
2016-06-28 18:13:19 +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
9dac14f9f4 Merge \\"Update UI for Storage settings.\\" into nyc-mr1-dev am: d65b27a02c
am: 007f83964c

Change-Id: I5b92608ccd6af6d2fccafdbe515ec424a108c4e9
2016-06-28 17:15:33 +00:00
Doris Ling
007f83964c Merge \"Update UI for Storage settings.\" into nyc-mr1-dev
am: d65b27a02c

Change-Id: I87a2a929604f6fda9f2805224fffebfddc15e44c
2016-06-28 17:12:34 +00:00
Doris Ling
d65b27a02c Merge "Update UI for Storage settings." into nyc-mr1-dev 2016-06-28 17:08:09 +00:00
Ricky Wai
c070e5e039 Merge \\"Set message id in notification redaction activity\\" into nyc-mr1-dev am: a02e5f73ca
am: fe1cb3ca19

Change-Id: I95f5659dc91872faff8b1261f25233dc8b55e79a
2016-06-28 10:45:30 +00:00
Ricky Wai
fe1cb3ca19 Merge \"Set message id in notification redaction activity\" into nyc-mr1-dev
am: a02e5f73ca

Change-Id: Ia3593ca0a8d64da4efd09cf3c614e028d67e4189
2016-06-28 10:42:07 +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
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
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
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
Doris Ling
8661620b3a Merge "Update UI for the Gestures settings." into nyc-mr1-dev 2016-06-27 17:08:30 +00: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
Ricky Wai
3029bb9eb7 Set message id in notification redaction activity
Bug: 29633162
Change-Id: I803789ba719d4f40629a8da49b47cf4548c072f0
2016-06-27 15:02:19 +01: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
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
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
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
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
bdbd9e43d1 Merge \"Add play icon to the gesture settings videos.\" into nyc-mr1-dev
am: 9ca0e6cc86

Change-Id: I542d48564a52b2ae7dd8497cdebde19086fe53bb
2016-06-21 19:04:29 +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
5b66e143cc Update Settings to use DeviceDefault.Settings.
BUG: 28625050

Change-Id: Id283703a309cf27bb284147421614196e903c660
2016-06-21 11:23:39 -07:00
Jason Monk
0ceacec553 Fix focusability of battery history chart am: 9c6ab88bd7 am: b363eb89bc
am: b6af413f8b

Change-Id: I160a01e21771ba120b646cff796a1539216de9db
2016-06-20 17:57:05 +00:00
Jason Monk
b6af413f8b Fix focusability of battery history chart am: 9c6ab88bd7
am: b363eb89bc

Change-Id: Ibdb83d13677d9101264593e2220b9d18fc261fc9
2016-06-20 17:38:19 +00: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
Jason Monk
b363eb89bc Fix focusability of battery history chart
am: 9c6ab88bd7

Change-Id: I8239280074c191c98414e57c0c915463ade9ec9c
2016-06-20 17:29:24 +00:00
Fan Zhang
461b286de7 Merge \"Add a \"Do not show\" checkbox in support disclaimer dialog.\" into nyc-mr1-dev
am: d04b49649e

Change-Id: I25ff49cb0ce6ab6cb4cfb35aef254d3881e343e1
2016-06-20 17:25:45 +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
Jason Monk
9c6ab88bd7 Fix focusability of battery history chart
Change-Id: I0bd0da84a08ed6e3c51da3dc6a68e878c5c0d3cd
Fixes: 29453492
2016-06-20 11:04:43 -04: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
Adrian Roos
6f23c0493a resolve merge conflicts of 380b01a to nyc-mr1-dev-plus-aosp
am: fa2bbcc288

Change-Id: Ia76e98cf5b8a94a36d77a326ce37bf31ae34a3bb
2016-06-17 18:55:31 +00: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
Adrian Roos
fa2bbcc288 resolve merge conflicts of 380b01a to nyc-mr1-dev-plus-aosp
Change-Id: If97f5d5b4d67177b8160b96894a35d685573c46a
2016-06-16 18:58:04 -07:00
Adrian Roos
bd470255d0 resolve merge conflicts of 333ba2d to nyc-mr1-dev
Change-Id: I32f284bb2216755ae0ddbea4b7fc76a38c7aa7e2
2016-06-16 18:54:50 -07:00
Adrian Roos
380b01a00e Merge \"Remove RemoteInput on lockscreen setting\" into nyc-dev
am: 333ba2df01

Change-Id: Ib9419acf4b09dd17fd15b53d32ce4616cbec94fa
2016-06-16 23:41:25 +00:00
Maurice Lam
47e38646ed Merge \"Use GLIF theme for Settings > Security > Screen lock\" into nyc-mr1-dev
am: 223d45ea0e

Change-Id: Idc5b5b2e59f7753e226878a2d3838fd8f61a19cd
2016-06-16 22:10:10 +00:00
Adrian Roos
38e4e5dca6 Remove RemoteInput on lockscreen setting
Bug: 29370898
Change-Id: I6fef3deb55357e8569e023968967663582974f79
2016-06-16 13:29:11 -07:00