Commit Graph

36511 Commits

Author SHA1 Message Date
Kevin Chyn
2ca8635a5e Merge "Fix settings crash due to enrolling error" into oc-dev
am: 5ccc2fe242

Change-Id: I08fb0fd4826135f4b469e6516d2cea25cba0a679
2017-05-20 00:00:01 +00:00
TreeHugger Robot
5ccc2fe242 Merge "Fix settings crash due to enrolling error" into oc-dev 2017-05-19 23:56:12 +00:00
Hemant Gupta
7bec5bf895 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)
2017-05-19 23:33:29 +00:00
Kevin Chyn
468a72aed3 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
2017-05-19 13:04:08 -07:00
Adam Bookatz
17706e5777 Merge "Add aggregated partial wakelock time per uid" into oc-dev am: 11e7781b32
am: 069e8ab3cd

Change-Id: Iebcee8a80d79311f5c967b9db47928653822861f
2017-05-19 18:40:09 +00:00
Adam Bookatz
069e8ab3cd Merge "Add aggregated partial wakelock time per uid" into oc-dev
am: 11e7781b32

Change-Id: I17641683c8d6ec278070ebbafaefce35008248f0
2017-05-19 18:32:31 +00:00
Maurice Lam
f7db59d03f Merge "Align password requirement according to theme" 2017-05-19 18:26:49 +00:00
Adam Bookatz
11e7781b32 Merge "Add aggregated partial wakelock time per uid" into oc-dev 2017-05-19 18:24:45 +00:00
Lorenzo Colitti
991a273669 Merge "Raneme the wifi detail "Sign into network" button to "Sign in"." into oc-dev am: 7d045387e0
am: c2bd388bb9

Change-Id: I685c53a605572aa6cfc1e6082d7427a1febc4b40
2017-05-19 03:14:38 +00:00
Lorenzo Colitti
c2bd388bb9 Merge "Raneme the wifi detail "Sign into network" button to "Sign in"." into oc-dev
am: 7d045387e0

Change-Id: Ie329358b56b34a94bbf12d32b9829247e6a6bf3d
2017-05-19 03:10:14 +00:00
TreeHugger Robot
7d045387e0 Merge "Raneme the wifi detail "Sign into network" button to "Sign in"." into oc-dev 2017-05-19 03:01:29 +00:00
Maurice Lam
27b762c963 Align password requirement according to theme
Test: Manual
Bug: 38180862
Change-Id: I60f58b35c057352dd352ad847f69b1eb999f2f08
2017-05-18 18:48:34 -07:00
TreeHugger Robot
7aac5c5791 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.
2017-05-19 01:24:50 +00:00
TreeHugger Robot
5d20c1ab87 Merge "Fix bug where app list says "No app" in multi-window mode" 2017-05-19 01:04:06 +00:00
Matthew Fritze
87cb3c92bb Merge "Remove Language and Input duplicates" into oc-dev am: 6f4a6a737d
am: 5569e3a33f  -s ours

Change-Id: I09c9b357d77128623b179234bae28a2dba6abcb1
2017-05-19 00:56:39 +00:00
Matthew Fritze
5569e3a33f Merge "Remove Language and Input duplicates" into oc-dev
am: 6f4a6a737d

Change-Id: Id6639a9dc08c1a27cf1bc4ed7969cc54a4bd2df2
2017-05-19 00:49:41 +00:00
TreeHugger Robot
6f4a6a737d Merge "Remove Language and Input duplicates" into oc-dev 2017-05-19 00:41:04 +00:00
Fan Zhang
98289a887b Use entity header on AccountDetailDashboardFragment
Bug: 37669238
Test: make RunSettingsRoboTests
Change-Id: Iaf92730e8c6b5c44cb8eca4525fc931487ce9630
2017-05-18 16:36:32 -07:00
Fan Zhang
d7414259d0 Move entity header controller out of application package.
Bug: 37669238
Test: rerun robotests
Change-Id: I54eb30f28fa0a88a6f0b97b53f9f1408320b5ce0
2017-05-18 16:36:32 -07:00
Fan Zhang
f5bd885a1d 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
2017-05-18 16:35:27 -07:00
TreeHugger Robot
dd6483461f Merge "Remove Language and Input duplicates" 2017-05-18 22:37:27 +00:00
Daniel Nishi
838ec5d15b Merge "Make Storage settings title be "Storage"." into oc-dev am: c7299663e7
am: af1a66202f

Change-Id: I71309f8db92a72df913aa30e4664cabb69b2fcbb
2017-05-18 22:11:55 +00:00
Daniel Nishi
af1a66202f Merge "Make Storage settings title be "Storage"." into oc-dev
am: c7299663e7

