OSDN Git Service
Bill Yi [Tue, 31 Jan 2017 07:10:41 +0000 (23:10 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2852cdf90dd08680bd6e7af3c8dffec5b60a4fe4
Auto-generated-cl: translation import
TreeHugger Robot [Fri, 27 Jan 2017 20:31:39 +0000 (20:31 +0000)]
Merge "Remove fake data" into nyc-mr2-dev
TreeHugger Robot [Fri, 27 Jan 2017 19:59:03 +0000 (19:59 +0000)]
Merge "Fix null pointer exception when surveys are turned off" into nyc-mr2-dev
Salvador Martinez [Wed, 25 Jan 2017 22:56:03 +0000 (14:56 -0800)]
Remove fake data
Missed one location that adds fake data
to the payload the first time these were
removed. This patch removes any remaining
fake data being attached to a survey payload.
Test: Robotests still pass
Bug:
34716378
Change-Id: Iccb60ce24ae5c494dcd287107f8d293f4a56b2d5
Merged-In: I055c2b2e027f721e14ea5b6b7efccd5267018b8c
Salvador Martinez [Tue, 24 Jan 2017 23:16:52 +0000 (15:16 -0800)]
Fix null pointer exception when surveys are turned off
In some conditions the survey provider could be null on
download completion which could lead to a NPE. This
has been addressed by not requiring an instance for
the removal of the receiver.
Test: RunSettingsRoboTests (master)
Bug:
33707203
Change-Id: Id1ab1a24c697fed8e4dd259682a088b50c35f38a
Merged-In: Icfb545697f24172db734dd7dad421796edf68186
TreeHugger Robot [Fri, 27 Jan 2017 03:37:44 +0000 (03:37 +0000)]
Merge "Finalize string for usage alerts." into nyc-mr2-dev
Andrew Sapperstein [Fri, 27 Jan 2017 01:30:30 +0000 (17:30 -0800)]
Finalize string for usage alerts.
Test: manual
Bug:
34200177
Change-Id: I5c28b2844b035d551ef2707b9797443074d0d23f
Stefano Tommasini [Thu, 26 Jan 2017 10:31:14 +0000 (10:31 +0000)]
Merge "*DO NOT MERGE* Create new suggestion category for backup." into nyc-mr2-dev
TreeHugger Robot [Thu, 26 Jan 2017 07:06:17 +0000 (07:06 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Thu, 26 Jan 2017 04:04:52 +0000 (20:04 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ibb3ccac189513a5a988ec8c857f2ad574371808a
Auto-generated-cl: translation import
Jerry Zhang [Wed, 25 Jan 2017 20:30:17 +0000 (20:30 +0000)]
Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" into nyc-mr2-dev
Stefanot [Wed, 25 Jan 2017 11:20:50 +0000 (11:20 +0000)]
*DO NOT MERGE* Create new suggestion category for backup.
Test: manual
BUG:
34219298
Change-Id: I288d36b2b48582e5f8e0d1720d1f7004ad8dae2c
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.
Bug:
31814300
Test: Manually change usb configuration
Change-Id: Id78da530ff485ecd7a915056832eec1dd8c91954
(cherry picked from commit
5d36a177d95184aaa0763d07aa38ff028f5a9b9c)
Stefano Tommasini [Sat, 21 Jan 2017 19:44:15 +0000 (19:44 +0000)]
Merge "Add SuggestionFeatureProvider interface." into nyc-mr2-dev
Stefanot [Fri, 13 Jan 2017 14:58:41 +0000 (14:58 +0000)]
Add SuggestionFeatureProvider interface.
The interface is added so that a vendor can add new suggestions to the
settings app, and customize details for these suggestions.
Test: make RunSettingsRoboTests
BUG:
34219298
Change-Id: I373c63709b1aaf68360aa2561a2ecfc3194e0e2b
Bill Yi [Fri, 20 Jan 2017 20:31:51 +0000 (12:31 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6aed674efc270223bddfd6fbdae50a98ae695276
Auto-generated-cl: translation import
Jack He [Tue, 1 Nov 2016 22:38:38 +0000 (15:38 -0700)]
Fix Bluetooth pairing dialogue crash
When pairing passkey is invalid, onCreate() should return early to
prevent any dialog from displaying, which will then call onDestroy()
to destroy the activity. However mReceiver should be registered before
onDestroy() is called as onDestroy() will call unregisterReceiver(mReceiver)
that will throw an IllegalArgumentException when mReceiver was not registered.
This fix adds a flag that tracks whether mReceiver has been registered.
In addition, this fix fails the passkey confirmation request upon invalid
passkey.
Bug:
32577328
Test: Test with PTS TC_SERVER_SA_BI_01_C
Change-Id: Ifc047bad6bd99abca04404af9cd54d2034cd35aa
(cherry picked from commit
6f8e9eda2d9ed830d47971d93327792906db2dc1)
Bill Yi [Thu, 19 Jan 2017 03:10:06 +0000 (19:10 -0800)]
Import translations. DO NOT MERGE
Change-Id: I610fb1c188fb93d6e2d70dd52da7dd766d27c209
Auto-generated-cl: translation import
Jaewoong Jung [Tue, 20 Dec 2016 02:39:41 +0000 (18:39 -0800)]
Implements additional battery info menu behavior.
This is a manual cherry-pick of commit
6a43a06cac12494cd27e5b5cad4149a272d90038.
Bug:
33352540
Test: Updated existing tests.
Change-Id: I990029d2ea9032301362d614959259965b8ecb10
Jaewoong Jung [Fri, 13 Jan 2017 22:38:10 +0000 (22:38 +0000)]
Merge "Adds a menu item for additional battery info to battery settings." into nyc-mr2-dev
Jaewoong Jung [Tue, 13 Dec 2016 01:32:31 +0000 (17:32 -0800)]
Adds a menu item for additional battery info to battery settings.
This is a manual cherry-pick of commit
1e0f8ff5e549636e98b7fa0f12761be934f8f36b.
Bug:
33352540
Test: No additional test failures.
Change-Id: Ibfc1a9463c93d3c087ed712fe45d3d0717472c6a
Salvador Martinez [Fri, 16 Dec 2016 00:13:38 +0000 (16:13 -0800)]
Removed fake data
Was using fake data for testing that we could attach
payloads. This is no longer needed since we are now
attaching real data.
Test: Manual Verification on GCS
Bug:
27823357
Change-Id: I055c2b2e027f721e14ea5b6b7efccd5267018b8c
Bill Yi [Thu, 12 Jan 2017 14:02:43 +0000 (06:02 -0800)]
Import translations. DO NOT MERGE
Change-Id: I83e0e51b5552d44b66a84d5abdaac59ec3932c64
Auto-generated-cl: translation import
Salvador Martinez [Thu, 8 Dec 2016 20:44:47 +0000 (12:44 -0800)]
Added survey triggering mechanisms
Surveys can now be triggered on a subset of Settings screens.
Surveys can also be modified/created for this subset of
screens remotely.
Test: RoboTests(master) && JUnitTests
Bug:
27823357
Change-Id: I1534af5573bef6f6c65c9c99b6f5a2917c3325b9
Salvador Martinez [Wed, 19 Oct 2016 19:51:45 +0000 (12:51 -0700)]
Added feature for surveys provider to Settings
It is now possible to create and show surveys to a user
asking them for feedback within the Settings app.
Test: In Master Branch
Bug:
27823357
Change-Id: I824899045f6ce30e5b6f46d20888da673114f658
Geoffrey Pitsch [Tue, 10 Jan 2017 19:06:00 +0000 (19:06 +0000)]
Merge "DO NOT MERGE Fix Notification Settings when unblockable app is blocked." into nyc-mr2-dev
TreeHugger Robot [Tue, 10 Jan 2017 07:18:41 +0000 (07:18 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Mon, 9 Jan 2017 21:14:43 +0000 (13:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iba9f6f945f3e421f8413967b392e04085561c7c3
Auto-generated-cl: translation import
pkanwar [Mon, 9 Jan 2017 20:21:22 +0000 (12:21 -0800)]
DO NOT MERGE: Fix NPE in ConfigureWifiSettings.
NPE was introduced as part of recent changes for Carrier Wifi networks.
This CL adds a null check.
Bug:
34050661
Change-Id: I585f6499b1ca06d9bd25ad3449f035c5a616a140
Bill Yi [Thu, 5 Jan 2017 01:46:43 +0000 (17:46 -0800)]
Import translations. DO NOT MERGE
Change-Id: I24410f77a5b2f4777bae8546e6709c47d971c992
Auto-generated-cl: translation import
Bill Yi [Fri, 30 Dec 2016 08:59:18 +0000 (00:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id7a36307bc781734e2647f01af6b07b5ed3a600a
Auto-generated-cl: translation import
Geoffrey Pitsch [Wed, 28 Dec 2016 17:29:40 +0000 (12:29 -0500)]
DO NOT MERGE Fix Notification Settings when unblockable app is blocked.
When an app was blocked in the past, don't hide the controls
so the user is able to unblock the app. After unblocking, the
controls will be hidden the next time settings is visited.
Bug:
32557897
Change-Id: I7ab17f647b197162932b131c41bb18cf5c18917d
Nathan Harold [Fri, 23 Dec 2016 01:11:39 +0000 (01:11 +0000)]
Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List" into nyc-mr2-dev
Pankaj Kanwar [Thu, 22 Dec 2016 20:41:54 +0000 (20:41 +0000)]
Merge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into nyc-mr2-dev
pkanwar [Sun, 11 Dec 2016 23:36:34 +0000 (15:36 -0800)]
DO NOT MERGE: Add UI toggle to control connections to carrier networks.
Bug:
31003437
Change-Id: Ieb6dfc0dc989068e151a1d0e376f56f67c9790b2
Bill Yi [Thu, 22 Dec 2016 05:59:21 +0000 (21:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id3458a153f2db98b0035caac52eb1933cb9fd18f
Auto-generated-cl: translation import
Youhan Wang [Fri, 16 Dec 2016 23:53:16 +0000 (15:53 -0800)]
DO NOT MERGE OMADM Trigger in *#*#INFO#*#* hidden menu.
Failed Treehugger automerge to master, will be cherry-picked to master
manually.
Bug:
32874442
Change-Id: Ie64eb28671ec4afafd352d1f86b61c4ce1108338
Nathan Harold [Tue, 20 Dec 2016 02:04:52 +0000 (18:04 -0800)]
Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List
To facilitate user recovery from issues where the band mode
list is incomplete and may not report the full list of bands,
the user should *always* have the ability to set the band mode
selection to AUTOMATIC.
Bug:
28124606
Test: compilation, UI check
Change-Id: Ib961d9b058ade5a51dfec0777971c8c98dee2033
(cherry picked from commit
f8555e481263e936ab853a32431c188d34419467)
Bill Yi [Thu, 15 Dec 2016 05:03:28 +0000 (21:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: If6787baad938f8184b5b6ddb2c59317b0d6144bd
Auto-generated-cl: translation import
TreeHugger Robot [Wed, 14 Dec 2016 02:08:36 +0000 (02:08 +0000)]
Merge "DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD" into nyc-mr2-dev
Bill Yi [Tue, 13 Dec 2016 01:30:02 +0000 (17:30 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia4641aa6b6dc9907ede180fa2d7d0cb4f1c258f0
Auto-generated-cl: translation import
Tony Mak [Mon, 12 Dec 2016 02:29:55 +0000 (02:29 +0000)]
DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD
This is a cherry-pick of ag/
1640561.
1. Context.getActivityToken is not available in n mr2, passed the token
from the activity to the controller instead.
2. Haven't pick the tests from master to mr2 branch because robotest
is not set up in mr2 branch.
Fix:
32959373
Change-Id: I2f73d01ab11e91b337beb90c05bbcb857dfd40dc
Youhan Wang [Fri, 9 Dec 2016 22:17:08 +0000 (22:17 +0000)]
Merge changes from topic 'ims-radio-info-mr2' into nyc-mr2-dev
* changes:
Add Ims Registration Info to RadioInfo
Enable and Disable IMS Provisioning Based on Platform Capability
Nathan Harold [Thu, 27 Oct 2016 20:45:00 +0000 (13:45 -0700)]
Add Ims Registration Info to RadioInfo
Replaced not used pdp list.
Bug:
32874442
Change-Id: Iadb21a3108aaaa3afcde3972e6f98bfbbd5413f1
Nathan Harold [Fri, 28 Oct 2016 18:45:59 +0000 (11:45 -0700)]
Enable and Disable IMS Provisioning Based on Platform Capability
Bug:
32874442
Change-Id: I4be301864a3d48ef14834caa707e9d64536fd836
Daniel Nishi [Mon, 19 Sep 2016 19:16:21 +0000 (12:16 -0700)]
Move private volume storage calculations into a shared lib.
Bug:
30895163
Test: m RunStorageManagerRoboTests
Change-Id: I3e464c8b721373ebc1527eb5411622c69bf587d1
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 05:19:32 +0000 (22:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I64f7cc447bbacc64f2993230946f87258496824a
Auto-generated-cl: translation import
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
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)
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: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
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
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
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: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: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: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: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: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: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:16:39 +0000 (22:16 +0000)]
Merge "Separate ambient display triggers" into nyc-mr1-dev
am:
ee5eef1492
Change-Id: Id045b4f47d8052b8e058522d69d91f9e1a9bba48
Adrian Roos [Tue, 18 Oct 2016 22:07:11 +0000 (22:07 +0000)]
Separate ambient display triggers
am:
82829ee0b1
Change-Id: I9f58e13648def7e982ce2966e789147d07b14f62
Adrian Roos [Tue, 18 Oct 2016 22:00:04 +0000 (22:00 +0000)]
Merge "Separate ambient display triggers" into nyc-mr1-dev
Lei Yu [Tue, 18 Oct 2016 16:54:04 +0000 (16:54 +0000)]
Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev
am:
7fee46383f
Change-Id: I0adb924d05bed16bb6415f2b8edf69e509d7fe72
jackqdyulei [Tue, 18 Oct 2016 16:54:03 +0000 (16:54 +0000)]
Suspend action in security patch when browser is disabled
am:
013da34209
Change-Id: I408fadd1b4d5a3455eb70dc808efe18e258f26c0
Lei Yu [Tue, 18 Oct 2016 16:45:35 +0000 (16:45 +0000)]
Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev
Bill Yi [Tue, 18 Oct 2016 05:40:29 +0000 (05:40 +0000)]
Import translations. DO NOT MERGE am:
6515783df6 -s ours
am:
37c5dd0fe3 -s ours
Change-Id: Ia6d04b243b2338687963f234374d44a76a8bfae8
Bill Yi [Tue, 18 Oct 2016 05:40:02 +0000 (05:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
5ffabbe58b -s ours
Change-Id: I97a96da052f14ecd9901ef7aee42cfdbaf284cbf
Bill Yi [Tue, 18 Oct 2016 05:40:01 +0000 (05:40 +0000)]
Import translations. DO NOT MERGE
am:
ccde0787b8 -s ours
Change-Id: I7ee7d06fa217a520809ade396be78dddc63b3109
Bill Yi [Tue, 18 Oct 2016 05:37:33 +0000 (05:37 +0000)]
Import translations. DO NOT MERGE
am:
6515783df6 -s ours
Change-Id: I4afd6c7910dde3c52771687f6fa8bfbe55e56894