Commit Graph

38210 Commits

Author SHA1 Message Date
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
Bill Yi
556bf129c9 Import translations. DO NOT MERGE
Change-Id: Ie9a5c1d5f9795c7ca3120f792300ec3d4e3cc8b7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-07 03:01:25 -07:00
TreeHugger Robot
13f417c980 Merge "Change strings for settings toggles when scorer is unset or unsupported." 2017-07-07 04:00:34 +00:00
Kevin Chyn
74d4547a3f Merge "Fix Assist Gesture settings check" into oc-dr1-dev am: d0487eff5e
am: 6d41ab7958

Change-Id: I6f4bdd8e1f18870c027c578fc9c1a1e4143da7d5
2017-07-07 03:57:30 +00:00
Philip Quinn
97efc5c6f1 Add SeekBarPreference.getMax(). am: 648ddd5c83
am: 7d46906218

Change-Id: Id8d9071b4a9ceac31fe81eb7d1de31890d9156f1
2017-07-07 03:51:09 +00:00
Kevin Chyn
6d41ab7958 Merge "Fix Assist Gesture settings check" into oc-dr1-dev
am: d0487eff5e

Change-Id: I609448c301e3c28a2362a884b01a196912c4c7b8
2017-07-07 03:49:36 +00:00
Philip Quinn
7d46906218 Add SeekBarPreference.getMax().
am: 648ddd5c83

Change-Id: I2ea54359e6c13b0626ed96da6c8924e70d3d95cb
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
Doris Ling
6dce6413f5 Merge "Merge "Reduce spacing in condition cards." into oc-dr1-dev am: 494f82e9b0" into oc-dr1-dev-plus-aosp
am: 73b6a18d24

Change-Id: I5711f999c28fcdfd4cbeef0fd807e00a4687a8a2
2017-07-07 03:35:53 +00:00
Doris Ling
2f33a4a897 Merge "Merge "Reduce spacing in condition cards." into oc-dr1-dev am: 494f82e9b0" into oc-dr1-dev-plus-aosp
am: 7091fa4882

Change-Id: I73573bcae13c54e0903c6e0a2d81a4802d39a9d9
2017-07-07 03:35:19 +00:00
jackqdyulei
e895cac68d Merge "Merge "Update Anomaly detection framework" into oc-dr1-dev am: 690accadc7" into oc-dr1-dev-plus-aosp
am: c0e8d57a48

Change-Id: I961166ef36ac9523355affdd5231af658a67ed75
2017-07-07 03:34:51 +00:00
jackqdyulei
dadbcfca37 Merge "Merge "Update Anomaly detection framework" into oc-dr1-dev am: 690accadc7" into oc-dr1-dev-plus-aosp
am: 0291cbb58e

Change-Id: I7942d4ab3bd2ceb29375dd62c58ff319b9d5d9e8
2017-07-07 03:34:24 +00:00
Andrew Sapperstein
4d7675ad0c 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
2017-07-07 03:33:56 +00:00
Andrew Sapperstein
c2684dd56b 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
2017-07-07 03:33:25 +00:00
Doris Ling
772e8b3790 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
2017-07-07 03:32:55 +00:00
Doris Ling
d53a828660 Merge "Update the gesture video container background color." into oc-dr1-dev am: c2002db8cc
am: 40822c1800

Change-Id: Id3fee0ce04f5d599c38ccea00e85c5f1bbfa1445
2017-07-07 03:31:35 +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

Change-Id: Ice2da438bc2bbbae77699e0795426c6456fbe80d
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

Change-Id: I28903bbc7667f0a0bad065b090076ec73db4947f
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

Change-Id: Ic0867be73688beed9ddf5395ed9427572d1b5165
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

Change-Id: Idefefd2703b8b885cc6aa68665d629d04092d5d9
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

Change-Id: Ic602d70e1f1d05cb47054cf4b919e81793e18a39
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

Change-Id: I49fcb529e64cd1d66c85bc42f67514559140467b
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

Change-Id: I82814ee82e24bb382f54a01accec1ad2da2b7c42
2017-07-07 03:00:47 +00:00
TreeHugger Robot
c432d19068 Merge "Create BatterySaverReceiver" 2017-07-07 03:00:45 +00:00
Android Build Merger (Role)
e074ed313e Merge "Merge "Change empty apn type in user entered APN to non-read-only types." into oc-dr1-dev am: 4fffc20ada am: fb2b63df05" 2017-07-07 03:00:14 +00:00
Doris Ling
40822c1800 Merge "Update the gesture video container background color." into oc-dr1-dev
am: c2002db8cc

Change-Id: Ia99dd8d0d9ae926d4fe09c7911c4bc10e60e397d
2017-07-07 02:59:44 +00:00
Android Build Merger (Role)
22967dfa33 Merge "Merge "Change empty apn type in user entered APN to non-read-only types." into oc-dr1-dev am: 4fffc20ada am: fb2b63df05" 2017-07-07 02:58:54 +00:00
TreeHugger Robot
d7dea14f0e 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
2017-07-07 02:57:36 +00:00
TreeHugger Robot
a53d834f31 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
2017-07-07 02:57:09 +00:00
Android Build Merger (Role)
c9a57bf3db Merge "Merge "Add a confirmation dialog when forgetting BT device" into oc-dr1-dev am: 21423623bd am: c608cfcceb" 2017-07-07 02:56:52 +00:00
Antony Sargent
72947770c5 Merge "Add a confirmation dialog when forgetting BT device" into oc-dr1-dev am: 21423623bd
am: c608cfcceb

Change-Id: Ia3a4a17dd0c253b10be2e1bcfbad4609d0ed1d88
2017-07-07 02:55:16 +00:00
Antony Sargent
1e673aeafb Merge "Add a confirmation dialog when forgetting BT device" into oc-dr1-dev am: 21423623bd
am: c608cfcceb

Change-Id: I67eebf79d609eff8353255e35f04bf1ff728d497
2017-07-07 02:54:18 +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

Change-Id: I2e0672e71b69f35cbc0f98d9cebeebf1a6dc1af7
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

Change-Id: I9f819e3f4bf0f785f9a42592a9a37955df8e8103
2017-07-07 02:35:24 +00:00
TreeHugger Robot
d432e07e91 Merge "Disable suggestion on low memory devices" 2017-07-07 02:17:29 +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
Rajeev Kumar
9b6c42557b Merge "Recycle TypedArray in DividerPreference.java" 2017-07-07 02:02:27 +00:00
Christine Franks
8767dd7461 Prevent clipping of SeekBar thumb
Bug: 63406092
Test: manual - purely a UI change
Change-Id: I1fbf7cba6d3c172a7e04de36a665dcf78b629f00
2017-07-06 18:41:46 -07:00
Stephen Chen
b4d72297ed Change strings for settings toggles when scorer is unset or unsupported.
Bug: 62343859
Test: make RunSettingsRoboTests -j40
Change-Id: I22cba1b22af0defc3b53ce42ef2b5bb02b6fef49
2017-07-06 18:29:57 -07:00