Commit Graph

37294 Commits

Author SHA1 Message Date
Mikhail Malakhov
933cdd5503 Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing"
am: c7697e9b8a

Change-Id: Ic9bdabec50ba8b72656c0d5fc0b56551ad3a46cb
2017-06-03 22:16:48 +00:00
Treehugger Robot
c7697e9b8a Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing" 2017-06-03 22:11:13 +00:00
Tony Mantler
02ca8da6ee Merge "Move strings to SettingsLib so TV can use them" into oc-dev am: 685041559a
am: ea71adb730  -s ours

Change-Id: Id876c24798a8f1a95e39915be3f6201ac0c9103a
2017-06-03 22:05:21 +00:00
Tony Mantler
ea71adb730 Merge "Move strings to SettingsLib so TV can use them" into oc-dev
am: 685041559a

Change-Id: I9ff3757e28b82caac7d83394f3734eee040a7b00
2017-06-03 22:00:17 +00:00
Fan Zhang
9011a67431 Add a suggestion: showing new device features
- New suggestion activity
- Removed useless api SuggestionFeatureProvider.isPresent().

- Also updated support activity search indexing icon and summary

Change-Id: Ib52cf26a985f57bf0aac918606b10f75bd024639
Fix: 62034077
Fix: 62196070
Test: make RunSettingsRoboTests
2017-06-03 14:51:09 -07:00
TreeHugger Robot
685041559a Merge "Move strings to SettingsLib so TV can use them" into oc-dev 2017-06-03 21:40:56 +00:00
TreeHugger Robot
75c1fcb7fb Merge "Combine settings suggestion and condition." 2017-06-03 18:49:54 +00:00
Bill Yi
016a542876 Import translations. DO NOT MERGE
Change-Id: I2484f37f3299006a02b28681ccd1be87123dba7b
Auto-generated-cl: translation import
2017-06-03 11:42:52 -07:00
Bill Yi
6dbf0f9cf1 Import translations. DO NOT MERGE
Change-Id: I3a1b048bab26b99a535ccdb42ab21002935a5fa0
Auto-generated-cl: translation import
2017-06-03 11:04:01 -07:00
TreeHugger Robot
cd0b3240a5 Merge "Move strings to SettingsLib so TV can use them" 2017-06-03 04:29:27 +00:00
Thecrazyskull
f7791d75bf ConditionManager: don't crash when trying to add unexpected condition
* Instead, just don't add the unexpected condition

Test: none

Change-Id: Id768d54e90fac6cbbfdca514e769cb3b331fbc46
2017-06-02 22:50:47 +00:00
TreeHugger Robot
8e7cd4e6fe Merge "String update for setup wizard" 2017-06-02 22:33:57 +00:00
jackqdyulei
214372be19 Use new time format in BatteryInfo
1. Using "h" and "m" instead of "hrs" and "min"
2. Refactor the string to CharSequence so it won't have
TTS issue(i.e read "m" as "meter")
3. Update tests related to this part.

Bug: 37201139
Test: RunSettingsRoboTests
Change-Id: I9cadb511572b2d522d26ab337c171fa69da87475
2017-06-02 15:15:16 -07:00
Tony Mantler
94c717f239 Move strings to SettingsLib so TV can use them
Bug: 38496265
Test: Compiles
Change-Id: Iea90cbcf858cd598af4adc017e673e299a62ed39
Merged-In: Iea90cbcf858cd598af4adc017e673e299a62ed39
2017-06-02 15:10:18 -07:00
TreeHugger Robot
907810953c Merge "Add strings to use in Bluetooth device forget confirmation" 2017-06-02 22:01:57 +00:00
Doris Ling
83a6621b38 Combine settings suggestion and condition.
- Add a flag in dashboard feature provider to specify whether to use the
combined UI for suggestions and conditions.
- Move Conditions below Suggestions.
- Add dashboard entity for condition and suggestion container, and
  wrap the condition and suggestion list inside the container. The
  container itself will be a single dashboard item, and within it will
  be the list of suggestion or condition.
- Add suggestion/condition header that will show the combined info for
  the conditions and suggestion data, and have the expand button to
  control expanding both the suggestion and condition list.
- Change the individual condition card to be always expanded, and
remove the logic to collapse/expand individual condition card.
- Remove the divider between the action button and condition detail
  within each condition card.
- Add suggestion/condition footer for collapsing the whole suggestion and
  condition list.

Bug: 37645754
Test: make RunSettingsRoboTests
Change-Id: I86df75f7e4551778f79d730851c03121fd0dcbdf
2017-06-02 14:59:48 -07:00
Tony Mantler
b8950510ba Move strings to SettingsLib so TV can use them
Bug: 38496265
Test: Compiles
Change-Id: Iea90cbcf858cd598af4adc017e673e299a62ed39
2017-06-02 14:55:18 -07:00
TreeHugger Robot
2e30bca800 Merge "Updating the search ranking API and some improvements:" 2017-06-02 20:49:28 +00:00
Peter Qiu
feba9f5dac Merge "wifi: use WifiSavedConfigUtils to retrieve saved configurations" into oc-dev am: 7eeca4b052
am: d8895787c9

