Commit Graph

15074 Commits

Author SHA1 Message Date
Pavel Zhamaitsiak
e2f59b90ad Hide WFC settings if WFC is not provisioned (and provisioning is required)
Bug: 29223318
Change-Id: Ic927e742d84f55ea411a0d034fc1caac72ee58e7
2016-06-20 17:52:48 -07:00
Julia Reynolds
8dc40b87a7 Merge \\\"Fix NPE printing notification actions.\\\" into nyc-dev am: 43b04bcc7d am: 018444ab61
am: 4606b359e9

Change-Id: I221d2967735e7867969bd5aa038f935168dc25e3
2016-06-20 19:20:17 +00:00
Julia Reynolds
4606b359e9 Merge \\"Fix NPE printing notification actions.\\" into nyc-dev am: 43b04bcc7d
am: 018444ab61

Change-Id: I1946b95fd5ccf8e4506b452998c478c2781d3e3a
2016-06-20 19:12:14 +00:00
Julia Reynolds
018444ab61 Merge \"Fix NPE printing notification actions.\" into nyc-dev
am: 43b04bcc7d

Change-Id: I427adea08ff2a9f50c0d54329ae1b5adcca508c8
2016-06-20 19:08:43 +00:00
Julia Reynolds
07e85aa5c0 Merge \"Fix NPE printing notification actions.\" into nyc-dev
am: 43b04bcc7d

Change-Id: I2763437122129654485c80b7652729526042321a
2016-06-20 18:58:07 +00: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
ab2e0390a0 Log button taps in support tab.
Bug: 29282762
Change-Id: I7d573f95450292840413cb5e266915f64f6d667d
2016-06-20 10:26:20 -07: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
Julia Reynolds
9bcc04c5db Fix NPE printing notification actions.
Change-Id: Icb52e7bc632bf7109a75a7695fb253b2183e7360
Fixes: 29017025
2016-06-20 10:23:44 -04:00
Meng Wang
ffb4f8a058 Merge \\"Hide \\'Update Emergecy Address\\' preference w/o carrier support\\" into nyc-mr1-dev am: 2a817d97fe
am: 8008dee36c

Change-Id: I5551238b5fc0eee189c0183aec7d7addacad678c
2016-06-18 04:15:55 +00:00
Meng Wang
8008dee36c Merge \"Hide \'Update Emergecy Address\' preference w/o carrier support\" into nyc-mr1-dev
am: 2a817d97fe

Change-Id: Iccf8008b7a818bf8327e8e53632326dd0dc41982
2016-06-18 04:12:40 +00:00
TreeHugger Robot
2a817d97fe Merge "Hide 'Update Emergecy Address' preference w/o carrier support" into nyc-mr1-dev 2016-06-18 04:02:49 +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
39d2e1f916 resolve merge conflicts of 057f4ae to master
Change-Id: I609b04b174195b2396ee5918990b03d737ad0067
2016-06-17 15:40:48 -07:00
Fan Zhang
057f4ae6cc Merge \"Use metrics defined by proto in new Settings tabs.\" into nyc-mr1-dev
am: b2728f51fb

Change-Id: I4dceebf40bc15302d2fea43cc733c64a04ca2fea
2016-06-17 20:20:54 +00:00
Fan Zhang
b2728f51fb Merge "Use metrics defined by proto in new Settings tabs." into nyc-mr1-dev 2016-06-17 20:15:48 +00: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
Doris Ling
a617c80bac Merge \\"Add handling for fingerprint swipe in gesture settings.\\" into nyc-mr1-dev am: b458f46438
am: 6bf5f1e84a

Change-Id: Ida043d486ab1ebb1173f076a9476baf34102ed2b
2016-06-17 18:56:11 +00:00
Jason Monk
60aac91c64 Merge \\\"Protect against crash in memory details\\\" into nyc-dev am: c3ec1ab889 am: 989a52dc8d
am: 07e52aeb1c

Change-Id: I601ba95f6bab1cf53e56a866300dae96d0b9f4d5
2016-06-17 18:55:34 +00:00
Jason Monk
0a96193e46 Make sure screen pinning desc is part of view hierarchy am: 0c2ccba2f9 am: 11bad8d93e
am: ac0b7dd4e7

Change-Id: I1c42b58359636987aec1c430bbec94f7c34250b8
2016-06-17 18:55:33 +00: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
Ajay Kumar Nadathur Sreenivasan
53bded5da2 Merge \\"[SetupWizard] Fix talkback on lock screen.\\" into nyc-mr1-dev am: eddcd7d085
am: 10c74d81df

Change-Id: Iae70d32d3af03888e02e4ba67fef9486e723329a
2016-06-17 18:54:54 +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
Yohei Yukawa
887b19d846 Merge \\\"Teach hard keyboard settings about correct user ID\\\" into nyc-dev am: db6f1f2cb5 am: 75778049ba
am: a95348d6c1

