Commit Graph

2190 Commits

Author SHA1 Message Date
Fan Zhang
4ff09a2eec Merge "Misc search fix" 2017-07-17 19:01:08 +00:00
Kevin Chyn
c457f58b90 Merge "Fix assist gesture keyword" into oc-dr1-dev am: 4b4ad6efc2
am: 14f8431a9f

Change-Id: I37e5bcbcf77661d49d4209d258820fad2faf5aaf
2017-07-15 04:18:53 +00:00
Kevin Chyn
431ce43357 Fix assist gesture keyword
Bug: 63544783

Test: make -j RunSettingsRoboTests
Change-Id: Ief33fa9c556cc5a328401573459c7cbdd0053260
2017-07-14 16:10:12 -07:00
Fan Zhang
4e7bd693b2 Misc search fix
- Remove incorrect summary from set date/time
- Remove some unused resources
- Remove ability to clear individual search history
- Add remove all query history menu item

Change-Id: I4383d075310297163fd2206d1a5b9c8f4ed94078
Fix: 62741488
Fix: 31589605
Test: robotests
2017-07-14 15:29:57 -07:00
Fan Zhang
a7b04ed692 Merge "Show default app icon in default app screen." 2017-07-13 22:41:16 +00:00
TreeHugger Robot
b852f6de93 Merge "Bidi wrap ip address in Wifi config settings" 2017-07-13 22:19:25 +00:00
Fan Zhang
2ea6700336 Show default app icon in default app screen.
- Renamed AdvancedAppSettings to DefaultAppSettings.
- Add logic to DefaultAppPreferenceController to also display icon.
- Modified DefautlAssistPrefController to suppress gear icon, and use
  the controller in default app setting UI to display icon.
- Remove dynamic injected payment setting activity and create the
  setting statically in xml.
