Commit Graph

14339 Commits

Author SHA1 Message Date
Abodunrinwa Toki
6d2a0b6424 Fix order of items in language menu.
Bug: 29571417
Change-Id: I682925afe7fe07f6300197e0b4064525f0799b4f
2016-07-01 11:50:55 +01: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
Daniel Nishi
55f2a8a8b5 Merge \"Add text to the Manage Settings page to show freed storage.\" into nyc-mr1-dev
am: 8c8791a807

Change-Id: I4b09319cf771325d1bbb11214733a45e7b26a3b5
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
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
931c0f92fe Merge \\"Add help url for gestures settings.\\" into nyc-mr1-dev am: 0a7300b8d1
am: 055c48b751

Change-Id: I37d6d591aa8da8689e5721dd97a2fc7d22e645d7
2016-06-30 20:09:33 +00:00
Doris Ling
055c48b751 Merge \"Add help url for gestures settings.\" into nyc-mr1-dev
am: 0a7300b8d1

Change-Id: Ia267524166ed0c9ffb3f517a0c81119d45e7a57b
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
Jason Monk
fab3a5ba85 Pre-setup restrictions
- Don't let user settings run

Bug: 29194585
Change-Id: Ia9c46c7ba04ce2809304bebe8a4c5cdac2108611
2016-06-30 13:16:20 -04:00
Fan Zhang
65db222528 Merge \\"Fix a bug where selected country is reset.\\" into nyc-mr1-dev am: 57824d5aaa
am: 8ea45ff337

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

Change-Id: I1b5c64822a80b9cc493b47a4b7a37fb5a19cf3bb
2016-06-30 17:03:04 +00: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

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
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
Meng Wang
b97b16da91 WiFiCallingSettings: "Update Emergency Address" shouldn't be disabled.
Bug: 29875773
Change-Id: I3a0277c865c12793ffd9039a9724a1a253b461c9
2016-06-29 18:07:55 -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
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
Fan Zhang
d85f11eb97 Merge \\"Show operation hours for selected country\\'s support phone\\" into nyc-mr1-dev am: ab7a6cf828
am: 2768793840

Change-Id: Ib73505b8dd88d725b61cc5d43cc1774ab8cc9694
2016-06-28 18:16:28 +00:00
Fan Zhang
fd82193e37 Merge \\"Show tolled support number when click travel abroad.\\" into nyc-mr1-dev am: 106ff4ff0c
am: 45eb3c04b5

Change-Id: I13303f7c82801212034dc2744adb009b6ce00e43
2016-06-28 18:16:26 +00:00
Fan Zhang
2768793840 Merge \"Show operation hours for selected country\'s support phone\" into nyc-mr1-dev
am: ab7a6cf828

Change-Id: I325c9dcb1469855d3273e42457ee0e0f3d62d8fa
2016-06-28 18:13:20 +00:00