Commit Graph

11849 Commits

Author SHA1 Message Date
Julia Reynolds
bcaa8ecb24 Merge "Consolidate notification settings." into oc-dev
am: 6adf04c741

Change-Id: I255c258c6defed91fea42ab70ed8ff2019f271f1
2017-04-17 23:24:54 +00:00
Maurice Lam
88df6f4407 Use buttons for EncryptionInterstitial
Bug: 30742121
Test: Run EncryptionInterstitialTest via `am instrument`
Change-Id: I04d304da4153ebc7f8809ce9c640bccc5e1f5685
(cherry picked from commit 9be96e06bb)
2017-04-17 15:42:21 -07:00
Julia Reynolds
8cf8bf0ae8 Consolidate notification settings.
App notifications now appears under configure notifications.

Bug: 36562211
Test: functional test, NotificationsSettingsTests
Change-Id: If6a5fd062b7983fc97621b9e7240e6bdad04ee86
2017-04-17 21:28:47 +00:00
Fan Zhang
d96ce57713 Merge "Use standard preference layout for wallpaper picker" into oc-dev
am: 8e1d588cdf

Change-Id: If8d1c3c3f8dd318e5c85393bf430a22fc07a8a89
2017-04-17 21:18:14 +00:00
TreeHugger Robot
8e1d588cdf Merge "Use standard preference layout for wallpaper picker" into oc-dev 2017-04-17 21:10:31 +00:00
Sarah Fortune
9827007c5e Merge "Disable the wifi wakeup preference when wifi scanning is disabled" into oc-dev
am: f7896f491a

Change-Id: I66a108fd9b767a9060c22feb39c928a196fdfe07
2017-04-17 20:15:45 +00:00
Sarah Fortune
f7896f491a Merge "Disable the wifi wakeup preference when wifi scanning is disabled" into oc-dev 2017-04-17 20:07:32 +00:00
Fan Zhang
1a4fea2b72 Use standard preference layout for wallpaper picker
Change-Id: I7c76a9af5e64af4ac8641227289a94ab00f923f2
Fix: 37351626
Test: visual
2017-04-17 12:23:52 -07:00
Saige McVea
6a6b97905f Conditionally reposition experimental preferences.
Specifically, move colour inversion and colour correction preferences
to the display category if device is color transform accelerated.

Test: Manual

Bug: 36603386

Change-Id: I4f7e4e569f5f358e6e3c705f9df02e0da473a081
2017-04-17 11:59:07 -07:00
Fan Zhang
00a0978293 Update action bar style in app header UI.
am: be6fab0135

Change-Id: I51f4b7900fb1be6631b686915e02333db2df2e9f
2017-04-17 18:38:01 +00:00
Sarah Fortune
15d1e2676c Disable the wifi wakeup preference when wifi scanning is disabled
Bug: 36033488
Test: Manual testing on the device, make RunSettingsRoboTests
Change-Id: I0abfe69a8a84dc9c5e78f1debce7748c92b47e04
2017-04-17 11:35:21 -07:00
Fan Zhang
be6fab0135 Update action bar style in app header UI.
- Update background color of actionbar
- Remove elevation of actionbar so it appears to be the same entity as
  app header.
- Add a shadow below app header view. We can't set elevation on app
  header unfortunately because that will add shadow all round the view,
  but we only want shadow below it.
- Updated app icon size/text size per to match UI spec.

Change-Id: I63d7fa42b859a008fa662aaf19848cd40529c2ff
Fix: 37207527
Fix: 37079248
Test: visual && make RunSettingsRoboTests
2017-04-17 09:30:40 -07:00
Daniel Nishi
e90e746046 Merge "Jostle the elements around in app storage settings." into oc-dev
am: bea96cfb65

Change-Id: Ib4a8bf827266d5fbb015fb5d4c71cd7a7f19b617
2017-04-15 00:04:52 +00:00
Daniel Nishi
bea96cfb65 Merge "Jostle the elements around in app storage settings." into oc-dev 2017-04-14 23:52:08 +00:00
Lei Yu
b783b2775d Merge "Update some battery string comments" into oc-dev
am: 2721c8aa03

