Commit Graph

35480 Commits

Author SHA1 Message Date
Sean Stout
87350960d7 Merge "Added Night Light Suggestion and tests" into oc-dev am: 1512b07a9b
am: c2ed9f8b7e

Change-Id: I70ce8e5ae91c3eebc8322ebc0f495b572247c8f0
2017-04-04 17:38:14 +00:00
Soroosh Mariooryad
172f888ad5 Adding APIs for smart search ranking.
Test: RunSettingsRoboTests
Bug: 36866337

Change-Id: I20a26e5ac7a57582cea24951120717a4f2c93ce0
2017-04-04 10:33:58 -07:00
Christine Franks
c259cee35f Merge "Changed description for system alert window setting" into oc-dev
am: 48c2d516de

Change-Id: If350524f65a14de2f7c95919f85657a5e2476469
2017-04-04 17:30:39 +00:00
Sean Stout
c2ed9f8b7e Merge "Added Night Light Suggestion and tests" into oc-dev
am: 1512b07a9b

Change-Id: Ia680639585eb6f196b6f3d2cb23b5772224286c4
2017-04-04 17:30:22 +00:00
Christine Franks
48c2d516de Merge "Changed description for system alert window setting" into oc-dev 2017-04-04 17:24:40 +00:00
Sean Stout
1512b07a9b Merge "Added Night Light Suggestion and tests" into oc-dev 2017-04-04 17:19:44 +00:00
jackqdyulei
273ad50a3a Ui changes in battery main page
1. Refine the battery header view
2. Move stats section to the place above power management
3. Add last full charge battery stat
4. Add the disclaimer as a footer

Also update the method name in test file, and this ui changes
also fix the header flash problem.

Bug: 36576021
Bug: 36494178
Test: RunSettingsRoboTests
Change-Id: I9784dbbbe16e61da7287f300183347dd4eee6a2b
(cherry picked from commit edfd09d590)
2017-04-04 10:06:35 -07:00
Tony Mantler
d9db7dfc28 Add AvailableVirtualKeyboardFragment to TV
Allows enabling/disabling IMEs on TV.
Moves InputMethodPreference to SettingsLib.
Also minor code tidying

Bug: 36079941
Test: Keyboard settings still work on Fugu and Ryu
Change-Id: Idf42cf5c46d5bb32db59924819d64f73d533d105
(cherry picked from commit 2ec69563cd)
2017-04-04 15:49:47 +00:00
Jesse Evans
804854cdfe Removes instant apps from certain screens
Removes instant apps from the Special Access screens, as well as
notifications.

Test: make RunSettingsRoboTests
Bug: 36515324
Change-Id: I5b2f0ee3219acd89e2cbdcefed4d9608450395c0
(cherry picked from commit 1c9b6092ee)
2017-04-04 08:34:57 -07:00
Jesse Evans
5c9f7a88b4 Adds the Clear App dialog for Instant Apps
Adds a confirmation dialog for the user when tapping clear app.

From this dialog the user can either cancel, or confirm they
want to clear the app.

Test: make RunSettingsRoboTests

Bug: 36536695
Change-Id: Idffcf5ef318578ae2e075ea2cbb35323d41acade
2017-04-04 08:30:38 -07:00
Christine Franks
3bec2c3c25 Changed description for system alert window setting
Bug: 36070413
Test: make -j100, updated string appears in Settings
Change-Id: I962b17344ea5fc948c35e4d779ed5686df0d09a3
2017-04-04 15:05:16 +00:00
Jack He
fa183f7a49 Fix a crash when an app requests Bluetooth to be discoverable am: ebbfce0bf1
am: 4b27231fd4

Change-Id: Id383dca443a09dd25b520978b9fbe8f5791eb46f
2017-04-04 04:17:31 +00:00
Jack He
4b27231fd4 Fix a crash when an app requests Bluetooth to be discoverable
am: ebbfce0bf1

Change-Id: I3fcdf1abcf7ce42b7f95dc9ca34aad6dac03daff
2017-04-04 04:12:08 +00:00
jackqdyulei
6424c17e3d Update foreground string in battery page
Change foreground app title to "While in active use"

Bug: 36781909
Test: Build
Change-Id: Ideadc5f6efafe22b014380a5c023e4e5e6a47df5
2017-04-03 18:59:47 -07:00
Jack He
ebbfce0bf1 Fix a crash when an app requests Bluetooth to be discoverable
* When an app requests Bluetooth to be discoverable with a timeout and a
  non null EXTRA_PACKAGE_NAME, Settings app should put in the correct
  timeout values in the dialog string

Bug: 36870303
Test: make, try making Bluetooth discoverable via
      ACTION_REQUEST_DISCOVERABLE intent

