OSDN Git Service

android-x86/packages-apps-Settings.git
8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 19 Aug 2016 16:11:07 +0000 (16:11 +0000)]
Import translations. DO NOT MERGE
am: 1339fe799d  -s ours

Change-Id: Ide032ff6bbdfdb0f73e045135f80a3d1f75f338e

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 19 Aug 2016 14:39:53 +0000 (07:39 -0700)]
Import translations. DO NOT MERGE

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

8 years agoMerge "WiFiCallingSettings: hide wfc mode preference if not editable" into nyc-mr1-dev
Meng Wang [Thu, 18 Aug 2016 22:08:27 +0000 (22:08 +0000)]
Merge "WiFiCallingSettings: hide wfc mode preference if not editable" into nyc-mr1-dev
am: f30ef19dc3

Change-Id: Ibe2e2a5a6d5188ae4aa42195884caa5b0ad7853b

8 years agoWiFiCallingSettings: hide wfc mode preference if not editable
Meng Wang [Thu, 18 Aug 2016 22:08:27 +0000 (22:08 +0000)]
WiFiCallingSettings: hide wfc mode preference if not editable
am: 4436d6fe16

Change-Id: Ica966b8306afd541521b0e7f65c68019f4c692b4

8 years agoMerge "WiFiCallingSettings: hide wfc mode preference if not editable" into nyc-mr1-dev
TreeHugger Robot [Thu, 18 Aug 2016 21:59:16 +0000 (21:59 +0000)]
Merge "WiFiCallingSettings: hide wfc mode preference if not editable" into nyc-mr1-dev

8 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

8 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

8 years agoWiFiCallingSettings: hide wfc mode preference if not editable
Meng Wang [Thu, 18 Aug 2016 19:19:01 +0000 (12:19 -0700)]
WiFiCallingSettings: hide wfc mode preference if not editable

Bug: 30947921
Change-Id: I80240fbd912afa9a40cee38070c4e77d5e9d6ae9

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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
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
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.
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
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
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
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
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
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
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.
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 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
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
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
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 18:59:43 +0000 (18:59 +0000)]
Merge "Set the tether Entitlement app as active when enabling tethering." into nyc-mr1-dev
am: 84101bef07

Change-Id: If09acddff160af33a5d14eca40172bfbfc3ec720

8 years agoSet the tether Entitlement app as active when enabling tethering.
Jeremy Klein [Wed, 3 Aug 2016 18:59:42 +0000 (18:59 +0000)]
Set the tether Entitlement app as active when enabling tethering.
am: b04fae204e

Change-Id: Ie74056677682e858625ea571049efc52154797b7

8 years agoMerge "Set the tether Entitlement app as active when enabling tethering." into nyc...
Jeremy Klein [Wed, 3 Aug 2016 18:54:12 +0000 (18:54 +0000)]
Merge "Set the tether Entitlement app as active when enabling tethering." into nyc-mr1-dev

8 years agoMerge "Hide redundant restrictions" into nyc-mr1-dev
Tony Mak [Wed, 3 Aug 2016 09:35:27 +0000 (09:35 +0000)]
Merge "Hide redundant restrictions" into nyc-mr1-dev
am: cd49847096

Change-Id: Ib02fe9ff98d07fdf7d95d64f53e29d6cd51e7fc3

8 years agoHide redundant restrictions
Tony Mak [Wed, 3 Aug 2016 09:35:27 +0000 (09:35 +0000)]
Hide redundant restrictions
am: 9ba765b875

Change-Id: I93f08738626422d3f9b35b89a2292417e2cdcdf9

8 years agoMerge "Hide redundant restrictions" into nyc-mr1-dev
Tony Mak [Wed, 3 Aug 2016 09:28:24 +0000 (09:28 +0000)]
Merge "Hide redundant restrictions" into nyc-mr1-dev

8 years agoMerge "Update string for FallbackHome" into nyc-mr1-dev
Jorim Jaggi [Wed, 3 Aug 2016 00:50:58 +0000 (00:50 +0000)]
Merge "Update string for FallbackHome" into nyc-mr1-dev
am: 787fb603b9

Change-Id: I39722bcf0046c3be7a36193959b09840fb8fed38

