Julia Reynolds
6ad9f3267b
Zen settings screen update
...
am: 56b748d686
2017-07-21 16:21:25 +00:00
Julia Reynolds
4faa353f02
Zen settings screen update
...
am: 56b748d686
2017-07-21 16:21:25 +00:00
Julia Reynolds
56b748d686
Zen settings screen update
...
- Remove app attribution
- Change visual disturbances label
Change-Id: Id2f7a16817a3b044db4374bf45a54706b8c42eff
Fixes: 63905920
Fixes: 63906381
Test: manual
2017-07-21 09:11:14 -04:00
Daniel Nishi
edd0f985a8
Merge "Merge "Make the support loader activity display UI." into oc-dr1-dev am: 4ab6f77f98 am: bb86b53a06" into oc-mr1-dev-plus-aosp
...
am: 744bb1c4b1
2017-07-21 01:52:12 +00:00
Daniel Nishi
f63ad77b68
Merge "Make the support loader activity display UI." into oc-dr1-dev am: 4ab6f77f98 am: 0eae770acc
...
am: eeae7822a2
2017-07-21 01:51:38 +00:00
Android Build Merger (Role)
744bb1c4b1
Merge "Merge "Make the support loader activity display UI." into oc-dr1-dev am: 4ab6f77f98 am: bb86b53a06" into oc-mr1-dev-plus-aosp
2017-07-21 01:50:05 +00:00
Daniel Nishi
62fa0f8410
Merge "Make the support loader activity display UI." into oc-dr1-dev am: 4ab6f77f98
...
am: bb86b53a06
2017-07-21 01:49:39 +00:00
Daniel Nishi
eeae7822a2
Merge "Make the support loader activity display UI." into oc-dr1-dev am: 4ab6f77f98
...
am: 0eae770acc
2017-07-21 01:49:34 +00:00
Daniel Nishi
bb86b53a06
Merge "Make the support loader activity display UI." into oc-dr1-dev
...
am: 4ab6f77f98
2017-07-21 01:47:17 +00:00
Daniel Nishi
0eae770acc
Merge "Make the support loader activity display UI." into oc-dr1-dev
...
am: 4ab6f77f98
2017-07-21 01:47:17 +00:00
TreeHugger Robot
4ab6f77f98
Merge "Make the support loader activity display UI." into oc-dr1-dev
2017-07-21 01:43:47 +00:00
Fan Zhang
ee8d574c26
Add shadow to searchbar when user scrolls vertically
...
Bug: 63528057
Test: robotests
Change-Id: Ib85676d78b43be38aab1eacd0820d0755a601f60
(cherry picked from commit e651ddf9e6
2017-07-21 01:34:46 +00:00
Christine Franks
a09eb383d9
Move logic for FR in demo mode out of Settings
...
Bug: 62712426
Test: make \
ROBOTEST_FILTER="(MasterClearTest|FactoryResetPreferenceControllerTest
|UtilsTest)" \
RunSettingsRoboTests -j100
Change-Id: I5e287c3d4a6a7050bda78187c52aec19e90b50bc
2017-07-20 17:44:18 -07:00
Fan Zhang
1cc0ebc79a
Merge "Add shadow to searchbar when user scrolls vertically" into oc-mr1-dev am: 91468e309c
...
am: 2770bfa38b
2017-07-21 00:44:01 +00:00
Fan Zhang
2770bfa38b
Merge "Add shadow to searchbar when user scrolls vertically" into oc-mr1-dev
...
am: 91468e309c
2017-07-21 00:41:32 +00:00
TreeHugger Robot
91468e309c
Merge "Add shadow to searchbar when user scrolls vertically" into oc-mr1-dev
2017-07-21 00:36:59 +00:00
Doris Ling
6f44ea54ae
Add divider line below "see all apps" preference
...
- and increase the tile limit by 1 to accomodate the divider.
Change-Id: I94cbf47fd987a6ff4c4fabcc3124fae1f0438876
Fix: 63906012
Test: make RunSettingsRoboTests
(cherry picked from commit 6cd558e595
2017-07-20 17:21:11 -07:00
Fan Zhang
68d910978d
Merge "Ignore clicks on developer switch UI during monkey test" into oc-mr1-dev am: 52a3b5c17d
...
am: 8809d3f18e
2017-07-20 22:31:24 +00:00
Fan Zhang
8809d3f18e
Merge "Ignore clicks on developer switch UI during monkey test" into oc-mr1-dev
...
am: 52a3b5c17d
2017-07-20 22:23:54 +00:00
TreeHugger Robot
52a3b5c17d
Merge "Ignore clicks on developer switch UI during monkey test" into oc-mr1-dev
2017-07-20 22:17:50 +00:00
Salvador Martinez
07647532c6
Merge "Merge "Add some more logging to settings battery stuff" into oc-dr1-dev am: e4c9b7162d am: 30b97e89d4" into oc-mr1-dev-plus-aosp
...
am: 280c7976e7
2017-07-20 21:58:10 +00:00
Salvador Martinez
40d1465ea3
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev am: e4c9b7162d am: 2834bcb195
...
am: c2649ba09d
2017-07-20 21:57:49 +00:00
Android Build Merger (Role)
280c7976e7
Merge "Merge "Add some more logging to settings battery stuff" into oc-dr1-dev am: e4c9b7162d am: 30b97e89d4" into oc-mr1-dev-plus-aosp
2017-07-20 21:56:06 +00:00
Salvador Martinez
c27c831b1b
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev am: e4c9b7162d
...
am: 30b97e89d4
2017-07-20 21:55:52 +00:00
Salvador Martinez
c2649ba09d
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev am: e4c9b7162d
...
am: 2834bcb195
2017-07-20 21:55:48 +00:00
Salvador Martinez
30b97e89d4
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev
...
am: e4c9b7162d
2017-07-20 21:53:50 +00:00
Salvador Martinez
2834bcb195
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev
...
am: e4c9b7162d
2017-07-20 21:53:50 +00:00
Bill Yi
79c6f7a156
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: acd97be0b8 -s ours am: 2d50ad831e -s ours
...
am: 14ebe7a75d
2017-07-20 21:47:30 +00:00
Bill Yi
c6d86e281c
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: acd97be0b8 -s ours am: bc1a0265c5 -s ours
...
am: 34d159fca7
2017-07-20 21:47:10 +00:00
TreeHugger Robot
e4c9b7162d
Merge "Add some more logging to settings battery stuff" into oc-dr1-dev
2017-07-20 21:46:33 +00:00
Amit Mahajan
20446c50b6
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am: c2b12c5304 am: 8ace0324ee
...
am: e31cad3392
2017-07-20 21:41:58 +00:00
Amit Mahajan
e377bd5271
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am: c2b12c5304 am: 9ded852f71
...
am: 4a88f93aac
2017-07-20 21:37:54 +00:00
Bill Yi
14ebe7a75d
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: acd97be0b8 -s ours
...
am: 2d50ad831e
2017-07-20 21:31:34 +00:00
Bill Yi
34d159fca7
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: acd97be0b8 -s ours
...
am: bc1a0265c5
2017-07-20 21:29:51 +00:00
Bill Yi
2d50ad831e
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: acd97be0b8
2017-07-20 21:27:48 +00:00
Bill Yi
bc1a0265c5
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: acd97be0b8
2017-07-20 21:27:48 +00:00
Amit Mahajan
e31cad3392
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am: c2b12c5304
...
am: 8ace0324ee
2017-07-20 21:26:51 +00:00
Doris Ling
a184178256
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev am: 390bb3216d am: 1f8c5debbb
...
am: 4d3a9f6f63
2017-07-20 21:18:42 +00:00
Evan Laird
c2b3d82e4b
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev am: a9e2d97004 am: e99586cfea
...
am: 36d4a23727
2017-07-20 21:18:23 +00:00
Doris Ling
192fbd1c21
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev am: 390bb3216d am: 11cfc26d0a
...
am: c7efdbdbf5
2017-07-20 21:18:05 +00:00
Evan Laird
e4f8e8d3fb
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev am: a9e2d97004 am: bc562b1888
...
am: de5d2e8894
2017-07-20 21:17:47 +00:00
TreeHugger Robot
acd97be0b8
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-07-20 21:17:34 +00:00
Amit Mahajan
4a88f93aac
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am: c2b12c5304
...
am: 9ded852f71
2017-07-20 21:11:45 +00:00
TreeHugger Robot
508a622fac
Merge "Import translations. DO NOT MERGE"
2017-07-20 21:08:37 +00:00
Amit Mahajan
9ded852f71
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
...
am: c2b12c5304
2017-07-20 21:00:23 +00:00
Amit Mahajan
8ace0324ee
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
...
am: c2b12c5304
2017-07-20 20:58:48 +00:00
Doris Ling
4d3a9f6f63
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev am: 390bb3216d
...
am: 1f8c5debbb
2017-07-20 20:57:03 +00:00
Evan Laird
36d4a23727
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev am: a9e2d97004
...
am: e99586cfea
2017-07-20 20:56:43 +00:00
Doris Ling
c7efdbdbf5
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev am: 390bb3216d
...
am: 11cfc26d0a
2017-07-20 20:51:19 +00:00
Evan Laird
de5d2e8894
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev am: a9e2d97004
...
am: bc562b1888
2017-07-20 20:50:57 +00:00
