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
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
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
Doris Ling
40822c1800
Merge "Update the gesture video container background color." into oc-dr1-dev
...
am: c2002db8cc
2017-07-07 02:59:44 +00:00
TreeHugger Robot
fb2b63df05
Merge "Change empty apn type in user entered APN to non-read-only types." into oc-dr1-dev
...
am: 4fffc20ada
2017-07-07 02:38:10 +00:00
Antony Sargent
c608cfcceb
Merge "Add a confirmation dialog when forgetting BT device" into oc-dr1-dev
...
am: 21423623bd
2017-07-07 02:35:24 +00:00
TreeHugger Robot
494f82e9b0
Merge "Reduce spacing in condition cards." into oc-dr1-dev
2017-07-07 02:17:15 +00:00
TreeHugger Robot
690accadc7
Merge "Update Anomaly detection framework" into oc-dr1-dev
2017-07-07 02:13:37 +00:00
TreeHugger Robot
4545d636ec
Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev
2017-07-07 02:02:51 +00:00
TreeHugger Robot
c2002db8cc
Merge "Update the gesture video container background color." into oc-dr1-dev
2017-07-07 01:26:48 +00:00
TreeHugger Robot
4fffc20ada
Merge "Change empty apn type in user entered APN to non-read-only types." into oc-dr1-dev
2017-07-06 23:50:28 +00:00
TreeHugger Robot
21423623bd
Merge "Add a confirmation dialog when forgetting BT device" into oc-dr1-dev
2017-07-06 23:46:39 +00:00
Doris Ling
b91e454050
Reduce spacing in condition cards.
...
- decrease space between title and summary by 12dp.
- decrease space below button by 7dp.
Change-Id: I9caa0507b89367960fb94bf4af07cdd5dd1dbedf
Fix: 63394014
Test: Visual
2017-07-06 16:15:37 -07:00
jackqdyulei
bfc2b11b93
Update Anomaly detection framework
...
This cl make it could have multiple actions for each anomaly type.
This includes:
1. Add field "targetSdkVersion", "bgRestrictionEnabled" in Anomaly
2. Add new action which includes "force stop" and "background check"
3. Add "sdkVersion" and "bgRestrictionEnabled" method in BatteryUtils
4. Update BackgroundCheckAction to check sdkVersion first
5. Update serveral tests and add new test
Bug: 63037765
Test: RunSettingsRoboTests
Change-Id: Iea7a131ee57d501f7737ae4a3ba672d948d05cd8
2017-07-06 15:53:28 -07:00
Android Build Merger (Role)
7e410cc787
Merge "Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev am: 8218511fb7" into oc-dr1-dev-plus-aosp
2017-07-06 22:12:03 +00:00
Maurice Lam
1fd8a6d987
Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev
...
am: 8218511fb7
2017-07-06 22:11:52 +00:00
Android Build Merger (Role)
66037a6ae6
Merge "Merge "Add util method to get battery stats" into oc-dr1-dev am: 55ad60d1ff" into oc-dr1-dev-plus-aosp
2017-07-06 22:11:44 +00:00
Matthew Fritze
956f52d606
Merge "Add util method to get battery stats" into oc-dr1-dev
...
am: 55ad60d1ff
2017-07-06 22:11:11 +00:00
Matthew Fritze
3b32306c54
Merge "Add util method to get battery stats" into oc-dr1-dev
...
am: 55ad60d1ff
2017-07-06 22:11:04 +00:00
Daniel Nishi
a22ecac2f9
Merge "Shrink the music icon." into oc-dr1-dev
...
am: e78190d124
2017-07-06 22:10:37 +00:00
Daniel Nishi
5f27569478
Merge "Update the Storage icons." into oc-dr1-dev
...
am: fa47cebd55
2017-07-06 22:10:18 +00:00
TreeHugger Robot
8218511fb7
Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev
2017-07-06 22:08:51 +00:00
TreeHugger Robot
55ad60d1ff
Merge "Add util method to get battery stats" into oc-dr1-dev
2017-07-06 21:58:33 +00:00
Daniel Nishi
e78190d124
Merge "Shrink the music icon." into oc-dr1-dev
2017-07-06 21:58:01 +00:00
Ajay Nadathur
3d9fffed16
Screen lock type metrics are not reported if user goes back
...
bug: 63116381
Test: Manually tested and verified that metrics are passed back to
setupwizard. Also added robolectric tests
Change-Id: I9d095754addc34121a2a0a12b3e5d1479ff15a78
2017-07-06 14:56:34 -07:00
Daniel Nishi
fa47cebd55
Merge "Update the Storage icons." into oc-dr1-dev
2017-07-06 21:50:49 +00:00
Andrew Sapperstein
ccbb4cfc2c
Use config_headlineFontFamily for password screens.
...
These screens are used whenever setting or confirming the
lockscreen PIN or password. Set them to a consistent textSize (24sp)
and a consistent fontFamily.
Would have set the fontFamily in the style, but unfortunately
setInputType is called on the TextViews after inflation which blows
away the fontFamily. Instead, we set it in code right after that
call.
Change-Id: I77c3f94e2b1ce6d1f19697394c5caa09aac423b0
Fixes: 62873478
Test: manual
2017-07-06 14:30:28 -07:00
