OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoMerge "Fix margin in Tap & pay -> Payment default." into nyc-mr1-dev am: 15c13f9e10...
Doris Ling [Tue, 23 Aug 2016 21:40:45 +0000 (21:40 +0000)]
Merge "Fix margin in Tap & pay -> Payment default." into nyc-mr1-dev am: 15c13f9e10 am: ea445c9db7
am: f101f3c396

Change-Id: Icb986ac5d17c0423bdd68dd975c13c20cdcad59d

7 years agoFix margin in Tap & pay -> Payment default. am: 9e29ac7983 am: 88842736d7
Doris Ling [Tue, 23 Aug 2016 21:40:44 +0000 (21:40 +0000)]
Fix margin in Tap & pay -> Payment default. am: 9e29ac7983 am: 88842736d7
am: a44f2e0f8f

Change-Id: I258bf58e922ff3b866bc21e8cdc7fb5fbf6991da

7 years agoMerge "Stop apps with Storage Managers from launching activity when disabled" into...
Matthew Fritze [Tue, 23 Aug 2016 21:40:44 +0000 (21:40 +0000)]
Merge "Stop apps with Storage Managers from launching activity when disabled" into nyc-mr1-dev am: 88d3cb7176 am: c9be13f26e
am: b4522799ef

Change-Id: I6ad201c483befea0a28e3fa21ddd1b63f09dfc00

7 years agoStop apps with Storage Managers from launching activity when disabled am: 1051fe1e14...
Matthew Fritze [Tue, 23 Aug 2016 21:40:43 +0000 (21:40 +0000)]
Stop apps with Storage Managers from launching activity when disabled am: 1051fe1e14 am: 7444ee791c
am: bf61bf6459

Change-Id: I14d7a4615a479f3a9e77a5139d89cc05d474f15c

7 years agoMerge "Disabled BSM mode switch when plugged in" into nyc-mr1-dev am: 4c8776627b...
Salvador Martinez [Tue, 23 Aug 2016 21:39:53 +0000 (21:39 +0000)]
Merge "Disabled BSM mode switch when plugged in" into nyc-mr1-dev am: 4c8776627b am: b3b0fd931b
am: bc81965891

Change-Id: Ibe60de90217cb7be265ee5b7f41c7ffcfaf4d6ac

7 years agoDisabled BSM mode switch when plugged in am: d4a6768880 am: 18d58269a8
Salvador Martinez [Tue, 23 Aug 2016 21:39:51 +0000 (21:39 +0000)]
Disabled BSM mode switch when plugged in am: d4a6768880 am: 18d58269a8
am: 3f3ce9595b

Change-Id: I0e703a0d249ae4708bce34733834a52ab01bfc00

7 years agoMerge "Made dialog material design compliant" into nyc-mr1-dev am: 4f6755931e am...
Salvador Martinez [Tue, 23 Aug 2016 21:39:49 +0000 (21:39 +0000)]
Merge "Made dialog material design compliant" into nyc-mr1-dev am: 4f6755931e am: a60628517f
am: fd59fa60e9

Change-Id: Ia76c4984d2d0433b5f66af634f744ed030563d90

7 years agoMade dialog material design compliant am: cfee94d448 am: 676db52b64
Salvador Martinez [Tue, 23 Aug 2016 21:39:46 +0000 (21:39 +0000)]
Made dialog material design compliant am: cfee94d448 am: 676db52b64
am: 1e9b8e67ff

Change-Id: I249dc055c7e429b3fb624e2fcaba90e0e2df1ebd

7 years agoMerge "Settings Focus prevented from moving to pref" into nyc-mr1-dev am: 0e98c73666...
Salvador Martinez [Tue, 23 Aug 2016 21:39:43 +0000 (21:39 +0000)]
Merge "Settings Focus prevented from moving to pref" into nyc-mr1-dev am: 0e98c73666 am: 5817342f14
am: 597d352cfb

Change-Id: I865e8548b4b00cbddbd3ce54db9a4ff0ce5b7442

7 years agoMerge "resolve merge conflicts of 052975e to master"
Salvador Martinez [Tue, 23 Aug 2016 21:30:13 +0000 (21:30 +0000)]
Merge "resolve merge conflicts of 052975e to master"

7 years agoMerge "Extract and refactor logic to determine the data usage summary mark."
TreeHugger Robot [Tue, 23 Aug 2016 21:24:41 +0000 (21:24 +0000)]
Merge "Extract and refactor logic to determine the data usage summary mark."

7 years agoresolve merge conflicts of 052975e to master
Salvador Martinez [Tue, 23 Aug 2016 20:59:48 +0000 (13:59 -0700)]
resolve merge conflicts of 052975e to master

