git.osdn.net Git - android-x86/packages-apps-Settings.git/log

(root) / android-x86 / packages-apps-Settings.git / log

Bill Yi [Thu, 27 Jul 2017 05:32:37 +0000 (05:32 +0000)]

Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours am: e3e1e7b9d4 -s ours am: a9fc19e385 -s ours
am: 4baa6ce625 -s ours

Change-Id: I76cf979321b93327e2695cba6beba02f5c8df97d

commit | commitdiff | tree

Andrew Sapperstein [Thu, 27 Jul 2017 05:32:16 +0000 (05:32 +0000)]

Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev am: 7b445d59ef am: fe35c40dad
am: b0b1bdd02b

Change-Id: I8d1c9b5a059b68e9cecfbe80151cfdd6ef4a6791

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 05:31:51 +0000 (05:31 +0000)]

Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours am: b0126e3500 -s ours am: 1602913a75 -s ours
am: d8667dba08 -s ours

Change-Id: I5c0bb0b72d3004f10acf00e25a43bdcdbe09a72d

commit | commitdiff | tree

Matthew Fritze [Thu, 27 Jul 2017 05:31:26 +0000 (05:31 +0000)]

Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev am: c2cb0d0b9e am: 9092e1a0b0
am: ece8c7bfe7

Change-Id: I6528cb4f24562d66aa139dc76e522b75305f340a

commit | commitdiff | tree

jackqdyulei [Thu, 27 Jul 2017 05:30:58 +0000 (05:30 +0000)]

Merge "Set minLines for battery header text" into oc-dr1-dev am: 02560caa92 am: 75e89dfede
am: 418bd11db3

Change-Id: I73a01ad35316be7c6d66f05ba312a5c432558d3b

commit | commitdiff | tree

Andrew Sapperstein [Thu, 27 Jul 2017 05:30:09 +0000 (05:30 +0000)]

Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev am: 7b445d59ef am: 1ee62c16a3
am: df916872c1

Change-Id: Ie842bc43d7af52f3b797eba63c2ec9e5fb886381

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 05:29:41 +0000 (05:29 +0000)]

Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours am: b0126e3500 -s ours am: ef36ef28d9 -s ours
am: 97bed117da -s ours

Change-Id: I50cf506341907c540c71718d933524735738cc4a

commit | commitdiff | tree

Matthew Fritze [Thu, 27 Jul 2017 05:29:20 +0000 (05:29 +0000)]

Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev am: c2cb0d0b9e am: 68617a6f42
am: cba96eb672

Change-Id: I0f6a9f3923c36553d4494a0fca00024abffb96e5

commit | commitdiff | tree

Doris Ling [Thu, 27 Jul 2017 05:28:52 +0000 (05:28 +0000)]

Merge "Fix gestures summary text when there is no sensor for assit." into oc-mr1-dev am: 8e13218ec8
am: e866cd4825

Change-Id: If482eb0f2229193145e2157ae76d09249e0c433b

commit | commitdiff | tree

jackqdyulei [Thu, 27 Jul 2017 05:28:27 +0000 (05:28 +0000)]

Merge "Set minLines for battery header text" into oc-dr1-dev am: 02560caa92 am: 063e87c689
am: 220b1f163a

Change-Id: I9f1857004f87e659fdf807bb41cec18a69c60266

commit | commitdiff | tree

Andrew Sapperstein [Thu, 27 Jul 2017 05:27:57 +0000 (05:27 +0000)]

Merge "Add ambient notifications as inline setting." into oc-mr1-dev am: 5d7fab4f22
am: 8f25bc916a

Change-Id: Icdbd94d006b5c7bcc0251d657342ee6c90f7ef48

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 02:15:58 +0000 (02:15 +0000)]

Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours am: e3e1e7b9d4 -s ours
am: a9fc19e385 -s ours

Change-Id: Iaaa737d1fad0e56d13799452af97cd91c8266c94

commit | commitdiff | tree

Andrew Sapperstein [Thu, 27 Jul 2017 02:15:36 +0000 (02:15 +0000)]

Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev am: 7b445d59ef
am: fe35c40dad

Change-Id: I018aa267ca72d8b8c42fa6e0e39c5cc454fb4d20

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 02:15:13 +0000 (02:15 +0000)]

Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours am: b0126e3500 -s ours
am: 1602913a75 -s ours

Change-Id: Iad694020c5ab0c0e4105940da1cc1a0b3854c435

commit | commitdiff | tree

