OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoNever store battery stats for cache
jackqdyulei [Fri, 14 Jul 2017 22:23:32 +0000 (15:23 -0700)]
Never store battery stats for cache

In PowerUsageBase, it will store battery stats if it has a configuration
change, which will make BatteryStatsLoaderHelper never get the correct
battery stats because it uses Bundle.EMPTY as the bundle message.

This cl:
1. Remove the store action even though it is configuration change.
2. Always use null to get battery stats
3. Always start a battery status check in register()

Bug: 63658232
Test: RunSettingsRoboTests
Change-Id: Ifbf970c63378ed66dddcdae4d952b7d1fd84216a

7 years agoMerge "Add metric action for bt rename dialog" into oc-dr1-dev
Lei Yu [Fri, 14 Jul 2017 17:19:32 +0000 (17:19 +0000)]
Merge "Add metric action for bt rename dialog" into oc-dr1-dev

7 years agoMerge "Remove automatic rule icons" into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 16:45:49 +0000 (16:45 +0000)]
Merge "Remove automatic rule icons" into oc-dr1-dev

7 years agoRemove automatic rule icons
Julia Reynolds [Fri, 14 Jul 2017 14:03:56 +0000 (10:03 -0400)]
Remove automatic rule icons

Test: code inspection
Change-Id: I7e585f485d3ba9318bf533e07e9fa7f1e1874d51
Fixes: 63623747

7 years agoMerge "Don't show "Wipe eSIMs" checkbox for developers." into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 01:02:07 +0000 (01:02 +0000)]
Merge "Don't show "Wipe eSIMs" checkbox for developers." into oc-dr1-dev

7 years agoAdd metric action for bt rename dialog
jackqdyulei [Tue, 11 Jul 2017 18:15:25 +0000 (11:15 -0700)]
Add metric action for bt rename dialog

Bug: 63553537
Test: runtest -x BluetoothNetworkSettingsTests
Change-Id: Ic618133da513bb0c22ac4d79e5d7cb75412a93dd

7 years agoMerge "Extend char limit for dialog title" into oc-dr1-dev
Lei Yu [Thu, 13 Jul 2017 21:33:27 +0000 (21:33 +0000)]
Merge "Extend char limit for dialog title" into oc-dr1-dev

7 years agoMerge "Fix mokey crash on swiping settings condition." into oc-dr1-dev
TreeHugger Robot [Thu, 13 Jul 2017 21:14:45 +0000 (21:14 +0000)]
Merge "Fix mokey crash on swiping settings condition." into oc-dr1-dev

7 years agoMerge "UI refresh on bluetooth list page" into oc-dr1-dev
TreeHugger Robot [Thu, 13 Jul 2017 20:05:25 +0000 (20:05 +0000)]
Merge "UI refresh on bluetooth list page" into oc-dr1-dev

7 years agoMerge "Make sure PIN edit control is focused" into oc-dr1-dev
TreeHugger Robot [Thu, 13 Jul 2017 19:41:01 +0000 (19:41 +0000)]
Merge "Make sure PIN edit control is focused" into oc-dr1-dev

7 years agoUI refresh on bluetooth list page
Fan Zhang [Wed, 12 Jul 2017 17:18:54 +0000 (10:18 -0700)]
UI refresh on bluetooth list page

- xml layout clean up
- add "Device name" preference, tapping will bring up rename dialog
- Remove tap target from original device_name pref

Merged-In: I6e9764dbb6c51f94be6d6a61d5a6401141407409
Change-Id: I9cb67cc557a9b932d7cf795a8d4a6fb5215c4365
Fix: 62890841
Fix: 62891178
Test: robotests

7 years agoFix mokey crash on swiping settings condition.
Doris Ling [Wed, 12 Jul 2017 19:28:16 +0000 (12:28 -0700)]
Fix mokey crash on swiping settings condition.

When the condition card is being swiped, add null check for the
retrieved Condition to ensure it is still valid before trying to
dismiss it.

Change-Id: I265091a5fe290e359fa9a6e16b1d87c03894c1b8
Fix: 63624859
Test: make RunSettingsRoboTests

7 years agoExtend char limit for dialog title
jackqdyulei [Thu, 13 Jul 2017 17:25:39 +0000 (10:25 -0700)]
Extend char limit for dialog title