Change-Id: I276079d08c2a73b2b00b065da666e33b33642fbd

7 years agoMerge "Prevent wifi icon from disappearing" into nyc-mr1-dev am: 89d138b724 am: d31d9...
Salvador Martinez [Tue, 23 Aug 2016 20:06:53 +0000 (20:06 +0000)]
Merge "Prevent wifi icon from disappearing" into nyc-mr1-dev am: 89d138b724 am: d31d90eecf
am: 2279920944

Change-Id: Iccb6ae0dd0b8d584fd0c1121b7bb91bcbbd235e8

7 years agoPrevent wifi icon from disappearing am: 5c0063af7e am: 56ebf2a051
Salvador Martinez [Tue, 23 Aug 2016 20:06:49 +0000 (20:06 +0000)]
Prevent wifi icon from disappearing am: 5c0063af7e am: 56ebf2a051
am: 5bbfa0555a

Change-Id: Ic365caef2c120220ae7ec13e576ae589017bc545

7 years agoExtract and refactor logic to determine the data usage summary mark.
Matthew Fritze [Tue, 23 Aug 2016 00:40:02 +0000 (17:40 -0700)]
Extract and refactor logic to determine the data usage summary mark.

Created a new controller for DataUsageInfo and add appropriate
unit tests.

Bug: 30946416
Change-Id: Ida1281a771013fd807242f846edb4f2a9c0ccabb
Test: Robolectric tests with target RunSettingsRoboTests

7 years agoMerge "Force phone number display to be LTR in support tab."
TreeHugger Robot [Tue, 23 Aug 2016 18:37:45 +0000 (18:37 +0000)]
Merge "Force phone number display to be LTR in support tab."

7 years agoMerge "Fix margin in Tap & pay -> Payment default." into nyc-mr1-dev am: 15c13f9e10
Doris Ling [Tue, 23 Aug 2016 18:29:08 +0000 (18:29 +0000)]
Merge "Fix margin in Tap & pay -> Payment default." into nyc-mr1-dev am: 15c13f9e10
am: ea445c9db7

Change-Id: I7fc61672c9df0a808c0a07723346678222c4ccf3

7 years agoFix margin in Tap & pay -> Payment default. am: 9e29ac7983
Doris Ling [Tue, 23 Aug 2016 18:29:07 +0000 (18:29 +0000)]
Fix margin in Tap & pay -> Payment default. am: 9e29ac7983
am: 88842736d7

Change-Id: Ia933244f4d9bf6cf2700f1815a77bbfcf47468e0

7 years agoMerge "Stop apps with Storage Managers from launching activity when disabled" into...
Matthew Fritze [Tue, 23 Aug 2016 18:28:04 +0000 (18:28 +0000)]
Merge "Stop apps with Storage Managers from launching activity when disabled" into nyc-mr1-dev am: 88d3cb7176
am: c9be13f26e

Change-Id: Ia249e3ea91b80d443be64c19f0a89da133a5a2c8

7 years agoStop apps with Storage Managers from launching activity when disabled am: 1051fe1e14
Matthew Fritze [Tue, 23 Aug 2016 18:27:59 +0000 (18:27 +0000)]
Stop apps with Storage Managers from launching activity when disabled am: 1051fe1e14
am: 7444ee791c

Change-Id: Ia358b60aff78a967663112399a260ffc2de27668

7 years agoMerge "Disabled BSM mode switch when plugged in" into nyc-mr1-dev am: 4c8776627b
Salvador Martinez [Tue, 23 Aug 2016 18:27:56 +0000 (18:27 +0000)]
Merge "Disabled BSM mode switch when plugged in" into nyc-mr1-dev am: 4c8776627b
am: b3b0fd931b

Change-Id: Ib36fed3ad37831b957bf445e1ad116dacb49baf0

7 years agoDisabled BSM mode switch when plugged in am: d4a6768880
Salvador Martinez [Tue, 23 Aug 2016 18:27:52 +0000 (18:27 +0000)]
Disabled BSM mode switch when plugged in am: d4a6768880
am: 18d58269a8

Change-Id: I3001c4e21f5e1bcae64074962ab4399f0787aaa3

7 years agoMerge "Made dialog material design compliant" into nyc-mr1-dev am: 4f6755931e
Salvador Martinez [Tue, 23 Aug 2016 18:27:49 +0000 (18:27 +0000)]
Merge "Made dialog material design compliant" into nyc-mr1-dev am: 4f6755931e
am: a60628517f

Change-Id: Ie9a865fc1cc13a1b516d2b4a99eca84cc5adfeb7

