OSDN Git Service
Doris Ling [Mon, 17 Oct 2016 20:18:33 +0000 (20:18 +0000)]
Merge "Add static preview images to gesture settings." into nyc-mr1-dev
am:
ec5314f2f5
Change-Id: Ib195aa98f9838ceffc27255e34b18e2bdfbccbff
Doris Ling [Mon, 17 Oct 2016 20:18:30 +0000 (20:18 +0000)]
Add static preview images to gesture settings.
am:
12e4bebabf
Change-Id: I4f5f16b109c4997b15b93320945bbb3ccab06735
Doris Ling [Mon, 17 Oct 2016 20:11:31 +0000 (20:11 +0000)]
Merge "Add static preview images to gesture settings." into nyc-mr1-dev
Sanket Padawe [Mon, 17 Oct 2016 17:18:34 +0000 (17:18 +0000)]
Fix multi-sim popup issue in data usage.
am:
8591f26fa3
Change-Id: If23388f4fb2211af239aef7043cceb2ec2dd13e8
Sanket Padawe [Fri, 14 Oct 2016 22:41:52 +0000 (15:41 -0700)]
Fix multi-sim popup issue in data usage.
+ Avoid sending popup dialog when data is enabled on currently active
data sim.
Bug:
31736014
Change-Id: I60e9e049f546cb176283bc4c4e20cb2d3e7ac386
Bill Yi [Fri, 14 Oct 2016 09:22:56 +0000 (09:22 +0000)]
Import translations. DO NOT MERGE am:
43920d3ba5 -s ours
am:
1146d6375c -s ours
Change-Id: I973f3606e3f7427f74c9af29d58ba0611b865704
Bill Yi [Fri, 14 Oct 2016 09:21:26 +0000 (09:21 +0000)]
Import translations. DO NOT MERGE
am:
43920d3ba5 -s ours
Change-Id: I72f1d361a29a4391c33c5fd0fb8a3340287314f9
Bill Yi [Fri, 14 Oct 2016 09:20:40 +0000 (09:20 +0000)]
Import translations. DO NOT MERGE
am:
18a64f201b -s ours
Change-Id: I91b138778b8488b63afa11c1c6625f7a72acbd62
Bill Yi [Thu, 13 Oct 2016 22:35:00 +0000 (15:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia1b89602b4538d719cf4b4c2285290598a9d60f6
Auto-generated-cl: translation import
Bill Yi [Thu, 13 Oct 2016 22:30:06 +0000 (15:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: If676bfdcdc338204bedc7a678042d214d0cbc0a3
Auto-generated-cl: translation import
Daniel Sandler [Wed, 12 Oct 2016 13:51:05 +0000 (13:51 +0000)]
Merge "Suppress notif block/silence settings for essential packages." into nyc-mr1-dev
am:
0f6ae3aa87
Change-Id: I87fbb0cd4c462a7df76e2f5719aafc54ee671076
Dan Sandler [Wed, 12 Oct 2016 13:51:04 +0000 (13:51 +0000)]
Suppress notif block/silence settings for essential packages.
am:
acf763e996
Change-Id: I2c88494c5d1df2075bc56ed10aa88b41d6ec6113
Daniel Sandler [Wed, 12 Oct 2016 13:38:56 +0000 (13:38 +0000)]
Merge "Suppress notif block/silence settings for essential packages." into nyc-mr1-dev
Doris Ling [Wed, 12 Oct 2016 00:23:48 +0000 (00:23 +0000)]
Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev
am:
49c0bab8bf
Change-Id: I8cf7ab7f80ea97249425e8da2fae6c2e88affd99
Doris Ling [Wed, 12 Oct 2016 00:23:46 +0000 (00:23 +0000)]
Remove pickup gesture settings if sensor is not found.
am:
94e0da52fc
Change-Id: Iaca5d323b7cda84ca3ed822babe150fc517f1ce9
Doris Ling [Fri, 30 Sep 2016 19:41:26 +0000 (12:41 -0700)]
Add static preview images to gesture settings.
Set the animation preview image view to the newly added preview image
instead of loading it from animation video.
Test: manual - launch gesture settings and visually check the animation
preview images.
Bug:
31636637
Change-Id: If25a0e3501bea0c6343326a143d665ec79e3d7c7
Doris Ling [Tue, 11 Oct 2016 23:42:41 +0000 (23:42 +0000)]
Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev
Doris Ling [Tue, 11 Oct 2016 21:19:03 +0000 (14:19 -0700)]
Remove pickup gesture settings if sensor is not found.
Update gesture settings to check for available pickup sensor before
showing pickup gesture settings.
Test: manual - launch gesture settings on different device and check for
pickup preference. Auto test pending.
Bug:
32072298
Change-Id: Iaab0290dcfeb2b0c9195df685f225d092a658347
Nick Kralevich [Tue, 11 Oct 2016 18:14:06 +0000 (18:14 +0000)]
Merge "Delete "Show CPU usage"" into nyc-mr1-dev
am:
09d3961326
Change-Id: Iaa4e4d01ca8a1543994d9ca422991cc25a36d819
Nick Kralevich [Tue, 11 Oct 2016 18:09:16 +0000 (18:09 +0000)]
Delete "Show CPU usage"
am:
73dfef91b2
Change-Id: I3bf3ab7c241980f21ae0b648db4e0e4065d3b848
Nick Kralevich [Tue, 11 Oct 2016 18:03:25 +0000 (18:03 +0000)]
Merge "Delete "Show CPU usage"" into nyc-mr1-dev
Nick Kralevich [Tue, 11 Oct 2016 16:03:29 +0000 (09:03 -0700)]
Delete "Show CPU usage"
This functionality hasn't worked since Lollipop.
Bug:
21388590
Change-Id: Ie3684ba0f8b3a5f577462e4cc4a1ceba53931eff
Bill Yi [Tue, 11 Oct 2016 15:09:26 +0000 (15:09 +0000)]
Import translations. DO NOT MERGE am:
64d3e22e11 -s ours
am:
9f8644c04f -s ours
Change-Id: I7dc4c1f300dd8a3afdd55cca1224c81e83528478
Bill Yi [Tue, 11 Oct 2016 15:09:11 +0000 (15:09 +0000)]
Import translations. DO NOT MERGE
am:
6acf691f62 -s ours
Change-Id: I2e8466a2baab0727b0a03ab96589cb0a1bd312a3
Bill Yi [Tue, 11 Oct 2016 15:03:11 +0000 (15:03 +0000)]
Import translations. DO NOT MERGE
am:
64d3e22e11 -s ours
Change-Id: Ib8ac9eb3a836caf8e4c239c0caa99ca1c9ec0948
Bill Yi [Mon, 10 Oct 2016 19:39:26 +0000 (12:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5616dbd321f70984c0386fd5b2e48f608ede25cb
Auto-generated-cl: translation import
Bill Yi [Mon, 10 Oct 2016 19:31:59 +0000 (12:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic1133c6ddf9e2230e189751a04c58b953ef2b4c5
Auto-generated-cl: translation import
Salvador Martinez [Fri, 7 Oct 2016 21:04:16 +0000 (21:04 +0000)]
Fixed spans getting stripped from disclaimer
am:
e0b74a6de0
Change-Id: I5b668306d5e6221f47903179b58ce9b227d6a940
Salvador Martinez [Fri, 7 Oct 2016 02:26:51 +0000 (19:26 -0700)]
Fixed spans getting stripped from disclaimer
In the support disclaimer the text
"Privacy Policy" and "Terms of Service"
will no longer have their url spans
stripped.
Test: Instrumentation Test
Bug:
31939039
Change-Id: Ifdd9c3b5249d4678b30e677b909d0b58dd2c5edc
Matthew Fritze [Thu, 6 Oct 2016 22:49:58 +0000 (22:49 +0000)]
Merge "The center column of the support tab is back to white" into nyc-mr1-dev
am:
9f95a59b88
Change-Id: Ic7948520f75b0b8024d9239a87734ae6fa003705
Matthew Fritze [Thu, 6 Oct 2016 22:49:56 +0000 (22:49 +0000)]
The center column of the support tab is back to white
am:
2d07290453
Change-Id: I14bb5ca55ed267b3144a091e5b0bc636aeaaaa1e
Matthew Fritze [Thu, 6 Oct 2016 22:43:28 +0000 (22:43 +0000)]
Merge "The center column of the support tab is back to white" into nyc-mr1-dev
Salvador Martinez [Thu, 6 Oct 2016 22:42:57 +0000 (22:42 +0000)]
Merge "Added onClick logic for domain url list screen" into nyc-mr1-dev
am:
8a468ccbdf
Change-Id: Iffe25be2bb7623d3529feb8d0bd115c7b423db72
Salvador Martinez [Thu, 6 Oct 2016 22:42:56 +0000 (22:42 +0000)]
Added onClick logic for domain url list screen
am:
26e5760033
Change-Id: I11428c85ef077b7eee6ec7b6722463e86ac21a9b
Salvador Martinez [Thu, 6 Oct 2016 22:37:05 +0000 (22:37 +0000)]
Merge "Added onClick logic for domain url list screen" into nyc-mr1-dev
Bill Yi [Thu, 6 Oct 2016 20:49:41 +0000 (20:49 +0000)]
Import translations. DO NOT MERGE
am:
a6b32526d7 -s ours
Change-Id: I3235d07dafe77d05dadeadc3224469bd225ae7f8
Fan Zhang [Thu, 6 Oct 2016 20:49:12 +0000 (20:49 +0000)]
Merge "Fix a NPE in confirm lock screen." into nyc-mr1-dev
am:
6cea122bfc
Change-Id: Iba84fbd3eedd674fa038fa515dba507d2c4b9e0e
Fan Zhang [Thu, 6 Oct 2016 20:49:10 +0000 (20:49 +0000)]
Fix a NPE in confirm lock screen.
am:
8b2baed2be
Change-Id: I4c16a428b3409b33815740c734b3390192866a20
Jeff Sharkey [Thu, 6 Oct 2016 20:48:56 +0000 (20:48 +0000)]
Switch to static warning threshold when adopting.
am:
bd7adb9313
Change-Id: Ib7e82d50f7d3e98d3a669a9508d6cee9871a4383
Jonathan Nieder [Thu, 6 Oct 2016 20:48:23 +0000 (20:48 +0000)]
Merge "Add condition check for double tap gesture settings." into nyc-mr1-dev
am:
6cab381bc2
Change-Id: I4e140a32c84c820761176e816cbb88c4be46ef70
Doris Ling [Thu, 6 Oct 2016 20:47:32 +0000 (20:47 +0000)]
Add condition check for double tap gesture settings.
am:
c8b7555fc9
Change-Id: I7fa9e76725a7920d36936ffd4a737e8ed7eb8107
Matthew Fritze [Thu, 6 Oct 2016 20:47:09 +0000 (20:47 +0000)]
Merge "Fix bug preventing users from clicking settings suggestions twice" into nyc-mr1-dev
am:
fb42828381
Change-Id: I77f828913d3a941f040c6548fc99e86033e432a6
Matthew Fritze [Thu, 6 Oct 2016 20:47:07 +0000 (20:47 +0000)]
Fix bug preventing users from clicking settings suggestions twice
am:
f265dbc447
Change-Id: I0e9a1a92d84f2ae2dc783ddea4f6bcb728a72a52
Jeff Sharkey [Thu, 6 Oct 2016 20:41:48 +0000 (20:41 +0000)]
Give CTS the handle it expects to remove PIN.
am:
7be1b5923f
Change-Id: If949083726e0809d6ed45083282acda2255f546b
Bill Yi [Thu, 6 Oct 2016 20:41:23 +0000 (20:41 +0000)]
Import translations. DO NOT MERGE am:
972c78b4ee -s ours
am:
e87f2bbaa0 -s ours
Change-Id: Id32e92fba6ba6fbb791e0afd275cb59ae1dfe96e
Lei Yu [Thu, 6 Oct 2016 20:41:04 +0000 (20:41 +0000)]
Merge "Add "FILTER_NOT_HIDE" for all app filters." into nyc-mr1-dev
am:
9c54a67d66
Change-Id: Iba9f294bbbd1fd32e55950a6ddcc73604e4d0bea
jackqdyulei [Thu, 6 Oct 2016 20:28:52 +0000 (20:28 +0000)]
Add "FILTER_NOT_HIDE" for all app filters.
am:
d785a8db78
Change-Id: I779bc9de3e094c80c1749ac65acb932dc251f451
Bill Yi [Thu, 6 Oct 2016 20:28:13 +0000 (20:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
f91ca6bcd9 -s ours
Change-Id: Id18279ec5ccafbdcc0b4de8c24342f2c41ae9d10
Bill Yi [Thu, 6 Oct 2016 20:28:12 +0000 (20:28 +0000)]
Import translations. DO NOT MERGE
am:
8aee525418 -s ours
Change-Id: If58e31763e5f3b014126005d2816532323aa13f3
Lorenzo Colitti [Thu, 6 Oct 2016 20:27:51 +0000 (20:27 +0000)]
Merge "resolve merge conflicts of
f2801e4 to nyc-mr1-dev" into nyc-mr1-dev
am:
365d95b69a
Change-Id: Idde7cfe0966da74fad876820d9ad5623735e7a2a
Lorenzo Colitti [Thu, 6 Oct 2016 20:27:49 +0000 (20:27 +0000)]
resolve merge conflicts of
f2801e4 to nyc-mr1-dev
am:
b01c080b08
Change-Id: I7eb92f48024bf8298f2a31c0acfa87a355be872a
Matthew Fritze [Thu, 6 Oct 2016 20:27:36 +0000 (20:27 +0000)]
Prevent monkey tests from crashing with race conditions
am:
7ac78f2daf
Change-Id: I6634fa0ac2b4b5712f18db7320f82f595381ce1a
Bill Yi [Thu, 6 Oct 2016 20:27:09 +0000 (20:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
0d424ef9bd -s ours
Change-Id: I700b9562e1e366ee89b34c428e7af79d2a1340c9
Bill Yi [Thu, 6 Oct 2016 20:27:08 +0000 (20:27 +0000)]
Import translations. DO NOT MERGE
am:
ae33f8e62c -s ours
Change-Id: Ibb93c7fcea5a052cbafc28b445bd85810a331122
Philip P. Moltmann [Thu, 6 Oct 2016 20:26:50 +0000 (20:26 +0000)]
Merge "USB restriction is similar to media restriction" into nyc-mr1-dev
am:
f9ca06b367
Change-Id: Ic342e1a153ec1139afa7fc36f29fbd657ca441a9
Philip P. Moltmann [Thu, 6 Oct 2016 19:55:42 +0000 (19:55 +0000)]
USB restriction is similar to media restriction
am:
13ee50be48
Change-Id: I89214518add09b1e788535ea6b1a913307fb7b5c
Bill Yi [Thu, 6 Oct 2016 00:36:53 +0000 (17:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id06ae993d6e5f0bb1249f5b94e96c73d1c1a183d
Auto-generated-cl: translation import
Salvador Martinez [Wed, 5 Oct 2016 21:46:34 +0000 (14:46 -0700)]
Added onClick logic for domain url list screen
This class was created from a code refactoring
in ManageApplications but the functionality
associated with clicking on a preference was
accidently left out. This CL restores that
functionality.
Test: run ManageDomainUrlsEspressoTest class
Bug:
31958776
Change-Id: I1a7f5ee92daeebdb9fd7d9c83a564f0d104aa562
Matthew Fritze [Wed, 5 Oct 2016 18:07:08 +0000 (11:07 -0700)]
The center column of the support tab is back to white
Regression came in here:
ag/
1492761
Change-Id: I7ea5015abbe78d06b6df17d3caa3177642539023
Fixes:
31958339
Test: Manual
TreeHugger Robot [Wed, 5 Oct 2016 19:52:02 +0000 (19:52 +0000)]
Merge "Fix a NPE in confirm lock screen." into nyc-mr1-dev
Jeff Sharkey [Wed, 5 Oct 2016 17:21:22 +0000 (11:21 -0600)]
Switch to static warning threshold when adopting.
See rationale and details in inline comment block.
Test: adopt slow and fast SD cards
Bug:
29990216
Change-Id: I927d683db5e43216ee0837290ee4ca23a55a5dbb
Fan Zhang [Mon, 3 Oct 2016 16:05:55 +0000 (09:05 -0700)]
Fix a NPE in confirm lock screen.
The NPE happens is when using pin later. It's too late to recover if we
just catch the NPE where it happens, so we should early terminate the
call by adding TextUtil.isEmpty(pin) check.
Change-Id: Id280cd1b8781678540c9ea281b3186edd04d61f9
Fixes:
31895774
Test: make RunSettingsRoboTests
Test: manually enter correct/wrong/empty password/pin in confirm lock UI
(cherry picked from commit
774e1d8443fa551bdcfb54de2fd478db42e70a16)
Dan Sandler [Tue, 4 Oct 2016 19:24:23 +0000 (15:24 -0400)]
Suppress notif block/silence settings for essential packages.
Companion to change I6b8fa374.
Bug:
31360343
Test: Manual. With config_nonBlockableNotificationPackages
set to include com.android.dialer, examine Dialer's
notification settings. Be sure to test with advanced
notification controls enabled in System UI Tuner.
Change-Id: Ifbe13acf4cb02d6642f5c80e000f5b558f289920
Jonathan Nieder [Wed, 5 Oct 2016 01:08:03 +0000 (01:08 +0000)]
Merge "Add condition check for double tap gesture settings." into nyc-mr1-dev
Matthew Fritze [Tue, 4 Oct 2016 22:51:51 +0000 (22:51 +0000)]
Merge "Fix bug preventing users from clicking settings suggestions twice" into nyc-mr1-dev
Doris Ling [Tue, 4 Oct 2016 22:31:58 +0000 (15:31 -0700)]
Add condition check for double tap gesture settings.
Only shows the double tap gesture preference if the config is enabled.
Test: manual - launch gesture settings on different devices and check
for double tap preference. Auto test pending.
Bug:
31930457
Change-Id: Id972f60035d0c74f0832395f0229691cd3296d60
Matthew Fritze [Tue, 4 Oct 2016 20:39:27 +0000 (13:39 -0700)]
Fix bug preventing users from clicking settings suggestions twice
In an attempt to fix a monkey test crash which would open a
suggestion, click back and tap the same one again. The change
unfortunately prevented this for all users, but was not caught
because of a debug flag set on my device. A unit test will be added
to master to catch such cases, as tracked by this bug:
b/
31937112
Change-Id: Ib1cff07e54903df687454bdbf2ed1416485ab34f
Fixes:
31926102
Test: Manual
Jeff Sharkey [Tue, 4 Oct 2016 19:43:35 +0000 (13:43 -0600)]
Give CTS the handle it expects to remove PIN.
When the Direct Boot tests go to remove the PIN set in previous
tests, it needs to find the option that will remove the PIN. Recent
changes for fingerprint caused this "none" option to be hidden, so
assign the "none" ID to the "skip" option.
Test: cts-tradefed run cts-dev --module CtsAppSecurityHostTestCases --test android.appsecurity.cts.DirectBootHostTest
Bug:
31160946
Change-Id: I0b34cbfae45d1db8ee58a5ef66738414f5e2fc27
Bill Yi [Tue, 4 Oct 2016 20:05:52 +0000 (20:05 +0000)]
Import translations. DO NOT MERGE
am:
972c78b4ee -s ours
Change-Id: I526a783783c7ecda889b918ecfbafca399371895
Lei Yu [Tue, 4 Oct 2016 19:51:22 +0000 (19:51 +0000)]
Merge "Add "FILTER_NOT_HIDE" for all app filters." into nyc-mr1-dev
Bill Yi [Tue, 4 Oct 2016 18:51:04 +0000 (18:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Tue, 4 Oct 2016 18:18:12 +0000 (11:18 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
31827713
Change-Id: Ib9bed5a9d8a9237935842d496c8f1630dad64c27
Bill Yi [Tue, 4 Oct 2016 05:27:10 +0000 (22:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iab5c7c6153bc12f50cc443225c0e562a795a7731
Auto-generated-cl: translation import
Lorenzo Colitti [Mon, 3 Oct 2016 23:37:09 +0000 (23:37 +0000)]
Merge "resolve merge conflicts of
f2801e4 to nyc-mr1-dev" into nyc-mr1-dev
jackqdyulei [Mon, 3 Oct 2016 21:01:46 +0000 (14:01 -0700)]
Add "FILTER_NOT_HIDE" for all app filters.
The "FILTER_NOT_HIDE" is used to filter out apps that "blacklisted"
by the carrier. So when user insert a specific sim card, these apps
are hiden in settings > apps unless user enable them.
Bug:
31823872
Test: Manual
Change-Id: I28a38b5780cb63fe22af12d80cc24e965b2b83cf
Matthew Fritze [Mon, 3 Oct 2016 20:26:07 +0000 (13:26 -0700)]
Prevent monkey tests from crashing with race conditions
Change-Id: I3eb7d5549aba2f9684f97e8ee7c56c469f9daae0
Fixes:
31856366
Test: None, monkey test race conditions.
Lorenzo Colitti [Mon, 3 Oct 2016 17:28:58 +0000 (02:28 +0900)]
resolve merge conflicts of
f2801e4 to nyc-mr1-dev
Change-Id: I8a9723e8c070cd7f99c39fe5918335847f0b6248
Hugo Benichi [Thu, 29 Sep 2016 00:16:55 +0000 (09:16 +0900)]
Update text of wifi to cell autoswitch toggle
Bug:
31807564
Change-Id: I3332a93bca855e3d3c8d63306a116dbe7f829ae0
TreeHugger Robot [Sat, 1 Oct 2016 08:55:31 +0000 (08:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Sat, 1 Oct 2016 01:11:46 +0000 (18:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I50d10792c922453215b9af11d6867626c2ce2152
Auto-generated-cl: translation import
Philip P. Moltmann [Sat, 1 Oct 2016 00:16:09 +0000 (00:16 +0000)]
Merge "USB restriction is similar to media restriction" into nyc-mr1-dev
Matthew Fritze [Fri, 30 Sep 2016 22:41:33 +0000 (22:41 +0000)]
Merge "Prevent double tap on suggestions" into nyc-mr1-dev
am:
d8435d57d2
Change-Id: Ia59ca2de3d5f90bb80c62ad3615197ccefc6f461
Matthew Fritze [Fri, 30 Sep 2016 22:41:32 +0000 (22:41 +0000)]
Prevent double tap on suggestions
am:
703dc60b14
Change-Id: I29e1f6aff53fc0c97ea5fabf325838981f1ef57f
Matthew Fritze [Fri, 30 Sep 2016 22:38:23 +0000 (22:38 +0000)]
Tablet Settings support tab has start/end padding
am:
839be498b6
Change-Id: I6e58352f95e5f5947a3d4ae111f3cf4a709462b7
TreeHugger Robot [Fri, 30 Sep 2016 22:33:46 +0000 (22:33 +0000)]
Merge "Prevent double tap on suggestions" into nyc-mr1-dev
Philip P. Moltmann [Wed, 14 Sep 2016 20:31:26 +0000 (13:31 -0700)]
USB restriction is similar to media restriction
Bug:
31472955
Change-Id: I3682ccd102565982c434d70fc0d907b1aa779689
(cherry picked from commit
58e2b502922c525ea5f4afcb43f4d2580016b22f)
Matthew Fritze [Wed, 28 Sep 2016 21:30:17 +0000 (14:30 -0700)]
Tablet Settings support tab has start/end padding
Change-Id: Ifdc74af0edbd1b44c4f73b497f16f8edcf647ede
Fixes:
31583422
Tests: Visual Inspection
Matthew Fritze [Fri, 30 Sep 2016 19:36:27 +0000 (12:36 -0700)]
Prevent double tap on suggestions
Change-Id: I963d96b75cb5d464b6f91cf0824aee6e21cfeff0
Fixes:
31856366
Matthew Fritze [Fri, 30 Sep 2016 00:20:29 +0000 (00:20 +0000)]
Merge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev
am:
cf0f301250
Change-Id: I3279202d4e7d9e836ca5173c9f4169c92c052d15
Matthew Fritze [Fri, 30 Sep 2016 00:20:27 +0000 (00:20 +0000)]
Support dialog disclaimer text now appears properly
am:
adc5555acf
Change-Id: I8eefba43b0e919f502c91f5f770d446c1d17a4e3
Matthew Fritze [Fri, 30 Sep 2016 00:12:55 +0000 (00:12 +0000)]
Merge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev
Garfield Tan [Thu, 29 Sep 2016 23:23:50 +0000 (23:23 +0000)]
Launch other info in storage in correct user id.
am:
493bf348b9
Change-Id: Iced863d798194b66b549e4213b5f813c2773ac1b
Matthew Fritze [Thu, 29 Sep 2016 22:03:28 +0000 (15:03 -0700)]
Support dialog disclaimer text now appears properly
The string override between Settings and SettigsGoogle was not properly
distinguishing, and was defaulting to the AOSP version.
Bug:
31827726
Test: Manual
Change-Id: Iebd8681fb4f040e956f05fb0f5d96deae9eec26f
Garfield Tan [Thu, 29 Sep 2016 21:14:54 +0000 (14:14 -0700)]
Launch other info in storage in correct user id.
Bug:
31592290
Change-Id: I816668c7ff9d1b443d4b49e17bdcfa39ef335aee
Bill Yi [Thu, 29 Sep 2016 07:57:16 +0000 (07:57 +0000)]
Import translations. DO NOT MERGE am:
dccfc04a3e -s ours
am:
ae35fa061e -s ours
Change-Id: Iefe3d69297ef0f4cb04ede83b2b93b523678c3ff
Bill Yi [Thu, 29 Sep 2016 07:53:15 +0000 (07:53 +0000)]
Import translations. DO NOT MERGE
am:
dccfc04a3e -s ours
Change-Id: Ia00dff846fc9174b6f5f4284e3d42f1ad9869ec7
Bill Yi [Thu, 29 Sep 2016 07:48:48 +0000 (07:48 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
f497c48345 -s ours
Change-Id: Ie7d6c6f9bbe4af3ca3709c1557dde5e52eeb91bc
Bill Yi [Thu, 29 Sep 2016 07:48:46 +0000 (07:48 +0000)]
Import translations. DO NOT MERGE
am:
4ae03656ac -s ours
Change-Id: I69bfb0033fd813af6242dead9e30d4a1bfcd3cd6
TreeHugger Robot [Thu, 29 Sep 2016 07:40:48 +0000 (07:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 29 Sep 2016 06:25:18 +0000 (23:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0cd1cb776f4dda8b02f683d92cda3efedff989bb
Auto-generated-cl: translation import