OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoMerge "Add condition check for double tap gesture settings." into nyc-mr1-dev am...
Jonathan Nieder [Thu, 6 Oct 2016 21:52:45 +0000 (21:52 +0000)]
Merge "Add condition check for double tap gesture settings." into nyc-mr1-dev am: 6cab381bc2
am: 64136f30d1

Change-Id: I3ee238ba4cc3ec5abc1ecc950dc01e7b08a5d62a

7 years agoAdd condition check for double tap gesture settings. am: c8b7555fc9
Doris Ling [Thu, 6 Oct 2016 21:52:33 +0000 (21:52 +0000)]
Add condition check for double tap gesture settings. am: c8b7555fc9
am: 7f62890cad

Change-Id: If89dfb781ca8b8e0a7dd8e0b1f59e32ae6d4d98f

7 years agoMerge "Fix bug preventing users from clicking settings suggestions twice" into nyc...
Matthew Fritze [Thu, 6 Oct 2016 21:52:02 +0000 (21:52 +0000)]
Merge "Fix bug preventing users from clicking settings suggestions twice" into nyc-mr1-dev am: fb42828381
am: 62fcf9369f

Change-Id: I7aa60f53cf44d5090a648551ef2ff02431981ff0

7 years agoFix bug preventing users from clicking settings suggestions twice am: f265dbc447
Matthew Fritze [Thu, 6 Oct 2016 21:51:47 +0000 (21:51 +0000)]
Fix bug preventing users from clicking settings suggestions twice am: f265dbc447
am: e5e60eccaf

Change-Id: I956ed80ce27ec50378901111f5679b163719628f

7 years agoGive CTS the handle it expects to remove PIN. am: 7be1b5923f
Jeff Sharkey [Thu, 6 Oct 2016 21:15:12 +0000 (21:15 +0000)]
Give CTS the handle it expects to remove PIN. am: 7be1b5923f
am: 4ae8eb2aae

Change-Id: Ic3ee8be685d83b8be07f2e0129e3a7573ad4e920

7 years agoImport translations. DO NOT MERGE am: 972c78b4ee -s ours am: e87f2bbaa0 -s ours
Bill Yi [Thu, 6 Oct 2016 21:10:21 +0000 (21:10 +0000)]
Import translations. DO NOT MERGE am: 972c78b4ee  -s ours am: e87f2bbaa0  -s ours
am: 784b1cbf35  -s ours

Change-Id: I9ffd9b5af5b44dd0e9dfb0a2ee231ce619ce9d71

7 years agoMerge "Add "FILTER_NOT_HIDE" for all app filters." into nyc-mr1-dev am: 9c54a67d66
Lei Yu [Thu, 6 Oct 2016 21:10:06 +0000 (21:10 +0000)]
Merge "Add "FILTER_NOT_HIDE" for all app filters." into nyc-mr1-dev am: 9c54a67d66
am: d7f2c10f94

Change-Id: Idd81a0beb1b5999696e6f47ab6fb64110a4f0793

7 years agoAdd "FILTER_NOT_HIDE" for all app filters. am: d785a8db78
jackqdyulei [Thu, 6 Oct 2016 21:00:31 +0000 (21:00 +0000)]
Add "FILTER_NOT_HIDE" for all app filters. am: d785a8db78
am: 00ed827516

