OSDN Git Service
Bill Yi [Wed, 23 Nov 2016 23:44:25 +0000 (23:44 +0000)]
Import translations. DO NOT MERGE am:
475763d01c -s ours am:
9a22968ff8 -s ours
am:
88b043714b -s ours
Change-Id: I733c0d9fc99ffe62dc43ff32e0d9067ab2e1fa23
Bill Yi [Wed, 23 Nov 2016 23:28:12 +0000 (23:28 +0000)]
Import translations. DO NOT MERGE am:
475763d01c -s ours
am:
9a22968ff8 -s ours
Change-Id: Ic98ab45a4b2e31007a18e7018ad5f31c2b82d2ae
Bill Yi [Mon, 21 Nov 2016 01:33:23 +0000 (01:33 +0000)]
Import translations. DO NOT MERGE am:
001632d55c -s ours
am:
9e17133192 -s ours
Change-Id: Idda03611e22b67dba524f61ac9884de84950d962
Bill Yi [Mon, 21 Nov 2016 01:28:26 +0000 (01:28 +0000)]
Import translations. DO NOT MERGE
am:
001632d55c -s ours
Change-Id: Ib267ac961a6ef99c9c1401e8967725b0f7914bac
Bill Yi [Mon, 21 Nov 2016 00:12:14 +0000 (16:12 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32177112
Change-Id: Id8af490796464cb8422fa4be023af34baee73002
Jerry Zhang [Thu, 17 Nov 2016 00:39:37 +0000 (00:39 +0000)]
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" am:
89a055aa9d am:
1451a4af78
am:
3473bc219e
Change-Id: I6064f90dcde32ccc5132fd5999224a99c7e378b0
Jerry Zhang [Thu, 17 Nov 2016 00:39:22 +0000 (00:39 +0000)]
Refactor setCurrentFunction and setUsbDataUnlocked into one method am:
a1b60e629f am:
a75fa91247
am:
fd764ac0e3
Change-Id: Iee63263785e80cb1a893dc99204bb2fb225a497a
Jerry Zhang [Thu, 17 Nov 2016 00:24:57 +0000 (00:24 +0000)]
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" am:
89a055aa9d
am:
1451a4af78
Change-Id: I90048a233d80ee023e9f775b540248b62aa5e4ea
Jerry Zhang [Thu, 17 Nov 2016 00:24:50 +0000 (00:24 +0000)]
Refactor setCurrentFunction and setUsbDataUnlocked into one method am:
a1b60e629f
am:
a75fa91247
Change-Id: I70fdc7a2d4bfa40e315a4de172dbcee22d666cc6
Jerry Zhang [Thu, 17 Nov 2016 00:12:59 +0000 (00:12 +0000)]
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method"
am:
89a055aa9d
Change-Id: I8bad2864a848b46c99e2693acacb320615338ec8
Jerry Zhang [Thu, 17 Nov 2016 00:09:38 +0000 (00:09 +0000)]
Refactor setCurrentFunction and setUsbDataUnlocked into one method
am:
a1b60e629f
Change-Id: I0ed28df5f24e7fe545f968c4d65cfc0494b57ebd
Jerry Zhang [Wed, 16 Nov 2016 23:59:32 +0000 (23:59 +0000)]
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method"
Sohani Rao [Mon, 14 Nov 2016 21:28:16 +0000 (21:28 +0000)]
Merge "Add WiFi toggle prompts - settings" am:
b4b2c2aa43 am:
6f126a8f5c
am:
6cebca2599
Change-Id: I8cfaadb7dd8df6d81695dea8530a25de69fcce3d
Sohani Rao [Mon, 14 Nov 2016 21:21:49 +0000 (21:21 +0000)]
Merge "Add WiFi toggle prompts - settings" am:
b4b2c2aa43
am:
6f126a8f5c
Change-Id: I327d6c864ce58c21a74d628d1945f86ff518234c
Sohani Rao [Mon, 14 Nov 2016 21:14:54 +0000 (21:14 +0000)]
Merge "Add WiFi toggle prompts - settings"
am:
b4b2c2aa43
Change-Id: Idef71123fde9475a549a1ccab136564ccf3d4a4a
Sohani Rao [Mon, 14 Nov 2016 20:59:35 +0000 (20:59 +0000)]
Merge "Add WiFi toggle prompts - settings"
Bill Yi [Mon, 14 Nov 2016 19:44:02 +0000 (19:44 +0000)]
Import translations. DO NOT MERGE
am:
d13efff7aa -s ours
Change-Id: I03a2044f78ee22bc152cabc2a3c338aacd9f37fe
Svetoslav Ganov [Wed, 27 Jul 2016 01:26:45 +0000 (18:26 -0700)]
Add WiFi toggle prompts - settings
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.
Bug:
28715749
Test: Unit tests
Change-Id: I10d1231ea0c47eec5993dbe367cc0c245cba9385
Merged-In: I10d1231ea0c47eec5993dbe367cc0c245cba9385
Bill Yi [Mon, 14 Nov 2016 17:50:59 +0000 (09:50 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32839141
Change-Id: I6145b97714693ec78cbc8b7d2235ed5830e7f714
Bill Yi [Sat, 5 Nov 2016 06:44:39 +0000 (06:44 +0000)]
Import translations. DO NOT MERGE
am:
416fa38e75 -s ours
Change-Id: Idfc5c51e90e9ccfb84256f532250ca5cfdf2a0a1
Bill Yi [Sat, 5 Nov 2016 05:19:32 +0000 (22:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I64f7cc447bbacc64f2993230946f87258496824a
Auto-generated-cl: translation import
Stephen Chen [Fri, 4 Nov 2016 17:22:30 +0000 (17:22 +0000)]
Add subtypes to tron logging for Wifi toggles.
am:
b21815e320
Change-Id: Ia08aa862e311dba4af08a1a76c0083519dcdeeb9
Stephen Chen [Mon, 31 Oct 2016 19:59:41 +0000 (12:59 -0700)]
Add subtypes to tron logging for Wifi toggles.
For ACTION_WIFI_CONNECT, added subtype to specify whether user is
connecting to saved network.
For ACTION_WIFI_OFF, added subtype to specify whether user was connected
to a network at the time.
Bug:
32371451
Test: Verify logs by running:
adb logcat -b events | egrep '(sysui_|notification_)'
Merged-In: I1d4445bda2fbeb062831e6f858ccc711bff65105
Change-Id: I6b87dc10fcfe412f1c72ae944c2dd4d81da12b53
Juan Flores [Wed, 2 Nov 2016 16:47:33 +0000 (16:47 +0000)]
Merge "Fix crash while searching in Settings" am:
176c0c5d98 am:
d705a333ca
am:
16455893d7
Change-Id: Ic41c29b7d3ba2c90e4c375c843ea8532b236f4a4
Juan Flores [Wed, 2 Nov 2016 16:45:03 +0000 (16:45 +0000)]
Merge "Fix crash while searching in Settings" am:
176c0c5d98
am:
d705a333ca
Change-Id: I31732b822a80caa52cb97c43ea093dea8c0b19cb
Juan Flores [Wed, 2 Nov 2016 16:42:03 +0000 (16:42 +0000)]
Merge "Fix crash while searching in Settings"
am:
176c0c5d98
Change-Id: Iaaf4de39939728e9b2645e119437a9142473a5b1
Treehugger Robot [Wed, 2 Nov 2016 16:37:07 +0000 (16:37 +0000)]
Merge "Fix crash while searching in Settings"
Fan Zhang [Tue, 1 Nov 2016 17:25:38 +0000 (17:25 +0000)]
Fix crash when opening account sync detail for external app am:
c9cdc25f41 am:
f3e86ca481
am:
ce01f167e1
Change-Id: I36a67f2241b1a4e2fc8787adb84af31209084ede
Fan Zhang [Tue, 1 Nov 2016 17:23:38 +0000 (17:23 +0000)]
Fix crash when opening account sync detail for external app am:
c9cdc25f41
am:
f3e86ca481
Change-Id: I3ca70edada88ee6d7c4dde2ba7e5972233357add
Fan Zhang [Tue, 1 Nov 2016 17:21:36 +0000 (17:21 +0000)]
Fix crash when opening account sync detail for external app
am:
c9cdc25f41
Change-Id: Ic8016695966d64c02c4e2fbe37703db8c771930e
Fan Zhang [Mon, 31 Oct 2016 19:45:49 +0000 (12:45 -0700)]
Fix crash when opening account sync detail for external app
Bug:
32426306
Test: Manual, and added unit test
Change-Id: I8703c9a13a60e57d7dd2bab2ae3cf6be362e351a
(cherry picked from commit
e3ad2b56c31f3f9fa751647197b8b2ca5cdb0fb6)
Paul Stewart [Fri, 28 Oct 2016 21:14:38 +0000 (21:14 +0000)]
Merge "Don't display an invalid Wi-Fi MAC address" am:
917b7b863c am:
27c5edb968
am:
dab924f04d
Change-Id: I06bad134648c70f432194e163a8e0a5829f514f0
Paul Stewart [Fri, 28 Oct 2016 21:09:38 +0000 (21:09 +0000)]
Merge "Don't display an invalid Wi-Fi MAC address" am:
917b7b863c
am:
27c5edb968
Change-Id: I427261d397f0003f1e4eecd55d431441303e4b4c
Paul Stewart [Fri, 28 Oct 2016 21:04:40 +0000 (21:04 +0000)]
Merge "Don't display an invalid Wi-Fi MAC address"
am:
917b7b863c
Change-Id: I61b50ff7a50551e12a218d73bcf95f0c24e64430
Treehugger Robot [Fri, 28 Oct 2016 20:56:35 +0000 (20:56 +0000)]
Merge "Don't display an invalid Wi-Fi MAC address"
Marie Janssen [Fri, 28 Oct 2016 02:57:06 +0000 (02:57 +0000)]
Merge "Add Bluetooth toggle prompts - settings" am:
de037d5491 -s ours am:
ce2a10b743
am:
6e8a67c008
Change-Id: I0fc40f9a3f3a8488e696727d08084f2d2b9d2d75
Marie Janssen [Fri, 28 Oct 2016 02:52:12 +0000 (02:52 +0000)]
Merge "Add Bluetooth toggle prompts - settings" am:
de037d5491 -s ours
am:
ce2a10b743
Change-Id: If2a0712b38cfd85af1502e68bdda39d1be8735b6
Marie Janssen [Fri, 28 Oct 2016 02:45:39 +0000 (02:45 +0000)]
Merge "Add Bluetooth toggle prompts - settings"
am:
de037d5491 -s ours
Change-Id: I4d809fb02c07ad366b6e5954ac3c0dbc0f5c597d
Marie Janssen [Thu, 27 Oct 2016 23:07:31 +0000 (23:07 +0000)]
Merge "Add Bluetooth toggle prompts - settings"
Paul Stewart [Thu, 27 Oct 2016 20:29:05 +0000 (13:29 -0700)]
Don't display an invalid Wi-Fi MAC address
Only display the WifiInfo MAC address if it is a valid address.
Otherwise, display "Unavailable". The underlying WifiInfo class
now has a default value, and a method that can be used to test
whether or not the contained address is valid. This change uses
this test and avoids having the confusing default address displayed.
Bug:
32478606
Test: Manual: Turn off WiFi and reboot -- make sure "Unavailable"
is displayed as the Wi-Fi MAC Address as opposed to "02:00:00:00:00:00"
Change-Id: I912804eb65735375e0ca3c4618a6399543f33b57
Bill Yi [Thu, 27 Oct 2016 05:36:09 +0000 (05:36 +0000)]
Import translations. DO NOT MERGE am:
bb6af9902d -s ours am:
061b294714 -s ours am:
4666b50754 -s ours
am:
69e4232f8d -s ours
Change-Id: Icedc51c61aa4c3b8aa80016617e9e6fc8ebf72fa
Bill Yi [Thu, 27 Oct 2016 05:35:55 +0000 (05:35 +0000)]
Import translations. DO NOT MERGE am:
e7f9b0b30b -s ours am:
f8b4927683 -s ours
am:
f55f67e409 -s ours
Change-Id: I650772657134b60a80f91d2dd0f5d740233aecbc
Bill Yi [Thu, 27 Oct 2016 05:31:37 +0000 (05:31 +0000)]
Import translations. DO NOT MERGE am:
bb6af9902d -s ours am:
061b294714 -s ours
am:
4666b50754 -s ours
Change-Id: I89ed1044560f40ebb78d0e1b9bf07a4a7cd575b7
Bill Yi [Thu, 27 Oct 2016 05:31:24 +0000 (05:31 +0000)]
Import translations. DO NOT MERGE am:
e7f9b0b30b -s ours
am:
f8b4927683 -s ours
Change-Id: I9d28fc31d3dc6ead839e36b000d16cec353562fd
Bill Yi [Thu, 27 Oct 2016 05:27:37 +0000 (05:27 +0000)]
Import translations. DO NOT MERGE am:
bb6af9902d -s ours
am:
061b294714 -s ours
Change-Id: If6f1925ffdab47128db255040e97a45733f819d5
Bill Yi [Thu, 27 Oct 2016 05:27:22 +0000 (05:27 +0000)]
Import translations. DO NOT MERGE
am:
e7f9b0b30b -s ours
Change-Id: I4297eed21e6b8854801a3e9a6f9904b1dadaab72
Bill Yi [Thu, 27 Oct 2016 05:22:55 +0000 (05:22 +0000)]
Import translations. DO NOT MERGE
am:
bb6af9902d -s ours
Change-Id: I601e2eb4a89830873bee3f05b77d90b0e9dff9bb
Bill Yi [Thu, 27 Oct 2016 04:56:50 +0000 (04:56 +0000)]
Import translations. DO NOT MERGE
am:
06f30f99c0 -s ours
Change-Id: I573f6294350759b53b9c12c3a21cd2b571393b2a
Bill Yi [Thu, 27 Oct 2016 04:04:20 +0000 (21:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie7733c16a2d1b8502a2b33e10fe0c4fa0e6d9138
Auto-generated-cl: translation import
Bill Yi [Thu, 27 Oct 2016 03:59:24 +0000 (20:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I51115d580c3d823482a01f078fd23b2690f3899b
Auto-generated-cl: translation import
Bill Yi [Thu, 27 Oct 2016 03:51:47 +0000 (20:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I593dba1b6fda93a08279272c8e4061c464899afc
Auto-generated-cl: translation import
Svetoslav Ganov [Sat, 23 Jul 2016 03:08:41 +0000 (20:08 -0700)]
Add Bluetooth toggle prompts - settings
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.
bug:
28715749
Change-Id: I5ae0c532c92b2c05a91f0d769ca6744002747fca
(cherry picked from commit
b06766f129dac138568883110f6d2a085b53445b)
Steven Ng [Tue, 25 Oct 2016 22:23:35 +0000 (22:23 +0000)]
Nexus imprint setting is missing while adding corp account from SUW am:
378dec1495 am:
046a63450f
am:
bde2c59f00
Change-Id: Ie6c4a37d9aaaf9cba94c6fc050600f8acf13f53e
Steven Ng [Tue, 25 Oct 2016 22:19:05 +0000 (22:19 +0000)]
Nexus imprint setting is missing while adding corp account from SUW am:
378dec1495
am:
046a63450f
Change-Id: I3a393fb00ab8f312ca078b08feb42decb106fb81
Steven Ng [Tue, 25 Oct 2016 22:15:03 +0000 (22:15 +0000)]
Nexus imprint setting is missing while adding corp account from SUW
am:
378dec1495
Change-Id: I829c9738c70ec8242fb2c3fdcf7eecd5ff39df7c
Steven Ng [Tue, 25 Oct 2016 16:23:30 +0000 (17:23 +0100)]
Nexus imprint setting is missing while adding corp account from SUW
+ This is caused by the encryption interstitial result code not handled
in ChooseLockGeneric. Change the request code of launching encryption
interstitial screen to CHOOSE_LOCK_BEFORE_FINGERPRINT_REQUEST if it
is set new password flow.
Testing
Test: See below
1) Auto
make RunSettingsRoboTests
2) Manual
On a device (Nexus 5x) that shows encryption interstital screen and
supports fingerprint.
1) Nexus imprint flow (regression test)
Fingerprint can be enrolled with the following flow.
Settings > Security > Nexus Imprint > FingerprintEnrollIntroduction
> ChooseLockGeneric (Unlock selection) > Encryption Interstitial
> Password setup > Notification Interstitial
> Find sensor and fingerprint enrollment
2) Set new password test
i) $ adb shell am start -a android.app.action.SET_NEW_PASSWORD
ii) Click Nexus Imprint + Pattern.
iii) Choose "Require pattern to start device"
iv) Set a pattern lock.
v) Choose any of the notification behavior.
vi) Can enroll a fingerprint.
Bug:
32382952
Change-Id: Ie66ffca2e8c3cc46b5e8b619bd35986e4f41d5ab
Jerry Zhang [Wed, 12 Oct 2016 21:42:56 +0000 (14:42 -0700)]
Refactor setCurrentFunction and setUsbDataUnlocked into one method
This allows us to get rid of an extraneous config switch and
simplify some code.
Test: Manually change usb configuration
Change-Id: Id78da530ff485ecd7a915056832eec1dd8c91954
(cherry picked from commit
5d36a177d95184aaa0763d07aa38ff028f5a9b9c)
Bill Yi [Tue, 25 Oct 2016 06:48:05 +0000 (06:48 +0000)]
Import translations. DO NOT MERGE am:
a6d9842695 -s ours am:
c027907edc -s ours am:
f8032d0b15 -s ours
am:
79d7ca6010 -s ours
Change-Id: Icc5f7f210bd15607918cf967b0e5e47952034e25
Bill Yi [Tue, 25 Oct 2016 06:47:51 +0000 (06:47 +0000)]
Import translations. DO NOT MERGE am:
475763d01c -s ours am:
9a22968ff8 -s ours
am:
44ab95f758 -s ours
Change-Id: Ic439351fb3ab9c1153fba758b2c4ebe229e04ff3
Bill Yi [Tue, 25 Oct 2016 06:47:27 +0000 (06:47 +0000)]
Import translations. DO NOT MERGE
am:
9351e5f083 -s ours
Change-Id: I4c60ee71fe030300677212e0897a204b7f29b463
Bill Yi [Tue, 25 Oct 2016 06:38:04 +0000 (06:38 +0000)]
Import translations. DO NOT MERGE am:
a6d9842695 -s ours am:
c027907edc -s ours
am:
f8032d0b15 -s ours
Change-Id: I08630831bbe4204fd9a86c30e9710abea02cb78c
Bill Yi [Tue, 25 Oct 2016 06:37:49 +0000 (06:37 +0000)]
Import translations. DO NOT MERGE am:
475763d01c -s ours
am:
9a22968ff8 -s ours
Change-Id: Id515f8c57aeb9c6a478d025b4a7223acb8163b72
Bill Yi [Tue, 25 Oct 2016 06:30:52 +0000 (06:30 +0000)]
Import translations. DO NOT MERGE am:
a6d9842695 -s ours
am:
c027907edc -s ours
Change-Id: I09c421885fb40a57e309a083413797bac5de053b
Bill Yi [Tue, 25 Oct 2016 06:30:37 +0000 (06:30 +0000)]
Import translations. DO NOT MERGE
am:
475763d01c -s ours
Change-Id: I4b54504ffad69e916590de47d505979b82325827
Bill Yi [Tue, 25 Oct 2016 06:30:08 +0000 (06:30 +0000)]
Import translations. DO NOT MERGE
am:
a6d9842695 -s ours
Change-Id: Ic902f00f1abc643ecfb2e567d7368815bf727d62
Juan Flores [Mon, 27 Oct 2014 13:12:20 +0000 (14:12 +0100)]
Fix crash while searching in Settings
A crash occurrs when power button is pressed during search in Settings
due to IndexOutOfBoundsException in HeaderViewListAdapter.
When suggestions and results are cleared,
the layouts should be invisible to solve this problem.
Bug:
27913974
Test: manual - search "font" and press power button twice
Change-Id: Ia53d393e695dbb238fc4c82a3fe52ef4250d84c1
Bill Yi [Mon, 24 Oct 2016 19:40:25 +0000 (12:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic23d8689a23264722dd70856138fbda6a214e7cb
Auto-generated-cl: translation import
Bill Yi [Mon, 24 Oct 2016 19:35:20 +0000 (12:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I75261b567ac55ce6adfbcdadb63a058dfeac9bda
Auto-generated-cl: translation import
Bill Yi [Mon, 24 Oct 2016 19:27:49 +0000 (12:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie8400c22cf5931503997d0dc93b0358ee40c89d7
Auto-generated-cl: translation import
Doris Ling [Fri, 21 Oct 2016 23:46:51 +0000 (23:46 +0000)]
Ensure that the gesture animation video is paused properly. am:
4245ad4771
am:
5e4fce04fb
Change-Id: Ic615738b57a4ca49f5c6101e86aea03dbf0f9a12
Doris Ling [Fri, 21 Oct 2016 23:44:19 +0000 (23:44 +0000)]
Ensure that the gesture animation video is paused properly.
am:
4245ad4771
Change-Id: Ib6bd653fe0f1fd0859c37df4655908e67ecc4444
Doris Ling [Fri, 21 Oct 2016 21:28:54 +0000 (14:28 -0700)]
Ensure that the gesture animation video is paused properly.
Add the handling to pause the animation video when user navigates away
from the gesture settings.
Test: Manual - play gesture animation videos, then switch to another app
in recents. Verifies from logcat that NuPlayerDriver is not active.
Fix:
32064123
Change-Id: I3d0fb3946e4d0d77a686aa97cfabe667862cac17
Matthew Fritze [Fri, 21 Oct 2016 16:46:00 +0000 (16:46 +0000)]
Merge "Support tile title text line wraps" into nyc-mr1-dev am:
f5cd60372c
am:
2da1ca120f
Change-Id: Ic447e8fbf664140f2580c4898e2a0b6618585543
Matthew Fritze [Fri, 21 Oct 2016 16:45:40 +0000 (16:45 +0000)]
Support tile title text line wraps am:
0f813d668d
am:
0e0e6c5544
Change-Id: I81fa4356f76b2693eca95ff5c79c6168a68ffd64
Matthew Fritze [Fri, 21 Oct 2016 16:36:20 +0000 (16:36 +0000)]
Merge "Support tile title text line wraps" into nyc-mr1-dev
am:
f5cd60372c
Change-Id: Ie0d699bcc355519060df04b46b213ce368e47e6a
Matthew Fritze [Fri, 21 Oct 2016 16:36:19 +0000 (16:36 +0000)]
Support tile title text line wraps
am:
0f813d668d
Change-Id: I47a4f7f95f0bce43a55e661209d48142f82e5b42
TreeHugger Robot [Fri, 21 Oct 2016 16:30:49 +0000 (16:30 +0000)]
Merge "Support tile title text line wraps" into nyc-mr1-dev
Matthew Fritze [Thu, 20 Oct 2016 22:35:29 +0000 (15:35 -0700)]
Support tile title text line wraps
Change-Id: Ice430d03877618aacad21e5ee6167516f60f02fd
Fixes:
32239411
Test: Manual
Fan Zhang [Thu, 20 Oct 2016 20:34:04 +0000 (20:34 +0000)]
Merge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev am:
08254e5b4f
am:
723fbd06a9
Change-Id: Ief7d0f6e9d90c34f8b9405d4d13c4080f669c15c
Fan Zhang [Thu, 20 Oct 2016 20:33:51 +0000 (20:33 +0000)]
Fix help & feedback link in data usage summary screen. am:
9b52836251
am:
7568e120cf
Change-Id: If7768bdf34204ca158dcf7e2078826a0aabc2ec7
Fan Zhang [Thu, 20 Oct 2016 20:25:38 +0000 (20:25 +0000)]
Merge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev
am:
08254e5b4f
Change-Id: Ia9c30a0a03a1dcaec42573c3578f5a1ed80aa9b6
Fan Zhang [Thu, 20 Oct 2016 20:25:37 +0000 (20:25 +0000)]
Fix help & feedback link in data usage summary screen.
am:
9b52836251
Change-Id: I1417eebbf5218baa24a79f2f1988844b8d06d674
TreeHugger Robot [Thu, 20 Oct 2016 20:18:44 +0000 (20:18 +0000)]
Merge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev
Bill Yi [Thu, 20 Oct 2016 16:41:12 +0000 (16:41 +0000)]
Import translations. DO NOT MERGE am:
4bfccb32a7 -s ours am:
4559d2bfac -s ours
am:
d0c5d246c8 -s ours
Change-Id: Ic8230d57c512c2ccbc54be5061caac490bcbe6d4
Bill Yi [Thu, 20 Oct 2016 16:33:20 +0000 (16:33 +0000)]
Import translations. DO NOT MERGE am:
4bfccb32a7 -s ours
am:
4559d2bfac -s ours
Change-Id: Iff8ca804ae251a0462f148a236e7b4e8c9dd3e4d
Bill Yi [Thu, 20 Oct 2016 16:25:35 +0000 (16:25 +0000)]
Import translations. DO NOT MERGE
am:
4bfccb32a7 -s ours
Change-Id: I7c16649111b0057307773f7674c11c1aa9732c4c
Bill Yi [Thu, 20 Oct 2016 16:25:23 +0000 (16:25 +0000)]
Import translations. DO NOT MERGE am:
7e6e9220da -s ours
am:
d5bc80036b -s ours
Change-Id: I147e0e6546f7d367ff81d45bc66e7829bcf45267
Bill Yi [Thu, 20 Oct 2016 16:17:21 +0000 (16:17 +0000)]
Import translations. DO NOT MERGE
am:
7e6e9220da -s ours
Change-Id: Ibe7e7a4797602978d09a44aab39f49045f029748
Fan Zhang [Thu, 20 Oct 2016 16:06:12 +0000 (09:06 -0700)]
Fix help & feedback link in data usage summary screen.
The fragment was not providing the correct string for help & feedback
button, causing no result page when user navigates to help article page
from actionbar overflow menu.
Change-Id: I076846c44d4fc95efea743f019a7ad4aab47f214
Fixes:
32291069
Test: manual
Bill Yi [Thu, 20 Oct 2016 14:52:52 +0000 (07:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2490d08d85215767e05bf193c3e352c3ab7a7ce9
Auto-generated-cl: translation import
Bill Yi [Thu, 20 Oct 2016 14:48:07 +0000 (07:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I60964278429db5003b317b04e53324fc312116d5
Auto-generated-cl: translation import
Anna Galusza [Thu, 20 Oct 2016 03:46:56 +0000 (03:46 +0000)]
Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev am:
ee502d5037
am:
b104675957
Change-Id: Id3c38bf0f288ec55bdedb2029eac7c713773c4a9
Anna Galusza [Thu, 20 Oct 2016 03:46:42 +0000 (03:46 +0000)]
Fix insufficint contrast on Vision Settings toggles. am:
e212817785
am:
5bf1f668ff
Change-Id: I0ac8ad8d8cd0091224c2bf1a76ac4845b4c6cf31
Anna Galusza [Thu, 20 Oct 2016 03:38:11 +0000 (03:38 +0000)]
Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev
am:
ee502d5037
Change-Id: I23a6c8eb6911902fc9b9ecab8bb87e38c73371b5
Anna Galusza [Thu, 20 Oct 2016 03:38:11 +0000 (03:38 +0000)]
Fix insufficint contrast on Vision Settings toggles.
am:
e212817785
Change-Id: I9969b046d52d6aff86fe6b0f5d44cce2cf49e8dd
Anna Galusza [Thu, 20 Oct 2016 03:32:22 +0000 (03:32 +0000)]
Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev
Anna Galusza [Mon, 17 Oct 2016 19:23:08 +0000 (12:23 -0700)]
Fix insufficint contrast on Vision Settings toggles.
Bug:
29161887
Change-Id: I633ed3cf0fa00d3b697377118580471afaf30132
Adrian Roos [Tue, 18 Oct 2016 22:43:36 +0000 (22:43 +0000)]
Merge "Separate ambient display triggers" into nyc-mr1-dev am:
ee5eef1492
am:
f33b98b750
Change-Id: I61777d38647d8b6f858de9feadf7ae3c8a9b7ebd
Adrian Roos [Tue, 18 Oct 2016 22:19:52 +0000 (22:19 +0000)]
Separate ambient display triggers am:
82829ee0b1
am:
5ba2074e31
Change-Id: I023918a3d862502de6a4058609e29b8867e39f0c
Adrian Roos [Tue, 18 Oct 2016 22:16:39 +0000 (22:16 +0000)]
Merge "Separate ambient display triggers" into nyc-mr1-dev
am:
ee5eef1492
Change-Id: Id045b4f47d8052b8e058522d69d91f9e1a9bba48