OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoDo not allow apps to cause Bluetooth to be discoverable forever am: 6dcab67c0c
Ajay Panicker [Thu, 18 Aug 2016 22:01:26 +0000 (22:01 +0000)]
Do not allow apps to cause Bluetooth to be discoverable forever am: 6dcab67c0c
am: 091986f33a

Change-Id: I2231d4bb2d339bbcf4a248e1702c3efae82c544d

7 years agoDo not allow apps to cause Bluetooth to be discoverable forever
Ajay Panicker [Thu, 18 Aug 2016 21:57:51 +0000 (21:57 +0000)]
Do not allow apps to cause Bluetooth to be discoverable forever
am: 6dcab67c0c

Change-Id: Ifaef229a60b74bb2708159232fe8f6792ded7647

7 years agoDo not allow apps to cause Bluetooth to be discoverable forever
Ajay Panicker [Thu, 18 Aug 2016 20:17:19 +0000 (13:17 -0700)]
Do not allow apps to cause Bluetooth to be discoverable forever

Trying to set a discoverable timout of 0 for Bluetooth will now
not allow bluetooth to be discoverable forever.

Bug: 28177801
Change-Id: Icfa03e2100f8e7f31415ebab39889b9ec32e6c77

7 years agoMerge "Display days of week in locale order." into nyc-mr1-dev am: 8d9ade8b9c
Julia Reynolds [Wed, 17 Aug 2016 19:04:35 +0000 (19:04 +0000)]
Merge "Display days of week in locale order." into nyc-mr1-dev am: 8d9ade8b9c
am: fcc323c091

Change-Id: I680adb75a621a0641a2262199a86ad7693ce9566

7 years agoDisplay days of week in locale order. am: 0bb60ada96
Julia Reynolds [Wed, 17 Aug 2016 19:04:35 +0000 (19:04 +0000)]
Display days of week in locale order. am: 0bb60ada96
am: c3997cbae1

Change-Id: Ic8837b2b5c1985910a02edf62316597bdff87122

7 years agoLoad default data warning value instead of hardcode it. am: 688ad857e8
Fan Zhang [Wed, 17 Aug 2016 18:31:20 +0000 (18:31 +0000)]
Load default data warning value instead of hardcode it. am: 688ad857e8
am: 2ef1750fff

Change-Id: I1b33b9e40e0daf6b489a0662f7b14631b6899d7b

7 years agoImport translations. DO NOT MERGE am: 8a611b1162 -s ours
Bill Yi [Wed, 17 Aug 2016 18:31:16 +0000 (18:31 +0000)]
Import translations. DO NOT MERGE am: 8a611b1162  -s ours
am: 25a04c0b39  -s ours

Change-Id: I51f6a1fe06709f31cb51d99e5deeb7ebcb3b91cc

7 years agoMerge "Display days of week in locale order." into nyc-mr1-dev
Julia Reynolds [Wed, 17 Aug 2016 18:11:44 +0000 (18:11 +0000)]
Merge "Display days of week in locale order." into nyc-mr1-dev
am: 8d9ade8b9c

Change-Id: I2fc4c10d0fae744749a7c92aa0c39681e1c9861c

7 years agoDisplay days of week in locale order.
Julia Reynolds [Wed, 17 Aug 2016 18:11:43 +0000 (18:11 +0000)]
Display days of week in locale order.
am: 0bb60ada96

Change-Id: I9c6cb0b0947d8d313fa5794185fbe119cfa7725a

7 years agoLoad default data warning value instead of hardcode it.
Fan Zhang [Wed, 17 Aug 2016 17:39:24 +0000 (17:39 +0000)]
Load default data warning value instead of hardcode it.
am: 688ad857e8

Change-Id: Ie982559572c96da6ba0bb9276f4ba974936b418f

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 17 Aug 2016 17:39:22 +0000 (17:39 +0000)]
Import translations. DO NOT MERGE
am: 8a611b1162  -s ours

Change-Id: I69399deba5bc5fd85d06923cacc07fb1128f6eec

7 years agoMerge "Display days of week in locale order." into nyc-mr1-dev
Julia Reynolds [Wed, 17 Aug 2016 16:42:25 +0000 (16:42 +0000)]
Merge "Display days of week in locale order." into nyc-mr1-dev

