OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoDisabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c4...
Suprabh Shukla [Wed, 16 Aug 2017 22:12:17 +0000 (22:12 +0000)]
Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41 am: 1370eb3d52 am: 616c84ccb0  -s ours am: aedf7cdfdb  -s ours am: baf4375f01  -s ours am: db8682996d  -s ours
am: db19657051  -s ours

Change-Id: I86ec44b3063464dae8911ab4c33f2549628dc4e7

6 years agoDisabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c4...
Suprabh Shukla [Wed, 16 Aug 2017 22:11:33 +0000 (22:11 +0000)]
Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41 am: 1370eb3d52 am: 616c84ccb0  -s ours am: aedf7cdfdb  -s ours am: f52c8ccbfc  -s ours am: d0275e53eb  -s ours
am: 39f553782c  -s ours

Change-Id: Iaa91677ee23b5b43e74ab24b50abd752be1315b7

6 years agoMerge "DeviceInfoSettingsTest: test parsing llvm kernel" am: 33046b4ec2 -s ours...
Nick Desaulniers [Wed, 16 Aug 2017 22:10:50 +0000 (22:10 +0000)]
Merge "DeviceInfoSettingsTest: test parsing llvm kernel" am: 33046b4ec2  -s ours am: f25a418e24 am: e625c2f64e am: 4cdaebd0c4
am: 9729edbb8a

Change-Id: I0ea93e11cb5bb000aca1fe49f7201d2f70a80e5e

6 years agoMerge "Use default primary color for choose lock screens" into oc-mr1-dev am: 595627c630
Maurice Lam [Wed, 16 Aug 2017 22:10:01 +0000 (22:10 +0000)]
Merge "Use default primary color for choose lock screens" into oc-mr1-dev am: 595627c630
am: 4db65eab00

Change-Id: I0d101f0c14572be3f8885e4a02dcb0119b4059ed

6 years agoMerge "Update detail icon only if its signal level changed."
TreeHugger Robot [Wed, 16 Aug 2017 20:48:12 +0000 (20:48 +0000)]
Merge "Update detail icon only if its signal level changed."

6 years agoMerge "Stub out feature flag UI"
Fan Zhang [Wed, 16 Aug 2017 20:27:14 +0000 (20:27 +0000)]
Merge "Stub out feature flag UI"

6 years agoDisabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c4...
Suprabh Shukla [Wed, 16 Aug 2017 20:21:13 +0000 (20:21 +0000)]
Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41 am: 1370eb3d52 am: 616c84ccb0  -s ours am: aedf7cdfdb  -s ours am: baf4375f01  -s ours
am: db8682996d  -s ours

Change-Id: Ic463b15f7575d5f89bef764e81a72119b45d73ae

6 years agoDisabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c4...
Suprabh Shukla [Wed, 16 Aug 2017 20:03:35 +0000 (20:03 +0000)]
Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41 am: 1370eb3d52 am: 616c84ccb0  -s ours am: aedf7cdfdb  -s ours am: f52c8ccbfc  -s ours
am: d0275e53eb  -s ours

Change-Id: Icc99f47b9ccb35207f6420ec50840e133bd402eb

6 years agoDisabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c4...
Suprabh Shukla [Wed, 16 Aug 2017 19:51:03 +0000 (19:51 +0000)]
Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41 am: 1370eb3d52 am: 616c84ccb0  -s ours am: aedf7cdfdb  -s ours
am: baf4375f01  -s ours

Change-Id: I530a1f23f0a1804786fe3645a115176b53102a9b

6 years agoDisabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c4...
Suprabh Shukla [Wed, 16 Aug 2017 19:51:03 +0000 (19:51 +0000)]
Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41 am: 1370eb3d52 am: 616c84ccb0  -s ours am: aedf7cdfdb  -s ours
am: f52c8ccbfc  -s ours

Change-Id: I432c3951bc7bd3a1aafca201dd9206dcfb33ceee

6 years agoDisabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c4...
Suprabh Shukla [Wed, 16 Aug 2017 19:49:08 +0000 (19:49 +0000)]
Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41 am: 1370eb3d52 am: 616c84ccb0  -s ours
am: aedf7cdfdb  -s ours

Change-Id: I0a6af74c670ecfde23b1d5217f67ebccb14c0080

6 years agoDisabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c4...
Suprabh Shukla [Wed, 16 Aug 2017 19:48:33 +0000 (19:48 +0000)]
Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41 am: 1370eb3d52 am: 616c84ccb0  -s ours
am: aedf7cdfdb  -s ours