Change-Id: I4332f53b0c60367c832e68f95ee69f261b54c92f
2017-04-14 20:33:48 +00:00
Lei Yu
2721c8aa03 Merge "Update some battery string comments" into oc-dev 2017-04-14 20:26:27 +00:00
Daniel Nishi
ae3305e7bd Merge "Shrink the progress bar on storage items." into oc-dev
am: 53ea5701f4

Change-Id: Ibd0a426630929dc3c5de7eb98fce692bd30d7729
2017-04-14 20:22:46 +00:00
Daniel Nishi
53ea5701f4 Merge "Shrink the progress bar on storage items." into oc-dev 2017-04-14 20:18:18 +00:00
Daniel Nishi
b6afa7575a Merge "Use the music note icon for the music files pref." into oc-dev
am: fbaa29a4b1

Change-Id: Ic1b0ad7ec4e260703a2cdafcefdc4209957e2561
2017-04-14 19:56:45 +00:00
Daniel Nishi
fbaa29a4b1 Merge "Use the music note icon for the music files pref." into oc-dev 2017-04-14 19:50:31 +00:00
Fan Zhang
b7c880a709 Merge "Get rid of the extra divider lines in memory usage UI" into oc-dev
am: c8c066dedf

Change-Id: Icf250ff46ddfd48d3d213c86f0c5001547a1a4ec
2017-04-14 18:43:09 +00:00
TreeHugger Robot
c8c066dedf Merge "Get rid of the extra divider lines in memory usage UI" into oc-dev 2017-04-14 18:30:13 +00:00
Daniel Nishi
c274a28660 Use the music note icon for the music files pref.
Change-Id: I0e688321d7697aa4ad5b4ae16e7ca03f60e582cd
Fixes: 36900603
Test: Manual
2017-04-14 10:29:14 -07:00
jackqdyulei
3fd3a348d3 Merge "Update summary when toggle background activity" into oc-dev
am: 8d519f8281

Change-Id: I5e135d0cb4d4d6457e05b8c91ef69323cab57a33
2017-04-14 01:25:47 +00:00
TreeHugger Robot
8d519f8281 Merge "Update summary when toggle background activity" into oc-dev 2017-04-14 01:13:57 +00:00
jackqdyulei
7c7654b401 Update some battery string comments
1. battery_detail_foreground
2. battery_detail_background

Fix: 36874567
Test: Build
Change-Id: I955023ff8919b7019d459bd75a8baccf69a46355
2017-04-13 17:54:48 -07:00
Jesse Evans
ec9090782c Merge "Instant apps show supported links not open default" into oc-dev
am: 0f34680fe0

Change-Id: Ib3df529beea9d610bc79512f6f50df5a4c41a640
2017-04-14 00:48:56 +00:00
TreeHugger Robot
0f34680fe0 Merge "Instant apps show supported links not open default" into oc-dev 2017-04-14 00:41:01 +00:00
jackqdyulei
60607da120 Update summary when toggle background activity
In previous code, it didn't update summary when preference is changed.
This cl adds it and also updates the title for Battery Optimization.

Bug: 37163617
Test: RunSettingsRoboTests
Change-Id: I276d9a267379104794998a605a8e258660dcf350
2017-04-13 16:23:45 -07:00
Jesse Evans
edc5099e89 Instant apps show supported links not open default
On the app info page, instant apps show only the supported links
dialog rather than Open by default which opens in a secondary page
where the user can control things that aren't relevant to instant
apps.
Test: make RunSettingsRoboTests
Bug: 36497697
Change-Id: If4eba7c11c5490cbda1ef617002121fe108c4085
2017-04-13 15:17:41 -07:00
Lei Yu
aa03fd4c42 Merge "Revamp battery Ui in low battery mode" into oc-dev
am: c4f08120b1

Change-Id: I98dd93c678a3c71e0c19cb8a2f3979606d7075af
2017-04-13 21:52:49 +00:00
Fan Zhang
2bc3e47953 Get rid of the extra divider lines in memory usage UI
Change-Id: I991f74ed3139f6119188a446fbf12bef23189988
Fix: 37211922
Test: visual
2017-04-13 14:46:00 -07:00
Lei Yu
c4f08120b1 Merge "Revamp battery Ui in low battery mode" into oc-dev 2017-04-13 21:43:38 +00:00
Daniel Nishi
0cce538bb0 Shrink the progress bar on storage items.
Change-Id: I4c9161de01236f7ac7ab633162a806888006fc1f
Fixes: 37283130
Test: Manual
2017-04-13 14:15:29 -07:00
Anna Galusza
cc7de0c36d Update Setup Wizard Vision Settings colors.
Bug: 34470898
Test: UI updates only.

