Commit Graph

12621 Commits

Author SHA1 Message Date
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
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
Andrew Sapperstein
e0c01c6605 Merge "Search bar polish" into oc-dr1-dev
am: d10a1af258

Change-Id: Ia09442652744696c2902356b66367d46e7f20534
2017-07-07 17:47:19 +00:00
TreeHugger Robot
d10a1af258 Merge "Search bar polish" into oc-dr1-dev 2017-07-07 17:39:11 +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
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
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
TreeHugger Robot
13f417c980 Merge "Change strings for settings toggles when scorer is unset or unsupported." 2017-07-07 04:00:34 +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
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
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
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
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
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
TreeHugger Robot
494f82e9b0 Merge "Reduce spacing in condition cards." into oc-dr1-dev 2017-07-07 02:17:15 +00:00
TreeHugger Robot
4545d636ec Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev 2017-07-07 02:02:51 +00: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
TreeHugger Robot
c2002db8cc Merge "Update the gesture video container background color." into oc-dr1-dev 2017-07-07 01:26:48 +00:00
Andrew Sapperstein
a22768cc1e 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
2017-07-06 16:37:00 -07: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
Daniel Nishi
b41f08ce10 Merge "Update the Storage icons." into oc-dr1-dev am: fa47cebd55
am: 5f27569478

Change-Id: Ibd5bf197507154c7c45b875ab46350c70b6f3ee8
2017-07-06 22:30:55 +00:00
TreeHugger Robot
e663befae4 Merge "App header cleanup" 2017-07-06 22:22:52 +00:00
Daniel Nishi
5f27569478 Merge "Update the Storage icons." into oc-dr1-dev
am: fa47cebd55

Change-Id: I2a393ea0aa4274c23cf9c75fdc655d7436d695d3
2017-07-06 22:10:18 +00: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
Fan Zhang
75bee9bf98 App header cleanup
- Refactor the entity header layout to use LinearLayout and add id to
  content area
- Remove now unused AppHeader class
- Make entire icon+text area clickable and link to app info page
  Refactor the binding logic from bindButton to its own method.
- Remove unused MultiLinePreference

Fix: 62705377
Test: make RunSettingsRoboTests

Change-Id: I6db554695410e71b669f6fdba29d98fedc3364b9
2017-07-06 13:23:38 -07:00
Rajeev Kumar
88f5dd165d 1. Fix the apostrophe escaping for few strings in Settings app
2. Fix few indentation issues in strings.xml file

Test: Manually tested it.
Change-Id: I8f3e7c213614c26fc835b646289ce7fd01d5b626
2017-07-06 12:32:11 -07:00
Lorenzo Colitti
ad25a47e92 Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev am: dcc15eabdf
am: 413d0ac41e

Change-Id: I1521f1a914b7d8514d9eb976f56d5b856caa2a83
2017-07-06 06:36:46 +00:00
Lorenzo Colitti
413d0ac41e Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev
am: dcc15eabdf

Change-Id: I28e2de31fafa533e35655a2d5f2ec9b1e3554eee
2017-07-06 06:30:31 +00:00
TreeHugger Robot
dcc15eabdf Merge "Add a developer offload for tethering hardware acceleration." into oc-dr1-dev 2017-07-06 06:13:55 +00:00
Daniel Sheng
89efcf0c0b Removed camera lift gesture settings UI.
am: 9a16e473ab

Change-Id: I7fe06ff066878b725be5a8ac6132ee9fa9ff3a81
2017-07-06 05:39:34 +00:00
Daniel Sheng
34887c8355 Merge "Added suggestions for gestures." into oc-dr1-dev
am: f8e0963f78

Change-Id: If48fd6cbbc1e8a90afd12da39df8752c4ff301f4
2017-07-06 03:30:33 +00:00
Daniel Sheng
9a16e473ab Removed camera lift gesture settings UI.
Bug: 37154489
Test: make + manual + unit tests
Change-Id: Ifefa07d0e8e0de19d78303352c6f0e01dc1c52ab
Merged-In: I79e70dea12a65fefcb06aca3fd1891a95d856626
2017-07-05 20:24:12 -07:00
Daniel Sheng
f8e0963f78 Merge "Added suggestions for gestures." into oc-dr1-dev 2017-07-06 03:19:57 +00:00
Lorenzo Colitti
03c4a7401e Add a developer offload for tethering hardware acceleration.
Bug: 32163131
Test: builds
Change-Id: Icca7bbd2bdd572b1328e7d0fecb663405b115fe1
2017-07-06 12:13:11 +09:00
Daniel Sheng
11d240c300 Removed camera lift gesture settings UI.
Bug: 37154489
Test: make + manual + unit tests
Change-Id: I79e70dea12a65fefcb06aca3fd1891a95d856626
2017-07-05 18:04:10 -07:00
Daniel Sheng
f7c459c9e5 Added suggestions for gestures.
Bug: 30986021
Test: manual + make RunSettingsRoboTests + adb shell am instrument -w
com.android.settings.tests.unit /android.support.test.runner.AndroidJUnitRunner
Change-Id: I7337a141cb21e5a1399aaca05ec1facd8629577b
Merged-In: I7aed110c81ca2fb6b90e2f359b4bb941c02bc1c3
2017-07-05 17:35:03 -07:00
Daniel Sheng
77ba611ac0 Merge "Added suggestions for gestures." 2017-07-06 00:34:06 +00:00
Android Build Merger (Role)
e9e5978576 Merge "Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev am: 6d50576496 am: 5438319677" 2017-07-05 23:21:57 +00:00
TreeHugger Robot
e0f8691abf Merge "Fix alignment for build number preference in RTL." 2017-07-05 23:21:44 +00:00
Antony Sargent
c73c4b4055 Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev am: 6d50576496
am: 5438319677

Change-Id: I1595e3c80b731a4c7f86faa198f2cc6e7f05d710
2017-07-05 23:15:53 +00:00
Antony Sargent
5438319677 Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev
am: 6d50576496

Change-Id: Ib35f0e2f74055b7c119f9fd9775c7299a6cc9e29
2017-07-05 22:55:51 +00:00
Antony Sargent
6d50576496 Merge "Fix Bluetooth device details crash on screen rotation" into oc-dr1-dev 2017-07-05 22:49:04 +00:00
Sundeep Ghuman
2d1e8a736e Merge "Use EntityHeaderController in WifiDetailPreferenceController." into oc-dr1-dev am: 09229abbf2
am: 4fd8528c2f

Change-Id: Ie183a68e7ae944bad8a2ca3782522afd7f78b74f
2017-07-05 22:43:16 +00:00
Sundeep Ghuman
4fd8528c2f Merge "Use EntityHeaderController in WifiDetailPreferenceController." into oc-dr1-dev
am: 09229abbf2

Change-Id: I7a636c40515b24b7376b8ceadf969a257b2dc8d9
2017-07-05 22:30:22 +00:00
TreeHugger Robot
09229abbf2 Merge "Use EntityHeaderController in WifiDetailPreferenceController." into oc-dr1-dev 2017-07-05 22:21:40 +00:00
Daniel Nishi
2872e2c6cc Update the Storage icons.
Change-Id: I10648df80566629c09d03211ed642516595e4b22
Fixes: 62548249
Test: Manual
2017-07-05 14:41:12 -07:00