7 years agoLoad default data warning value instead of hardcode it.
Fan Zhang [Tue, 9 Aug 2016 23:27:54 +0000 (16:27 -0700)]
Load default data warning value instead of hardcode it.

Bug: 30898071
Change-Id: I36f3669ca07862476c778aabb1290f3ceb3afc92

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 16 Aug 2016 09:31:55 +0000 (02:31 -0700)]
Import translations. DO NOT MERGE

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

7 years agoDon't dial any number if DIAL intent is not supported. am: 6098913d4b
Fan Zhang [Mon, 15 Aug 2016 23:44:32 +0000 (23:44 +0000)]
Don't dial any number if DIAL intent is not supported. am: 6098913d4b
am: 9d478bef16

Change-Id: I6726f4551a1ca865c225d2c6d2bfb0b1e6a4f00a

7 years agoDon't dial any number if DIAL intent is not supported.
Fan Zhang [Mon, 15 Aug 2016 23:40:39 +0000 (23:40 +0000)]
Don't dial any number if DIAL intent is not supported.
am: 6098913d4b

Change-Id: Ia00c08773bb69508f274739043b6c0b00015358e

7 years agoDon't dial any number if DIAL intent is not supported.
Fan Zhang [Mon, 15 Aug 2016 20:22:42 +0000 (13:22 -0700)]
Don't dial any number if DIAL intent is not supported.

Bug: 30868123
Change-Id: Ieb971fdd86011ef0699fdbcfec1ecce2112d0209

8 years agoMerge "Assist: Allow disabling the disclosure animation" into nyc-mr1-dev am: 404104a6a8
Adrian Roos [Fri, 12 Aug 2016 23:18:40 +0000 (23:18 +0000)]
Merge "Assist: Allow disabling the disclosure animation" into nyc-mr1-dev am: 404104a6a8
am: c8131c1e58

Change-Id: I35103df353bf82d27dec8a579f459ec1201247cd

8 years agoAssist: Allow disabling the disclosure animation am: fff9fd87bf
Adrian Roos [Fri, 12 Aug 2016 23:18:32 +0000 (23:18 +0000)]
Assist: Allow disabling the disclosure animation am: fff9fd87bf
am: cea8891d5a

Change-Id: Ib18f9a866942cc40752b7ff36d2cd6a2aa6e7084

8 years agoMerge "Strings in a diclaimer dialog when turning on NFC." into nyc-mr1-dev am: f22f7...
Fan Zhang [Fri, 12 Aug 2016 20:40:43 +0000 (20:40 +0000)]
Merge "Strings in a diclaimer dialog when turning on NFC." into nyc-mr1-dev am: f22f7e8b53
am: 91becf6d87

Change-Id: I44e1b5af1f4555d4f2483634e525582153c82968

8 years agoStrings in a diclaimer dialog when turning on NFC. am: 9c9cadd991
Fan Zhang [Fri, 12 Aug 2016 20:40:43 +0000 (20:40 +0000)]
Strings in a diclaimer dialog when turning on NFC. am: 9c9cadd991
am: d9f35ed984

Change-Id: Id5e8ed6bc0398d97e7ca662c1c9bf173a3159a7f

8 years agoMerge "Assist: Allow disabling the disclosure animation" into nyc-mr1-dev
Adrian Roos [Fri, 12 Aug 2016 20:35:34 +0000 (20:35 +0000)]
Merge "Assist: Allow disabling the disclosure animation" into nyc-mr1-dev
am: 404104a6a8

Change-Id: I0254b84dac2b1cb3fa7a07e74218bf8cc30ff59b

8 years agoAssist: Allow disabling the disclosure animation
Adrian Roos [Fri, 12 Aug 2016 20:35:30 +0000 (20:35 +0000)]
Assist: Allow disabling the disclosure animation
am: fff9fd87bf

Change-Id: I625b96295a9f39704f2016903f4cfc063613122f

8 years agoMerge "Assist: Allow disabling the disclosure animation" into nyc-mr1-dev
TreeHugger Robot [Fri, 12 Aug 2016 20:28:10 +0000 (20:28 +0000)]
Merge "Assist: Allow disabling the disclosure animation" into nyc-mr1-dev

