Fan Zhang
75d38e4b43
resolve merge conflicts of 9968f7a to nyc-mr1-dev-plus-aosp
...
am: 4a1d2c793d
2016-07-06 20:59:51 +00:00
Fan Zhang
5efd8009df
Merge \"Add logging when click tollfree/tolled phone support button\" into nyc-mr1-dev
...
am: a0eb2997a9
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
4a1d2c793d
resolve merge conflicts of 9968f7a to nyc-mr1-dev-plus-aosp
...
Change-Id: Ic9a3884cc8bd08eea22d7d83660419ac84555e83
2016-07-06 13:28:19 -07:00
Fan Zhang
121a654084
Merge \\"Remove search in support tab.\\" into nyc-mr1-dev am: bae81b4a6f
...
am: afa4fff821
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
2016-07-06 20:14:46 +00:00
TreeHugger Robot
9968f7a752
Merge "Show 'up arrow' in About phone->Status menu." into nyc-mr1-dev
2016-07-06 20:09:44 +00:00
Fan Zhang
bae81b4a6f
Merge "Remove search in support tab." into nyc-mr1-dev
2016-07-06 20:09:10 +00:00
Bill Yi
0dc7e4e116
Import translations. DO NOT MERGE am: 271f042229 -s ours am: d2a702e82f -s ours
...
am: b468190a12
2016-07-06 18:39:54 +00:00
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
Maurice Lam
584a11ec4a
Update button styles for fingerprint
...
Use button styles instead of list style because of UX spec change.
Bug: 29421687
Change-Id: Icf178c881c2325b6183de8667a5657b3d2088f72
2016-07-06 18:15:06 +00:00
Victor Chang
fcb0d74a3c
Fix always-on is not turned off when user forgets vpn
...
Change-Id: Iad285ff06abde71ef040cbb29f740bcf20c3bbb7
Fix: 29991174
2016-07-06 18:27:55 +01:00
Fan Zhang
ece8ff63b6
Remove search in support tab.
...
Bug: 29397123
Change-Id: Id2d43724696c04e890adba562b5476e1834779da
2016-07-06 09:54:07 -07:00
Justin Klaassen
d770c05f6e
Ensure classes used via XML are kept by proguard
...
Bug: 29795762
- Keep MenuItem onClick methods.
- Keep View subclasses and animatable properties.
Change-Id: I4449c8d6caee1d499d8816e62ffc482661df6bea
2016-07-06 12:19:10 +00:00
Robin Lee
1c9c4b724f
Merge \\"Don\\'t show always-on option connecting PPTP vpn\\" into nyc-mr1-dev am: 1926ed9f83
...
am: 2ac7bc0565
2016-07-06 10:38:22 +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
a63c20b3b6
Merge \\"Show info icon when RestrictedListPreference is disabled\\" into nyc-mr1-dev am: b0a4c897ac
...
am: b62a70db93
2016-07-06 09:10: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
ca2d7746fd
Import translations. DO NOT MERGE am: 271f042229 -s ours am: 45215ab25b -s ours
...
am: 7f4ded6b14
2016-07-06 04:42:33 +00:00
Bill Yi
9a4b5e64b8
Import translations. DO NOT MERGE am: a937ff573e -s ours
...
am: 370af158e9
2016-07-06 04:42:31 +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
Bill Yi
246bcb7b41
Import translations. DO NOT MERGE
...
Change-Id: I9292d04c0981f742b5a71403c58509f1fd4e4d4c
Auto-generated-cl: translation import
2016-07-05 19:05:09 -07: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
Fan Zhang
47e2b976a0
Show 'up arrow' in About phone->Status menu.
...
Bug: 27970152
Status should be a Submenu to have up arrow. Also cleaned up
AndroidManifest for this fragment as it doesn't need to run in a
separate process.
Change-Id: I0610314b3baa3d5f1f70d255b4657c805c534373
2016-07-01 16:51:49 -07:00
Doris Ling
57949a9784
Merge \\"Update Backup & reset settings to launch the configured activity.\\" into nyc-mr1-dev am: f230f4f9ad
...
am: 0fbf0fd198
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
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
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
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
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
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
2016-07-01 15:38:47 +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
Abodunrinwa Toki
6d2a0b6424
Fix order of items in language menu.
...
Bug: 29571417
Change-Id: I682925afe7fe07f6300197e0b4064525f0799b4f
2016-07-01 11:50:55 +01:00
Bill Yi
d05dde8166
Import translations. DO NOT MERGE am: bb3e765b77 -s ours am: 57d0077833 -s ours
...
am: 5b1a3a40c5
2016-07-01 05:39:47 +00:00
