Commit Graph

29672 Commits

Author SHA1 Message Date
Fan Zhang
121a654084 Merge \\"Remove search in support tab.\\" into nyc-mr1-dev am: bae81b4a6f
am: afa4fff821

Change-Id: Iaadb88a07abad89a6fe0c0a1ae6cfc058fbd6662
2016-07-06 20:26:29 +00:00
Fan Zhang
afa4fff821 Merge \"Remove search in support tab.\" into nyc-mr1-dev
am: bae81b4a6f

Change-Id: I59e7b9dffd8c488397b6904928e6c56a4ad0664d
2016-07-06 20:14:46 +00:00
Fan Zhang
bae81b4a6f Merge "Remove search in support tab." into nyc-mr1-dev 2016-07-06 20:09:10 +00:00
Bill Yi
0dc7e4e116 Import translations. DO NOT MERGE am: 271f042229 -s ours am: d2a702e82f -s ours
am: b468190a12  -s ours

Change-Id: I02b08be1d509f0ac52a2d9e81373ec6a65065f42
2016-07-06 18:39:54 +00:00
Bill Yi
b468190a12 Import translations. DO NOT MERGE am: 271f042229 -s ours
am: d2a702e82f  -s ours

Change-Id: I0f93fc30e59e41f59048b491fd784eb154c3d924
2016-07-06 18:32:41 +00:00
Bill Yi
d2a702e82f Import translations. DO NOT MERGE
am: 271f042229  -s ours

Change-Id: Ia494efe0469c9877dc7730c9a57d9be8ea9e30a9
2016-07-06 18:25:17 +00:00
Fan Zhang
ece8ff63b6 Remove search in support tab.
Bug: 29397123
Change-Id: Id2d43724696c04e890adba562b5476e1834779da
2016-07-06 09:54:07 -07:00
Justin Klaassen
d770c05f6e Ensure classes used via XML are kept by proguard
Bug: 29795762

- Keep MenuItem onClick methods.
- Keep View subclasses and animatable properties.

Change-Id: I4449c8d6caee1d499d8816e62ffc482661df6bea
2016-07-06 12:19:10 +00:00
Robin Lee
1c9c4b724f Merge \\"Don\\'t show always-on option connecting PPTP vpn\\" into nyc-mr1-dev am: 1926ed9f83
am: 2ac7bc0565

Change-Id: I5945bb58dc952bc149a03325013f0904d5157847
2016-07-06 10:38:22 +00:00
Robin Lee
2ac7bc0565 Merge \"Don\'t show always-on option connecting PPTP vpn\" into nyc-mr1-dev
am: 1926ed9f83

Change-Id: I98de935857099b26946a66a884908cdcf470e11a
2016-07-06 10:35:11 +00:00
Robin Lee
1926ed9f83 Merge "Don't show always-on option connecting PPTP vpn" into nyc-mr1-dev 2016-07-06 10:30:13 +00:00
Tony Mak
a63c20b3b6 Merge \\"Show info icon when RestrictedListPreference is disabled\\" into nyc-mr1-dev am: b0a4c897ac
am: b62a70db93

Change-Id: I033c13b26dec6973f66dc48c491f7a1b15232381
2016-07-06 09:10:13 +00:00
Tony Mak
b62a70db93 Merge \"Show info icon when RestrictedListPreference is disabled\" into nyc-mr1-dev
am: b0a4c897ac

Change-Id: Ic9f17f748d414e7c5307d4e81d79a1a55a444091
2016-07-06 09:07:02 +00:00
Tony Mak
b0a4c897ac Merge "Show info icon when RestrictedListPreference is disabled" into nyc-mr1-dev 2016-07-06 09:01:37 +00:00
Bill Yi
ca2d7746fd Import translations. DO NOT MERGE am: 271f042229 -s ours am: 45215ab25b -s ours
am: 7f4ded6b14  -s ours

Change-Id: I2cacfd33eb554e4d14c6bd6dfeae55af395dad4a
2016-07-06 04:42:33 +00:00
Bill Yi
9a4b5e64b8 Import translations. DO NOT MERGE am: a937ff573e -s ours
am: 370af158e9  -s ours

