Commit Graph

35568 Commits

Author SHA1 Message Date
Ajay Panicker
80d580731d Limit btsnoop file size (4/8)
Limit btsnoop file size by rotating between snoop files. The rotation occurrs
when a fixed number of packets have been logged and will start overwriting
the older file.

Bug: 35998031
Test: Enable snoop logs from developer options and let logs get large
Change-Id: I94f8f6bc12ab3f7ff406c9392934ecb7209cd635
2017-04-24 10:56:37 -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
Suprabh Shukla
c73508b88d Merge "Updating strings for Install unknown apps" into oc-dev am: 008a9adef9
am: 063bd1d40c

Change-Id: Ic0c4afabdb2bf589f10e0176063e8ab79146cab2
2017-04-22 02:31:44 +00:00
Suprabh Shukla
063bd1d40c Merge "Updating strings for Install unknown apps" into oc-dev
am: 008a9adef9

Change-Id: Ic33d5e774d18ba15723c581b494e625665b73ecc
2017-04-22 02:29:13 +00:00
TreeHugger Robot
008a9adef9 Merge "Updating strings for Install unknown apps" into oc-dev 2017-04-22 02:23:57 +00:00
Ajay Panicker
05d5b83b22 Merge "Add Bluetooth Pairing notifications to a channel" into oc-dev am: 8b09195f80
am: 344405d87a

Change-Id: I1b64ea9a1a35776c06ee3ab256031862b062f61a
2017-04-22 01:56:42 +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
de03948870 Merge "Remove duplicates between battery and display settings" into oc-dev am: 1c7e25d3b6
am: a95fc0f05f  -s ours

Change-Id: I52edd436dd1a4dd97e548993de8a786c3ff17f74
2017-04-22 01:02:39 +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
TreeHugger Robot
4d33effa55 Merge "Revert "Listen to brigtness updates to update brightness summary."" 2017-04-21 22:07:14 +00:00
Suprabh Shukla
075a9f86c4 Merge "Renaming intent action manage unknown sources" into oc-dev am: d796fda4bf
am: 0bf520852d

Change-Id: I12c93a08b0e93b4e7d527a8cf60505ad5b73c6a5
2017-04-21 21:45:30 +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
Suprabh Shukla
0bf520852d Merge "Renaming intent action manage unknown sources" into oc-dev
am: d796fda4bf

Change-Id: I5b477a803bbfae04819abc6d9d8169781a134a99
2017-04-21 21:32:02 +00:00
TreeHugger Robot
d796fda4bf Merge "Renaming intent action manage unknown sources" into oc-dev 2017-04-21 21:22:10 +00:00
Suprabh Shukla
d9e317809f Updating strings for Install unknown apps
Updating some strings for clarity based on ux review.

Test: Manual

Bug: 37362450
     37362065
Change-Id: I26dd191d19ea8f3bd905c2e61ff77c4a2b796b3c
2017-04-21 14:20:56 -07:00
Suprabh Shukla
ed0ba74060 Renaming intent action manage unknown sources
Test: gts-tradefed run gts -m GtsExternalSourcesTestCases

Bug: 37515311
Change-Id: I3ad4ae24b67c6e8e68024bf5e8f73bc6563c443a
2017-04-21 14:20:55 -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
5f42717858 Merge "Remove icons for setting items in app & notification screen" into oc-dev am: 25b6ef1604
am: 63d9ad3dcc

Change-Id: I1676993390f14f45a0a73d31e0fc910fc5f24019
2017-04-21 21:08:00 +00: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
Fan Zhang
63d9ad3dcc Merge "Remove icons for setting items in app & notification screen" into oc-dev
am: 25b6ef1604

Change-Id: Idc68e9a24390842ca8232e2215a0173a33b84e2a
2017-04-21 21:03:40 +00: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
25b6ef1604 Merge "Remove icons for setting items in app & notification screen" into oc-dev 2017-04-21 21:01:30 +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
faa8c37da7 Bluetooth: Make pairing notification cancellable am: f8aaed9e1f
am: a4ad9d41f4

Change-Id: I69692916cf9acd42c3f1cc1314df1ae708d204bd
2017-04-21 20:37:52 +00:00
Marie Janssen
a4ad9d41f4 Bluetooth: Make pairing notification cancellable
am: f8aaed9e1f

Change-Id: I79695ea20185854c971057f50e1853069d32b883
2017-04-21 20:32:18 +00:00
jackqdyulei
da51747c46 Merge "Fix wrong voice call time in battery page" into oc-dev am: 057bd05420
am: 5e42c8e012

Change-Id: I6dd0bf0fe2b4229e05bdc8cb3031c24ce39f3355
2017-04-21 20:29:17 +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
Matthew Fritze
4897eccd5d Revert "Listen to brigtness updates to update brightness summary."
This reverts commit 83e2741bd7.

Change-Id: I93e2cf00ac5ffce7bd4e5951dcbe19c4189ffafd
2017-04-21 20:17:58 +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
Daniel Sheng
4380a8fd7c Merge "Added Trust Agent suggestion category from SUW" 2017-04-21 19:36:41 +00:00
Marie Janssen
87c6aa7cc8 Merge "Bluetooth: Make pairing notification cancellable" am: 6c142b35b4 am: 28bbd5bacb am: c7ad828691
am: f119ab31ad

Change-Id: Ic1c9bcbdd27d7e86f16e87e7f4b548ef86370856
2017-04-21 19:22:25 +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
Marie Janssen
28bbd5bacb Merge "Bluetooth: Make pairing notification cancellable"
am: 6c142b35b4

Change-Id: If7266819da387d53d768e29511c184419a2f8fa5
2017-04-21 18:38:40 +00:00
Treehugger Robot
6c142b35b4 Merge "Bluetooth: Make pairing notification cancellable" 2017-04-21 18:31:46 +00:00
Daniel Nishi
278bea730d Fake data to be 0B after clearing.
The data folder -technically- takes up 16kB of space. By faking it to be
0B immediately after clearing, we can get the UI to look right.

Change-Id: I65321a79fc3266f66f61909682132de176237fb1
Fixes: 34199891
Test: Settings robotest
2017-04-21 11:20:48 -07:00
jackqdyulei
34145705de Fix wrong voice call time in battery page
The voice call is belong to DrainType.PHONE, which is not an app.
This cl stop using method in BatteryUtils to calculate the time, since
that method should only be used for DrainType.APP

Bug: 37402819
Test: RunSettingsRoboTests
Change-Id: I3aa7366401e54df87ffe913af0dcb1bcd5abf110
2017-04-21 11:00:50 -07:00
Daniel Nishi
ca32f1d354 Merge "Add EXTRA_FROM_STORAGE to photos gallery intent." into oc-dev am: bad8171d05
am: f3c3cd97ba

Change-Id: I41a99ae57dbd5abd1309f643831aa9d20e62836a
2017-04-21 17:25:35 +00:00
Daniel Nishi
f3c3cd97ba Merge "Add EXTRA_FROM_STORAGE to photos gallery intent." into oc-dev
am: bad8171d05

Change-Id: I63dde23276126e7d246b5b36bf201acb24e2f9af
2017-04-21 17:22:07 +00:00
Daniel Nishi
bad8171d05 Merge "Add EXTRA_FROM_STORAGE to photos gallery intent." into oc-dev 2017-04-21 17:18:05 +00:00
Daniel Sheng
73ffcd55e8 Added Trust Agent suggestion category from SUW
Bug: 36513986
Test: make RunSettingsRoboTests
Change-Id: I3238864bfeee1601d735daf811898886baa2b204
2017-04-21 10:15:23 -07:00