Commit Graph

28520 Commits

Author SHA1 Message Date
Mark Salyzyn
fd021e203d Merge "Settings: add logpersist kernel only selection (strings)" 2016-07-08 21:06:29 +00:00
Fan Zhang
0e2c45b5df UI updates for support tab.
am: 48aab452cb

Change-Id: I7d2bb55979e6b2a4dfe944552fe9a50a184fe573
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
Doris Ling
6b1a2a8cc8 Add handling for gesture settings for double twist for camera flip.
Add handling for updating the secure settings for camera double twist
when user updates the on/off toggle, and move
SYSTEM_NAVIGATION_KEYS_ENABLED from Global to Secure.

Bug: 29869445
Change-Id: Iebb937509a661b012688a3eb36efe08d2292ff26
2016-07-08 10:37:16 -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
Makoto Onuki
0651701930 Restore "reset ShortcutManager rate limiting" dev option
Bug 30031093

Change-Id: I28cbf56e61937b15eb5806823f40e43d6bac4e72
2016-07-08 09:37:48 -07:00
Fan Zhang
6e5de35ba4 Merge \"Wrap bluetooth edit content in a scrollview.\" into nyc-mr1-dev
am: 96bc7b5d03

Change-Id: I70717e53ebdc47a658092743e31dc8db0a70d811
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
aca1f81bad Merge \"Add padding for the animation in the gestures settings.\" into nyc-mr1-dev
am: 1b41dd7f8c

Change-Id: I047b71720315408c432b1bd4d430b1724ea48536
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
Fan Zhang
caf4498597 Fix strings for support tab.
am: 4178710f3d

Change-Id: Iaf5c0945180fab00986827f03dd1bdf9b4c224eb
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
93acb63447 Merge \"Use phone number as summary for \'About Phone\'.\" into nyc-mr1-dev
am: 071f62954d

Change-Id: I74ff5bbbe078f450769fcfc8f36bddb221daca69
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
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
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
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
4a1d2c793d resolve merge conflicts of 9968f7a to nyc-mr1-dev-plus-aosp
Change-Id: Ic9a3884cc8bd08eea22d7d83660419ac84555e83
2016-07-06 13:28:19 -07: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
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
b468190a12 Import translations. DO NOT MERGE am: 271f042229 -s ours
am: d2a702e82f  -s ours

Change-Id: I0f93fc30e59e41f59048b491fd784eb154c3d924
2016-07-06 18:32:41 +00:00
Bill Yi
d2a702e82f Import translations. DO NOT MERGE
am: 271f042229  -s ours

Change-Id: Ia494efe0469c9877dc7730c9a57d9be8ea9e30a9
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
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
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
7f4ded6b14 Import translations. DO NOT MERGE am: 271f042229 -s ours
am: 45215ab25b  -s ours

Change-Id: I29d78230052fb90e466fcb8c5e954330e05216a8
2016-07-06 04:37:00 +00:00
Bill Yi
370af158e9 Import translations. DO NOT MERGE
am: a937ff573e  -s ours

Change-Id: I714848e4322a4e2ffb6cabc4f99509ab8536c7bd
2016-07-06 04:36:57 +00:00
Bill Yi
45215ab25b Import translations. DO NOT MERGE
am: 271f042229  -s ours

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