Commit Graph

38441 Commits

Author SHA1 Message Date
TreeHugger Robot
32d87f4916 Merge "Change words in wifi settings toggle to lowercase." 2017-07-07 20:31:32 +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
Andrew Sapperstein
fedae393ef Duplicate ambient display setting in battery settings.
Also fixed a bug where ambient display was duplicated
in search results.

Change-Id: Iacdb53c70e90f8240da1ed9acec7e382ed1df5de
Fixes: 62298578
Test: robotests
2017-07-07 13:07:54 -07:00
jackqdyulei
e1d46b005b Merge "Create BatterySaverReceiver" into oc-dr1-dev am: 062dedb072
am: 3decd57c50  -s ours

Change-Id: I2975753557bdc016d13c3e0acea0801a36d28c53
2017-07-07 19:47:14 +00:00
jackqdyulei
3decd57c50 Merge "Create BatterySaverReceiver" into oc-dr1-dev
am: 062dedb072

Change-Id: I0f992f6191181be50a54040c0694037cf49a77f5
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
Rajeev Kumar
6e4ae6dc53 Merge "Some import cleanups." 2017-07-07 18:39:07 +00:00
Stephen Chen
16d59cbdd4 Change words in wifi settings toggle to lowercase.
Bug: 62343859
Test: make RunSettingsRoboTests -j40
Change-Id: If0e653fd7268e5e14f360a043cdc039a7846bb4a
2017-07-07 11:31:55 -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
Stephen Chen
cb3dfb91e8 Adjust UX for toggles when active scorer is not set.
This change fixes two issues: when wakeup is not available, update the
number of items to show above the fold in wifi preferences. When scorer
is not set, grey out wakeup toggle and set summary to reflect the
status.

Bug: 62410973
Bug: 62343859
Test: make RunSettingsRoboTests -j40
Merged-In: I5f4131c6a86eab6c0fb03ea2b5101ba107a9189f
Change-Id: I5f4131c6a86eab6c0fb03ea2b5101ba107a9189f
2017-07-07 11:06:20 -07:00
Andrew Sapperstein
1bc4a459fb Merge "Search bar polish" into oc-dr1-dev am: d10a1af258
am: e0c01c6605

Change-Id: I39bae9af6032e392bfcb96eaab1af281bc705273
2017-07-07 18:04:37 +00:00
Ajay Kumar Nadathur Sreenivasan
0f9d39518b Merge "Screen lock type metrics are not reported if user goes back" into oc-dr1-dev am: 9afa37ac3c
am: d6e1be947e

Change-Id: I253706d61d4c917601581457b128f7fedec3a12c
2017-07-07 18:03:31 +00:00
Andrew Sapperstein
e0c01c6605 Merge "Search bar polish" into oc-dr1-dev
am: d10a1af258

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

Change-Id: Ib1b02ae394631c28db7f2bdd5bbba5a19812182f
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
Android Build Merger (Role)
2ad1f69d1e Merge "Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev am: 6d8f0b57af am: cfa37bb121" 2017-07-07 17:06:07 +00:00
Android Build Merger (Role)
358a0d98b5 Merge "Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev am: 6d8f0b57af am: cfa37bb121" 2017-07-07 17:05:55 +00:00
Adrian Roos
a33b206e0c Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev am: 6d8f0b57af
am: cfa37bb121

Change-Id: I67430769e05885673c08ac0e9291171d9a86ea4d
2017-07-07 17:05:50 +00:00
Android Build Merger (Role)
26c559cead Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: e371dcf55a -s ours am: dc333a317e -s ours" 2017-07-07 17:05:45 +00:00
Adrian Roos
d33ec4d62f Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev am: 6d8f0b57af
am: cfa37bb121

Change-Id: Ie089ee289db78126aba7196e7c1277ab557df61a
2017-07-07 17:05:39 +00:00
Bill Yi
eb6db8d4a9 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: e371dcf55a -s ours
am: dc333a317e  -s ours

Change-Id: If837e09f2811d3114cfbbc72bc9be619593b3f31
2017-07-07 17:05:29 +00:00
Bill Yi
938351a749 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: e371dcf55a -s ours
am: dc333a317e  -s ours

Change-Id: I3ef6ec6fd8c2ebc77325a20ee6b178a08446d59e
2017-07-07 17:05:17 +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

Change-Id: Ic25e07b765b3d732f410643eba7e854168092e86
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
TreeHugger Robot
04d5a29507 Merge "Log async ranking state in Settings search ranking" 2017-07-07 16:38:46 +00:00
Bill Yi
dc333a317e Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: e371dcf55a  -s ours

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