Lorenzo Colitti
c2bd388bb9
Merge "Raneme the wifi detail "Sign into network" button to "Sign in"." into oc-dev
...
am: 7d045387e0
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
Matthew Fritze
5569e3a33f
Merge "Remove Language and Input duplicates" into oc-dev
...
am: 6f4a6a737d
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
Daniel Nishi
af1a66202f
Merge "Make Storage settings title be "Storage"." into oc-dev
...
am: c7299663e7
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
a3202a9a36
Merge "Log preference change as count (in addition to action)" into oc-dev
...
am: 13bcf501dd
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
Bill Yi
d172f720d9
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 6253e0710b
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
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
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
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
145c364479
Merge "Update no search results icon and move image to top of page" into oc-dev
...
am: fc4db3bd80
2017-05-18 17:18:30 +00:00
TreeHugger Robot
fc4db3bd80
Merge "Update no search results icon and move image to top of page" into oc-dev
2017-05-18 17:11:29 +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
Lorenzo Colitti
89b4ff5c1e
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
2017-05-19 00:13:18 +09:00
Bill Yi
63c87dabb6
Import translations. DO NOT MERGE
...
Change-Id: I79790dae43f96a35c56970f27acb47ba689f731e
Auto-generated-cl: translation import
2017-05-17 22:58:00 -07: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
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
9938dc8337
Log preference change as count (in addition to action)
...
Bug: 38258793
Test: rerun robotests, and inspected log
Change-Id: I23fabddc1336709af424bbcb7250535833a8ada6
2017-05-18 00:05:12 +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
c6b1845d0f
Merge "TelephonyMonitor: Replace boolean decision with multiple status." into oc-dev
...
am: 350ba4a4c3
2017-05-17 23:42:49 +00:00
Youhan Wang
350ba4a4c3
Merge "TelephonyMonitor: Replace boolean decision with multiple status." into oc-dev
2017-05-17 23:38:08 +00:00
Matthew Fritze
b4f2f81f27
Update no search results icon and move image to top of page
...
Change-Id: Ib57bdc49095091ff6e432be922da676806ee3e2f
Fixes: 36597112
Test: search for "aaa" and observe image
2017-05-17 16:24:27 -07:00
Steven Ng
268be8edde
Merge "DO NOT MERGE Fix build failure due to missing guava target" into nyc-mr2-dev-plus-aosp
...
am: 3b76c25cee
2017-05-17 22:49:14 +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
Steven Ng
3b76c25cee
Merge "DO NOT MERGE Fix build failure due to missing guava target" into nyc-mr2-dev-plus-aosp
2017-05-17 22:43:11 +00:00
Steven Ng
3c03b45a16
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
2017-05-17 22:40:33 +00:00
Steven Ng
be7621e1d7
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791 am: e05ef08a8e -s ours am: 6496c3757b -s ours
...
am: 9eeb954d39
2017-05-17 21:05:09 +00:00
Steven Ng
b0ad380d0c
Fix phishing attack in ChooseLockGeneric
...
am: 56870f438c
2017-05-17 21:04:40 +00:00
Steven Ng
9eeb954d39
Merge "Fix phishing attack in ChooseLockGeneric" into nyc-mr1-dev am: c07f39c791 am: e05ef08a8e -s ours
...
am: 6496c3757b
2017-05-17 21:01:46 +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
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
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
Kenny Guy
020dd7b169
Merge "Disable managed profile version of shortcut picker." into oc-dev
...
am: c760135f14
2017-05-17 17:43:44 +00:00
TreeHugger Robot
c760135f14
Merge "Disable managed profile version of shortcut picker." into oc-dev
2017-05-17 17:38:30 +00:00