Change-Id: I95b94ed593f31067244d5d7bd795fe734cba971a

6 years agoDisabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c4...
Suprabh Shukla [Wed, 16 Aug 2017 19:40:30 +0000 (19:40 +0000)]
Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41 am: 1370eb3d52
am: 616c84ccb0  -s ours

Change-Id: Ibb6e939c0511012a567baf5df3aafdb4da9198ef

6 years agoMerge "Remove "saved networks" from search indexing"
TreeHugger Robot [Wed, 16 Aug 2017 19:36:34 +0000 (19:36 +0000)]
Merge "Remove "saved networks" from search indexing"

6 years agoDisabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41
Suprabh Shukla [Wed, 16 Aug 2017 19:34:24 +0000 (19:34 +0000)]
Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41
am: 1370eb3d52

Change-Id: Ifd670d7a6a673b49b2b0563b81a83fda20889126

6 years agoDisabling the activate button when paused am: 8e08a9bb71 am: 08207f457d
Suprabh Shukla [Wed, 16 Aug 2017 19:30:03 +0000 (19:30 +0000)]
Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d
am: 1e9af33c41

Change-Id: Iea61138c41fdb00ee30e0fba0d06b1d59b9c6afa

6 years agoDisabling the activate button when paused am: 8e08a9bb71
Suprabh Shukla [Wed, 16 Aug 2017 19:25:59 +0000 (19:25 +0000)]
Disabling the activate button when paused am: 8e08a9bb71
am: 08207f457d

Change-Id: I693fde0d9935e0b92fa8848b205db3a810a58b67

6 years agoDisabling the activate button when paused
Suprabh Shukla [Wed, 16 Aug 2017 19:22:01 +0000 (19:22 +0000)]
Disabling the activate button when paused
am: 8e08a9bb71

Change-Id: I9b9ccd0bd849d34343ff0a6d6b579274d02264c6

6 years agoUpdate detail icon only if its signal level changed.
Eric Schwarzenbach [Wed, 16 Aug 2017 18:52:17 +0000 (11:52 -0700)]
Update detail icon only if its signal level changed.

Changes behavior to only render the wifi pie icon if the new rssi has
resulted in a new signal level.

Bug: 64712237
Test: make -j40 ROBOTEST_FILTER=WifiDetailPreferenceControllerTest
RunSettingsRoboTests

Change-Id: I01be2f87d61489242d646ff2003db13c9268ea14

6 years agoMerge "DeviceInfoSettingsTest: test parsing llvm kernel" am: 33046b4ec2 -s ours...
Nick Desaulniers [Wed, 16 Aug 2017 18:51:56 +0000 (18:51 +0000)]
Merge "DeviceInfoSettingsTest: test parsing llvm kernel" am: 33046b4ec2  -s ours am: f25a418e24 am: e625c2f64e
am: 4cdaebd0c4

Change-Id: Id52b16b39b337b52065c5a3828286170ee4f1c66

6 years agoMerge "DeviceInfoSettingsTest: test parsing llvm kernel" am: 33046b4ec2 -s ours...
Nick Desaulniers [Wed, 16 Aug 2017 18:44:56 +0000 (18:44 +0000)]
Merge "DeviceInfoSettingsTest: test parsing llvm kernel" am: 33046b4ec2  -s ours am: f25a418e24
am: e625c2f64e

Change-Id: If659955e693b8bae1aae5118fa7122fa2d287b3b

6 years agoMerge "DeviceInfoSettingsTest: test parsing llvm kernel" am: 33046b4ec2 -s ours
Nick Desaulniers [Wed, 16 Aug 2017 18:37:21 +0000 (18:37 +0000)]
Merge "DeviceInfoSettingsTest: test parsing llvm kernel" am: 33046b4ec2  -s ours
am: f25a418e24

Change-Id: I3e1b36b906f137b9960b25c8c6de61e31f751804

6 years agoMerge "DeviceInfoSettingsTest: test parsing llvm kernel"
Nick Desaulniers [Wed, 16 Aug 2017 18:34:27 +0000 (18:34 +0000)]
Merge "DeviceInfoSettingsTest: test parsing llvm kernel"
am: 33046b4ec2  -s ours

Change-Id: I1f83d7375246e2b84bb3a0f911dfdc5980da76f9

