Android Build Merger (Role)
|
073e23286a
|
Merge "Zen settings screen update am: 56b748d686 am: 4faa353f02" into oc-mr1-dev-plus-aosp
|
2017-07-21 16:27:31 +00:00 |
|
Julia Reynolds
|
fb2452f5d9
|
Zen settings screen update am: 56b748d686
am: 4faa353f02
Change-Id: Ifd7d390db0373561b9a5536b412373579dadc8e3
|
2017-07-21 16:27:18 +00:00 |
|
Julia Reynolds
|
eff648bf76
|
Zen settings screen update am: 56b748d686
am: 6ad9f3267b
Change-Id: I1430e8788765d33e6fd03e2739676d26964cda68
|
2017-07-21 16:27:00 +00:00 |
|
Julia Reynolds
|
4faa353f02
|
Zen settings screen update
am: 56b748d686
Change-Id: Iaac694915e20e5dc0f5edd0d1be17321621caa6e
|
2017-07-21 16:21:25 +00:00 |
|
Julia Reynolds
|
6ad9f3267b
|
Zen settings screen update
am: 56b748d686
Change-Id: Ida9de16ee3a52fd1d06764e560411401c976ac5d
|
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 |
|
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
Change-Id: I8fcb2b002c6007dafaeeee882a00937f4aa94e79
|
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
Change-Id: I0ae9bff7b69927d535656482838f1819304d82df
|
2017-07-21 01:49:34 +00:00 |
|
Daniel Nishi
|
0eae770acc
|
Merge "Make the support loader activity display UI." into oc-dr1-dev
am: 4ab6f77f98
Change-Id: I06dea000a9bc74314905f49843262e79a6c240dd
|
2017-07-21 01:47:17 +00:00 |
|
Daniel Nishi
|
bb86b53a06
|
Merge "Make the support loader activity display UI." into oc-dr1-dev
am: 4ab6f77f98
Change-Id: I17baf254839424d21f1588b1a7925927437b95c6
|
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
|
2770bfa38b
|
Merge "Add shadow to searchbar when user scrolls vertically" into oc-mr1-dev
am: 91468e309c
Change-Id: Ib1dcebb2136f8a673e050a3d19534d3fdb309766
|
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 |
|
Fan Zhang
|
8809d3f18e
|
Merge "Ignore clicks on developer switch UI during monkey test" into oc-mr1-dev
am: 52a3b5c17d
Change-Id: I2127af952a134a9eeb17c2ee2eda6c8410a671f6
|
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 |
|
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
Change-Id: I6a1d8d036380f183bb080330542f0d5090e93a1b
|
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
Change-Id: I07ba4b0efeae47fc80c46a193aaf073ccadbc182
|
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
Change-Id: Ib105c6a9769db260e781dde61af74563735345a3
|
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
Change-Id: I560c4f1640b20e781daf2bcc9e22fc0c9b511b90
|
2017-07-20 21:53:50 +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 |
|
Bill Yi
|
14ebe7a75d
|
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: acd97be0b8 -s ours
am: 2d50ad831e -s ours
Change-Id: Ic02b25c0a6077217fbd8093ae4f55a062d62bb3f
|
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 -s ours
Change-Id: Ife685585ed0bef93f591de8b852dd4368811af42
|
2017-07-20 21:29:51 +00:00 |
|
Bill Yi
|
2d50ad831e
|
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: acd97be0b8 -s ours
Change-Id: I4b9fad43198474d48c7eb5313b52f9c9314ca05f
|
2017-07-20 21:27:48 +00:00 |
|
Bill Yi
|
bc1a0265c5
|
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: acd97be0b8 -s ours
Change-Id: Ib8a1e9a9f4b4ae2d056b5b4bf8e6603aa9212c4d
|
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
Change-Id: I515783259b3c57c36985e0646886a1248a47c608
|
2017-07-20 21:26:51 +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
Change-Id: I1fc8aec7c8cfc71c707f4ea1d0f02a2a2a7c8375
|
2017-07-20 21:11:45 +00:00 |
|
Amit Mahajan
|
9ded852f71
|
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
am: c2b12c5304
Change-Id: Ic352005843d3ffd0b04a0a80710c04a5f02291a6
|
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
Change-Id: I536c3111a917a2d9b1f64235fb54c5face72eb74
|
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
Change-Id: If600090e0b5e49682411dc42c027a206c97e3e2c
|
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
Change-Id: I84e08dda688ccec72c9c672813f75a3f597784e3
|
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
Change-Id: I3ac60eea7ed915e891412f88479c9b5374f53299
|
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
Change-Id: I9c33400aa612b7c44b9199ef8564889d8a128a1b
|
2017-07-20 20:50:57 +00:00 |
|
Amit Mahajan
|
c2b12c5304
|
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
|
2017-07-20 20:47:12 +00:00 |
|
Doris Ling
|
11cfc26d0a
|
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev
am: 390bb3216d
Change-Id: Icfaf4162e4f43e6f91bc886e3750c2a713765e5c
|
2017-07-20 20:43:32 +00:00 |
|
Evan Laird
|
bc562b1888
|
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev
am: a9e2d97004
Change-Id: I891ad549056df8632fd10570769c2695f6ad4384
|
2017-07-20 20:42:46 +00:00 |
|
Doris Ling
|
1f8c5debbb
|
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev
am: 390bb3216d
Change-Id: I4b6b6f8d2d6ef19e16d74df1f403f0a5f5109713
|
2017-07-20 20:38:09 +00:00 |
|
Evan Laird
|
e99586cfea
|
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev
am: a9e2d97004
Change-Id: I596d700d10a29640344d4554824a29eb21e71cf1
|
2017-07-20 20:37:47 +00:00 |
|
TreeHugger Robot
|
390bb3216d
|
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev
|
2017-07-20 20:34:55 +00:00 |
|
Fan Zhang
|
e651ddf9e6
|
Add shadow to searchbar when user scrolls vertically
Bug: 63528057
Test: robotests
Change-Id: Ib85676d78b43be38aab1eacd0820d0755a601f60
|
2017-07-20 20:32:09 +00:00 |
|
TreeHugger Robot
|
a9e2d97004
|
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev
|
2017-07-20 20:23:53 +00:00 |
|
Android Build Merger (Role)
|
6c3edcd118
|
Merge "Merge "Import translations. DO NOT MERGE am: 6cf2d99816 -s ours am: cc298f9ae6 -s ours" into oc-dr1-dev-plus-aosp am: 8746483a7c -s ours" into oc-mr1-dev-plus-aosp
|
2017-07-20 20:10:56 +00:00 |
|
Bill Yi
|
beb1dab803
|
Merge "Import translations. DO NOT MERGE am: 6cf2d99816 -s ours am: cc298f9ae6 -s ours" into oc-dr1-dev-plus-aosp
am: 8746483a7c -s ours
Change-Id: I5a0e57de40ded32e9207c4ac0e5e85e89d2fde1f
|
2017-07-20 20:10:38 +00:00 |
|
Android Build Merger (Role)
|
2929aa2069
|
Merge "Import translations. DO NOT MERGE am: 6cf2d99816 -s ours am: bd3bd7d1e1 -s ours am: 29978d1ee6 -s ours" into oc-mr1-dev-plus-aosp
|
2017-07-20 20:10:30 +00:00 |
|
Bill Yi
|
576a46e8c5
|
Import translations. DO NOT MERGE am: 6cf2d99816 -s ours am: bd3bd7d1e1 -s ours
am: 29978d1ee6 -s ours
Change-Id: I876d8498f240de3446cc7700ae36db901f6a8408
|
2017-07-20 20:10:13 +00:00 |
|
Bill Yi
|
b840846416
|
Import translations. DO NOT MERGE am: 6cf2d99816 -s ours am: cc298f9ae6 -s ours
am: 821967eca5 -s ours
Change-Id: I5fa9fbca513f35b554126b8a86536c68dcbdf7d0
|
2017-07-20 20:10:11 +00:00 |
|
Android Build Merger (Role)
|
8746483a7c
|
Merge "Import translations. DO NOT MERGE am: 6cf2d99816 -s ours am: cc298f9ae6 -s ours" into oc-dr1-dev-plus-aosp
|
2017-07-20 20:05:12 +00:00 |
|
Bill Yi
|
821967eca5
|
Import translations. DO NOT MERGE am: 6cf2d99816 -s ours
am: cc298f9ae6 -s ours
Change-Id: I28beea32e9cdc8bced4cd2af333e391bfc6d73c0
|
2017-07-20 20:04:42 +00:00 |
|