7 years agoMade dialog material design compliant am: cfee94d448
Salvador Martinez [Tue, 23 Aug 2016 18:26:40 +0000 (18:26 +0000)]
Made dialog material design compliant am: cfee94d448
am: 676db52b64

Change-Id: I2b5cdd12cda5b364afb1532e548b090144084a45

7 years agoMerge "Settings Focus prevented from moving to pref" into nyc-mr1-dev am: 0e98c73666
Salvador Martinez [Tue, 23 Aug 2016 18:26:39 +0000 (18:26 +0000)]
Merge "Settings Focus prevented from moving to pref" into nyc-mr1-dev am: 0e98c73666
am: 5817342f14

Change-Id: Id0d329a2a682e46a0168ed47f6fdba8e3163a6c9

7 years agoSettings Focus prevented from moving to pref am: 41fc4e8cb7
Salvador Martinez [Tue, 23 Aug 2016 18:26:38 +0000 (18:26 +0000)]
Settings Focus prevented from moving to pref am: 41fc4e8cb7
am: ce14c1e5eb

Change-Id: I56f870955b8bc534e21fec821404fe38c75a8e65

7 years agoMerge "Prevent wifi icon from disappearing" into nyc-mr1-dev am: 89d138b724
Salvador Martinez [Tue, 23 Aug 2016 18:26:37 +0000 (18:26 +0000)]
Merge "Prevent wifi icon from disappearing" into nyc-mr1-dev am: 89d138b724
am: d31d90eecf

Change-Id: Icfc80e8e55a41cbc4039e5075cd883a5ebf6d2c8

7 years agoPrevent wifi icon from disappearing am: 5c0063af7e
Salvador Martinez [Tue, 23 Aug 2016 18:26:33 +0000 (18:26 +0000)]
Prevent wifi icon from disappearing am: 5c0063af7e
am: 56ebf2a051

Change-Id: I0cf475280dd390e55befd285c33cde593e8c7878

7 years agoForce phone number display to be LTR in support tab.
Fan Zhang [Tue, 23 Aug 2016 16:18:13 +0000 (09:18 -0700)]
Force phone number display to be LTR in support tab.

Bug: 31030062
Change-Id: I94272c0ecbfa2f96842838c0f590b3704cd5c020

7 years agoMerge "Fix margin in Tap & pay -> Payment default." into nyc-mr1-dev
Doris Ling [Tue, 23 Aug 2016 16:07:13 +0000 (16:07 +0000)]
Merge "Fix margin in Tap & pay -> Payment default." into nyc-mr1-dev
am: 15c13f9e10

Change-Id: I814e027259acc0b084f2b8a86bfc73ecdf453331

7 years agoFix margin in Tap & pay -> Payment default.
Doris Ling [Tue, 23 Aug 2016 16:07:10 +0000 (16:07 +0000)]
Fix margin in Tap & pay -> Payment default.
am: 9e29ac7983

Change-Id: I04ffd2ec727a87096c554ae452ed58f5c2483f1e

7 years agoMerge "Stop apps with Storage Managers from launching activity when disabled" into...
Matthew Fritze [Tue, 23 Aug 2016 14:43:44 +0000 (14:43 +0000)]
Merge "Stop apps with Storage Managers from launching activity when disabled" into nyc-mr1-dev
am: 88d3cb7176

Change-Id: I9c081c2f701033ba9f74c73a70fd7ea50e5cd6f5

7 years agoStop apps with Storage Managers from launching activity when disabled
Matthew Fritze [Tue, 23 Aug 2016 14:43:44 +0000 (14:43 +0000)]
Stop apps with Storage Managers from launching activity when disabled
am: 1051fe1e14

Change-Id: Ib2ae9dcbd034c36c44addfaea0bc84ebe3f2247b

7 years agoMerge "Disabled BSM mode switch when plugged in" into nyc-mr1-dev
Salvador Martinez [Tue, 23 Aug 2016 14:43:43 +0000 (14:43 +0000)]
Merge "Disabled BSM mode switch when plugged in" into nyc-mr1-dev
am: 4c8776627b

Change-Id: Ifadf14eb2f4cf46da098bad92b795dc6ff0e67e1

7 years agoDisabled BSM mode switch when plugged in
Salvador Martinez [Tue, 23 Aug 2016 14:43:42 +0000 (14:43 +0000)]
Disabled BSM mode switch when plugged in
am: d4a6768880

Change-Id: I9e8116dd9413090145b7ef98b37db20706471c28

