OSDN Git Service
Lei Yu [Thu, 25 May 2017 20:07:20 +0000 (20:07 +0000)]
Merge "Add NPE check for refreshUi" into oc-dev
am:
1a8c2dd899
Change-Id: I1daa1c18a7a938c1e6528aaeda2a3a874b2fe028
Lei Yu [Thu, 25 May 2017 19:51:13 +0000 (19:51 +0000)]
Merge "Add NPE check for refreshUi" into oc-dev
jackqdyulei [Thu, 25 May 2017 04:01:46 +0000 (04:01 +0000)]
Merge "Turn on power accounting in AOSP" into oc-dev
am:
0a6d61883c
Change-Id: I9204d0b51db9fedbf2f49b5d635e46b221c5d7ea
TreeHugger Robot [Thu, 25 May 2017 03:57:27 +0000 (03:57 +0000)]
Merge "Turn on power accounting in AOSP" into oc-dev
Fan Zhang [Thu, 25 May 2017 03:25:43 +0000 (03:25 +0000)]
Merge "Recursively remove preference from screen." into oc-dev
am:
7731b4244e
Change-Id: Ib3c637bcb4bbd6ded83f626b1b00dff32f9cb12c
TreeHugger Robot [Thu, 25 May 2017 03:22:50 +0000 (03:22 +0000)]
Merge "Recursively remove preference from screen." into oc-dev
Doris Ling [Thu, 25 May 2017 02:34:26 +0000 (02:34 +0000)]
Merge "Listener to tether state change on Network & internet page." into oc-dev
am:
1dead24890
Change-Id: Ic64e4f29c2e7124b3e977acb245f0e3e15f84ff6
TreeHugger Robot [Thu, 25 May 2017 02:25:55 +0000 (02:25 +0000)]
Merge "Listener to tether state change on Network & internet page." into oc-dev
jackqdyulei [Wed, 24 May 2017 00:01:39 +0000 (17:01 -0700)]
Add NPE check for refreshUi
The reason for NPE is that callback is registered too early, so
one callback is invoked before controller is fully inited. This
cl fix it in two ways:
1. Add NPE check in refreshUi, since this method in InstalledAppDetail
is robost to NPE
2. Move the callback to the end of constructor.
Bug:
37913054
Test: RunSettingsRoboTests
Change-Id: I54b03fb51a958a8e63bfe8a7ccfda79be1fa1956
Doris Ling [Wed, 24 May 2017 20:24:23 +0000 (13:24 -0700)]
Listener to tether state change on Network & internet page.
User can navigates to the page and turn hotspot on or off from the quick
settings. Need to listen to the tether state updates to refresh the
summary for the Hotspot & tethering preference accordingly.
Change-Id: I7c6869b909306b09556e19cf7b7543ce9dcd890e
Fix:
38452559
Test: make RunSettingsRoboTests
Fan Zhang [Wed, 24 May 2017 22:48:55 +0000 (22:48 +0000)]
Tether screen cleanup
am:
20ae31e87c
Change-Id: I5294531666526a05d07db15ff208eedec3504970
Fan Zhang [Wed, 24 May 2017 18:19:52 +0000 (11:19 -0700)]
Recursively remove preference from screen.
The preference framework does not remove pref recursively. So when a
preference is nested in preference hierarchy, it's not safe to simply
call screen.removePreference(). We need to first find its parent and
remove pref from its parent.
Change-Id: Ic7fefa498ed71a8877d862845ddcc2d6d6034a55
Fix:
38507066
Test: make RunSettingsRoboTests
Fan Zhang [Thu, 4 May 2017 18:28:16 +0000 (11:28 -0700)]
Tether screen cleanup
- Add a summary placeholder reserving 2 lines for wifi tether pref
- Replace DividerPreference with regular Preference
Change-Id: I2e0c36f27abe2c17625d00d80c816b526f59a6fd
Fix:
37518463
Test: visual
(cherry picked from commit
d80117dcea2ae386dea238ae760a12f8004f4b4c)
jackqdyulei [Wed, 24 May 2017 19:26:16 +0000 (19:26 +0000)]
Merge "Make "Battery usage" accessible at any time" into oc-dev
am:
a935b3c030
Change-Id: I969c301888aca43b5e2154fc86dd139ebb83c3f3
TreeHugger Robot [Wed, 24 May 2017 19:19:54 +0000 (19:19 +0000)]
Merge "Make "Battery usage" accessible at any time" into oc-dev
Matthew Fritze [Wed, 24 May 2017 17:16:01 +0000 (17:16 +0000)]
Merge "Revert "Revert "Replace dynamic summary text for SettingPref""" into oc-dev
am:
ae0886c9f7
Change-Id: I29ca4bdf7ad579699283fe4adde2ad22439d7ce9
TreeHugger Robot [Wed, 24 May 2017 17:12:34 +0000 (17:12 +0000)]
Merge "Revert "Revert "Replace dynamic summary text for SettingPref""" into oc-dev
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
Merged-In: Ic53c33b7dcbac82de58f31cf96e0bd8fa54e53ea
Change-Id: Ic53c33b7dcbac82de58f31cf96e0bd8fa54e53ea
Tony Mak [Wed, 24 May 2017 10:53:25 +0000 (10:53 +0000)]
Merge "Show app battery usage in correct user" into oc-dev
am:
7226c9f4c4
Change-Id: I719a19c92d9671e471b648aa6db9881dbd01ad30
TreeHugger Robot [Wed, 24 May 2017 10:49:11 +0000 (10:49 +0000)]
Merge "Show app battery usage in correct user" into oc-dev
jackqdyulei [Wed, 24 May 2017 01:33:01 +0000 (01:33 +0000)]
Merge "Split loading process for battery header" into oc-dev
am:
987ee5338a
Change-Id: I395b493338f0225bd300e155d3303a1ba9136555
TreeHugger Robot [Wed, 24 May 2017 01:22:23 +0000 (01:22 +0000)]
Merge "Split loading process for battery header" into oc-dev
jackqdyulei [Wed, 24 May 2017 00:54:40 +0000 (00:54 +0000)]
Merge "Update the strings for "show all apps"" into oc-dev
am:
4e0f69c10c
Change-Id: I86150368f09801e90263fc099d4e0a703029dac2
TreeHugger Robot [Wed, 24 May 2017 00:49:48 +0000 (00:49 +0000)]
Merge "Update the strings for "show all apps"" into oc-dev
Bill Yi [Wed, 24 May 2017 00:19:39 +0000 (00:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
20748da300 -s ours
Change-Id: Ife6fcaa53d906080248b0cb63e8a32ae3a373793
TreeHugger Robot [Wed, 24 May 2017 00:10:58 +0000 (00:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
jackqdyulei [Fri, 19 May 2017 20:29:09 +0000 (13:29 -0700)]
Split loading process for battery header
This cl creates BatteryHeaderPreferenceController, which will first
load the battery level in ui thread(in displayPreference()), then
display the remaining time once we get the battery stats.
This is the best we can do to avoid ui flashing while removing the
animation
Bug:
38349587
Test: RunSettingsRoboTests
Merged-In: Ic3622bb73562ba42e69b37e5674a724c03c45f12
Change-Id: Ic3622bb73562ba42e69b37e5674a724c03c45f12
jackqdyulei [Tue, 23 May 2017 22:35:54 +0000 (15:35 -0700)]
Turn on power accounting in AOSP
Bug:
38328724
Test: RunSettingsRoboTests
Change-Id: Ibb2691ffdf8581549a1e99f94a8dbaa849453742
Matthew Fritze [Tue, 23 May 2017 22:21:18 +0000 (22:21 +0000)]
Merge "Remove duplicates in Security Settings" into oc-dev
am:
96a8dffafb
Change-Id: I1e987af06d086fd971e2865d5fa854b58ce0e409
jackqdyulei [Tue, 23 May 2017 21:30:47 +0000 (14:30 -0700)]
Update the strings for "show all apps"
Bug:
38328724
Test: Screenshot
Change-Id: If48ff26f691795dcf206346af6a9a0be62bbf733
TreeHugger Robot [Tue, 23 May 2017 22:13:37 +0000 (22:13 +0000)]
Merge "Remove duplicates in Security Settings" into oc-dev
Bill Yi [Tue, 23 May 2017 22:05:15 +0000 (15:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I82f35157c3d1396be572d690b559ebfb6fa9910f
Auto-generated-cl: translation import
Matthew Fritze [Tue, 23 May 2017 21:02:57 +0000 (21:02 +0000)]
Revert "Revert "Replace dynamic summary text for SettingPref""
This reverts commit
8061aaef621b38e269eaa34c0cfef48a9b7eb288.
Test: make RunSettingsRoboTests
Fixes:
36101902
Change-Id: Ide74780153fc7f36d897f559c7a3c138190e3320
Felipe Leme [Tue, 23 May 2017 20:57:34 +0000 (20:57 +0000)]
Merge "Refactored ConfirmationDialogFragment to use default construcutor." into oc-dev
am:
3cf690e906
Change-Id: Ia76b7b27c3697645b58ee705733211b85a4dca40
TreeHugger Robot [Tue, 23 May 2017 20:44:08 +0000 (20:44 +0000)]
Merge "Refactored ConfirmationDialogFragment to use default construcutor." into oc-dev
Matthew Fritze [Thu, 11 May 2017 18:56:27 +0000 (11:56 -0700)]
Remove duplicates in Security Settings
Duplicates:
- Location
- Scanning
- Encryption and Credentials
- Screen Pinning
- Device Admin Apps
Bug:
33701673
Test: make RunSettingsRoboTests
Change-Id: Id06b6d9e82769abfa31a0c3e9900bcebdbd0c13c
Merged-In: I91566b8fb7fdb3b39c8833a6fa8e52bbbf6507b6
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
Daniel Nishi [Tue, 23 May 2017 17:35:14 +0000 (17:35 +0000)]
Merge "Fix storage summary background colors." into oc-dev
Felipe Leme [Thu, 18 May 2017 21:32:13 +0000 (14:32 -0700)]
Refactored ConfirmationDialogFragment to use default construcutor.
Test: manual verification
Test: make RunSettingsRoboTests -j90
Fixes:
38397850
Change-Id: Ie724e7e92a6a34d4db16e4406bf821f00d98d180
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
TreeHugger Robot [Tue, 23 May 2017 15:18:06 +0000 (15:18 +0000)]
Merge "Developer setting to enable notification channel warnings" into oc-dev
Tony Mak [Mon, 22 May 2017 13:22:57 +0000 (14:22 +0100)]
Show app battery usage in correct user
Test: m -j RunSettingsRoboTests
Change-Id: I6c0f74b79468ee670f642edb0a50400c030d1925
Merged-In: I6c0f74b79468ee670f642edb0a50400c030d1925
Fix:
38447829
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
Lei Yu [Tue, 23 May 2017 06:16:43 +0000 (06:16 +0000)]
Merge "Use BatteryStatsLoader in InstalledAppDetails" 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
TreeHugger Robot [Tue, 23 May 2017 01:49:22 +0000 (01:49 +0000)]
Merge "Revert "Add animation for battery asyncLoader."" into oc-dev
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
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
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
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
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
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: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:32:31 +0000 (18:32 +0000)]
Merge "Add aggregated partial wakelock time per uid" into oc-dev
am:
11e7781b32
Change-Id: I17641683c8d6ec278070ebbafaefce35008248f0
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: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
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
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 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
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: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
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
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: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
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.
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
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
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
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:42:49 +0000 (23:42 +0000)]
Merge "TelephonyMonitor: Replace boolean decision with multiple status." into oc-dev
am:
350ba4a4c3
Change-Id: Ia508085e2fe2dd2061d772b0caf976d039aaa213
Youhan Wang [Wed, 17 May 2017 23:38:07 +0000 (23:38 +0000)]
Merge "TelephonyMonitor: Replace boolean decision with multiple status." into oc-dev
Matthew Fritze [Fri, 12 May 2017 17:10:37 +0000 (10:10 -0700)]
Update no search results icon and move image to top of page
Change-Id: Ib57bdc49095091ff6e432be922da676806ee3e2f
Fixes:
36597112
Test: search for "aaa" and observe image
Steven Ng [Wed, 17 May 2017 22:49:14 +0000 (22:49 +0000)]
Merge "DO NOT MERGE Fix build failure due to missing guava target" into nyc-mr2-dev-plus-aosp
am:
3b76c25cee -s ours
Change-Id: I6b9f260b8494ced24cd758207981d60c9a5ca97e
Fan Zhang [Wed, 17 May 2017 22:37:03 +0000 (15:37 -0700)]
Fix robolectric test failure
Default UserManager caches instance across entire test suite, so
test becomes flakey depending on the order they are run. Using a
a ShadowUserManager without the cache ensures each test class gets
a UserManager with clean state.
Change-Id: Ia54f6a3259859add5a1e5d0101829497fb985ab1
Fix:
38393235
Test: make RunSettingsRoboTests
Steven Ng [Wed, 17 May 2017 22:43:10 +0000 (22:43 +0000)]
Merge "DO NOT MERGE Fix build failure due to missing guava target" into nyc-mr2-dev-plus-aosp
Steven Ng [Wed, 17 May 2017 22:30:42 +0000 (23:30 +0100)]
DO NOT MERGE Fix build failure due to missing guava target
Test: 1) build sailfish-userdebug successfully
2) m SettingsTests -j32 built successfully
Bug:
33059280
Change-Id: If1c281888e4581b5eb3b8842892464aebd04b827
Steven Ng [Wed, 17 May 2017 21:05:09 +0000 (21:05 +0000)]
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am:
c07f39c791 am:
e05ef08a8e -s ours am:
6496c3757b -s ours
am:
9eeb954d39 -s ours
Change-Id: I10aad8dbfe4b42a887b2166608456595640e0feb
Steven Ng [Wed, 17 May 2017 21:04:40 +0000 (21:04 +0000)]
Fix phishing attack in ChooseLockGeneric
am:
56870f438c -s ours
Change-Id: I3f71fa7a65f732de8816b43f02df3cf414e8408b