8 years agoMerge "Strings in a diclaimer dialog when turning on NFC." into nyc-mr1-dev
Fan Zhang [Fri, 12 Aug 2016 20:21:31 +0000 (20:21 +0000)]
Merge "Strings in a diclaimer dialog when turning on NFC." into nyc-mr1-dev
am: f22f7e8b53

Change-Id: I892a2e9b741b44b462bd30581ad0d7c36e1db514

8 years agoStrings in a diclaimer dialog when turning on NFC.
Fan Zhang [Fri, 12 Aug 2016 20:21:30 +0000 (20:21 +0000)]
Strings in a diclaimer dialog when turning on NFC.
am: 9c9cadd991

Change-Id: Ic71699bbc33fca59c29abd8c7e3804975ceca9db

8 years agoMerge "Strings in a diclaimer dialog when turning on NFC." into nyc-mr1-dev
TreeHugger Robot [Fri, 12 Aug 2016 19:58:26 +0000 (19:58 +0000)]
Merge "Strings in a diclaimer dialog when turning on NFC." into nyc-mr1-dev

8 years agoStrings in a diclaimer dialog when turning on NFC.
Fan Zhang [Fri, 12 Aug 2016 17:44:23 +0000 (10:44 -0700)]
Strings in a diclaimer dialog when turning on NFC.

Bug: 30834503

