OSDN Git Service
Fan Zhang [Tue, 12 Jul 2016 21:33:06 +0000 (21:33 +0000)]
Merge \"Use app name as summary in default home app setting.\" into nyc-mr1-dev
am:
0fd709bf44
Change-Id: Ie2ea62621d24f8c2d6867fb6b8f4c3b00c57333d
TreeHugger Robot [Tue, 12 Jul 2016 21:26:11 +0000 (21:26 +0000)]
Merge "Use app name as summary in default home app setting." into nyc-mr1-dev
Fan Zhang [Mon, 11 Jul 2016 22:25:03 +0000 (15:25 -0700)]
Use app name as summary in default home app setting.
Bug:
27834147
Condition: Only use app name as summary if there is only 1 launcher app
installed.
Change-Id: Idb9b55d5618bbdbea6446758f2fcd09d0d6309af
Bill Yi [Tue, 12 Jul 2016 16:53:42 +0000 (16:53 +0000)]
Import translations. DO NOT MERGE am:
fdb2a9ab61 -s ours
am:
f7e4533931 -s ours
Change-Id: Ie0091e08de1cd14903989b1a133cfeb3ddd2ed3f
Bill Yi [Tue, 12 Jul 2016 16:53:41 +0000 (16:53 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
7b2e48bc53 -s ours
Change-Id: Ib90da04c38aec52e7d8932f387ad477ade3807a8
Bill Yi [Tue, 12 Jul 2016 16:41:10 +0000 (16:41 +0000)]
Import translations. DO NOT MERGE am:
fdb2a9ab61 -s ours
am:
60761866e5 -s ours
Change-Id: I0c8e63469275a91fe0b75b67062bb686cb055d3d
Bill Yi [Tue, 12 Jul 2016 16:35:07 +0000 (16:35 +0000)]
Import translations. DO NOT MERGE
am:
fdb2a9ab61 -s ours
Change-Id: I9e66dac2b329ad2f6065a5208b8da471b14f66e7
Bill Yi [Tue, 12 Jul 2016 16:31:39 +0000 (16:31 +0000)]
Import translations. DO NOT MERGE
am:
fdb2a9ab61 -s ours
Change-Id: Ica3d0c2c2fcc40034c93cd26e5596961dff32473
TreeHugger Robot [Tue, 12 Jul 2016 16:18:53 +0000 (16:18 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Mark Salyzyn [Tue, 12 Jul 2016 15:35:14 +0000 (15:35 +0000)]
Merge \\\"Settings: add logpersist kernel only selection\\\" am:
3c60540078 am:
bd900c98ef
am:
364322a81d
Change-Id: I46f8b760043a4cafcb1798479f10a623776a0f7b
Mark Salyzyn [Tue, 12 Jul 2016 15:32:34 +0000 (15:32 +0000)]
Merge \\"Settings: add logpersist kernel only selection\\" am:
3c60540078
am:
bd900c98ef
Change-Id: I4fea0151e3bf5fb9d0ee14a333eac4ddaa16c5f3
Mark Salyzyn [Tue, 12 Jul 2016 15:29:51 +0000 (15:29 +0000)]
Merge \"Settings: add logpersist kernel only selection\"
am:
3c60540078
Change-Id: Ieefd7e08368174f735b8491f8f01847906e1fd3b
Treehugger Robot [Tue, 12 Jul 2016 15:24:10 +0000 (15:24 +0000)]
Merge "Settings: add logpersist kernel only selection"
Mark Salyzyn [Thu, 7 Jul 2016 19:38:50 +0000 (12:38 -0700)]
Settings: add logpersist kernel only selection
Bug:
28936216
Bug:
29831823
Change-Id: I9bfbb2717c2d4d39bfda6b92221a38985a4f4973
Julia Reynolds [Tue, 12 Jul 2016 14:08:26 +0000 (14:08 +0000)]
Merge \"Correct logic for showing overide dnd field.\" into nyc-mr1-dev
am:
42d2fda721
Change-Id: I34ad6825441eb154fb767e24857119561b2855ed
Julia Reynolds [Tue, 12 Jul 2016 14:03:12 +0000 (14:03 +0000)]
Merge "Correct logic for showing overide dnd field." into nyc-mr1-dev
Tony Mak [Tue, 12 Jul 2016 13:52:31 +0000 (13:52 +0000)]
Remove KeyboardView in ChooseLockPassword
am:
9c26c9dba6
Change-Id: I740daffa8a7e9c4d0fa686dc22043a9de518f473
Tony Mak [Tue, 12 Jul 2016 13:52:31 +0000 (13:52 +0000)]
Visualize password requirements and their fulfillment
am:
0bbcdccdbf
Change-Id: Iad89b5aa1a94c12edeebf42be6c8c380f27bd4ff
Tony Mak [Fri, 1 Jul 2016 12:55:47 +0000 (13:55 +0100)]
Remove KeyboardView in ChooseLockPassword
1. We actually use user installed keyboard
2. Request focus on the edittext instead of the keyboard
Bug:
24900754
Change-Id: I6257a592ad34875d46c5c05349098b891ef37d98
Tony Mak [Tue, 12 Jul 2016 10:19:45 +0000 (11:19 +0100)]
Visualize password requirements and their fulfillment
1. Aggregate policies and generate the requirements
2. When user modifies the password, check is each requirement fulfilled
Update the view accordingly.
Change-Id: I962ed3b81ce844006be1024a493e94ce52a3fdec
Fix:
24900754
Tony Mak [Tue, 12 Jul 2016 07:04:17 +0000 (07:04 +0000)]
Update work challenge strings
am:
9a8e5a7f25
Change-Id: I767c864b9e96df909b03c5e0ce449125f89c3f83
Tony Mak [Tue, 5 Jul 2016 06:48:53 +0000 (07:48 +0100)]
Update work challenge strings
Change-Id: I9c938c9a9547ec92d7ba7b452861db174e421068
Fix:
29358023
Maurice Lam [Tue, 12 Jul 2016 02:01:46 +0000 (02:01 +0000)]
Merge \"Update button styles for fingerprint\" into nyc-mr1-dev
am:
68d65abaaa
Change-Id: I718eb92c675f186b1450c378ce1c6589a862862b
Maurice Lam [Tue, 12 Jul 2016 01:51:11 +0000 (01:51 +0000)]
Merge "Update button styles for fingerprint" into nyc-mr1-dev
Doris Ling [Mon, 11 Jul 2016 22:28:52 +0000 (22:28 +0000)]
Merge \"Disable Gestures Settings by default.\" into nyc-mr1-dev
am:
709aa539c8
Change-Id: I164c244613a9d58b7e2f5ec37d144385d577ccdd
Doris Ling [Mon, 11 Jul 2016 22:21:25 +0000 (22:21 +0000)]
Merge "Disable Gestures Settings by default." into nyc-mr1-dev
Maurice Lam [Mon, 11 Jul 2016 21:45:36 +0000 (21:45 +0000)]
Merge \"Fix PIN screen title\" into nyc-mr1-dev
am:
79321c480f
Change-Id: Ia2c432d0692a9a7bf9fd3f1277f79d25d4e1ead9
Maurice Lam [Mon, 11 Jul 2016 21:33:04 +0000 (21:33 +0000)]
Merge "Fix PIN screen title" into nyc-mr1-dev
Bill Yi [Mon, 11 Jul 2016 19:53:47 +0000 (12:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7b972f861006fd59590ca433f16f6f794c792161
Auto-generated-cl: translation import
Bill Yi [Mon, 11 Jul 2016 19:42:47 +0000 (12:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I945ac4865ce29fb45b0e0935cadbdc0dd3ab3ce7
Auto-generated-cl: translation import
Doris Ling [Mon, 11 Jul 2016 19:00:18 +0000 (12:00 -0700)]
Disable Gestures Settings by default.
Add a config boolean to determine if the gesture settings is enabled or
not.
Bug:
30022840
Change-Id: Ie7ae8bedbfc128b64999d33a3d626d4e311e5e3e
Makoto Onuki [Mon, 11 Jul 2016 18:09:18 +0000 (18:09 +0000)]
Merge \"Restore \"reset ShortcutManager rate limiting\" dev option\" into nyc-mr1-dev
am:
ed9aed1878
Change-Id: If095c72ed03bbae493259479c6b23a862e71db4c
Makoto Onuki [Mon, 11 Jul 2016 17:54:27 +0000 (17:54 +0000)]
Merge "Restore "reset ShortcutManager rate limiting" dev option" into nyc-mr1-dev
Maurice Lam [Sat, 9 Jul 2016 01:38:48 +0000 (18:38 -0700)]
Fix PIN screen title
Set the header text of the screen after Activity.setTitle is called,
so that the PIN screen will show the PIN text as header, as opposed to
the default which is always "password".
Bug:
30041779
Change-Id: I525bd4e5c51252410fdeb0424329bbfbd86e5b7d
Victor Chang [Mon, 11 Jul 2016 14:08:09 +0000 (14:08 +0000)]
Merge \"Fix always-on is not turned off when user forgets vpn\" into nyc-mr1-dev
am:
9505b78e29
Change-Id: I60148caf5e9bd37ae2c0460e6c8a8d6aacf478aa
Victor Chang [Mon, 11 Jul 2016 13:56:07 +0000 (13:56 +0000)]
Merge "Fix always-on is not turned off when user forgets vpn" into nyc-mr1-dev
Julia Reynolds [Mon, 11 Jul 2016 13:05:44 +0000 (09:05 -0400)]
Correct logic for showing overide dnd field.
Change-Id: Iae1d053d3816ccdae9f6d9bc6a16622b50e07440
Fixes:
29995563
Doris Ling [Sat, 9 Jul 2016 00:03:11 +0000 (00:03 +0000)]
Merge \"Add handling for gesture settings for double twist for camera flip.\" into nyc-mr1-dev
am:
94c8f7ea7e
Change-Id: I28cec18b2f9df53b0a48f7668311e1d4120cb636
Doris Ling [Fri, 8 Jul 2016 23:58:45 +0000 (23:58 +0000)]
Merge "Add handling for gesture settings for double twist for camera flip." into nyc-mr1-dev
Doris Ling [Fri, 8 Jul 2016 23:23:35 +0000 (23:23 +0000)]
Merge \"Change gesture settings for Ambient Display from nudge to double tap.\" into nyc-mr1-dev
am:
8ba6e6a792
Change-Id: Ib76c7172feddc578c4f276098e58c050cd4c6f8e
Doris Ling [Fri, 8 Jul 2016 23:16:36 +0000 (23:16 +0000)]
Merge "Change gesture settings for Ambient Display from nudge to double tap." into nyc-mr1-dev
Doris Ling [Fri, 8 Jul 2016 23:03:44 +0000 (23:03 +0000)]
Merge \"Add summary for Settings->Gestures.\" into nyc-mr1-dev
am:
f46dabcf0f
Change-Id: I1754736fb69495e5601b2e13038e30df1482b792
Doris Ling [Fri, 8 Jul 2016 22:56:45 +0000 (22:56 +0000)]
Merge "Add summary for Settings->Gestures." into nyc-mr1-dev
Mark Salyzyn [Fri, 8 Jul 2016 21:29:15 +0000 (21:29 +0000)]
Merge \\\"Settings: add logpersist kernel only selection (strings)\\\" am:
fd021e203d -s ours am:
a79d854fb6
am:
f8da6eca1c
Change-Id: Ic56f36df562ded8e353977b1d468732414b9c5eb
Mark Salyzyn [Fri, 8 Jul 2016 21:26:51 +0000 (21:26 +0000)]
Merge \\"Settings: add logpersist kernel only selection (strings)\\" am:
fd021e203d -s ours
am:
a79d854fb6
Change-Id: I06daa419b00c21c3ed981ff674023e3d1d5b1719
Doris Ling [Fri, 8 Jul 2016 19:42:13 +0000 (12:42 -0700)]
Change gesture settings for Ambient Display from nudge to double tap.
Change the description text and animation video to double tap the device
instead of nudge movement. Also update the summary text in
Display->Ambient Display to match the gesture description.
Bug:
30034987
Change-Id: If95e7a417b472dd677174a8187a83594e06e0eee
Mark Salyzyn [Fri, 8 Jul 2016 21:24:24 +0000 (21:24 +0000)]
Merge \"Settings: add logpersist kernel only selection (strings)\"
am:
fd021e203d -s ours
Change-Id: I3eebcf646fa289462caf57b51846cee93a7774c0
Justin Klaassen [Fri, 8 Jul 2016 21:15:39 +0000 (21:15 +0000)]
Merge \"Add Night display settings\" into nyc-mr1-dev
am:
e577ed1b91
Change-Id: I2d3aa5fdd00ccf0fe5dbb55468504b59cc8c8bbb
Doris Ling [Fri, 8 Jul 2016 18:35:27 +0000 (11:35 -0700)]
Add summary for Settings->Gestures.
Add summary text for gesture settings.
Bug:
30034888
Change-Id: I15128b6e533b279ca5da98bf4f0e042dd93a0d02
Justin Klaassen [Fri, 8 Jul 2016 21:07:47 +0000 (21:07 +0000)]
Merge "Add Night display settings" into nyc-mr1-dev
Mark Salyzyn [Fri, 8 Jul 2016 21:06:29 +0000 (21:06 +0000)]
Merge "Settings: add logpersist kernel only selection (strings)"
Fan Zhang [Fri, 8 Jul 2016 19:21:26 +0000 (19:21 +0000)]
UI updates for support tab.
am:
48aab452cb
Change-Id: I7d2bb55979e6b2a4dfe944552fe9a50a184fe573
Justin Klaassen [Wed, 22 Jun 2016 01:32:04 +0000 (18:32 -0700)]
Add Night display settings
Bug:
28615069
Change-Id: I2e8a374a00c06c06d419a6ff46cd3b5d544c1d3e
Mark Salyzyn [Thu, 7 Jul 2016 18:30:32 +0000 (11:30 -0700)]
Settings: add logpersist kernel only selection (strings)
Bug:
28936216
Bug:
29831823
Change-Id: I4e578bbe2f5bbf936b03fbdac34a225a0432e503
Doris Ling [Wed, 6 Jul 2016 20:44:26 +0000 (13:44 -0700)]
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
Fan Zhang [Thu, 7 Jul 2016 23:44:05 +0000 (16:44 -0700)]
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
Makoto Onuki [Fri, 8 Jul 2016 16:17:25 +0000 (09:17 -0700)]
Restore "reset ShortcutManager rate limiting" dev option
Bug
30031093
Change-Id: I28cbf56e61937b15eb5806823f40e43d6bac4e72
Fan Zhang [Thu, 7 Jul 2016 21:01:56 +0000 (21:01 +0000)]
Merge \"Wrap bluetooth edit content in a scrollview.\" into nyc-mr1-dev
am:
96bc7b5d03
Change-Id: I70717e53ebdc47a658092743e31dc8db0a70d811
Fan Zhang [Thu, 7 Jul 2016 20:30:00 +0000 (20:30 +0000)]
Merge "Wrap bluetooth edit content in a scrollview." into nyc-mr1-dev
Doris Ling [Thu, 7 Jul 2016 17:11:12 +0000 (17:11 +0000)]
Merge \"Add padding for the animation in the gestures settings.\" into nyc-mr1-dev
am:
1b41dd7f8c
Change-Id: I047b71720315408c432b1bd4d430b1724ea48536
Doris Ling [Thu, 7 Jul 2016 16:58:40 +0000 (16:58 +0000)]
Merge "Add padding for the animation in the gestures settings." into nyc-mr1-dev
Fan Zhang [Thu, 7 Jul 2016 15:37:23 +0000 (15:37 +0000)]
Fix strings for support tab.
am:
4178710f3d
Change-Id: Iaf5c0945180fab00986827f03dd1bdf9b4c224eb
Fan Zhang [Thu, 7 Jul 2016 00:07:37 +0000 (17:07 -0700)]
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
Fan Zhang [Wed, 6 Jul 2016 23:40:34 +0000 (16:40 -0700)]
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
Fan Zhang [Thu, 7 Jul 2016 00:20:59 +0000 (00:20 +0000)]
Merge \"Use phone number as summary for \'About Phone\'.\" into nyc-mr1-dev
am:
071f62954d
Change-Id: I74ff5bbbe078f450769fcfc8f36bddb221daca69
TreeHugger Robot [Thu, 7 Jul 2016 00:14:07 +0000 (00:14 +0000)]
Merge "Use phone number as summary for 'About Phone'." into nyc-mr1-dev
Fan Zhang [Wed, 6 Jul 2016 19:17:54 +0000 (12:17 -0700)]
Use phone number as summary for 'About Phone'.
Bug:
28419411
Change-Id: I3ac57a770bf4d7416459dadedf91c3d6cefbc6b4
Doris Ling [Wed, 6 Jul 2016 22:20:07 +0000 (22:20 +0000)]
Merge \"Fix layout transition from Display->Ambient Display to Gestures\" into nyc-mr1-dev
am:
3633058181
Change-Id: I75ed59bcdb3cf2382b8bc6fb9eb99f280fc1df72
Doris Ling [Wed, 6 Jul 2016 22:08:08 +0000 (22:08 +0000)]
Merge "Fix layout transition from Display->Ambient Display to Gestures" into nyc-mr1-dev
Doris Ling [Wed, 6 Jul 2016 21:59:33 +0000 (14:59 -0700)]
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
Fan Zhang [Wed, 6 Jul 2016 20:56:03 +0000 (20:56 +0000)]
Merge \"Add logging when click tollfree/tolled phone support button\" into nyc-mr1-dev
am:
a0eb2997a9
Change-Id: I7a0d7e8cf410e05e578690b6ece69d6489fb3d81
TreeHugger Robot [Wed, 6 Jul 2016 20:44:04 +0000 (20:44 +0000)]
Merge "Add logging when click tollfree/tolled phone support button" into nyc-mr1-dev
Fan Zhang [Wed, 6 Jul 2016 20:28:19 +0000 (13:28 -0700)]
resolve merge conflicts of
9968f7a to nyc-mr1-dev-plus-aosp
Change-Id: Ic9a3884cc8bd08eea22d7d83660419ac84555e83
Doris Ling [Fri, 1 Jul 2016 01:58:40 +0000 (18:58 -0700)]
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
Fan Zhang [Wed, 6 Jul 2016 20:14:46 +0000 (20:14 +0000)]
Merge \"Remove search in support tab.\" into nyc-mr1-dev
am:
bae81b4a6f
Change-Id: I59e7b9dffd8c488397b6904928e6c56a4ad0664d
TreeHugger Robot [Wed, 6 Jul 2016 20:09:43 +0000 (20:09 +0000)]
Merge "Show 'up arrow' in About phone->Status menu." into nyc-mr1-dev
Fan Zhang [Wed, 6 Jul 2016 20:09:10 +0000 (20:09 +0000)]
Merge "Remove search in support tab." into nyc-mr1-dev
Bill Yi [Wed, 6 Jul 2016 18:32:41 +0000 (18:32 +0000)]
Import translations. DO NOT MERGE am:
271f042229 -s ours
am:
d2a702e82f -s ours
Change-Id: I0f93fc30e59e41f59048b491fd784eb154c3d924
Bill Yi [Wed, 6 Jul 2016 18:25:17 +0000 (18:25 +0000)]
Import translations. DO NOT MERGE
am:
271f042229 -s ours
Change-Id: Ia494efe0469c9877dc7730c9a57d9be8ea9e30a9
Maurice Lam [Mon, 27 Jun 2016 19:59:12 +0000 (12:59 -0700)]
Update button styles for fingerprint
Use button styles instead of list style because of UX spec change.
Bug:
29421687
Change-Id: Icf178c881c2325b6183de8667a5657b3d2088f72
Victor Chang [Wed, 6 Jul 2016 17:27:55 +0000 (18:27 +0100)]
Fix always-on is not turned off when user forgets vpn
Change-Id: Iad285ff06abde71ef040cbb29f740bcf20c3bbb7
Fix:
29991174
Fan Zhang [Thu, 30 Jun 2016 20:20:12 +0000 (13:20 -0700)]
Remove search in support tab.
Bug:
29397123
Change-Id: Id2d43724696c04e890adba562b5476e1834779da
Robin Lee [Wed, 6 Jul 2016 10:35:11 +0000 (10:35 +0000)]
Merge \"Don\'t show always-on option connecting PPTP vpn\" into nyc-mr1-dev
am:
1926ed9f83
Change-Id: I98de935857099b26946a66a884908cdcf470e11a
Robin Lee [Wed, 6 Jul 2016 10:30:12 +0000 (10:30 +0000)]
Merge "Don't show always-on option connecting PPTP vpn" into nyc-mr1-dev
Tony Mak [Wed, 6 Jul 2016 09:07:02 +0000 (09:07 +0000)]
Merge \"Show info icon when RestrictedListPreference is disabled\" into nyc-mr1-dev
am:
b0a4c897ac
Change-Id: Ic9f17f748d414e7c5307d4e81d79a1a55a444091
Tony Mak [Wed, 6 Jul 2016 09:01:37 +0000 (09:01 +0000)]
Merge "Show info icon when RestrictedListPreference is disabled" into nyc-mr1-dev
Bill Yi [Wed, 6 Jul 2016 04:37:00 +0000 (04:37 +0000)]
Import translations. DO NOT MERGE am:
271f042229 -s ours
am:
45215ab25b -s ours
Change-Id: I29d78230052fb90e466fcb8c5e954330e05216a8
Bill Yi [Wed, 6 Jul 2016 04:36:57 +0000 (04:36 +0000)]
Import translations. DO NOT MERGE
am:
a937ff573e -s ours
Change-Id: I714848e4322a4e2ffb6cabc4f99509ab8536c7bd
Bill Yi [Wed, 6 Jul 2016 04:26:32 +0000 (04:26 +0000)]
Import translations. DO NOT MERGE
am:
271f042229 -s ours
Change-Id: I2286ee629008672002f36dcca7f505898a40d1dd
Bill Yi [Wed, 6 Jul 2016 02:52:46 +0000 (19:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3df812343b69d4e10d3fa2876913a4c7f5698c89
Auto-generated-cl: translation import
Bill Yi [Wed, 6 Jul 2016 02:42:12 +0000 (19:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idce951754c8e74f8e6370dc1ad03cebfce4db3c6
Auto-generated-cl: translation import
Tony Mak [Tue, 28 Jun 2016 15:30:38 +0000 (16:30 +0100)]
Show info icon when RestrictedListPreference is disabled
Fix:
29766349
Fan Zhang [Fri, 1 Jul 2016 23:46:51 +0000 (16:46 -0700)]
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
Doris Ling [Fri, 1 Jul 2016 20:33:11 +0000 (20:33 +0000)]
Merge \"Update Backup & reset settings to launch the configured activity.\" into nyc-mr1-dev
am:
f230f4f9ad
Change-Id: I24c3976e863e1a9db02dbf1fee07358e52b72269
Doris Ling [Fri, 1 Jul 2016 20:15:59 +0000 (20:15 +0000)]
Merge "Update Backup & reset settings to launch the configured activity." into nyc-mr1-dev
Doris Ling [Thu, 16 Jun 2016 01:16:09 +0000 (18:16 -0700)]
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
Fan Zhang [Fri, 1 Jul 2016 18:31:18 +0000 (18:31 +0000)]
Merge \"Update escalation cards layout and data binding.\" into nyc-mr1-dev
am:
eef9dbcdb9
Change-Id: I1d5d80d7c60b72f0cb4d8d9eb91679000f278f6d
Fan Zhang [Fri, 1 Jul 2016 00:30:29 +0000 (17:30 -0700)]
Add logging when click tollfree/tolled phone support button
Bug:
29105266
Change-Id: Ide67c74b6c072c937f97269ad33800cca68a672d
Fan Zhang [Fri, 1 Jul 2016 18:17:38 +0000 (18:17 +0000)]
Merge "Update escalation cards layout and data binding." into nyc-mr1-dev
Jason Monk [Fri, 1 Jul 2016 16:07:01 +0000 (16:07 +0000)]
Merge \"Remove dead code that could have a memory leak\" into nyc-mr1-dev
am:
d1e94a10eb
Change-Id: I9c9f6f5cce2ff475148d498896dc36f0b381c977