6 years agoMerge "Use default primary color for choose lock screens" into oc-mr1-dev
Maurice Lam [Wed, 16 Aug 2017 18:30:22 +0000 (18:30 +0000)]
Merge "Use default primary color for choose lock screens" into oc-mr1-dev
am: 595627c630

Change-Id: I09fc05b21e993352b4e6402032ca636ae18535e4

6 years agoMerge "Use default primary color for choose lock screens" into oc-mr1-dev
Maurice Lam [Wed, 16 Aug 2017 18:25:02 +0000 (18:25 +0000)]
Merge "Use default primary color for choose lock screens" into oc-mr1-dev

6 years agoMerge "DeviceInfoSettingsTest: test parsing llvm kernel"
Treehugger Robot [Wed, 16 Aug 2017 18:00:44 +0000 (18:00 +0000)]
Merge "DeviceInfoSettingsTest: test parsing llvm kernel"

6 years agoMerge "Update strings for screen lock setup"
Maurice Lam [Wed, 16 Aug 2017 17:40:52 +0000 (17:40 +0000)]
Merge "Update strings for screen lock setup"

6 years agoRemove "saved networks" from search indexing
Fan Zhang [Wed, 16 Aug 2017 17:29:13 +0000 (10:29 -0700)]
Remove "saved networks" from search indexing

Change-Id: Ic8c1f8cee2c2a325ba3518d52d0c35b230a6abfd
Fixes: 64755091
Test: robotests

6 years agoDeviceInfoSettingsTest: test parsing llvm kernel
Nick Desaulniers [Sun, 30 Oct 2016 21:48:08 +0000 (14:48 -0700)]
DeviceInfoSettingsTest: test parsing llvm kernel

Adds unit test for DeviceInfoUtils.formatKernelVersion to see if it can
parse a /proc/version string from a kernel compiled with Clang/LLVM.

Bug: 32455817
Change-Id: I25123bf44f67e038e01d8c76d6eab18d5616c7c2

6 years agoMerge "Don't launch Choose Lock again if recreating" into oc-mr1-dev am: 0ece5f2a06
Maurice Lam [Wed, 16 Aug 2017 08:09:50 +0000 (08:09 +0000)]
Merge "Don't launch Choose Lock again if recreating" into oc-mr1-dev am: 0ece5f2a06
am: 2dad90da4b

Change-Id: Iadffbc4f2e84c9c36ed7d0470831aac6bb0656f4

6 years agoMerge "Don't launch Choose Lock again if recreating" into oc-mr1-dev
Maurice Lam [Wed, 16 Aug 2017 08:04:41 +0000 (08:04 +0000)]
Merge "Don't launch Choose Lock again if recreating" into oc-mr1-dev
am: 0ece5f2a06

Change-Id: Ib00277edf9edc35fbb0c279f1e103c02c0e508fc

6 years agoMerge "Don't launch Choose Lock again if recreating" into oc-mr1-dev
TreeHugger Robot [Wed, 16 Aug 2017 07:51:27 +0000 (07:51 +0000)]
Merge "Don't launch Choose Lock again if recreating" into oc-mr1-dev

6 years agoUse default primary color for choose lock screens
Maurice Lam [Wed, 16 Aug 2017 02:30:14 +0000 (19:30 -0700)]
Use default primary color for choose lock screens

Make the settings screens that inherit from SuwThemeGlif use the
default blue primary color.

Test: Manual
Bug: 63143321
Change-Id: I07026139a5e0562c192ec1ca9304d5cd3647d5b0

6 years agoStub out feature flag UI
Fan Zhang [Wed, 16 Aug 2017 00:18:10 +0000 (17:18 -0700)]
Stub out feature flag UI

Bug: 36222960
Test: make -j40 RunSettingsRoboTests
Change-Id: Id2483d39018b2d93868f4ef7032124795ea91a53

6 years agoMerge "Remove references to NetworkBadging."
TreeHugger Robot [Wed, 16 Aug 2017 00:11:56 +0000 (00:11 +0000)]
Merge "Remove references to NetworkBadging."

6 years agoMerge "Compute aspect ratio properly"
Fan Zhang [Tue, 15 Aug 2017 23:37:59 +0000 (23:37 +0000)]
Merge "Compute aspect ratio properly"

6 years agoDon't launch Choose Lock again if recreating
Maurice Lam [Tue, 15 Aug 2017 23:26:05 +0000 (16:26 -0700)]
Don't launch Choose Lock again if recreating