7 years agoMerge "Made dialog material design compliant" into nyc-mr1-dev
Salvador Martinez [Tue, 23 Aug 2016 14:43:41 +0000 (14:43 +0000)]
Merge "Made dialog material design compliant" into nyc-mr1-dev
am: 4f6755931e

Change-Id: Ia60e7c612435c2215789a749231d2df78de411be

7 years agoMade dialog material design compliant
Salvador Martinez [Tue, 23 Aug 2016 14:43:40 +0000 (14:43 +0000)]
Made dialog material design compliant
am: cfee94d448

Change-Id: If01b0f216ff0a8cadaa0d659b89a0c03136ce406

7 years agoMerge "Settings Focus prevented from moving to pref" into nyc-mr1-dev
Salvador Martinez [Tue, 23 Aug 2016 14:43:39 +0000 (14:43 +0000)]
Merge "Settings Focus prevented from moving to pref" into nyc-mr1-dev
am: 0e98c73666

Change-Id: Iad871a4333675bde9c1c18b50f91aed6976dada8

7 years agoSettings Focus prevented from moving to pref
Salvador Martinez [Tue, 23 Aug 2016 14:43:39 +0000 (14:43 +0000)]
Settings Focus prevented from moving to pref
am: 41fc4e8cb7

Change-Id: Ifc9b53a0514830e73a06311e27acbca57b476a0d

7 years agoMerge "Prevent wifi icon from disappearing" into nyc-mr1-dev
Salvador Martinez [Tue, 23 Aug 2016 14:43:37 +0000 (14:43 +0000)]
Merge "Prevent wifi icon from disappearing" into nyc-mr1-dev
am: 89d138b724

Change-Id: I2d3d0996f4fcbfa234c46d6a7c50c84ca7517c77

7 years agoPrevent wifi icon from disappearing
Salvador Martinez [Tue, 23 Aug 2016 14:43:36 +0000 (14:43 +0000)]
Prevent wifi icon from disappearing
am: 5c0063af7e

Change-Id: I1039ce10631d7f792cae36c3a171d90df11a9e33

7 years agoMerge "Tests for launch support on default feature" into nyc-mr1-dev am: 5b5cf5a2c7...
Salvador Martinez [Tue, 23 Aug 2016 02:08:46 +0000 (02:08 +0000)]
Merge "Tests for launch support on default feature" into nyc-mr1-dev am: 5b5cf5a2c7 am: f4ccb09603
am: 26fd0d0b75

Change-Id: I818e179bd0c3d3a75382b668c296f41f3d179a8e

7 years agoMerge "Fix margin in Tap & pay -> Payment default." into nyc-mr1-dev
Doris Ling [Tue, 23 Aug 2016 01:29:41 +0000 (01:29 +0000)]
Merge "Fix margin in Tap & pay -> Payment default." into nyc-mr1-dev

7 years agoresolve merge conflicts of 111b81d to master
Fan Zhang [Tue, 23 Aug 2016 00:26:34 +0000 (17:26 -0700)]
resolve merge conflicts of 111b81d to master

Change-Id: I2b7eb6dfe73a94b6acd5ef47690ee72022b1ad6d

7 years agoMerge "Force searchview to stretch entire actionbar."
TreeHugger Robot [Mon, 22 Aug 2016 23:05:42 +0000 (23:05 +0000)]
Merge "Force searchview to stretch entire actionbar."

7 years agoMerge "Make number in dialog highlighted" into nyc-mr1-dev am: 2363094863 am: ffc6372e7d
Lei Yu [Mon, 22 Aug 2016 22:38:52 +0000 (22:38 +0000)]
Merge "Make number in dialog highlighted" into nyc-mr1-dev am: 2363094863 am: ffc6372e7d
am: 2edf494de8

Change-Id: I3ab17d11b0540d6465726911c276667e19f20733

7 years agoMake number in dialog highlighted am: 7a78213776 am: 226ccfe62f
jackqdyulei [Mon, 22 Aug 2016 22:38:51 +0000 (22:38 +0000)]
Make number in dialog highlighted am: 7a78213776 am: 226ccfe62f
am: 8d4a7021dd

Change-Id: I04d18f0f33135a24f0638edd0f0b5547c8ed7fe6

7 years agoMerge "Fix the nullpointer bug in monkey test." into nyc-mr1-dev am: dd90acf2c0 am...
Lei Yu [Mon, 22 Aug 2016 22:38:47 +0000 (22:38 +0000)]
Merge "Fix the nullpointer bug in monkey test." into nyc-mr1-dev am: dd90acf2c0 am: 69db34ed2e
am: 6ad307140a

Change-Id: Ieef6eb6ef4f51cd9084738a80b2d021735ce9a86

