OSDN Git Service
Rajeev Kumar [Fri, 7 Jul 2017 18:39:07 +0000 (18:39 +0000)]
Merge "Some import cleanups."
Andrew Sapperstein [Fri, 7 Jul 2017 18:04:37 +0000 (18:04 +0000)]
Merge "Search bar polish" into oc-dr1-dev am:
d10a1af258
am:
e0c01c6605
Change-Id: I39bae9af6032e392bfcb96eaab1af281bc705273
Ajay Kumar Nadathur Sreenivasan [Fri, 7 Jul 2017 18:03:31 +0000 (18:03 +0000)]
Merge "Screen lock type metrics are not reported if user goes back" into oc-dr1-dev am:
9afa37ac3c
am:
d6e1be947e
Change-Id: I253706d61d4c917601581457b128f7fedec3a12c
Andrew Sapperstein [Fri, 7 Jul 2017 17:47:19 +0000 (17:47 +0000)]
Merge "Search bar polish" into oc-dr1-dev
am:
d10a1af258
Change-Id: Ia09442652744696c2902356b66367d46e7f20534
Ajay Kumar Nadathur Sreenivasan [Fri, 7 Jul 2017 17:40:32 +0000 (17:40 +0000)]
Merge "Screen lock type metrics are not reported if user goes back" into oc-dr1-dev
am:
9afa37ac3c
Change-Id: Ib1b02ae394631c28db7f2bdd5bbba5a19812182f
TreeHugger Robot [Fri, 7 Jul 2017 17:39:11 +0000 (17:39 +0000)]
Merge "Search bar polish" into oc-dr1-dev
Ajay Kumar Nadathur Sreenivasan [Fri, 7 Jul 2017 17:30:15 +0000 (17:30 +0000)]
Merge "Screen lock type metrics are not reported if user goes back" into oc-dr1-dev
Android Build Merger (Role) [Fri, 7 Jul 2017 17:06:07 +0000 (17:06 +0000)]
Merge "Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev am:
6d8f0b57af am:
cfa37bb121"
Android Build Merger (Role) [Fri, 7 Jul 2017 17:05:55 +0000 (17:05 +0000)]
Merge "Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev am:
6d8f0b57af am:
cfa37bb121"
Adrian Roos [Fri, 7 Jul 2017 17:05:50 +0000 (17:05 +0000)]
Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev am:
6d8f0b57af
am:
cfa37bb121
Change-Id: I67430769e05885673c08ac0e9291171d9a86ea4d
Android Build Merger (Role) [Fri, 7 Jul 2017 17:05:45 +0000 (17:05 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
e371dcf55a -s ours am:
dc333a317e -s ours"
Adrian Roos [Fri, 7 Jul 2017 17:05:39 +0000 (17:05 +0000)]
Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev am:
6d8f0b57af
am:
cfa37bb121
Change-Id: Ie089ee289db78126aba7196e7c1277ab557df61a
Bill Yi [Fri, 7 Jul 2017 17:05:29 +0000 (17:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
e371dcf55a -s ours
am:
dc333a317e -s ours
Change-Id: If837e09f2811d3114cfbbc72bc9be619593b3f31
Bill Yi [Fri, 7 Jul 2017 17:05:17 +0000 (17:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
e371dcf55a -s ours
am:
dc333a317e -s ours
Change-Id: I3ef6ec6fd8c2ebc77325a20ee6b178a08446d59e
Adrian Roos [Fri, 7 Jul 2017 16:57:56 +0000 (16:57 +0000)]
Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev
am:
6d8f0b57af
Change-Id: Ic25e07b765b3d732f410643eba7e854168092e86
TreeHugger Robot [Fri, 7 Jul 2017 16:52:44 +0000 (16:52 +0000)]
Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 16:38:46 +0000 (16:38 +0000)]
Merge "Log async ranking state in Settings search ranking"
Bill Yi [Fri, 7 Jul 2017 16:02:10 +0000 (16:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
e371dcf55a -s ours
Change-Id: If7245374f3d569a9406d632fc7a6c4d618b1dfd0
TreeHugger Robot [Fri, 7 Jul 2017 15:45:55 +0000 (15:45 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Adrian Roos [Fri, 7 Jul 2017 14:30:04 +0000 (16:30 +0200)]
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.
Bill Yi [Fri, 7 Jul 2017 10:12:06 +0000 (03:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6c862c42b058adf710c961f7c42d108fbf8caf01
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
TreeHugger Robot [Fri, 7 Jul 2017 04:00:34 +0000 (04:00 +0000)]
Merge "Change strings for settings toggles when scorer is unset or unsupported."
Kevin Chyn [Fri, 7 Jul 2017 03:57:30 +0000 (03:57 +0000)]
Merge "Fix Assist Gesture settings check" into oc-dr1-dev am:
d0487eff5e
am:
6d41ab7958
Change-Id: I6f4bdd8e1f18870c027c578fc9c1a1e4143da7d5
Philip Quinn [Fri, 7 Jul 2017 03:51:09 +0000 (03:51 +0000)]
Add SeekBarPreference.getMax(). am:
648ddd5c83
am:
7d46906218
Change-Id: Id8d9071b4a9ceac31fe81eb7d1de31890d9156f1
Kevin Chyn [Fri, 7 Jul 2017 03:49:36 +0000 (03:49 +0000)]
Merge "Fix Assist Gesture settings check" into oc-dr1-dev
am:
d0487eff5e
Change-Id: I609448c301e3c28a2362a884b01a196912c4c7b8
Philip Quinn [Fri, 7 Jul 2017 03:47:19 +0000 (03:47 +0000)]
Add SeekBarPreference.getMax().
am:
648ddd5c83
Change-Id: I2ea54359e6c13b0626ed96da6c8924e70d3d95cb
TreeHugger Robot [Fri, 7 Jul 2017 03:43:12 +0000 (03:43 +0000)]
Merge "Fix Assist Gesture settings check" into oc-dr1-dev
Philip Quinn [Sun, 2 Jul 2017 04:24:10 +0000 (21:24 -0700)]
Add SeekBarPreference.getMax().
Bug:
63047816
Test: make -j
Change-Id: I416d044fa32f3aed32c1e6239baf9c57652bca2e
Doris Ling [Fri, 7 Jul 2017 03:35:53 +0000 (03:35 +0000)]
Merge "Merge "Reduce spacing in condition cards." into oc-dr1-dev am:
494f82e9b0" into oc-dr1-dev-plus-aosp
am:
73b6a18d24
Change-Id: I5711f999c28fcdfd4cbeef0fd807e00a4687a8a2
Doris Ling [Fri, 7 Jul 2017 03:35:19 +0000 (03:35 +0000)]
Merge "Merge "Reduce spacing in condition cards." into oc-dr1-dev am:
494f82e9b0" into oc-dr1-dev-plus-aosp
am:
7091fa4882
Change-Id: I73573bcae13c54e0903c6e0a2d81a4802d39a9d9
jackqdyulei [Fri, 7 Jul 2017 03:34:51 +0000 (03:34 +0000)]
Merge "Merge "Update Anomaly detection framework" into oc-dr1-dev am:
690accadc7" into oc-dr1-dev-plus-aosp
am:
c0e8d57a48
Change-Id: I961166ef36ac9523355affdd5231af658a67ed75
jackqdyulei [Fri, 7 Jul 2017 03:34:24 +0000 (03:34 +0000)]
Merge "Merge "Update Anomaly detection framework" into oc-dr1-dev am:
690accadc7" into oc-dr1-dev-plus-aosp
am:
0291cbb58e
Change-Id: I7942d4ab3bd2ceb29375dd62c58ff319b9d5d9e8
Andrew Sapperstein [Fri, 7 Jul 2017 03:33:56 +0000 (03:33 +0000)]
Merge "Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev am:
4545d636ec" into oc-dr1-dev-plus-aosp
am:
e0d864aae1
Change-Id: Ia89bdd1f99bdc351ac0b9609e003d0d2166722c2
Andrew Sapperstein [Fri, 7 Jul 2017 03:33:25 +0000 (03:33 +0000)]
Merge "Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev am:
4545d636ec" into oc-dr1-dev-plus-aosp
am:
0ee38fa7eb
Change-Id: I95f9a51aee9542cb2ff99043fd305760e276f108
Doris Ling [Fri, 7 Jul 2017 03:32:55 +0000 (03:32 +0000)]
Merge "Merge "Update the gesture video container background color." into oc-dr1-dev am:
c2002db8cc" into oc-dr1-dev-plus-aosp
am:
abe9a99474
Change-Id: I7e4e805120d934d10fcdc0af0a82d25b007d0899
Doris Ling [Fri, 7 Jul 2017 03:31:35 +0000 (03:31 +0000)]
Merge "Update the gesture video container background color." into oc-dr1-dev am:
c2002db8cc
am:
40822c1800
Change-Id: Id3fee0ce04f5d599c38ccea00e85c5f1bbfa1445
Android Build Merger (Role) [Fri, 7 Jul 2017 03:01:58 +0000 (03:01 +0000)]
Merge "Merge "Reduce spacing in condition cards." into oc-dr1-dev am:
494f82e9b0" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 7 Jul 2017 03:01:56 +0000 (03:01 +0000)]
Merge "Merge "Reduce spacing in condition cards." into oc-dr1-dev am:
494f82e9b0" into oc-dr1-dev-plus-aosp
Doris Ling [Fri, 7 Jul 2017 03:01:45 +0000 (03:01 +0000)]
Merge "Reduce spacing in condition cards." into oc-dr1-dev
am:
494f82e9b0
Change-Id: Ice2da438bc2bbbae77699e0795426c6456fbe80d
Android Build Merger (Role) [Fri, 7 Jul 2017 03:01:38 +0000 (03:01 +0000)]
Merge "Merge "Update Anomaly detection framework" into oc-dr1-dev am:
690accadc7" into oc-dr1-dev-plus-aosp
Doris Ling [Fri, 7 Jul 2017 03:01:37 +0000 (03:01 +0000)]
Merge "Reduce spacing in condition cards." into oc-dr1-dev
am:
494f82e9b0
Change-Id: I28903bbc7667f0a0bad065b090076ec73db4947f
Android Build Merger (Role) [Fri, 7 Jul 2017 03:01:28 +0000 (03:01 +0000)]
Merge "Merge "Update Anomaly detection framework" into oc-dr1-dev am:
690accadc7" into oc-dr1-dev-plus-aosp
jackqdyulei [Fri, 7 Jul 2017 03:01:26 +0000 (03:01 +0000)]
Merge "Update Anomaly detection framework" into oc-dr1-dev
am:
690accadc7
Change-Id: Ic0867be73688beed9ddf5395ed9427572d1b5165
Android Build Merger (Role) [Fri, 7 Jul 2017 03:01:20 +0000 (03:01 +0000)]
Merge "Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev am:
4545d636ec" into oc-dr1-dev-plus-aosp
jackqdyulei [Fri, 7 Jul 2017 03:01:16 +0000 (03:01 +0000)]
Merge "Update Anomaly detection framework" into oc-dr1-dev
am:
690accadc7
Change-Id: Idefefd2703b8b885cc6aa68665d629d04092d5d9
Android Build Merger (Role) [Fri, 7 Jul 2017 03:01:08 +0000 (03:01 +0000)]
Merge "Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev am:
4545d636ec" into oc-dr1-dev-plus-aosp
Andrew Sapperstein [Fri, 7 Jul 2017 03:01:07 +0000 (03:01 +0000)]
Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev
am:
4545d636ec
Change-Id: Ic602d70e1f1d05cb47054cf4b919e81793e18a39
Android Build Merger (Role) [Fri, 7 Jul 2017 03:01:01 +0000 (03:01 +0000)]
Merge "Merge "Update the gesture video container background color." into oc-dr1-dev am:
c2002db8cc" into oc-dr1-dev-plus-aosp
Andrew Sapperstein [Fri, 7 Jul 2017 03:00:49 +0000 (03:00 +0000)]
Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev
am:
4545d636ec
Change-Id: I49fcb529e64cd1d66c85bc42f67514559140467b
Doris Ling [Fri, 7 Jul 2017 03:00:47 +0000 (03:00 +0000)]
Merge "Update the gesture video container background color." into oc-dr1-dev
am:
c2002db8cc
Change-Id: I82814ee82e24bb382f54a01accec1ad2da2b7c42
TreeHugger Robot [Fri, 7 Jul 2017 03:00:45 +0000 (03:00 +0000)]
Merge "Create BatterySaverReceiver"
Android Build Merger (Role) [Fri, 7 Jul 2017 03:00:14 +0000 (03:00 +0000)]
Merge "Merge "Change empty apn type in user entered APN to non-read-only types." into oc-dr1-dev am:
4fffc20ada am:
fb2b63df05"
Doris Ling [Fri, 7 Jul 2017 02:59:44 +0000 (02:59 +0000)]
Merge "Update the gesture video container background color." into oc-dr1-dev
am:
c2002db8cc
Change-Id: Ia99dd8d0d9ae926d4fe09c7911c4bc10e60e397d
Android Build Merger (Role) [Fri, 7 Jul 2017 02:58:54 +0000 (02:58 +0000)]
Merge "Merge "Change empty apn type in user entered APN to non-read-only types." into oc-dr1-dev am:
4fffc20ada am:
fb2b63df05"
TreeHugger Robot [Fri, 7 Jul 2017 02:57:36 +0000 (02:57 +0000)]
Merge "Change empty apn type in user entered APN to non-read-only types." into oc-dr1-dev am:
4fffc20ada
am:
fb2b63df05
Change-Id: I04784337fe7a2ed0d3752383d781a9a446c55d1e
TreeHugger Robot [Fri, 7 Jul 2017 02:57:09 +0000 (02:57 +0000)]
Merge "Change empty apn type in user entered APN to non-read-only types." into oc-dr1-dev am:
4fffc20ada
am:
fb2b63df05
Change-Id: I0c19439f83ff576673ab7ebf9b8e5860b7eb7dc3
Android Build Merger (Role) [Fri, 7 Jul 2017 02:56:52 +0000 (02:56 +0000)]
Merge "Merge "Add a confirmation dialog when forgetting BT device" into oc-dr1-dev am:
21423623bd am:
c608cfcceb"
Antony Sargent [Fri, 7 Jul 2017 02:55:16 +0000 (02:55 +0000)]
Merge "Add a confirmation dialog when forgetting BT device" into oc-dr1-dev am:
21423623bd
am:
c608cfcceb
Change-Id: Ia3a4a17dd0c253b10be2e1bcfbad4609d0ed1d88
Antony Sargent [Fri, 7 Jul 2017 02:54:18 +0000 (02:54 +0000)]
Merge "Add a confirmation dialog when forgetting BT device" into oc-dr1-dev am:
21423623bd
am:
c608cfcceb
Change-Id: I67eebf79d609eff8353255e35f04bf1ff728d497
TreeHugger Robot [Fri, 7 Jul 2017 02:38:10 +0000 (02:38 +0000)]
Merge "Change empty apn type in user entered APN to non-read-only types." into oc-dr1-dev
am:
4fffc20ada
Change-Id: I2e0672e71b69f35cbc0f98d9cebeebf1a6dc1af7
Antony Sargent [Fri, 7 Jul 2017 02:35:24 +0000 (02:35 +0000)]
Merge "Add a confirmation dialog when forgetting BT device" into oc-dr1-dev
am:
21423623bd
Change-Id: I9f819e3f4bf0f785f9a42592a9a37955df8e8103
TreeHugger Robot [Fri, 7 Jul 2017 02:17:29 +0000 (02:17 +0000)]
Merge "Disable suggestion on low memory devices"
TreeHugger Robot [Fri, 7 Jul 2017 02:17:15 +0000 (02:17 +0000)]
Merge "Reduce spacing in condition cards." into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 02:13:37 +0000 (02:13 +0000)]
Merge "Update Anomaly detection framework" into oc-dr1-dev
TreeHugger Robot [Fri, 7 Jul 2017 02:02:51 +0000 (02:02 +0000)]
Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev
Rajeev Kumar [Fri, 7 Jul 2017 02:02:27 +0000 (02:02 +0000)]
Merge "Recycle TypedArray in DividerPreference.java"
Stephen Chen [Fri, 7 Jul 2017 01:29:57 +0000 (18:29 -0700)]
Change strings for settings toggles when scorer is unset or unsupported.
Bug:
62343859
Test: make RunSettingsRoboTests -j40
Change-Id: I22cba1b22af0defc3b53ce42ef2b5bb02b6fef49
TreeHugger Robot [Fri, 7 Jul 2017 01:26:48 +0000 (01:26 +0000)]
Merge "Update the gesture video container background color." into oc-dr1-dev
Rajeev Kumar [Fri, 7 Jul 2017 00:19:50 +0000 (17:19 -0700)]
Some import cleanups.
1. Get rid of unused import.
2. Fix import order.
Change-Id: I278949d95242682fd277adc2c71bc892e58a8533
TreeHugger Robot [Thu, 6 Jul 2017 23:50:28 +0000 (23:50 +0000)]
Merge "Change empty apn type in user entered APN to non-read-only types." into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 23:46:39 +0000 (23:46 +0000)]
Merge "Add a confirmation dialog when forgetting BT device" into oc-dr1-dev
Andrew Sapperstein [Thu, 6 Jul 2017 23:34:58 +0000 (16:34 -0700)]
Search bar polish
Updated main page text color, text size, and search bar height.
Also updated results page text size.
Change-Id: Ic4a390136b854741a73e99431b8dd9452871dd2c
Fixes:
63397599
Fixes:
63394285
Test: robotests and manual
Rajeev Kumar [Thu, 6 Jul 2017 23:01:06 +0000 (16:01 -0700)]
Recycle TypedArray in DividerPreference.java
1. Make sure 'TypedArray' is recycled after use with '#recycle()' in DividerPreference.java class
2. Get rid of an unused import from DividerPreference.java class
Test: make RunSettingsRoboTests -j40
Change-Id: I3baf7d51b5112583b9605fc6ec0c81f40ba76ee9
Doris Ling [Thu, 6 Jul 2017 22:23:00 +0000 (15:23 -0700)]
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
Fan Zhang [Thu, 6 Jul 2017 22:59:31 +0000 (15:59 -0700)]
Disable suggestion on low memory devices
Change-Id: I9d22170845661fc8b48b116c9b09f758926c096f
Fix:
63157777
Test: make RunSettingsRoboTests
jackqdyulei [Wed, 5 Jul 2017 22:49:16 +0000 (15:49 -0700)]
Create BatterySaverReceiver
Cherry-picked from oc-dev
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
jackqdyulei [Thu, 29 Jun 2017 21:20:46 +0000 (14:20 -0700)]
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
Android Build Merger (Role) [Thu, 6 Jul 2017 22:34:15 +0000 (22:34 +0000)]
Merge "Merge "Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev am:
8218511fb7" into oc-dr1-dev-plus-aosp am:
7e410cc787"
Maurice Lam [Thu, 6 Jul 2017 22:33:59 +0000 (22:33 +0000)]
Merge "Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev am:
8218511fb7" into oc-dr1-dev-plus-aosp
am:
7e410cc787
Change-Id: Icec778e5dc5095ebeea441b75cc41a662f70cb32
Android Build Merger (Role) [Thu, 6 Jul 2017 22:33:51 +0000 (22:33 +0000)]
Merge "Merge "Merge "Add util method to get battery stats" into oc-dr1-dev am:
55ad60d1ff" into oc-dr1-dev-plus-aosp am:
66037a6ae6"
Maurice Lam [Thu, 6 Jul 2017 22:33:30 +0000 (22:33 +0000)]
Merge "Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev am:
8218511fb7" into oc-dr1-dev-plus-aosp
am:
7e410cc787
Change-Id: Id5d5f187d588708394144eaf02004c584c97dbac
Matthew Fritze [Thu, 6 Jul 2017 22:33:16 +0000 (22:33 +0000)]
Merge "Merge "Add util method to get battery stats" into oc-dr1-dev am:
55ad60d1ff" into oc-dr1-dev-plus-aosp
am:
66037a6ae6
Change-Id: Ifeaeaf53a18932fcaa417fd97b69bf317e109a7b
Matthew Fritze [Thu, 6 Jul 2017 22:32:42 +0000 (22:32 +0000)]
Merge "Merge "Add util method to get battery stats" into oc-dr1-dev am:
55ad60d1ff" into oc-dr1-dev-plus-aosp
am:
66037a6ae6
Change-Id: I0319d997e7f7953b7aa757b217ff792ebcc19f2e
Matthew Fritze [Thu, 6 Jul 2017 22:32:01 +0000 (22:32 +0000)]
Merge "Add util method to get battery stats" into oc-dr1-dev am:
55ad60d1ff
am:
3b32306c54
Change-Id: Ibd2fc5828da10cfdc1356dcb19aa25c36565e1aa
Daniel Nishi [Thu, 6 Jul 2017 22:31:34 +0000 (22:31 +0000)]
Merge "Shrink the music icon." into oc-dr1-dev am:
e78190d124
am:
a22ecac2f9
Change-Id: Ic5787c194d73c8de47f554f506c7601df00d55de
Daniel Nishi [Thu, 6 Jul 2017 22:30:55 +0000 (22:30 +0000)]
Merge "Update the Storage icons." into oc-dr1-dev am:
fa47cebd55
am:
5f27569478
Change-Id: Ibd5bf197507154c7c45b875ab46350c70b6f3ee8
TreeHugger Robot [Thu, 6 Jul 2017 22:22:52 +0000 (22:22 +0000)]
Merge "App header cleanup"
Android Build Merger (Role) [Thu, 6 Jul 2017 22:12:03 +0000 (22:12 +0000)]
Merge "Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev am:
8218511fb7" into oc-dr1-dev-plus-aosp
Maurice Lam [Thu, 6 Jul 2017 22:11:52 +0000 (22:11 +0000)]
Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev
am:
8218511fb7
Change-Id: I48b40d6158f4ebeaaaef6b8d2baf72bf8edf226a
Android Build Merger (Role) [Thu, 6 Jul 2017 22:11:44 +0000 (22:11 +0000)]
Merge "Merge "Add util method to get battery stats" into oc-dr1-dev am:
55ad60d1ff" into oc-dr1-dev-plus-aosp
Matthew Fritze [Thu, 6 Jul 2017 22:11:11 +0000 (22:11 +0000)]
Merge "Add util method to get battery stats" into oc-dr1-dev
am:
55ad60d1ff
Change-Id: I6aa6178f142bcf0bb67957c459d86ec0618c7bd0
Matthew Fritze [Thu, 6 Jul 2017 22:11:04 +0000 (22:11 +0000)]
Merge "Add util method to get battery stats" into oc-dr1-dev
am:
55ad60d1ff
Change-Id: I02308e6829fbc1a3764efb8a09dfc9d576428775
Daniel Nishi [Thu, 6 Jul 2017 22:10:37 +0000 (22:10 +0000)]
Merge "Shrink the music icon." into oc-dr1-dev
am:
e78190d124
Change-Id: I21af42927fa117c68a4979285213361a3c70fa56
Daniel Nishi [Thu, 6 Jul 2017 22:10:18 +0000 (22:10 +0000)]
Merge "Update the Storage icons." into oc-dr1-dev
am:
fa47cebd55
Change-Id: I2a393ea0aa4274c23cf9c75fdc655d7436d695d3
TreeHugger Robot [Thu, 6 Jul 2017 22:08:51 +0000 (22:08 +0000)]
Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev
TreeHugger Robot [Thu, 6 Jul 2017 21:58:33 +0000 (21:58 +0000)]
Merge "Add util method to get battery stats" into oc-dr1-dev
Daniel Nishi [Thu, 6 Jul 2017 21:58:01 +0000 (21:58 +0000)]
Merge "Shrink the music icon." into oc-dr1-dev
Ajay Nadathur [Wed, 5 Jul 2017 20:17:30 +0000 (13:17 -0700)]
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
Daniel Nishi [Thu, 6 Jul 2017 21:50:49 +0000 (21:50 +0000)]
Merge "Update the Storage icons." into oc-dr1-dev
Andrew Sapperstein [Thu, 6 Jul 2017 21:30:28 +0000 (14:30 -0700)]
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
OSDN Git Service
