Dan Sandler
29ebf7f779
Merge \\\"Show \\\"0\\\" instead of \\\"0 B\\\" in storage settings.\\\" into nyc-dev am: 87fcf9e95f am: 7df9a28fdb
...
am: 92e908b68e
2016-06-21 18:36:28 +00:00
Daniel Sandler
92e908b68e
Merge \\"Show \\"0\\" instead of \\"0 B\\" in storage settings.\\" into nyc-dev am: 87fcf9e95f
...
am: 7df9a28fdb
2016-06-21 18:28:35 +00:00
Dan Sandler
7df9a28fdb
Merge \"Show \"0\" instead of \"0 B\" in storage settings.\" into nyc-dev
...
am: 87fcf9e95f
2016-06-21 18:17:08 +00:00
Pavel Zhamaitsiak
646cb279b5
Merge \\"Hide WFC settings if WFC is not provisioned (and provisioning is required)\\" into nyc-mr1-dev am: 4f3a7589bc
...
am: 7fffd051fa
2016-06-21 18:12:07 +00:00
Daniel Sandler
87fcf9e95f
Merge "Show "0" instead of "0 B" in storage settings." into nyc-dev
2016-06-21 18:11:11 +00:00
Pavel Zhamaitsiak
7fffd051fa
Merge \"Hide WFC settings if WFC is not provisioned (and provisioning is required)\" into nyc-mr1-dev
...
am: 4f3a7589bc
2016-06-21 18:09:07 +00:00
TreeHugger Robot
4f3a7589bc
Merge "Hide WFC settings if WFC is not provisioned (and provisioning is required)" into nyc-mr1-dev
2016-06-21 17:58:26 +00:00
Fan Zhang
3b50d91ee9
Merge \\"Enable/disable support buttons based on operation hours.\\" into nyc-mr1-dev am: a00e3b78de
...
am: e4d1e73c87
2016-06-21 17:31:23 +00:00
Fan Zhang
e4d1e73c87
Merge \"Enable/disable support buttons based on operation hours.\" into nyc-mr1-dev
...
am: a00e3b78de
2016-06-21 17:27:31 +00:00
Fan Zhang
a00e3b78de
Merge "Enable/disable support buttons based on operation hours." into nyc-mr1-dev
2016-06-21 17:21:07 +00:00
Zoltan Szatmary-Ban
cf945c47d2
Fix non-app non-user preferences in Settings > Data usage am: afea1cae25 am: 63170fbf7a
...
am: 3b629c6918
2016-06-21 15:57:49 +00:00
Zoltan Szatmary-Ban
e341462a50
Fix non-app non-user preferences in Settings > Data usage
...
am: afea1cae25
2016-06-21 15:57:08 +00:00
Zoltan Szatmary-Ban
3b629c6918
Fix non-app non-user preferences in Settings > Data usage am: afea1cae25
...
am: 63170fbf7a
2016-06-21 15:55:07 +00:00
Zoltan Szatmary-Ban
63170fbf7a
Fix non-app non-user preferences in Settings > Data usage
...
am: afea1cae25
2016-06-21 15:52:33 +00:00
Fan Zhang
881685d6d1
Merge \\"Log button taps in support tab.\\" into nyc-mr1-dev am: a2fe136837
...
am: 1b6d911793
2016-06-21 15:47:29 +00:00
Fan Zhang
1b6d911793
Merge \"Log button taps in support tab.\" into nyc-mr1-dev
...
am: a2fe136837
2016-06-21 15:35:07 +00:00
Fan Zhang
a2fe136837
Merge "Log button taps in support tab." into nyc-mr1-dev
2016-06-21 15:28:31 +00:00
Robin Lee
140ad39fb0
Merge "Don't show always-on option connecting PPTP vpn"
2016-06-21 13:53:20 +00:00
Zoltan Szatmary-Ban
afea1cae25
Fix non-app non-user preferences in Settings > Data usage
...
Bug:29466113
Change-Id: Ib7a6d477146a856c0cb9c49143ffbf4fb99e38ed
2016-06-21 12:57:30 +01:00
Robin Lee
ca75deb7af
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
2016-06-21 12:24:33 +01:00
Dan Sandler
89d5659643
Show "0" instead of "0 B" in storage settings.
...
Two benefits:
- "0 B" might be a little confusing for sighted users
- "zero bee" is definitely confusing for TalkBack users
Nonzero storage items will still read as "640 KB" which
should be enough for anyone.
Change-Id: I5c89f7c6382ca14fb91d7d1dd145977f855618ae
Fixes: 27973778
2016-06-21 00:33:16 -04:00
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
2016-06-20 19:20:17 +00:00
Julia Reynolds
4606b359e9
Merge \\"Fix NPE printing notification actions.\\" into nyc-dev am: 43b04bcc7d
...
am: 018444ab61
2016-06-20 19:12:14 +00:00
Julia Reynolds
018444ab61
Merge \"Fix NPE printing notification actions.\" into nyc-dev
...
am: 43b04bcc7d
2016-06-20 19:08:43 +00:00
Julia Reynolds
07e85aa5c0
Merge \"Fix NPE printing notification actions.\" into nyc-dev
...
am: 43b04bcc7d
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
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
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
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
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
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
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
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
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
2016-06-17 18:55:33 +00:00
Adrian Roos
6f23c0493a
resolve merge conflicts of 380b01a to nyc-mr1-dev-plus-aosp
...
am: fa2bbcc288
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
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
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
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
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
2016-06-17 17:52:01 +00:00
Jason Monk
2ca05240fd
Make sure screen pinning desc is part of view hierarchy
...
am: 0c2ccba2f9
2016-06-17 17:52:01 +00:00
