Commit Graph

13166 Commits

Author SHA1 Message Date
Doris Ling
2ed8651f1f Merge \\"Fix layout transition from Display->Ambient Display to Gestures\\" into nyc-mr1-dev am: 3633058181
am: e4b305a0f0

Change-Id: Iff8d7ff83a301a18482c008f912b0a660a314bc0
2016-07-06 22:29:27 +00:00
Doris Ling
e4b305a0f0 Merge \"Fix layout transition from Display->Ambient Display to Gestures\" into nyc-mr1-dev
am: 3633058181

Change-Id: I75ed59bcdb3cf2382b8bc6fb9eb99f280fc1df72
2016-07-06 22:20:07 +00:00
Doris Ling
3633058181 Merge "Fix layout transition from Display->Ambient Display to Gestures" into nyc-mr1-dev 2016-07-06 22:08:08 +00:00
Fan Zhang
7b410d1e4b Merge \\"Add logging when click tollfree/tolled phone support button\\" into nyc-mr1-dev am: a0eb2997a9
am: 5efd8009df

Change-Id: Iae38dc35b951caaf69f6f0cf771b61b06469fea2
2016-07-06 20:59:52 +00:00
Fan Zhang
5efd8009df Merge \"Add logging when click tollfree/tolled phone support button\" into nyc-mr1-dev
am: a0eb2997a9

Change-Id: I7a0d7e8cf410e05e578690b6ece69d6489fb3d81
2016-07-06 20:56:03 +00:00
TreeHugger Robot
a0eb2997a9 Merge "Add logging when click tollfree/tolled phone support button" into nyc-mr1-dev 2016-07-06 20:44:04 +00:00
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
Doris Ling
9a3cf7725b Fix layout transition from Display->Ambient Display to Gestures
1. Add handling in Gestures settings to scroll to the corresponding
preference when launching from Display->Ambient Display
2. Remove the bitmap creation for the video preview image
3. Use a custom aspect ration framee layout to hold the animation
instead to avoid resizing of the animation view.

Bug: 29795707
Change-Id: I67209ba2508a93da4fc46ff20986309dbe5a83d5
2016-07-06 13:21:08 -07: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
Fan Zhang
ece8ff63b6 Remove search in support tab.
Bug: 29397123
Change-Id: Id2d43724696c04e890adba562b5476e1834779da
2016-07-06 09:54:07 -07: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
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
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
a9f7016acd Add logging when click tollfree/tolled phone support button
Bug: 29105266
Change-Id: Ide67c74b6c072c937f97269ad33800cca68a672d
2016-07-01 11:18:13 -07: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
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
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