When ChooseLockGeneric is recreated, don't automatically launch
ChooseLock[Password/Pattern] even if the corresponding intent extras
are specified, because one would have been launched in the previous
onCreate.

Test: Manual
Bug: 64605627
Change-Id: I227a14abb2f4dd6c4577186a3d8164df0bec7791

6 years agoCompute aspect ratio properly
Fan Zhang [Tue, 15 Aug 2017 18:00:04 +0000 (11:00 -0700)]
Compute aspect ratio properly

Change-Id: Ic4e1f20f7354b9ab5f4e9c7564d16d06324ec23d
Fixes: 64608152
Test: visual

6 years agoRemove references to NetworkBadging.
Eric Schwarzenbach [Mon, 7 Aug 2017 20:19:50 +0000 (13:19 -0700)]
Remove references to NetworkBadging.

Removes all references to the deprecated NetworkBadging class. Replaces
Badging enums with AccessPoint.Speed. Uses SettingsLib Utils class to
get the WifiIcons.

Note: This change depends on ag/2676505.

Bug: 62355275
Test: make -j40 RunSettingsRoboTests
Change-Id: If3301ce30e22a7b2cc4d534b0a89e6d7ddfef45b

6 years agoDisabling the activate button when paused
Suprabh Shukla [Tue, 15 Aug 2017 03:33:12 +0000 (03:33 +0000)]
Disabling the activate button when paused

This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.

Test: CtsVerifier -> Device Administration -> Device Admin Tapjacking Test

Bug: 35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b

6 years agoMerge "Change strings from Instant app account to setting" into oc-mr1-dev am: 858ea46a3a
Jesse Evans [Tue, 15 Aug 2017 02:43:00 +0000 (02:43 +0000)]
Merge "Change strings from Instant app account to setting" into oc-mr1-dev am: 858ea46a3a
am: eee0e82fba

Change-Id: I996ed8caf0581cc3f273423b7d8d3989235e2f4e

6 years agoMerge "Add userId to key when type is USER"
TreeHugger Robot [Tue, 15 Aug 2017 01:47:05 +0000 (01:47 +0000)]
Merge "Add userId to key when type is USER"

6 years agoMerge "Change strings from Instant app account to setting" into oc-mr1-dev
Jesse Evans [Tue, 15 Aug 2017 01:37:07 +0000 (01:37 +0000)]
Merge "Change strings from Instant app account to setting" into oc-mr1-dev
am: 858ea46a3a

Change-Id: I22fb4b6d3ee5456a591f8dfa8f78d9f6d6da82dd

6 years agoMerge "Change strings from Instant app account to setting" into oc-mr1-dev
TreeHugger Robot [Tue, 15 Aug 2017 01:18:27 +0000 (01:18 +0000)]
Merge "Change strings from Instant app account to setting" into oc-mr1-dev

6 years agoUpdate strings for screen lock setup
Maurice Lam [Thu, 3 Aug 2017 03:11:28 +0000 (20:11 -0700)]
Update strings for screen lock setup

Manual cherry pick of 3eb4c8333e3821a85d19e8b281f315d3608d5b2b

Test: Manual, existing tests pass
Bug: 64084524
Change-Id: Iff4b004aaf504ae3d574428e41bf91fd46a66f30

6 years agoMerge "Use ThreadUtils instead of AsyncTask to get app title/icon"
TreeHugger Robot [Mon, 14 Aug 2017 22:38:11 +0000 (22:38 +0000)]
Merge "Use ThreadUtils instead of AsyncTask to get app title/icon"

6 years agoUse ThreadUtils instead of AsyncTask to get app title/icon
Fan Zhang [Wed, 9 Aug 2017 23:18:15 +0000 (16:18 -0700)]
Use ThreadUtils instead of AsyncTask to get app title/icon

Change-Id: I44459d9e4a11329a3bd3bfda5057e05eb7e04d6a
Fixes: 63620905
Test: robotest

6 years agoAdd userId to key when type is USER
jackqdyulei [Fri, 11 Aug 2017 20:00:04 +0000 (13:00 -0700)]
Add userId to key when type is USER

Before this cl, the app list couldn't distinguish different users
because all of them have the same key: USER.

This cl adds userId into key, to make sure the preference key
is unique.

