OSDN Git Service
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
TreeHugger Robot [Tue, 23 May 2017 02:01:41 +0000 (02:01 +0000)]
Merge "Show shadow when entity header starts scrolling."
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
TreeHugger Robot [Tue, 23 May 2017 01:49:22 +0000 (01:49 +0000)]
Merge "Revert "Add animation for battery asyncLoader."" into oc-dev
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
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
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
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
Lei Yu [Mon, 22 May 2017 23:30:01 +0000 (23:30 +0000)]
Merge "Revert "Add animation for battery asyncLoader.""
TreeHugger Robot [Mon, 22 May 2017 23:13:13 +0000 (23:13 +0000)]
Merge "Remove lifecycle interfaces from settings."
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
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
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
TreeHugger Robot [Mon, 22 May 2017 22:37:39 +0000 (22:37 +0000)]
Merge "Use label instead of raw value for theme preference summary"
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
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
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
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
TreeHugger Robot [Mon, 22 May 2017 18:57:09 +0000 (18:57 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 22 May 2017 16:11:11 +0000 (16:11 +0000)]
Merge "Show 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
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
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
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
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
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
TreeHugger Robot [Fri, 19 May 2017 23:56:11 +0000 (23:56 +0000)]
Merge "Fix settings crash due to enrolling error" into oc-dev
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)
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
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
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
Maurice Lam [Fri, 19 May 2017 18:26:47 +0000 (18:26 +0000)]
Merge "Align password requirement according to theme"
Adam Bookatz [Fri, 19 May 2017 18:24:31 +0000 (18:24 +0000)]
Merge "Add aggregated partial wakelock time per uid" 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
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
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
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
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.
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"
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
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
TreeHugger Robot [Fri, 19 May 2017 00:41:02 +0000 (00:41 +0000)]
Merge "Remove Language and Input duplicates" into oc-dev
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
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
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
TreeHugger Robot [Thu, 18 May 2017 22:37:24 +0000 (22:37 +0000)]
Merge "Remove Language and Input duplicates"
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
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
Daniel Nishi [Thu, 18 May 2017 21:57:21 +0000 (21:57 +0000)]
Merge "Make Storage settings title be "Storage"." into oc-dev
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
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
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
Juan Lang [Thu, 18 May 2017 20:52:53 +0000 (20:52 +0000)]
Merge "Update FooterPreference's classpath in preference files."
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
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
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
TreeHugger Robot [Thu, 18 May 2017 20:28:50 +0000 (20:28 +0000)]
Merge "Skip cursor loader if not needed"
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
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
TreeHugger Robot [Thu, 18 May 2017 20:05:19 +0000 (20:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
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
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
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
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
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
TreeHugger Robot [Thu, 18 May 2017 19:10:15 +0000 (19:10 +0000)]
Merge "Add screen usage string for battery settings" into oc-dev
TreeHugger Robot [Thu, 18 May 2017 19:04:09 +0000 (19:04 +0000)]
Merge "Rename app_details to entity_header"
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."
TreeHugger Robot [Thu, 18 May 2017 18:54:45 +0000 (18:54 +0000)]
Merge "Dynamic summary text for network/connected device screen."
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
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
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
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
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
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
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
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
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
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.
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
Lorenzo Colitti [Thu, 18 May 2017 15:04:19 +0000 (00:04 +0900)]
Raneme the wifi detail "Sign into network" button to "Sign in".
Bug:
36656914
Test: button looks reasonable in English, Italian, Japanese, Dutch
Change-Id: Icaba16a4ef1ddfc03fc45fd1d1c64bcca9913d7c
TreeHugger Robot [Thu, 18 May 2017 08:43:19 +0000 (08:43 +0000)]
Merge "Default setup wizard to use PIN"
Bill Yi [Thu, 18 May 2017 05:58:00 +0000 (22:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I79790dae43f96a35c56970f27acb47ba689f731e
Auto-generated-cl: translation import
Bill Yi [Thu, 18 May 2017 05:41:50 +0000 (22:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8a4be0cbaa913e1df9fb06b72bb4eefad5e17eab
Auto-generated-cl: translation import
Philip Quinn [Thu, 18 May 2017 00:41:45 +0000 (17:41 -0700)]
Increase the resolution of the assist gesture sensitivity slider.
Test: make RunSettingsRoboTests && manual
Change-Id: I47cdeba932afb4ab68b2283efa479a1e4725675c
Fan Zhang [Wed, 17 May 2017 21:15:34 +0000 (14:15 -0700)]
Rename app_details to entity_header
Bug:
37669238
Test: rerun robotests
Change-Id: Iab2cdf83d8b35ce3d45b0c413cad8614d44d5ed3
Fan Zhang [Thu, 18 May 2017 01:14:10 +0000 (01:14 +0000)]
Merge "Fix bug where accounts are duplicated in user&account list." into oc-dev am:
2b030aeb65
am:
60d26cfffa
Change-Id: I878bafe5a626e2f6fe9d8f4cfbb89dfeb763c7a0
jackqdyulei [Tue, 16 May 2017 23:39:03 +0000 (16:39 -0700)]
Drop the misc and not smear it.
Bug:
38347725
Test: RunSettingsRoboTests
Change-Id: I573e4fb945bc212505c9211d9b92f77a6a9a2739
Fan Zhang [Thu, 18 May 2017 01:11:00 +0000 (01:11 +0000)]
Merge "Fix bug where accounts are duplicated in user&account list." into oc-dev
am:
2b030aeb65
Change-Id: I4c13fb0ce652108fdabbaa8ca215a5799374c8f8
Fan Zhang [Thu, 18 May 2017 01:09:16 +0000 (01:09 +0000)]
Merge "Fix robolectric test failure" into oc-dev am:
2545bcaa74
am:
3970916cf1
Change-Id: I7f63f5cee9a91c8f88711a0ada04a24a676692f1
jackqdyulei [Tue, 16 May 2017 23:09:14 +0000 (16:09 -0700)]
Smear screen power usage based on activity time.
Bug:
38328636
Test: RunSettingsRoboTests
Change-Id: I8e7baadcd88a8e9d674f5bc8d8e42e0f3953c98a
Fan Zhang [Thu, 18 May 2017 01:05:38 +0000 (01:05 +0000)]
Merge "Fix bug where accounts are duplicated in user&account list." into oc-dev
Fan Zhang [Thu, 18 May 2017 01:01:12 +0000 (01:01 +0000)]
Merge "Fix robolectric test failure" into oc-dev
am:
2545bcaa74
Change-Id: I632edffaced0b4ce7d391d525c4d9288e5ba97cc
Fan Zhang [Thu, 18 May 2017 00:41:17 +0000 (00:41 +0000)]
Merge "Fix robolectric test failure" into oc-dev
Fan Zhang [Thu, 18 May 2017 00:01:44 +0000 (17:01 -0700)]
Log preference change as count (in addition to action)
Bug:
38258793
Test: rerun robotests, and inspected log
Change-Id: I23fabddc1336709af424bbcb7250535833a8ada6
Fan Zhang [Wed, 17 May 2017 19:32:59 +0000 (12:32 -0700)]
Fix bug where accounts are duplicated in user&account list.
This happens when user has different accounts with same account name. For
example: user@domain.com for type1 and same email for type2, etc. When
we refresh the account list during onResume(), the same account name
incorrectly causes the logic to think they are the same account and
updates the account list by mistake.
- Introduced a util method to generate unique key from Account object.
And set it as preference key.
- when updating preference on screen, use key to find preference instead
of the preference instance itself.
Change-Id: I0aa692cb965b7037155a746389a919cd155843da
Fix:
34035653
Test: make RunSettingsRoboTests
Youhan Wang [Wed, 17 May 2017 23:46:20 +0000 (23:46 +0000)]
Merge "TelephonyMonitor: Replace boolean decision with multiple status." into oc-dev am:
350ba4a4c3
am:
c6b1845d0f
Change-Id: I3bee5b3a1e90a7f8766b875045a54a9945264226
Youhan Wang [Wed, 17 May 2017 23:42:49 +0000 (23:42 +0000)]
Merge "TelephonyMonitor: Replace boolean decision with multiple status." into oc-dev
am:
350ba4a4c3
Change-Id: Ia508085e2fe2dd2061d772b0caf976d039aaa213
Doris Ling [Wed, 17 May 2017 00:23:55 +0000 (17:23 -0700)]
Fix issue for new account not being shown in work profile.
When refreshing the UI, we tried to only create profile data for new
profile, and skip the initialization for existing profiles. However,
the authentication helper will not get the updated account list, since
the account update listener is being paused. Re-create the
authentication helper to get the latest list of enabled accounts.
Change-Id: Ie29699456e5b32747e8158d51382afaa2c0c5908
Fix:
38302246
Test: make RunSettingsRoboTests
Youhan Wang [Wed, 17 May 2017 23:38:07 +0000 (23:38 +0000)]
Merge "TelephonyMonitor: Replace boolean decision with multiple status." into oc-dev