Commit Graph

1740 Commits

Author SHA1 Message Date
jackqdyulei
89f27bcc2d Merge "Move battery stats loading to AsyncLoader." into oc-dev am: d0ea1386ad
am: 303672f1d3

Change-Id: I70f8b843f79ddac4a4dd80834a09846296e33667
2017-04-26 10:55:55 +00:00
Fan Zhang
2e02794115 Merge changes I4ae01109,Ib45289c3 into oc-dev am: eda3e8c3d9
am: 7d04b2dab0

Change-Id: Ieece29f0f8488a9932aa96be6958430337df8d4e
2017-04-26 10:55:34 +00:00
Ruchi Kandoi
068ba85a7e Merge "Add searchable index for Bluetooth and Nfc only if the feature exists" into oc-dev am: 41a858fde1
am: 7094f1d170

Change-Id: Idde8d3b3782d8a6d111a9314a6a458ec650405e0
2017-04-26 10:55:10 +00:00
Pavel Grafov
5d567c4786 Disable "Verify apps over usb" according to user restriction.
This is ag/2124876 which fails to automerge oc-dev->master, so
sending as a separate change. Will add Merged-In to the original CL
before submitting to oc-dev.

Bug: 37158436
Test: make ROBOTEST_FILTER=VerifyAppsOverUsbPreferenceControllerTest RunSettingsRoboTests
Change-Id: I52d40f4176ecd660c621ec056649c94fc29f2d4b
2017-04-26 11:54:13 +01:00
TreeHugger Robot
f650c82b16 Merge "Add search index provider for ConfigureNotificationSettings" into oc-dev 2017-04-26 00:06:42 +00:00
Fan Zhang
0576ea48b5 resolve merge conflicts of e8411c4454 to master
Test: make RunSettingsRoboTests
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I7575438bf364f3f4a6ea0372e6216fd5d5a5bb69
2017-04-25 16:16:12 -07:00
Bill Yi
a3f31766c9 Import translations. DO NOT MERGE
Change-Id: Ia07692e881b02a0f4ac62f1a714eb45319d063c8
Auto-generated-cl: translation import
2017-04-25 16:01:58 -07:00
Daniel Nishi
980155fb30 Merge "Don't shows Files when storage is adopted." into oc-dev 2017-04-25 22:30:29 +00:00
Daniel Nishi
32f95292bf Merge "Don't crash on opening ejecting USB." into oc-dev 2017-04-25 22:30:14 +00:00
Daniel Nishi
63a11c56de Always use GB as the unit in Storage Settings.
Bug: 36901322
Test: Settings unit tests

Change-Id: I08c711db6a271522942a01d1adf3e8e5223010f7
2017-04-25 15:23:49 -07:00
Fan Zhang
bd3cbf44ac Merge "Update account sync settings title." into oc-dev am: a031636725
am: c669438450

Change-Id: I5a163d5e3902c04f1006a15e4a330f55f6af0ef9
2017-04-25 22:19:10 +00:00
jackqdyulei
bf922da309 Merge "Remove STATE_TOP_SLEEPING from foreground time" into oc-dev am: e5fa4cd4b5
am: 1bc54ae5eb

Change-Id: I065332475ad70ef81367e37b608e1c18f358d6d6
2017-04-25 22:18:50 +00:00
Sundeep Ghuman
87bf49a436 Force update APs when enabling wifi in WifiSettings.
This reverts commit b2bdc8f17b
and fixes a broken Espresso test case.

Reason for revert: Rolling forward after fix in ag/2133493, to fix b/37324736

Bug: b/37324736
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java

Change-Id: I9cdf8cb1043af5d527eccbd9cc56d3b02419d7ac
2017-04-25 15:12:00 -07:00
TreeHugger Robot
e494a3e59b Merge "Distribute the misc among all the apps" into oc-dev 2017-04-25 21:44:55 +00:00
TreeHugger Robot
d0ea1386ad Merge "Move battery stats loading to AsyncLoader." into oc-dev 2017-04-25 21:44:06 +00:00
Jack He
2a67cf0465 Bluetooth: Dismiss pairing dialog on user click
* Existing pairing dialog should be dismissed when user clicks on Yes/No
* In a pairing session with multiple pairing dialogs, this is necessary
  as otherwise the second pairing dialog will not be shown
* Modified unit test to test this behavior
* Launch pairing dialog as UserHandle.CURRENT to avoid Context warnings