Bug: 64605854
Test: RunSettingsRoboTests
Change-Id: Ia4de2ff85b214465a35f1983ca69a9280d053154

6 years agoRevert "Import translations. DO NOT MERGE" am: d8d29f2964 -s ours am: fdbe5d9f82...
Bill Yi [Mon, 14 Aug 2017 14:02:17 +0000 (14:02 +0000)]
Revert "Import translations. DO NOT MERGE" am: d8d29f2964  -s ours am: fdbe5d9f82  -s ours
am: 52744ebaf1  -s ours

Change-Id: If66ec28de393372d32e7479d4de1517cea149b56

6 years agoRevert "Import translations. DO NOT MERGE" am: d8d29f2964 -s ours
Bill Yi [Mon, 14 Aug 2017 13:49:45 +0000 (13:49 +0000)]
Revert "Import translations. DO NOT MERGE" am: d8d29f2964  -s ours
am: fdbe5d9f82  -s ours

Change-Id: I3ba9ad28e11f9ef58d78b255434c3a8173829984

6 years agoRevert "Import translations. DO NOT MERGE" am: d8d29f2964 -s ours am: 6ece6e96fb...
Bill Yi [Mon, 14 Aug 2017 13:43:14 +0000 (13:43 +0000)]
Revert "Import translations. DO NOT MERGE" am: d8d29f2964  -s ours am: 6ece6e96fb  -s ours
am: ffded27909  -s ours

Change-Id: I6708e27a6f2ecb431c7cac77d12d6cab89b01bfa

6 years agoRevert "Import translations. DO NOT MERGE" am: d8d29f2964 -s ours
Bill Yi [Mon, 14 Aug 2017 13:39:44 +0000 (13:39 +0000)]
Revert "Import translations. DO NOT MERGE" am: d8d29f2964  -s ours
am: 6ece6e96fb  -s ours

Change-Id: I0b39167d3a80e650d55104a6f8b1d19a3c4a52f9

6 years agoMerge "Revert "Import translations. DO NOT MERGE""
Bill Yi [Mon, 14 Aug 2017 13:39:07 +0000 (13:39 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""

6 years agoRevert "Import translations. DO NOT MERGE"
Bill Yi [Mon, 14 Aug 2017 13:38:36 +0000 (13:38 +0000)]
Revert "Import translations. DO NOT MERGE"

This reverts commit 5530c73afa58dbe5fd9fa5b8e6e0bfee2b64d70c.

Change-Id: I7804b7e3e00574424a95788ece7a4d28bcd761a7
Exempt-From-Owner-Approval: translation import

6 years agoRevert "Import translations. DO NOT MERGE"
Bill Yi [Mon, 14 Aug 2017 13:35:42 +0000 (13:35 +0000)]
Revert "Import translations. DO NOT MERGE"
am: d8d29f2964  -s ours

Change-Id: I6f29a8cc9f7667aa5209638e3caf1441216ea319

6 years agoRevert "Import translations. DO NOT MERGE"
Bill Yi [Mon, 14 Aug 2017 13:35:42 +0000 (13:35 +0000)]
Revert "Import translations. DO NOT MERGE"
am: d8d29f2964  -s ours

Change-Id: Ia169054dc581d5633ceed24edf4892a10ca601ad

6 years agoRevert "Import translations. DO NOT MERGE"
Bill Yi [Mon, 14 Aug 2017 13:32:35 +0000 (13:32 +0000)]
Revert "Import translations. DO NOT MERGE"

This reverts commit a2a4037f593b6bbbe5c178971f13ef869b7ffe8e.

Change-Id: I2145ac4c4f1092799bbc547ef9ea7d19c101cd95
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE am: a2a4037f59 -s ours am: 8944eb96c8 -s ours
Bill Yi [Sat, 12 Aug 2017 18:46:06 +0000 (18:46 +0000)]
Import translations. DO NOT MERGE am: a2a4037f59  -s ours am: 8944eb96c8  -s ours
am: 6b925ea6c9  -s ours

Change-Id: Ib3855bf1ea880e55ebfea6908340176bca1f70e7

6 years agoImport translations. DO NOT MERGE am: a2a4037f59 -s ours am: d3f28537a4 -s ours
Bill Yi [Sat, 12 Aug 2017 18:45:28 +0000 (18:45 +0000)]
Import translations. DO NOT MERGE am: a2a4037f59  -s ours am: d3f28537a4  -s ours
am: 65dd906932  -s ours

Change-Id: Ib48e8ea3b77bf7ebc6d579bf7ee34981cca4792c

6 years agoImport translations. DO NOT MERGE am: a2a4037f59 -s ours
Bill Yi [Sat, 12 Aug 2017 18:43:37 +0000 (18:43 +0000)]
Import translations. DO NOT MERGE am: a2a4037f59  -s ours
am: 8944eb96c8  -s ours

Change-Id: If0e4af025f0831b132cab08155731d40ac150bdd

6 years agoImport translations. DO NOT MERGE am: a2a4037f59 -s ours
Bill Yi [Sat, 12 Aug 2017 18:42:28 +0000 (18:42 +0000)]
Import translations. DO NOT MERGE am: a2a4037f59  -s ours
am: d3f28537a4  -s ours

Change-Id: Ib8f0bd25e6c6a1b803b225da833393507c56003a

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 12 Aug 2017 18:39:26 +0000 (18:39 +0000)]
Import translations. DO NOT MERGE
am: a2a4037f59  -s ours

Change-Id: I5702da8e0a51efa1ab4ad1e262e53f720a36b96a

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 12 Aug 2017 18:39:26 +0000 (18:39 +0000)]
Import translations. DO NOT MERGE
am: a2a4037f59  -s ours