7 years agoFix the nullpointer bug in monkey test. am: 409c4708c1 am: fbed8d95e9
jackqdyulei [Mon, 22 Aug 2016 22:38:46 +0000 (22:38 +0000)]
Fix the nullpointer bug in monkey test. am: 409c4708c1 am: fbed8d95e9
am: 83c6cfa463

Change-Id: I1b75233d06a534bc6f439649f460769b37ec5953

7 years agoMerge "Tests for launch support on default feature" into nyc-mr1-dev am: 5b5cf5a2c7
Salvador Martinez [Mon, 22 Aug 2016 22:32:39 +0000 (22:32 +0000)]
Merge "Tests for launch support on default feature" into nyc-mr1-dev am: 5b5cf5a2c7
am: f4ccb09603

Change-Id: I8f699fe1077e0fb120211c8b7e451d9b46da6404

7 years agoTests for launch support on default feature am: 3fb4e96b0d
Salvador Martinez [Mon, 22 Aug 2016 22:32:34 +0000 (22:32 +0000)]
Tests for launch support on default feature am: 3fb4e96b0d
am: 6c07416eba

Change-Id: I5ed71234e55ecbfbf160b860122ba73cc18d1707

7 years agoMerge "can open settings with support tab by default" into nyc-mr1-dev am: 5bd202e277
Salvador Martinez [Mon, 22 Aug 2016 22:32:25 +0000 (22:32 +0000)]
Merge "can open settings with support tab by default" into nyc-mr1-dev am: 5bd202e277
am: a9dc4d46ca

Change-Id: I9144185ab2a1e47364d6e8720481f3741b70f615

7 years agocan open settings with support tab by default am: 12c5208ad0
Salvador Martinez [Mon, 22 Aug 2016 22:32:20 +0000 (22:32 +0000)]
can open settings with support tab by default am: 12c5208ad0
am: 8d47bdc773

Change-Id: I223e42c2bc89e3f95a0fed9cc74ebfb21932370f

7 years agoMerge "Make number in dialog highlighted" into nyc-mr1-dev am: 2363094863
Lei Yu [Mon, 22 Aug 2016 22:32:19 +0000 (22:32 +0000)]
Merge "Make number in dialog highlighted" into nyc-mr1-dev am: 2363094863
am: ffc6372e7d

Change-Id: Ib86849dbdbfd1521c0715f839aba8c2acdc6538b

7 years agoMake number in dialog highlighted am: 7a78213776
jackqdyulei [Mon, 22 Aug 2016 22:32:18 +0000 (22:32 +0000)]
Make number in dialog highlighted am: 7a78213776
am: 226ccfe62f

Change-Id: Ie22cae038131a206f2d8a246ba3cd80398ba7cff

7 years agoMerge "Fix the nullpointer bug in monkey test." into nyc-mr1-dev am: dd90acf2c0
Lei Yu [Mon, 22 Aug 2016 22:32:17 +0000 (22:32 +0000)]
Merge "Fix the nullpointer bug in monkey test." into nyc-mr1-dev am: dd90acf2c0
am: 69db34ed2e

Change-Id: Ifdb6298262e2c2269e83c815cd376066fb7ec4e9

7 years agoFix the nullpointer bug in monkey test. am: 409c4708c1
jackqdyulei [Mon, 22 Aug 2016 22:32:17 +0000 (22:32 +0000)]
Fix the nullpointer bug in monkey test. am: 409c4708c1
am: fbed8d95e9

Change-Id: Ia93f4051af386b8d6dee02d7c617fe75730e9fc2

7 years agoMerge "Stop apps with Storage Managers from launching activity when disabled" into...
TreeHugger Robot [Mon, 22 Aug 2016 22:24:15 +0000 (22:24 +0000)]
Merge "Stop apps with Storage Managers from launching activity when disabled" into nyc-mr1-dev

7 years agoMerge "Tests for launch support on default feature" into nyc-mr1-dev
Salvador Martinez [Mon, 22 Aug 2016 22:21:03 +0000 (22:21 +0000)]
Merge "Tests for launch support on default feature" into nyc-mr1-dev
am: 5b5cf5a2c7

Change-Id: I7c855c5e352f57fb32a81baa891a83993fc926ca

7 years agoTests for launch support on default feature
Salvador Martinez [Mon, 22 Aug 2016 22:21:02 +0000 (22:21 +0000)]
Tests for launch support on default feature
am: 3fb4e96b0d

Change-Id: I3b3e4c1e717861856a1c5daf9d9bc9047629dae1