- Add DefaultPaymentSettingsPreference to display default payment app
  title (no icon because we can't get it)

Change-Id: I6b8c768da0bafe5ec9a85ba9c79c7993b449be25
Fix: 36458534
Test: robotests
2017-07-13 13:49:28 -07:00
Fan Zhang
0d8ae943d2 Bidi wrap ip address in Wifi config settings
Change-Id: Ic1b8a61dbb05abd71170a0b98e7d1b8e604bbdcb
Fix: 63670324
Test: robotests
2017-07-13 13:19:29 -07:00
Fan Zhang
7b9568c10d UI refresh on bluetooth list page
- xml layout clean up
- add "Device name" preference, tapping will bring up rename dialog
- Remove tap target from original device_name pref

Merged-In: I6e9764dbb6c51f94be6d6a61d5a6401141407409
Change-Id: I9cb67cc557a9b932d7cf795a8d4a6fb5215c4365
Fix: 62890841
Fix: 62891178
Test: robotests
2017-07-13 11:08:18 -07:00
Fan Zhang
f57e167375 UI refresh on bluetooth list page
- xml layout clean up
- add "Device name" preference, tapping will bring up rename dialog
- Remove tap target from original device_name pref

Change-Id: I6e9764dbb6c51f94be6d6a61d5a6401141407409
Bug: 62890841
Bug: 62891178
Test: robotests
2017-07-12 13:24:25 -07:00
Kevin Chyn
1e21688600 Merge "Assist gesture title should not be translated, remove unused strings" into oc-dr1-dev am: 7bde506ed1
am: bab6e592bc

Change-Id: I2e4fd1b07be1de6565dd2842211392d8f6cb3e36
2017-07-11 22:40:16 +00:00
Kevin Chyn
599d4b93f3 Assist gesture title should not be translated, remove unused strings
Bug: 63441962

Test: manual && make -j RunSettingsRoboTests
Change-Id: I8b50ad378828f30f31dbfd648c9fac62af5d9da7
2017-07-11 13:17:37 -07:00
Fan Zhang
1befb49813 Search cleanu-np: remove useless summary from some settings
Change-Id: Ie5c953f594bf1d364c0aa1a99f9363756ac5802f
Fix: 63014636
Test: robotests
2017-07-10 15:36:58 -07:00
Andrew Sapperstein
512dc80a42 Duplicate ambient display setting in battery settings.
Also fixed a bug where ambient display was duplicated
in search results.

Change-Id: I71e8d9ff12e59ad7b9eb309d1093df1ba67abaae
Merged-In: Iacdb53c70e90f8240da1ed9acec7e382ed1df5de
Fixes: 62298578
Test: robotests
2017-07-07 20:10:09 +00:00
Andrew Sapperstein
fedae393ef Duplicate ambient display setting in battery settings.
Also fixed a bug where ambient display was duplicated
in search results.

Change-Id: Iacdb53c70e90f8240da1ed9acec7e382ed1df5de
Fixes: 62298578
Test: robotests
2017-07-07 13:07:54 -07:00
Daniel Nishi
b41f08ce10 Merge "Update the Storage icons." into oc-dr1-dev am: fa47cebd55
am: 5f27569478

Change-Id: Ibd5bf197507154c7c45b875ab46350c70b6f3ee8
2017-07-06 22:30:55 +00:00
Daniel Nishi
fa47cebd55 Merge "Update the Storage icons." into oc-dr1-dev 2017-07-06 21:50:49 +00:00
Lorenzo Colitti
ad25a47e92 Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev am: dcc15eabdf
am: 413d0ac41e

Change-Id: I1521f1a914b7d8514d9eb976f56d5b856caa2a83
2017-07-06 06:36:46 +00:00
TreeHugger Robot
dcc15eabdf Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev 2017-07-06 06:13:55 +00:00
Daniel Sheng
9a16e473ab Removed camera lift gesture settings UI.
Bug: 37154489
Test: make + manual + unit tests
Change-Id: Ifefa07d0e8e0de19d78303352c6f0e01dc1c52ab
Merged-In: I79e70dea12a65fefcb06aca3fd1891a95d856626
2017-07-05 20:24:12 -07:00
Lorenzo Colitti
03c4a7401e Add a developer offload for tethering hardware acceleration.
Bug: 32163131
Test: builds
Change-Id: Icca7bbd2bdd572b1328e7d0fecb663405b115fe1
2017-07-06 12:13:11 +09:00
Daniel Sheng
11d240c300 Removed camera lift gesture settings UI.
Bug: 37154489
Test: make + manual + unit tests
Change-Id: I79e70dea12a65fefcb06aca3fd1891a95d856626
2017-07-05 18:04:10 -07:00
Android Build Merger (Role)
e9e5978576 Merge "Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev am: 6d50576496 am: 5438319677" 2017-07-05 23:21:57 +00:00
TreeHugger Robot
e0f8691abf Merge "Fix alignment for build number preference in RTL." 2017-07-05 23:21:44 +00:00
Antony Sargent
c73c4b4055 Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev am: 6d50576496
am: 5438319677

Change-Id: I1595e3c80b731a4c7f86faa198f2cc6e7f05d710
2017-07-05 23:15:53 +00:00
Antony Sargent
6d50576496 Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev 2017-07-05 22:49:04 +00:00
Sundeep Ghuman
2d1e8a736e Merge "Use EntityHeaderController in WifiDetailPreferenceController." into oc-dr1-dev am: 09229abbf2
am: 4fd8528c2f

Change-Id: Ie183a68e7ae944bad8a2ca3782522afd7f78b74f
2017-07-05 22:43:16 +00:00
TreeHugger Robot
09229abbf2 Merge "Use EntityHeaderController in WifiDetailPreferenceController." into oc-dr1-dev 2017-07-05 22:21:40 +00:00
Daniel Nishi
2872e2c6cc Update the Storage icons.
Change-Id: I10648df80566629c09d03211ed642516595e4b22
Fixes: 62548249
Test: Manual
2017-07-05 14:41:12 -07:00
Fan Zhang
e6b7bc6f15 Fix alignment for build number preference in RTL.
- Fixed by adding BidiFormatter.unicodeWrap around the whole string.

Change-Id: I3ca1292d912062db8c2fead524cd84a19eb80cff
Fix: 63135900
Test: make RunSettingsRoboTests
2017-07-05 14:20:08 -07:00
jackqdyulei
2a6abb5e80 Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev am: 3a9734261d
am: 593049c1d4

Change-Id: Idbdaad128672c06837730863ad2d71446b4642fa
2017-07-05 20:27:29 +00:00
TreeHugger Robot
3a9734261d Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev 2017-07-05 20:21:46 +00:00
Sundeep Ghuman
d569195299 Use EntityHeaderController in WifiDetailPreferenceController.
Switch to the Entity header to bring parity in design of
WifiNetworkDetailsFragment and other Settings pages.

Bug: b/37252029
Test: make -j40 RunSettingsRoboTests
Change-Id: Ib11f3d37eac4dca08fa61eef67910cd328682bac
2017-07-05 12:54:38 -07:00
Fan Zhang
63b43c082d Change permission preference to only 1 line summary am: 32a8568230
am: 33a91c5004

Change-Id: I2e32fe198008b05a779dbfc68fc5695fec10f8bb
2017-07-01 00:49:43 +00:00
Antony Sargent
1b6e7d76ed Fix Bluetooth device details crash on screen rotation
We were getting the following exception when you rotated the Bluetooth
device details screen:

java.lang.RuntimeException: Unable to start activity
ComponentInfo{com.android.settings/com.android.settings.SubSettings}:
java.lang.IllegalStateException: This Activity already has an action bar
supplied by the window decor. Do not request Window.FEATURE_ACTION_BAR
and set android:windowActionBar to false in your theme to use a Toolbar
instead.

It turns out that allowing EntityHeaderController to inflate the
settings_entity_header.xml view seems to cause this - if you instead
manually include a LayoutPreference and hand that to
EntityHeaderController, you don't have the problem.

The rotation failure couldn't be tested with Robolectric because our
version doesn't support using FragmentTestUtil.startFragment for
fragments which use PreferenceScreen's ("sorry, not yet
implemented"). So instead this includes an app test.

Bug: 62447414
Test: runtest --path=BluetoothDeviceDetailsRotationTest.java
Change-Id: I8d052d1f4ab6e2b0ca5c0e513ec366bdcc382d99
2017-06-30 16:34:40 -07:00
TreeHugger Robot
25faa52b34 Merge "Move the placeholder in Account detail page above Account sync." 2017-06-30 23:00:19 +00:00
Fan Zhang
32a8568230 Change permission preference to only 1 line summary
Test: visual
Change-Id: I0e397c096eac19d312c5632cd7f0a1856c199b96
Fix: 36413664
2017-06-30 22:29:27 +00:00
Daniel Nishi
e6e3752dbf Merge "Use normal layout for "Space Used" header." into oc-dr1-dev am: 7809c3d2f0
am: 0c48b5a29d

Change-Id: I5c8c53050506127697721c971ba18baca6e50487
2017-06-30 22:16:23 +00:00
Daniel Nishi
7809c3d2f0 Merge "Use normal layout for "Space Used" header." into oc-dr1-dev 2017-06-30 21:54:38 +00:00
Doris Ling
7ca92571b2 Move the placeholder in Account detail page above Account sync.
Change-Id: I812551f3cccf3b107d2a2532170ef0ef3157bee1
Fix: 62364991
Test: visual
2017-06-30 13:44:24 -07:00
jackqdyulei
a66363a787 Make items in Advanced battery page unclickable.
Because these items only display info and have no click action:
1. foreground time item
2. background time item
3. battery usage item

Bug: 62423725
Test: Build
Change-Id: I8d15be13953c73fce4d5f42711e186673673a036
2017-06-30 11:11:16 -07:00
Daniel Nishi
7aad345862 Use normal layout for "Space Used" header.
This fixes the issue where the indentation was wrong.

Change-Id: Ie16bcdec87aa8605d65ac33a05c12d7a26b89b55
Fixes: 62548754
Test: Manual
2017-06-29 12:37:23 -07:00
TreeHugger Robot
b5ef73ebcb Merge "Add ordering attribute to sound setting preferences." 2017-06-29 17:12:36 +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
TreeHugger Robot
2d6930b2df Merge "Add account sync summary." 2017-06-29 01:11:43 +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
Doris Ling
771848dde0 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.

Bug: 62862167
Test: make RunSettingsRoboTests
Change-Id: Ic333f62cce9aed0a72771324976ebe3d8e586287
2017-06-28 13:18:56 -07:00
Fan Zhang
79d8fbb789 Fix preference title typo in saved network screen
Change-Id: If6df7d42379d8597fcdcd20f71c88376a972ee70
Fix: 33909403
Test: reindex search
2017-06-28 12:17:43 -07:00
Fan Zhang
c144c9c380 Merge "Update icon for language settings" into oc-dr1-dev am: 124232d6fa
am: 6175c9cc6a

Change-Id: I46a0308bf9d3a7aa8397d337e99bc4a09eae2f00
2017-06-27 18:53:25 +00:00
Fan Zhang
b30fb0f580 Update icon for language settings
Change-Id: I74691be4d2e8377640b931a3b05021129ce246d5
Fix: 37929875
Test: visual
2017-06-26 19:01:31 +00:00