Change-Id: If18fe3ae075d96fbac20751d91d10a03d3396a53

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 99b590df3e -s ours
Bill Yi [Fri, 12 Aug 2016 09:45:35 +0000 (09:45 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 99b590df3e  -s ours
am: 7b1062da75  -s ours

Change-Id: I64e1747122165a22613ec976e8a3d9d713da41d6

8 years agoImport translations. DO NOT MERGE am: 125aecfb4b -s ours
Bill Yi [Fri, 12 Aug 2016 09:45:33 +0000 (09:45 +0000)]
Import translations. DO NOT MERGE am: 125aecfb4b  -s ours
am: e24aef7907  -s ours

Change-Id: I0808abfa35007a9539f9f411ab5c64b6c9572863

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Fri, 12 Aug 2016 09:38:33 +0000 (09:38 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 99b590df3e  -s ours

Change-Id: If09ddaa056c14936d86b11a369a7a2a31025f057

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 12 Aug 2016 09:38:33 +0000 (09:38 +0000)]
Import translations. DO NOT MERGE
am: 125aecfb4b  -s ours

Change-Id: Ic8503c8f4b0b05582c1ad5f12e0e5123b2ea5c41

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 12 Aug 2016 09:25:46 +0000 (09:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 12 Aug 2016 01:25:13 +0000 (18:25 -0700)]
Import translations. DO NOT MERGE

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

8 years agoFix a broken TetherServiceTest. am: 8681148918
Jeremy Klein [Fri, 12 Aug 2016 00:06:28 +0000 (00:06 +0000)]
Fix a broken TetherServiceTest. am: 8681148918
am: be9c338253

Change-Id: Ic4b97f70f0ac75c3ee42ebc51a0b1365a7ac58f1

8 years agoFix a broken TetherServiceTest.
Jeremy Klein [Fri, 12 Aug 2016 00:02:57 +0000 (00:02 +0000)]
Fix a broken TetherServiceTest.
am: 8681148918

Change-Id: Ie8a290129fd32b6630273a29cd6f77425e6c419d

8 years agoFix a broken TetherServiceTest.
Jeremy Klein [Thu, 11 Aug 2016 22:57:29 +0000 (15:57 -0700)]
Fix a broken TetherServiceTest.

This should have been updated when I changed settings to use the new
tethering API.

Bug: 30814807
Change-Id: I3853e6abf1e9976aedae70d4ff41336940545b64

8 years agoAssist: Allow disabling the disclosure animation
Adrian Roos [Thu, 11 Aug 2016 22:45:22 +0000 (15:45 -0700)]
Assist: Allow disabling the disclosure animation

Change-Id: I18a2e4144c762a0833d2384c51f916b841dfc8b3
Fixes: 30809067

8 years agoMerge "Update support tab strings." into nyc-mr1-dev am: 623650c898
Matthew Fritze [Tue, 9 Aug 2016 22:42:41 +0000 (22:42 +0000)]
Merge "Update support tab strings." into nyc-mr1-dev am: 623650c898
am: 3f89379170

Change-Id: I5d3b012f334a12a5bf5566906d8100712aa34ff2

8 years agoUpdate support tab strings. am: 4bb7854d04
Matthew Fritze [Tue, 9 Aug 2016 22:42:38 +0000 (22:42 +0000)]
Update support tab strings. am: 4bb7854d04
am: 7233ce37ee

Change-Id: I4e6db102174db845bab6725d244f5c778aed4dd2

8 years agoMerge "Update support tab strings." into nyc-mr1-dev
Matthew Fritze [Tue, 9 Aug 2016 22:38:50 +0000 (22:38 +0000)]
Merge "Update support tab strings." into nyc-mr1-dev
am: 623650c898

Change-Id: I492f8c7d386c7a90455d48ffa18ad00bebd9ffa8

8 years agoUpdate support tab strings.
Matthew Fritze [Tue, 9 Aug 2016 22:38:49 +0000 (22:38 +0000)]
Update support tab strings.
am: 4bb7854d04

Change-Id: Iac65f5356686c450a2b20db151fb39496b6a89ba

8 years agoMerge "Update support tab strings." into nyc-mr1-dev
Matthew Fritze [Tue, 9 Aug 2016 22:35:26 +0000 (22:35 +0000)]
Merge "Update support tab strings." into nyc-mr1-dev

8 years agoUpdate support tab strings.
Matthew Fritze [Tue, 9 Aug 2016 21:46:14 +0000 (14:46 -0700)]
Update support tab strings.

Bug: 30757866
Change-Id: Ia0df640e548b57ed034e97a34c396f55eb850e73

8 years agoBoot Sounds setting in OtherSoundSettings am: 7f6d27b1ce
Geoffrey Pitsch [Tue, 9 Aug 2016 19:55:17 +0000 (19:55 +0000)]
Boot Sounds setting in OtherSoundSettings am: 7f6d27b1ce
am: 56aa7785ae

Change-Id: I27db7465af53db37fbd0c0e7304f56d865276892

8 years agoBoot Sounds setting in OtherSoundSettings
Geoffrey Pitsch [Tue, 9 Aug 2016 19:47:53 +0000 (19:47 +0000)]
Boot Sounds setting in OtherSoundSettings
am: 7f6d27b1ce

Change-Id: Iae8f014dc240202a7347daa4f8c22754662d9ea2

8 years agoBoot Sounds setting in OtherSoundSettings
Geoffrey Pitsch [Mon, 8 Aug 2016 19:39:33 +0000 (15:39 -0400)]
Boot Sounds setting in OtherSoundSettings

Uses a persistent system property so it can be accessed by bootanim.

BUG:30690353
Change-Id: Iffb7e140074b8bf4b0faabdecbbf163b14360655

8 years agoMerge "Set Fragment title in onCreate." into nyc-mr1-dev am: a353d3fa5f
Philip P. Moltmann [Mon, 8 Aug 2016 22:25:09 +0000 (22:25 +0000)]
Merge "Set Fragment title in onCreate." into nyc-mr1-dev am: a353d3fa5f
am: 691af0ff1c

Change-Id: I30557ee72b6386148184d8f47912cd9225fcac8a

8 years agoSet Fragment title in onCreate. am: 1ba9127696
Philip P. Moltmann [Mon, 8 Aug 2016 22:25:07 +0000 (22:25 +0000)]
Set Fragment title in onCreate. am: 1ba9127696
am: e94449bc83

Change-Id: Iaf0c2bd0cc35a187fd20ac2565abfd381d29c3d2

8 years agoMerge "Set Fragment title in onCreate." into nyc-mr1-dev
Philip P. Moltmann [Mon, 8 Aug 2016 22:11:31 +0000 (22:11 +0000)]
Merge "Set Fragment title in onCreate." into nyc-mr1-dev
am: a353d3fa5f

Change-Id: I4a632e25514fec5f2b2c169f6c9ac8a3e13d156b

8 years agoSet Fragment title in onCreate.
Philip P. Moltmann [Mon, 8 Aug 2016 22:11:31 +0000 (22:11 +0000)]
Set Fragment title in onCreate.
am: 1ba9127696

Change-Id: Ic162d48bd93bef43127fbd0c58cba4ebf9efddfe

8 years agoMerge "Set Fragment title in onCreate." into nyc-mr1-dev
Philip P. Moltmann [Mon, 8 Aug 2016 21:54:22 +0000 (21:54 +0000)]
Merge "Set Fragment title in onCreate." into nyc-mr1-dev

8 years agoMerge "Update OEM unlock summary string" into nyc-mr1-dev am: 2de8fd95a3
Esteban Talavera [Mon, 8 Aug 2016 20:52:01 +0000 (20:52 +0000)]
Merge "Update OEM unlock summary string" into nyc-mr1-dev am: 2de8fd95a3
am: 9e879b8a8d

Change-Id: Id5d5a5557adf2478eb56d9935cd8d1d3f32635b3

8 years agoUpdate OEM unlock summary string am: 63f791a1e9
Esteban Talavera [Mon, 8 Aug 2016 20:52:00 +0000 (20:52 +0000)]
Update OEM unlock summary string am: 63f791a1e9
am: e3d32bb291

Change-Id: I56ec672beb69eea0221c69f60025d9fe172dfcdc

8 years agoMerge "Update OEM unlock summary string" into nyc-mr1-dev
Esteban Talavera [Mon, 8 Aug 2016 20:49:24 +0000 (20:49 +0000)]
Merge "Update OEM unlock summary string" into nyc-mr1-dev
am: 2de8fd95a3

Change-Id: If27d401ceb80ab7b797fc8c8677b8c42341f03e7

8 years agoUpdate OEM unlock summary string
Esteban Talavera [Mon, 8 Aug 2016 20:49:24 +0000 (20:49 +0000)]
Update OEM unlock summary string
am: 63f791a1e9

Change-Id: I8cc34021241e2abdb55aafb4c313e79d68d02ef2

8 years agoMerge "Update OEM unlock summary string" into nyc-mr1-dev
TreeHugger Robot [Mon, 8 Aug 2016 19:51:32 +0000 (19:51 +0000)]
Merge "Update OEM unlock summary string" into nyc-mr1-dev

8 years agoSet Fragment title in onCreate.
Philip P. Moltmann [Mon, 8 Aug 2016 17:57:22 +0000 (10:57 -0700)]
Set Fragment title in onCreate.

To allow the accessibility to read the title early enough.

Fixes: 30677578
Change-Id: I2dbd8f0fa7697038cf69e0282ebcb590fbc64cc2

8 years agoUpdate OEM unlock summary string
Esteban Talavera [Mon, 8 Aug 2016 14:38:01 +0000 (15:38 +0100)]
Update OEM unlock summary string

Bug: 30661116
Bug: 29047618

Change-Id: I4f747e29c595453d9d0263ce7fc90d37b81aa251

8 years agoImport translations. DO NOT MERGE am: a409b4126a -s ours
Bill Yi [Mon, 8 Aug 2016 14:14:04 +0000 (14:14 +0000)]
Import translations. DO NOT MERGE am: a409b4126a  -s ours
am: 05938c0fb4  -s ours

Change-Id: I246ca7392ece04e34aa774a4b0a7ae9441b2f628

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 8 Aug 2016 14:01:49 +0000 (14:01 +0000)]
Import translations. DO NOT MERGE
am: a409b4126a  -s ours

Change-Id: Ic0a1c0ea38a3294a9188ed8f158addbac6cc4810

8 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 8 Aug 2016 05:18:11 +0000 (22:18 -0700)]
Import translations. DO NOT MERGE

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

