Bill Yi
b468190a12
Import translations. DO NOT MERGE am: 271f042229 -s ours
...
am: d2a702e82f
2016-07-06 18:32:41 +00:00
Bill Yi
d2a702e82f
Import translations. DO NOT MERGE
...
am: 271f042229
2016-07-06 18:25:17 +00:00
Robin Lee
2ac7bc0565
Merge \"Don\'t show always-on option connecting PPTP vpn\" into nyc-mr1-dev
...
am: 1926ed9f83
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
b62a70db93
Merge \"Show info icon when RestrictedListPreference is disabled\" into nyc-mr1-dev
...
am: b0a4c897ac
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
7f4ded6b14
Import translations. DO NOT MERGE am: 271f042229 -s ours
...
am: 45215ab25b
2016-07-06 04:37:00 +00:00
Bill Yi
370af158e9
Import translations. DO NOT MERGE
...
am: a937ff573e
2016-07-06 04:36:57 +00:00
Bill Yi
45215ab25b
Import translations. DO NOT MERGE
...
am: 271f042229
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
Tony Mak
1e25ba3ed1
Show info icon when RestrictedListPreference is disabled
...
Fix: 29766349
2016-07-04 04:01:49 +00:00
Doris Ling
0fbf0fd198
Merge \"Update Backup & reset settings to launch the configured activity.\" into nyc-mr1-dev
...
am: f230f4f9ad
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
0e2e738400
Merge \"Update escalation cards layout and data binding.\" into nyc-mr1-dev
...
am: eef9dbcdb9
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
19aa60b67a
Merge \"Remove dead code that could have a memory leak\" into nyc-mr1-dev
...
am: d1e94a10eb
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
0358d2b336
Protect against null carrier config
...
am: 934a400ddc
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
Bill Yi
5b1a3a40c5
Import translations. DO NOT MERGE am: bb3e765b77 -s ours
...
am: 57d0077833
2016-07-01 05:23:05 +00:00
Bill Yi
57d0077833
Import translations. DO NOT MERGE
...
am: bb3e765b77
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
b582e1c7de
Merge \"Update strings to match the latest mocks.\" into nyc-mr1-dev
...
am: 7a23b48266
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
92f03e58f3
Merge \"Fix ugly flash between boot animation and setup wizard (1/2)\" into nyc-mr1-dev
...
am: 9711521e3c
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
55f2a8a8b5
Merge \"Add text to the Manage Settings page to show freed storage.\" into nyc-mr1-dev
...
am: 8c8791a807
2016-06-30 21:25:10 +00:00
Daniel Nishi
8c8791a807
Merge "Add text to the Manage Settings page to show freed storage." into nyc-mr1-dev
2016-06-30 21:17:19 +00:00
Daniel Nishi
9a761788b0
Update strings to match the latest mocks.
...
Bug: 29877906
Change-Id: I96338cb42f8e53b0d642e1ad13064fa86cbdc5ba
2016-06-30 14:05:22 -07:00
Fan Zhang
016bd60491
Update escalation cards layout and data binding.
...
Bug: 29397123
- Updated the UI for support escalation cards so different state have
the same height and text/button shows up at roughly same place.
- Split data model for escalation cards from SupportData. The data and
UI between escalation cards and support tiles are different enough
that it no longer makes sense to share the same data object.
Change-Id: I328cc33961b9638e5e5fc2cad3ebf443991f4d0c
2016-06-30 13:57:22 -07:00
Doris Ling
055c48b751
Merge \"Add help url for gestures settings.\" into nyc-mr1-dev
...
am: 0a7300b8d1
2016-06-30 20:06:00 +00:00
Doris Ling
0a7300b8d1
Merge "Add help url for gestures settings." into nyc-mr1-dev
2016-06-30 19:59:21 +00:00
Doris Ling
ec208fdb8f
Add help url for gestures settings.
...
Override getHelpResource() in GestureSettings and added corresponding
resource string for the help url.
Bug: 29792538
Change-Id: I2f2d93fc25b63266504bd13b954fefa5692e9ddf
2016-06-30 10:53:07 -07:00
Andrew Sapperstein
987c5d07ba
Merge \"Fix some bluetooth theming issues.\" into nyc-mr1-dev
...
am: 6e1336bff1
2016-06-30 17:32:29 +00:00
Andrew Sapperstein
6e1336bff1
Merge "Fix some bluetooth theming issues." into nyc-mr1-dev
2016-06-30 17:17:19 +00:00
Fan Zhang
8ea45ff337
Merge \"Fix a bug where selected country is reset.\" into nyc-mr1-dev
...
am: 57824d5aaa
2016-06-30 17:03:04 +00:00
Andrew Sapperstein
294469e09a
Fix some bluetooth theming issues.
...
The ic_lockscreen_ime wasn't being appropriately colored due to
the (now deleted) override of the assets defined in SettingsLib
that were hardcoded teal. By deleting these, the vector drawable
that's tinted with the accent color is used.
Also fixes the pairing dialog to use DeviceDefault themes.
Fixes: 29837825
Change-Id: I66cd57c00f1eec00346d7d10a86cd9be79d6cf5c
2016-06-30 10:01:59 -07:00
TreeHugger Robot
57824d5aaa
Merge "Fix a bug where selected country is reset." into nyc-mr1-dev
2016-06-30 16:51:55 +00:00
Fan Zhang
a05a1b15d8
Merge \"Update UI for support tab.\" into nyc-mr1-dev
...
am: 0293fb40f2
2016-06-30 15:28:43 +00:00
Fan Zhang
0293fb40f2
Merge "Update UI for support tab." into nyc-mr1-dev
2016-06-30 15:22:02 +00:00
Robin Lee
07127d83a6
Don't show always-on option connecting PPTP vpn
...
Support for this kind has been taken out so it shouldn't be an option
when connecting (it's already not an option when editing).
Bug: 28807474
Change-Id: Id3e7be390c6813d091e7f897ac82aaf29042beb8
(cherry picked from commit ca75deb7af
2016-06-30 09:05:58 +00:00
Bill Yi
636cf49c27
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
...
am: ebed4797b1
2016-06-30 03:38:43 +00:00
TreeHugger Robot
ebed4797b1
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-06-30 03:28:31 +00:00
Android Build Merger (Role)
68a1509eb6
Merge "Import translations. DO NOT MERGE am: ea1e82088e -s ours am: 6c22b54c97 -s ours" into nyc-mr1-dev-plus-aosp
2016-06-30 03:15:12 +00:00
Bill Yi
9fde76f19c
Import translations. DO NOT MERGE am: ea1e82088e -s ours
...
am: 6c22b54c97
2016-06-30 03:14:55 +00:00
Bill Yi
28c008d6a3
Import translations. DO NOT MERGE am: ea1e82088e -s ours
...
am: 7d048b49ad
2016-06-30 03:14:54 +00:00
Bill Yi
7d048b49ad
Import translations. DO NOT MERGE
...
am: ea1e82088e
2016-06-30 03:12:28 +00:00
