Commit Graph

38696 Commits

Author SHA1 Message Date
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
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
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
bd3bd7d1e1 Import translations. DO NOT MERGE
am: 6cf2d99816  -s ours

Change-Id: Iad277ccc5f81d14255363128d400420ca70cd376
2017-07-20 19:58:46 +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
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
Doris Ling
204ca74397 Move Gesture settings up one level.
Move System->Languages, input & gestures->Gestures to System->Gestures.

Change-Id: Ie81876208383f69ebf1a0465d76c760d7dd9d95d
Fix: 62276882
Test: make RunSettingsRoboTests
(cherry picked from commit 55ce7de7d0)
2017-07-20 16:46:44 +00:00
Fan Zhang
bac6458a22 Ignore clicks on developer switch UI during monkey test
Change-Id: I10c4771386bb38e117848da385090dec78e4a2f8
Fix: 63852950
Test: robotests
2017-07-20 16:44:28 +00:00
Android Build Merger (Role)
f2223accb0 Merge "Merge "Zen priority settings update" into oc-dr1-dev am: 9dec71f7d7 am: b49578e485" into oc-mr1-dev-plus-aosp 2017-07-20 14:27:14 +00:00
Julia Reynolds
986210c390 Merge "Zen priority settings update" into oc-dr1-dev am: 9dec71f7d7
am: b49578e485

Change-Id: I00e748acbef7661272eae4d28f66bfde5ac854b5
2017-07-20 14:27:01 +00:00
Julia Reynolds
8639bbcb2e Merge "Zen priority settings update" into oc-dr1-dev am: 9dec71f7d7
am: 2ab6e2ef9e

Change-Id: Idd8c5f5602a46e595077989dc03911367f633263
2017-07-20 14:26:50 +00:00
Julia Reynolds
2ab6e2ef9e Merge "Zen priority settings update" into oc-dr1-dev
am: 9dec71f7d7

Change-Id: I1170215a15609f1ca5b4da0eeff0ecc112d9fbf3
2017-07-20 14:24:03 +00:00
Julia Reynolds
b49578e485 Merge "Zen priority settings update" into oc-dr1-dev
am: 9dec71f7d7

Change-Id: I81e2609637537413bfd36ed9e0658d49d533a9cd
2017-07-20 14:23:51 +00:00
Julia Reynolds
9dec71f7d7 Merge "Zen priority settings update" into oc-dr1-dev 2017-07-20 14:19:33 +00:00
Bill Yi
606f83bd74 Import translations. DO NOT MERGE
Change-Id: I1dad650eb3d6c49c1b1b8b6873a2f8a0ffe89a9c
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-19 23:13:29 -07:00
Salvador Martinez
7961627680 Add some more logging to settings battery stuff
This CL adds logging to areas which are possible suspects for
the slowdown some people have been reporting in the
PowerUsageAdvanced screen. It times the time it takes for various
battery stats methods as well as the time it takes to draw things.

Test: still build (only adds logging)
Bug: 62959645
Bug: 63442960
Change-Id: I7e6c5e83e33a931057c9fdef14d3bef84f514940
2017-07-19 18:16:56 -07:00
Rajeev Kumar
5984c71af2 Merge "Data plan usage summary activity." 2017-07-19 21:41:09 +00:00
TreeHugger Robot
1dcfbdb0cc Merge "Delete " / " delimiter in Settings app." 2017-07-19 20:39:05 +00:00
Rajeev Kumar
4a5e3dc6c5 Data plan usage summary activity.
Change-Id: Ibb0889563d432591fd00ac00d03633b1894ad124
Note: These changes are required for Data balance UI.
Bug: 62349208
Test: make RunSettingsRoboTests -j40
2017-07-19 12:35:24 -07:00
TreeHugger Robot
ba70d1866f Merge "Settings: Add SMS Mirroring." 2017-07-19 16:52:57 +00:00
Julia Reynolds
33e8223fe2 Merge "Add separator to auto zen rule listing." into oc-dr1-dev am: afe4ce0927
am: 92f2cd5055

Change-Id: Iafd82b051b0e2f83dc797338bb121cf72f29c52c
2017-07-19 16:50:55 +00:00
Julia Reynolds
92f2cd5055 Merge "Add separator to auto zen rule listing." into oc-dr1-dev
am: afe4ce0927

Change-Id: I91c22aeb773e32d544bb658a61e94c2b740ae5c9
2017-07-19 16:47:56 +00:00
Julia Reynolds
afe4ce0927 Merge "Add separator to auto zen rule listing." into oc-dr1-dev 2017-07-19 16:44:07 +00:00
Oren Blasberg
d33dcf13ee Settings: Add SMS Mirroring.
Bug: 37546615

Test: Updated Robolectric suite with new unit tests.

Change-Id: I02e1723e1b125b004ff679d6242df14bca4f08ce
2017-07-19 08:07:11 -07:00