8 years agoUpdate string for FallbackHome
Jorim Jaggi [Wed, 3 Aug 2016 00:50:57 +0000 (00:50 +0000)]
Update string for FallbackHome
am: 2d3a1cd8bd

Change-Id: I3ed33118adb6a8425184ad07c3a59afa351d55dd

8 years agoMerge "Update string for FallbackHome" into nyc-mr1-dev
TreeHugger Robot [Wed, 3 Aug 2016 00:43:24 +0000 (00:43 +0000)]
Merge "Update string for FallbackHome" into nyc-mr1-dev

8 years agoMerge "Fix potential NPE in BluetoothPairingDialog#onDestroy" into cw-f-dev
ewol [Tue, 2 Aug 2016 22:29:34 +0000 (22:29 +0000)]
Merge "Fix potential NPE in BluetoothPairingDialog#onDestroy" into cw-f-dev

8 years agoUpdate string for FallbackHome
Jorim Jaggi [Tue, 2 Aug 2016 20:13:32 +0000 (22:13 +0200)]
Update string for FallbackHome

Also add some margins in case the string is really long

Change-Id: I0b5246d51d670316c8578475aedac00f8c090e57
Fixes: 30213213

8 years agoMerge "Show progress user unlocking is delayed" into nyc-mr1-dev
Jorim Jaggi [Tue, 2 Aug 2016 19:30:09 +0000 (19:30 +0000)]
Merge "Show progress user unlocking is delayed" into nyc-mr1-dev
am: 2b0bd66d5b

Change-Id: I7fb342b6ba882efb311762aea65b1612cb0cb35b

8 years agoShow progress user unlocking is delayed
Jorim Jaggi [Tue, 2 Aug 2016 19:30:09 +0000 (19:30 +0000)]
Show progress user unlocking is delayed
am: 984079442f

Change-Id: Ib2e7f8c0e45a594127f3384b8d25f6de171b17e0

8 years agoMerge "Hide sim card selection UI when only one sim presents" into nyc-mr1-dev
Meng Wang [Tue, 2 Aug 2016 19:27:40 +0000 (19:27 +0000)]
Merge "Hide sim card selection UI when only one sim presents" into nyc-mr1-dev
am: 6490032550

Change-Id: I99c1538f0f47714cdf041b0c1b043ef41cc217f5

8 years agoHide sim card selection UI when only one sim presents
Meng Wang [Tue, 2 Aug 2016 19:27:40 +0000 (19:27 +0000)]
Hide sim card selection UI when only one sim presents
am: dfba923468

Change-Id: Idcbfdf60b3bf0fbad1505f52c05c09ee4a91aff9

8 years agoMerge "Show progress user unlocking is delayed" into nyc-mr1-dev
TreeHugger Robot [Tue, 2 Aug 2016 19:26:40 +0000 (19:26 +0000)]
Merge "Show progress user unlocking is delayed" into nyc-mr1-dev

8 years agoMerge "Hide sim card selection UI when only one sim presents" into nyc-mr1-dev
TreeHugger Robot [Tue, 2 Aug 2016 19:07:47 +0000 (19:07 +0000)]
Merge "Hide sim card selection UI when only one sim presents" into nyc-mr1-dev

8 years agoShow progress user unlocking is delayed
Jorim Jaggi [Tue, 2 Aug 2016 09:53:12 +0000 (11:53 +0200)]
Show progress user unlocking is delayed

Sometimes it takes a while to unlock a user, for example, after an OTA.

In these cases, we show a progress bar in FallbackHome so the user knows
that something is happening.

Fixes: 30213213
Change-Id: Ie36a9b3107c32ff46a8890818d1f26ccf310ee6c

8 years agoHide redundant restrictions
Tony Mak [Tue, 2 Aug 2016 16:09:53 +0000 (17:09 +0100)]
Hide redundant restrictions

Change-Id: Id9b8ec6f045632a87092b4dccef5f7ff73a327cc
Fix: 30109035

8 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 2 Aug 2016 02:06:45 +0000 (02:06 +0000)]
Import translations. DO NOT MERGE
am: de26061dc9  -s ours

Change-Id: I8880f04010a4c0b0f2bd6596b3e83bf8c8014702

8 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 2 Aug 2016 00:43:36 +0000 (17:43 -0700)]
Import translations. DO NOT MERGE

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