Matthew Fritze [Thu, 27 Jul 2017 02:14:54 +0000 (02:14 +0000)]

Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev am: c2cb0d0b9e
am: 9092e1a0b0

Change-Id: I44bc5c7f3576eeba51913a8a852b6ecfc5f5fbd5

commit | commitdiff | tree

jackqdyulei [Thu, 27 Jul 2017 02:14:28 +0000 (02:14 +0000)]

Merge "Set minLines for battery header text" into oc-dr1-dev am: 02560caa92
am: 75e89dfede

Change-Id: I718c78a47392273db4cff54abe6a2f80067f4d7e

commit | commitdiff | tree

Andrew Sapperstein [Thu, 27 Jul 2017 01:36:57 +0000 (01:36 +0000)]

Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev am: 7b445d59ef
am: 1ee62c16a3

Change-Id: I7f051180f0938d3eb467e87c522fc9fb4b12e5f5

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 01:36:32 +0000 (01:36 +0000)]

Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours am: b0126e3500 -s ours
am: ef36ef28d9 -s ours

Change-Id: Iec10999409679807df916e04ca9413385c33093f

commit | commitdiff | tree

Matthew Fritze [Thu, 27 Jul 2017 01:35:04 +0000 (01:35 +0000)]

Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev am: c2cb0d0b9e
am: 68617a6f42

Change-Id: Ibe30aace8256cc25a1856f90877ea57a73f60419

commit | commitdiff | tree

Doris Ling [Thu, 27 Jul 2017 01:33:52 +0000 (01:33 +0000)]

Merge "Fix gestures summary text when there is no sensor for assit." into oc-mr1-dev
am: 8e13218ec8

Change-Id: Ie0b5b306e00e6bb62e5385caabdf306c98fb8c05

commit | commitdiff | tree

jackqdyulei [Thu, 27 Jul 2017 01:33:28 +0000 (01:33 +0000)]

Merge "Set minLines for battery header text" into oc-dr1-dev am: 02560caa92
am: 063e87c689

Change-Id: I641556b2baa47690a616dc0e4fec91070a8e4565

commit | commitdiff | tree

Andrew Sapperstein [Thu, 27 Jul 2017 01:32:37 +0000 (01:32 +0000)]

Merge "Add ambient notifications as inline setting." into oc-mr1-dev
am: 5d7fab4f22

Change-Id: I2654f7820dda35f45b3c4fe1f4792e68736b00ef

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 01:24:51 +0000 (01:24 +0000)]

Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours
am: e3e1e7b9d4 -s ours

Change-Id: I851c408375fa08799cc3be2330e18a928abd89e3

commit | commitdiff | tree

Andrew Sapperstein [Thu, 27 Jul 2017 01:21:05 +0000 (01:21 +0000)]

Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev
am: 7b445d59ef

Change-Id: Ibe7f73e37c446d908e8b69b2a3789c7b22f34509

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 01:20:25 +0000 (01:20 +0000)]

Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours
am: b0126e3500 -s ours

Change-Id: Id66f31e0cb7118122723aa5f7ac87837d8075e8a

commit | commitdiff | tree

Andrew Sapperstein [Thu, 27 Jul 2017 01:20:05 +0000 (01:20 +0000)]

Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev
am: 7b445d59ef

Change-Id: I44d837dd039a13ef7f2bf236657a5fae3640b0be

commit | commitdiff | tree

Matthew Fritze [Thu, 27 Jul 2017 01:20:02 +0000 (01:20 +0000)]

Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
am: c2cb0d0b9e

Change-Id: I0c11d28b60492723f985c606253a0a9dc6c07595

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 01:10:19 +0000 (01:10 +0000)]

Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours
am: b0126e3500 -s ours

Change-Id: Ie1a52928c7d6a8f8da3444e74249da90a62d7b00

commit | commitdiff | tree

Matthew Fritze [Thu, 27 Jul 2017 01:09:55 +0000 (01:09 +0000)]

Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
am: c2cb0d0b9e

Change-Id: I701fb6fc2d74fef1fce1f4b0d21c86d79012b76d

commit | commitdiff | tree

jackqdyulei [Thu, 27 Jul 2017 01:08:43 +0000 (01:08 +0000)]

Merge "Set minLines for battery header text" into oc-dr1-dev
am: 02560caa92

Change-Id: I0bc848b91594cb0adfd2900ce2678f6acc6ef66e

commit | commitdiff | tree