Change-Id: I0cebc2f20371c9de5f28feb26425422c0777aa45
2017-04-04 01:53:20 +00:00
Jeff Sharkey
5a13d2fc4d Merge "Don't try using a detached fragment." into oc-dev am: b59337c0eb
am: 019946868e

Change-Id: I5e60e805cda5e7210d18027dfd4ddf9382ce50b8
2017-04-04 01:31:09 +00:00
Jeff Sharkey
019946868e Merge "Don't try using a detached fragment." into oc-dev
am: b59337c0eb

Change-Id: I7b52324981b9f6bd71a1497b0d93afbd4dcb7ef9
2017-04-04 01:26:59 +00:00
TreeHugger Robot
b59337c0eb Merge "Don't try using a detached fragment." into oc-dev 2017-04-04 01:18:11 +00:00
Jeff Sharkey
5e2fc68668 Don't try using a detached fragment.
Test: builds, boots
Bug: 36486843
Change-Id: I3e2d2bcd56edcc86370f4b64dabdf155d63f40d3
2017-04-03 17:19:19 -06:00
Doris Ling
03ee253701 Add summary text to Display->Brightness level.
Get the current brightness level from settings provider and set it to
the brightness preference summary.

Change-Id: Ieb4fbc132ec120cf839548f64e9c5f5b52b2f9c2
Fix: 36650108
Test: make RunSettingsRoboTests
2017-04-03 15:26:30 -07:00
TreeHugger Robot
b4e7b17223 Merge "Add AvailableVirtualKeyboardFragment to TV" 2017-04-03 22:04:18 +00:00
Sean Stout
062512641e Added Night Light Suggestion and tests
Bug: 34900174
Test: make ROBOTEST_FILTER=SettingsSuggestionsTest RunSettingsRoboTests
Change-Id: I5b2d4e5debc1403cfcbf9c6ecf9397d1074e3a29
2017-04-03 14:46:25 -07:00
Maurice Lam
ca022e2b9b Merge "Fix suggested action custom view binding" 2017-04-03 21:38:20 +00:00
Maurice Lam
68d6bcd18a Merge "Rebuild suggestions when suggestions are dismissed" 2017-04-03 21:37:59 +00:00
Doris Ling
3ff3b81827 Update USb preference controller to use the new summary texts.
- since the choose usb mode dialog and the preference summary use
separate strings now, the two classes can have their own handling
for getting the title/summary text and hence revert the earlier
change that move the setTitle() and setSummary() from the activity
to controller
- only show summary for the option for "supply power", and don't set
summary for all other options
- update the controller to use the new summary text.
- update test correspondingly.

Change-Id: Ie56eb33ba24262e6f3a2259e4ee5ad6f3bfb8061
Fix: 36234108
Test: make RunSettingsRoboTests
2017-04-03 13:53:11 -07:00
Doris Ling
c5f4120484 Update summary for Connected devices->Printing.
The summary text now shows the number of enabled print services. Update
the flag to only select enabled service from PrintManager.

Bug: 36234108
Test: make RunSettingsRoboTests
Change-Id: I81e1584182edd1f290faa941c7d3ee711a9d67b8
2017-04-03 13:42:26 -07:00
Daniel Nishi
1ee13fd386 Update the automatic storage management preferences.
This updates this page to match the newer mocks. The changes
include:

* Changing the toggle from a switch to a switch bar.
* Removing the Deletion Helper flow from the screen.
* Unit testing the previously untested functionality.

Change-Id: I35eb1e065c9acfbf32a64d659d35e18034025472
Fixes: 36486021
Test: Robotest
2017-04-03 13:05:08 -07:00
Daniel Nishi
38a2a5f425 Fix a unit test regression.
This fixes a StorageSettingsTest regression where the percentage
was no longer being formatted correctly for the test.

Change-Id: I71e03926ad8b3691cebc26aea11e8557c2ba0fea
Fixes: 36858638
Test: Settings Robotest
2017-04-03 13:01:27 -07:00
Sundeep Ghuman
d2831c31c1 Create Espresso test class for WifiSettings.
Bug: b/36403696
Test:  runtest --path
packages/apps/Settings/tests/app/src/com/android/settings/wifi/WifiSettingsUiTest.java

Change-Id: I91306880f620c4a05bfdce35360a1edbcd8a15b7
2017-04-03 12:28:40 -07:00
Maurice Lam
957fc67af2 Disable SetupRedactionInterstitial when complete
When RedactionInterstitial is complete, there is no need to show the
SetupRedactionInterstitial as optional step anymore. Disable it via
package manager when RedactionInterstatial completes.

Test: Manual
Bug: 36696006
Change-Id: I3fd421d6a8a0d24d7ebbe8c1e688a10e00067f2f
2017-04-03 12:09:37 -07:00
Stephen Chen
fb3bdd7ed4 Merge "Add friction icon for metered networks." into oc-dev am: 9b271041a9
am: c1288e2630

