Commit Graph

37625 Commits

Author SHA1 Message Date
jackqdyulei
595def292b Merge "Change the type of "hours" from long to double" into oc-dr1-dev
am: 1498e86530

Change-Id: I4bd802fa60da314a7997addbe2920b394d0e4209
2017-06-29 18:41:23 +00:00
TreeHugger Robot
1498e86530 Merge "Change the type of "hours" from long to double" into oc-dr1-dev 2017-06-29 18:38:39 +00:00
Guliz Tuncay
04ac51b23c 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
2017-06-29 18:28:29 +00:00
TreeHugger Robot
b5ef73ebcb Merge "Add ordering attribute to sound setting preferences." 2017-06-29 17:12:36 +00:00
jackqdyulei
d26dcbd95f 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
2017-06-29 10:02:25 -07:00
Andrew Sapperstein
2a800052ad Merge "Use proper title for support page." into oc-dr1-dev am: 05872fc1c7
am: 115f0603eb

Change-Id: I4a1c4b02311fbdbc9bf7ae7158c3f2060e5ba9c9
2017-06-29 16:49:31 +00:00
Andrew Sapperstein
115f0603eb Merge "Use proper title for support page." into oc-dr1-dev
am: 05872fc1c7

Change-Id: Ie8d19b8925328b296879179d4c88af217d66edaa
2017-06-29 16:38:16 +00:00
TreeHugger Robot
05872fc1c7 Merge "Use proper title for support page." into oc-dr1-dev 2017-06-29 16:31:06 +00:00
Andrew Sapperstein
cc7adfd9e0 Merge "Reduce number of wallpaper results in search." into oc-dr1-dev am: 63c63ff640
am: 301dfdd8d1

Change-Id: Iab4d5c24b9ac7cee39af3bcc14631fa09bb455c5
2017-06-29 04:52:32 +00:00
Andrew Sapperstein
301dfdd8d1 Merge "Reduce number of wallpaper results in search." into oc-dr1-dev
am: 63c63ff640

Change-Id: I165409df28685c85ca2edc22971e4471d9ff549f
2017-06-29 04:48:30 +00:00
TreeHugger Robot
63c63ff640 Merge "Reduce number of wallpaper results in search." into oc-dr1-dev 2017-06-29 04:38:44 +00:00
Sundeep Ghuman
14cc864122 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
2017-06-28 20:27:15 -07:00
Shunta Sato
22080a1df5 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
2017-06-28 20:21:46 -07:00
Maurice Lam
21bd3994c4 Merge "Read theme for lock screen flows" into oc-dr1-dev am: 864d5c96d7
am: d3d1210fad

Change-Id: I6f689b5242b122eb2f4388de10acb7e4c7e3b81e
2017-06-29 02:07:19 +00:00
Maurice Lam
d3d1210fad Merge "Read theme for lock screen flows" into oc-dr1-dev
am: 864d5c96d7

Change-Id: I5b70f7ac6ff0c4598f3f409d682c9ff2dec42471
2017-06-29 02:00:33 +00:00
TreeHugger Robot
4ef813efdc Merge "Disable SmartSuggestion conditionally" 2017-06-29 01:55:52 +00:00
Maurice Lam
864d5c96d7 Merge "Read theme for lock screen flows" into oc-dr1-dev 2017-06-29 01:47:14 +00:00
jackqdyulei
0e852e4113 Merge "Add metric action log for anomaly action" into oc-dr1-dev am: 43afb664e6
am: b58333f46e

Change-Id: If798eac93947126cbdee7c02ee69a792d3032d18
2017-06-29 01:19:16 +00:00
jackqdyulei
b58333f46e Merge "Add metric action log for anomaly action" into oc-dr1-dev
am: 43afb664e6

Change-Id: I8cd38faa751b9fabbe9164d90b0e73199b28bf94
2017-06-29 01:15:33 +00:00
Doris Ling
bcd2322fa6 Merge "Change to use new suggestion/condition UI." into oc-dr1-dev am: 9df70249b9
am: 5d66fa4c94  -s ours

Change-Id: Ic17a6314f3088e40a01f34bef67282696ec0bbbb
2017-06-29 01:15:23 +00:00
Fan Zhang
2e72dda1aa 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
2017-06-28 18:14:18 -07:00
Doris Ling
5d66fa4c94 Merge "Change to use new suggestion/condition UI." into oc-dr1-dev
am: 9df70249b9

Change-Id: I4d245fa2b74d5e6967a522455584971b8c9fb711
2017-06-29 01:11:57 +00:00
TreeHugger Robot
2d6930b2df Merge "Add account sync summary." 2017-06-29 01:11:43 +00:00
TreeHugger Robot
43afb664e6 Merge "Add metric action log for anomaly action" into oc-dr1-dev 2017-06-29 01:10:42 +00:00
TreeHugger Robot
9df70249b9 Merge "Change to use new suggestion/condition UI." into oc-dr1-dev 2017-06-29 01:04:58 +00:00
Andrew Sapperstein
3d246e607d Use proper title for support page.
Was using settings, now using "support & tips".