8 years agoMerge "Use different text in fingeprint intro for SUW" into nyc-mr1-dev am: 297be6c350
Maurice Lam [Fri, 5 Aug 2016 22:15:07 +0000 (22:15 +0000)]
Merge "Use different text in fingeprint intro for SUW" into nyc-mr1-dev am: 297be6c350
am: fced432a22

Change-Id: Iebae7bee886667076d4f60e30a18c6e814d8377a

8 years agoUse different text in fingeprint intro for SUW am: a3397cbbcc
Maurice Lam [Fri, 5 Aug 2016 22:15:04 +0000 (22:15 +0000)]
Use different text in fingeprint intro for SUW am: a3397cbbcc
am: cdedff01cb

Change-Id: Id1c6d160c75a3ff367c1c4498b3c7b3f4a74ad2e

8 years agoMerge "Use different text in fingeprint intro for SUW" into nyc-mr1-dev
Maurice Lam [Fri, 5 Aug 2016 22:12:21 +0000 (22:12 +0000)]
Merge "Use different text in fingeprint intro for SUW" into nyc-mr1-dev
am: 297be6c350

Change-Id: Ia1e0985a731c86bde8ddaf53f6e920030538f31d

8 years agoUse different text in fingeprint intro for SUW
Maurice Lam [Fri, 5 Aug 2016 22:12:20 +0000 (22:12 +0000)]
Use different text in fingeprint intro for SUW
am: a3397cbbcc

