Commit Graph

16602 Commits

Author SHA1 Message Date
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
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
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
Fan Zhang
0c6bd7efe7 Properly check wallpaper state before showing suggestion
The old check only considers static wallpaper. So if user set a dynamic
one we still think wallpaper is not set.

Change-Id: I3fa0908b29891cf7b90c24d5a63ce60d5985a70d
Fix: 34719455
Test: make RunSettingsRoboTests
2017-04-21 09:58:29 -07:00
Ajay Nadathur
872efe5914 Merge "Fingerprint suggestion should not be dismissed until fingerprint added" into oc-dev
am: 9e89d528f6

Change-Id: I1ee72cec3e831652d1bae451b8c43d9d8032c74d
2017-04-21 02:23:13 +00:00
TreeHugger Robot
9e89d528f6 Merge "Fingerprint suggestion should not be dismissed until fingerprint added" into oc-dev 2017-04-21 01:56:58 +00:00
jackqdyulei
aaaa4b4b42 Merge "Include type service as type system" into oc-dev
am: 72ca5b0bb2

Change-Id: I74a9883ada03f26ea3e2d22c053958bacae87a2e
2017-04-21 01:54:11 +00:00
TreeHugger Robot
72ca5b0bb2 Merge "Include type service as type system" into oc-dev 2017-04-21 01:45:28 +00:00
Fan Zhang
2c8649f641 Merge "Remove deep link to app store from app header." into oc-dev
am: 8d01d48672

Change-Id: I984df5f918fd0f5cafb5fc73c7edc3ca054c4dc9
2017-04-21 01:40:34 +00:00
TreeHugger Robot
8d01d48672 Merge "Remove deep link to app store from app header." into oc-dev 2017-04-21 01:36:19 +00:00
Fan Zhang
6a2fa09ff4 Merge "Bidi wrap keyboard names before displaying them." into oc-dev
am: b8d6222e23

Change-Id: I46d9cc46789d193d13cdb64f0cccd65dbb1e727f
2017-04-21 01:06:16 +00:00
TreeHugger Robot
b8d6222e23 Merge "Bidi wrap keyboard names before displaying them." into oc-dev 2017-04-21 01:02:35 +00:00
Anas Karbila
cf5053a31f Merge "Settings: PreviewPagerAdapter: copy the full theme" am: b6bbbc91ca am: aaf9fdc5cf
am: bffc5230f7

Change-Id: I545673221d7218cbc8d8196ebb8714c6d822d51a
2017-04-20 23:25:28 +00:00
Anas Karbila
bffc5230f7 Merge "Settings: PreviewPagerAdapter: copy the full theme" am: b6bbbc91ca
am: aaf9fdc5cf

Change-Id: I5d28e158cd1159ad7074cf596752f8cbe54fab1b
2017-04-20 23:22:27 +00:00
Fan Zhang
b61f945e8e Fix disable/force stop app button incorrect state.
The LayoutPreference calls super.onBindPreview, which enables all
children views. This is usually fine because a Preference object has
just one click target. But the LayoutPreference can hold multiple click
targets so we should not force enable everything during every single
bind.

To fix this, we don't call super.onBind, and manually wire up
onClickListener and selectable/focusable state. Everything else from
super.onBind is useless to this preference type.

Change-Id: Ibb89f1be399311b9ee053733a050f04be6aa85e8
Fix: 37452204
Fix: 37538936
Fix: 35633637
Test: make RunSettingsRoboTests
2017-04-20 15:52:12 -07:00
Marie Janssen
c79470d089 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
2017-04-20 15:22:20 -07:00
Daniel Nishi
9e107c5682 Add EXTRA_FROM_STORAGE to photos gallery intent.
Change-Id: I050149f558df0de83e7139354ac54176d7ced162
Fixes: 36991234
Test: Settings robotest
2017-04-20 14:46:28 -07:00
Sundeep Ghuman
e4d80f99a1 Merge "Revert "Force update APs when enabling wifi in WifiSettings."" into oc-dev
am: 76ed3e5344

Change-Id: I7541a423acd06f69fa944a9044a4768e62e76d68
2017-04-20 20:52:45 +00:00
Sundeep Ghuman
76ed3e5344 Merge "Revert "Force update APs when enabling wifi in WifiSettings."" into oc-dev 2017-04-20 20:45:33 +00:00
Fan Zhang
dcc0af50c6 Remove deep link to app store from app header.
The link doesn't actually work and uses wrong icon. There is a working
version at the app info screen already.

Change-Id: I16890bd66e095c3185e12d604d8daba5036ab24c
Fix: 37544209
Test: robotests
2017-04-20 13:45:23 -07:00
Anas Karbila
ada2ea57b4 Settings: PreviewPagerAdapter: copy the full theme
getThemeResId() returns the theme resource id which is defined inside AndroidManifest.xml.
If you set a theme via code (or add extra attributes using applyStyle method), the new theme will not be carried over.
Fix this by using setTo method with the context theme as argument.

Issue: https://issuetracker.google.com/37543358

Test: set new theme via code (or add extra attributes using applyStyle method) and check if they are carried over to the configContext context

Change-Id: I82739fe47b2d5b2d05da4cb3759b630b10dc8c8f
2017-04-20 20:11:00 +00:00
Ajay Nadathur
22ebdd9493 Fingerprint suggestion should not be dismissed until fingerprint added
- Do not dismiss fingerprint suggestion until atleast one fingerprint is
added.

bug: 36578142
Test: robotest & manually verified.
Change-Id: I3151c9ae971666a0964be007103a9b7ad41de5ce
(cherry picked from commit 51ef801b32)
2017-04-20 11:34:54 -07:00
Fan Zhang
b1bdf90c35 Bidi wrap keyboard names before displaying them.
This is needed because keyboard names can contain characters from mixed
locale. Without Bidi wrapping the labels will be garbled and not
readable.

Change-Id: I47668a65d7bef8828ad0424097834929ec12700d
Fix: 37353900
Test: make RunSettingsRoboTests
2017-04-20 11:23:14 -07:00