Bug: 35833536
Test: make, unit test, pair with Bluetooth devices
Change-Id: I1823b78d287134505f59eab7caca2329ecc3a36f
2017-04-25 14:13:26 -07:00
Daniel Sheng
e531c540c2 Merge "Added settings UI for camera lift trigger gesture" 2017-04-25 20:43:55 +00:00
jackqdyulei
106dc459e0 Move battery stats loading to AsyncLoader.
It takes 3-4 seconds to load the battery settings page in Ryu. Main
reason is that it takes too long to init BatteryStatsHelper.

This cl moves loading code to AsyncLoader, and we will refresh ui once
the loading part is finished.

Following cl will add animation for the battery header to make it not
so janky

Bug: 37196170
Test: RunSettingsRoboTest
Change-Id: I40dfdde4a072e28a56c8fdf0ec6d671b5109fc6d
2017-04-25 13:26:17 -07:00
TreeHugger Robot
eda3e8c3d9 Merge changes I4ae01109,Ib45289c3 into oc-dev
* changes:
  Remove shadow below app info header.
  Fix ANR in installed app details.
2017-04-25 20:16:20 +00:00
Fan Zhang
a25bc6983e Add search index provider for ConfigureNotificationSettings
Change-Id: I1da8e318a8823ffe54b2edd7a83a8c7e31ee34e6
Fix: 37593839
Test: make RunSettingsRoboTests
2017-04-25 13:01:36 -07:00
TreeHugger Robot
41a858fde1 Merge "Add searchable index for Bluetooth and Nfc only if the feature exists" into oc-dev 2017-04-25 19:05:42 +00:00
Fan Zhang
db68ddc1cc Merge "Properly check wallpaper state before showing suggestion" into oc-dev 2017-04-25 18:55:53 +00:00
Fan Zhang
a031636725 Merge "Update account sync settings title." into oc-dev 2017-04-25 18:55:29 +00:00
jackqdyulei
a245188a65 Distribute the misc among all the apps
Distribute it in:
1. Battery main page(PowerUsageSummary)
2. Advanced battery page(PowerUsageAdvanced)

Bug: 37487061
Test: RunSettingsRoboTests
Change-Id: Id1810b81a6b380d908bcdc18421530e938578c37
2017-04-25 11:48:24 -07:00
TreeHugger Robot
e5fa4cd4b5 Merge "Remove STATE_TOP_SLEEPING from foreground time" into oc-dev 2017-04-25 18:36:01 +00:00
Denis Kuznetsov
f0a61dd112 DO Disclosures: detailed application lists
Add UI that lists enterprise set default apps for handling important intents
(opening browser, using camera, phone, etc).

Bug: 32692748
Test: m RunSettingsRoboTests
Change-Id: I75bb97d1b3728b1dcb90981b24d12edf510c4b04
2017-04-25 16:53:17 +02:00
Denis Kuznetsov
60b2960cbb DO Disclosure: add UI that lists apps that were managed by owner:
- had permissions granted by admin
- were installed by owner via policy

Bug: 32692748
Test: m RunSettingsRoboTests
Change-Id: I365e2f8f351671e68f83cceb7c0ca241d7a5a588
2017-04-25 11:08:56 +02:00
Fan Zhang
f6126e7a00 Fix ANR in installed app details.
InstalledAppDetails tries to refreshUi whenever something about a
package changes. It does not need to refresh when the changing package
is different from what's being displayed.

Change-Id: Ib45289c39ee402cf8974bf52c881f44d225b8be5
Fix: 37424866
Test: make RunSettingsRoboTests
2017-04-24 21:51:32 -07:00
Matthew Fritze
10ad029318 Merge "Update Search UX for OC" into oc-dev am: 0cdade8a78
am: 61255c0c93

Change-Id: I87d9dc74413d8ba34f7ab72dc047f1b29485e74a
2017-04-25 01:02:03 +00:00
TreeHugger Robot
0cdade8a78 Merge "Update Search UX for OC" into oc-dev 2017-04-25 00:55:03 +00:00
Daniel Nishi
1f079fbae4 Don't shows Files when storage is adopted.
One regression from the previous storage view is that the
Files category should not show at all when the storage is adopted.

Fixes: 36786953
Test: Settings robotest

Change-Id: Ice365fabc3bfa66f4c5526ac78bbbfc5e15b7b35
2017-04-24 17:24:51 -07:00
TreeHugger Robot
6d537b6767 Merge "Prevent search crashes from uninstalled apps" into oc-dev 2017-04-25 00:12:34 +00:00
Daniel Nishi
97686254be Merge "Fake data to be 0B after clearing." into oc-dev am: cba520fc9d
am: 8c6327cfe5

Change-Id: If56a028099b9b8eeb66a90fcb617be745ccac2c1
2017-04-24 22:56:01 +00:00
Lei Yu
b4da0a47ab Merge "Add TtsSpan for formatted time." into oc-dev am: 8f9f25c541
am: 8c2a018e77