8 years agoSet the tether Entitlement app as active when enabling tethering.
Jeremy Klein [Sat, 30 Jul 2016 02:22:21 +0000 (19:22 -0700)]
Set the tether Entitlement app as active when enabling tethering.

This fixes tether entitlement timeouts when tethering is enabled
via the QS tile.

Bug: 29514913
Change-Id: I975bf3e52d2df49541544d1b7a6bdcdec1b61d8c

8 years agoMerge "Set correct flag when enabling listener for conditions." into nyc-mr1-dev
Fan Zhang [Mon, 1 Aug 2016 21:38:11 +0000 (21:38 +0000)]
Merge "Set correct flag when enabling listener for conditions." into nyc-mr1-dev
am: dccd2544b3

Change-Id: I4e93011305b9c2e98899d7cc752793386d7f8107

8 years agoSet correct flag when enabling listener for conditions.
Fan Zhang [Mon, 1 Aug 2016 21:38:10 +0000 (21:38 +0000)]
Set correct flag when enabling listener for conditions.
am: 0aebaf1556

Change-Id: Iba750354cb791b3daace54ed1ed8ccdb645f6901

8 years agoMerge "Set correct flag when enabling listener for conditions." into nyc-mr1-dev
Fan Zhang [Mon, 1 Aug 2016 21:31:15 +0000 (21:31 +0000)]
Merge "Set correct flag when enabling listener for conditions." into nyc-mr1-dev

8 years agoSet correct flag when enabling listener for conditions.
Fan Zhang [Mon, 1 Aug 2016 20:58:57 +0000 (13:58 -0700)]
Set correct flag when enabling listener for conditions.

Bug: 30551655

Without this flag Settings app will close whenever listener is
enabled/disabled.

Change-Id: I99102308ada3897cf44917e96015c71b926e5fb5

8 years agoLog switch toggle action whenever its status changes.
Fan Zhang [Mon, 1 Aug 2016 19:19:07 +0000 (19:19 +0000)]
Log switch toggle action whenever its status changes.
am: 6d2a0c80df

Change-Id: If5eda574db3ea776a082246d2919e4e49d614206

8 years agoLog switch toggle action whenever its status changes.
Fan Zhang [Mon, 1 Aug 2016 16:40:06 +0000 (09:40 -0700)]
Log switch toggle action whenever its status changes.

Bug: 30110675

onClick is only called when the switchbar is clicked. We also need to
log when switch itself is clicked.

Change-Id: I892b72daeefe0f36608a73fe509199e200376eb7

8 years agoHide sim card selection UI when only one sim presents
Meng Wang [Mon, 1 Aug 2016 17:19:15 +0000 (10:19 -0700)]
Hide sim card selection UI when only one sim presents

Bug: 30319100
Change-Id: I9bb8409475d9431463516117b54d34cbdfb317b9

8 years agoFix potential NPE in BluetoothPairingDialog#onDestroy
Erik Wolsheimer [Mon, 1 Aug 2016 16:18:37 +0000 (09:18 -0700)]
Fix potential NPE in BluetoothPairingDialog#onDestroy

BUG: 21478473
Change-Id: I8b2b7222f6f17d27cd18a35f83f8d48125ec4091

8 years agoAlign battery consumer app title to view start.
Fan Zhang [Sat, 30 Jul 2016 08:04:50 +0000 (08:04 +0000)]
Align battery consumer app title to view start.
am: b3e657211d

Change-Id: I8e75cc94d3902648a3164fc686219d1975dc0e04

8 years agoAlign battery consumer app title to view start.
Fan Zhang [Fri, 29 Jul 2016 20:58:30 +0000 (13:58 -0700)]
Align battery consumer app title to view start.

Bug: 30161009

This makes sure in RTL language app titles start from right.

Change-Id: I87030121f39519d09e5872eb4c01ec682f69db55

8 years agoMerge \"Show IMEI SV when phone has LTE_ON_CDMA_TRUE\" into nyc-mr1-dev
Vineeta Srivastava [Fri, 29 Jul 2016 01:50:53 +0000 (01:50 +0000)]
Merge \"Show IMEI SV when phone has LTE_ON_CDMA_TRUE\" into nyc-mr1-dev
am: 10327d07fd

Change-Id: Ifc2019449837e668176f7cd757a2c94a01590a7c