Andrew Sapperstein [Thu, 27 Jul 2017 01:01:26 +0000 (01:01 +0000)]

Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 00:55:57 +0000 (00:55 +0000)]

Import translations. DO NOT MERGE am: 05185952c8 -s ours
am: 64ce525c6a -s ours

Change-Id: Idfd7931360bf1ac57a9bc7937ceb36ade0839963

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 00:55:32 +0000 (00:55 +0000)]

Import translations. DO NOT MERGE am: 05185952c8 -s ours
am: 64ce525c6a -s ours

Change-Id: Ided1154cb4002792a68ddfed98dd057d7f88e620

commit | commitdiff | tree

TreeHugger Robot [Thu, 27 Jul 2017 00:50:10 +0000 (00:50 +0000)]

Merge "Fix gestures summary text when there is no sensor for assit." into oc-mr1-dev

commit | commitdiff | tree

Andrew Sapperstein [Thu, 27 Jul 2017 00:41:48 +0000 (17:41 -0700)]

Fix more config_headlineFontFamily-induced test breakages

Change-Id: Ic8a68a77e7ef8a3fd422e53e39d2fee74324c355
Fixes: 64024743
Test: robotests

commit | commitdiff | tree

TreeHugger Robot [Thu, 27 Jul 2017 00:31:13 +0000 (00:31 +0000)]

Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev

commit | commitdiff | tree

jackqdyulei [Thu, 27 Jul 2017 00:05:53 +0000 (00:05 +0000)]

Merge "Set minLines for battery header text" into oc-dr1-dev
am: 02560caa92

Change-Id: I2a4d3ed816a7bb938b5613154b8a4bc8f3114142

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 23:46:42 +0000 (23:46 +0000)]

Merge "Set minLines for battery header text" into oc-dr1-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 23:34:22 +0000 (23:34 +0000)]

Merge "Add ambient notifications as inline setting." into oc-mr1-dev

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 23:22:33 +0000 (23:22 +0000)]

Import translations. DO NOT MERGE
am: 05185952c8 -s ours

Change-Id: I2fcf9dbc20ad0600ac924d106e5a87d49752f379

commit | commitdiff | tree

Ajay Nadathur [Wed, 26 Jul 2017 22:53:34 +0000 (22:53 +0000)]

Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev am: f5ebc6f7ed am: 044485b850
am: 06a9a033a0

Change-Id: If6323b25f3678a9cb614d005d67e350746778987

commit | commitdiff | tree

Ajay Nadathur [Wed, 26 Jul 2017 22:53:03 +0000 (22:53 +0000)]

Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev am: f5ebc6f7ed am: 3c308aef22
am: 03737f1c9c