Change-Id: I509533491925b9c49f9a5c905d1c2e5818978684
2017-04-24 22:55:33 +00:00
Lei Yu
7dc19949a4 Merge "Add device name for connect string" into oc-dev am: bcaabec925
am: 96cba04e0d

Change-Id: I4de396b85b039ea3e9e64040287b21d89cad173d
2017-04-24 22:55:09 +00:00
Daniel Sheng
1721b802c5 Added settings UI for camera lift trigger gesture
Bug: 37154489
Test: manual + make RunSettingsRoboTests

- Added preference fragment for camera lift gesture
- Added activity alias for camera lift gesture setting
- Added resources + overlays for camera lift gesture setting
- Added config flag for limiting camera lift gesture setting for Pixel
- Added Robolectric tests for camera lift gesture settings classes

Change-Id: Ie4846cb1ea6b5279a19f20cb0299426f0d5cbb71
2017-04-24 14:57:55 -07:00
Ruchi Kandoi
7ca6c2410c Add searchable index for Bluetooth and Nfc only if the feature exists
Test: make RunSettingsRoboTests
Bug: 35657961
Change-Id: Ie2f4722b2b1599981c933f87f95016909ba92022
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2017-04-24 13:15:35 -07:00
jackqdyulei
7c6e6e9254 Remove STATE_TOP_SLEEPING from foreground time
That state means the time when app is on top while screen is off,
we should not count it as foreground usage time.

Bug: 37547898
Test: RunSettingsRoboTests
Change-Id: I67e0c135d0c4b71cd667037b0d5dc7673b53607e
2017-04-24 11:37:00 -07:00
Matthew Fritze
d0b42b0322 Update Search UX for OC
- Change text opacity for Search UX
- Update dps between summary and breadcrumbs
- Remove icons for Title items
- Restrict summary to single line

Test: manual
Bug: 36853763
Change-Id: I2acd574ec9c490bbe7097d30c512e58ebe1ad9f2
2017-04-24 11:21:35 -07:00
Daniel Nishi
cba520fc9d Merge "Fake data to be 0B after clearing." into oc-dev 2017-04-24 17:54:20 +00:00
Lei Yu
8f9f25c541 Merge "Add TtsSpan for formatted time." into oc-dev 2017-04-24 17:01:59 +00:00
Lei Yu
bcaabec925 Merge "Add device name for connect string" into oc-dev 2017-04-24 17:00:49 +00:00
TreeHugger Robot
1c7e25d3b6 Merge "Remove duplicates between battery and display settings" into oc-dev 2017-04-22 00:56:09 +00:00
Matthew Fritze
75f55d6e05 Prevent search crashes from uninstalled apps
All search results are now refreshed when resuming the
search fragment, to prevent crashes from results that
no longer exist.

Change-Id: I905465d14f415598ec7a2ebe7b29ed620cde0962
Fixes: 34817357
Test: make RunSettingsRoboTests
Merged-In: I96a0cbfee711ab9dee49d56bfdc4e885202d9ecd
2017-04-21 15:56:44 -07:00
jackqdyulei
471d71bae0 Add device name for connect string
When there are more than one connected device, show
a general summary.

Bug: 37365660
Test: RunSettingsRoboTests
Change-Id: I0eed734e82750969bef97a61dd59167e679c0203
2017-04-21 15:10:56 -07:00
TreeHugger Robot
4d33effa55 Merge "Revert "Listen to brigtness updates to update brightness summary."" 2017-04-21 22:07:14 +00:00
jackqdyulei
f4c1cef322 Add TtsSpan for formatted time.
Talk back will read "Used for 3m" as "Used for 3 meters", but
it will read "Used for 3h 3m" correctly.

This cl add specific Ttsspan if the time only contains "minute"

Bug: 36379530
Test: Run SettingsRoboTests

Change-Id: I033575938cce24221980dddd9d66be4e18804541
2017-04-21 14:42:42 -07:00
Fan Zhang
044dc59acc Update account sync settings title.
Change-Id: I188ec1e53d88a61d854cf70d91effa47cc8b8555
Fix: 36375242
Test: make RunSettingsRoboTests
2017-04-21 14:10:37 -07:00
Fan Zhang
52cf12dd00 Merge "Fix disable/force stop app button incorrect state." into oc-dev am: 6190c159e8
am: f1267ddbe1

Change-Id: Ia7b4cbf0d318e6e8f792c984d5869f31f9bcb29e
2017-04-21 21:07:39 +00:00
TreeHugger Robot
6190c159e8 Merge "Fix disable/force stop app button incorrect state." into oc-dev 2017-04-21 21:00:33 +00:00