Change-Id: I1014fde8dcc26b78895cd151ec54f834ca3b7b38
2016-07-06 04:42:31 +00:00
Bill Yi
7f4ded6b14 Import translations. DO NOT MERGE am: 271f042229 -s ours
am: 45215ab25b  -s ours

Change-Id: I29d78230052fb90e466fcb8c5e954330e05216a8
2016-07-06 04:37:00 +00:00
Bill Yi
370af158e9 Import translations. DO NOT MERGE
am: a937ff573e  -s ours

Change-Id: I714848e4322a4e2ffb6cabc4f99509ab8536c7bd
2016-07-06 04:36:57 +00:00
Bill Yi
45215ab25b Import translations. DO NOT MERGE
am: 271f042229  -s ours

Change-Id: I2286ee629008672002f36dcca7f505898a40d1dd
2016-07-06 04:26:32 +00:00
Bill Yi
a937ff573e Import translations. DO NOT MERGE
Change-Id: I3df812343b69d4e10d3fa2876913a4c7f5698c89
Auto-generated-cl: translation import
2016-07-05 19:52:46 -07:00
Bill Yi
271f042229 Import translations. DO NOT MERGE
Change-Id: Idce951754c8e74f8e6370dc1ad03cebfce4db3c6
Auto-generated-cl: translation import
2016-07-05 19:42:12 -07:00
Bill Yi
246bcb7b41 Import translations. DO NOT MERGE
Change-Id: I9292d04c0981f742b5a71403c58509f1fd4e4d4c
Auto-generated-cl: translation import
2016-07-05 19:05:09 -07:00
Abodunrinwa Toki
6306044706 Merge "Fix order of items in language menu." 2016-07-04 13:45:49 +00:00
Tony Mak
1e25ba3ed1 Show info icon when RestrictedListPreference is disabled
Fix: 29766349
2016-07-04 04:01:49 +00:00
Doris Ling
57949a9784 Merge \\"Update Backup & reset settings to launch the configured activity.\\" into nyc-mr1-dev am: f230f4f9ad
am: 0fbf0fd198

Change-Id: I8ff4ca45d2985cb5c18f0664e95747ce57515118
2016-07-01 20:38:41 +00:00
Doris Ling
0fbf0fd198 Merge \"Update Backup & reset settings to launch the configured activity.\" into nyc-mr1-dev
am: f230f4f9ad

Change-Id: I24c3976e863e1a9db02dbf1fee07358e52b72269
2016-07-01 20:33:11 +00:00
Doris Ling
f230f4f9ad Merge "Update Backup & reset settings to launch the configured activity." into nyc-mr1-dev 2016-07-01 20:15:59 +00:00
Doris Ling
26bf003df9 Update Backup & reset settings to launch the configured activity.
Check for configured backup settings activity to be used for
Settings->Backup & reset.

Bug: 28942163
Change-Id: I8b937fde5b400afdb81463c9c278b3e3ad42688b
2016-07-01 11:49:03 -07:00
Fan Zhang
bfed632c6e Merge \\"Update escalation cards layout and data binding.\\" into nyc-mr1-dev am: eef9dbcdb9
am: 0e2e738400

Change-Id: Iff273a832ffa46deda85223a0b627cbc5e015caf
2016-07-01 18:36:19 +00:00
Fan Zhang
0e2e738400 Merge \"Update escalation cards layout and data binding.\" into nyc-mr1-dev
am: eef9dbcdb9

Change-Id: I1d5d80d7c60b72f0cb4d8d9eb91679000f278f6d
2016-07-01 18:31:18 +00:00
Fan Zhang
eef9dbcdb9 Merge "Update escalation cards layout and data binding." into nyc-mr1-dev 2016-07-01 18:17:38 +00:00
Jason Monk
ac92d478f1 Merge \\"Remove dead code that could have a memory leak\\" into nyc-mr1-dev am: d1e94a10eb
am: 19aa60b67a

Change-Id: I47bd9f8f15f89c96af4ac6c67a193abc331f2e60
2016-07-01 16:11:09 +00:00
Jason Monk
19aa60b67a Merge \"Remove dead code that could have a memory leak\" into nyc-mr1-dev
am: d1e94a10eb