Change-Id: Ia875f59977e855fb75d29368e2661219e6da63e8

8 years agoMerge "Use different text in fingeprint intro for SUW" into nyc-mr1-dev
Maurice Lam [Fri, 5 Aug 2016 22:06:30 +0000 (22:06 +0000)]
Merge "Use different text in fingeprint intro for SUW" into nyc-mr1-dev

8 years agoRevert change to move Display->Ambient Display to Moves->Quick screen check. am:...
Doris Ling [Fri, 5 Aug 2016 21:07:57 +0000 (21:07 +0000)]
Revert change to move Display->Ambient Display to Moves->Quick screen check. am: 9b3000d8ac
am: ded92189c2

Change-Id: Ic7e0788c5b77bcf3e33009b2ffad9b748c3d73b9

8 years agoRevert change to move Display->Ambient Display to Moves->Quick screen check.
Doris Ling [Fri, 5 Aug 2016 21:04:57 +0000 (21:04 +0000)]
Revert change to move Display->Ambient Display to Moves->Quick screen check.
am: 9b3000d8ac

Change-Id: I81191942eee433b04ff72672e98ec0ffd080e7cf

8 years agoUse different text in fingeprint intro for SUW
Maurice Lam [Fri, 5 Aug 2016 19:06:05 +0000 (12:06 -0700)]
Use different text in fingeprint intro for SUW

Bug: 30681287
Change-Id: Idd03b96c9447523f3128e559be213d89691f4ce1

8 years agoRevert change to move Display->Ambient Display to Moves->Quick screen
Doris Ling [Fri, 5 Aug 2016 18:36:33 +0000 (11:36 -0700)]
Revert change to move Display->Ambient Display to Moves->Quick screen
check.

1. Add back original toggle for Display->Ambient Display and revert
summary text.
2. Remove Moves->Quick screen check preference and related scroll logic.
3. Remove ambient display related animation videos

Bug: 30686297
Change-Id: Ie01a201f0a8deb0a858bc2a7f9cc607b749ab6e4

8 years agoMerge changes Ic198dc44,I15f000bf am: 682c2ede09 -s ours am: d3ad45e37c
Mark Salyzyn [Fri, 5 Aug 2016 17:31:57 +0000 (17:31 +0000)]
Merge changes Ic198dc44,I15f000bf am: 682c2ede09  -s ours am: d3ad45e37c
am: a8e7eaafda

Change-Id: I7bbabbf1c86b52a9db679de5618ed9fa99d4b3d9

8 years agoMerge changes Ic198dc44,I15f000bf am: 682c2ede09 -s ours
Mark Salyzyn [Fri, 5 Aug 2016 17:29:00 +0000 (17:29 +0000)]
Merge changes Ic198dc44,I15f000bf am: 682c2ede09  -s ours
am: d3ad45e37c

Change-Id: If65c8493f77db6bc24e24ecb7ff089c7284959be

8 years agoMerge changes Ic198dc44,I15f000bf
Mark Salyzyn [Fri, 5 Aug 2016 17:26:28 +0000 (17:26 +0000)]
Merge changes Ic198dc44,I15f000bf
am: 682c2ede09  -s ours

Change-Id: I69584d0b778ca9ffa6c8f2965a874cf63fa650d7

8 years agoMerge changes Ic198dc44,I15f000bf
Mark Salyzyn [Fri, 5 Aug 2016 17:03:05 +0000 (17:03 +0000)]
Merge changes Ic198dc44,I15f000bf

* changes:
  select_logd_size_summaries char limit
  select_logpersist_title char limit