Change-Id: Ic79d256e841afb52048e9584279a111f6a121504
Fixes: 62903819
Test: manual
2017-06-28 17:57:53 -07:00
jackqdyulei
985aa11e1a Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev am: 33c9b7a111
am: 9d57855c96

Change-Id: Ib387fc18e5352afddf698f0108fc78c71b66dc88
2017-06-29 00:53:14 +00:00
jackqdyulei
9d57855c96 Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev
am: 33c9b7a111

Change-Id: I63328028c7620792ca619cb63c5d0b048413eda5
2017-06-29 00:48:47 +00:00
TreeHugger Robot
33c9b7a111 Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev 2017-06-29 00:43:09 +00:00
Andrew Sapperstein
ebaab6aabd 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
2017-06-28 17:16:57 -07:00
Sundeep Ghuman
77a58c7b8c Merge "Scroll to top when connecting to network." into oc-dr1-dev am: ea3d314a10
am: 9ff2435ebc

Change-Id: Ia9041ca6f1a3fcfc707b9e3f93a06a1612226606
2017-06-28 23:40:33 +00:00
Sundeep Ghuman
9ff2435ebc Merge "Scroll to top when connecting to network." into oc-dr1-dev
am: ea3d314a10

Change-Id: I78adb370cf5261611ad0a56effae652c494e9592
2017-06-28 23:36:12 +00:00
TreeHugger Robot
ea3d314a10 Merge "Scroll to top when connecting to network." into oc-dr1-dev 2017-06-28 23:32:13 +00:00
jackqdyulei
8213f102dc 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
2017-06-28 16:20:34 -07:00
Doris Ling
067122a8e4 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
2017-06-28 16:12:38 -07:00
jackqdyulei
ac29684b14 Add metric action log for anomaly action
Change AnomalyAction to abstract class and log the action there.

Bug: 37681923
Test: RunSettingsRoboTests
Change-Id: Ied7a269d4a3f8fcb978165af6e17a9c9952fea49
2017-06-28 15:35:54 -07:00
Maurice Lam
9990f39722 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
2017-06-28 15:06:09 -07:00
Fan Zhang
e199f50d65 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
2017-06-28 14:58:29 -07:00
TreeHugger Robot
b0eaab5738 Merge "Fix preference title typo in saved network screen" 2017-06-28 21:24:55 +00:00
Daniel Nishi
65a628751e Merge "Put the donut on a diet." into oc-dr1-dev am: 2cbe278ad4
am: 7cc286bac7

Change-Id: I7ff03385d589e1fd147f05cd417fbaba144a3e3c
2017-06-28 21:07:26 +00:00
Daniel Nishi
696afbc1cb Merge "Use the proper style for the SpacePreference." into oc-dr1-dev am: ff8312b36b
am: e440fdb769

Change-Id: I2b393b0583f295524eaaa79032f73abc0724469d
2017-06-28 21:07:00 +00:00
Daniel Nishi
7cc286bac7 Merge "Put the donut on a diet." into oc-dr1-dev
am: 2cbe278ad4

Change-Id: I156d0acacd4933247634d7915defa9fbe73a0ba0
2017-06-28 20:59:52 +00:00
Daniel Nishi
e440fdb769 Merge "Use the proper style for the SpacePreference." into oc-dr1-dev
am: ff8312b36b

Change-Id: I44d02a388a2d8c9dd8a797f78fce67a856bc22e5
2017-06-28 20:59:31 +00:00
Daniel Nishi
2cbe278ad4 Merge "Put the donut on a diet." into oc-dr1-dev 2017-06-28 20:54:57 +00:00
Daniel Nishi
ff8312b36b Merge "Use the proper style for the SpacePreference." into oc-dr1-dev 2017-06-28 20:54:29 +00:00
Matthew Fritze
f050ab93d1 Merge "Add synchronous indexing api to SearchFeatureProvider" into oc-dr1-dev am: e2e54e17c7
am: d4075ea983

Change-Id: Ie93718a9af3b3bb4e53dfbf7f43da31c1ee9404a
2017-06-28 20:53:12 +00:00
Matthew Fritze
d4075ea983 Merge "Add synchronous indexing api to SearchFeatureProvider" into oc-dr1-dev
am: e2e54e17c7

Change-Id: Ib8b6696cc232ef492a75180c4ac18ee7685be047
2017-06-28 20:50:22 +00:00
TreeHugger Robot
e2e54e17c7 Merge "Add synchronous indexing api to SearchFeatureProvider" into oc-dr1-dev 2017-06-28 20:44:13 +00:00
Matthew Fritze
5c16030dbc Merge "Add list-select as an inline result" into oc-dr1-dev am: e455c8f377
am: 46483a1a29

Change-Id: Ia2f55440571504c66b67276990e9fde19a1709fa
2017-06-28 20:40:42 +00:00
Doris Ling
e76550a66e Add account sync summary.
- Check for the number of sync adapter that is enabled for the account and
update the summary text for the account sync preference accordingly.
- Add divider above the Remove Account button.

Merged-In: Ic333f62cce9aed0a72771324976ebe3d8e586287
Change-Id: I003d6dd0a070bf123f178b8d9ba7b6657466b905
Fix: 62862167
Test: make RunSettingsRoboTests
2017-06-28 13:37:17 -07:00