Commit Graph

30261 Commits

Author SHA1 Message Date
TreeHugger Robot
57824d5aaa Merge "Fix a bug where selected country is reset." into nyc-mr1-dev 2016-06-30 16:51:55 +00:00
Jason Monk
e6ad6e866b Pre-setup restrictions DO NOT MERGE
- Prevent external tiles from system apps
 - Don't let user settings run
 - Disable help

Bug: 29194585
Change-Id: I74ab8aaab62d62cc4dbbdf3164429a503f3a572b
2016-06-30 12:50:44 -04:00
Fan Zhang
a418447608 Merge \\"Update UI for support tab.\\" into nyc-mr1-dev am: 0293fb40f2
am: a05a1b15d8

Change-Id: Ib4835e280ed30e690405a745e70d089143b92327
2016-06-30 15:31:15 +00:00
Fan Zhang
a05a1b15d8 Merge \"Update UI for support tab.\" into nyc-mr1-dev
am: 0293fb40f2

Change-Id: I2126800fbd52201ac25a150ec9e8acf66c0526b1
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  -s ours

Change-Id: I8ffe6b20738c79c9f92899840132207716ea65f9
2016-06-30 03:41:06 +00:00
Bill Yi
636cf49c27 Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: ebed4797b1  -s ours

Change-Id: Ifb056a801040c094a25ccb1e9d51f82db32f6d40
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  -s ours

Change-Id: Id30c8f4c1cdc5b075078c786903831a17b3943be
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  -s ours

Change-Id: Idc2b02b2859e221a17351f534897a17a9b9f37dd
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  -s ours

Change-Id: Ie15ea539bd72f49b96641493a77356ac4ebfbac9
2016-06-30 03:14:55 +00:00
Bill Yi
28c008d6a3 Import translations. DO NOT MERGE am: ea1e82088e -s ours
am: 7d048b49ad  -s ours

Change-Id: I98c7e4be1c71c9520d4ce345114f115decbd8633
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  -s ours

Change-Id: Id41fa3b1ed36132ae2e12d4045c6f08c9a4892f5
2016-06-30 03:12:28 +00:00
Bill Yi
6c22b54c97 Import translations. DO NOT MERGE
am: ea1e82088e  -s ours

Change-Id: I442e044b8a5e2027a409feae9b597fae850d7979
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

Change-Id: Ie72dec382011386ff28bb51494e88ee098fd5fdc
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

Change-Id: I1dcab97d1dc6e45c6ed5c88caa57156ce5a26b7d
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

Change-Id: I9305eaebfe680ee47782bc04ae527d3843933e0d
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

Change-Id: I796da8879deede67d28321680b96ff890699c718
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

Change-Id: I868559036cf31fae31be91c1d9e227f17cda42d9
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

Change-Id: I4f780a1e369a7e80db41de0d00afff2d74bce72d
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

Change-Id: I4134323420a89305415561c96ea87abb1cdc812f
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

Change-Id: I88ee4177303737d1622ba9b326610418c7269a58
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

Change-Id: Ifcf6aab49fb5ea989862d8a7b882d17761065f6a
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

Change-Id: Ia1d7a4c28840ed7d3c3be56ab21b71800464d787
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
Fyodor Kupolov
5210fcc801 Merge \\"Lockdown settings in retail demo mode\\" into nyc-mr1-dev am: cc1379bfea
am: 6622af5d10

Change-Id: Iceb6723dc46305c19da98d8f542633e0c7c17f16
2016-06-28 23:18:06 +00:00
Fyodor Kupolov
6622af5d10 Merge \"Lockdown settings in retail demo mode\" into nyc-mr1-dev
am: cc1379bfea

Change-Id: I49c818af2a1f966c60f7ba184cf50fcfcae788ad
2016-06-28 23:14:39 +00:00
Fyodor Kupolov
cc1379bfea Merge "Lockdown settings in retail demo mode" into nyc-mr1-dev 2016-06-28 23:08:46 +00:00
Muyuan Li
5a48c8493f Only shows music stream when using master stream.
Bug: 29446492
Change-Id: I52b686daa21499d0b054f762251c544c263fdec4
(cherry picked from commit ec88e104befb872c0bde99871eec73bf5d705369)
2016-06-28 20:51:32 +00:00
Fan Zhang
f71366d8ef Merge changes from topics \\'offline_operation_hours_part5\\', \\'offline_operation_hours_part4\\' into nyc-mr1-dev am: 734c550c59
am: 0f38866528

Change-Id: Idbdaaf9ab08009e1250b4cf3649e46e8a8340087
2016-06-28 19:34:15 +00:00
Fan Zhang
0f38866528 Merge changes from topics \'offline_operation_hours_part5\', \'offline_operation_hours_part4\' into nyc-mr1-dev
am: 734c550c59

Change-Id: If9d9c8e960fd526e0d6d6df5189ae71de4802421
2016-06-28 19:28:11 +00:00
TreeHugger Robot
734c550c59 Merge changes from topics 'offline_operation_hours_part5', 'offline_operation_hours_part4' into nyc-mr1-dev
* changes:
  Show a static title/summary if country doesn't have support
  By default select current country in support phone list.
2016-06-28 19:20:03 +00:00
Doris Ling
5d1a512934 Update listener for animation in Gesture Settings.
Use onClick listener instead of onTouch listener for handling playback
for the animation video.

Bug: 29779942
Change-Id: Ia30c0c49635fedd7f5afd4873ed1971529b99dcc
2016-06-28 11:55:20 -07:00