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
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
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
2017-07-20 20:42:46 +00:00
Doris Ling
c84001528c
Fix gesture preview image visibility not set correctly.
...
- update for the preview image is done only in onStart()/Stop().
Move the handling to onPause()/onResume() instead so that visibility
updates will also be done when switching between pages.
- remove the obsolete GesturePreference class.
Change-Id: I743a9d41f17aab3303201e11e5bba708ca5810ae
Fix: 63783217
Test: make RunSettingsRoboTests
2017-07-20 20:41:43 +00:00
Doris Ling
1f8c5debbb
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev
...
am: 390bb3216d
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
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
Bill Yi
1835292a22
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
...
am: 6c3edcd118
2017-07-20 20:16:26 +00:00
Bill Yi
43a7927631
Merge "Import translations. DO NOT MERGE am: 6cf2d99816 -s ours am: bd3bd7d1e1 -s ours am: 29978d1ee6 -s ours" into oc-mr1-dev-plus-aosp
...
am: 2929aa2069
2017-07-20 20:16:02 +00:00
Bill Yi
b2d0eb2cf7
Import translations. DO NOT MERGE am: 6cf2d99816 -s ours am: cc298f9ae6 -s ours am: 821967eca5 -s ours
...
am: b840846416
2017-07-20 20:15:42 +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
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
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
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
2017-07-20 20:04:42 +00:00
Bill Yi
29978d1ee6
Import translations. DO NOT MERGE am: 6cf2d99816 -s ours
...
am: bd3bd7d1e1
2017-07-20 20:04:42 +00:00
Bill Yi
de7f8eb788
Import translations. DO NOT MERGE am: 6cf2d99816 -s ours
...
am: cc298f9ae6
2017-07-20 20:04:41 +00:00
Bill Yi
cc298f9ae6
Import translations. DO NOT MERGE
...
am: 6cf2d99816
2017-07-20 19:58:46 +00:00
Bill Yi
bd3bd7d1e1
Import translations. DO NOT MERGE
...
am: 6cf2d99816
2017-07-20 19:58:46 +00:00
Doris Ling
8b07bb4091
Move Gesture settings up one level. am: 204ca74397
...
am: 68406aaa69
2017-07-20 19:54:55 +00:00
