Julia Reynolds
|
c163e02162
|
Merge "Zen settings screen update am: 56b748d686 am: 4faa353f02" into oc-mr1-dev-plus-aosp
am: 073e23286a
Change-Id: I116b395ee178ee550c7d02cc8c10b5a21b919f49
|
2017-07-21 16:30:39 +00:00 |
|
Julia Reynolds
|
1525457b4d
|
Zen settings screen update am: 56b748d686 am: 6ad9f3267b
am: eff648bf76
Change-Id: Ic32cc6a1762b60b15e76762868a403e9f2b143d7
|
2017-07-21 16:30:18 +00:00 |
|
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 |
|
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
Change-Id: I6e1a850bcbfb2e08ad5fbfa0c716cac477f5ddab
|
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
Change-Id: I53d3e3dc095ee9f40470caeec09a6d41cb2048de
|
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
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
|
1cc0ebc79a
|
Merge "Add shadow to searchbar when user scrolls vertically" into oc-mr1-dev am: 91468e309c
am: 2770bfa38b
Change-Id: I6c6ceb9d46e88bccc727334bd5a8cd373519b11c
|
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
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
|
68d910978d
|
Merge "Ignore clicks on developer switch UI during monkey test" into oc-mr1-dev am: 52a3b5c17d
am: 8809d3f18e
Change-Id: I549c76f6670f92d63c7becb3284c95e97e9a386b
|
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
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 |
|
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
Change-Id: I4904a1db6b774acf447f1f1acd0f5c06b186c8cc
|
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
Change-Id: Id7483570224dd0ecb9e62fe6f1cbcdba6e9dec52
|
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
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 |
|
Bill Yi
|
79c6f7a156
|
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: acd97be0b8 -s ours am: 2d50ad831e -s ours
am: 14ebe7a75d -s ours
Change-Id: Ia4cba51e8f08c5ff7e84756a4b920182835c2640
|
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 -s ours
Change-Id: I63a6c314846d2dcedd1cc1d8477c55aece9b3bc3
|
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
Change-Id: I206cef8dd9bc299bf455a7f1f425663ddadf5d05
|
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
Change-Id: Ie3a97abc571824ddbe24173a0e02293638befed1
|
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 -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 |
|
Doris Ling
|
a184178256
|
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev am: 390bb3216d am: 1f8c5debbb
am: 4d3a9f6f63
Change-Id: I4be042696570d0bd62e945a6f541677ea6dc5637
|
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
Change-Id: I01a325cf480a98749eac987642eebdfb09e1cd71
|
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
Change-Id: I9d1ed8ddc814387d767fd9ca653dde96865b2534
|
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
Change-Id: Ia40e778b74941bce7cda9e13643684c2eb96caa7
|
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
Change-Id: I1fc8aec7c8cfc71c707f4ea1d0f02a2a2a7c8375
|
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
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 |
|