Bug: 63396701
Test: Build
Change-Id: I6f873e42c52e66bab54de087ac7a478a9d6ce4f9

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 13 Jul 2017 14:56:00 +0000 (07:56 -0700)]
Import translations. DO NOT MERGE

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

7 years agoMake sure PIN edit control is focused
Antony Sargent [Thu, 13 Jul 2017 00:29:10 +0000 (17:29 -0700)]
Make sure PIN edit control is focused

When doing Bluetooth pairing and the dialog reqesting a PIN comes up, we
want the PIN field to be focused and the keyboard to be shown. This fixes
a regression from N.

Bug: 62857671
Test: make RunSettingsRoboTests
Change-Id: I00dabfda737b6ac61b50518e11f21e5f9a5a1be1

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c ...
Phil Weaver [Wed, 12 Jul 2017 23:22:23 +0000 (23:22 +0000)]
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c  -s ours am: 98e0930394  -s ours am: df045253a4 am: b72ffa47a4  -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c am: 24aaf4d7ad  -s ours am: e9d2bdc380 am: 8bf67896d6 am: 254bbe84a3 am: 8870bd7c5a am: 23a6d1d953  -s ours
am: 9e63322457

Change-Id: I96336a9618789cab1760ea651323c3f8982741e2

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c ...
Phil Weaver [Wed, 12 Jul 2017 23:15:51 +0000 (23:15 +0000)]
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c  -s ours am: 98e0930394  -s ours am: df045253a4 am: b72ffa47a4  -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c am: 24aaf4d7ad  -s ours am: e9d2bdc380 am: 8bf67896d6 am: 254bbe84a3 am: 8870bd7c5a
am: 23a6d1d953  -s ours

Change-Id: Ic4747be59996146ac76509581e390afc99ebe876

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c ...
Phil Weaver [Wed, 12 Jul 2017 23:08:49 +0000 (23:08 +0000)]
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c  -s ours am: 98e0930394  -s ours am: df045253a4 am: b72ffa47a4  -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c am: 24aaf4d7ad  -s ours am: e9d2bdc380 am: 8bf67896d6 am: 254bbe84a3
am: 8870bd7c5a

Change-Id: I4a9a2124db4e45793d969be6c3e33479524e01c9

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c ...
Phil Weaver [Wed, 12 Jul 2017 23:02:11 +0000 (23:02 +0000)]
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c  -s ours am: 98e0930394  -s ours am: df045253a4 am: b72ffa47a4  -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c am: 24aaf4d7ad  -s ours am: e9d2bdc380 am: 8bf67896d6
am: 254bbe84a3

Change-Id: I87ffde2e35401e7d027ddae59bbbeddbe6ed91dc

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c ...
Phil Weaver [Wed, 12 Jul 2017 22:56:17 +0000 (22:56 +0000)]
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c  -s ours am: 98e0930394  -s ours am: df045253a4 am: b72ffa47a4  -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c am: 24aaf4d7ad  -s ours am: e9d2bdc380
am: 8bf67896d6

Change-Id: If3df05ce2112fb26b53651f51d47987d4f8582ca

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c ...
Phil Weaver [Wed, 12 Jul 2017 22:50:05 +0000 (22:50 +0000)]
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c  -s ours am: 98e0930394  -s ours am: df045253a4 am: b72ffa47a4  -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c am: 24aaf4d7ad  -s ours
am: e9d2bdc380

Change-Id: I568b19d74265138d2f5cb563491c379bcfbb18aa

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c ...
Phil Weaver [Wed, 12 Jul 2017 22:41:40 +0000 (22:41 +0000)]
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c  -s ours am: 98e0930394  -s ours am: df045253a4 am: b72ffa47a4  -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c
am: 24aaf4d7ad  -s ours

Change-Id: Ibf0c76ba5e9059cd87282cefa9b0c7724ed64128

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c ...
Phil Weaver [Wed, 12 Jul 2017 22:35:43 +0000 (22:35 +0000)]
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c  -s ours am: 98e0930394  -s ours am: df045253a4 am: b72ffa47a4  -s ours am: bb12830bf9 am: 4a40ef7688
am: a486c82d9c

