OSDN Git Service
Bill Yi [Sat, 1 Jul 2017 16:14:53 +0000 (16:14 +0000)]
Import translations. DO NOT MERGE am:
126ce95bc6 -s ours am:
2626c36d29 -s ours
am:
44a5f4cece -s ours
Change-Id: Ic89fcbaec13f3cee8012d005c99493eed9d6c7d9
Bill Yi [Sat, 1 Jul 2017 16:09:34 +0000 (16:09 +0000)]
Import translations. DO NOT MERGE am:
126ce95bc6 -s ours
am:
2626c36d29 -s ours
Change-Id: Ia3d459b682083ce6b7897439748a2630a143e90e
Bill Yi [Sat, 1 Jul 2017 16:05:02 +0000 (16:05 +0000)]
Import translations. DO NOT MERGE
am:
126ce95bc6 -s ours
Change-Id: Iaa93cedcdc1089409ee0d01bad5edd932acbbcbb
Kevin Chyn [Sat, 1 Jul 2017 03:11:52 +0000 (03:11 +0000)]
Merge "Assist gesture setting should not be available on unsupported devices" into oc-dr1-dev am:
72a94e9f5a
am:
408efb26f0
Change-Id: I696511821f64f7bc09819cf1d45374125b7905c0
Kevin Chyn [Sat, 1 Jul 2017 03:06:52 +0000 (03:06 +0000)]
Merge "Assist gesture setting should not be available on unsupported devices" into oc-dr1-dev
am:
72a94e9f5a
Change-Id: I7748c0537a6eebb1fd460b3039a9a53dc070e19e
TreeHugger Robot [Sat, 1 Jul 2017 02:59:19 +0000 (02:59 +0000)]
Merge "Assist gesture setting should not be available on unsupported devices" into oc-dr1-dev
Bill Yi [Sat, 1 Jul 2017 01:07:52 +0000 (18:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id991a5f419ccb85d8e25a5111b717a84e4de6184
Auto-generated-cl: translation import
TreeHugger Robot [Sat, 1 Jul 2017 01:06:58 +0000 (01:06 +0000)]
Merge "Code cleanup: DashboardAdapter.category is no longer a list"
Fan Zhang [Sat, 1 Jul 2017 00:49:43 +0000 (00:49 +0000)]
Change permission preference to only 1 line summary am:
32a8568230
am:
33a91c5004
Change-Id: I2e32fe198008b05a779dbfc68fc5695fec10f8bb
Fan Zhang [Sat, 1 Jul 2017 00:45:13 +0000 (00:45 +0000)]
Change permission preference to only 1 line summary
am:
32a8568230
Change-Id: I5f4cb35694767adc62d5f094e481d1423a85c93b
Kevin Chyn [Fri, 30 Jun 2017 23:27:49 +0000 (16:27 -0700)]
Assist gesture setting should not be available on unsupported devices
Fixes:
63176246
Test: manual
Change-Id: I17cd338eafd2e1a86d1e82d81bc9817eaf18d57b
TreeHugger Robot [Fri, 30 Jun 2017 23:00:19 +0000 (23:00 +0000)]
Merge "Move the placeholder in Account detail page above Account sync."
TreeHugger Robot [Fri, 30 Jun 2017 22:49:31 +0000 (22:49 +0000)]
Merge "Remove animation from account detail page."
Fan Zhang [Thu, 29 Jun 2017 21:35:41 +0000 (14:35 -0700)]
Code cleanup: DashboardAdapter.category is no longer a list
We only ever display a single DashboardCategory in homepaeg, so the
category doesn't need to be a list in DashboardData/Adapter
Change-Id: I57db02bb45cbc511f0fce1bf33043b51ef9db15c
Fix:
33861822
Test: updated robotests
Fan Zhang [Fri, 30 Jun 2017 22:28:19 +0000 (15:28 -0700)]
Change permission preference to only 1 line summary
Test: visual
Change-Id: I0e397c096eac19d312c5632cd7f0a1856c199b96
Fix:
36413664
Salvador Martinez [Fri, 30 Jun 2017 22:16:47 +0000 (22:16 +0000)]
Merge "Add BatteryInfo logging to settings" into oc-dr1-dev am:
9a3b115cc8
am:
97642af54d
Change-Id: Id4f7032e735067ab9a81476e83003c942eb4f826
Daniel Nishi [Fri, 30 Jun 2017 22:16:23 +0000 (22:16 +0000)]
Merge "Use normal layout for "Space Used" header." into oc-dr1-dev am:
7809c3d2f0
am:
0c48b5a29d
Change-Id: I5c8c53050506127697721c971ba18baca6e50487
Salvador Martinez [Fri, 30 Jun 2017 22:05:53 +0000 (22:05 +0000)]
Merge "Add BatteryInfo logging to settings" into oc-dr1-dev
am:
9a3b115cc8
Change-Id: I447d0d7689f77b12a0caf9374155883217ff330a
Daniel Nishi [Fri, 30 Jun 2017 22:05:33 +0000 (22:05 +0000)]
Merge "Use normal layout for "Space Used" header." into oc-dr1-dev
am:
7809c3d2f0
Change-Id: I8eddca071d602cedcdcdbd5f65f5dd5265a084a8
TreeHugger Robot [Fri, 30 Jun 2017 21:58:38 +0000 (21:58 +0000)]
Merge "Add BatteryInfo logging to settings" into oc-dr1-dev
Daniel Nishi [Fri, 30 Jun 2017 21:54:38 +0000 (21:54 +0000)]
Merge "Use normal layout for "Space Used" header." into oc-dr1-dev
Doris Ling [Fri, 30 Jun 2017 20:43:17 +0000 (13:43 -0700)]
Move the placeholder in Account detail page above Account sync.
Change-Id: I812551f3cccf3b107d2a2532170ef0ef3157bee1
Fix:
62364991
Test: visual
TreeHugger Robot [Fri, 30 Jun 2017 20:16:37 +0000 (20:16 +0000)]
Merge "Sorting search results with TreeSet instead of Collection.sort"
TreeHugger Robot [Fri, 30 Jun 2017 20:07:40 +0000 (20:07 +0000)]
Merge "Also tint the settings icon in DashboardAdapter.setCategory()."
Jason Monk [Fri, 30 Jun 2017 19:51:03 +0000 (19:51 +0000)]
Allow clicking on guest user am:
c1cc9fefa8
am:
bc4df21ef7
Change-Id: I013a1c3eae74d34a05494d7a4a78f51e9ddd3470
Jason Monk [Fri, 30 Jun 2017 19:43:00 +0000 (19:43 +0000)]
Allow clicking on guest user
am:
c1cc9fefa8
Change-Id: I828716ff982cd2f8bedc96b74c1abc44716cc753
Soroosh Mariooryad [Thu, 29 Jun 2017 23:10:33 +0000 (16:10 -0700)]
Sorting search results with TreeSet instead of Collection.sort
Benchmarking shows lower sorting latencies with with TreeSet, specially
with larger lists:
Average Latencies(ms):
list size in [0, 115] list size in [40, 115]
Collection.sort 39.22 77.57
TreeSet 30.23 52.06
Test: RunSettingsRoboTests
Bug:
38197948
Bug:
37312700
Change-Id: I1dd7c77900e8e98e26a8417f2b77582532e1a5f3
Jason Monk [Fri, 30 Jun 2017 15:29:40 +0000 (11:29 -0400)]
Allow clicking on guest user
This is needed since the user switch will be hidden by default in
QS and will show up once multi-user has been activated in some way.
Test: click on guest
Bug:
37152893
Change-Id: I351a5d95e9e8a5e47e388d9f0611924b077754da
TreeHugger Robot [Fri, 30 Jun 2017 15:19:35 +0000 (15:19 +0000)]
Merge "Settings app changes spell checker settings directly without TSM APIs"
Fan Zhang [Fri, 30 Jun 2017 03:53:57 +0000 (03:53 +0000)]
Fix settings robotest am:
4e34839a1e
am:
517daf43a4
Change-Id: I8a8beb1549f625ac2cfa147162b747b5e05df771
Fan Zhang [Fri, 30 Jun 2017 03:49:57 +0000 (03:49 +0000)]
Fix settings robotest
am:
4e34839a1e
Change-Id: I46d6dd639b779f993bc2088608a52165139967fb
Fan Zhang [Fri, 30 Jun 2017 01:25:48 +0000 (18:25 -0700)]
Fix settings robotest
Change-Id: I0685b1f47ae286a4fdf78a57c21f7a656804754f
Fix:
63146944
Test: robotest
Sundeep Ghuman [Fri, 30 Jun 2017 00:12:41 +0000 (00:12 +0000)]
Merge "Don't scroll when removing saved networks." into oc-dr1-dev am:
1e561edb45
am:
b963c1190f
Change-Id: I389ffac52942e382e145de94c166578d6ead48ad
Sundeep Ghuman [Fri, 30 Jun 2017 00:04:37 +0000 (00:04 +0000)]
Merge "Don't scroll when removing saved networks." into oc-dr1-dev
am:
1e561edb45
Change-Id: I9fa78596bdcbaeac90aaee55ddcde3f698ad907f
Sundeep Ghuman [Thu, 29 Jun 2017 23:56:51 +0000 (23:56 +0000)]
Merge "Don't scroll when removing saved networks." into oc-dr1-dev
Salvador Martinez [Tue, 27 Jun 2017 00:21:05 +0000 (17:21 -0700)]
Add BatteryInfo logging to settings
This Cl adds a few log statements to BatteryInfo to try
and determine what the bottleneck in the Battery Settings
Advanced page could be.
Test: robotests still pass
Bug:
62959645
Change-Id: I1ff712d97bc8be78873c63e187edbffa8e10cd21
Andrew Sapperstein [Thu, 29 Jun 2017 23:42:57 +0000 (23:42 +0000)]
Merge "Fix robotests." into oc-dr1-dev am:
db72caf3ea
am:
8e1c3b9b1b
Change-Id: I2990a108691e8123df1eeefc50f650d0b8d318a6
Andrew Sapperstein [Thu, 29 Jun 2017 23:35:26 +0000 (23:35 +0000)]
Merge "Fix robotests." into oc-dr1-dev
am:
db72caf3ea
Change-Id: I8893ca932f1cfcb20d72609eaf994bc7ddb9f143
Andrew Sapperstein [Thu, 29 Jun 2017 23:27:24 +0000 (23:27 +0000)]
Merge "Fix robotests." into oc-dr1-dev
Andrew Sapperstein [Thu, 29 Jun 2017 22:38:55 +0000 (15:38 -0700)]
Fix robotests.
Change-Id: Ia0615bfdd303a19b145ead44979a03ccdd29bf41
Fixes:
63141368
Test: robotest
Fan Zhang [Thu, 29 Jun 2017 23:21:44 +0000 (23:21 +0000)]
Merge "Change the way we generate stable id for DashboardSummary"
Lei Yu [Thu, 29 Jun 2017 22:17:33 +0000 (22:17 +0000)]
Merge "Update strings for anomaly dialog" into oc-dr1-dev am:
2354fae941
am:
34c96fff5c
Change-Id: I254eb9ccac2190030bc0f920c053f93570b6ef2b
Lei Yu [Thu, 29 Jun 2017 22:13:36 +0000 (22:13 +0000)]
Merge "Update strings for anomaly dialog" into oc-dr1-dev
am:
2354fae941
Change-Id: Ief85db7f1134036ced0eac6f07c0d6a15603ee73
Lei Yu [Thu, 29 Jun 2017 22:08:40 +0000 (22:08 +0000)]
Merge "Update strings for anomaly dialog" into oc-dr1-dev
Doris Ling [Thu, 29 Jun 2017 21:46:09 +0000 (14:46 -0700)]
Remove animation from account detail page.
Set the preference comparison callback to null for the account detail
fragment so that there won't be animation when the we insert the dynamic
tiles.
Change-Id: I35c9fcda500e58d0a18f6ad4ef6f0651166fd70a
Fix:
62365204
Test: visual
Fan Zhang [Thu, 29 Jun 2017 19:58:39 +0000 (12:58 -0700)]
Change the way we generate stable id for DashboardSummary
- The countItem() method generates id based on position of Tile. This is
not truely stable.
- Added stable id constants for static views, and use hash of title as
stable id for tiles.
Bug:
33861822
Test: robotests
Change-Id: Ibbc88c82655503dc3964cb0c430c779dc9c93d41
Shunta Sato [Thu, 29 Jun 2017 20:42:16 +0000 (20:42 +0000)]
Merge "Fix Wi-Fi list adds same AP repeatedly" into oc-dr1-dev am:
9638e020e5
am:
97419f8d52
Change-Id: I06a7a62ca94104bc0b108df1fa53660453a95375
Shunta Sato [Thu, 29 Jun 2017 20:38:03 +0000 (20:38 +0000)]
Merge "Fix Wi-Fi list adds same AP repeatedly" into oc-dr1-dev
am:
9638e020e5
Change-Id: I4c947cddb3ee000bc51dd8ea2f9eefbc54927824
TreeHugger Robot [Thu, 29 Jun 2017 20:31:18 +0000 (20:31 +0000)]
Merge "Fix Wi-Fi list adds same AP repeatedly" into oc-dr1-dev
Daniel Nishi [Thu, 29 Jun 2017 19:37:23 +0000 (12:37 -0700)]
Use normal layout for "Space Used" header.
This fixes the issue where the indentation was wrong.
Change-Id: Ie16bcdec87aa8605d65ac33a05c12d7a26b89b55
Fixes:
62548754
Test: Manual
Doris Ling [Thu, 29 Jun 2017 19:05:56 +0000 (19:05 +0000)]
Merge "Add account sync summary." into oc-dr1-dev am:
5243d5dd85
am:
cf57e17791 -s ours
Change-Id: I58427cf57812c2b52b2f3106c6606f490bd49c39
Doris Ling [Thu, 29 Jun 2017 19:02:29 +0000 (19:02 +0000)]
Merge "Add account sync summary." into oc-dr1-dev
am:
5243d5dd85
Change-Id: I00eb5bae671c4e4427c8af04abb541b0f1e74d60
TreeHugger Robot [Thu, 29 Jun 2017 18:58:58 +0000 (18:58 +0000)]
Merge "Add account sync summary." into oc-dr1-dev
jackqdyulei [Thu, 29 Jun 2017 18:46:28 +0000 (18:46 +0000)]
Merge "Change the type of "hours" from long to double" into oc-dr1-dev am:
1498e86530
am:
595def292b
Change-Id: I7a84119fc64b37c8d6ed32ee05e644f9f860a62e
jackqdyulei [Thu, 29 Jun 2017 18:41:23 +0000 (18:41 +0000)]
Merge "Change the type of "hours" from long to double" into oc-dr1-dev
am:
1498e86530
Change-Id: I4bd802fa60da314a7997addbe2920b394d0e4209
TreeHugger Robot [Thu, 29 Jun 2017 18:38:39 +0000 (18:38 +0000)]
Merge "Change the type of "hours" from long to double" into oc-dr1-dev
Guliz Tuncay [Thu, 22 Jun 2017 23:25:23 +0000 (16:25 -0700)]
Settings app changes spell checker settings directly without TSM APIs
Previously, Settings application was using TextServicesManager APIs to
update any of the spell checker settings (i.e., enabled/disabled, spell
checker, subtype). Since these APIs are used only by the Settings
application, there is no need to expose it to other services and the
Settings application can directly write them to secure settings since it
has the WRITE_SECURE_SETTINGS permission.
Bug:
62950392
Test: Manually as follows.
1. Build and flash an OS image.
2. Complete the setup wizard (if any).
3. Make sure AOSP Keyboard (com.android.inputmethod.latin) is installed
4. Install SampleSpellCheckerService
4.1 tapas SampleSpellCheckerService
4.2. make -j
4.3. adb install -r out/target/product/generic/system/app/SampleSpellCheckerService/SampleSpellCheckerService.apk
5. Go to spell checker settings in the system settings
6. Select 'SampleSpellCheckerService' through Settings app
7. Run
adb shell settings get secure selected_spell_checker
and make sure it returns the following value
com.example.android.samplespellcheckerservice/.SampleSpellCheckerService
8. Run
adb shell settings get secure selected_spell_checker_subtype
and make sure it returns '0'
9. Select 'Android Spell Checker (AOSP)' through Settings app
10. Run
adb shell settings get secure selected_spell_checker
and make sure it returns the following value
com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
11. Run
adb shell settings get secure selected_spell_checker_subtype
and make sure it returns '0'
12. Tap 'Languages' on the spell checker settings to select 'French'
13. Run
adb shell settings get secure selected_spell_checker_subtype
and make sure it returns '102517'
14. Select 'SampleSpellCheckerService' again through Settings app
15. Run
adb shell settings get secure selected_spell_checker
and make sure it returns the following value
com.example.android.samplespellcheckerservice/.SampleSpellCheckerService
16. Run
adb shell settings get secure selected_spell_checker_subtype
and make sure it returns '0'
Test: Manually as follows.
1. Build and flash an OS image.
2. Complete the setup wizard (if any).
3. Make sure AOSP Keyboard (com.android.inputmethod.latin) is installed
4. Install SampleSpellCheckerService
4.1 tapas SampleSpellCheckerService
4.2. make -j
4.3. adb install -r out/target/product/generic/system/app/SampleSpellCheckerService/SampleSpellCheckerService.apk
5. Set the current spell checker service to be AOSP SCS by
adb shell settings put secure selected_spell_checker com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
6. Run a test program that has TextView and tap on one of the
TextViews and type some text.
7. Observe that there is a connection to AOSP SCS by
adb shell dumpsys textservices
8. Set the current spell checker service to be
SampleSpellCheckerService SCS by
adb shell settings put secure selected_spell_checker com.example.android.samplespellcheckerservice/.SampleSpellCheckerService
9. Tap on the same TextView as in Step 6
10. Observe that there is a connection to SampleSpellCheckerService
SCS (for this TextView) by
adb shell dumpsys textservices
Change-Id: I2f3d5282a342bcb42abf995d6e7834241e11cd4f
TreeHugger Robot [Thu, 29 Jun 2017 17:12:36 +0000 (17:12 +0000)]
Merge "Add ordering attribute to sound setting preferences."
jackqdyulei [Wed, 28 Jun 2017 23:32:59 +0000 (16:32 -0700)]
Update strings for anomaly dialog
1. Add message for new force stop dialog, which is used for wakeup alarm
anomaly
2. Change message for background usage dialog by adding the force stop
action
Bug:
63037765
Test: screenshots
Change-Id: I8ecbf9c517eee7e31ae39509c9112b53ef1225c6
Andrew Sapperstein [Thu, 29 Jun 2017 16:49:31 +0000 (16:49 +0000)]
Merge "Use proper title for support page." into oc-dr1-dev am:
05872fc1c7
am:
115f0603eb
Change-Id: I4a1c4b02311fbdbc9bf7ae7158c3f2060e5ba9c9
Andrew Sapperstein [Thu, 29 Jun 2017 16:38:16 +0000 (16:38 +0000)]
Merge "Use proper title for support page." into oc-dr1-dev
am:
05872fc1c7
Change-Id: Ie8d19b8925328b296879179d4c88af217d66edaa
TreeHugger Robot [Thu, 29 Jun 2017 16:31:06 +0000 (16:31 +0000)]
Merge "Use proper title for support page." into oc-dr1-dev
Andrew Sapperstein [Thu, 29 Jun 2017 04:52:32 +0000 (04:52 +0000)]
Merge "Reduce number of wallpaper results in search." into oc-dr1-dev am:
63c63ff640
am:
301dfdd8d1
Change-Id: Iab4d5c24b9ac7cee39af3bcc14631fa09bb455c5
Andrew Sapperstein [Thu, 29 Jun 2017 04:48:30 +0000 (04:48 +0000)]
Merge "Reduce number of wallpaper results in search." into oc-dr1-dev
am:
63c63ff640
Change-Id: I165409df28685c85ca2edc22971e4471d9ff549f
TreeHugger Robot [Thu, 29 Jun 2017 04:38:44 +0000 (04:38 +0000)]
Merge "Reduce number of wallpaper results in search." into oc-dr1-dev
Sundeep Ghuman [Tue, 27 Jun 2017 00:22:08 +0000 (17:22 -0700)]
Don't scroll when removing saved networks.
Bug: b/
62374459
Test: Open saved networks from WifiSettings. Remove a saved network.
Screen should not scroll to the top of the list.
Change-Id: Ia78fc0b5435f659c8fe31abee8b76006d7986b66
Shunta Sato [Mon, 19 Dec 2016 11:30:46 +0000 (19:30 +0800)]
Fix Wi-Fi list adds same AP repeatedly
When switch AP security mode, several same APs are shown.
To fix this issue, append security type to preference
key for avoiding different APs have same key.
git fetch
Cherrypick of:
https://partner-android-review.googlesource.com/#/c/799829/
Bug:
37558394
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
Change-Id: I39621636f14b29e45ba96ff76dc3c21a4996a136
Maurice Lam [Thu, 29 Jun 2017 02:07:19 +0000 (02:07 +0000)]
Merge "Read theme for lock screen flows" into oc-dr1-dev am:
864d5c96d7
am:
d3d1210fad
Change-Id: I6f689b5242b122eb2f4388de10acb7e4c7e3b81e
Maurice Lam [Thu, 29 Jun 2017 02:00:33 +0000 (02:00 +0000)]
Merge "Read theme for lock screen flows" into oc-dr1-dev
am:
864d5c96d7
Change-Id: I5b70f7ac6ff0c4598f3f409d682c9ff2dec42471
TreeHugger Robot [Thu, 29 Jun 2017 01:55:52 +0000 (01:55 +0000)]
Merge "Disable SmartSuggestion conditionally"
Maurice Lam [Thu, 29 Jun 2017 01:47:14 +0000 (01:47 +0000)]
Merge "Read theme for lock screen flows" into oc-dr1-dev
jackqdyulei [Thu, 29 Jun 2017 01:19:16 +0000 (01:19 +0000)]
Merge "Add metric action log for anomaly action" into oc-dr1-dev am:
43afb664e6
am:
b58333f46e
Change-Id: If798eac93947126cbdee7c02ee69a792d3032d18
jackqdyulei [Thu, 29 Jun 2017 01:15:33 +0000 (01:15 +0000)]
Merge "Add metric action log for anomaly action" into oc-dr1-dev
am:
43afb664e6
Change-Id: I8cd38faa751b9fabbe9164d90b0e73199b28bf94
Doris Ling [Thu, 29 Jun 2017 01:15:23 +0000 (01:15 +0000)]
Merge "Change to use new suggestion/condition UI." into oc-dr1-dev am:
9df70249b9
am:
5d66fa4c94 -s ours
Change-Id: Ic17a6314f3088e40a01f34bef67282696ec0bbbb
Fan Zhang [Thu, 29 Jun 2017 01:14:18 +0000 (18:14 -0700)]
Add ordering attribute to sound setting preferences.
The ordering helps injected settings show up before work profile
settings.
Change-Id: Id840b721fc3ef82f53591a16b385965f7a719b67
Fix:
62997256
Test: visual
Doris Ling [Thu, 29 Jun 2017 01:11:57 +0000 (01:11 +0000)]
Merge "Change to use new suggestion/condition UI." into oc-dr1-dev
am:
9df70249b9
Change-Id: I4d245fa2b74d5e6967a522455584971b8c9fb711
TreeHugger Robot [Thu, 29 Jun 2017 01:11:43 +0000 (01:11 +0000)]
Merge "Add account sync summary."
TreeHugger Robot [Thu, 29 Jun 2017 01:10:42 +0000 (01:10 +0000)]
Merge "Add metric action log for anomaly action" into oc-dr1-dev
TreeHugger Robot [Thu, 29 Jun 2017 01:04:58 +0000 (01:04 +0000)]
Merge "Change to use new suggestion/condition UI." into oc-dr1-dev
Andrew Sapperstein [Thu, 29 Jun 2017 00:57:53 +0000 (17:57 -0700)]
Use proper title for support page.
Was using settings, now using "support & tips".
Change-Id: Ic79d256e841afb52048e9584279a111f6a121504
Fixes:
62903819
Test: manual
jackqdyulei [Thu, 29 Jun 2017 00:53:14 +0000 (00:53 +0000)]
Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev am:
33c9b7a111
am:
9d57855c96
Change-Id: Ib387fc18e5352afddf698f0108fc78c71b66dc88
jackqdyulei [Thu, 29 Jun 2017 00:48:47 +0000 (00:48 +0000)]
Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev
am:
33c9b7a111
Change-Id: I63328028c7620792ca619cb63c5d0b048413eda5
TreeHugger Robot [Thu, 29 Jun 2017 00:43:09 +0000 (00:43 +0000)]
Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev
Andrew Sapperstein [Thu, 29 Jun 2017 00:16:57 +0000 (17:16 -0700)]
Reduce number of wallpaper results in search.
Previously we indexed the intent in display settings and every
app that handled ACTION_SET_WALLPAPER. Now, we only index an
app that handles ACTION_SET_WALLPAPER and is the listed package in
config_wallpaper_picker_package.
Change-Id: Ife81702017e3e8be4a754873d9c453fddf1cbd9e
Fixes:
62793068
Test: manual, search wallpaper and observe results
Sundeep Ghuman [Wed, 28 Jun 2017 23:40:33 +0000 (23:40 +0000)]
Merge "Scroll to top when connecting to network." into oc-dr1-dev am:
ea3d314a10
am:
9ff2435ebc
Change-Id: Ia9041ca6f1a3fcfc707b9e3f93a06a1612226606
Sundeep Ghuman [Wed, 28 Jun 2017 23:36:12 +0000 (23:36 +0000)]
Merge "Scroll to top when connecting to network." into oc-dr1-dev
am:
ea3d314a10
Change-Id: I78adb370cf5261611ad0a56effae652c494e9592
TreeHugger Robot [Wed, 28 Jun 2017 23:32:13 +0000 (23:32 +0000)]
Merge "Scroll to top when connecting to network." into oc-dr1-dev
jackqdyulei [Wed, 28 Jun 2017 22:10:44 +0000 (15:10 -0700)]
Change the type of "hours" from long to double
So we won't have the rounding issue here.
Bug:
63112264
Test: RunSettingsRoboTests
Change-Id: I85b3525781074294964a956dbe76f3b55f65704d
Doris Ling [Wed, 28 Jun 2017 23:12:38 +0000 (16:12 -0700)]
Also tint the settings icon in DashboardAdapter.setCategory().
When suggestion loader takes longer time to complete, we will first show
the dashboard with just the categories, and refresh the UI when the
suggestion is ready. However, we only tint the icon when we update both
the categories and suggestions, and hence in some case, some tile
results with icon not being tinted.
Change-Id: I023d50655349731b03c7d7aff153d2cbbd8c63e0
Fix:
37456962
Test: make RunSettingsRoboTests
jackqdyulei [Wed, 21 Jun 2017 22:14:04 +0000 (15:14 -0700)]
Add metric action log for anomaly action
Change AnomalyAction to abstract class and log the action there.
Bug:
37681923
Test: RunSettingsRoboTests
Change-Id: Ied7a269d4a3f8fcb978165af6e17a9c9952fea49
Maurice Lam [Wed, 28 Jun 2017 22:06:09 +0000 (15:06 -0700)]
Read theme for lock screen flows
Move the applyThemeResource calls up from the setup wizard specific
subclasses up to the settings classes so that it will get GLIF v2
theme on devices that request it.
Test: Manual
Bug:
62906814
Change-Id: I6ff4ff8d9ed3e6090b35b4ae7197e5d01f5a61f8
Fan Zhang [Wed, 28 Jun 2017 21:32:39 +0000 (14:32 -0700)]
Disable SmartSuggestion conditionally
The smart suggestion flag should be treated as false when dismissing
first impression type suggestions. Smart suggestion and first impression
suggestions have different dismiss rules.
Change-Id: Ia99d310ddea7baf58b6eadacee8ccda5bf33f311
Fix:
63094854
Test: robotests
TreeHugger Robot [Wed, 28 Jun 2017 21:24:55 +0000 (21:24 +0000)]
Merge "Fix preference title typo in saved network screen"
Daniel Nishi [Wed, 28 Jun 2017 21:07:26 +0000 (21:07 +0000)]
Merge "Put the donut on a diet." into oc-dr1-dev am:
2cbe278ad4
am:
7cc286bac7
Change-Id: I7ff03385d589e1fd147f05cd417fbaba144a3e3c
Daniel Nishi [Wed, 28 Jun 2017 21:07:00 +0000 (21:07 +0000)]
Merge "Use the proper style for the SpacePreference." into oc-dr1-dev am:
ff8312b36b
am:
e440fdb769
Change-Id: I2b393b0583f295524eaaa79032f73abc0724469d
Daniel Nishi [Wed, 28 Jun 2017 20:59:52 +0000 (20:59 +0000)]
Merge "Put the donut on a diet." into oc-dr1-dev
am:
2cbe278ad4
Change-Id: I156d0acacd4933247634d7915defa9fbe73a0ba0
Daniel Nishi [Wed, 28 Jun 2017 20:59:31 +0000 (20:59 +0000)]
Merge "Use the proper style for the SpacePreference." into oc-dr1-dev
am:
ff8312b36b
Change-Id: I44d02a388a2d8c9dd8a797f78fce67a856bc22e5
Daniel Nishi [Wed, 28 Jun 2017 20:54:57 +0000 (20:54 +0000)]
Merge "Put the donut on a diet." into oc-dr1-dev
Daniel Nishi [Wed, 28 Jun 2017 20:54:29 +0000 (20:54 +0000)]
Merge "Use the proper style for the SpacePreference." into oc-dr1-dev
Matthew Fritze [Wed, 28 Jun 2017 20:53:12 +0000 (20:53 +0000)]
Merge "Add synchronous indexing api to SearchFeatureProvider" into oc-dr1-dev am:
e2e54e17c7
am:
d4075ea983
Change-Id: Ie93718a9af3b3bb4e53dfbf7f43da31c1ee9404a
OSDN Git Service
