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
508a622fac
Merge "Import translations. DO NOT MERGE"
2017-07-20 21:08:37 +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
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
TreeHugger Robot
390bb3216d
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev
2017-07-20 20:34:55 +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
29978d1ee6
Import translations. DO NOT MERGE am: 6cf2d99816 -s ours
...
am: bd3bd7d1e1
2017-07-20 20:04:42 +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
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
Doris Ling
68406aaa69
Move Gesture settings up one level.
...
am: 204ca74397
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
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
dd0f8dd568
Merge "Move Gesture settings up one level."
2017-07-20 16:45:37 +00:00
Julia Reynolds
a24184abc3
Merge "Merge "Zen priority settings update" into oc-dr1-dev am: 9dec71f7d7 am: b49578e485" into oc-mr1-dev-plus-aosp
...
am: f2223accb0
2017-07-20 14:43:14 +00:00
Julia Reynolds
2dbb48ff7d
Merge "Zen priority settings update" into oc-dr1-dev am: 9dec71f7d7 am: 2ab6e2ef9e
...
am: 8639bbcb2e
2017-07-20 14:42:55 +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
2017-07-20 14:27:01 +00:00
Julia Reynolds
8639bbcb2e
Merge "Zen priority settings update" into oc-dr1-dev am: 9dec71f7d7
...
am: 2ab6e2ef9e
2017-07-20 14:26:50 +00:00
Julia Reynolds
2ab6e2ef9e
Merge "Zen priority settings update" into oc-dr1-dev
...
am: 9dec71f7d7
2017-07-20 14:24:03 +00:00
Julia Reynolds
b49578e485
Merge "Zen priority settings update" into oc-dr1-dev
...
am: 9dec71f7d7
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
e82db58cce
Import translations. DO NOT MERGE
...
Change-Id: Idb67cb6b176bde8d5029a3919af7e3993d539f6f
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-19 23:03:06 -07:00
Doris Ling
55ce7de7d0
Move Gesture settings up one level.
...
Move System->Languages, input & gestures->Gestures to System->Gestures.
Change-Id: Ie81876208383f69ebf1a0465d76c760d7dd9d95d
Fix: 62276882
Test: make RunSettingsRoboTests
2017-07-19 16:50:53 -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
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
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
Evan Laird
22315adb60
Fix Settings manifest pointing to old class namespace
...
The string declaring the right fragment was never updated to the new
namespace.
Change-Id: I35809f2f35dbf290deeb69d1bc672b86f8d5a752
Fixes: 63677809
Test: make SettingsUnitTests && \
adb install -r out/target/product/<device>/data/app/SettingsUnitTests/SettingsUnitTests.apk && \
adb shell am instrument -w -e class \
com.android.settings.dream.DreamSettingsLaunchTest\
com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
2017-07-19 10:29:16 -04:00
Alex Kulesza
c0cc7feb6e
Merge "Make time remaining estimate debug mode more reliable." into oc-dr1-dev am: f21bc100a6
...
am: 07bd51e98d
2017-07-19 03:22:39 +00:00
Alex Kulesza
07bd51e98d
Merge "Make time remaining estimate debug mode more reliable." into oc-dr1-dev
...
am: f21bc100a6
2017-07-19 03:17:43 +00:00
