Commit Graph

26781 Commits

Author SHA1 Message Date
Doris Ling
e15eb0a263 Merge "Remove summary text for Backup & reset." into nyc-mr1-dev 2016-06-22 17:27:25 +00:00
Jason Monk
c04ac8415a Merge \"Fix tethering re-enable after edit.\" into nyc-dev
am: dbb5a0b918

Change-Id: Ib8547ccf2a169c16b6bb0785e7094edbee123af0
2016-06-22 15:26:29 +00:00
Jason Monk
dbb5a0b918 Merge "Fix tethering re-enable after edit." into nyc-dev 2016-06-22 15:22:10 +00:00
Jason Monk
a996a46c62 Merge \"Update battery content descriptions with labels\" into nyc-dev
am: 2a6b3d4db1

Change-Id: Id0d36f67615bd319351ba2bdc3c2993a3162e665
2016-06-22 13:32:21 +00:00
Jason Monk
2a6b3d4db1 Merge "Update battery content descriptions with labels" into nyc-dev 2016-06-22 13:22:45 +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
ec354cd326 Remove summary text for Backup & reset.
Remove the SummaryProvider from PrivacySettings so that it will not show
the summary for the Backup & reset settings.

Bug: 29519430
Change-Id: Idf41c2f794391f81bf864ade0db9087c2e3e1c0e
2016-06-21 13:29:07 -07: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
Dan Sandler
7df9a28fdb Merge \"Show \"0\" instead of \"0 B\" in storage settings.\" into nyc-dev
am: 87fcf9e95f

Change-Id: I40778ba470d12dd6f5b924ddcf650f27459faab6
2016-06-21 18:17:08 +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
Jason Monk
cf7c2374a9 Fix tethering re-enable after edit.
Sometimes the tether state change comes in late (or seemingly not
at all).  Also listen for wifi ap state changes as a fallback for
this case.

Change-Id: I6677c4277453be881967a3cf2234de11cd0237b8
Fixes: 28851179
2016-06-21 14:06:48 -04: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
Jason Monk
d589bafc4a Update battery content descriptions with labels
Change-Id: I0ad4ca753f8f5e1a01e2e21181526ddb921d487a
Fixes: 28301362
2016-06-21 13:36:57 -04: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
Bill Yi
672e1ddb14 Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: f315e2e6f0  -s ours

Change-Id: I8216d1ead0653fff4d1a335f11ff92879d587fcc
2016-06-21 16:56:44 +00:00
TreeHugger Robot
5903be35f4 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-21 16:53:39 +00:00
TreeHugger Robot
f315e2e6f0 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-21 16:53:26 +00:00
Sunny Goyal
139fbb78b5 Merge "Adding custom manifest shortcuts in Settings app" into nyc-mr1-dev 2016-06-21 16:39:33 +00:00
Zoltan Szatmary-Ban
e341462a50 Fix non-app non-user preferences in Settings > Data usage
am: afea1cae25

Change-Id: I55e991f5cd9c39a740dd62945fe113ee59ea18a9
2016-06-21 15:57:08 +00:00
Fan Zhang
a2fe136837 Merge "Log button taps in support tab." into nyc-mr1-dev 2016-06-21 15:28:31 +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
Bill Yi
efd819e862 Import translations. DO NOT MERGE
Change-Id: Ia258f44583c5690bd396d20517e1309807c659ad
Auto-generated-cl: translation import
2016-06-21 04:40:02 -07:00
Bill Yi
2d85beec1e Import translations. DO NOT MERGE
Change-Id: Iebfc06a928c222879aceec01c3aaf35f2cf78561
Auto-generated-cl: translation import
2016-06-21 04:28:46 -07: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
Sunny Goyal
5f179fcef1 Adding custom manifest shortcuts in Settings app
Bug:28298258
Change-Id: Ie7fd86a999fa2abe2522adfb29573b86f36db3a5
2016-06-20 16:44:17 -07: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
43b04bcc7d Merge "Fix NPE printing notification actions." into nyc-dev 2016-06-20 18:43:04 +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
Jason Monk
b363eb89bc Fix focusability of battery history chart
am: 9c6ab88bd7

Change-Id: I8239280074c191c98414e57c0c915463ade9ec9c
2016-06-20 17:29:24 +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
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
Julia Reynolds
9bcc04c5db Fix NPE printing notification actions.
Change-Id: Icb52e7bc632bf7109a75a7695fb253b2183e7360
Fixes: 29017025
2016-06-20 10:23:44 -04: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
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
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
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
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
bd470255d0 resolve merge conflicts of 333ba2d to nyc-mr1-dev
Change-Id: I32f284bb2216755ae0ddbea4b7fc76a38c7aa7e2
2016-06-16 18:54:50 -07: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
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