Change-Id: I9c9f6f5cce2ff475148d498896dc36f0b381c977
2016-07-01 16:07:01 +00:00
TreeHugger Robot
d1e94a10eb Merge "Remove dead code that could have a memory leak" into nyc-mr1-dev 2016-07-01 16:00:35 +00:00
Jason Monk
81bc861efc Protect against null carrier config am: 934a400ddc
am: 0358d2b336

Change-Id: I9c745ebea3b3b87b7b0949c9439c79e0175733c5
2016-07-01 15:38:47 +00:00
Jason Monk
0358d2b336 Protect against null carrier config
am: 934a400ddc

Change-Id: Ieb008120519ad68db85ac709f23a31b70d51d1d7
2016-07-01 15:34:37 +00:00
Jason Monk
f5a2422f32 Remove dead code that could have a memory leak
Change-Id: I0a4994f1397160e479cee7eaa1e334e002d28c8c
Fixes: 29115509
2016-07-01 10:28:34 -04:00
Jason Monk
934a400ddc Protect against null carrier config
Change-Id: Ida60ead4a85017c29cc8ad3c3e7a462a9e3c720b
Fixes: 28085042
2016-07-01 09:55:44 -04:00
Abodunrinwa Toki
6d2a0b6424 Fix order of items in language menu.
Bug: 29571417
Change-Id: I682925afe7fe07f6300197e0b4064525f0799b4f
2016-07-01 11:50:55 +01:00
Bill Yi
d05dde8166 Import translations. DO NOT MERGE am: bb3e765b77 -s ours am: 57d0077833 -s ours
am: 5b1a3a40c5  -s ours

Change-Id: I6703629ab6ff0e939e57e989c72167d4cfbd844f
2016-07-01 05:39:47 +00:00
Bill Yi
5b1a3a40c5 Import translations. DO NOT MERGE am: bb3e765b77 -s ours
am: 57d0077833  -s ours

Change-Id: Ia3fa4dca2ae1d68b1e42f2f8024971a1f085b17a
2016-07-01 05:23:05 +00:00
Bill Yi
57d0077833 Import translations. DO NOT MERGE
am: bb3e765b77  -s ours

Change-Id: Ie794d33045a64ba42a7c765e06a7d6fb9531c3da
2016-07-01 05:13:39 +00:00
Bill Yi
bb3e765b77 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Ia51772c969ecd375d6ab9b48f27f1d81749cbd50
2016-06-30 20:20:01 -07:00
Daniel Nishi
53027997ff Merge \\"Update strings to match the latest mocks.\\" into nyc-mr1-dev am: 7a23b48266
am: b582e1c7de

Change-Id: Ib45c94ed413c4e096c69c18c2125fbb67b22f2f2
2016-07-01 00:35:51 +00:00
Daniel Nishi
b582e1c7de Merge \"Update strings to match the latest mocks.\" into nyc-mr1-dev
am: 7a23b48266

Change-Id: Icf61ff61f5110c6455c88da9b62026b1b9955484
2016-07-01 00:02:10 +00:00
Daniel Nishi
7a23b48266 Merge "Update strings to match the latest mocks." into nyc-mr1-dev 2016-06-30 23:50:47 +00:00
Jorim Jaggi
93779ae3c6 Merge \\"Fix ugly flash between boot animation and setup wizard (1/2)\\" into nyc-mr1-dev am: 9711521e3c
am: 92f03e58f3

Change-Id: Ibc2962f22482e7c4d239c64472a24773359c9971
2016-06-30 23:15:23 +00:00
Jorim Jaggi
92f03e58f3 Merge \"Fix ugly flash between boot animation and setup wizard (1/2)\" into nyc-mr1-dev
am: 9711521e3c

Change-Id: Ibe1410573df0d661ae62e45ff798bfbcc0079a1a
2016-06-30 23:10:38 +00:00
TreeHugger Robot
9711521e3c Merge "Fix ugly flash between boot animation and setup wizard (1/2)" into nyc-mr1-dev 2016-06-30 22:58:09 +00:00
Daniel Nishi
1fde957be1 Merge \\"Add text to the Manage Settings page to show freed storage.\\" into nyc-mr1-dev am: 8c8791a807
am: 55f2a8a8b5

Change-Id: I7b25f572d4e10da89b29dcc339e695637f716958
2016-06-30 21:31:57 +00:00