Change-Id: I70d51d28867e44da0d95e14089584988ae3c98e9

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Sat, 12 Aug 2017 17:57:59 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 12 Aug 2017 15:56:25 +0000 (08:56 -0700)]
Import translations. DO NOT MERGE

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

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 12 Aug 2017 15:36:20 +0000 (08:36 -0700)]
Import translations. DO NOT MERGE

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

6 years agoUpdate strings for screen lock setup am: 3eb4c8333e
Maurice Lam [Sat, 12 Aug 2017 01:32:03 +0000 (01:32 +0000)]
Update strings for screen lock setup am: 3eb4c8333e
am: a773403cd2  -s ours

Change-Id: I4a20a0f0ca018088098f2ad22fee6d5b3a9e8fad

6 years agoChange strings from Instant app account to setting
Jesse Evans [Sat, 12 Aug 2017 00:51:33 +0000 (17:51 -0700)]
Change strings from Instant app account to setting

Test: existing tests
Bug: 63762769
Change-Id: I5499f76b9f8b5f513813c4ee09a4fb00c96c3fd4

6 years agoUpdate strings for screen lock setup
Maurice Lam [Sat, 12 Aug 2017 00:22:14 +0000 (00:22 +0000)]
Update strings for screen lock setup
am: 3eb4c8333e

Change-Id: If48e98edbdc3eb7266ca951e23994942f31c2ef4

6 years agoUpdate strings for screen lock setup
Maurice Lam [Thu, 3 Aug 2017 03:11:28 +0000 (20:11 -0700)]
Update strings for screen lock setup

Test: Manual, existing tests pass
Bug: 64084524
Change-Id: Iff4b004aaf504ae3d574428e41bf91fd46a66f30

6 years agoMerge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev am: 2e7b65f74a
Kevin Chyn [Fri, 11 Aug 2017 17:49:58 +0000 (17:49 +0000)]
Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev am: 2e7b65f74a
am: 5e8f4b6320

Change-Id: Iafc8de444be0c455a8b6e3e51c3b6b407fd125e5

6 years agoMerge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
Kevin Chyn [Fri, 11 Aug 2017 17:34:35 +0000 (17:34 +0000)]
Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
am: 2e7b65f74a

Change-Id: I20ab95a2a6b677ac04cd46dbf89775f1cd8f071c

6 years agoMerge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 17:26:08 +0000 (17:26 +0000)]
Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev

6 years agoMerge "Update strings for skip fingerprint setup" into oc-mr1-dev am: 719d80e6e0
Ajay Nadathur [Fri, 11 Aug 2017 17:25:31 +0000 (17:25 +0000)]
Merge "Update strings for skip fingerprint setup" into oc-mr1-dev am: 719d80e6e0
am: aec29ee4be

Change-Id: I66480f242ed99d3f6488b2c832b0b2745e7432e8

6 years agoMerge "Update strings for skip fingerprint setup" into oc-mr1-dev
Ajay Nadathur [Fri, 11 Aug 2017 17:21:24 +0000 (17:21 +0000)]
Merge "Update strings for skip fingerprint setup" into oc-mr1-dev
am: 719d80e6e0