Change-Id: Ib92175b78417bda6e58da2b93e37143a428852c0

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c ...
Phil Weaver [Wed, 12 Jul 2017 22:29:09 +0000 (22:29 +0000)]
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c  -s ours am: 98e0930394  -s ours am: df045253a4 am: b72ffa47a4  -s ours am: bb12830bf9
am: 4a40ef7688

Change-Id: I6d627519091040c4d64841210003de8aa1471f53

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c ...
Phil Weaver [Wed, 12 Jul 2017 22:23:16 +0000 (22:23 +0000)]
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c  -s ours am: 98e0930394  -s ours am: df045253a4 am: b72ffa47a4  -s ours
am: bb12830bf9

Change-Id: I51e797becf12a2c21e04eb5e701b44cad5f8045f

7 years agoMerge "Fix bug in DevicePickerFragment" into oc-dr1-dev
TreeHugger Robot [Wed, 12 Jul 2017 22:20:00 +0000 (22:20 +0000)]
Merge "Fix bug in DevicePickerFragment" into oc-dr1-dev

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c ...
Phil Weaver [Wed, 12 Jul 2017 22:19:08 +0000 (22:19 +0000)]
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c  -s ours am: 98e0930394  -s ours am: df045253a4
am: b72ffa47a4  -s ours

Change-Id: Idc84d1fbeb9e6bcb219c231af4565b666d2d1f00

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c ...
Phil Weaver [Wed, 12 Jul 2017 22:13:16 +0000 (22:13 +0000)]
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c  -s ours am: 98e0930394  -s ours
am: df045253a4

Change-Id: I1ec6fc85e78e081fba4858c8cb4bd7aa2751811c

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c ...
Phil Weaver [Wed, 12 Jul 2017 22:06:35 +0000 (22:06 +0000)]
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c  -s ours
am: 98e0930394  -s ours

Change-Id: I8de29bde0bf73adde876e6cba0e4e61de6e4f2cb

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e
Phil Weaver [Wed, 12 Jul 2017 21:59:38 +0000 (21:59 +0000)]
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e
am: bebc9f9f3c  -s ours

Change-Id: I1d6d10dace8425eb21bacd9582404e876da2db7c

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38
Phil Weaver [Wed, 12 Jul 2017 21:55:38 +0000 (21:55 +0000)]
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e

Change-Id: I5b2add698df347db16bfedb196793ea77b70f8a8

7 years agoDO NOT MERGE Back-port ag/2491664
Phil Weaver [Wed, 12 Jul 2017 21:43:49 +0000 (21:43 +0000)]
DO NOT MERGE Back-port ag/2491664
am: 9a14484b38

Change-Id: Ie1a9075d996f38ac8bbe56e19880bbfd6b9f9a96

7 years agoDO NOT MERGE Back-port ag/2491664
Phil Weaver [Tue, 11 Jul 2017 18:34:40 +0000 (11:34 -0700)]
DO NOT MERGE Back-port ag/2491664

Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.

Change-Id: Icbd00799e4b12cde9d17d3d0abbd38d9643b26c4

7 years agoMerge "Fix mistake in conditional + test" into oc-dr1-dev
TreeHugger Robot [Wed, 12 Jul 2017 20:41:27 +0000 (20:41 +0000)]
Merge "Fix mistake in conditional + test" into oc-dr1-dev

7 years agoMerge "Remove next button from FingerprintEnroll screen" into oc-dr1-dev
TreeHugger Robot [Wed, 12 Jul 2017 20:03:14 +0000 (20:03 +0000)]
Merge "Remove next button from FingerprintEnroll screen" into oc-dr1-dev

7 years agoFix bug in DevicePickerFragment
jackqdyulei [Wed, 12 Jul 2017 19:30:02 +0000 (12:30 -0700)]
Fix bug in DevicePickerFragment

BluetoothProgressCategory will add a no device preference if it is
not scanning and no device is added to the list. Since
DeviceListFragment doesn't report its scanning status correctly, it will
show "No nearby device" even though it is scanning.

This cl add control code for BluetoothProgressCategory in
DeviceListFragment, which avoid the unnecessary no device preference.

Bug: 62492822
Test: RunSettingsRoboTests
Change-Id: Ic49f21cb58a80dcd37c5737800181263ae876ebc

7 years agoFix mistake in conditional + test
Salvador Martinez [Tue, 11 Jul 2017 23:15:44 +0000 (16:15 -0700)]
Fix mistake in conditional + test