8 years agoselect_logd_size_summaries char limit
Mark Salyzyn [Fri, 5 Aug 2016 16:30:16 +0000 (09:30 -0700)]
select_logd_size_summaries char limit

increase select_logd_size_summaries character limit to 44

Bug: 29890579
Change-Id: Ic198dc4420e074fd72d1864c7448659a33126b1b

8 years agoselect_logpersist_title char limit
Mark Salyzyn [Fri, 5 Aug 2016 16:28:21 +0000 (09:28 -0700)]
select_logpersist_title char limit

increase select_logpersist_title character limit to 60
increase select_logpersist_titles character limit to 26

Bug: 29313564
Change-Id: I15f000bf155f33a7d4a1cc6c5434552f43803f58

8 years agoChange Display->Ambient Display to Display->Quick screen check. am: b727e9caa5
Doris Ling [Thu, 4 Aug 2016 23:53:40 +0000 (23:53 +0000)]
Change Display->Ambient Display to Display->Quick screen check. am: b727e9caa5
am: 2533fb386d

Change-Id: I1e7656af2b8c0376369affd11e417fe2ed7ed4b5

8 years agoChange Display->Ambient Display to Display->Quick screen check.
Doris Ling [Thu, 4 Aug 2016 23:46:47 +0000 (23:46 +0000)]
Change Display->Ambient Display to Display->Quick screen check.
am: b727e9caa5

Change-Id: I2bfd2c525f5d44a94eb56f489526fb6f7931412a

8 years agoChange Display->Ambient Display to Display->Quick screen check.
Doris Ling [Mon, 1 Aug 2016 21:56:26 +0000 (14:56 -0700)]
Change Display->Ambient Display to Display->Quick screen check.

Update the preference title for Ambient display and add metrics logging
when user selects it.