Change-Id: Id274a3c6fb6374e6db459bea150984a85fd3e8ad

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 22:52:25 +0000 (22:52 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 975d9a18f1 -s ours
am: fee1e54914 -s ours

Change-Id: If9d2805f0f3ba0d9bf9056923d5611dd50cf22cc

commit | commitdiff | tree

Ajay Nadathur [Wed, 26 Jul 2017 22:26:27 +0000 (22:26 +0000)]

Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev am: f5ebc6f7ed
am: 044485b850

Change-Id: Ifae5025374a37d1bf8cc07a8af013bff9267f8d5

commit | commitdiff | tree

Ajay Nadathur [Wed, 26 Jul 2017 22:16:46 +0000 (22:16 +0000)]

Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev am: f5ebc6f7ed
am: 3c308aef22

Change-Id: Idc7a3f732ca5977ad14dfb9e05db3d80898dc822

commit | commitdiff | tree

Ajay Nadathur [Wed, 26 Jul 2017 22:02:33 +0000 (22:02 +0000)]

Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
am: f5ebc6f7ed

Change-Id: Ia91197e1d6ee74fd890887330da1eaeb932cd5cb

commit | commitdiff | tree

Ajay Nadathur [Wed, 26 Jul 2017 22:02:05 +0000 (22:02 +0000)]

Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
am: f5ebc6f7ed

Change-Id: I106b98a55eec646959a4f00c44074efc9f0dbe39

commit | commitdiff | tree

Ajay Nadathur [Wed, 26 Jul 2017 21:42:12 +0000 (21:42 +0000)]

Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 21:41:58 +0000 (21:41 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Andrew Sapperstein [Wed, 26 Jul 2017 18:55:31 +0000 (11:55 -0700)]

Add ambient notifications as inline setting.

Bug: 62022517
Test: robotest and manual
Change-Id: If245f541ec3c8a1627d082b97bba9b325438cfeb

commit | commitdiff | tree

Matthew Fritze [Wed, 26 Jul 2017 19:59:50 +0000 (12:59 -0700)]

Change SwipeForNotification Payload default to Off

Bug: 62022517
Test: make RunSettingsRoboTests
Change-Id: Icf6b1224e0857841dcb0d9dd14948d9ef39110ee

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 19:47:51 +0000 (19:47 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 975d9a18f1 -s ours

Change-Id: Id7b12d9714304d13c6b0fa60a4a3b2eec9b4c160

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 19:39:46 +0000 (19:39 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 18:49:07 +0000 (18:49 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 402abcc9df -s ours am: bd429f42cb -s ours
am: 8c88b53dda -s ours

Change-Id: If72aa100f75f5b39945a0d33402dc74b09b88c07

commit | commitdiff | tree

jackqdyulei [Wed, 26 Jul 2017 18:24:54 +0000 (11:24 -0700)]

Set minLines for battery header text

So the header won't grow/shrink when the text changes.

Bug: 64065456
Test: Build
Change-Id: I96bb00e81d677b1efd55afbfe5f23024d6afd71b

commit | commitdiff | tree

Doris Ling [Wed, 26 Jul 2017 18:07:19 +0000 (11:07 -0700)]

Fix gestures summary text when there is no sensor for assit.

Should exit the summary handling if sensor is not available.

Change-Id: I5918fa5ac614db48fc2c41e1de555d1ba6928bd4
Fix: 64039312
Test: make RunSettingsRoboTests

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:48:32 +0000 (17:48 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 402abcc9df -s ours
am: bd429f42cb -s ours

Change-Id: Ia36706cecaa4a47f7c5963bbd76702b918fcf51d

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:36:09 +0000 (17:36 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 402abcc9df -s ours am: eca6781a49 -s ours
am: db8172a4fe -s ours

Change-Id: I185a23d087c53962fca769bb8a6573440311bd64

commit | commitdiff | tree

Antony Sargent [Wed, 26 Jul 2017 17:31:06 +0000 (17:31 +0000)]

Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev am: 9fb7a3b8b4 am: 1e69f27a41
am: 2665600b75 -s ours

Change-Id: I097be7c19bcf4b3fb3a84e8b8b374e07313ab0d1

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:27:31 +0000 (10:27 -0700)]

Import translations. DO NOT MERGE

Change-Id: I8f49a9c6acaa689f9269aaca9f22e8b4ab4a5ae0
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:26:10 +0000 (10:26 -0700)]

Import translations. DO NOT MERGE

Change-Id: If81b78db0b3575bccde65cb54ee824b4897ddc56
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:26:06 +0000 (17:26 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 402abcc9df -s ours
am: eca6781a49 -s ours

Change-Id: I76deaa778d926e596a7da86e660c6356a1c4f704

commit | commitdiff | tree

Antony Sargent [Wed, 26 Jul 2017 17:09:14 +0000 (17:09 +0000)]

Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev am: 9fb7a3b8b4
am: 1e69f27a41

Change-Id: Iaf5a8c94d8efc7ca22b242f725a9fd94145a163b

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:04:23 +0000 (17:04 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 402abcc9df -s ours

Change-Id: I8b980099381db8f56e3a339dfe497cce93595674

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 16:46:51 +0000 (16:46 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 402abcc9df -s ours

Change-Id: Ib6905c29f41aaea8c779f1771793da0daa2326dd

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 16:31:13 +0000 (16:31 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

commit | commitdiff | tree

Antony Sargent [Wed, 26 Jul 2017 16:31:13 +0000 (16:31 +0000)]

Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev am: 9fb7a3b8b4 am: c3cd88c302
am: 1c84e34cb5 -s ours

Change-Id: I9a9d319d578a0fddb4d1c80e8535df7b1429d601

commit | commitdiff | tree

Antony Sargent [Wed, 26 Jul 2017 16:19:02 +0000 (16:19 +0000)]

Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev am: 9fb7a3b8b4
am: c3cd88c302

Change-Id: Ibeca8eb7fd61b0a730dc4c77a80a152d69eba0ca

commit | commitdiff | tree

Antony Sargent [Wed, 26 Jul 2017 16:18:50 +0000 (16:18 +0000)]

Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
am: 9fb7a3b8b4

Change-Id: Ic44e0cf3972085439a603e25374d46447ebe7a8f

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 15:07:49 +0000 (08:07 -0700)]

Import translations. DO NOT MERGE

Change-Id: I0dd55f8bfcdc12a551f396cdd6b84072c78bb88e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 14:32:24 +0000 (07:32 -0700)]

Import translations. DO NOT MERGE

Change-Id: If2e8b93c86f4499c112549d060696e4b272eb5ce
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Antony Sargent [Wed, 26 Jul 2017 11:12:39 +0000 (11:12 +0000)]

Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
am: 9fb7a3b8b4

Change-Id: I63ea14bf12934edfe259ab04beae4653082fbf25

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 10:53:30 +0000 (10:53 +0000)]

Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 09:07:36 +0000 (09:07 +0000)]

Import translations. DO NOT MERGE am: 8a25fb603a -s ours am: 0c3ee7c15d -s ours am: 565664fad7 -s ours
am: c2d779e568 -s ours

Change-Id: I1a750cb3a19c8ebada11b915bd3129da8c7f195a

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:46:06 +0000 (08:46 +0000)]

Import translations. DO NOT MERGE am: 8a25fb603a -s ours am: 0c3ee7c15d -s ours
am: 565664fad7 -s ours

Change-Id: I58da132af7b082860813238be8b054955629cbc9

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:24:19 +0000 (08:24 +0000)]

Import translations. DO NOT MERGE am: 8a25fb603a -s ours
am: 0c3ee7c15d -s ours

Change-Id: Id2a54f2d8f8dd4a0558b95bf70f9ccd36c8d70b5

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:11:26 +0000 (08:11 +0000)]

Merge "Import translations. DO NOT MERGE am: 8a25fb603a -s ours am: 9d7971905c -s ours am: 9d33ddc3f7 -s ours" into oc-mr1-dev-plus-aosp
am: 13607bdea0 -s ours

Change-Id: I94cd202beea0cb9ce4569ff07fb5b894da5330c3

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:11:05 +0000 (08:11 +0000)]

Import translations. DO NOT MERGE am: 8a25fb603a -s ours am: 9d7971905c -s ours am: a2954b3232 -s ours
am: 2bfaa1856b -s ours

Change-Id: I5d3f413bec8f870a61514c4da3f7f452dcf5c20f

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 26 Jul 2017 08:06:55 +0000 (08:06 +0000)]