This CL fixes a mixup that was in a conditional that determined
what was shown on the battery settings page. Additionally, it adds
a simple test to help ensure that this does not regress in the
future.

Test: Robotest
Bug: 63158794
Change-Id: I8af4843ef6d798b5114c97b2f1b99dd29fa5f412

7 years agoMerge "Do not show options if screen lock types is empty" into oc-dr1-dev
Ajay Nadathur [Wed, 12 Jul 2017 17:53:07 +0000 (17:53 +0000)]
Merge "Do not show options if screen lock types is empty" into oc-dr1-dev

7 years agoMerge "Fix filter bug for non-internal app filtering." into oc-dr1-dev
Daniel Nishi [Wed, 12 Jul 2017 17:13:46 +0000 (17:13 +0000)]
Merge "Fix filter bug for non-internal app filtering." into oc-dr1-dev

7 years agoMerge "Disable lift-to-wake when always-on is checked" into oc-dr1-dev
Geoffrey Pitsch [Wed, 12 Jul 2017 16:50:48 +0000 (16:50 +0000)]
Merge "Disable lift-to-wake when always-on is checked" into oc-dr1-dev

7 years agoMerge "Update spacing and background color for condition/suggestion." into oc-dr1-dev
TreeHugger Robot [Wed, 12 Jul 2017 02:58:28 +0000 (02:58 +0000)]
Merge "Update spacing and background color for condition/suggestion." into oc-dr1-dev

7 years agoMerge "Add another fingerprint button not visible in landscape mode" into oc-dr1-dev
TreeHugger Robot [Wed, 12 Jul 2017 01:57:26 +0000 (01:57 +0000)]
Merge "Add another fingerprint button not visible in landscape mode" into oc-dr1-dev

7 years agoRemove next button from FingerprintEnroll screen
Ajay Nadathur [Tue, 11 Jul 2017 18:45:08 +0000 (11:45 -0700)]
Remove next button from FingerprintEnroll screen

bug: 63515466
Test: Manually tested and verified that next button is removed
Change-Id: Ib43363c763fba2f92cb4774e1b961ab8647f5040

7 years agoDo not show options if screen lock types is empty
Ajay Nadathur [Sat, 8 Jul 2017 01:04:14 +0000 (18:04 -0700)]
Do not show options if screen lock types is empty

Bug: 63311251
Test: Manually tested on device
Change-Id: Ia56a0791b89635efb4f8305f39b586b8054271cf

7 years agoFix filter bug for non-internal app filtering.
Daniel Nishi [Tue, 11 Jul 2017 20:38:38 +0000 (13:38 -0700)]
Fix filter bug for non-internal app filtering.

By default, the filter would show all non-categorized apps. This,
however, regressed the external storage apps view which does not have
categorization (yet). By adding back in a legacy option to use the old
purely UUID filtering, we can fix the regression.

Change-Id: I72d8d3bc08fbdff53374eb1e973bce9f8d7e2e79
Fixes: 63542896
Test: Settings unit test

7 years agoMerge "Remove obsolete bluetooth pages" into oc-dr1-dev
TreeHugger Robot [Wed, 12 Jul 2017 00:01:47 +0000 (00:01 +0000)]
Merge "Remove obsolete bluetooth pages" into oc-dr1-dev

7 years agoAdd another fingerprint button not visible in landscape mode
Ajay Nadathur [Tue, 11 Jul 2017 18:12:47 +0000 (11:12 -0700)]
Add another fingerprint button not visible in landscape mode

bug:63067568
Test: Manually tested and verified
Change-Id: I172bbf4c4db6cebb2cc96874f3d8d29e859b07d1

7 years agoMerge "Add category for wallpaper suggestion" into oc-dr1-dev
Maurice Lam [Tue, 11 Jul 2017 23:41:32 +0000 (23:41 +0000)]
Merge "Add category for wallpaper suggestion" into oc-dr1-dev

7 years agoUpdate spacing and background color for condition/suggestion.
Doris Ling [Thu, 6 Jul 2017 22:21:31 +0000 (15:21 -0700)]
Update spacing and background color for condition/suggestion.

- changed suggestion/condition and searchbox background color to
  #F2F2F2
