Commit Graph

16276 Commits

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

Change-Id: Ic9e7b20ab191224061a7c43f2292978daa43582e
2017-04-25 21:55:10 +00:00
TreeHugger Robot
d0ea1386ad Merge "Move battery stats loading to AsyncLoader." into oc-dev 2017-04-25 21:44:06 +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
Fan Zhang
7d04b2dab0 Merge changes I4ae01109,Ib45289c3 into oc-dev
am: eda3e8c3d9

Change-Id: I897373ce37fd8352edb27ef954b1dc7792ea7026
2017-04-25 20:22:45 +00: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
Ruchi Kandoi
7094f1d170 Merge "Add searchable index for Bluetooth and Nfc only if the feature exists" into oc-dev
am: 41a858fde1

Change-Id: Ida195181c34d5f53ea544b1a0c81d3154385219e
2017-04-25 19:20:06 +00: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
Charles He
9c5e338850 Merge "Prevent fingerprint from bypassing work challenge" into oc-dev
am: 24157209c5

Change-Id: I9d024aa89a2cf5315ef8e70d5bc93a472411d242
2017-04-25 19:01:35 +00:00
Fan Zhang
e8411c4454 Merge "Properly check wallpaper state before showing suggestion" into oc-dev
am: db68ddc1cc

Change-Id: I9fb77a7f0b01e694d51a4a08ae6f925dc868ce80
2017-04-25 18:59:52 +00:00
TreeHugger Robot
24157209c5 Merge "Prevent fingerprint from bypassing work challenge" into oc-dev 2017-04-25 18:59:34 +00:00
Fan Zhang
c669438450 Merge "Update account sync settings title." into oc-dev
am: a031636725

Change-Id: I77a1df15ab010b355ff1ccd8eb2da98c99487c32
2017-04-25 18:59:34 +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
1bc54ae5eb Merge "Remove STATE_TOP_SLEEPING from foreground time" into oc-dev
am: e5fa4cd4b5

Change-Id: Ic54a96a1fe33a8e733762b40cd3c8a1751619ce4
2017-04-25 18:53:30 +00:00
TreeHugger Robot
e5fa4cd4b5 Merge "Remove STATE_TOP_SLEEPING from foreground time" into oc-dev 2017-04-25 18:36:01 +00: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
61255c0c93 Merge "Update Search UX for OC" into oc-dev
am: 0cdade8a78

Change-Id: Id21676b0e0fe9cb67474fa977f58e6c647db4fa8
2017-04-25 00:59:33 +00:00
TreeHugger Robot
0cdade8a78 Merge "Update Search UX for OC" into oc-dev 2017-04-25 00:55:03 +00:00
Matthew Fritze
8465bd3adb Merge "Prevent search crashes from uninstalled apps" into oc-dev
am: 6d537b6767

Change-Id: I21b6bbf8a2c22fe98e0a2f03fc3f95cb9edc225e
2017-04-25 00:16:20 +00:00
TreeHugger Robot
6d537b6767 Merge "Prevent search crashes from uninstalled apps" into oc-dev 2017-04-25 00:12:34 +00:00
Amit Mahajan
563d2d5a29 Merge "Do not call update() for read only APNs." into oc-dev
am: 8f18f8e087

Change-Id: I4afa467be33359cd09fde8d00b62fc299e01a85a
2017-04-24 22:19:40 +00:00
TreeHugger Robot
8f18f8e087 Merge "Do not call update() for read only APNs." into oc-dev 2017-04-24 22:16:32 +00: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
Daniel Nishi
8c6327cfe5 Merge "Fake data to be 0B after clearing." into oc-dev
am: cba520fc9d

Change-Id: Ica285a037ead3cd869e3905489eb6abeb95c5194
2017-04-24 19:44:09 +00:00
Lei Yu
8c2a018e77 Merge "Add TtsSpan for formatted time." into oc-dev
am: 8f9f25c541

Change-Id: I2a1d2ccf3e7fd6353d58f30617deed756a71ddde
2017-04-24 19:43:33 +00:00
Lei Yu
96cba04e0d Merge "Add device name for connect string" into oc-dev
am: bcaabec925