Change-Id: I4a8f9ed8661f9af6105456c3a0d681373768dc40
2017-06-02 20:45:36 +00:00
Peter Qiu
d8895787c9 Merge "wifi: use WifiSavedConfigUtils to retrieve saved configurations" into oc-dev
am: 7eeca4b052

Change-Id: I5a8daed2e821623aaa953ccf256808776f7febdd
2017-06-02 20:38:58 +00:00
TreeHugger Robot
7eeca4b052 Merge "wifi: use WifiSavedConfigUtils to retrieve saved configurations" into oc-dev 2017-06-02 20:25:20 +00:00
Lei Yu
fbeab35a25 Merge "Restart loader in onResume" into oc-dev am: 74ca6aa060
am: 64c87589c5  -s ours

Change-Id: I8f00cfce679daa7e2e3e20589b21c109ab35f35c
2017-06-02 19:32:08 +00:00
Lei Yu
64c87589c5 Merge "Restart loader in onResume" into oc-dev
am: 74ca6aa060

Change-Id: I4cc76a8eeee55335bd6a4ab7d6870084ec609f9b
2017-06-02 19:29:09 +00:00
Lei Yu
74ca6aa060 Merge "Restart loader in onResume" into oc-dev 2017-06-02 19:21:29 +00:00
Soroosh Mariooryad
733bbf7c34 Updating the search ranking API and some improvements:
- Ranking API is modified to run the ranking asynchronous to the main thread.
Therefore, it can now run in parallel to loading the results from DB
which decreases the overall latency.
- Ranking API now supports reporting failure from the ranker
implementation side.
- Settings that are not ranked by the ranker algorithm are now ranked at
the end of the list. This is added for dynamic settings (e.g., apps).
- Failure handling mechanism is added for cases that ranker catches an
exception or it takes a long time to respond.

Bug: 37312700
Fixes: 36866337
Fixes: 36867476
Fixes: 36866736
Fixes: 36866838

Test: RunSettingsRoboTests

Change-Id: I3a2a97e3a07a8d4afbb090061d92172a27588ee7
2017-06-02 12:09:20 -07:00
Alison Cichowlas
0f7e904dbe Merge "Delay adding app settings link until data fetch returns, to avoid reordering/visible misplaced "additional settings in the app" during transition." into oc-dev am: e811873b4e
am: f62c6372e8

Change-Id: Ic1434ccc7a4ec01957a7d1219fa5cf6cc1f84948
2017-06-02 18:52:33 +00:00
Suprabh Shukla
3aeffe5e9d Merge "Always returning the updated preference summary" 2017-06-02 18:51:10 +00:00
Alison Cichowlas
f62c6372e8 Merge "Delay adding app settings link until data fetch returns, to avoid reordering/visible misplaced "additional settings in the app" during transition." into oc-dev
am: e811873b4e

Change-Id: Ia4def66e47faf702c22a4e3aba04d52965052aa8
2017-06-02 18:49:29 +00:00
TreeHugger Robot
e811873b4e Merge "Delay adding app settings link until data fetch returns, to avoid reordering/visible misplaced "additional settings in the app" during transition." into oc-dev 2017-06-02 18:42:25 +00:00
TreeHugger Robot
3c292444b0 Merge "Simplify InlineSwitchPayloads and generalize get/set method" 2017-06-02 18:06:49 +00:00
jackqdyulei
ee01dcc74a Restart loader in onResume
We need to refresh batterystatsHelper in onResume, so we need to
call restartLoader instead of initLoader

Bug: 62237848
Test: RunSettingsRoboTests
Change-Id: I6f7e1b57b945c92d34587ca24db192600e7f797f
Merged-In: I6f7e1b57b945c92d34587ca24db192600e7f797f
2017-06-02 10:21:32 -07:00
Peter Qiu
1fcb026a3a wifi: use WifiSavedConfigUtils to retrieve saved configurations
Bug: 62048284
Test: manual test
Change-Id: Ib1719af1b256020bbf57d07ebe8c29ac1c460c1a
2017-06-02 17:16:54 +00:00
Lei Yu
f91dc2b064 Merge "Refine the ProgressCategory" into oc-dev am: 5f4f1b81af
am: f2379e2ed3

Change-Id: Ibc809ffa4740e9f4a51975c4cdc94b5ff3f4643a
2017-06-02 17:16:53 +00:00
Lei Yu
f2379e2ed3 Merge "Refine the ProgressCategory" into oc-dev
am: 5f4f1b81af

Change-Id: I2b0fda608b8fe33eaa8ba6e7580c3becc1ebad71
2017-06-02 17:13:55 +00:00
Lei Yu
5f4f1b81af Merge "Refine the ProgressCategory" into oc-dev 2017-06-02 17:08:45 +00:00
Alison Cichowlas
5cdcb40cd3 Merge "Disallow buzz/beep/disturb changes for notifications with locked importance." into oc-dev am: 3efc502840
am: 5698552021

