Commit Graph

28251 Commits

Author SHA1 Message Date
Bill Yi
d916e7de44 Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 9439574d34  -s ours

Change-Id: I3bffb8f39c8f4098391ea8105c4f9137e00f2d37
2016-06-24 06:36:29 +00:00
Android Build Merger (Role)
ea2427cf9f Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 5bb180388a -s ours am: 699bdb38ba -s ours" into nyc-mr1-dev-plus-aosp 2016-06-24 06:34:46 +00:00
Bill Yi
25771333c3 Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 5bb180388a -s ours
am: 699bdb38ba  -s ours

Change-Id: I3b5b4128cc2f46555155830d7e8e80285ef9e53b
2016-06-24 06:34:35 +00:00
Bill Yi
e266de3282 Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 5bb180388a -s ours
am: 1072cc1175  -s ours

Change-Id: I63a62b20953668ba82cf05387041cfa8b1d2e0bb
2016-06-24 06:34:34 +00:00
TreeHugger Robot
9439574d34 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-24 06:32:53 +00:00
Bill Yi
699bdb38ba Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 5bb180388a  -s ours

Change-Id: I7f0781cb71e8c9382e0085a7070a0c5aa00ae647
2016-06-24 06:30:26 +00:00
Bill Yi
1072cc1175 Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 5bb180388a  -s ours

Change-Id: I13908cbf3a74b215e12c271642722424470e30c6
2016-06-24 06:30:26 +00:00
TreeHugger Robot
5bb180388a Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-24 06:22:57 +00:00
Bill Yi
94e8b660ad Import translations. DO NOT MERGE
Change-Id: I34aedbc52d5223b977ea7ef5899a54bae1bbf51a
Auto-generated-cl: translation import
2016-06-23 22:11:31 -07:00
Bill Yi
058e4e9a36 Import translations. DO NOT MERGE
Change-Id: I99973d29e54e0ccd4d0ec2e3e631f0d7d8f57c8a
Auto-generated-cl: translation import
2016-06-23 22:02:51 -07: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
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
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
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
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
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
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
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