7 years agoMerge "can open settings with support tab by default" into nyc-mr1-dev
Salvador Martinez [Mon, 22 Aug 2016 22:20:58 +0000 (22:20 +0000)]
Merge "can open settings with support tab by default" into nyc-mr1-dev
am: 5bd202e277

Change-Id: I0100549be28207d38ac040e8e7cd5fd5c3c1447f

7 years agocan open settings with support tab by default
Salvador Martinez [Mon, 22 Aug 2016 22:20:54 +0000 (22:20 +0000)]
can open settings with support tab by default
am: 12c5208ad0

Change-Id: Ic28fc68db3d971ccf48c5667875474d4c9060a7b

7 years agoMerge "Make number in dialog highlighted" into nyc-mr1-dev
Lei Yu [Mon, 22 Aug 2016 22:20:52 +0000 (22:20 +0000)]
Merge "Make number in dialog highlighted" into nyc-mr1-dev
am: 2363094863

Change-Id: Ie93f7f491f2ccc5747963be5ba44e1e9c94fc584

7 years agoMake number in dialog highlighted
jackqdyulei [Mon, 22 Aug 2016 22:20:52 +0000 (22:20 +0000)]
Make number in dialog highlighted
am: 7a78213776

Change-Id: I1b5fb80a2a38a1224d6aa586d1ff2065c4a2a32a

7 years agoMerge "Fix the nullpointer bug in monkey test." into nyc-mr1-dev
Lei Yu [Mon, 22 Aug 2016 22:20:51 +0000 (22:20 +0000)]
Merge "Fix the nullpointer bug in monkey test." into nyc-mr1-dev
am: dd90acf2c0

Change-Id: I61637865ac2eed318d46e568b61f8eecc03713ab

7 years agoFix the nullpointer bug in monkey test.
jackqdyulei [Mon, 22 Aug 2016 22:20:50 +0000 (22:20 +0000)]
Fix the nullpointer bug in monkey test.
am: 409c4708c1

Change-Id: I03e6e3a5951f587169d0b2758283bff069b925a2

7 years agoMerge "Disabled BSM mode switch when plugged in" into nyc-mr1-dev
Salvador Martinez [Mon, 22 Aug 2016 21:56:21 +0000 (21:56 +0000)]
Merge "Disabled BSM mode switch when plugged in" into nyc-mr1-dev

7 years agoMerge "Made dialog material design compliant" into nyc-mr1-dev
Salvador Martinez [Mon, 22 Aug 2016 21:56:05 +0000 (21:56 +0000)]
Merge "Made dialog material design compliant" into nyc-mr1-dev

7 years agoMerge "Settings Focus prevented from moving to pref" into nyc-mr1-dev
Salvador Martinez [Mon, 22 Aug 2016 21:55:46 +0000 (21:55 +0000)]
Merge "Settings Focus prevented from moving to pref" into nyc-mr1-dev

7 years agoMerge "Prevent wifi icon from disappearing" into nyc-mr1-dev
Salvador Martinez [Mon, 22 Aug 2016 21:55:18 +0000 (21:55 +0000)]
Merge "Prevent wifi icon from disappearing" into nyc-mr1-dev

7 years agoMerge "Tests for launch support on default feature" into nyc-mr1-dev
Salvador Martinez [Mon, 22 Aug 2016 21:53:52 +0000 (21:53 +0000)]
Merge "Tests for launch support on default feature" into nyc-mr1-dev

7 years agoMerge "can open settings with support tab by default" into nyc-mr1-dev
Salvador Martinez [Mon, 22 Aug 2016 21:53:52 +0000 (21:53 +0000)]
Merge "can open settings with support tab by default" into nyc-mr1-dev

7 years agoTests for launch support on default feature
Salvador Martinez [Fri, 29 Jul 2016 16:50:56 +0000 (09:50 -0700)]
Tests for launch support on default feature

Includes some espresso tests to ensure that the proper
tab is selected when you attempt to launch settings.

Bug: 30233920
Change-Id: I171293114bd84b064b333091fcf2394d44debed5
(cherry picked from commit d1ef20beaa3c69e038860fd610f076892d428da2)

7 years agoMerge "Make number in dialog highlighted" into nyc-mr1-dev
Lei Yu [Mon, 22 Aug 2016 21:50:29 +0000 (21:50 +0000)]
Merge "Make number in dialog highlighted" into nyc-mr1-dev

7 years agoMerge "Fix the nullpointer bug in monkey test." into nyc-mr1-dev
Lei Yu [Mon, 22 Aug 2016 21:49:56 +0000 (21:49 +0000)]
Merge "Fix the nullpointer bug in monkey test." into nyc-mr1-dev