Change-Id: I2873188fb073261695d79719c99617a355f17acc
2017-05-18 22:07:24 +00:00
Daniel Nishi
c7299663e7 Merge "Make Storage settings title be "Storage"." into oc-dev 2017-05-18 21:57:22 +00:00
Fan Zhang
462d852808 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
2017-05-18 14:37:09 -07:00
jackqdyulei
5333ecd1fb 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
2017-05-18 14:12:02 -07:00
Matthew Fritze
742467ec9f 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
2017-05-18 13:57:54 -07:00
Juan Lang
96c413b5f2 Merge "Update FooterPreference's classpath in preference files." 2017-05-18 20:52:56 +00:00
Fan Zhang
daf95ed1b3 Merge "Log preference change as count (in addition to action)" into oc-dev am: 13bcf501dd
am: a3202a9a36

Change-Id: Ibf483af95630ca15d886e8ef83b96dbe1aefd55f
2017-05-18 20:44:33 +00:00
Fan Zhang
a3202a9a36 Merge "Log preference change as count (in addition to action)" into oc-dev
am: 13bcf501dd

Change-Id: I9a7e0fa439344a44ddde299795d83d00dd83306d
2017-05-18 20:34:47 +00:00
TreeHugger Robot
13bcf501dd Merge "Log preference change as count (in addition to action)" into oc-dev 2017-05-18 20:29:12 +00:00
TreeHugger Robot
b287dc93d5 Merge "Skip cursor loader if not needed" 2017-05-18 20:28:52 +00:00
Bill Yi
29a1434435 Merge "Import translations. DO NOT MERGE" into oc-dev am: 6253e0710b -s ours
am: d172f720d9  -s ours

Change-Id: I6b474c120c59dffeb8b16e565eb47b4c1158fdf2
2017-05-18 20:18:16 +00:00
Bill Yi
d172f720d9 Merge "Import translations. DO NOT MERGE" into oc-dev
am: 6253e0710b  -s ours

Change-Id: I2ba0f963274890e9c2c8ce5c9347b74ab3a9cce2
2017-05-18 20:13:46 +00:00
TreeHugger Robot
6253e0710b Merge "Import translations. DO NOT MERGE" into oc-dev 2017-05-18 20:05:21 +00:00
jackqdyulei
803f0c96e8 Merge "Show wifi and bluetooth item in battery settings" into oc-dev am: 21d2403c67
am: 972763ee50

Change-Id: Ic54ae913ec5f9418f81ad15437fbaca8b96fad15
2017-05-18 19:35:56 +00:00
jackqdyulei
b5219ba29a Merge "Add screen usage string for battery settings" into oc-dev am: 28cf04d994
am: 3ab2ca5cc9

Change-Id: Iaca27db0a637de88c09a45d88f35db258783fa16
2017-05-18 19:35:27 +00:00
jackqdyulei
972763ee50 Merge "Show wifi and bluetooth item in battery settings" into oc-dev
am: 21d2403c67

Change-Id: I7ee542befa8e5287dbd73be242ec812a1a5d0c19
2017-05-18 19:26:20 +00:00
jackqdyulei
3ab2ca5cc9 Merge "Add screen usage string for battery settings" into oc-dev
am: 28cf04d994

Change-Id: Ie60e5de8164bfc16fa29ca16b63caa08812db52f
2017-05-18 19:25:57 +00:00
TreeHugger Robot
21d2403c67 Merge "Show wifi and bluetooth item in battery settings" into oc-dev 2017-05-18 19:13:35 +00:00
TreeHugger Robot
28cf04d994 Merge "Add screen usage string for battery settings" into oc-dev 2017-05-18 19:10:16 +00:00
TreeHugger Robot
8311e26aba Merge "Rename app_details to entity_header" 2017-05-18 19:04:12 +00:00
TreeHugger Robot
3f4056212f Merge "Fix issue for new account not being shown in work profile." 2017-05-18 18:55:27 +00:00
TreeHugger Robot
f76dafea55 Merge "Dynamic summary text for network/connected device screen." 2017-05-18 18:54:48 +00:00
Juan Lang
330d685063 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
2017-05-18 11:49:37 -07:00
Daniel Nishi
12dbce00c1 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
2017-05-18 11:36:10 -07:00
Salvador Martinez
44b9a4072c 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
2017-05-18 11:10:18 -07:00
Daniel Nishi
0d03b88e91 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
2017-05-18 11:02:10 -07:00
Matthew Fritze
b97a1bffa8 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
2017-05-18 17:36:59 +00:00
Matthew Fritze
cc7687c27c Merge "Update no search results icon and move image to top of page" into oc-dev am: fc4db3bd80
am: 145c364479

Change-Id: I910bb7eeffe938f708c5d3df8a62790f92b83de1
2017-05-18 17:23:01 +00:00