Change-Id: I83920ad2cecfece9ed7bb4acb50fe6a6068bd51b
2017-04-24 19:43:08 +00:00
Bartosz Fabianowski
154bb00cb0 Only show headers in Master Clear when there are multiple profiles
am: 28ec98cd1f

Change-Id: I125a16685be88cfc309d70550e72247cecbb75cd
2017-04-24 19:42:34 +00: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
Amit Mahajan
b4ac40b204 Do not call update() for read only APNs.
Calling update marks the APN USER_EDITED and thus makes it user
editable.

Test: manual
Bug: 37607890
Change-Id: Ia5aa0df470e04c8bcc58080577cc3da2ab6dc9df
2017-04-24 11:02:03 -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
Bartosz Fabianowski
28ec98cd1f Only show headers in Master Clear when there are multiple profiles
The Master Clear dialog lists the accounts whose data will be lost by
a factory reset. The list contains the headings "Personal" and "Work"
to distinguish accounts in the main user and the work profile. When
there is no work profile, the header (only "Personal" would be shown in
this case) is superfluous and misleading (as the user may be using the
device for work).

Bug: 30132270
Test: Manual :(

Change-Id: Id493652fc331d4500c4d772a9abcc716995565b3
(cherry picked from commit 30ba868014)
2017-04-24 13:51:37 +00:00
Ajay Panicker
344405d87a Merge "Add Bluetooth Pairing notifications to a channel" into oc-dev
am: 8b09195f80

Change-Id: Iced885cd7195ed48920667ef96c0cbbdec587466
2017-04-22 01:53:42 +00:00
TreeHugger Robot
8b09195f80 Merge "Add Bluetooth Pairing notifications to a channel" into oc-dev 2017-04-22 01:49:51 +00:00
Matthew Fritze
a95fc0f05f Merge "Remove duplicates between battery and display settings" into oc-dev
am: 1c7e25d3b6

Change-Id: I1e824de321f7d8eeb9fbcefb22048af0ae5109be
2017-04-22 00:59:40 +00:00
TreeHugger Robot
1c7e25d3b6 Merge "Remove duplicates between battery and display settings" into oc-dev 2017-04-22 00:56:09 +00:00
Ajay Panicker
2432051bfd Add Bluetooth Pairing notifications to a channel
Bug: 37531430
Test: Send a pairing request to DUT from remote phone
Change-Id: I2014b0aa3c4797cbf8e601003471372f4920d21d
2017-04-21 16:44:55 -07: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
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
f1267ddbe1 Merge "Fix disable/force stop app button incorrect state." into oc-dev
am: 6190c159e8

Change-Id: I3aff38236f1eeb69779a53a1b971f83f69bc752d
2017-04-21 21:03:20 +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
Marie Janssen
f8aaed9e1f Bluetooth: Make pairing notification cancellable
Add actions to the pairing service notification so the user can dismiss
the pairing request if they want to.

Add some more information to logs when the user takes an action.

Reformat the file to match android style.

Test: pair from a remote device, dismiss using the new actions
Bug: 36036358
Change-Id: Ie110044bd4caf465f454452737000f01e7430925
(cherry picked from commit c79470d089)
2017-04-21 20:19:20 +00:00
jackqdyulei
5e42c8e012 Merge "Fix wrong voice call time in battery page" into oc-dev
am: 057bd05420

Change-Id: Id1d1c6755333251fa09378815a62211637d939c0
2017-04-21 20:17:47 +00:00
TreeHugger Robot
057bd05420 Merge "Fix wrong voice call time in battery page" into oc-dev 2017-04-21 20:04:08 +00:00
Marie Janssen
f119ab31ad Merge "Bluetooth: Make pairing notification cancellable" am: 6c142b35b4 am: 28bbd5bacb
am: c7ad828691

Change-Id: I1b6a63bdca7a104f993b9114f7c0da18c5e8df22
2017-04-21 18:54:11 +00:00
Marie Janssen
c7ad828691 Merge "Bluetooth: Make pairing notification cancellable" am: 6c142b35b4
am: 28bbd5bacb

Change-Id: I3669fab18c0cf2abffeba566580a04a8135ee7fc
2017-04-21 18:41:41 +00:00