Sunny Goyal
91f6cad742
Merge "Using a common class for loading drawables and handling various badging" into oc-dev am: d2561263a8
...
am: 77fca989a0
2017-04-19 03:03:50 +00:00
Sunny Goyal
77fca989a0
Merge "Using a common class for loading drawables and handling various badging" into oc-dev
...
am: d2561263a8
2017-04-19 02:53:17 +00:00
TreeHugger Robot
d2561263a8
Merge "Using a common class for loading drawables and handling various badging" into oc-dev
2017-04-19 02:43:48 +00:00
Saige McVea
c83b8de6a7
Merge "Conditionally reposition experimental preferences." into oc-dev am: b18e31bc5a
...
am: f869788eb8
2017-04-18 22:00:48 +00:00
Saige McVea
f869788eb8
Merge "Conditionally reposition experimental preferences." into oc-dev
...
am: b18e31bc5a
2017-04-18 21:54:38 +00:00
Saige McVea
b18e31bc5a
Merge "Conditionally reposition experimental preferences." into oc-dev
2017-04-18 21:47:25 +00:00
Sunny Goyal
3b172d7b89
Using a common class for loading drawables and handling various badging
...
Test: make RunSettingsRoboTests -j31
Bug: 36591157
Change-Id: I4cb1d313920d5d8604fd79ff65b40e2dda180e2e
2017-04-18 21:34:13 +00:00
Alison Cichowlas
7622c300bd
Merge "In apps with no channels, provide settings for misc channel in top level." into oc-dev am: cf172040a9
...
am: 2d8a676b47
2017-04-18 20:54:59 +00:00
Alison Cichowlas
2d8a676b47
Merge "In apps with no channels, provide settings for misc channel in top level." into oc-dev
...
am: cf172040a9
2017-04-18 20:49:52 +00:00
Alison Cichowlas
cf172040a9
Merge "In apps with no channels, provide settings for misc channel in top level." into oc-dev
2017-04-18 20:36:54 +00:00
Anna Galusza
50d359aa38
Merge "Update Setup Wizard Vision Settings colors." into oc-dev am: 221f9245d6
...
am: 86d10d65ab
2017-04-18 19:48:03 +00:00
Anna Galusza
86d10d65ab
Merge "Update Setup Wizard Vision Settings colors." into oc-dev
...
am: 221f9245d6
2017-04-18 19:42:39 +00:00
Anna Galusza
221f9245d6
Merge "Update Setup Wizard Vision Settings colors." into oc-dev
2017-04-18 19:35:06 +00:00
Alison Cichowlas
7f431e3cd1
In apps with no channels, provide settings for misc channel in top level.
...
Test: robolectric tests pass, plus manual verification
Bug: 36561295
Change-Id: I58872a41fab562787d85bade0552c7735d716e5b
2017-04-18 18:49:24 +00:00
Julia Reynolds
90f49214d0
Merge "Consolidate notification settings." into oc-dev am: 6adf04c741
...
am: bcaa8ecb24
2017-04-18 02:03:01 +00:00
Maurice Lam
1b852af477
Sticky footer for GLIF theme
...
am: 667d694220
2017-04-18 01:02:00 +00:00
Maurice Lam
62c5a2c357
Merge "Use buttons for EncryptionInterstitial" into oc-dev
...
am: b6a0360a92
2017-04-18 01:01:43 +00:00
Maurice Lam
667d694220
Sticky footer for GLIF theme
...
For settings screens using GLIF theme, update to sticky footers.
Test: Existing tests pass
Bug: 35448201
Change-Id: If26e7e25f7f02b4c24979503e0c9359b88ff16d1
(cherry picked from commit a857c8da4f
2017-04-18 00:33:44 +00:00
TreeHugger Robot
b6a0360a92
Merge "Use buttons for EncryptionInterstitial" into oc-dev
2017-04-18 00:32:55 +00:00
Julia Reynolds
bcaa8ecb24
Merge "Consolidate notification settings." into oc-dev
...
am: 6adf04c741
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
Fan Zhang
b0c2ca7c07
Merge "Use standard preference layout for wallpaper picker" into oc-dev am: 8e1d588cdf
...
am: d96ce57713
2017-04-17 22:33:08 +00:00
Sarah Fortune
e6fbdee6e6
Merge "Disable the wifi wakeup preference when wifi scanning is disabled" into oc-dev am: f7896f491a
...
am: 9827007c5e
2017-04-17 22:32:52 +00:00
Fan Zhang
554ae02f68
Update action bar style in app header UI. am: be6fab0135
...
am: 00a0978293
2017-04-17 21:37:24 +00: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
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
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
TreeHugger Robot
ee4e9a7fe8
Merge "Finalize the string for eSIM factory reset."
2017-04-17 19:50:16 +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
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
2017-04-15 00:04:52 +00:00
qingxi
a7b8b66fc5
Finalize the string for eSIM factory reset.
...
Bug: 37255419
Test: refactoring CL. Existing unit tests still pass.
Change-Id: I6fe5d09bc58021fe196dc8ee739280d70f9d0017
2017-04-14 17:04:20 -07: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
ce62cb0118
Merge "Update some battery string comments" into oc-dev am: 2721c8aa03
...
am: b783b2775d
2017-04-14 20:41:17 +00:00
Lei Yu
b783b2775d
Merge "Update some battery string comments" into oc-dev
...
am: 2721c8aa03
2017-04-14 20:33:48 +00:00
Daniel Nishi
99ebf72938
Merge "Shrink the progress bar on storage items." into oc-dev am: 53ea5701f4
...
am: ae3305e7bd
2017-04-14 20:28:02 +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
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
10cdecef13
Merge "Use the music note icon for the music files pref." into oc-dev am: fbaa29a4b1
...
am: b6afa7575a
2017-04-14 20:00:05 +00:00
Daniel Nishi
b6afa7575a
Merge "Use the music note icon for the music files pref." into oc-dev
...
am: fbaa29a4b1
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
0d6cd5a902
Merge "Get rid of the extra divider lines in memory usage UI" into oc-dev am: c8c066dedf
...
am: b7c880a709
2017-04-14 18:48:18 +00:00
jackqdyulei
c238596912
Merge "Update summary when toggle background activity" into oc-dev am: 8d519f8281
...
am: 3fd3a348d3
2017-04-14 18:47:47 +00:00
Jesse Evans
3d9fc82734
Merge "Instant apps show supported links not open default" into oc-dev am: 0f34680fe0
...
am: ec9090782c
2017-04-14 18:47:30 +00:00
