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
TreeHugger Robot
b287dc93d5
Merge "Skip cursor loader if not needed"
2017-05-18 20:28:52 +00:00
jackqdyulei
803f0c96e8
Merge "Show wifi and bluetooth item in battery settings" into oc-dev am: 21d2403c67
...
am: 972763ee50
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
2017-05-18 19:35:27 +00:00
jackqdyulei
972763ee50
Merge "Show wifi and bluetooth item in battery settings" into oc-dev
...
am: 21d2403c67
2017-05-18 19:26:20 +00:00
jackqdyulei
3ab2ca5cc9
Merge "Add screen usage string for battery settings" into oc-dev
...
am: 28cf04d994
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
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
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
Lei Yu
9a4be81e5c
Merge changes I573e4fb9,I8e7baadc into oc-dev am: 67e38774ce
...
am: d85bdebe0e
2017-05-18 17:12:34 +00:00
Lei Yu
d85bdebe0e
Merge changes I573e4fb9,I8e7baadc into oc-dev
...
am: 67e38774ce
2017-05-18 17:08:33 +00:00
Lei Yu
67e38774ce
Merge changes I573e4fb9,I8e7baadc into oc-dev
...
* changes:
Drop the misc and not smear it.
Smear screen power usage based on activity time.
2017-05-18 17:00:27 +00:00
Fan Zhang
7c3a87ebd3
Dynamic summary text for network/connected device screen.
...
Change-Id: I3254c63b7c241e2de9251b3c2d2a0106fb049ece
Fix: 36768218
Test: make RunSettingsRoboTests
2017-05-18 09:52:43 -07:00
TreeHugger Robot
821c83e749
Merge "Default setup wizard to use PIN"
2017-05-18 08:43:24 +00:00
Fan Zhang
2ed0f99989
Rename app_details to entity_header
...
Bug: 37669238
Test: rerun robotests
Change-Id: Iab2cdf83d8b35ce3d45b0c413cad8614d44d5ed3
2017-05-17 18:17:20 -07:00
Fan Zhang
867c68e76c
Merge "Fix bug where accounts are duplicated in user&account list." into oc-dev am: 2b030aeb65
...
am: 60d26cfffa
2017-05-18 01:14:10 +00:00
jackqdyulei
7d7080ab64
Drop the misc and not smear it.
...
Bug: 38347725
Test: RunSettingsRoboTests
Change-Id: I573e4fb945bc212505c9211d9b92f77a6a9a2739
2017-05-17 18:12:03 -07:00
Fan Zhang
60d26cfffa
Merge "Fix bug where accounts are duplicated in user&account list." into oc-dev
...
am: 2b030aeb65
2017-05-18 01:11:00 +00:00
Fan Zhang
63c5b41f01
Merge "Fix robolectric test failure" into oc-dev am: 2545bcaa74
...
am: 3970916cf1
2017-05-18 01:09:16 +00:00
jackqdyulei
2b923ce44f
Smear screen power usage based on activity time.
...
Bug: 38328636
Test: RunSettingsRoboTests
Change-Id: I8e7baadcd88a8e9d674f5bc8d8e42e0f3953c98a
2017-05-17 18:06:47 -07:00
Fan Zhang
2b030aeb65
Merge "Fix bug where accounts are duplicated in user&account list." into oc-dev
2017-05-18 01:05:39 +00:00
Fan Zhang
3970916cf1
Merge "Fix robolectric test failure" into oc-dev
...
am: 2545bcaa74
2017-05-18 01:01:12 +00:00
Fan Zhang
2545bcaa74
Merge "Fix robolectric test failure" into oc-dev
2017-05-18 00:41:18 +00:00
Fan Zhang
c754f59fb0
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
2017-05-17 23:50:30 +00:00
Youhan Wang
1bceb954ed
Merge "TelephonyMonitor: Replace boolean decision with multiple status." into oc-dev am: 350ba4a4c3
...
am: c6b1845d0f
2017-05-17 23:46:20 +00:00
Youhan Wang
c6b1845d0f
Merge "TelephonyMonitor: Replace boolean decision with multiple status." into oc-dev
...
am: 350ba4a4c3
2017-05-17 23:42:49 +00:00
Doris Ling
71090678c0
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
2017-05-17 23:42:17 +00:00
Youhan Wang
350ba4a4c3
Merge "TelephonyMonitor: Replace boolean decision with multiple status." into oc-dev
2017-05-17 23:38:08 +00:00
Fan Zhang
28dcdb7c3b
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
2017-05-17 22:46:27 +00:00
Lei Yu
868ecae66d
Merge "Add AnomalyDetectionPolicy"
2017-05-17 21:10:30 +00:00
jackqdyulei
7548f1fa77
Add screen usage string for battery settings
...
In advanced battery page we still use "Used for"
Bug: 38328647
Test: Build & Screenshot
Change-Id: Ic194bfed45a76c811c431a13b5554f5bc978bca5
2017-05-17 13:14:45 -07:00
Antony Sargent
3033c1a2cf
Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev am: c439202da9
...
am: 3afb6616c6
2017-05-17 19:41:16 +00:00
Antony Sargent
3afb6616c6
Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev
...
am: c439202da9
2017-05-17 19:12:43 +00:00
Matthew Fritze
c838e959f7
Merge "Remove duplicates from sound settings" into oc-dev am: 3abeba07d3
...
am: a939959838
2017-05-17 19:07:45 +00:00
Matthew Fritze
8cd0562bd6
Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev am: 4bd0f411ce
...
am: af054e63e0
2017-05-17 19:06:59 +00:00
TreeHugger Robot
c439202da9
Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev
2017-05-17 18:59:54 +00:00
Matthew Fritze
a939959838
Merge "Remove duplicates from sound settings" into oc-dev
...
am: 3abeba07d3
2017-05-17 18:51:14 +00:00
Matthew Fritze
af054e63e0
Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev
...
am: 4bd0f411ce
2017-05-17 18:50:28 +00:00
TreeHugger Robot
3abeba07d3
Merge "Remove duplicates from sound settings" into oc-dev
2017-05-17 18:29:54 +00:00
TreeHugger Robot
4bd0f411ce
Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev
2017-05-17 18:28:35 +00:00
Matthew Fritze
256e9e208e
Merge "Remove Network Restrictions duplicate from setting search" into oc-dev am: 09dbc8043f
...
am: d53409356d
2017-05-17 17:53:08 +00:00
Matthew Fritze
d53409356d
Merge "Remove Network Restrictions duplicate from setting search" into oc-dev
...
am: 09dbc8043f
2017-05-17 17:37:51 +00:00
Matthew Fritze
f81f1024c3
Merge "Remove Legal Information duplicate from Settings search" into oc-dev am: 915f0cea5b
...
am: 70db53a8d5
2017-05-17 17:31:08 +00:00
jackqdyulei
6c9dc0b1ca
Show wifi and bluetooth item in battery settings
...
Change-Id: Icc1824758908b14ad895dcc28a63a5d9c685b490
Fix: 38328856
Fix: 38328641
Test: RunSettingsRoboTests
2017-05-17 10:29:55 -07:00
TreeHugger Robot
09dbc8043f
Merge "Remove Network Restrictions duplicate from setting search" into oc-dev
2017-05-17 17:27:57 +00:00
Matthew Fritze
70db53a8d5
Merge "Remove Legal Information duplicate from Settings search" into oc-dev
...
am: 915f0cea5b
2017-05-17 17:26:07 +00:00