Change-Id: I844147fa567fd168dbf14effb746d96aee12ad3a

6 years agoMerge "Update strings for skip fingerprint setup" into oc-mr1-dev
Ajay Nadathur [Fri, 11 Aug 2017 17:12:26 +0000 (17:12 +0000)]
Merge "Update strings for skip fingerprint setup" into oc-mr1-dev

6 years agoMerge "Don't lose dialogs during configuration change"
Tony Mantler [Fri, 11 Aug 2017 16:28:43 +0000 (16:28 +0000)]
Merge "Don't lose dialogs during configuration change"

6 years agoMerge "Clean up AssistGesturePreferenceController" into oc-mr1-dev am: 14450c5669
Kevin Chyn [Fri, 11 Aug 2017 03:11:27 +0000 (03:11 +0000)]
Merge "Clean up AssistGesturePreferenceController" into oc-mr1-dev am: 14450c5669
am: e54e3de80c

Change-Id: Ifa1964b6d9d6b32e8b2fc440c40f2431ddcc7b43

6 years agoMerge "Clean up AssistGesturePreferenceController" into oc-mr1-dev
Kevin Chyn [Fri, 11 Aug 2017 03:06:19 +0000 (03:06 +0000)]
Merge "Clean up AssistGesturePreferenceController" into oc-mr1-dev
am: 14450c5669

Change-Id: I511a265ff31d6ced75bc3915c97e09eb95cbbc51

6 years agoMerge "Clean up AssistGesturePreferenceController" into oc-mr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 03:01:33 +0000 (03:01 +0000)]
Merge "Clean up AssistGesturePreferenceController" into oc-mr1-dev

6 years agoClean up AssistGesturePreferenceController
Kevin Chyn [Fri, 4 Aug 2017 00:03:13 +0000 (17:03 -0700)]
Clean up AssistGesturePreferenceController

The preference controller shouldn't be shared between the
"Assist Gesture" parent setting, and the child setting within

Fixes: 64318213

Test: manual test of settings && make -j RunSettingsRoboTests
Change-Id: I2d2437e2036881a08977924dc1386aa1fab67070

6 years agoUpdate strings for skip fingerprint setup
Ajay Nadathur [Thu, 10 Aug 2017 19:36:00 +0000 (12:36 -0700)]
Update strings for skip fingerprint setup

bug: 64092225
Test: Manually tested and verified updated strings used
Change-Id: I813f72abb8cb9fd2ba9ec952c0926ecd2f670ed0

6 years agoMerge "onConnectedChanged should not update access points"
TreeHugger Robot [Thu, 10 Aug 2017 23:35:07 +0000 (23:35 +0000)]
Merge "onConnectedChanged should not update access points"

6 years agoInitialize the volume seekbar preference max and progress. am: cbc231c545 am: cd4dc413f4
Doris Ling [Thu, 10 Aug 2017 22:42:42 +0000 (22:42 +0000)]
Initialize the volume seekbar preference max and progress. am: cbc231c545 am: cd4dc413f4
am: 549ff2cddc

Change-Id: Ie4774f927f9fc81f77955b64a823ef3158eac298

6 years agoInitialize the volume seekbar preference max and progress. am: cbc231c545 am: f9ff9b9f5c
Doris Ling [Thu, 10 Aug 2017 22:42:06 +0000 (22:42 +0000)]
Initialize the volume seekbar preference max and progress. am: cbc231c545 am: f9ff9b9f5c
am: f92ca61cca

Change-Id: Iba3641ae83143245ab04cbf37b6ea48bfb2a367b

6 years agoInitialize the volume seekbar preference max and progress. am: cbc231c545
Doris Ling [Thu, 10 Aug 2017 22:36:27 +0000 (22:36 +0000)]
Initialize the volume seekbar preference max and progress. am: cbc231c545
am: cd4dc413f4

Change-Id: I5408c62bbf0c1a7669388e4fffd76b317bbf8e15

6 years agoInitialize the volume seekbar preference max and progress. am: cbc231c545
Doris Ling [Thu, 10 Aug 2017 22:35:40 +0000 (22:35 +0000)]
Initialize the volume seekbar preference max and progress. am: cbc231c545
am: f9ff9b9f5c

Change-Id: Idf70f2a7a277924a6486ae7b976d57abd1789051