Change-Id: I108753ea9af54aba754a8899f02a3f100f3b38fd

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f91ca6bcd9 -s ours
Bill Yi [Thu, 6 Oct 2016 21:00:03 +0000 (21:00 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f91ca6bcd9  -s ours
am: f0be222981  -s ours

Change-Id: I22381a4a7bc572765718c6003769431b0974567c

7 years agoImport translations. DO NOT MERGE am: 8aee525418 -s ours
Bill Yi [Thu, 6 Oct 2016 20:59:44 +0000 (20:59 +0000)]
Import translations. DO NOT MERGE am: 8aee525418  -s ours
am: 47f6271d15  -s ours

Change-Id: I9f2c7f8ffce896e53ca32192b6902760b9939bb2

7 years agoMerge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev am: 365d95b69a
Lorenzo Colitti [Thu, 6 Oct 2016 20:59:31 +0000 (20:59 +0000)]
Merge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev am: 365d95b69a
am: bb529c267d

Change-Id: I817462cc9a96112bd6f80d8f6042cae962ec7331

7 years agoresolve merge conflicts of f2801e4 to nyc-mr1-dev am: b01c080b08
Lorenzo Colitti [Thu, 6 Oct 2016 20:59:17 +0000 (20:59 +0000)]
resolve merge conflicts of f2801e4 to nyc-mr1-dev am: b01c080b08
am: be3924c1b6

Change-Id: Ifecf71ed6b0c756fb59ce8fa4293aebb68158f89

7 years agoPrevent monkey tests from crashing with race conditions am: 7ac78f2daf
Matthew Fritze [Thu, 6 Oct 2016 20:59:03 +0000 (20:59 +0000)]
Prevent monkey tests from crashing with race conditions am: 7ac78f2daf
am: 9264154bee

Change-Id: If30a93ce12ee3100f6fea14f4765e3428b122ad3

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 0d424ef9bd -s ours
Bill Yi [Thu, 6 Oct 2016 20:58:50 +0000 (20:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 0d424ef9bd  -s ours
am: ffae7d82c3  -s ours

Change-Id: Iff1708277ff2827a631228d4c4a286e503543190

7 years agoImport translations. DO NOT MERGE am: ae33f8e62c -s ours
Bill Yi [Thu, 6 Oct 2016 20:58:37 +0000 (20:58 +0000)]
Import translations. DO NOT MERGE am: ae33f8e62c  -s ours
am: b1f3f659f1  -s ours

Change-Id: Ibb7e5a0d26b14095d632979a5e57fd8bed9966f1

7 years agoMerge "USB restriction is similar to media restriction" into nyc-mr1-dev am: f9ca06b367
Philip P. Moltmann [Thu, 6 Oct 2016 20:58:22 +0000 (20:58 +0000)]
Merge "USB restriction is similar to media restriction" into nyc-mr1-dev am: f9ca06b367
am: ae23c07073

Change-Id: I9ccd46e5d5d15685dccf8b9a3dbd5a82b56d6bda

7 years agoMerge "Add condition check for double tap gesture settings." into nyc-mr1-dev
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

7 years agoAdd condition check for double tap gesture settings.
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

7 years agoMerge "Fix bug preventing users from clicking settings suggestions twice" into nyc...
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

7 years agoFix bug preventing users from clicking settings suggestions twice
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

7 years agoGive CTS the handle it expects to remove PIN.
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

7 years agoImport translations. DO NOT MERGE am: 972c78b4ee -s ours
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

7 years agoMerge "Add "FILTER_NOT_HIDE" for all app filters." into nyc-mr1-dev
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

7 years agoAdd "FILTER_NOT_HIDE" for all app filters.
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

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
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

7 years agoImport translations. DO NOT MERGE
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

7 years agoMerge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev
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

7 years agoresolve merge conflicts of f2801e4 to nyc-mr1-dev
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

7 years agoPrevent monkey tests from crashing with race conditions
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

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
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

7 years agoImport translations. DO NOT MERGE
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

7 years agoMerge "USB restriction is similar to media restriction" into nyc-mr1-dev
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

7 years agoUSB restriction is similar to media restriction am: 13ee50be48
Philip P. Moltmann [Thu, 6 Oct 2016 20:07:13 +0000 (20:07 +0000)]
USB restriction is similar to media restriction am: 13ee50be48
am: a78fced068

Change-Id: Icb1dbfba6cf3e1a5097cc32b33330b8025e6c46d

7 years agoUSB restriction is similar to media restriction
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

7 years agoMerge "Add condition check for double tap gesture settings." into nyc-mr1-dev
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

7 years agoMerge "Fix bug preventing users from clicking settings suggestions twice" into nyc...
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

7 years agoAdd condition check for double tap gesture settings.
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

7 years agoFix bug preventing users from clicking settings suggestions twice
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

7 years agoGive CTS the handle it expects to remove PIN.
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

7 years agoImport translations. DO NOT MERGE
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

7 years agoMerge "Add "FILTER_NOT_HIDE" for all app filters." into nyc-mr1-dev
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

7 years agoMerge "Import translations. DO NOT MERGE" 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

7 years agoImport translations. DO NOT MERGE
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

7 years agoImport translations. DO NOT MERGE
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

7 years agoMerge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev
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

7 years agoAdd "FILTER_NOT_HIDE" for all app filters.
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

7 years agoPrevent monkey tests from crashing with race conditions
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.

7 years agoresolve merge conflicts of f2801e4 to nyc-mr1-dev
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

7 years agoUpdate text of wifi to cell autoswitch toggle
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

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Sat, 1 Oct 2016 08:55:31 +0000 (08:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoImport translations. DO NOT MERGE
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

7 years agoMerge "USB restriction is similar to media restriction" into nyc-mr1-dev
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

7 years agoMerge "Prevent double tap on suggestions" into nyc-mr1-dev am: d8435d57d2
Matthew Fritze [Fri, 30 Sep 2016 22:48:12 +0000 (22:48 +0000)]
Merge "Prevent double tap on suggestions" into nyc-mr1-dev am: d8435d57d2
am: c94ac39096

Change-Id: I25635d1153694924fdd025b31185c9ac4ffdcff8

7 years agoPrevent double tap on suggestions am: 703dc60b14
Matthew Fritze [Fri, 30 Sep 2016 22:47:58 +0000 (22:47 +0000)]
Prevent double tap on suggestions am: 703dc60b14
am: ae3ad11e69

Change-Id: Ie53d72bf5e504cdc87d01ce0aeef1683b9d72214

7 years agoTablet Settings support tab has start/end padding am: 839be498b6
Matthew Fritze [Fri, 30 Sep 2016 22:47:45 +0000 (22:47 +0000)]
Tablet Settings support tab has start/end padding am: 839be498b6
am: 4de4d8801d

Change-Id: I47af4f65b405346e5ceae8006f7b09d4763dc8ad

7 years agoMerge "Prevent double tap on suggestions" 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

7 years agoPrevent double tap on suggestions
Matthew Fritze [Fri, 30 Sep 2016 22:41:32 +0000 (22:41 +0000)]
Prevent double tap on suggestions
am: 703dc60b14

Change-Id: I29e1f6aff53fc0c97ea5fabf325838981f1ef57f

7 years agoTablet Settings support tab has start/end padding
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

7 years agoMerge "Prevent double tap on suggestions" into nyc-mr1-dev
TreeHugger Robot [Fri, 30 Sep 2016 22:33:46 +0000 (22:33 +0000)]
Merge "Prevent double tap on suggestions" into nyc-mr1-dev

7 years agoUSB restriction is similar to media restriction
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)

7 years agoTablet Settings support tab has start/end padding
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

7 years agoPrevent double tap on suggestions
Matthew Fritze [Fri, 30 Sep 2016 19:36:27 +0000 (12:36 -0700)]
Prevent double tap on suggestions

Change-Id: I963d96b75cb5d464b6f91cf0824aee6e21cfeff0
Fixes: 31856366

7 years agoMerge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev am:...
Matthew Fritze [Fri, 30 Sep 2016 00:22:31 +0000 (00:22 +0000)]
Merge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev am: cf0f301250
am: b0722aeb88

Change-Id: Iee75b36e9c6a07bbadfebd8e561edc352492520a

7 years agoSupport dialog disclaimer text now appears properly am: adc5555acf
Matthew Fritze [Fri, 30 Sep 2016 00:22:26 +0000 (00:22 +0000)]
Support dialog disclaimer text now appears properly am: adc5555acf
am: bbe0e8a30b

Change-Id: I42f693c150af45e2a6c57d82c30d0b5ffc9dd0ed

7 years agoMerge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev
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

7 years agoSupport dialog disclaimer text now appears properly
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

7 years agoMerge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev
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

7 years agoLaunch other info in storage in correct user id. am: 493bf348b9
Garfield Tan [Thu, 29 Sep 2016 23:29:21 +0000 (23:29 +0000)]
Launch other info in storage in correct user id. am: 493bf348b9
am: 1ab4f4b816

Change-Id: I93d5222647efd84eb6c1d159c053455fbb382c13

7 years agoLaunch other info in storage in correct user id.
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

7 years agoSupport dialog disclaimer text now appears properly
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

7 years agoLaunch other info in storage in correct user id.
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

7 years agoImport translations. DO NOT MERGE am: dccfc04a3e -s ours am: ae35fa061e -s ours
Bill Yi [Thu, 29 Sep 2016 08:01:47 +0000 (08:01 +0000)]
Import translations. DO NOT MERGE am: dccfc04a3e  -s ours am: ae35fa061e  -s ours
am: a69e26abbf  -s ours

Change-Id: If22270482cf8caffc0baa84e6205903e73f1f7fc

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f497c48345 -s ours
Bill Yi [Thu, 29 Sep 2016 07:57:41 +0000 (07:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f497c48345  -s ours
am: c53fb015d9  -s ours

Change-Id: I86a1e1bd6a7ef84d41b743d1ac1b0827183ff94f

7 years agoImport translations. DO NOT MERGE am: 4ae03656ac -s ours
Bill Yi [Thu, 29 Sep 2016 07:57:26 +0000 (07:57 +0000)]
Import translations. DO NOT MERGE am: 4ae03656ac  -s ours
am: ae3ec3984d  -s ours

Change-Id: I43fbba4e5f8c55a438233ac120f0af00300b8a25

7 years agoImport translations. DO NOT MERGE am: dccfc04a3e -s ours
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

7 years agoImport translations. DO NOT MERGE
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

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
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

7 years agoImport translations. DO NOT MERGE
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

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 29 Sep 2016 07:40:48 +0000 (07:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoImport translations. DO NOT MERGE
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

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 29 Sep 2016 06:20:25 +0000 (23:20 -0700)]
Import translations. DO NOT MERGE

Change-Id: I4a6114d77d04143e22aa02f591cc6f7b75444d46
Auto-generated-cl: translation import

7 years agoMerge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev am: c81e1141cc
Hugo Benichi [Thu, 29 Sep 2016 03:50:16 +0000 (03:50 +0000)]
Merge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev am: c81e1141cc
am: 9bd60dd8ac

Change-Id: I0abb48f432879b686ee179069c366753ada31161

7 years agoUpdate text of wifi to cell autoswitch toggle am: 1968fb1fd4
Hugo Benichi [Thu, 29 Sep 2016 03:50:01 +0000 (03:50 +0000)]
Update text of wifi to cell autoswitch toggle am: 1968fb1fd4
am: b00a9135ba

Change-Id: Icb2059fe884e7020ad843158db1af444b2641d61

7 years agoMerge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev
Hugo Benichi [Thu, 29 Sep 2016 03:46:11 +0000 (03:46 +0000)]
Merge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev
am: c81e1141cc

Change-Id: Idf215a22923b96129462579816e170655f99d4e8

7 years agoUpdate text of wifi to cell autoswitch toggle
Hugo Benichi [Thu, 29 Sep 2016 03:46:10 +0000 (03:46 +0000)]
Update text of wifi to cell autoswitch toggle
am: 1968fb1fd4

Change-Id: I58f87f2befc0dbcb1fa0ea43dc9255a7849984f6

7 years agoMerge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev
TreeHugger Robot [Thu, 29 Sep 2016 03:38:46 +0000 (03:38 +0000)]
Merge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev

7 years agoUpdate text of wifi to cell autoswitch toggle
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

7 years agoMerge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev am: 6cafff3b2c
Matthew Fritze [Thu, 29 Sep 2016 00:36:18 +0000 (00:36 +0000)]
Merge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev am: 6cafff3b2c
am: 493350dcf7

Change-Id: I9b1e216adddaa1e995ef0d80280fc47d7a02bad8

7 years agoTablet Settings Layout is no longer stretched am: c4a9b18121
Matthew Fritze [Thu, 29 Sep 2016 00:36:04 +0000 (00:36 +0000)]
Tablet Settings Layout is no longer stretched am: c4a9b18121
am: a936610ae2

Change-Id: Ib6d604f753d3424d67396c9e051829cad43d6d76

7 years agoMerge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev am: 2f6eef699d
Meng Wang [Thu, 29 Sep 2016 00:35:49 +0000 (00:35 +0000)]
Merge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev am: 2f6eef699d
am: 2c545d5bfa

Change-Id: I06bdabaabc3baec3faa82182cf8e0d0e208e252b

7 years agoWiFiCallingSettings: show roaming preferrence am: fe3749dd0b
Meng Wang [Thu, 29 Sep 2016 00:30:54 +0000 (00:30 +0000)]
WiFiCallingSettings: show roaming preferrence am: fe3749dd0b
am: 335b3488f9

Change-Id: I9a6d86727a29991056f452b74bcc5632bb8750a9

7 years agoMerge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev
Matthew Fritze [Thu, 29 Sep 2016 00:27:18 +0000 (00:27 +0000)]
Merge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev
am: 6cafff3b2c

Change-Id: I8cc65986d6b5788ccbc8919e0788cf2db4b7fade

7 years agoTablet Settings Layout is no longer stretched
Matthew Fritze [Thu, 29 Sep 2016 00:27:17 +0000 (00:27 +0000)]
Tablet Settings Layout is no longer stretched
am: c4a9b18121

Change-Id: Ie103fd6248bd206e517c5f7de880b76862b831ba

7 years agoMerge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev
Meng Wang [Thu, 29 Sep 2016 00:26:56 +0000 (00:26 +0000)]
Merge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev
am: 2f6eef699d

Change-Id: Id6d84cd51171da42f21894617ec26fb48e45cfa9

7 years agoWiFiCallingSettings: show roaming preferrence
Meng Wang [Thu, 29 Sep 2016 00:22:18 +0000 (00:22 +0000)]
WiFiCallingSettings: show roaming preferrence
am: fe3749dd0b

Change-Id: I10a1a2e443e3c678db3fa892d4c1331339e8df85

7 years agoMerge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev
TreeHugger Robot [Thu, 29 Sep 2016 00:16:23 +0000 (00:16 +0000)]
Merge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev

7 years agoMerge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev
Meng Wang [Thu, 29 Sep 2016 00:13:49 +0000 (00:13 +0000)]
Merge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev

7 years agoMerge "Settings suggestions now describes expand and collapse in talkback" into nyc...
Matthew Fritze [Wed, 28 Sep 2016 23:01:26 +0000 (23:01 +0000)]
Merge "Settings suggestions now describes expand and collapse in talkback" into nyc-mr1-dev am: fb0d4c8534
am: cdaddb365f

Change-Id: I712be7226887900a0810c692615c5c3a39bf7c10

7 years agoSettings suggestions now describes expand and collapse in talkback am: 62cf9efd9b
Matthew Fritze [Wed, 28 Sep 2016 23:01:12 +0000 (23:01 +0000)]
Settings suggestions now describes expand and collapse in talkback am: 62cf9efd9b
am: d522eff9e5

Change-Id: I95c7c1e9f7e3cec8dc9d439b480b78b2520730fb

7 years agoMerge "Settings suggestions now describes expand and collapse in talkback" into nyc...
Matthew Fritze [Wed, 28 Sep 2016 22:58:11 +0000 (22:58 +0000)]
Merge "Settings suggestions now describes expand and collapse in talkback" into nyc-mr1-dev
am: fb0d4c8534

Change-Id: Ibdbf2f289d9e74e6517f3bb4c05e3436dd699e37