Commit Graph

37633 Commits

Author SHA1 Message Date
Bill Yi
7df73c0524 Import translations. DO NOT MERGE
Change-Id: I67181f9f767d7edccf78f901ad70e903b123649f
Auto-generated-cl: translation import
2017-06-30 18:02:00 -07:00
Fan Zhang
33a91c5004 Change permission preference to only 1 line summary
am: 32a8568230

Change-Id: I5f4cb35694767adc62d5f094e481d1423a85c93b
2017-07-01 00:45:13 +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
Kevin Chyn
1db30b7749 Assist gesture setting should not be available on unsupported devices
Fixes: 63176246

Test: manual
Change-Id: I17cd338eafd2e1a86d1e82d81bc9817eaf18d57b
2017-06-30 16:27:49 -07:00
jackqdyulei
43cbee6914 Update the method about foreground time.
For now it uses MIN(STATE_TOP_TIME, FOREGROUND_ACTIVITY_TIME) and this
method is used in both display and screen smearing.

Bug: 63080621
Test: RunSettingsRoboTests
Change-Id: I2ca3109697aa66fae67d8b2f4f10c4d08bb99d59
2017-06-30 16:18:29 -07: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
Salvador Martinez
97642af54d Merge "Add BatteryInfo logging to settings" into oc-dr1-dev
am: 9a3b115cc8

Change-Id: I447d0d7689f77b12a0caf9374155883217ff330a
2017-06-30 22:05:53 +00:00
Daniel Nishi
0c48b5a29d Merge "Use normal layout for "Space Used" header." into oc-dr1-dev
am: 7809c3d2f0

Change-Id: I8eddca071d602cedcdcdbd5f65f5dd5265a084a8
2017-06-30 22:05:33 +00:00
TreeHugger Robot
9a3b115cc8 Merge "Add BatteryInfo logging to settings" into oc-dr1-dev 2017-06-30 21:58:38 +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
e7e971d2ed Update the gesture video container background color.
The new sets of gesture video has slight different background color,
updating the background of the container to better match that.

Bug: 62517696
Test: Visual
Change-Id: I95cfb8c4c50706b7ce28c778453c5ee115d5ed08
2017-06-30 13:59:16 -07:00
Jason Monk
bc4df21ef7 Allow clicking on guest user
am: c1cc9fefa8

Change-Id: I828716ff982cd2f8bedc96b74c1abc44716cc753
2017-06-30 19:43:00 +00: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
Jason Monk
c1cc9fefa8 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
2017-06-30 11:29:40 -04:00
Fan Zhang
517daf43a4 Fix settings robotest
am: 4e34839a1e

Change-Id: I46d6dd639b779f993bc2088608a52165139967fb
2017-06-30 03:49:57 +00:00
Fan Zhang
4e34839a1e Fix settings robotest
Change-Id: I0685b1f47ae286a4fdf78a57c21f7a656804754f
Fix: 63146944
Test: robotest
2017-06-30 01:27:20 +00:00
Sundeep Ghuman
b963c1190f Merge "Don't scroll when removing saved networks." into oc-dr1-dev
am: 1e561edb45

Change-Id: I9fa78596bdcbaeac90aaee55ddcde3f698ad907f
2017-06-30 00:04:37 +00:00
Sundeep Ghuman
1e561edb45 Merge "Don't scroll when removing saved networks." into oc-dr1-dev 2017-06-29 23:56:51 +00:00
Salvador Martinez
cc7c9603db 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
2017-06-29 16:53:27 -07:00
Andrew Sapperstein
8e1c3b9b1b Merge "Fix robotests." into oc-dr1-dev
am: db72caf3ea

Change-Id: I8893ca932f1cfcb20d72609eaf994bc7ddb9f143
2017-06-29 23:35:26 +00:00
Andrew Sapperstein
db72caf3ea Merge "Fix robotests." into oc-dr1-dev 2017-06-29 23:27:24 +00:00
Andrew Sapperstein
51e4a66446 Fix robotests.
Change-Id: Ia0615bfdd303a19b145ead44979a03ccdd29bf41
Fixes: 63141368
Test: robotest
2017-06-29 16:24:32 -07:00
Lei Yu
34c96fff5c Merge "Update strings for anomaly dialog" into oc-dr1-dev
am: 2354fae941

Change-Id: Ief85db7f1134036ced0eac6f07c0d6a15603ee73
2017-06-29 22:13:36 +00:00
Lei Yu
2354fae941 Merge "Update strings for anomaly dialog" into oc-dr1-dev 2017-06-29 22:08:40 +00:00
Shunta Sato
97419f8d52 Merge "Fix Wi-Fi list adds same AP repeatedly" into oc-dr1-dev
am: 9638e020e5

Change-Id: I4c947cddb3ee000bc51dd8ea2f9eefbc54927824
2017-06-29 20:38:03 +00:00
TreeHugger Robot
9638e020e5 Merge "Fix Wi-Fi list adds same AP repeatedly" into oc-dr1-dev 2017-06-29 20:31:18 +00: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
Doris Ling
cf57e17791 Merge "Add account sync summary." into oc-dr1-dev
am: 5243d5dd85

Change-Id: I00eb5bae671c4e4427c8af04abb541b0f1e74d60
2017-06-29 19:02:29 +00:00
Daniel Nishi
05d49497b9 Storage item preferences should be 72dp tall.
In changing the layout, this also centers the icon properly.

Change-Id: I8fa36e18cf4a0d5765ccbe65a7975fd71832a9ae
Fixes: 62548432
Bug: 62581475
Test: Manual
2017-06-29 12:01:59 -07:00
TreeHugger Robot
5243d5dd85 Merge "Add account sync summary." into oc-dr1-dev 2017-06-29 18:58:58 +00:00
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
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
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
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
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
Maurice Lam
864d5c96d7 Merge "Read theme for lock screen flows" into oc-dr1-dev 2017-06-29 01:47:14 +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
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
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
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
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