Change-Id: Ib0a9db86ea0191c4cd487842eb9ce49b9e6db2e0
2017-06-02 17:02:30 +00:00
Alison Cichowlas
5698552021 Merge "Disallow buzz/beep/disturb changes for notifications with locked importance." into oc-dev
am: 3efc502840

Change-Id: Ib9006beaec685ef91583278585c9522f995d3c09
2017-06-02 16:56:59 +00:00
TreeHugger Robot
3efc502840 Merge "Disallow buzz/beep/disturb changes for notifications with locked importance." into oc-dev 2017-06-02 16:46:52 +00:00
Alison Cichowlas
1765820203 Merge "Add group name into channel summary, if applicable." into oc-dev am: 4b29f593f0
am: b143e15dd1  -s ours

Change-Id: I74811fefac1d831c4f851bfa783b1e0aee20f41a
2017-06-02 16:37:50 +00:00
Alison Cichowlas
b143e15dd1 Merge "Add group name into channel summary, if applicable." into oc-dev
am: 4b29f593f0

Change-Id: Ia4c0c9a506894033471b563f89e02a35cbf25601
2017-06-02 15:48:25 +00:00
Alison Cichowlas
4b29f593f0 Merge "Add group name into channel summary, if applicable." into oc-dev 2017-06-02 15:39:44 +00:00
Matthew Fritze
2b1a88da3d Simplify InlineSwitchPayloads and generalize get/set method
InlineSwitchPayload now assumes that all switches will be
stored as 1 or 0, which simplifies the code.

Moves Availability into ResultPayload, so that custom
payloads can be created to set/get values which are more
complicated than stotring ints (like bluetooth or DnD),
and give more expressive reasons when unavailable.

Bug: 62022517
Test: make RunSettingsRoboTests
Change-Id: I87e6fc041bfd398e7daf6e6e479d502930d36f0f
2017-06-02 08:23:45 -07:00
Bartosz Fabianowski
09ddef953b Hide "Changes made by your organization's admin" when empty am: 493495452a
am: 98b216dc05  -s ours

Change-Id: Icd55cf9ce8a18578be783d057bd92a8ebdf639e0
2017-06-02 13:34:12 +00:00
Bartosz Fabianowski
98b216dc05 Hide "Changes made by your organization's admin" when empty
am: 493495452a

Change-Id: Ided6278456fe5ffdbb843717a1ec7070e7a3d3dc
2017-06-02 13:30:12 +00:00
Bartosz Fabianowski
493495452a Hide "Changes made by your organization's admin" when empty
The admin of a manged device can take a number actions that will be
listed in the "Changes made by your organization's admin" section of
Settings. If the admin has not taken any such actions, the section
will be empty and should be hidden. This is accomplished by having a
PreferenceController for the section that observes the state of the
PreferenceControllers inside it.

Bug: 35912953
Test: m RunSettingsRoboTests

Merged-in: Ia95754493ee6c5a19b4aa9731fd56fd558e61849

Change-Id: I82ca00b757001390f9a517b0c07057bdc49dab20
2017-06-02 13:45:40 +02:00
Bartosz Fabianowski
55038c0a95 Hide "Changes made by your organization's admin" when empty
The admin of a manged device can take a number actions that will be
listed in the "Changes made by your organization's admin" section of
Settings. If the admin has not taken any such actions, the section
will be empty and should be hidden. This is accomplished by having a
PreferenceController for the section that observes the state of the
PreferenceControllers inside it.

Bug: 35912953
Test: m RunSettingsRoboTests

Change-Id: Ia95754493ee6c5a19b4aa9731fd56fd558e61849
2017-06-02 11:40:41 +02:00
Lorenzo Colitti
beafc36360 Minor tweaks to WifiDetailPreferenceControllerTest.
Add makeNetworkCapabilities and updateNetworkCapabilities
methods, and use them. These are not very useful in the current
code but we introduce in their own CL to limit test changes in an
upcoming CL that will make use them to test new code.

Bug: 62209358
Test: make -j64 RunSettingsRoboTests
Change-Id: I67269e1add40ecb3c2b693548e8bf29ae776a79f
2017-06-02 17:56:52 +09:00
Esteban Talavera
c62ce670c3 Merge "Include disabled managed profiles in Accounts page" into oc-dev am: 92f78354f9
am: 42d97f86c2

Change-Id: If2708bc27673b50dfdf7faa3300944d8bdb47b60
2017-06-02 08:42:50 +00:00
Esteban Talavera
42d97f86c2 Merge "Include disabled managed profiles in Accounts page" into oc-dev
am: 92f78354f9

Change-Id: I3dc5fd6bb4c7466b204946db179b10d9a3c9ccdf
2017-06-02 08:38:51 +00:00
Esteban Talavera
92f78354f9 Merge "Include disabled managed profiles in Accounts page" into oc-dev 2017-06-02 08:33:17 +00:00