Merge "Import translations. DO NOT MERGE am: 8a25fb603a -s ours am: 9d7971905c -s ours am: 9d33ddc3f7 -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:06:37 +0000 (08:06 +0000)]

Import translations. DO NOT MERGE am: 8a25fb603a -s ours am: 9d7971905c -s ours
am: 9d33ddc3f7 -s ours

Change-Id: I8fb617839c8e4e691ac823301c006b2636eb0957

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:06:35 +0000 (08:06 +0000)]

Import translations. DO NOT MERGE am: 8a25fb603a -s ours am: 9d7971905c -s ours
am: a2954b3232 -s ours

Change-Id: Id6eb63a599efb450f30d5dddc0973c1936daf6df

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:06:13 +0000 (08:06 +0000)]

Import translations. DO NOT MERGE
am: 8a25fb603a -s ours

Change-Id: Ic9ca03e989bf73561c4884cf168a33f64c02973f

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:03:07 +0000 (08:03 +0000)]

Import translations. DO NOT MERGE am: 8a25fb603a -s ours
am: 9d7971905c -s ours

Change-Id: I689d34a1c300988ae315959a6d4fbb48158cffbf

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:03:05 +0000 (08:03 +0000)]

Import translations. DO NOT MERGE am: 8a25fb603a -s ours
am: 9d7971905c -s ours

Change-Id: I7f2e3e064028eb5634b3896ea24cee481d6e3c88

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 07:59:05 +0000 (07:59 +0000)]

Import translations. DO NOT MERGE
am: 8a25fb603a -s ours

Change-Id: If4a3775dac048d13e739174b79415cf025bd4454

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 07:23:37 +0000 (07:23 +0000)]

Merge "Allow open password dialog for wrong-password wifi access points"

commit | commitdiff | tree

Antony Sargent [Tue, 18 Jul 2017 22:33:18 +0000 (15:33 -0700)]

Allow open password dialog for wrong-password wifi access points

When we're failing to connect to a wifi access point due to an incorrect
password, we want to allow an intent from a notification to open up the
wifi settings page and bring up the dialog for entering a different
password. We already have code in settings to do this for not-yet-saved
access points, so this CL just changes it slightly to also allow it for
saved access points.