Change-Id: I5c922c8cb5f51bb9072b6c1802ca789ce6a6975b
2016-06-17 18:54:48 +00:00
Doris Ling
6bf5f1e84a Merge \"Add handling for fingerprint swipe in gesture settings.\" into nyc-mr1-dev
am: b458f46438

Change-Id: I3ad94884053f7d3788c06ef7d75b4f40f7b46758
2016-06-17 18:20:38 +00:00
Doris Ling
b458f46438 Merge "Add handling for fingerprint swipe in gesture settings." into nyc-mr1-dev 2016-06-17 18:15:58 +00:00
Jason Monk
ca26435ca0 Merge \"Protect against crash in memory details\" into nyc-dev
am: c3ec1ab889

Change-Id: If36b3350e0694ffae3086be9307295c4516828dd
2016-06-17 17:52:01 +00:00
Jason Monk
2ca05240fd Make sure screen pinning desc is part of view hierarchy
am: 0c2ccba2f9

Change-Id: Iac6d8d4df22fb8e32e61ad25aed06e079d1fa348
2016-06-17 17:52:01 +00:00
Jason Monk
07e52aeb1c Merge \\"Protect against crash in memory details\\" into nyc-dev am: c3ec1ab889
am: 989a52dc8d

Change-Id: I09960da265e426c58fc651d3c9b932f20633f1fb
2016-06-17 17:47:25 +00:00
Jason Monk
ac0b7dd4e7 Make sure screen pinning desc is part of view hierarchy am: 0c2ccba2f9
am: 11bad8d93e

Change-Id: I1235d2ae35600c71f92d69f1f4475a3b70efeef1
2016-06-17 17:47:25 +00:00
Jason Monk
989a52dc8d Merge \"Protect against crash in memory details\" into nyc-dev
am: c3ec1ab889

Change-Id: I64ec49c820c21971056b342908a1e0c33d394d72
2016-06-17 17:44:25 +00:00
Jason Monk
11bad8d93e Make sure screen pinning desc is part of view hierarchy
am: 0c2ccba2f9

Change-Id: I20e98baa0be229a72673ef18eccd35bc713f75ad
2016-06-17 17:44:25 +00:00
Jason Monk
c3ec1ab889 Merge "Protect against crash in memory details" into nyc-dev 2016-06-17 17:22:03 +00:00
Jason Monk
7a19965c9f Protect against crash in memory details
Change-Id: Ie80efa04d0c6bc9c117802e5a7018d448f4dc7b8
Fixes: 29308942
2016-06-17 10:12:37 -04:00
Jason Monk
0c2ccba2f9 Make sure screen pinning desc is part of view hierarchy
Change-Id: I2c2e25e129d8530512e1a1f4ee6a7483b5322286
Fixes: 29243233
2016-06-17 10:05:06 -04: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
Ajay Nadathur
10c74d81df Merge \"[SetupWizard] Fix talkback on lock screen.\" into nyc-mr1-dev
am: eddcd7d085

Change-Id: I8b4780b65a3088b3b7937d9c88326ace67a9e90d
2016-06-17 01:45:44 +00:00
Ajay Kumar Nadathur Sreenivasan
eddcd7d085 Merge "[SetupWizard] Fix talkback on lock screen." into nyc-mr1-dev 2016-06-17 01:18:00 +00:00
Meng Wang
184753f64f Hide 'Update Emergecy Address' preference w/o carrier support
Bug: 29256401
Change-Id: I59f9d6192d39e2a259e3f2cbee641335d5b8b8d7
2016-06-16 17:32:20 -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
Adrian Roos
333ba2df01 Merge "Remove RemoteInput on lockscreen setting" into nyc-dev 2016-06-16 23:33:56 +00:00
Fan Zhang
37d4d0c80e Use metrics defined by proto in new Settings tabs.
Bug: 28141203
Change-Id: Ia0c566f873f93e46203d19f35161bb98acc60a38
2016-06-16 16:24:20 -07: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
Maurice Lam
223d45ea0e Merge "Use GLIF theme for Settings > Security > Screen lock" into nyc-mr1-dev 2016-06-16 22:00:20 +00:00
Yohei Yukawa
a95348d6c1 Merge \\"Teach hard keyboard settings about correct user ID\\" into nyc-dev am: db6f1f2cb5
am: 75778049ba

Change-Id: Icdf0a2e5bbc18f02a642c0ee9cbea61fcf08c6bb
2016-06-16 21:46:49 +00:00
Ajay Nadathur
7dfa323c81 [SetupWizard] Fix talkback on lock screen.
- On volantis, talkback will now speak 'Protect your tablet' instead of
  'Choose screen lock'

Testing:
-------
 - Tested and verified on volantis

Change-Id: If010ab8f3fcd107b99294081765a52e98ed8cc1f
2016-06-16 14:42:22 -07:00