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
d2e91f05b1
Merge \\"Fix some bluetooth theming issues.\\" into nyc-mr1-dev am: 6e1336bff1
...
am: 987c5d07ba
2016-06-30 17:41:44 +00: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
65db222528
Merge \\"Fix a bug where selected country is reset.\\" into nyc-mr1-dev am: 57824d5aaa
...
am: 8ea45ff337
2016-06-30 17:06:04 +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
a418447608
Merge \\"Update UI for support tab.\\" into nyc-mr1-dev am: 0293fb40f2
...
am: a05a1b15d8
2016-06-30 15:31:15 +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
Tony Mak
6330e20b57
Merge "Show info icon when RestrictedListPreference is disabled"
2016-06-30 10:47:29 +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
96e3795f0b
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: ebed4797b1 -s ours
...
am: 636cf49c27
2016-06-30 03:41:06 +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
Bill Yi
2af5ef5928
Merge \"Import translations. DO NOT MERGE am: ea1e82088e -s ours am: 6c22b54c97 -s ours\" into nyc-mr1-dev-plus-aosp
...
am: 68a1509eb6
2016-06-30 03:17:27 +00:00
Bill Yi
e2c3836d42
Import translations. DO NOT MERGE am: ea1e82088e -s ours am: 7d048b49ad -s ours
...
am: 28c008d6a3
2016-06-30 03:17:25 +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
TreeHugger Robot
acf52fa03e
Merge "Import translations. DO NOT MERGE"
2016-06-30 03:12:36 +00:00
Bill Yi
7d048b49ad
Import translations. DO NOT MERGE
...
am: ea1e82088e
2016-06-30 03:12:28 +00:00
Bill Yi
6c22b54c97
Import translations. DO NOT MERGE
...
am: ea1e82088e
2016-06-30 03:12:28 +00:00
Meng Wang
702fafb72e
Merge \\"WiFiCallingSettings: \\"Update Emergency Address\\" shouldn\\'t be disabled.\\" into nyc-mr1-dev am: b831223dea
...
am: f68b06a6a0
2016-06-30 02:54:49 +00:00
Meng Wang
f68b06a6a0
Merge \"WiFiCallingSettings: \"Update Emergency Address\" shouldn\'t be disabled.\" into nyc-mr1-dev
...
am: b831223dea
2016-06-30 02:48:17 +00:00
TreeHugger Robot
b831223dea
Merge "WiFiCallingSettings: "Update Emergency Address" shouldn't be disabled." into nyc-mr1-dev
2016-06-30 02:38:12 +00:00
Bill Yi
f29de0854e
Import translations. DO NOT MERGE
...
Change-Id: Ibe485796993fc2bfad19b2da2ad0b7942a1fd460
Auto-generated-cl: translation import
2016-06-29 18:43:51 -07:00
Bill Yi
ea1e82088e
Import translations. DO NOT MERGE
...
Change-Id: Idaf99e158ee704e8017b7cb832e7f2dda16ff7bd
Auto-generated-cl: translation import
2016-06-29 18:34:49 -07:00
Meng Wang
b97b16da91
WiFiCallingSettings: "Update Emergency Address" shouldn't be disabled.
...
Bug: 29875773
Change-Id: I3a0277c865c12793ffd9039a9724a1a253b461c9
2016-06-29 18:07:55 -07:00
Bill Yi
98921f0397
Import translations. DO NOT MERGE
...
Change-Id: I1431033a7186031c35440012198f592530d54c39
Auto-generated-cl: translation import
2016-06-29 17:55:51 -07:00
Jorim Jaggi
a616a0dd02
Fix ugly flash between boot animation and setup wizard (1/2)
...
When FallbackHome is displayed before the setup wizard, we need to
match the last frame of the boot animation in FallbackHome.
Bug: 29054814
Change-Id: I4f0096d398341c3749820177cebc26dea85cea05
2016-06-29 16:57:33 -07:00
Daniel Nishi
eebd9292f4
Merge \\"Update the deletion helper intent string.\\" into nyc-mr1-dev am: 148a56f156
...
am: e5f78124b8
2016-06-29 21:54:14 +00:00
Daniel Nishi
1b9afaff2b
Add text to the Manage Settings page to show freed storage.
...
Bug: 29643106
Change-Id: Id05dc70e36a690e27cab67fecf921257ed7baf15
2016-06-29 14:48:50 -07:00
Daniel Nishi
e5f78124b8
Merge \"Update the deletion helper intent string.\" into nyc-mr1-dev
...
am: 148a56f156
2016-06-29 21:47:16 +00:00
Daniel Nishi
148a56f156
Merge "Update the deletion helper intent string." into nyc-mr1-dev
2016-06-29 21:37:08 +00:00
Fan Zhang
c2296644a5
Merge \\"UI Tweak: update setting dashboard cards background color.\\" into nyc-mr1-dev am: e5b195b37a
...
am: 3056cb67a4
2016-06-29 18:25:03 +00:00
Fan Zhang
3056cb67a4
Merge \"UI Tweak: update setting dashboard cards background color.\" into nyc-mr1-dev
...
am: e5b195b37a
2016-06-29 18:22:42 +00:00
Fan Zhang
e5b195b37a
Merge "UI Tweak: update setting dashboard cards background color." into nyc-mr1-dev
2016-06-29 18:18:33 +00:00
Doris Ling
f0beb1f0f5
Merge \\"Update listener for animation in Gesture Settings.\\" into nyc-mr1-dev am: b63679157b
...
am: e65dc0d20e
2016-06-29 18:01:34 +00:00
Doris Ling
e65dc0d20e
Merge \"Update listener for animation in Gesture Settings.\" into nyc-mr1-dev
...
am: b63679157b
2016-06-29 17:58:54 +00:00
Tony Mak
2f17085fcf
Show info icon when RestrictedListPreference is disabled
...
Change-Id: Iaafb2dd19bafe3145c5a84e34816f9d192de29cd
Fix: 29766349
2016-06-29 17:51:44 +00:00
Doris Ling
b63679157b
Merge "Update listener for animation in Gesture Settings." into nyc-mr1-dev
2016-06-29 17:49:50 +00:00
Fan Zhang
d89d60d9ca
Update UI for support tab.
...
Bug: 29397123
Bug: 29832054
- Increase spinner dropdown width to contain country names.
- Reduce suggestion counter's right padding.
- Tweak paddings in travel abroad phone dialog.
- Update icon and text for help&feedback / tips&tricks.
Change-Id: Ide52c6f8198d1a13a0fdeb000d7cb9e8c03688ca
2016-06-29 10:02:09 -07:00
Fan Zhang
242a7ef1e8
Fix a bug where selected country is reset.
...
Bug: 29397123
Bug caused by a bad merge.
Change-Id: I6cf4ea8796f712b3d2d9354a9845e9e95eda69b9
2016-06-29 09:39:37 -07:00
Philip P. Moltmann
a9e812d1b3
Merge \\"Setup up print settings fragments in onCreateView instead of onCreate.\\" into nyc-mr1-dev am: 0aad74a387
...
am: d623d3f6d3
2016-06-29 15:07:08 +00:00
Philip P. Moltmann
d623d3f6d3
Merge \"Setup up print settings fragments in onCreateView instead of onCreate.\" into nyc-mr1-dev
...
am: 0aad74a387
2016-06-29 15:04:01 +00:00
Philip P. Moltmann
0aad74a387
Merge "Setup up print settings fragments in onCreateView instead of onCreate." into nyc-mr1-dev
2016-06-29 14:58:03 +00:00
