Commit Graph

28568 Commits

Author SHA1 Message Date
Meng Wang
50a4f6b690 Merge \"WifiCallingSettings: UI improvement\" into nyc-mr1-dev
am: d70ebc7bc4

Change-Id: I717bf769eb87112f46c0a4d01c212794212036af
2016-06-23 00:07:10 +00:00
TreeHugger Robot
d70ebc7bc4 Merge "WifiCallingSettings: UI improvement" into nyc-mr1-dev 2016-06-23 00:04:41 +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
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
Doris Ling
09aa0cc24f Merge \"Make MasterClear a valid entry fragment.\" into nyc-mr1-dev
am: 44ce9aefbf

Change-Id: I7a1b3604bc05718249c532f142c9de45f0c515f7
2016-06-22 20:37:01 +00:00
Doris Ling
44ce9aefbf Merge "Make MasterClear a valid entry fragment." into nyc-mr1-dev 2016-06-22 20:29:16 +00:00
Jason Monk
b11ded0b52 Merge \\"Workaround to avoid crash in user photo selection\\" into nyc-dev am: 8f75abf92f
am: 34adfc533c

Change-Id: I2f28f41e52f24f4c64f96510236eda6d02a36037
2016-06-22 19:55:41 +00:00
Jason Monk
d12b359e09 Merge \\"Workaround to avoid crash in user photo selection\\" into nyc-dev am: 8f75abf92f
am: 4c33973714

Change-Id: Ieaa97e10d4e0173b74bb0015aa5c646857b92145
2016-06-22 19:52:32 +00:00
Jason Monk
4c33973714 Merge \"Workaround to avoid crash in user photo selection\" into nyc-dev
am: 8f75abf92f

Change-Id: Ic0378c50fdc7661e76eed36acc9e935351998f04
2016-06-22 19:50:01 +00:00
Jason Monk
34adfc533c Merge \"Workaround to avoid crash in user photo selection\" into nyc-dev
am: 8f75abf92f

Change-Id: Id340d94a65ed656ad003ea310d2c5c476a840999
2016-06-22 19:50:01 +00:00
Meng Wang
438b291376 WifiCallingSettings: UI improvement
Hide 'Update Emergency Address' on resume w/o carrier support

Bug: 29256401
Change-Id: I69f1d533c49614401767832bd502a732699aef22
2016-06-22 12:45:17 -07:00
Jason Monk
8f75abf92f Merge "Workaround to avoid crash in user photo selection" into nyc-dev 2016-06-22 19:45:07 +00:00
Android Build Merger (Role)
f422b7bba9 Merge "Merge \\"Protect against crash in font size\\" into nyc-dev am: 4b336099f1 am: b48664b9d1" into nyc-mr1-dev-plus-aosp 2016-06-22 19:12:05 +00:00
Jason Monk
fd6dda9040 Merge \\"Protect against crash in font size\\" into nyc-dev am: 4b336099f1
am: bc1764f404

Change-Id: I0808298678eb25b603302c537ca8e9a667fae8bc
2016-06-22 19:11:54 +00:00
Jason Monk
e07d70b99a Merge \\"Protect against crash in font size\\" into nyc-dev am: 4b336099f1
am: b48664b9d1

Change-Id: I87fc40652ece1584635d02e293254e975719cc1a
2016-06-22 19:11:54 +00:00
Jason Monk
b48664b9d1 Merge \"Protect against crash in font size\" into nyc-dev
am: 4b336099f1

Change-Id: Ia77306b83425ab46a33c6d8aa386adb5c52f3da5
2016-06-22 19:09:28 +00:00
Jason Monk
bc1764f404 Merge \"Protect against crash in font size\" into nyc-dev
am: 4b336099f1

Change-Id: Ida2f0e275cea74516616374b858816f162f76dd3
2016-06-22 19:09:27 +00:00
Jason Monk
4b336099f1 Merge "Protect against crash in font size" into nyc-dev 2016-06-22 19:04:16 +00:00
Doris Ling
7d73a29e28 Make MasterClear a valid entry fragment.
Add FactoryResetActivity that maps to MasterClear fragment, and add
MasterClear to SettingsActivity's ENTRY_FRAGMENTS so that the
factory data reset fragment can be launched from activity alias.

Bug: 29405129
Change-Id: I8eca6b857987792da8d8678d33e6ab9d4e10793a
2016-06-22 11:58:30 -07:00
Jason Monk
f7b1ae4ef3 Workaround to avoid crash in user photo selection
Bug: 29556966
Change-Id: I0715dee2a4cef2252b4ed1cc4d242b8b3d0ab45c
2016-06-22 14:46:56 -04:00
Doris Ling
d5e48c62b5 Merge \"Remove summary text for Backup & reset.\" into nyc-mr1-dev
am: e15eb0a263