Bug: 29994493
Change-Id: Ibeaa60889d3f4394c924471b21baa929d469db71

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: dfe576b3e4 -s ours
Bill Yi [Thu, 4 Aug 2016 09:49:41 +0000 (09:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: dfe576b3e4  -s ours
am: fd2baea4b8  -s ours

Change-Id: I4c02102d3e9451e893b755c7d94cdc8f844d35fb

8 years agoImport translations. DO NOT MERGE am: 6daafd06a8 -s ours
Bill Yi [Thu, 4 Aug 2016 09:49:40 +0000 (09:49 +0000)]
Import translations. DO NOT MERGE am: 6daafd06a8  -s ours
am: a9ad38d3a5  -s ours

Change-Id: Ice6604c90cac55d570bde083492c92a4279f478d

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 4 Aug 2016 09:41:10 +0000 (09:41 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: dfe576b3e4  -s ours

Change-Id: If528ff620a5250c512f182108bc02b8b4088bf7b

8 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 4 Aug 2016 09:41:09 +0000 (09:41 +0000)]
Import translations. DO NOT MERGE
am: 6daafd06a8  -s ours

Change-Id: I98aa5adddb125a51280b652df9fbd198a71e0471

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 4 Aug 2016 09:20:36 +0000 (09:20 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Update summary correctly in Settings dashboard." into nyc-mr1-dev am: e3f29e46b0
Fan Zhang [Thu, 4 Aug 2016 00:31:05 +0000 (00:31 +0000)]
Merge "Update summary correctly in Settings dashboard." into nyc-mr1-dev am: e3f29e46b0
am: a539715ae0

Change-Id: Ic63a1488e62e8debcbad90cdd59f32922d391982

8 years agoUpdate summary correctly in Settings dashboard. am: 011362d9f1
Fan Zhang [Thu, 4 Aug 2016 00:31:04 +0000 (00:31 +0000)]
Update summary correctly in Settings dashboard. am: 011362d9f1
am: 9ee547370b

Change-Id: I0e8930a2e81ab10b4c7539f4b07758817054a979

8 years agoMerge "Update summary correctly in Settings dashboard." into nyc-mr1-dev
Fan Zhang [Thu, 4 Aug 2016 00:26:09 +0000 (00:26 +0000)]
Merge "Update summary correctly in Settings dashboard." into nyc-mr1-dev
am: e3f29e46b0

Change-Id: Ie29f075a8de1a7846f6f5aea479aa5853f805c3e

8 years agoUpdate summary correctly in Settings dashboard.
Fan Zhang [Thu, 4 Aug 2016 00:26:09 +0000 (00:26 +0000)]
Update summary correctly in Settings dashboard.
am: 011362d9f1

Change-Id: I4733b94588d7b995846ce1d5d02bd2758f37d68b

8 years agoMerge "Update summary correctly in Settings dashboard." into nyc-mr1-dev
TreeHugger Robot [Thu, 4 Aug 2016 00:18:43 +0000 (00:18 +0000)]
Merge "Update summary correctly in Settings dashboard." into nyc-mr1-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 3 Aug 2016 23:08:38 +0000 (16:08 -0700)]
Import translations. DO NOT MERGE

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

8 years agoUpdate summary correctly in Settings dashboard.
Fan Zhang [Wed, 3 Aug 2016 21:47:01 +0000 (14:47 -0700)]
Update summary correctly in Settings dashboard.

Bug: 30490325

SummaryLoader needs DashboardCategory to update summary and it currently
ask for it from DashboardAdapter. But DashboardCategory is not always
available in DashboardAdapter. When SummaryLoader wants to get category
from adapter before adapter is ready, it won't have it, causing summary
to appear blank sometimes.

The fix is to get category from data source directly.

Change-Id: I9d7f676954d1cece42d6e03748ab7aa35357f8b7

8 years agoMerge "Hide travel abroad button initially." into nyc-mr1-dev am: fa41bf14fc
Fan Zhang [Wed, 3 Aug 2016 22:21:15 +0000 (22:21 +0000)]
Merge "Hide travel abroad button initially." into nyc-mr1-dev am: fa41bf14fc
am: b39fb89fe7

Change-Id: I552d7c48e924068a9814585c321b7c37cf626313

8 years agoHide travel abroad button initially. am: 79378ebf91
Fan Zhang [Wed, 3 Aug 2016 22:21:14 +0000 (22:21 +0000)]
Hide travel abroad button initially. am: 79378ebf91
am: ca2b903bc1

Change-Id: I8413373241ec9109f1a0ac2d86da95dc20c632e7

8 years agoMerge "Hide travel abroad button initially." into nyc-mr1-dev
Fan Zhang [Wed, 3 Aug 2016 22:11:27 +0000 (22:11 +0000)]
Merge "Hide travel abroad button initially." into nyc-mr1-dev
am: fa41bf14fc

Change-Id: I8412ad0c52aaad1a08e339dca376db672e8fec02

8 years agoHide travel abroad button initially.
Fan Zhang [Wed, 3 Aug 2016 22:11:27 +0000 (22:11 +0000)]
Hide travel abroad button initially.
am: 79378ebf91

Change-Id: Ifa43c925c2e5f1d49c0f01f55c87875d7369a247

8 years agoMerge "Hide travel abroad button initially." into nyc-mr1-dev
Fan Zhang [Wed, 3 Aug 2016 21:59:06 +0000 (21:59 +0000)]
Merge "Hide travel abroad button initially." into nyc-mr1-dev

8 years agoHide travel abroad button initially.
Fan Zhang [Wed, 3 Aug 2016 19:58:07 +0000 (12:58 -0700)]
Hide travel abroad button initially.

Bug: 30632031

This button needs to be initially hidden so user can't accidentally
click it before data is ready.

Change-Id: I8cdd1f68bdcb5ba7ecbde34e72d85a5da1fa4a3d

8 years agoMerge "Set the tether Entitlement app as active when enabling tethering." into nyc...
Jeremy Klein [Wed, 3 Aug 2016 19:02:21 +0000 (19:02 +0000)]
Merge "Set the tether Entitlement app as active when enabling tethering." into nyc-mr1-dev am: 84101bef07
am: 045d8f2326

Change-Id: I37ce43d180b0acbb88190fcce42163825d995ef0

8 years agoSet the tether Entitlement app as active when enabling tethering. am: b04fae204e
Jeremy Klein [Wed, 3 Aug 2016 19:02:20 +0000 (19:02 +0000)]
Set the tether Entitlement app as active when enabling tethering. am: b04fae204e
am: 95fb3f6d3c

Change-Id: I75d28601b83a9b8edffa1f6741767673aaa7dfc0