- changed condition card background color to #F8F8F8
- removed Suggestion header
- reduced space above condition header/footer by 9dp

Fix: 63393599
Test: visual
Change-Id: I4317781c93e23c6d019928b9fe9af16177f81c07
Merged-In: I268934e3a573b542480c0b21dbab68b7217295b5

7 years agoMerge "Assist gesture title should not be translated, remove unused strings" into...
TreeHugger Robot [Tue, 11 Jul 2017 22:32:19 +0000 (22:32 +0000)]
Merge "Assist gesture title should not be translated, remove unused strings" into oc-dr1-dev

7 years agoMerge "Bind service in onCreate" into oc-dr1-dev
TreeHugger Robot [Tue, 11 Jul 2017 22:02:35 +0000 (22:02 +0000)]
Merge "Bind service in onCreate" into oc-dr1-dev

7 years agoRemove obsolete bluetooth pages
jackqdyulei [Mon, 10 Jul 2017 22:15:33 +0000 (15:15 -0700)]
Remove obsolete bluetooth pages

1. Remove BluetoothSettingsObsolete
2. Remove DeviceListPreferenceObsoleteFragment
3. Update master swtich, now constantly point to new page
4. Update the tests

Future cl will remove the page switch API in BluetoothFeatureProvider

Bug: 63444548
Test: Test still pass
Change-Id: I24fb5cd03cf30044edb7201426e11e0a818f0a7f
Merged-In: I24fb5cd03cf30044edb7201426e11e0a818f0a7f

7 years agoMerge "Bluetooth: mLocalAdapter should never be null" into oc-dr1-dev
TreeHugger Robot [Tue, 11 Jul 2017 21:16:32 +0000 (21:16 +0000)]
Merge "Bluetooth: mLocalAdapter should never be null" into oc-dr1-dev

7 years agoMerge "Adjust UX for toggles when active scorer is not set." into oc-dr1-dev
TreeHugger Robot [Tue, 11 Jul 2017 20:21:01 +0000 (20:21 +0000)]
Merge "Adjust UX for toggles when active scorer is not set." into oc-dr1-dev

7 years agoBind service in onCreate
jackqdyulei [Mon, 10 Jul 2017 20:22:50 +0000 (13:22 -0700)]
Bind service in onCreate

This cl puts the binding to onCreate instead of constructor, so
preference controller won't bind/unbind service without registering
Lifecycle.

Bug: 62105045
Test: RunSettingsRoboTests
Change-Id: I1e60d4b6ad7270aa5d04b7ec9fae1d3200fccc5f
Merged-In: I1e60d4b6ad7270aa5d04b7ec9fae1d3200fccc5f

7 years agoAssist gesture title should not be translated, remove unused strings
Kevin Chyn [Fri, 7 Jul 2017 18:22:16 +0000 (11:22 -0700)]
Assist gesture title should not be translated, remove unused strings

Bug: 63441962

Test: manual && make -j RunSettingsRoboTests
Change-Id: I8b50ad378828f30f31dbfd648c9fac62af5d9da7

7 years agoMerge "Expand ASM activation warning." into oc-dr1-dev
Daniel Nishi [Tue, 11 Jul 2017 19:46:19 +0000 (19:46 +0000)]
Merge "Expand ASM activation warning." into oc-dr1-dev

7 years agoBluetooth: mLocalAdapter should never be null
Jack He [Tue, 11 Jul 2017 19:04:01 +0000 (12:04 -0700)]
Bluetooth: mLocalAdapter should never be null

* mLocalAdapter should never be null
* We should crash if it is ever null

Bug: 63442969
Test: make, pair Bluetooth device
Change-Id: If98f9ea0762927eb57d00224b62abf24bbec69ba

7 years agoMerge "Hide screen lock options button in confirm lock" into oc-dr1-dev
Maurice Lam [Tue, 11 Jul 2017 18:21:43 +0000 (18:21 +0000)]
Merge "Hide screen lock options button in confirm lock" into oc-dr1-dev

7 years agoDisable lift-to-wake when always-on is checked
Geoffrey Pitsch [Mon, 10 Jul 2017 14:30:05 +0000 (10:30 -0400)]
Disable lift-to-wake when always-on is checked

The setting has little to no meaning when AOD is on.

Test: make
ROBOTEST_FILTER=AmbientDisplayAlwaysOnPreferenceControllerTest
RunSettingsRoboTests -j
Bug:62391405
Change-Id:If5492227755ca81ec0bcf921a81e2bfd33a85b9c

7 years agoExpand ASM activation warning.
Daniel Nishi [Tue, 27 Jun 2017 22:09:20 +0000 (15:09 -0700)]
Expand ASM activation warning.

If the device had ASM enabled by default but still opted to disable ASM
for policy reasons, we need to start warning the user.

Change-Id: I6a296e95d00413308de3ddc565b42c5f605087e9
Fixes: 62105682
Test: Settings robotest

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Tue, 11 Jul 2017 04:01:24 +0000 (04:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

7 years agoImport translations. DO NOT MERGE am: 7267438b58 -s ours
Bill Yi [Tue, 11 Jul 2017 03:55:40 +0000 (03:55 +0000)]
Import translations. DO NOT MERGE am: 7267438b58  -s ours
am: 750540ae48  -s ours

Change-Id: Ie4b8baffb9d82f30bef5251893124152a66f8f1c

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 11 Jul 2017 03:47:35 +0000 (03:47 +0000)]
Import translations. DO NOT MERGE
am: 7267438b58  -s ours

Change-Id: Id5933547a1b04477e00dbef1fd88382a01e02891

7 years agoMerge "Remove unnecessary keywords" into oc-dr1-dev
TreeHugger Robot [Tue, 11 Jul 2017 03:31:06 +0000 (03:31 +0000)]
Merge "Remove unnecessary keywords" into oc-dr1-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 11 Jul 2017 03:30:04 +0000 (03:30 +0000)]
Import translations. DO NOT MERGE
am: f812f94216  -s ours

Change-Id: Id14fbf7f7822ce74772c66410f9bd69e9ecba388

7 years agoRemove unnecessary keywords
Kevin Chyn [Tue, 11 Jul 2017 00:54:04 +0000 (17:54 -0700)]
Remove unnecessary keywords

Fixes: 63544783

Test: make -j RunSettingsRoboTests && manual
Change-Id: I6f6cb8aff365174edb7cd22f18cbc1b7e7ba5b4a

7 years agoHide screen lock options button in confirm lock
Maurice Lam [Tue, 11 Jul 2017 01:15:10 +0000 (18:15 -0700)]
Hide screen lock options button in confirm lock

Hide the screen lock options button in the confirmation stage of
SetupChooseLockPassword, so the user cannot skip out of that screen
while the screen lock is being saved.

Test: Manual
Bug: 63526104
Change-Id: I8ee8938f3ddcd9f0ff3b1812fcae667eddaf09ab

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 11 Jul 2017 00:16:10 +0000 (17:16 -0700)]
Import translations. DO NOT MERGE

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

7 years agoMerge "Update notification redaction interstitial according to spec" into oc-dr1-dev
TreeHugger Robot [Tue, 11 Jul 2017 00:00:08 +0000 (00:00 +0000)]
Merge "Update notification redaction interstitial according to spec" into oc-dr1-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 10 Jul 2017 23:49:52 +0000 (16:49 -0700)]
Import translations. DO NOT MERGE

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

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 10 Jul 2017 23:23:41 +0000 (16:23 -0700)]
Import translations. DO NOT MERGE

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

7 years agoMerge "Add location as a Inline list payload" into oc-dr1-dev
TreeHugger Robot [Mon, 10 Jul 2017 23:23:13 +0000 (23:23 +0000)]
Merge "Add location as a Inline list payload" into oc-dr1-dev

7 years agoUpdate notification redaction interstitial according to spec
Ajay Nadathur [Mon, 10 Jul 2017 21:21:10 +0000 (14:21 -0700)]
Update notification redaction interstitial according to spec

bug: 38395294
Test: Manually tested and verified
Change-Id: Iddd53af604c65bb8e40c081f9538535bd3043ad4

7 years agoMerge "Support multi line title for switch and edittext preferences" into oc-dr1-dev
TreeHugger Robot [Mon, 10 Jul 2017 21:23:15 +0000 (21:23 +0000)]
Merge "Support multi line title for switch and edittext preferences" into oc-dr1-dev

7 years agoSupport multi line title for switch and edittext preferences
Fan Zhang [Mon, 10 Jul 2017 19:08:04 +0000 (12:08 -0700)]
Support multi line title for switch and edittext preferences

Change-Id: I898288a1e8c9d3bedae3f5f3269d4aa0fd2308f6
Fix: 63509156
Test: visual

7 years agoAdd location as a Inline list payload
Matthew Fritze [Fri, 7 Jul 2017 15:04:42 +0000 (08:04 -0700)]
Add location as a Inline list payload

The inline payload is added to security settings because
security settings indexes the setting with the key
"location" which corresponds with the correct
PreferenceController, LocationPreferenceController.

However, we suppress the Location search result, so to
avoid confusion later, we don't include the ResultPayload
in the search indexing.

Bug: 62022517
Test: make RunSettingsRoboTests
Change-Id: Ica9b775fe7b43259e651f95b079b8cccb29d0ea8
Merged-In: Ic5515d38064498ae908f4cefedfeb3c2a2af449c

7 years agoInit BatteryUtils in constructor
jackqdyulei [Mon, 10 Jul 2017 18:00:05 +0000 (11:00 -0700)]
Init BatteryUtils in constructor

In this case we won't have the NPE.

Bug: 63526637
Test: RunSettingsRoboTests
Change-Id: I20375e535ba07deddacf74052f31476e0cb28e56

7 years agoMerge "Prevent clipping of SeekBar thumb" into oc-dr1-dev
Christine Franks [Mon, 10 Jul 2017 13:51:39 +0000 (13:51 +0000)]
Merge "Prevent clipping of SeekBar thumb" into oc-dr1-dev

7 years agoMerge "Adding key to individual entries in ManagedServiceSettings so that it can...
TreeHugger Robot [Sat, 8 Jul 2017 23:01:36 +0000 (23:01 +0000)]
Merge "Adding key to individual entries in ManagedServiceSettings so that it can be linked using an intent. Also updating the icon loading logic so that it handles AdaptiveIcons properly." into oc-dr1-dev

7 years agoAdding key to individual entries in ManagedServiceSettings so that it can
Sunny Goyal [Fri, 7 Jul 2017 13:40:27 +0000 (06:40 -0700)]
Adding key to individual entries in ManagedServiceSettings so that it can
be linked using an intent.
Also updating the icon loading logic so that it handles AdaptiveIcons
properly.

Test: Manually tested on device
Bug: 63418030
Change-Id: I4d818956f2fa0585300d4dfb95ad7a16fe8882d5

Merged-In: I3059e3a562a593bc425d4e778be052ac014a7002

7 years agoAdd category for wallpaper suggestion
Maurice Lam [Sat, 8 Jul 2017 01:21:29 +0000 (18:21 -0700)]
Add category for wallpaper suggestion

Add PERSONALIZE category to wallpaper suggestion so it would be shown
during deferred setup.

Test: Manual
Bug: 62019610
Change-Id: Id3d9d926db298fba77dc472ae32574fe8855f962

7 years agoMerge "Update summary for "Voice Calls"" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 23:52:58 +0000 (23:52 +0000)]
Merge "Update summary for "Voice Calls"" into oc-dr1-dev

7 years agoMerge "Increase suggestion/condition card width." into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 23:35:08 +0000 (23:35 +0000)]
Merge "Increase suggestion/condition card width." into oc-dr1-dev

7 years agoMerge "Duplicate ambient display setting in battery settings." into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 22:46:05 +0000 (22:46 +0000)]
Merge "Duplicate ambient display setting in battery settings." into oc-dr1-dev

7 years agoMerge "Add public intent filters to indexing" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 22:39:20 +0000 (22:39 +0000)]
Merge "Add public intent filters to indexing" into oc-dr1-dev

7 years agoUpdate summary for "Voice Calls"
jackqdyulei [Fri, 7 Jul 2017 20:05:46 +0000 (13:05 -0700)]
Update summary for "Voice Calls"

Change it from "Screen usage 2m" to "2m", since this is not a screen
usage. This cl has effect on all non-app batterySipper.

Bug: 63443732
Test: RunSettingsRoboTests
Change-Id: I027b3234bd7b56738ab31c5dfbc0d8bd7f19186e

7 years agoMerge "Overlapping text over fingerprint animation" into oc-dr1-dev
Ajay Kumar Nadathur Sreenivasan [Fri, 7 Jul 2017 21:29:07 +0000 (21:29 +0000)]
Merge "Overlapping text over fingerprint animation" into oc-dr1-dev

7 years agoMerge "Get rid of spurious gear icon in BT details page" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 21:12:58 +0000 (21:12 +0000)]
Merge "Get rid of spurious gear icon in BT details page" into oc-dr1-dev

7 years agoDuplicate ambient display setting in battery settings.
Andrew Sapperstein [Fri, 7 Jul 2017 18:02:00 +0000 (11:02 -0700)]
Duplicate ambient display setting in battery settings.

Also fixed a bug where ambient display was duplicated
in search results.

Change-Id: I71e8d9ff12e59ad7b9eb309d1093df1ba67abaae
Merged-In: Iacdb53c70e90f8240da1ed9acec7e382ed1df5de
Fixes: 62298578
Test: robotests

7 years agoMerge "Create BatterySaverReceiver" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 19:31:47 +0000 (19:31 +0000)]
Merge "Create BatterySaverReceiver" into oc-dr1-dev

7 years agoOverlapping text over fingerprint animation
Ajay Nadathur [Fri, 7 Jul 2017 00:03:11 +0000 (17:03 -0700)]
Overlapping text over fingerprint animation

bug: 63122688
Test: Manually tested and verified using smallest & largest display
settings

Change-Id: I03a6ab380c8d611b69f0b817788ff1f34b47e19d

7 years agoGet rid of spurious gear icon in BT details page
Antony Sargent [Fri, 7 Jul 2017 18:09:24 +0000 (11:09 -0700)]
Get rid of spurious gear icon in BT details page

The problem is that we were calling done() on the EntityHeaderController
and passing false for whether to rebind the action buttons, which means
we were getting the default behavior including a visible gear
icon. Passing true to request rebinding causes that icon to be hidden.

Bug: 63405635
Test: make RunSettingsRoboTests
Change-Id: I031f4a2d176ff3be025cc2675d7026a679936b03

7 years agoAdjust UX for toggles when active scorer is not set.
Stephen Chen [Fri, 23 Jun 2017 22:14:14 +0000 (15:14 -0700)]
Adjust UX for toggles when active scorer is not set.

This change fixes two issues: when wakeup is not available, update the
number of items to show above the fold in wifi preferences. When scorer
is not set, grey out wakeup toggle and set summary to reflect the
status.

Bug: 62410973
Bug: 62343859
Test: make RunSettingsRoboTests -j40
Merged-In: I5f4131c6a86eab6c0fb03ea2b5101ba107a9189f
Change-Id: I5f4131c6a86eab6c0fb03ea2b5101ba107a9189f

7 years agoMerge "Search bar polish" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 17:39:11 +0000 (17:39 +0000)]
Merge "Search bar polish" into oc-dr1-dev

7 years agoMerge "Screen lock type metrics are not reported if user goes back" into oc-dr1-dev
Ajay Kumar Nadathur Sreenivasan [Fri, 7 Jul 2017 17:30:15 +0000 (17:30 +0000)]
Merge "Screen lock type metrics are not reported if user goes back" into oc-dr1-dev

7 years agoCreate BatterySaverReceiver
jackqdyulei [Wed, 5 Jul 2017 22:49:16 +0000 (15:49 -0700)]
Create BatterySaverReceiver

This cl elicits BatterySaverReceiver that listen to the change about
battery state and battery saver state.

BatterySaverController and BatterySaverSettings will use this receiver
to update the UI.

Bug: 32410757
Test: RunSettingsRoboTests
Change-Id: Ia92c6776985b89fe6a8d5b8d80898e502942b9b5
Merged-In: Ia92c6776985b89fe6a8d5b8d80898e502942b9b5

7 years agoMerge "AOD Settings: Add battery usage warning" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 16:52:44 +0000 (16:52 +0000)]
Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 15:45:55 +0000 (15:45 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

7 years agoAOD Settings: Add battery usage warning
Adrian Roos [Fri, 7 Jul 2017 14:30:04 +0000 (16:30 +0200)]
AOD Settings: Add battery usage warning

Change-Id: I14946046c1541e8092ed2b492867730713e3e1ed
Fixes: 33279975
Test: Open Settings > Display. Verify that always on strings contain the increased battery usage warning.