Commit Graph

26964 Commits

Author SHA1 Message Date
Felipe Leme
78756838a7 Don\'t toggle Data Saver again until it receives a callback.
am: 484caa3035

Change-Id: Ib81e52c99e227318a3575c1d7bf03ffd36ce1f74
2016-06-24 01:16:29 +00:00
Felipe Leme
484caa3035 Don't toggle Data Saver again until it receives a callback.
BUG: 29253107
Change-Id: I4371f947086a45be6709d2a560d27d1f5f0e79c4
2016-06-23 16:16:32 -07:00
Christine Hallstrom
ac47013154 Log whether BT pairing dialog is accepted or canceled
Change-Id: I584cef273f16e27cd7e569b53abccedfe0bd0af7
2016-06-23 20:45:32 +00:00
Jack Yu
f0c929017f Merge "Added multi sim support back for brazil channel 50 messages." into nyc-mr1-dev 2016-06-23 18:41:28 +00:00
Andrew Sapperstein
da926355c0 Merge "Use colorSecondary for switch bar backgrounds." into nyc-mr1-dev 2016-06-23 18:37:42 +00:00
Fan Zhang
c3a0a18f77 Merge "Display operation hours when support is closed." into nyc-mr1-dev 2016-06-23 17:27:11 +00:00
Fan Zhang
2373aaafc6 Merge "Bug fix: support tab doesn't show offline UI initially." into nyc-mr1-dev 2016-06-23 17:25:22 +00:00
Fan Zhang
a8219fb1c1 Bug fix: support tab doesn't show offline UI initially.
Bug: 29601818

The support UI correctly monitors network state change after being
displayed, but it fails to set initial hasInternet flag. So we
manually refresh this flag as part of onResume.

Change-Id: Icbf3cca708a961390073cfa77ec08bec7dd4d82f
2016-06-23 08:38:00 -07:00
Steven Ng
0998abfc8f Update the OEM unlock preference summary to reflect the disable reason
3 cases implemented:
1) Bootloader unlocked
2) Device SIM-locked
3) Device Configuration, such as SIM-lock, has not been retrieved.

Bug: 29047618
Change-Id: Idf5cc1c9b1d105a0efd408cc2aa0e229e874442e
2016-06-23 10:21:05 +01:00
TreeHugger Robot
742047f565 Merge "Flip default value for nav key setting." into nyc-mr1-dev 2016-06-23 02:51:44 +00:00
Daniel Nishi
be42f8bb61 Re-add a string to fix a build breakage.
Change-Id: I079a5643634ffbf68f9414c639a9aba4a8a67d75
2016-06-22 18:41:04 -07:00
Andrew Sapperstein
f6e4c5f1ff Flip default value for nav key setting.
It's on by default.

BUG: 28565958
BUG: 29550614
Change-Id: I3bec47f9f495bfec946f09d314407e6b48672b0a
2016-06-22 18:08:37 -07:00
Andrew Sapperstein
399251a0e7 Merge "Flip default values of two gesture settings." into nyc-mr1-dev 2016-06-23 00:29:26 +00:00
Jack Yu
bc7b0fec2e Added multi sim support back for brazil channel 50 messages.
Reverted the MSIM removeal CL ag/825835.

bug: 28787384
Change-Id: I2f3691a83c117c2f01a78788d6e95e51a314d51f
2016-06-22 17:11:19 -07:00
TreeHugger Robot
d70ebc7bc4 Merge "WifiCallingSettings: UI improvement" into nyc-mr1-dev 2016-06-23 00:04:41 +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
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
44ce9aefbf Merge "Make MasterClear a valid entry fragment." into nyc-mr1-dev 2016-06-22 20:29:16 +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
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
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
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
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
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
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
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
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
Daniel Nishi
aad643caf2 Remove the Deletion Helper and Automatic Storage Management jobs.
The automatic storage management settings have been left in place
and updated to use the intent to get into the deletion helper.

Bug: 28965462
Change-Id: I736c8e741b519eceb89075b74d42b38c3aa5d0f4
2016-06-21 10:00:52 -07: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