Maurice Lam
204af97eb0
Remove setup specific FP find sensor layout
...
Remove the setup variant layout of fingerprint find sensor, because
the regular one is also GLIF themed, and positions the graphic
correctly.
Bug: 29421687
Change-Id: I20dee43c657434f63e73b5c32eb9a492d6786de5
2016-06-23 20:30:52 -07:00
Felipe Leme
f9c9f2f773
Merge \"Don\\\'t toggle Data Saver again until it receives a callback. am: 484caa3035
am: a6ec072541\" into nyc-mr1-dev-plus-aosp
...
am: bf74f68fd9
Change-Id: I924d835b23fb185c52c76f2c9c6f488e2b039b1c
2016-06-24 01:24:24 +00:00
Felipe Leme
12c5efb645
Don\\\'t toggle Data Saver again until it receives a callback. am: 484caa3035
am: 78756838a7
...
am: 2180901e30
Change-Id: I9a5621ff61b75970116a5581d52af7d57626f1f8
2016-06-24 01:24:23 +00:00
Android Build Merger (Role)
bf74f68fd9
Merge "Don\\'t toggle Data Saver again until it receives a callback. am: 484caa3035
am: a6ec072541" into nyc-mr1-dev-plus-aosp
2016-06-24 01:20:23 +00:00
Felipe Leme
a3662a3a55
Don\\'t toggle Data Saver again until it receives a callback. am: 484caa3035
...
am: a6ec072541
Change-Id: Ia790b33199dd537baf36455956864d39535bcc77
2016-06-24 01:20:15 +00:00
Felipe Leme
2180901e30
Don\\'t toggle Data Saver again until it receives a callback. am: 484caa3035
...
am: 78756838a7
Change-Id: I4c8b69abdfeb740aac87f70cf4c3e305984cb557
2016-06-24 01:20:02 +00:00
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
a6ec072541
Don\'t toggle Data Saver again until it receives a callback.
...
am: 484caa3035
Change-Id: Ib4b48a02015b81791d5bb77242968ca7c66b0621
2016-06-24 01:15:45 +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
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
Andrew Sapperstein
90d2b0065a
Merge \\"Use colorSecondary for switch bar backgrounds.\\" into nyc-mr1-dev am: da926355c0
...
am: 5edd0b945c
Change-Id: I278085d32cc6a2481f95a334e18af02a895ddda8
2016-06-23 19:10:04 +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
Andrew Sapperstein
5edd0b945c
Merge \"Use colorSecondary for switch bar backgrounds.\" into nyc-mr1-dev
...
am: da926355c0
Change-Id: I0f5a0fe312bb922ddeb709e1bf480f2d03fcd27d
2016-06-23 18:45:03 +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
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
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
Change-Id: I6986367b31361d74e0efbd41d79da735cd555c24
2016-06-23 01:51:32 +00:00
Daniel Nishi
e91548ab38
Re-add a string to fix a build breakage.
...
am: be42f8bb61
Change-Id: I569479a635f407427a1877724d25101dde77602f
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
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
TreeHugger Robot
2eb2dfcae0
Merge "Cleanup proguard.flags"
2016-06-22 21:34:56 +00:00