Change-Id: Ic296e7c997f417a19e06ef782e87837b3066e2dd
2016-06-22 17:40:30 +00:00
Doris Ling
e15eb0a263 Merge "Remove summary text for Backup & reset." into nyc-mr1-dev 2016-06-22 17:27:25 +00:00
Jason Monk
4f8f4f2ec2 Protect against crash in font size
Change-Id: Ib3578e0e82388a4f6aa3eeade0d990fc107b9c14
Fixes: 29438848
2016-06-22 13:10:25 -04:00
Fan Zhang
0bc42ab618 Display operation hours when support is closed.
Bug: 29105266
Change-Id: Id451b1aa820961fad4ece07fde5782a5aecaee68
2016-06-22 09:26:49 -07:00
Jason Monk
06db1cf6e2 Merge \\"Fix tethering re-enable after edit.\\" into nyc-dev am: dbb5a0b918
am: cd2d94b2d1

Change-Id: Ifa46a3dce735778e99c115ac6499c71d05a2068b
2016-06-22 15:37:26 +00:00
Jason Monk
cd2d94b2d1 Merge \"Fix tethering re-enable after edit.\" into nyc-dev
am: dbb5a0b918

Change-Id: Ia9f2e65710a94f314f8bb2b8ec875088c9ccc59f
2016-06-22 15:36:36 +00:00
Jason Monk
e0d330f138 Merge \\"Fix tethering re-enable after edit.\\" into nyc-dev am: dbb5a0b918
am: c04ac8415a

Change-Id: I130760913149185f5cef084d9a239ad35a4fad04
2016-06-22 15:29:14 +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
05c7b5ad89 Merge \\"Update battery content descriptions with labels\\" into nyc-dev am: 2a6b3d4db1
am: a996a46c62

Change-Id: I8a942298ac1cda479cbed919b0000e7d8bb55ec1
2016-06-22 13:39:14 +00:00
Jason Monk
a7bb4c297a Merge \\"Update battery content descriptions with labels\\" into nyc-dev am: 2a6b3d4db1
am: 29e4b2bc30

Change-Id: I018d46e214d2a56ecc0fca5b089bcd81dc6c7c41
2016-06-22 13:38:39 +00:00
Jason Monk
29e4b2bc30 Merge \"Update battery content descriptions with labels\" into nyc-dev
am: 2a6b3d4db1

Change-Id: I0e81816f4eb2e99b10d4cbb46d97f0a370159a6c
2016-06-22 13:32:23 +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
9b223788ee Flip default values of two gesture settings.
The settings are enabled by default but the UI wasn't reflecting
that.

Change-Id: Ia321d12bcced4a7e2aa8c4a9fc0a0b7b3f5dad4a
FIXES: 29550614
2016-06-21 17:48:22 -07: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
Daniel Nishi
bf8f896879 Update the deletion helper intent string.
Bug: 28675265
Change-Id: Ic56e1617d0cf66e347c3a9b31592de4737b19bb3
2016-06-21 16:06:12 -07:00
Andrew Sapperstein
70ff5f8fa1 Merge "Update Settings to use DeviceDefault.Settings." into nyc-mr1-dev 2016-06-21 23:02:13 +00:00
Steven Ng
54ce1da49d Disable "disable" button for the device provision app in the Settings app
Bug: 29116229
Change-Id: I41076238f34f497c48cfd98a2466ac10cca6e989
2016-06-21 22:43:54 +01: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
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
e300b0fc1c Use colorSecondary for switch bar backgrounds.
Delete the private version in favor of using the platform's.

BUG: 28625050
Change-Id: I6bf0a13e5018f48f32a26a38307c30cf1aee0619
2016-06-21 11:50:20 -07:00
Daniel Sandler
09c38bb326 Merge \\"Show \\"0\\" instead of \\"0 B\\" in storage settings.\\" into nyc-dev am: 87fcf9e95f
am: 698fe0a9b0

Change-Id: I4d1d95d66b02d18c6f2ba80b0348895e542ae57f
2016-06-21 18:29:19 +00:00
Daniel Sandler
92e908b68e Merge \\"Show \\"0\\" instead of \\"0 B\\" in storage settings.\\" into nyc-dev am: 87fcf9e95f
am: 7df9a28fdb

Change-Id: I14d23175a455c21df8d526bfa2ae034e80e199d5
2016-06-21 18:28:35 +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
698fe0a9b0 Merge \"Show \"0\" instead of \"0 B\" in storage settings.\" into nyc-dev
am: 87fcf9e95f

Change-Id: I94d18998914552d21099b12b22471ea93857cf52
2016-06-21 18:18:21 +00: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