Unfortunately WifiSettings can't be tested with Robolectric due to it
not supporting PreferenceScreen, so this adds a test to
WifiSettingsUiTest. There were some existing test failures in that file
which I've fixed while I was in there:

-The TestAccessPointBuilder class wasn't being found at runtime because
it was getting stripped out at build time due to not being used in
settings.

-The changingSecurityStateOnApShouldNotCauseMultipleListItems test was
asserting that we don't end up with multiple entries for the same SSID
in the access point list when changing the security state for the AP,
but it was accidentally passing multiple AP's with the same name the
first time.

Bug: 33245941
Test: runtest --path WifiSettingsUiTest.java
Change-Id: I16c9c8b0d8380a0e26f9b23df6a8d012af6a2476
Merged-In: I929ca6892242059df157c01d6e9ea30e8d1c5e78

commit | commitdiff | tree

Jack He [Wed, 26 Jul 2017 06:42:36 +0000 (06:42 +0000)]

Merge "Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev am: 0c6f001c09 am: a65e3e6795" into oc-mr1-dev-plus-aosp
am: 0792518ba8

Change-Id: If822bd017b9eb083493ad0c1b0b64f06c157c0f9

commit | commitdiff | tree

Jack He [Wed, 26 Jul 2017 06:42:11 +0000 (06:42 +0000)]

Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev am: 0c6f001c09 am: dfc2fb14c6
am: 85d9a7c48a

Change-Id: I0222dd4251651fe2a83b978df708b3e1088c14b3

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 26 Jul 2017 06:38:57 +0000 (06:38 +0000)]

Merge "Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev am: 0c6f001c09 am: a65e3e6795" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Jack He [Wed, 26 Jul 2017 06:38:40 +0000 (06:38 +0000)]

Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev am: 0c6f001c09
am: a65e3e6795

Change-Id: I1f671e071132639a24a019909fdc6504f7bde66d

commit | commitdiff | tree

Jack He [Wed, 26 Jul 2017 06:38:32 +0000 (06:38 +0000)]

Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev am: 0c6f001c09
am: dfc2fb14c6

Change-Id: Ifb3276adeecf756b5c2aa11ee78f1c039273cfbe

commit | commitdiff | tree

Jack He [Wed, 26 Jul 2017 06:34:30 +0000 (06:34 +0000)]

Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
am: 0c6f001c09

Change-Id: I2a161d403cf0c8e34a16b1ac9328135c40f7e50a

commit | commitdiff | tree

Jack He [Wed, 26 Jul 2017 06:34:29 +0000 (06:34 +0000)]

Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev
am: 0c6f001c09

Change-Id: I6f9494b049d3e366c96edb60686fc8622c8b76d6

commit | commitdiff | tree

Doris Ling [Wed, 26 Jul 2017 06:31:27 +0000 (06:31 +0000)]

Merge "Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev am: 4906a2a38a am: 3ab3fc9ee4 -s ours" into oc-mr1-dev-plus-aosp
am: 40449ad439 -s ours

Change-Id: I4a56176a86d101069473a71ff8f2559782554f69

commit | commitdiff | tree

Doris Ling [Wed, 26 Jul 2017 06:31:03 +0000 (06:31 +0000)]

Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev am: 4906a2a38a -s ours am: dac62d24f4 -s ours
am: 566eea85dc -s ours

Change-Id: Idb5b70997a0b9808fc57b0f8b2ab6a3d8b19d278

commit | commitdiff | tree

TreeHugger Robot [Wed, 26 Jul 2017 06:28:44 +0000 (06:28 +0000)]

Merge "Bluetooth: reset mConnectionState when adapter is OFF" into oc-dr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 26 Jul 2017 06:27:25 +0000 (06:27 +0000)]

Merge "Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev am: 4906a2a38a am: 3ab3fc9ee4 -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Doris Ling [Wed, 26 Jul 2017 06:27:07 +0000 (06:27 +0000)]

Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev am: 4906a2a38a
am: 3ab3fc9ee4 -s ours

Change-Id: I4cd260bd057d9e638f4848eb41aa9cd2ae8f3c35

commit | commitdiff | tree

Doris Ling [Wed, 26 Jul 2017 06:27:06 +0000 (06:27 +0000)]

Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev am: 4906a2a38a -s ours
am: dac62d24f4 -s ours

Change-Id: I7c5148c30ff2aca518b63790c96566158cc42697

packages/apps/Settings

RSS Atom

About OSDN

Find Software

Develop Software

Help