Change-Id: I8693004637f31a433c6911a4c99d5dd1426d76f1
2017-04-13 20:29:45 +00:00
Daniel Nishi
e7202b5c3d Jostle the elements around in app storage settings.
This much more closely resembles the later mocks for
this page. The spacing, fonts, and colors are still off
and will be corrected once the final mocks land.

Bug: 34766830
Test: Manual
Change-Id: Ifbb8511d624cd06422025beee943fdead3faf53b
Merged-In: Id131e3596a0d08cb43c924a9f5cd9eb25329d7de
2017-04-13 13:14:35 -07:00
Jesse Evans
774b759ef9 Merge "Instant apps should not say App Installed by" into oc-dev
am: 28371d9c9e

Change-Id: I17c5ee53f16d26e9e01a54e717e1dcc10051650d
2017-04-13 20:03:43 +00:00
Jack He
ee720c000a Merge "Add developer menu entry to enable Bluetooth inband ringing" into oc-dev 2017-04-13 19:43:55 +00:00
TreeHugger Robot
28371d9c9e Merge "Instant apps should not say App Installed by" into oc-dev 2017-04-13 19:36:53 +00:00
Saige McVea
8fb5b5fd0e Merge "Added generic icon and magnification icon to a11y Settings." into oc-dev
am: ba7a4751a0

Change-Id: I9c9ca5d2584c923520f9d2d9986fdf28f7aae5d8
2017-04-13 19:18:29 +00:00
Saige McVea
ba7a4751a0 Merge "Added generic icon and magnification icon to a11y Settings." into oc-dev 2017-04-13 19:07:33 +00:00
Daniel Nishi
f6e6991965 Merge "Add a movies & tv apps category to storage settings." into oc-dev
am: c365a8735c

Change-Id: I665759c8ce9c74d83a1167c5d04e5134ff697d08
2017-04-13 18:45:04 +00:00
Daniel Nishi
c365a8735c Merge "Add a movies & tv apps category to storage settings." into oc-dev 2017-04-13 18:39:58 +00:00
Sundeep Ghuman
d840ac812d Merge "Update Wifi Preferences with custom icons." into oc-dev
am: 43bd76d2d0

Change-Id: I3a37077a166051c85891904e154de2fbcfc3ef63
2017-04-13 17:46:02 +00:00
Anas Karbila
97d884ad54 Merge "Settings: Fix wrong wifi drawable in screen zooming preview" am: 31ec85a913 am: 282a2317b9
am: 08cc4afc07

Change-Id: Ia99a4cb7fcb06612b26a050081e731a535449194
2017-04-13 17:37:42 +00:00
Anas Karbila
08cc4afc07 Merge "Settings: Fix wrong wifi drawable in screen zooming preview" am: 31ec85a913
am: 282a2317b9

Change-Id: I7775df15acf1cb74cad94e3e23dd6faf5d98412e
2017-04-13 17:27:36 +00:00
TreeHugger Robot
43bd76d2d0 Merge "Update Wifi Preferences with custom icons." into oc-dev 2017-04-13 17:08:25 +00:00
TreeHugger Robot
20099035ef Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-13 15:24:25 +00:00
Julia Reynolds
cd8f4fb614 Merge "Notification sound field updates" into oc-dev
am: b40a459031

Change-Id: Ie8b98d89f477c0d5cfc46946ea1bc14735b07c16
2017-04-13 13:13:18 +00:00
Anas Karbila
e17dc5eeb0 Settings: Fix wrong wifi drawable in screen zooming preview
We should use the same wifi drawable for the screen
zooming preview as the one the real settings menu
is using.

Change-Id: Ibb0d45b9f5aa431b52864aa826ea84c49b2d3fa0
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
2017-04-13 13:04:41 +00:00