Commit Graph

15074 Commits

Author SHA1 Message Date
Christine Hallstrom
9523f3de7b Log whether BT pairing dialog is accepted or canceled am: ac47013154
am: e8fe657b46

Change-Id: If947ee29ae057437fa5f677fabbef19c1d5a5450
2016-06-23 20:56:40 +00:00
Christine Hallstrom
e8fe657b46 Log whether BT pairing dialog is accepted or canceled
am: ac47013154

Change-Id: I09bdaf679b490bfb361c1648a8eee9f57db8b566
2016-06-23 20:53:59 +00:00
Christine Hallstrom
ac47013154 Log whether BT pairing dialog is accepted or canceled
Change-Id: I584cef273f16e27cd7e569b53abccedfe0bd0af7
2016-06-23 20:45:32 +00:00
Evan Rosky
bb70e4f696 Option to hide swipe method
Bug: 27502832
Change-Id: Ia61b63279fa6f831fdfa9209747b0cbcbf807d50
2016-06-23 19:51:26 +00:00
Jack Yu
e81fec8489 Merge \\"Added multi sim support back for brazil channel 50 messages.\\" into nyc-mr1-dev am: f0c929017f
am: c65ba9b08c

Change-Id: Id08987b8fee1f5ff8fb125520d97e4ffda7d4df2
2016-06-23 19:13:49 +00:00
Jack Yu
c65ba9b08c Merge \"Added multi sim support back for brazil channel 50 messages.\" into nyc-mr1-dev
am: f0c929017f

Change-Id: I49f1729d081f834715066ab690f8ca8808aa6f61
2016-06-23 18:45:17 +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
Fan Zhang
121b4d04a5 Merge \\"Display operation hours when support is closed.\\" into nyc-mr1-dev am: c3a0a18f77
am: 6485952e26

Change-Id: Ia66d9982a4cbdd6b3b2d5d45766dcb0cb446a34a
2016-06-23 17:44:38 +00:00
Fan Zhang
b0052ef0b5 Merge \\"Bug fix: support tab doesn\\'t show offline UI initially.\\" into nyc-mr1-dev am: 2373aaafc6
am: 3cdd348434

Change-Id: I66041ea6397b11ad7be3ae948d1ec18a302410d9
2016-06-23 17:44:34 +00:00
Fan Zhang
6485952e26 Merge \"Display operation hours when support is closed.\" into nyc-mr1-dev
am: c3a0a18f77

Change-Id: I85feefab029eeb7e7101ec7f25e28d3653b07852
2016-06-23 17:38:23 +00:00
Fan Zhang
3cdd348434 Merge \"Bug fix: support tab doesn\'t show offline UI initially.\" into nyc-mr1-dev
am: 2373aaafc6

Change-Id: I226b76f8d69ff25327c9043609bb923a13feab7b
2016-06-23 17:38:20 +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
TreeHugger Robot
76936904e2 Merge "Fix crash when setting a password/pattern from private fragment" 2016-06-23 11:33:24 +00:00
Clara Bayarri
77c4345373 Fix crash when setting a password/pattern from private fragment
As of N+, we don't allow the addition of private fragments as this
causes problems with Configuration Change recreations.

Bug: 29565251
Change-Id: I6a4cf1011e1a4e6ba308565e010a51d2992e79e2
2016-06-23 11:11:42 +01: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
Andrew Sapperstein
da36d4daeb Merge \\"Flip default value for nav key setting.\\" into nyc-mr1-dev am: 742047f565
am: a513e0e046

Change-Id: I2f95a89e47a7176678bc2eb563ff7cdf4a48ff68
2016-06-23 03:00:57 +00:00
Andrew Sapperstein
a513e0e046 Merge \"Flip default value for nav key setting.\" into nyc-mr1-dev
am: 742047f565

Change-Id: Id8aeaac79e142f81daecde2379e36ed77c0ba14c
2016-06-23 02:58:17 +00: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
e074d430ce Merge \\"Flip default values of two gesture settings.\\" into nyc-mr1-dev am: 399251a0e7
am: 1dbb1fb6e7

Change-Id: Iab366f210e11718b5735c90a7a6e6ee74510d824
2016-06-23 00:37:46 +00:00
Andrew Sapperstein
1dbb1fb6e7 Merge \"Flip default values of two gesture settings.\" into nyc-mr1-dev
am: 399251a0e7

Change-Id: Ifeb432500939cee04201b3ea464f84d2a269b970
2016-06-23 00:35:07 +00: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
Meng Wang
38c307c041 Merge \\"WifiCallingSettings: UI improvement\\" into nyc-mr1-dev am: d70ebc7bc4
am: 50a4f6b690

Change-Id: I69c9885fc94a4dbe283497eb8b3bd1e23f6055a1
2016-06-23 00:10:37 +00:00
Meng Wang
50a4f6b690 Merge \"WifiCallingSettings: UI improvement\" into nyc-mr1-dev
am: d70ebc7bc4

Change-Id: I717bf769eb87112f46c0a4d01c212794212036af
2016-06-23 00:07:10 +00:00
Daniel Nishi
b4a6067d66 Merge \\"Remove the Deletion Helper and Automatic Storage Management jobs.\\" into nyc-mr1-dev am: de17410d37
am: 4938a9a470

Change-Id: If4f17948cef697c6bc4cb0306a7506eb445f49d7
2016-06-23 00:05:43 +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
177f93eefb Merge \\"Add Debug Toggles for Video and WiFI Calling Provisioning\\" into nyc-mr1-dev am: d63c3e7854
am: 078f579871

Change-Id: Icb79d5f9d1236fde5884a1332d7d19664f6439b5
2016-06-22 23:29:21 +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
0384a05546 Merge \\"Make MasterClear a valid entry fragment.\\" into nyc-mr1-dev am: 44ce9aefbf
am: 09aa0cc24f

Change-Id: I0d0ca31cabb84bf6616fdd2210658e7e1178622c
2016-06-22 21:14:29 +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
c8e933ef60 Merge \\\"Workaround to avoid crash in user photo selection\\\" into nyc-dev am: 8f75abf92f am: 4c33973714
am: d12b359e09

Change-Id: I3ec5ae066643f3d3ca69db4b52e0f49c78a7b2f3
2016-06-22 20:10: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
Jason Monk
dbead65df2 Merge \\\"Protect against crash in font size\\\" into nyc-dev am: 4b336099f1 am: bc1764f404
am: fd6dda9040

Change-Id: I8fbc8cf8487631ae53b0e0483b9fe29df98423d7
2016-06-22 19:27:51 +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
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
eebc793453 Merge \\"Remove summary text for Backup & reset.\\" into nyc-mr1-dev am: e15eb0a263
am: d5e48c62b5

Change-Id: I80f327196180c80279891f0650f436ec4a9b4d12
2016-06-22 17:55:42 +00:00