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
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
2016-06-23 02:58:17 +00: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
53bbada296
Re-add a string to fix a build breakage. am: be42f8bb61
...
am: e91548ab38
2016-06-23 01:51:32 +00:00
Daniel Nishi
e91548ab38
Re-add a string to fix a build breakage.
...
am: be42f8bb61
2016-06-23 01:48:55 +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
e074d430ce
Merge \\"Flip default values of two gesture settings.\\" into nyc-mr1-dev am: 399251a0e7
...
am: 1dbb1fb6e7
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
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
2016-06-23 00:10:37 +00:00
Meng Wang
50a4f6b690
Merge \"WifiCallingSettings: UI improvement\" into nyc-mr1-dev
...
am: d70ebc7bc4
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
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
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
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
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
TreeHugger Robot
2eb2dfcae0
Merge "Cleanup proguard.flags"
2016-06-22 21:34:56 +00:00
Doris Ling
0384a05546
Merge \\"Make MasterClear a valid entry fragment.\\" into nyc-mr1-dev am: 44ce9aefbf
...
am: 09aa0cc24f
2016-06-22 21:14:29 +00:00
Doris Ling
09aa0cc24f
Merge \"Make MasterClear a valid entry fragment.\" into nyc-mr1-dev
...
am: 44ce9aefbf
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
3f2dc17e81
Merge \\\"Workaround to avoid crash in user photo selection\\\" into nyc-dev am: 8f75abf92f am: 34adfc533c
...
am: b11ded0b52
2016-06-22 20:10:42 +00:00
Jason Monk
c8e933ef60
Merge \\\"Workaround to avoid crash in user photo selection\\\" into nyc-dev am: 8f75abf92f am: 4c33973714
...
am: d12b359e09
2016-06-22 20:10:41 +00:00
Jason Monk
b11ded0b52
Merge \\"Workaround to avoid crash in user photo selection\\" into nyc-dev am: 8f75abf92f
...
am: 34adfc533c
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
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
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
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
ac63505ecd
Merge \"Merge \\\"Protect against crash in font size\\\" into nyc-dev am: 4b336099f1 am: b48664b9d1\" into nyc-mr1-dev-plus-aosp
...
am: f422b7bba9
2016-06-22 19:27:52 +00:00
Jason Monk
dbead65df2
Merge \\\"Protect against crash in font size\\\" into nyc-dev am: 4b336099f1 am: bc1764f404
...
am: fd6dda9040
2016-06-22 19:27:51 +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
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
2016-06-22 19:11:54 +00:00
Justin Klaassen
478b5a8cbe
Cleanup proguard.flags
...
Bug: 29574900
Proguard flags no longer specify specific packages or classes which
means they should not need to be updated everytime a new package or
class is added.
Change-Id: I2c2b501e904133d517d2467bd9f47c9577d9b446
2016-06-22 19:10:53 +00:00
Jason Monk
b48664b9d1
Merge \"Protect against crash in font size\" into nyc-dev
...
am: 4b336099f1
2016-06-22 19:09:28 +00:00
Jason Monk
bc1764f404
Merge \"Protect against crash in font size\" into nyc-dev
...
am: 4b336099f1
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
2016-06-22 17:55:42 +00:00