7 years agoMerge "Set oem unlock switch to reflect the actual state of device" into nyc-mr1...
Fan Zhang [Mon, 22 Aug 2016 21:47:29 +0000 (21:47 +0000)]
Merge "Set oem unlock switch to reflect the actual state of device" into nyc-mr1-dev am: 45fd5c4d4e am: a5785b72bb
am: d1a229ab52

Change-Id: I3fb9871a6ede2d592e40ce27136d50be396137c9

7 years agoSet oem unlock switch to reflect the actual state of device am: 1ba24ca792 am: ede4f9d41f
Fan Zhang [Mon, 22 Aug 2016 21:47:28 +0000 (21:47 +0000)]
Set oem unlock switch to reflect the actual state of device am: 1ba24ca792 am: ede4f9d41f
am: 7f881f339b

Change-Id: Ib51d2cf1ff484f16747762645e7c62006d2b574a

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: b98e47c79b -s ours...
Bill Yi [Mon, 22 Aug 2016 21:47:28 +0000 (21:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: b98e47c79b  -s ours am: 0d15b016db  -s ours
am: 2b094c4676  -s ours

Change-Id: Icff6987f0c89fe3fa6d25639997c7878799cc2c3

7 years agoImport translations. DO NOT MERGE am: f58be49ba8 -s ours am: 4114547feb -s ours
Bill Yi [Mon, 22 Aug 2016 21:46:15 +0000 (21:46 +0000)]
Import translations. DO NOT MERGE am: f58be49ba8  -s ours am: 4114547feb  -s ours
am: d0e262ba32  -s ours

Change-Id: Iad5870352bd0f497cfe619b2971190af6e0d0f30

7 years agoMerge "Have a fallback package name when matching targetPackage." into nyc-mr1-dev...
Fan Zhang [Mon, 22 Aug 2016 21:46:15 +0000 (21:46 +0000)]
Merge "Have a fallback package name when matching targetPackage." into nyc-mr1-dev am: 5a6fad7607 am: 93c6887768
am: c7065ca903

Change-Id: I9c61e2cfb396c86c45802e94b55ddb9772b9cf5a

7 years agoHave a fallback package name when matching targetPackage. am: 0c58131c37 am: 2dd0275d66
Fan Zhang [Mon, 22 Aug 2016 21:46:14 +0000 (21:46 +0000)]
Have a fallback package name when matching targetPackage. am: 0c58131c37 am: 2dd0275d66
am: 136fe5468c

Change-Id: I1993abbc9f3718dbec52f4e66e9bab0797945a64

7 years agoMerge "Align text to view start so they layout correctly in RTL." into nyc-mr1-dev...
Fan Zhang [Mon, 22 Aug 2016 21:46:14 +0000 (21:46 +0000)]
Merge "Align text to view start so they layout correctly in RTL." into nyc-mr1-dev am: ce8a222a59 am: 562d8276a6
am: ac38260bbb

Change-Id: I1992804517bfd96aad9efafedff1e75f52d940d2

7 years agoAlign text to view start so they layout correctly in RTL. am: be56fc17ed am: eebdb575ba
Fan Zhang [Mon, 22 Aug 2016 21:46:13 +0000 (21:46 +0000)]
Align text to view start so they layout correctly in RTL. am: be56fc17ed am: eebdb575ba
am: 44f03854d8

Change-Id: I4c9a5b25f17fd34bd9d2ad684cb3348d3f398363

7 years agoMerge "Set oem unlock switch to reflect the actual state of device" into nyc-mr1...
Fan Zhang [Mon, 22 Aug 2016 21:43:23 +0000 (21:43 +0000)]
Merge "Set oem unlock switch to reflect the actual state of device" into nyc-mr1-dev am: 45fd5c4d4e
am: a5785b72bb

Change-Id: Id7383a0e5565e5b1d8544553c6fdc10d75de26cf

7 years agoSet oem unlock switch to reflect the actual state of device am: 1ba24ca792
Fan Zhang [Mon, 22 Aug 2016 21:43:22 +0000 (21:43 +0000)]
Set oem unlock switch to reflect the actual state of device am: 1ba24ca792
am: ede4f9d41f

Change-Id: I61f6cc2ec3dc40f27dc1ac943a2305c41a826a88

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: b98e47c79b -s ours
Bill Yi [Mon, 22 Aug 2016 21:43:19 +0000 (21:43 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: b98e47c79b  -s ours
am: 0d15b016db  -s ours

Change-Id: I0e8a0a446a27c6b1e946829a9f6b895548bdc72f

7 years agoImport translations. DO NOT MERGE am: f58be49ba8 -s ours
Bill Yi [Mon, 22 Aug 2016 21:42:11 +0000 (21:42 +0000)]
Import translations. DO NOT MERGE am: f58be49ba8  -s ours
am: 4114547feb  -s ours

Change-Id: Icac1aca6c6f4d09de537b606b42ae1bb1c2ce457

7 years agoMerge "Have a fallback package name when matching targetPackage." into nyc-mr1-dev...
Fan Zhang [Mon, 22 Aug 2016 21:42:10 +0000 (21:42 +0000)]
Merge "Have a fallback package name when matching targetPackage." into nyc-mr1-dev am: 5a6fad7607
am: 93c6887768

Change-Id: If1fd73e98e2f06278e71d282a55d036215e7c50b

7 years agoHave a fallback package name when matching targetPackage. am: 0c58131c37
Fan Zhang [Mon, 22 Aug 2016 21:42:09 +0000 (21:42 +0000)]
Have a fallback package name when matching targetPackage. am: 0c58131c37
am: 2dd0275d66

Change-Id: I4ecd52a133db924a47fcaf843a32c64227134fd8

7 years agoMerge "Align text to view start so they layout correctly in RTL." into nyc-mr1-dev...
Fan Zhang [Mon, 22 Aug 2016 21:42:09 +0000 (21:42 +0000)]
Merge "Align text to view start so they layout correctly in RTL." into nyc-mr1-dev am: ce8a222a59
am: 562d8276a6

Change-Id: Ie6ec75ea45b9bb94652ce649ce1e7bdf68b74135

7 years agoAlign text to view start so they layout correctly in RTL. am: be56fc17ed
Fan Zhang [Mon, 22 Aug 2016 21:42:07 +0000 (21:42 +0000)]
Align text to view start so they layout correctly in RTL. am: be56fc17ed
am: eebdb575ba

Change-Id: Ie72f4716ae0fe55b7f3fffb7f100031f5122add7

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 22 Aug 2016 21:41:00 +0000 (21:41 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoMerge "Set oem unlock switch to reflect the actual state of device" into nyc-mr1-dev
Fan Zhang [Mon, 22 Aug 2016 21:37:49 +0000 (21:37 +0000)]
Merge "Set oem unlock switch to reflect the actual state of device" into nyc-mr1-dev
am: 45fd5c4d4e

Change-Id: I6ea35fe7eb8b6b8d711b128ada6da50284896a40

7 years agoSet oem unlock switch to reflect the actual state of device
Fan Zhang [Mon, 22 Aug 2016 21:37:48 +0000 (21:37 +0000)]
Set oem unlock switch to reflect the actual state of device
am: 1ba24ca792

Change-Id: I77c374d43d6f78cf57cf2a1a9bb505538d86c9aa

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Mon, 22 Aug 2016 21:37:47 +0000 (21:37 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: b98e47c79b  -s ours

Change-Id: I5b2018c5885abc17a04d5e5a1bae92178cd9e854

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 22 Aug 2016 21:37:45 +0000 (21:37 +0000)]
Import translations. DO NOT MERGE
am: f58be49ba8  -s ours

Change-Id: Ia9c43520ca258a2b85c47c417016f689723935ee

7 years agoMerge "Have a fallback package name when matching targetPackage." into nyc-mr1-dev
Fan Zhang [Mon, 22 Aug 2016 21:37:44 +0000 (21:37 +0000)]
Merge "Have a fallback package name when matching targetPackage." into nyc-mr1-dev
am: 5a6fad7607

Change-Id: I227c1571ba527529af038bf805c15f8b0bc803a4

7 years agoHave a fallback package name when matching targetPackage.
Fan Zhang [Mon, 22 Aug 2016 21:37:43 +0000 (21:37 +0000)]
Have a fallback package name when matching targetPackage.
am: 0c58131c37

Change-Id: I0c57b1a71c6388a3fdfc761b44b142abfdf40bcb

7 years agoMerge "Align text to view start so they layout correctly in RTL." into nyc-mr1-dev
Fan Zhang [Mon, 22 Aug 2016 21:37:42 +0000 (21:37 +0000)]
Merge "Align text to view start so they layout correctly in RTL." into nyc-mr1-dev
am: ce8a222a59

Change-Id: I2c8356156df5a938add968561efccdcc3affe72e

7 years agoAlign text to view start so they layout correctly in RTL.
Fan Zhang [Mon, 22 Aug 2016 21:37:41 +0000 (21:37 +0000)]
Align text to view start so they layout correctly in RTL.
am: be56fc17ed

Change-Id: I079df4d68672d97b4bb30996fb58c5a951e513f1