jackqdyulei
8ce27bc37c
resolve merge conflicts of 758b2d4ae6 to master
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic82e244ad1485bdd1f73cff628e0e343bfdb1c53
2017-06-26 18:30:40 -07:00
TreeHugger Robot
58005fc5c1
Merge "Fix assist gesture settings summary"
2017-06-27 01:22:17 +00:00
Maurice Lam
57e61ba4f3
Merge "Rename buttons in lock screen setup" into oc-dr1-dev
...
am: fbfca43e6e
2017-06-27 01:17:25 +00:00
Maurice Lam
467f39d243
Merge "Update skip button label to "Do it later"" into oc-dr1-dev
...
am: b97f91c971
2017-06-27 01:17:05 +00:00
Maurice Lam
a3eb263479
Merge "Add skip button to fingerprint enrolling screen" into oc-dr1-dev
...
am: 624212f43c
2017-06-27 01:16:46 +00:00
Maurice Lam
2cc641940d
Merge "Update buttons in FP find sensor" into oc-dr1-dev
...
am: a102714c19
2017-06-27 01:16:16 +00:00
Maurice Lam
fbfca43e6e
Merge "Rename buttons in lock screen setup" into oc-dr1-dev
2017-06-27 01:10:49 +00:00
Maurice Lam
b97f91c971
Merge "Update skip button label to "Do it later"" into oc-dr1-dev
2017-06-27 01:10:37 +00:00
Maurice Lam
624212f43c
Merge "Add skip button to fingerprint enrolling screen" into oc-dr1-dev
2017-06-27 01:10:23 +00:00
Maurice Lam
a102714c19
Merge "Update buttons in FP find sensor" into oc-dr1-dev
2017-06-27 01:10:10 +00:00
Kevin Chyn
57c7294e57
Merge "Remove unnecessary functions from AssistGestureFeatureProvider"
2017-06-27 00:45:31 +00:00
Andrew Sapperstein
ab0c049bc2
Search results page polish
...
Changes made:
- up button added and in correct place
- text color correct when entering query
- query text aligned with results
- grey background around searchbar
Fixes: 37477506
Test: robotests
Change-Id: Ieb135f81f684032f3d5e4102304e617088c88117
2017-06-26 17:19:53 -07:00
TreeHugger Robot
60b71f53e3
Merge "resolve merge conflicts of 31a2f413f8 to master"
2017-06-27 00:14:14 +00:00
TreeHugger Robot
4c1a871216
Merge "Dashboard search bar polish"
2017-06-27 00:11:59 +00:00
Kevin Chyn
59f901861b
Remove unnecessary functions from AssistGestureFeatureProvider
...
Fixes: 62945918
Test: make -j RunSettingsRoboTests && manual
Change-Id: I13438e6741a3398d06917b45f098c13df7dff97e
2017-06-26 16:58:43 -07:00
TreeHugger Robot
68fcefed1e
Merge "Remove redundant talkback readout when rebooting device"
2017-06-26 22:30:48 +00:00
Fan Zhang
6175c9cc6a
Merge "Update icon for language settings" into oc-dr1-dev
...
am: 124232d6fa
2017-06-26 22:22:30 +00:00
daqi
49729cbd9e
Merge "Fix PremiumSmsAccess memory leak" am: 31a2f413f8 -s ours am: 34fe9136c6
...
am: 96e566a68c
2017-06-26 22:20:53 +00:00
daqi
96e566a68c
Merge "Fix PremiumSmsAccess memory leak" am: 31a2f413f8 -s ours
...
am: 34fe9136c6
2017-06-26 22:18:38 +00:00
Fan Zhang
896f1b363c
Reduce jank around loading view when opening data usage UI
...
Change-Id: I3d23d8160b046de8fe125ba0697b7b3d7786453c
Fix: 28181319
Test: robotests
2017-06-26 15:15:30 -07:00
TreeHugger Robot
124232d6fa
Merge "Update icon for language settings" into oc-dr1-dev
2017-06-26 22:08:34 +00:00
daqi
34fe9136c6
Merge "Fix PremiumSmsAccess memory leak"
...
am: 31a2f413f8
2017-06-26 22:05:13 +00:00
daqi
ba3c8edc2f
resolve merge conflicts of 31a2f413f8 to master
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2d665a710a58d9e18d56517bffb69f42b9ffe7a6
2017-06-26 15:04:15 -07:00
Andrew Sapperstein
c0d544943f
Merge commit 'e414cd231656314442cb503f9cda3677561dc44a' into manual_merge_e414cd2316
...
Test: none
Change-Id: I5dedcc30c9f15fa61532ecad2e0f68de4fd97c8e
2017-06-26 14:28:10 -07:00
Treehugger Robot
31a2f413f8
Merge "Fix PremiumSmsAccess memory leak"
2017-06-26 21:13:49 +00:00
TreeHugger Robot
c26ae0677e
Merge "Fix typo in metrics constants"
2017-06-26 21:06:48 +00:00
Kevin Chyn
891ab1a713
Fix assist gesture settings summary
...
Bug: 62841640
Test: make -j RunSettingsRoboTests && manual testing of settings
Change-Id: I75ffce4ff1054dad6b2733a7d4f6bc7e526a8034
2017-06-26 13:36:02 -07:00
Kevin Chyn
4efa54e342
Merge "Remove unnecessary functions from AssistGestureFeatureProvider" into oc-dr1-dev
...
am: 0e393d4163
2017-06-26 20:30:56 +00:00
jackqdyulei
e9d1f6f1ae
Merge "Update the chargeLabel when battery level is full" into oc-dr1-dev
...
am: 1eb2f15339
2017-06-26 20:30:26 +00:00
TreeHugger Robot
0e393d4163
Merge "Remove unnecessary functions from AssistGestureFeatureProvider" into oc-dr1-dev
2017-06-26 20:23:11 +00:00
TreeHugger Robot
1eb2f15339
Merge "Update the chargeLabel when battery level is full" into oc-dr1-dev
2017-06-26 20:22:27 +00:00
jackqdyulei
758b2d4ae6
Merge "Hide misc in battery settings" into oc-dr1-dev
...
am: da45ba8c9e
2017-06-26 20:01:22 +00:00
TreeHugger Robot
da45ba8c9e
Merge "Hide misc in battery settings" into oc-dr1-dev
2017-06-26 19:52:55 +00:00
Antony Sargent
e414cd2316
Merge "Add a rename dialog for paired Bluetooth devices" into oc-dr1-dev
...
am: ee55927bd4
2017-06-26 19:49:16 +00:00
TreeHugger Robot
ee55927bd4
Merge "Add a rename dialog for paired Bluetooth devices" into oc-dr1-dev
2017-06-26 19:35:06 +00:00
Fan Zhang
9861c95577
Fix typo in metrics constants
...
Change-Id: If73ca178c6f3f5544ae2f5a0cc030e307d7df8c5
Fix: 62955794
Test: robotests
2017-06-26 12:13:55 -07:00
Fan Zhang
b30fb0f580
Update icon for language settings
...
Change-Id: I74691be4d2e8377640b931a3b05021129ce246d5
Fix: 37929875
Test: visual
2017-06-26 19:01:31 +00:00
Tony Mantler
1d583e125f
Make PreferenceController a mixin
...
Bug: 62912136
Test: Existing tests in BaseSearchIndexProviderTest
Change-Id: Ieda359806c09a019840b2005446c7ec8b61fdb00
2017-06-26 10:58:36 -07:00
jackqdyulei
d856294bf1
Hide misc in battery settings
...
Hide it in any condition:
1. both in app usage list and device usage list
2. in all targets(i.e. user, userdebug..)
Bug: 62422405
Test: RunSettingsRoboTests
Change-Id: I36bd043942ce7e2353163868bf6d86f422f8e7ee
2017-06-26 10:36:05 -07:00
Andrew Sapperstein
40be7df5df
Dashboard search bar polish
...
Various tweaks to match redlines:
- background is now grey all the time
- the search icon is aligned with the other icons
- the title text is primary colored instead of accent colored
- the background of search bar doesn't scroll anymore
Deletes a bunch of logic to add an initial view that would be
colored based on the first view. It never quite worked right.
Now it's consistent and never moves.
Bug: 37477506
Fixes: 62267378
Fixes: 62379978
Fixes: 62361213
Test: robotests
Change-Id: Iddfd45a64a0a8d0365397a207889d7225d1ebb70
Merged-In: I82c584e8f8ecc6fc298c5cdbce08516c6a069a39
2017-06-26 10:28:49 -07:00
Antony Sargent
843c3ead6d
Add a rename dialog for paired Bluetooth devices
...
This adds an icon to the paired device details page which users can
click on to bring up a dialog for changing the display name for that
device.
We already had a dialog for changing the advertised name of the local
Bluetooth adapter that's used on the main Bluetooth settings page, so
I've made that abstract and created two new subclasses to encapsulate
the slight differences for this use case.
Bug: 62535241
Test: make RunSettingsRoboTests
Change-Id: I1c407f276e12aedf066a336e24b4ccd16d67c4df
2017-06-26 10:20:38 -07:00
Andrew Sapperstein
c217464dca
Dashboard search bar polish
...
Various tweaks to match redlines:
- background is now grey all the time
- the search icon is aligned with the other icons
- the title text is primary colored instead of accent colored
- the background of search bar doesn't scroll anymore
Deletes a bunch of logic to add an initial view that would be
colored based on the first view. It never quite worked right.
Now it's consistent and never moves.
Bug: 37477506
Change-Id: I82c584e8f8ecc6fc298c5cdbce08516c6a069a39
Fixes: 62267378
Fixes: 62379978
Fixes: 62361213
Test: robotests
2017-06-26 10:08:44 -07:00
Andrew Sapperstein
4bac421538
Remove logic for adding a search icon to action bar. am: a2dd9978d4
...
am: a7dd97a4c9
2017-06-25 23:14:45 +00:00
Andrew Sapperstein
a7dd97a4c9
Remove logic for adding a search icon to action bar.
...
am: a2dd9978d4
2017-06-25 23:12:44 +00:00
Andrew Sapperstein
a2dd9978d4
Remove logic for adding a search icon to action bar.
...
No longer used given that we don't show the search icon on any page.
The main settings page now has the search bar.
Change-Id: I9535028298739467e7fa9c75d1a2fb2b2fa3251b
Fixes: 62230804
Bug: 37477506
Test: robotests
2017-06-25 13:51:08 -07:00
Kevin Chyn
cd236f7e60
Remove unnecessary functions from AssistGestureFeatureProvider
...
Fixes: 62945918
Test: make -j RunSettingsRoboTests && manual
Change-Id: I13438e6741a3398d06917b45f098c13df7dff97e
2017-06-24 14:16:47 -07:00
Andrew Sapperstein
8511745982
Merge "Remove PowerUsageFeatureProvider.isAnomalyDetectionEnabled" into oc-dr1-dev am: 74a350f9c9
...
am: ee3e1af182
2017-06-24 05:03:31 +00:00
Jack Yu
3f83028264
Merge "Refactored area update info support" into oc-dr1-dev am: 698dc94151
...
am: fa283cfff1
2017-06-24 04:55:48 +00:00
Andrew Sapperstein
ee3e1af182
Merge "Remove PowerUsageFeatureProvider.isAnomalyDetectionEnabled" into oc-dr1-dev
...
am: 74a350f9c9
2017-06-24 04:54:51 +00:00
Jack Yu
fa283cfff1
Merge "Refactored area update info support" into oc-dr1-dev
...
am: 698dc94151
2017-06-24 04:47:53 +00:00
