Sunny Goyal
32df75b686
Merge "Adding key to individual entries in ManagedServiceSettings so that it can be linked using an intent. Also updating the icon loading logic so that it handles AdaptiveIcons properly." into oc-dr1-dev
...
am: 8db0691129
2017-07-08 23:05:38 +00:00
TreeHugger Robot
8db0691129
Merge "Adding key to individual entries in ManagedServiceSettings so that it can be linked using an intent. Also updating the icon loading logic so that it handles AdaptiveIcons properly." into oc-dr1-dev
2017-07-08 23:01:36 +00:00
Sunny Goyal
93fb5863e5
Adding key to individual entries in ManagedServiceSettings so that it can
...
be linked using an intent.
Also updating the icon loading logic so that it handles AdaptiveIcons
properly.
Test: Manually tested on device
Bug: 63418030
Change-Id: I4d818956f2fa0585300d4dfb95ad7a16fe8882d5
Merged-In: I3059e3a562a593bc425d4e778be052ac014a7002
2017-07-08 20:42:04 +00:00
jackqdyulei
d8b92b4d82
Merge "Update summary for "Voice Calls"" into oc-dr1-dev
...
am: 69d6f2840f
2017-07-07 23:57:12 +00:00
TreeHugger Robot
69d6f2840f
Merge "Update summary for "Voice Calls"" into oc-dr1-dev
2017-07-07 23:52:58 +00:00
Doris Ling
67fed2400d
Merge "Increase suggestion/condition card width." into oc-dr1-dev
...
am: fbd8d21588
2017-07-07 23:41:15 +00:00
TreeHugger Robot
fbd8d21588
Merge "Increase suggestion/condition card width." into oc-dr1-dev
2017-07-07 23:35:08 +00:00
Andrew Sapperstein
0d2b782c28
Merge "Duplicate ambient display setting in battery settings." into oc-dr1-dev
...
am: 604df3cc55
2017-07-07 22:48:45 +00:00
Matthew Fritze
01ee9b3cc7
Merge "Add public intent filters to indexing" into oc-dr1-dev
...
am: 50535da16d
2017-07-07 22:46:47 +00:00
TreeHugger Robot
604df3cc55
Merge "Duplicate ambient display setting in battery settings." into oc-dr1-dev
2017-07-07 22:46:05 +00:00
TreeHugger Robot
50535da16d
Merge "Add public intent filters to indexing" into oc-dr1-dev
2017-07-07 22:39:20 +00:00
jackqdyulei
85e771da78
Update summary for "Voice Calls"
...
Change it from "Screen usage 2m" to "2m", since this is not a screen
usage. This cl has effect on all non-app batterySipper.
Bug: 63443732
Test: RunSettingsRoboTests
Change-Id: I027b3234bd7b56738ab31c5dfbc0d8bd7f19186e
2017-07-07 14:52:27 -07:00
Ajay Kumar Nadathur Sreenivasan
3fafe7cf22
Merge "Overlapping text over fingerprint animation" into oc-dr1-dev
...
am: 56787e3e54
2017-07-07 21:33:47 +00:00
Ajay Kumar Nadathur Sreenivasan
56787e3e54
Merge "Overlapping text over fingerprint animation" into oc-dr1-dev
2017-07-07 21:29:07 +00:00
Antony Sargent
ef7f6663ef
Merge "Get rid of spurious gear icon in BT details page" into oc-dr1-dev
...
am: db522a539d
2017-07-07 21:15:48 +00:00
TreeHugger Robot
db522a539d
Merge "Get rid of spurious gear icon in BT details page" into oc-dr1-dev
2017-07-07 21:12:58 +00:00
Andrew Sapperstein
512dc80a42
Duplicate ambient display setting in battery settings.
...
Also fixed a bug where ambient display was duplicated
in search results.
Change-Id: I71e8d9ff12e59ad7b9eb309d1093df1ba67abaae
Merged-In: Iacdb53c70e90f8240da1ed9acec7e382ed1df5de
Fixes: 62298578
Test: robotests
2017-07-07 20:10:09 +00:00
jackqdyulei
3decd57c50
Merge "Create BatterySaverReceiver" into oc-dr1-dev
...
am: 062dedb072
2017-07-07 19:39:06 +00:00
TreeHugger Robot
062dedb072
Merge "Create BatterySaverReceiver" into oc-dr1-dev
2017-07-07 19:31:47 +00:00
Ajay Nadathur
715713d524
Overlapping text over fingerprint animation
...
bug: 63122688
Test: Manually tested and verified using smallest & largest display
settings
Change-Id: I03a6ab380c8d611b69f0b817788ff1f34b47e19d
2017-07-07 12:10:45 -07:00
Antony Sargent
2efec86bae
Get rid of spurious gear icon in BT details page
...
The problem is that we were calling done() on the EntityHeaderController
and passing false for whether to rebind the action buttons, which means
we were getting the default behavior including a visible gear
icon. Passing true to request rebinding causes that icon to be hidden.
Bug: 63405635
Test: make RunSettingsRoboTests
Change-Id: I031f4a2d176ff3be025cc2675d7026a679936b03
2017-07-07 11:31:43 -07:00
Andrew Sapperstein
e0c01c6605
Merge "Search bar polish" into oc-dr1-dev
...
am: d10a1af258
2017-07-07 17:47:19 +00:00
Ajay Kumar Nadathur Sreenivasan
d6e1be947e
Merge "Screen lock type metrics are not reported if user goes back" into oc-dr1-dev
...
am: 9afa37ac3c
2017-07-07 17:40:32 +00:00
TreeHugger Robot
d10a1af258
Merge "Search bar polish" into oc-dr1-dev
2017-07-07 17:39:11 +00:00
Ajay Kumar Nadathur Sreenivasan
9afa37ac3c
Merge "Screen lock type metrics are not reported if user goes back" into oc-dr1-dev
2017-07-07 17:30:15 +00:00
jackqdyulei
aea085bc96
Create BatterySaverReceiver
...
This cl elicits BatterySaverReceiver that listen to the change about
battery state and battery saver state.
BatterySaverController and BatterySaverSettings will use this receiver
to update the UI.
Bug: 32410757
Test: RunSettingsRoboTests
Change-Id: Ia92c6776985b89fe6a8d5b8d80898e502942b9b5
Merged-In: Ia92c6776985b89fe6a8d5b8d80898e502942b9b5
2017-07-07 10:01:52 -07:00
Adrian Roos
cfa37bb121
Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev
...
am: 6d8f0b57af
2017-07-07 16:57:56 +00:00
TreeHugger Robot
6d8f0b57af
Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev
2017-07-07 16:52:44 +00:00
Bill Yi
dc333a317e
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: e371dcf55a
2017-07-07 16:02:10 +00:00
TreeHugger Robot
e371dcf55a
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-07-07 15:45:55 +00:00
Adrian Roos
6953a80804
AOD Settings: Add battery usage warning
...
Change-Id: I14946046c1541e8092ed2b492867730713e3e1ed
Fixes: 33279975
Test: Open Settings > Display. Verify that always on strings contain the increased battery usage warning.
2017-07-07 16:30:04 +02:00
Bill Yi
f6da721f4f
Import translations. DO NOT MERGE
...
Change-Id: I6c862c42b058adf710c961f7c42d108fbf8caf01
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-07 03:12:06 -07:00
Kevin Chyn
6d41ab7958
Merge "Fix Assist Gesture settings check" into oc-dr1-dev
...
am: d0487eff5e
2017-07-07 03:49:36 +00:00
Philip Quinn
7d46906218
Add SeekBarPreference.getMax().
...
am: 648ddd5c83
2017-07-07 03:47:19 +00:00
TreeHugger Robot
d0487eff5e
Merge "Fix Assist Gesture settings check" into oc-dr1-dev
2017-07-07 03:43:12 +00:00
Philip Quinn
648ddd5c83
Add SeekBarPreference.getMax().
...
Bug: 63047816
Test: make -j
Change-Id: I416d044fa32f3aed32c1e6239baf9c57652bca2e
2017-07-07 03:39:40 +00:00
Android Build Merger (Role)
73b6a18d24
Merge "Merge "Reduce spacing in condition cards." into oc-dr1-dev am: 494f82e9b0" into oc-dr1-dev-plus-aosp
2017-07-07 03:01:58 +00:00
Android Build Merger (Role)
7091fa4882
Merge "Merge "Reduce spacing in condition cards." into oc-dr1-dev am: 494f82e9b0" into oc-dr1-dev-plus-aosp
2017-07-07 03:01:56 +00:00
Doris Ling
fb62deac8e
Merge "Reduce spacing in condition cards." into oc-dr1-dev
...
am: 494f82e9b0
2017-07-07 03:01:45 +00:00
Android Build Merger (Role)
c0e8d57a48
Merge "Merge "Update Anomaly detection framework" into oc-dr1-dev am: 690accadc7" into oc-dr1-dev-plus-aosp
2017-07-07 03:01:38 +00:00
Doris Ling
2e215c5117
Merge "Reduce spacing in condition cards." into oc-dr1-dev
...
am: 494f82e9b0
2017-07-07 03:01:37 +00:00
Android Build Merger (Role)
0291cbb58e
Merge "Merge "Update Anomaly detection framework" into oc-dr1-dev am: 690accadc7" into oc-dr1-dev-plus-aosp
2017-07-07 03:01:28 +00:00
jackqdyulei
59907dda14
Merge "Update Anomaly detection framework" into oc-dr1-dev
...
am: 690accadc7
2017-07-07 03:01:26 +00:00
Android Build Merger (Role)
e0d864aae1
Merge "Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev am: 4545d636ec" into oc-dr1-dev-plus-aosp
2017-07-07 03:01:20 +00:00
jackqdyulei
059c4bca53
Merge "Update Anomaly detection framework" into oc-dr1-dev
...
am: 690accadc7
2017-07-07 03:01:16 +00:00
Android Build Merger (Role)
0ee38fa7eb
Merge "Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev am: 4545d636ec" into oc-dr1-dev-plus-aosp
2017-07-07 03:01:08 +00:00
Andrew Sapperstein
0706d091a4
Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev
...
am: 4545d636ec
2017-07-07 03:01:07 +00:00
Android Build Merger (Role)
abe9a99474
Merge "Merge "Update the gesture video container background color." into oc-dr1-dev am: c2002db8cc" into oc-dr1-dev-plus-aosp
2017-07-07 03:01:01 +00:00
Andrew Sapperstein
0fb7d3b5a2
Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev
...
am: 4545d636ec
2017-07-07 03:00:49 +00:00
Doris Ling
091b82a2f3
Merge "Update the gesture video container background color." into oc-dr1-dev
...
am: c2002db8cc
2017-07-07 03:00:47 +00:00