6 years agoInitialize the volume seekbar preference max and progress.
Doris Ling [Thu, 10 Aug 2017 22:29:23 +0000 (22:29 +0000)]
Initialize the volume seekbar preference max and progress.
am: cbc231c545

Change-Id: Ifd70d6362064f640dfd899d4437d582d853ed7a7

6 years agoInitialize the volume seekbar preference max and progress.
Doris Ling [Thu, 10 Aug 2017 22:28:20 +0000 (22:28 +0000)]
Initialize the volume seekbar preference max and progress.
am: cbc231c545

Change-Id: Ibfe977a33e25f5cd7188062595f2c8aa990ee8f3

6 years agoDon't lose dialogs during configuration change
Tony Mantler [Wed, 9 Aug 2017 21:16:48 +0000 (14:16 -0700)]
Don't lose dialogs during configuration change

Bug: 62442606
Test: Rotate device when a dialog is showing
Change-Id: I616d6030e2c43937e4b59dd7f6d78dd7124228dc

6 years agoInitialize the volume seekbar preference max and progress.
Doris Ling [Tue, 8 Aug 2017 23:52:42 +0000 (16:52 -0700)]
Initialize the volume seekbar preference max and progress.

When the media stream is set, initialize the preference max and progress
with the streams current value. Otherwise, when we initialize the seekbar
volumizer, it will first set the seekbar max to 0 and progress to 0,
then update with the correct value, which will result in the jank that
is seen when the sound settings are displayed.

Change-Id: I515c97bbc6ec38bbe92755e3d7cb53bb13ac52d0
Fix: 34035654
Test: make RunSettingsRoboTests
(cherry picked from commit b7490bea28cb28d301fe4ec0275cef7129621206)

6 years agoMerge "Implement auto 12/24h setting toggle."
Joachim Sauer [Thu, 10 Aug 2017 16:36:47 +0000 (16:36 +0000)]
Merge "Implement auto 12/24h setting toggle."

6 years agoImplement auto 12/24h setting toggle.
Joachim Sauer [Thu, 1 Jun 2017 10:23:28 +0000 (11:23 +0100)]
Implement auto 12/24h setting toggle.

This implements an explicit toggle to enable/disable automatic 12h/24h
time formatting detection based on the current locale.

Previously automatic detection was the norm on a freshly wiped device,
but could never be re-enabled once either 12h or 24h format was
configured.

Bug: 32761619
Test: m RunSettingsRoboTests
Change-Id: Idbbb8f79fccec95e33bf2f12767d5736e1118fa7

6 years agoMerge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev...
Antony Sargent [Thu, 10 Aug 2017 07:32:48 +0000 (07:32 +0000)]
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev am: 49cd8f2327 am: 8cd8519eab
am: c7e3832e80

Change-Id: I8cb5200d38539d56c3f73fb7cd6ffaeb57dccf56

6 years agoMerge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev...
Antony Sargent [Thu, 10 Aug 2017 07:32:23 +0000 (07:32 +0000)]
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev am: 49cd8f2327 am: 0fe460a8e3
am: d9456d807b

Change-Id: I5bd24cc8cc532ffdcec05c51424140e8dcc764f8

6 years agoMerge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev...
Antony Sargent [Thu, 10 Aug 2017 07:29:33 +0000 (07:29 +0000)]
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev am: 49cd8f2327
am: 8cd8519eab

Change-Id: I74d3cae7409336fe4d4ac33aa8802664bcf5cc7d

6 years agoMerge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev...
Antony Sargent [Thu, 10 Aug 2017 07:28:51 +0000 (07:28 +0000)]
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev am: 49cd8f2327
am: 0fe460a8e3

Change-Id: I000eba2d8266b3d86f08c336f4ae3217ae48b8ac

6 years agoMerge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev
Antony Sargent [Thu, 10 Aug 2017 07:25:53 +0000 (07:25 +0000)]
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev
am: 49cd8f2327

Change-Id: I4b8989fd95405bfeb7ada518b0ce2f76dec5cdb3

6 years agoMerge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev
Antony Sargent [Thu, 10 Aug 2017 07:25:52 +0000 (07:25 +0000)]
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev
am: 49cd8f2327

Change-Id: I02c6056ab8efb238cb8ba97ea4d4ea6de247c13d

6 years agoMerge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev
TreeHugger Robot [Thu, 10 Aug 2017 07:23:29 +0000 (07:23 +0000)]
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev