OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoMake "Battery usage" accessible at any time
jackqdyulei [Mon, 22 May 2017 22:40:19 +0000 (15:40 -0700)]
Make "Battery usage" accessible at any time

Before this cl, user could go to "Battery usage" page only if
related app has battery usage. This cl breaks this rule so we
could open "Battery usage" without battery data.

Bug: 38497822
Test: RunSettingsRoboTests
Change-Id: Ic53c33b7dcbac82de58f31cf96e0bd8fa54e53ea

7 years agoMerge "Add wakeup alarm anomaly detector"
TreeHugger Robot [Tue, 23 May 2017 18:08:07 +0000 (18:08 +0000)]
Merge "Add wakeup alarm anomaly detector"

7 years agoMerge "Fix storage summary background colors." into oc-dev am: 8b8f27cd06
Daniel Nishi [Tue, 23 May 2017 17:51:17 +0000 (17:51 +0000)]
Merge "Fix storage summary background colors." into oc-dev am: 8b8f27cd06
am: 4525f9387a

Change-Id: I8a30afbf999318fd7dabaf7d15ce38f99168353b

7 years agoMerge "Fix storage summary background colors." into oc-dev
Daniel Nishi [Tue, 23 May 2017 17:41:21 +0000 (17:41 +0000)]
Merge "Fix storage summary background colors." into oc-dev
am: 8b8f27cd06

Change-Id: I821d4a44c69bae33e3ae9854f23ed87e51139951

7 years agoMerge "Fix storage summary background colors." into oc-dev
Daniel Nishi [Tue, 23 May 2017 17:35:14 +0000 (17:35 +0000)]
Merge "Fix storage summary background colors." into oc-dev

7 years agoAdd wakeup alarm anomaly detector
jackqdyulei [Thu, 18 May 2017 00:00:47 +0000 (17:00 -0700)]
Add wakeup alarm anomaly detector

Wakeup alarm count frequent is calculated by a / b, where
1. a: the total wakeup alarm count since the last full charge
2. b: total time running since last full charge
(include sleeping time)

This cl also has the following changes:
1. Move bunch of methods to BatteryUtils
2. Create type WAKEUP_ALARM
3. Add and update tests

Upcoming cl will make sure we get the threshold from
AnomalyDetectionPolicy

Bug: 36921529
Test: RunSettingsRoboTests
Change-Id: I4f7b85606df68b6057f6c7d3f3be7f9a9a747f1d

7 years agoMerge "Developer setting to enable notification channel warnings" into oc-dev am...
Geoffrey Pitsch [Tue, 23 May 2017 15:26:39 +0000 (15:26 +0000)]
Merge "Developer setting to enable notification channel warnings" into oc-dev am: 77bb0aaf96
am: 984dad4ac6

Change-Id: Ica82b112388bd3f3f0a1e2e0281b8c1036d64934

7 years agoMerge "Developer setting to enable notification channel warnings" into oc-dev
Geoffrey Pitsch [Tue, 23 May 2017 15:24:09 +0000 (15:24 +0000)]
Merge "Developer setting to enable notification channel warnings" into oc-dev
am: 77bb0aaf96

Change-Id: I571de55e0b3d090ec2442e2019b2a460b0185283

7 years agoMerge "Developer setting to enable notification channel warnings" into oc-dev
TreeHugger Robot [Tue, 23 May 2017 15:18:06 +0000 (15:18 +0000)]
Merge "Developer setting to enable notification channel warnings" into oc-dev

7 years agoShow app battery usage in correct user
Tony Mak [Tue, 23 May 2017 09:29:06 +0000 (10:29 +0100)]
Show app battery usage in correct user

Test: m -j RunSettingsRoboTests

Fix: 38447829

Change-Id: I6c0f74b79468ee670f642edb0a50400c030d1925

7 years agoMerge "Use BatteryStatsLoader in InstalledAppDetails" into oc-dev am: 37f6b7f751
Lei Yu [Tue, 23 May 2017 06:23:31 +0000 (06:23 +0000)]
Merge "Use BatteryStatsLoader in InstalledAppDetails" into oc-dev am: 37f6b7f751
am: 996adfeb29

Change-Id: I11d0c39a68428637ce12aaffaa2a4f1e49bb716e

7 years agoMerge "Use BatteryStatsLoader in InstalledAppDetails" into oc-dev
Lei Yu [Tue, 23 May 2017 06:21:32 +0000 (06:21 +0000)]
Merge "Use BatteryStatsLoader in InstalledAppDetails" into oc-dev
am: 37f6b7f751

Change-Id: I5b5edc8b88a16c83a77ca584d21279892ebb08bf

7 years agoMerge "Use BatteryStatsLoader in InstalledAppDetails" into oc-dev
Lei Yu [Tue, 23 May 2017 06:16:43 +0000 (06:16 +0000)]
Merge "Use BatteryStatsLoader in InstalledAppDetails" into oc-dev

7 years agoMerge "Use enhanced estimate battery info when available"
Salvador Martinez [Tue, 23 May 2017 03:28:29 +0000 (03:28 +0000)]
Merge "Use enhanced estimate battery info when available"

7 years agoMerge "Log different type of values into different constants"
TreeHugger Robot [Tue, 23 May 2017 03:01:28 +0000 (03:01 +0000)]
Merge "Log different type of values into different constants"

7 years agoMerge "Revert "Add animation for battery asyncLoader."" into oc-dev am: 161571617b
Lei Yu [Tue, 23 May 2017 02:07:17 +0000 (02:07 +0000)]
Merge "Revert "Add animation for battery asyncLoader."" into oc-dev am: 161571617b
am: 603fba8afe  -s ours

Change-Id: I371a760fe5e801bdbbc6c658c8611d922f41b32a

7 years agoMerge "Show shadow when entity header starts scrolling."
TreeHugger Robot [Tue, 23 May 2017 02:01:41 +0000 (02:01 +0000)]
Merge "Show shadow when entity header starts scrolling."

7 years agoMerge "Revert "Add animation for battery asyncLoader."" into oc-dev
Lei Yu [Tue, 23 May 2017 01:56:48 +0000 (01:56 +0000)]
Merge "Revert "Add animation for battery asyncLoader."" into oc-dev
am: 161571617b

Change-Id: I7022cedf1252c5b8b02c6336611c9158ed98dc6c

7 years agoMerge "Revert "Add animation for battery asyncLoader."" into oc-dev
TreeHugger Robot [Tue, 23 May 2017 01:49:22 +0000 (01:49 +0000)]
Merge "Revert "Add animation for battery asyncLoader."" into oc-dev

7 years agoMerge changes Ief9e9690,I1cc1bc2d
TreeHugger Robot [Tue, 23 May 2017 01:36:19 +0000 (01:36 +0000)]
Merge changes Ief9e9690,I1cc1bc2d

* changes:
  Split BluetoothSettings into two pages
  Dupe BluetoothSettings and DeviceListPreferenceFragment

7 years agoUse enhanced estimate battery info when available
Salvador Martinez [Fri, 19 May 2017 18:12:26 +0000 (11:12 -0700)]
Use enhanced estimate battery info when available

This CL updates the battery page to get the updated strings and
other relevant battery info from directly from SettingsLib by
providing it an overrided drain time instead of manually changing
the value in the returned info. This will provide the added benefit
of using the new strings when appropriate that tell the user that
the estimate provided is based on their usage.

Test: robotests
Bug: 38399659
Change-Id: I0db572c2ea78910756314b6bf066d37e9f90a15c

7 years agoLog different type of values into different constants
Fan Zhang [Fri, 19 May 2017 00:49:25 +0000 (17:49 -0700)]
Log different type of values into different constants

Bug: 38258793
Test: make RunSettingsRoboTests
Change-Id: I3ed170613709be04ffb2c561e132094d64619dd4

7 years agoUse BatteryStatsLoader in InstalledAppDetails
jackqdyulei [Mon, 22 May 2017 21:23:37 +0000 (14:23 -0700)]
Use BatteryStatsLoader in InstalledAppDetails

InstalledAppDetails uses AsyncTask to update foreground mBatteryStatsHelper
in background thread, which is dangerous. This cl make
InstalledAppDetails use BatteryStatsLoader to update batteryStatsHelper
and only assign it once in UI thread.

Bug: 38497555
Test: RunSettingsRoboTests
Change-Id: I3078b60a2dae36995ae5f925b4d49e36e79bddfd

7 years agoShow shadow when entity header starts scrolling.
Fan Zhang [Mon, 22 May 2017 16:50:38 +0000 (09:50 -0700)]
Show shadow when entity header starts scrolling.

- Add a controller to manage add/remove onScrollChangedListener to
  recyclerviews.
- When recyclerview on each screen is scrolled to top, set actionbar
  elevation to 0, otherwise set it to non-zero.
- When screen is moved to background, detach the listener.
- Use the controller in entity header.

Change-Id: Iecf194d885098c98c392810f62893ae9189f3936
Fix: 37670670
Test: make RunSettingsRoboTests

7 years agoSplit BluetoothSettings into two pages
jackqdyulei [Wed, 10 May 2017 21:57:16 +0000 (14:57 -0700)]
Split BluetoothSettings into two pages

This cl splits the BluetoothSettings into paired device page and
pairing page, including small changes about:
1. Refactor the pages so they could get as much as static preference
from xml file rather than dynamically add/remove them everytime.
2. Remove creating method in BluetoothDeviceNamePreferenceController
and add it in xml file
3. Create BluetoothPairingDetail page, basically move the logic from
BluetoothSettings.
4. Make pairing preference clickable and jump to BluetoothPairingDetail
5. Add and update bunch of tests

Bug: 35877041
Test: RunSettingsRoboTests
Change-Id: Ief9e9690c612f7b46c58e866e5cecc511af642c8

7 years agoRevert "Add animation for battery asyncLoader."
Lei Yu [Fri, 19 May 2017 17:47:44 +0000 (17:47 +0000)]
Revert "Add animation for battery asyncLoader."

This reverts commit a3c528f64db7aa96c258bdc2f6dad0a8d6897461.

Test: Build
Change-Id: Ib50221873e39dee40c5cf8e4b41dcf7aa13f6134
Merged-In: Ib50221873e39dee40c5cf8e4b41dcf7aa13f6134

7 years agoMerge "Revert "Add animation for battery asyncLoader.""
Lei Yu [Mon, 22 May 2017 23:30:01 +0000 (23:30 +0000)]
Merge "Revert "Add animation for battery asyncLoader.""

7 years agoMerge "Remove lifecycle interfaces from settings."
TreeHugger Robot [Mon, 22 May 2017 23:13:13 +0000 (23:13 +0000)]
Merge "Remove lifecycle interfaces from settings."

7 years agoMerge "Queue events if enrollment sidecar listener is null" into oc-dev am: 32ad1c0db4
Kevin Chyn [Mon, 22 May 2017 23:09:35 +0000 (23:09 +0000)]
Merge "Queue events if enrollment sidecar listener is null" into oc-dev am: 32ad1c0db4
am: 35fb3302d7

Change-Id: I94cfe913b3e66ce27a0ee7ea439d3ed6a77942f3

7 years agoMerge "Queue events if enrollment sidecar listener is null" into oc-dev
Kevin Chyn [Mon, 22 May 2017 22:52:33 +0000 (22:52 +0000)]
Merge "Queue events if enrollment sidecar listener is null" into oc-dev
am: 32ad1c0db4

Change-Id: I3fecd41dac6e4fb3b576a18bf46f1d9a25c1b9ca

7 years agoMerge "Queue events if enrollment sidecar listener is null" into oc-dev
TreeHugger Robot [Mon, 22 May 2017 22:40:41 +0000 (22:40 +0000)]
Merge "Queue events if enrollment sidecar listener is null" into oc-dev

7 years agoMerge "Use label instead of raw value for theme preference summary"
TreeHugger Robot [Mon, 22 May 2017 22:37:39 +0000 (22:37 +0000)]
Merge "Use label instead of raw value for theme preference summary"

7 years agoRemove lifecycle interfaces from settings.
Fan Zhang [Mon, 22 May 2017 21:47:38 +0000 (14:47 -0700)]
Remove lifecycle interfaces from settings.

They are already moved to settingslib.

Test: builds

Change-Id: I581bdaff492bdb1e75c66fb69c803eb222f68b8b

7 years agoRevert "Add animation for battery asyncLoader."
Lei Yu [Fri, 19 May 2017 17:47:44 +0000 (17:47 +0000)]
Revert "Add animation for battery asyncLoader."

This reverts commit a3c528f64db7aa96c258bdc2f6dad0a8d6897461.

Test: Build
Change-Id: Ib50221873e39dee40c5cf8e4b41dcf7aa13f6134

7 years agoUse label instead of raw value for theme preference summary
Fan Zhang [Mon, 22 May 2017 20:30:11 +0000 (13:30 -0700)]
Use label instead of raw value for theme preference summary

Change-Id: I4dd1c156c8e68dd5567093c56d5e6846357fc2d6
Fix: 38470685
Test: make RunSettingsRoboTests

7 years agoQueue events if enrollment sidecar listener is null
Kevin Chyn [Sat, 20 May 2017 01:01:18 +0000 (18:01 -0700)]
Queue events if enrollment sidecar listener is null

Fixes: 38102355

Test: manual
Change-Id: I98bd347ee98117f7489376abd94d276d20e7b762

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 22 May 2017 18:57:09 +0000 (18:57 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoMerge "Show aditional WiFi calling message."
TreeHugger Robot [Mon, 22 May 2017 16:11:11 +0000 (16:11 +0000)]
Merge "Show aditional WiFi calling message."

7 years agoShow aditional WiFi calling message.
Meng Wang [Tue, 16 May 2017 18:50:20 +0000 (11:50 -0700)]
Show aditional WiFi calling message.

Bug: 37624313
Test: manual - locally apply this setting and verify that the
               additional text is shown.
Change-Id: I8a15a9aeb71a0daab1ae4533f2c3b7d05c57bc5f

7 years agoDeveloper setting to enable notification channel warnings
Geoffrey Pitsch [Thu, 11 May 2017 16:58:23 +0000 (12:58 -0400)]
Developer setting to enable notification channel warnings

Defaults to enabled for debuggable builds

Fixes: 37945054
Fixes: 38380608
Test: manual
Change-Id: I5d2101feffa7cf4433264eefc82b1b80f294d9f0

7 years agoMerge "Settings: Convert notifications to use NotificationChannel (2/2)" into oc...
Hemant Gupta [Sat, 20 May 2017 01:39:52 +0000 (01:39 +0000)]
Merge "Settings: Convert notifications to use NotificationChannel (2/2)" into oc-dev am: 860b608e41
am: 7eb5647656

Change-Id: I8d9c6e314a1b02cafc9523fae31a06dabfad4465

7 years agoMerge "Settings: Convert notifications to use NotificationChannel (2/2)" into oc-dev
Hemant Gupta [Sat, 20 May 2017 01:37:14 +0000 (01:37 +0000)]
Merge "Settings: Convert notifications to use NotificationChannel (2/2)" into oc-dev
am: 860b608e41

Change-Id: If246a2f7d340b1d21c805322fa10f0c2fed8115c

7 years agoMerge "Settings: Convert notifications to use NotificationChannel (2/2)" into oc-dev
TreeHugger Robot [Sat, 20 May 2017 01:33:36 +0000 (01:33 +0000)]
Merge "Settings: Convert notifications to use NotificationChannel (2/2)" into oc-dev

7 years agoMerge "Fix settings crash due to enrolling error" into oc-dev am: 5ccc2fe242
Kevin Chyn [Sat, 20 May 2017 00:01:59 +0000 (00:01 +0000)]
Merge "Fix settings crash due to enrolling error" into oc-dev am: 5ccc2fe242
am: 2ca8635a5e

Change-Id: I167959f2ef69bcda7fb604e3f3e85512799ce691

7 years agoMerge "Fix settings crash due to enrolling error" into oc-dev
Kevin Chyn [Sat, 20 May 2017 00:00:01 +0000 (00:00 +0000)]
Merge "Fix settings crash due to enrolling error" into oc-dev
am: 5ccc2fe242

Change-Id: I08fb0fd4826135f4b469e6516d2cea25cba0a679

7 years agoMerge "Fix settings crash due to enrolling error" into oc-dev
TreeHugger Robot [Fri, 19 May 2017 23:56:11 +0000 (23:56 +0000)]
Merge "Fix settings crash due to enrolling error" into oc-dev

7 years agoSettings: Convert notifications to use NotificationChannel (2/2)
Hemant Gupta [Tue, 16 May 2017 09:57:33 +0000 (15:27 +0530)]
Settings: Convert notifications to use NotificationChannel (2/2)

Test Setup:
===========
HW DUT: Pixel O
Remote: MecApp (PBAP Client, MAP Client, SAP Client)

Steps:
=====
1. Enable BT on DUT and bond with Remote.
2. Connect from MecApp for PBAP, MAP, SAP and observe if
   connection goes through fine.

Reproducibility:
===============
5/5

Observation:
============
MAP, PBAP and SAP cannot be connected.

Root cause:
In Android O, notifications are hidden by default.
This must be changed to use notification channels so that the
priority of the notifications can be updated.

Test: PBAP/MAP/SAP connection works fine with MecApp.

Bug: 38331825
Change-Id: I51de0ea303037bf88773352d99f092673acda2e3
(cherry picked from commit bd9f532013f0397879101f68f21ac8841fec344b)

7 years agoFix settings crash due to enrolling error
Kevin Chyn [Fri, 19 May 2017 19:22:44 +0000 (12:22 -0700)]
Fix settings crash due to enrolling error

Test: There's a condition where FP enrollment fails and a fragment
transaction/commit occurs after onSaveInstanceState. We should be
using commitAllowingStateLoss() instead of commit()

I'm not able to repro this issue but from looking at the stack
trace this should fix the problem.

Fixes: 38432354

Change-Id: I56b9c8d2efc45e9d77f29b897280f5378c3a84a0

7 years agoMerge "Add aggregated partial wakelock time per uid" into oc-dev am: 11e7781b32
Adam Bookatz [Fri, 19 May 2017 18:40:09 +0000 (18:40 +0000)]
Merge "Add aggregated partial wakelock time per uid" into oc-dev am: 11e7781b32
am: 069e8ab3cd

Change-Id: Iebcee8a80d79311f5c967b9db47928653822861f

7 years agoMerge "Add aggregated partial wakelock time per uid" into oc-dev
Adam Bookatz [Fri, 19 May 2017 18:32:31 +0000 (18:32 +0000)]
Merge "Add aggregated partial wakelock time per uid" into oc-dev
am: 11e7781b32

Change-Id: I17641683c8d6ec278070ebbafaefce35008248f0

7 years agoMerge "Align password requirement according to theme"
Maurice Lam [Fri, 19 May 2017 18:26:47 +0000 (18:26 +0000)]
Merge "Align password requirement according to theme"

7 years agoMerge "Add aggregated partial wakelock time per uid" into oc-dev
Adam Bookatz [Fri, 19 May 2017 18:24:31 +0000 (18:24 +0000)]
Merge "Add aggregated partial wakelock time per uid" into oc-dev

7 years agoMerge "Raneme the wifi detail "Sign into network" button to "Sign in"." into oc-dev...
Lorenzo Colitti [Fri, 19 May 2017 03:14:38 +0000 (03:14 +0000)]
Merge "Raneme the wifi detail "Sign into network" button to "Sign in"." into oc-dev am: 7d045387e0
am: c2bd388bb9

Change-Id: I685c53a605572aa6cfc1e6082d7427a1febc4b40

7 years agoMerge "Raneme the wifi detail "Sign into network" button to "Sign in"." into oc-dev
Lorenzo Colitti [Fri, 19 May 2017 03:10:14 +0000 (03:10 +0000)]
Merge "Raneme the wifi detail "Sign into network" button to "Sign in"." into oc-dev
am: 7d045387e0

Change-Id: Ie329358b56b34a94bbf12d32b9829247e6a6bf3d

7 years agoMerge "Raneme the wifi detail "Sign into network" button to "Sign in"." into oc-dev
TreeHugger Robot [Fri, 19 May 2017 03:01:27 +0000 (03:01 +0000)]
Merge "Raneme the wifi detail "Sign into network" button to "Sign in"." into oc-dev

7 years agoAlign password requirement according to theme
Maurice Lam [Tue, 16 May 2017 04:12:49 +0000 (21:12 -0700)]
Align password requirement according to theme

Test: Manual
Bug: 38180862
Change-Id: I60f58b35c057352dd352ad847f69b1eb999f2f08

7 years agoMerge changes Iaf92730e,I54eb30f2,Ib80827ae
TreeHugger Robot [Fri, 19 May 2017 01:24:46 +0000 (01:24 +0000)]
Merge changes Iaf92730e,I54eb30f2,Ib80827ae

* changes:
  Use entity header on AccountDetailDashboardFragment
  Move entity header controller out of application package.
  Clean up settings_entity_header layout.

7 years agoMerge "Fix bug where app list says "No app" in multi-window mode"
TreeHugger Robot [Fri, 19 May 2017 01:04:04 +0000 (01:04 +0000)]
Merge "Fix bug where app list says "No app" in multi-window mode"

7 years agoMerge "Remove Language and Input duplicates" into oc-dev am: 6f4a6a737d
Matthew Fritze [Fri, 19 May 2017 00:56:39 +0000 (00:56 +0000)]
Merge "Remove Language and Input duplicates" into oc-dev am: 6f4a6a737d
am: 5569e3a33f  -s ours

Change-Id: I09c9b357d77128623b179234bae28a2dba6abcb1

7 years agoMerge "Remove Language and Input duplicates" into oc-dev
Matthew Fritze [Fri, 19 May 2017 00:49:41 +0000 (00:49 +0000)]
Merge "Remove Language and Input duplicates" into oc-dev
am: 6f4a6a737d

Change-Id: Id6639a9dc08c1a27cf1bc4ed7969cc54a4bd2df2

7 years agoMerge "Remove Language and Input duplicates" into oc-dev
TreeHugger Robot [Fri, 19 May 2017 00:41:02 +0000 (00:41 +0000)]
Merge "Remove Language and Input duplicates" into oc-dev

7 years agoUse entity header on AccountDetailDashboardFragment
Fan Zhang [Thu, 18 May 2017 22:11:01 +0000 (15:11 -0700)]
Use entity header on AccountDetailDashboardFragment

Bug: 37669238
Test: make RunSettingsRoboTests
Change-Id: Iaf92730e8c6b5c44cb8eca4525fc931487ce9630

7 years agoMove entity header controller out of application package.
Fan Zhang [Thu, 18 May 2017 18:28:21 +0000 (11:28 -0700)]
Move entity header controller out of application package.

Bug: 37669238
Test: rerun robotests
Change-Id: I54eb30f28fa0a88a6f0b97b53f9f1408320b5ce0

7 years agoClean up settings_entity_header layout.
Fan Zhang [Thu, 18 May 2017 00:22:09 +0000 (17:22 -0700)]
Clean up settings_entity_header layout.

update layout view IDs, and controller variable names to be more
generic.

Fix: 36734470
Bug: 37669238
Test: make RunSettingsRoboTests
Change-Id: Ib80827ae3eae6d01a600068b4a8a44b239c32511

7 years agoMerge "Remove Language and Input duplicates"
TreeHugger Robot [Thu, 18 May 2017 22:37:24 +0000 (22:37 +0000)]
Merge "Remove Language and Input duplicates"

7 years agoMerge "Make Storage settings title be "Storage"." into oc-dev am: c7299663e7
Daniel Nishi [Thu, 18 May 2017 22:11:55 +0000 (22:11 +0000)]
Merge "Make Storage settings title be "Storage"." into oc-dev am: c7299663e7
am: af1a66202f

Change-Id: I71309f8db92a72df913aa30e4664cabb69b2fcbb

7 years agoMerge "Make Storage settings title be "Storage"." into oc-dev
Daniel Nishi [Thu, 18 May 2017 22:07:24 +0000 (22:07 +0000)]
Merge "Make Storage settings title be "Storage"." into oc-dev
am: c7299663e7

Change-Id: I2873188fb073261695d79719c99617a355f17acc

7 years agoMerge "Make Storage settings title be "Storage"." into oc-dev
Daniel Nishi [Thu, 18 May 2017 21:57:21 +0000 (21:57 +0000)]
Merge "Make Storage settings title be "Storage"." into oc-dev

7 years agoFix bug where app list says "No app" in multi-window mode
Fan Zhang [Thu, 18 May 2017 21:09:19 +0000 (14:09 -0700)]
Fix bug where app list says "No app" in multi-window mode

Move updateUi logic from onPause/onResume to onStop/onStart.

Change-Id: Iebe38d201d531058472cd033a0408239d36d32e4
Fix: 36305836
Test: instrumentation test

7 years agoDupe BluetoothSettings and DeviceListPreferenceFragment
jackqdyulei [Wed, 17 May 2017 03:17:35 +0000 (20:17 -0700)]
Dupe BluetoothSettings and DeviceListPreferenceFragment

Create the obsolete version of the belowing fragments, so we could
flip between old page and new page.

BluetoothSettingsObsolete and DeviceListPreferenceObsoleteFragment
contains all the old logic but:
1. Logic about BluetoothPairingPreferenceController(ag/2239482),
since this preference shouldn't be checked in without the flag :(

This cl also adds logic in MasterSwitchPreferenceController to flip
these two pages.

Following cl will refactor these fragment to make it compatible
to new framework.

Bug: 35877041
Test: RunSettingsRoboTests
Change-Id: I1cc1bc2d49d8a3e11c3127e56f6409fbc84028d8

7 years agoRemove Language and Input duplicates
Matthew Fritze [Tue, 11 Apr 2017 23:35:48 +0000 (16:35 -0700)]
Remove Language and Input duplicates

Change the keys in the Language and Input screen for the
gesture and tts-output settings so they can be disabled
in search. Then change the preference controllers to take
a key as input to avoid crashes on the other screens with
these settings.

Merge for: ag/2098173/

Test: make RunSettingsRoboTests
Bug: 33701673
Change-Id: I8bc0776131fcac5a6edf7e8271bc53252c2fc719

7 years agoMerge "Update FooterPreference's classpath in preference files."
Juan Lang [Thu, 18 May 2017 20:52:53 +0000 (20:52 +0000)]
Merge "Update FooterPreference's classpath in preference files."

7 years agoMerge "Log preference change as count (in addition to action)" into oc-dev am: 13bcf501dd
Fan Zhang [Thu, 18 May 2017 20:44:33 +0000 (20:44 +0000)]
Merge "Log preference change as count (in addition to action)" into oc-dev am: 13bcf501dd
am: a3202a9a36

Change-Id: Ibf483af95630ca15d886e8ef83b96dbe1aefd55f

7 years agoMerge "Log preference change as count (in addition to action)" into oc-dev
Fan Zhang [Thu, 18 May 2017 20:34:47 +0000 (20:34 +0000)]
Merge "Log preference change as count (in addition to action)" into oc-dev
am: 13bcf501dd

Change-Id: I9a7e0fa439344a44ddde299795d83d00dd83306d

7 years agoMerge "Log preference change as count (in addition to action)" into oc-dev
TreeHugger Robot [Thu, 18 May 2017 20:29:10 +0000 (20:29 +0000)]
Merge "Log preference change as count (in addition to action)" into oc-dev

7 years agoMerge "Skip cursor loader if not needed"
TreeHugger Robot [Thu, 18 May 2017 20:28:50 +0000 (20:28 +0000)]
Merge "Skip cursor loader if not needed"

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev am: 6253e0710b -s ours
Bill Yi [Thu, 18 May 2017 20:18:16 +0000 (20:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am: 6253e0710b  -s ours
am: d172f720d9  -s ours

Change-Id: I6b474c120c59dffeb8b16e565eb47b4c1158fdf2

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Thu, 18 May 2017 20:13:46 +0000 (20:13 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 6253e0710b  -s ours

Change-Id: I2ba0f963274890e9c2c8ce5c9347b74ab3a9cce2

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Thu, 18 May 2017 20:05:19 +0000 (20:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

7 years agoMerge "Show wifi and bluetooth item in battery settings" into oc-dev am: 21d2403c67
jackqdyulei [Thu, 18 May 2017 19:35:56 +0000 (19:35 +0000)]
Merge "Show wifi and bluetooth item in battery settings" into oc-dev am: 21d2403c67
am: 972763ee50

Change-Id: Ic54ae913ec5f9418f81ad15437fbaca8b96fad15

7 years agoMerge "Add screen usage string for battery settings" into oc-dev am: 28cf04d994
jackqdyulei [Thu, 18 May 2017 19:35:27 +0000 (19:35 +0000)]
Merge "Add screen usage string for battery settings" into oc-dev am: 28cf04d994
am: 3ab2ca5cc9

Change-Id: Iaca27db0a637de88c09a45d88f35db258783fa16

7 years agoMerge "Show wifi and bluetooth item in battery settings" into oc-dev
jackqdyulei [Thu, 18 May 2017 19:26:20 +0000 (19:26 +0000)]
Merge "Show wifi and bluetooth item in battery settings" into oc-dev
am: 21d2403c67

Change-Id: I7ee542befa8e5287dbd73be242ec812a1a5d0c19

7 years agoMerge "Add screen usage string for battery settings" into oc-dev
jackqdyulei [Thu, 18 May 2017 19:25:57 +0000 (19:25 +0000)]
Merge "Add screen usage string for battery settings" into oc-dev
am: 28cf04d994

Change-Id: Ie60e5de8164bfc16fa29ca16b63caa08812db52f

7 years agoMerge "Show wifi and bluetooth item in battery settings" into oc-dev
TreeHugger Robot [Thu, 18 May 2017 19:13:33 +0000 (19:13 +0000)]
Merge "Show wifi and bluetooth item in battery settings" into oc-dev

7 years agoMerge "Add screen usage string for battery settings" into oc-dev
TreeHugger Robot [Thu, 18 May 2017 19:10:15 +0000 (19:10 +0000)]
Merge "Add screen usage string for battery settings" into oc-dev

7 years agoMerge "Rename app_details to entity_header"
TreeHugger Robot [Thu, 18 May 2017 19:04:09 +0000 (19:04 +0000)]
Merge "Rename app_details to entity_header"

7 years agoMerge "Fix issue for new account not being shown in work profile."
TreeHugger Robot [Thu, 18 May 2017 18:55:24 +0000 (18:55 +0000)]
Merge "Fix issue for new account not being shown in work profile."

7 years agoMerge "Dynamic summary text for network/connected device screen."
TreeHugger Robot [Thu, 18 May 2017 18:54:45 +0000 (18:54 +0000)]
Merge "Dynamic summary text for network/connected device screen."

7 years agoUpdate FooterPreference's classpath in preference files.
Juan Lang [Thu, 18 May 2017 18:49:37 +0000 (11:49 -0700)]
Update FooterPreference's classpath in preference files.

FooterPreference was moved to SettingsLib in ag/2237939, which should
have updated these files as well.

Test: Manually test the change fixes the crash.
Bug: 38371580
Change-Id: I66b6fe555c164f879a2545ab455c822c0de4536d
Fixes: 38371580

7 years agoFix storage summary background colors.
Daniel Nishi [Tue, 9 May 2017 17:56:58 +0000 (10:56 -0700)]
Fix storage summary background colors.

This changes the donut background color to a lighter blue and changes
the overall background to be a grey. Both of these colors match the
Battery implementation.

Bug: 35245772
Test: Manual
Change-Id: I8e12afe4434a0e2428384fc496cab5c05dc998ee

7 years agoSkip cursor loader if not needed
Salvador Martinez [Thu, 18 May 2017 18:10:18 +0000 (11:10 -0700)]
Skip cursor loader if not needed

The cursor loader was being started when the battery prediction
feature was not enabled. This could lead to null pointers because
it was not possible to provide it with a valid URI which would
make the CursorLoader unhappy. This CL makes it so we just skip
the CursorLoader initialization entirely when we know the feature
is disabled so we don't have this issue. It also includes a test
to make sure this does not regress.

Test: Robotests
Bug: 38371686
Change-Id: I4f6f6278bbc16668bca0b51fcc7e30f27a9e216f

7 years agoMake Storage settings title be "Storage".
Daniel Nishi [Mon, 15 May 2017 18:30:16 +0000 (11:30 -0700)]
Make Storage settings title be "Storage".

This more closely reflects the idea that the top level setting title
should match the actual screen title.

Change-Id: Ie7ab1756d799c182cad74041995768037bba710f
Fixes: 37923462
Test: Manual

7 years agoRemove Language and Input duplicates
Matthew Fritze [Tue, 11 Apr 2017 23:35:48 +0000 (16:35 -0700)]
Remove Language and Input duplicates

Change the keys in the Language and Input screen for the
gesture and tts-output settings so they can be disabled
in search. Then change the preference controllers to take
a key as input to avoid crashes on the other screens with
these settings.

Test: make RunSettingsRoboTests
Bug: 33701673
Change-Id: Ifeb2a2d34a3efded3f0a9ba02ac76fd6f8ffd087
Merged-In: I8bc0776131fcac5a6edf7e8271bc53252c2fc719

7 years agoMerge "Update no search results icon and move image to top of page" into oc-dev am...
Matthew Fritze [Thu, 18 May 2017 17:23:01 +0000 (17:23 +0000)]
Merge "Update no search results icon and move image to top of page" into oc-dev am: fc4db3bd80
am: 145c364479

Change-Id: I910bb7eeffe938f708c5d3df8a62790f92b83de1

7 years agoMerge "Update no search results icon and move image to top of page" into oc-dev
Matthew Fritze [Thu, 18 May 2017 17:18:30 +0000 (17:18 +0000)]
Merge "Update no search results icon and move image to top of page" into oc-dev
am: fc4db3bd80

Change-Id: I6f387cf748a9e916e4ffd3312016b0a82e126ee2

7 years agoMerge changes I573e4fb9,I8e7baadc into oc-dev am: 67e38774ce
Lei Yu [Thu, 18 May 2017 17:12:34 +0000 (17:12 +0000)]
Merge changes I573e4fb9,I8e7baadc into oc-dev am: 67e38774ce
am: d85bdebe0e

Change-Id: I865f41eae196aee32edd60169dacbc5dca772439

7 years agoMerge "Update no search results icon and move image to top of page" into oc-dev
TreeHugger Robot [Thu, 18 May 2017 17:11:28 +0000 (17:11 +0000)]
Merge "Update no search results icon and move image to top of page" into oc-dev

7 years agoMerge changes I573e4fb9,I8e7baadc into oc-dev
Lei Yu [Thu, 18 May 2017 17:08:33 +0000 (17:08 +0000)]
Merge changes I573e4fb9,I8e7baadc into oc-dev
am: 67e38774ce

Change-Id: Id3a830eb46004a3febdb9c4bf96a39b8c4afaedd

7 years agoMerge changes I573e4fb9,I8e7baadc into oc-dev
Lei Yu [Thu, 18 May 2017 17:00:26 +0000 (17:00 +0000)]
Merge changes I573e4fb9,I8e7baadc into oc-dev

* changes:
  Drop the misc and not smear it.
  Smear screen power usage based on activity time.

7 years agoDynamic summary text for network/connected device screen.
Fan Zhang [Tue, 16 May 2017 23:58:43 +0000 (16:58 -0700)]
Dynamic summary text for network/connected device screen.

Change-Id: I3254c63b7c241e2de9251b3c2d2a0106fb049ece
Fix: 36768218
Test: make RunSettingsRoboTests