Mark Salyzyn
694a4bbcaa
Merge \\\\"Settings: add logpersist kernel only selection (strings)\\\\" am: fd021e203d -s ours am: a79d854fb6 am: f8da6eca1c
...
am: 9d14c80468
2016-07-08 21:48:55 +00:00
Justin Klaassen
1863ffc982
resolve merge conflicts of 67b3a94 to master
...
Change-Id: I8fabdf019fea12793c54745390ed4669118548d0
2016-07-08 14:40:55 -07:00
Mark Salyzyn
9d14c80468
Merge \\\"Settings: add logpersist kernel only selection (strings)\\\" am: fd021e203d -s ours am: a79d854fb6
...
am: f8da6eca1c
2016-07-08 21:29:15 +00:00
Mark Salyzyn
f8da6eca1c
Merge \\"Settings: add logpersist kernel only selection (strings)\\" am: fd021e203d -s ours
...
am: a79d854fb6
2016-07-08 21:26:51 +00:00
Mark Salyzyn
a79d854fb6
Merge \"Settings: add logpersist kernel only selection (strings)\"
...
am: fd021e203d
2016-07-08 21:24:24 +00:00
Justin Klaassen
67b3a94b81
Merge \"Add Night display settings\" into nyc-mr1-dev
...
am: e577ed1b91
2016-07-08 21:15:39 +00:00
Justin Klaassen
e577ed1b91
Merge "Add Night display settings" into nyc-mr1-dev
2016-07-08 21:07:48 +00:00
Mark Salyzyn
fd021e203d
Merge "Settings: add logpersist kernel only selection (strings)"
2016-07-08 21:06:29 +00:00
Fan Zhang
34969b0044
UI updates for support tab. am: 48aab452cb
...
am: 0e2c45b5df
2016-07-08 19:25:11 +00:00
Fan Zhang
0e2c45b5df
UI updates for support tab.
...
am: 48aab452cb
2016-07-08 19:21:26 +00:00
Justin Klaassen
c7cd2982cd
Add Night display settings
...
Bug: 28615069
Change-Id: I2e8a374a00c06c06d419a6ff46cd3b5d544c1d3e
2016-07-08 11:48:02 -07:00
Mark Salyzyn
466abc5f0f
Settings: add logpersist kernel only selection (strings)
...
Bug: 28936216
Bug: 29831823
Change-Id: I4e578bbe2f5bbf936b03fbdac34a225a0432e503
2016-07-08 11:08:05 -07:00
Fan Zhang
48aab452cb
UI updates for support tab.
...
Fixes: 29999181
Fixes: 29397123
- Reduce support tile min height to 48dp.
- Add a 8dp spacer between escalation card and first support tile.
- Show different off-hour support escalation title when support hour is
always avaiable.
Change-Id: I4dacf2b375734c4819b9b19b68fc84faf083c0d4
2016-07-08 10:26:29 -07:00
Fan Zhang
c74925b5dd
Merge \\"Wrap bluetooth edit content in a scrollview.\\" into nyc-mr1-dev am: 96bc7b5d03
...
am: 6e5de35ba4
2016-07-07 21:10:43 +00:00
Fan Zhang
6e5de35ba4
Merge \"Wrap bluetooth edit content in a scrollview.\" into nyc-mr1-dev
...
am: 96bc7b5d03
2016-07-07 21:01:56 +00:00
Fan Zhang
96bc7b5d03
Merge "Wrap bluetooth edit content in a scrollview." into nyc-mr1-dev
2016-07-07 20:30:00 +00:00
Doris Ling
27c6820fb9
Merge \\"Add padding for the animation in the gestures settings.\\" into nyc-mr1-dev am: 1b41dd7f8c
...
am: aca1f81bad
2016-07-07 17:14:51 +00:00
Doris Ling
aca1f81bad
Merge \"Add padding for the animation in the gestures settings.\" into nyc-mr1-dev
...
am: 1b41dd7f8c
2016-07-07 17:11:12 +00:00
Doris Ling
1b41dd7f8c
Merge "Add padding for the animation in the gestures settings." into nyc-mr1-dev
2016-07-07 16:58:40 +00:00
TreeHugger Robot
9298f8c604
Merge "Announce user credential deletions"
2016-07-07 16:54:31 +00:00
Fan Zhang
fb4c548b78
Fix strings for support tab. am: 4178710f3d
...
am: caf4498597
2016-07-07 15:40:16 +00:00
Fan Zhang
caf4498597
Fix strings for support tab.
...
am: 4178710f3d
2016-07-07 15:37:23 +00:00
Fan Zhang
4178710f3d
Fix strings for support tab.
...
Bug: 29105266
- Fix typos in string and comments
- Use 2 different strings for off-hour and off-line cases.
Change-Id: I63859605ff7185d5f8cc66fd31b56f1d09ed11aa
2016-07-07 08:27:25 -07:00
Fan Zhang
8924756a2b
Wrap bluetooth edit content in a scrollview.
...
Bug: 28914094
In split screen the dialog content is too tall to fit in viewport. Wrap
content in a scrollview so user can scroll vertically for different
options, and have a visual indication that content is scrollable.
Change-Id: Ia304dca6747cec6f31e86ccf89003ef6890e0640
2016-07-06 18:18:50 -07:00
Fan Zhang
e2443c0404
Merge \\"Use phone number as summary for \\'About Phone\\'.\\" into nyc-mr1-dev am: 071f62954d
...
am: 93acb63447
2016-07-07 00:27:30 +00:00
Fan Zhang
93acb63447
Merge \"Use phone number as summary for \'About Phone\'.\" into nyc-mr1-dev
...
am: 071f62954d
2016-07-07 00:20:59 +00:00
TreeHugger Robot
071f62954d
Merge "Use phone number as summary for 'About Phone'." into nyc-mr1-dev
2016-07-07 00:14:08 +00:00
Fan Zhang
ad2114e99b
Use phone number as summary for 'About Phone'.
...
Bug: 28419411
Change-Id: I3ac57a770bf4d7416459dadedf91c3d6cefbc6b4
2016-07-06 15:32:29 -07:00
Doris Ling
2ed8651f1f
Merge \\"Fix layout transition from Display->Ambient Display to Gestures\\" into nyc-mr1-dev am: 3633058181
...
am: e4b305a0f0
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
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
Doris Ling
41d06570a4
Add padding for the animation in the gestures settings.
...
Add padding around the animation video in landscape mode to make it look
more proportional.
Bug: 29792743
Change-Id: I52cfcecd680a118741d8ced18afd9fc811a33d94
2016-07-06 14:59:33 -07:00
Fan Zhang
7b410d1e4b
Merge \\"Add logging when click tollfree/tolled phone support button\\" into nyc-mr1-dev am: a0eb2997a9
...
am: 5efd8009df
2016-07-06 20:59:52 +00:00
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
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