Change-Id: If0a2c01310b5d899fcda40f88d6c22c6db445c00
2017-04-03 18:51:58 +00:00
Stephen Chen
c1288e2630 Merge "Add friction icon for metered networks." into oc-dev
am: 9b271041a9

Change-Id: Ic78a948751317a5536a8ee52825c74672b9a7996
2017-04-03 18:40:34 +00:00
Doris Ling
5853f9742f Update Wifi off summary text.
Changed the test from "disabled" to off when wifi is turned off.

Fix: 36296257
Test: make RunSettingsRoboTests
Change-Id: Iae421c15b812fa7a5c3ec841e9d2c28d21063884
2017-04-03 11:40:23 -07:00
Hemant Gupta
06dc823fb7 Merge "Bluetooth: Fix Resource Leak in OPP (1/2)" am: e270a6aa85 am: 2ffab51c0e am: b5e14d5f30
am: ec6815ea7c

Change-Id: I7a49313949a334776b69d12f09c807251005aacd
2017-04-03 18:40:19 +00:00
TreeHugger Robot
9b271041a9 Merge "Add friction icon for metered networks." into oc-dev 2017-04-03 18:24:02 +00:00
Hemant Gupta
ec6815ea7c Merge "Bluetooth: Fix Resource Leak in OPP (1/2)" am: e270a6aa85 am: 2ffab51c0e
am: b5e14d5f30

Change-Id: Ie2246c812f6a34086c19561f62e73f714bdd8eff
2017-04-03 17:57:42 +00:00
Hemant Gupta
b5e14d5f30 Merge "Bluetooth: Fix Resource Leak in OPP (1/2)" am: e270a6aa85
am: 2ffab51c0e

Change-Id: I96e6196c6e1417c3115946d483d6f822367aca11
2017-04-03 17:54:06 +00:00
Hemant Gupta
2ffab51c0e Merge "Bluetooth: Fix Resource Leak in OPP (1/2)"
am: e270a6aa85

Change-Id: Ia5108737add480f2cce52663f13d496653c37320
2017-04-03 17:50:36 +00:00
Treehugger Robot
e270a6aa85 Merge "Bluetooth: Fix Resource Leak in OPP (1/2)" 2017-04-03 17:43:42 +00:00
Amin Shaikh
fa04ad4e8f Fix NPE when forgetting networks. am: 3c0d5ff3d1
am: f73b263583

Change-Id: Ieb5ee707cb977c1bfe8803fb4678c5b8fda0337c
2017-04-02 21:36:50 +00:00
Amin Shaikh
f73b263583 Fix NPE when forgetting networks.
am: 3c0d5ff3d1

Change-Id: I713d50e7ecf31b95990afba7c26e2c0d54177f10
2017-04-02 21:33:55 +00:00
Amin Shaikh
3c0d5ff3d1 Fix NPE when forgetting networks.
- Fixed disablement of ephemeral networks
- Exit out of the fragment when Forget is pressed

Bug: 36723238
Test: m RunSettingsRoboTests and manual testing
Change-Id: I83c09a44dbef0f02a452dc8c3163523a27bd4b63
2017-04-02 12:19:42 -07:00
TreeHugger Robot
5ed1fc855e Merge "Adds the Clear App dialog for Instant Apps" 2017-04-02 18:25:26 +00:00
Jesse Evans
ee37bd1a61 Merge "Removes summary text from Instant Apps details" into oc-dev am: 8fc0d1f948
am: 6ecbdadd6a

Change-Id: I35a9a5dc4fff0253390abcd6af62f06f90e2cf4f
2017-04-02 16:20:33 +00:00
Jesse Evans
6ecbdadd6a Merge "Removes summary text from Instant Apps details" into oc-dev
am: 8fc0d1f948

Change-Id: I806826bd2b7ee5435f132d9f3db234878b9b429f
2017-04-02 16:17:35 +00:00
Jesse Evans
8fc0d1f948 Merge "Removes summary text from Instant Apps details" into oc-dev 2017-04-02 16:13:54 +00:00
Jesse Evans
91c51146a4 Merge "Removes instant apps from certain screens" 2017-04-02 16:09:32 +00:00
Lei Yu
b643a0d30b Merge "Fix crash when opening battery page" 2017-04-02 07:03:48 +00:00
Lei Yu
851e73b8a2 Merge "Ui changes in battery main page" 2017-04-02 07:03:10 +00:00
Bill Yi
760eca3d64 Import translations. DO NOT MERGE am: 66ff06da2f -s ours am: c7ca1bcf70 -s ours
am: ff8eb394ad  -s ours

Change-Id: Ie0a016511f22afefa66f9b2a0a6687f88b8a310f
2017-04-02 04:03:21 +00:00