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
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
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
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
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
-s ours
Change-Id: I9473a5de7493dd65fb6c4cefa0dbe56c1c20ae06
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
-s ours
Change-Id: I21e677aa73df3a150f46bed015f61592c71be348
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
-s ours
Change-Id: If2f2bb43dcc0c9215ae7c20a362742fdf9f4e607
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
-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
Bill Yi
29978d1ee6
Import translations. DO NOT MERGE am: 6cf2d99816
-s ours
...
am: bd3bd7d1e1
-s ours
Change-Id: I5654af1da287c0864385a5d6e473cd2800427eb7
2017-07-20 20:04:42 +00:00
Bill Yi
de7f8eb788
Import translations. DO NOT MERGE am: 6cf2d99816
-s ours
...
am: cc298f9ae6
-s ours
Change-Id: I3e0203a1fdc9f803c0f981d5dca7ad286493b4ce
2017-07-20 20:04:41 +00:00
Bill Yi
cc298f9ae6
Import translations. DO NOT MERGE
...
am: 6cf2d99816
-s ours
Change-Id: Ic6e1c58d91200c599211ccf4a1f781892dc75d55
2017-07-20 19:58:46 +00:00
Bill Yi
bd3bd7d1e1
Import translations. DO NOT MERGE
...
am: 6cf2d99816
-s ours
Change-Id: Iad277ccc5f81d14255363128d400420ca70cd376
2017-07-20 19:58:46 +00:00
Doris Ling
8b07bb4091
Move Gesture settings up one level. am: 204ca74397
...
am: 68406aaa69
Change-Id: I79a59cda05b9a263a84a7846d81f1e7bbe3ee848
2017-07-20 19:54:55 +00:00
Doris Ling
68406aaa69
Move Gesture settings up one level.
...
am: 204ca74397
Change-Id: I01ffe71df1e0769d87f9df6cdb1d3ced39e0ba99
2017-07-20 19:33:08 +00:00
Bill Yi
6cf2d99816
Import translations. DO NOT MERGE
...
Change-Id: If5c18c395a4293f6c084f9019fd37a17ddfd24d9
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-20 10:53:14 -07:00
Doris Ling
c496421aef
Ensure that brightness level is within 0-100%.
...
Check whether the retrieved brightnesss value is out of range, and
adjust it if necessary.
Change-Id: Ieb1ccc03dcb9fa3e1ed192fcc3d217b84d4d316c
Fix: 63872023
Test: make RunSettingsRoboTests
(cherry picked from commit c7d2d270ab
)
2017-07-20 17:39:58 +00:00
Antony Sargent
64fab6f4cd
Switch to using gray icon for Bluetooth imaging devices
...
All the other Bluetooth icons were switched to gray at some point in the
past, but we must have missed this one.
Bug: 63858978
Test: make RunSettingsRoboTests
Change-Id: I2ebefa42f3ecff8ae6d58f4bdb22dce39ae4dbd4
2017-07-20 09:54:29 -07:00