OSDN Git Service
Bill Yi [Thu, 20 Jul 2017 21:31:34 +0000 (21:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
acd97be0b8 -s ours
am:
2d50ad831e -s ours
Change-Id: Ic02b25c0a6077217fbd8093ae4f55a062d62bb3f
Bill Yi [Thu, 20 Jul 2017 21:29:51 +0000 (21:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
acd97be0b8 -s ours
am:
bc1a0265c5 -s ours
Change-Id: Ife685585ed0bef93f591de8b852dd4368811af42
Bill Yi [Thu, 20 Jul 2017 21:27:48 +0000 (21:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
acd97be0b8 -s ours
Change-Id: I4b9fad43198474d48c7eb5313b52f9c9314ca05f
Bill Yi [Thu, 20 Jul 2017 21:27:48 +0000 (21:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
acd97be0b8 -s ours
Change-Id: Ib8a1e9a9f4b4ae2d056b5b4bf8e6603aa9212c4d
Amit Mahajan [Thu, 20 Jul 2017 21:26:51 +0000 (21:26 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am:
c2b12c5304
am:
8ace0324ee
Change-Id: I515783259b3c57c36985e0646886a1248a47c608
TreeHugger Robot [Thu, 20 Jul 2017 21:17:34 +0000 (21:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Amit Mahajan [Thu, 20 Jul 2017 21:11:45 +0000 (21:11 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev am:
c2b12c5304
am:
9ded852f71
Change-Id: I1fc8aec7c8cfc71c707f4ea1d0f02a2a2a7c8375
Amit Mahajan [Thu, 20 Jul 2017 21:00:23 +0000 (21:00 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
am:
c2b12c5304
Change-Id: Ic352005843d3ffd0b04a0a80710c04a5f02291a6
Amit Mahajan [Thu, 20 Jul 2017 20:58:48 +0000 (20:58 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
am:
c2b12c5304
Change-Id: I536c3111a917a2d9b1f64235fb54c5face72eb74
Doris Ling [Thu, 20 Jul 2017 20:57:03 +0000 (20:57 +0000)]
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev am:
390bb3216d
am:
1f8c5debbb
Change-Id: If600090e0b5e49682411dc42c027a206c97e3e2c
Evan Laird [Thu, 20 Jul 2017 20:56:43 +0000 (20:56 +0000)]
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev am:
a9e2d97004
am:
e99586cfea
Change-Id: I84e08dda688ccec72c9c672813f75a3f597784e3
Doris Ling [Thu, 20 Jul 2017 20:51:19 +0000 (20:51 +0000)]
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev am:
390bb3216d
am:
11cfc26d0a
Change-Id: I3ac60eea7ed915e891412f88479c9b5374f53299
Evan Laird [Thu, 20 Jul 2017 20:50:57 +0000 (20:50 +0000)]
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev am:
a9e2d97004
am:
bc562b1888
Change-Id: I9c33400aa612b7c44b9199ef8564889d8a128a1b
Amit Mahajan [Thu, 20 Jul 2017 20:47:12 +0000 (20:47 +0000)]
Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev
Doris Ling [Thu, 20 Jul 2017 20:43:32 +0000 (20:43 +0000)]
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev
am:
390bb3216d
Change-Id: Icfaf4162e4f43e6f91bc886e3750c2a713765e5c
Evan Laird [Thu, 20 Jul 2017 20:42:46 +0000 (20:42 +0000)]
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev
am:
a9e2d97004
Change-Id: I891ad549056df8632fd10570769c2695f6ad4384
Doris Ling [Thu, 20 Jul 2017 20:38:09 +0000 (20:38 +0000)]
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev
am:
390bb3216d
Change-Id: I4b6b6f8d2d6ef19e16d74df1f403f0a5f5109713
Evan Laird [Thu, 20 Jul 2017 20:37:47 +0000 (20:37 +0000)]
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev
am:
a9e2d97004
Change-Id: I596d700d10a29640344d4554824a29eb21e71cf1
TreeHugger Robot [Thu, 20 Jul 2017 20:34:55 +0000 (20:34 +0000)]
Merge "Ensure that brightness level is within 0-100%." into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 20:23:53 +0000 (20:23 +0000)]
Merge "Fix Settings manifest pointing to old class namespace" into oc-dr1-dev
Android Build Merger (Role) [Thu, 20 Jul 2017 20:10:56 +0000 (20:10 +0000)]
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
Bill Yi [Thu, 20 Jul 2017 20:10:38 +0000 (20:10 +0000)]
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
Android Build Merger (Role) [Thu, 20 Jul 2017 20:10:30 +0000 (20:10 +0000)]
Merge "Import translations. DO NOT MERGE am:
6cf2d99816 -s ours am:
bd3bd7d1e1 -s ours am:
29978d1ee6 -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Thu, 20 Jul 2017 20:10:13 +0000 (20:10 +0000)]
Import translations. DO NOT MERGE am:
6cf2d99816 -s ours am:
bd3bd7d1e1 -s ours
am:
29978d1ee6 -s ours
Change-Id: I876d8498f240de3446cc7700ae36db901f6a8408
Bill Yi [Thu, 20 Jul 2017 20:10:11 +0000 (20:10 +0000)]
Import translations. DO NOT MERGE am:
6cf2d99816 -s ours am:
cc298f9ae6 -s ours
am:
821967eca5 -s ours
Change-Id: I5fa9fbca513f35b554126b8a86536c68dcbdf7d0
Android Build Merger (Role) [Thu, 20 Jul 2017 20:05:12 +0000 (20:05 +0000)]
Merge "Import translations. DO NOT MERGE am:
6cf2d99816 -s ours am:
cc298f9ae6 -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Thu, 20 Jul 2017 20:04:42 +0000 (20:04 +0000)]
Import translations. DO NOT MERGE am:
6cf2d99816 -s ours
am:
cc298f9ae6 -s ours
Change-Id: I28beea32e9cdc8bced4cd2af333e391bfc6d73c0
Bill Yi [Thu, 20 Jul 2017 20:04:42 +0000 (20:04 +0000)]
Import translations. DO NOT MERGE am:
6cf2d99816 -s ours
am:
bd3bd7d1e1 -s ours
Change-Id: I5654af1da287c0864385a5d6e473cd2800427eb7
Bill Yi [Thu, 20 Jul 2017 20:04:41 +0000 (20:04 +0000)]
Import translations. DO NOT MERGE am:
6cf2d99816 -s ours
am:
cc298f9ae6 -s ours
Change-Id: I3e0203a1fdc9f803c0f981d5dca7ad286493b4ce
Bill Yi [Thu, 20 Jul 2017 19:58:46 +0000 (19:58 +0000)]
Import translations. DO NOT MERGE
am:
6cf2d99816 -s ours
Change-Id: Ic6e1c58d91200c599211ccf4a1f781892dc75d55
Bill Yi [Thu, 20 Jul 2017 19:58:46 +0000 (19:58 +0000)]
Import translations. DO NOT MERGE
am:
6cf2d99816 -s ours
Change-Id: Iad277ccc5f81d14255363128d400420ca70cd376
Doris Ling [Thu, 20 Jul 2017 19:33:08 +0000 (19:33 +0000)]
Move Gesture settings up one level.
am:
204ca74397
Change-Id: I01ffe71df1e0769d87f9df6cdb1d3ced39e0ba99
Bill Yi [Thu, 20 Jul 2017 17:53:14 +0000 (10:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: If5c18c395a4293f6c084f9019fd37a17ddfd24d9
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Doris Ling [Wed, 5 Jul 2017 19:53:04 +0000 (12:53 -0700)]
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
c7d2d270abbe0d05ae00f326539d3dde91450243)
Doris Ling [Tue, 18 Jul 2017 22:43:26 +0000 (15:43 -0700)]
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
55ce7de7d06d9fd8ec153c4b6f5300fbe9349990)
Android Build Merger (Role) [Thu, 20 Jul 2017 14:27:14 +0000 (14:27 +0000)]
Merge "Merge "Zen priority settings update" into oc-dr1-dev am:
9dec71f7d7 am:
b49578e485" into oc-mr1-dev-plus-aosp
Julia Reynolds [Thu, 20 Jul 2017 14:27:01 +0000 (14:27 +0000)]
Merge "Zen priority settings update" into oc-dr1-dev am:
9dec71f7d7
am:
b49578e485
Change-Id: I00e748acbef7661272eae4d28f66bfde5ac854b5
Julia Reynolds [Thu, 20 Jul 2017 14:26:50 +0000 (14:26 +0000)]
Merge "Zen priority settings update" into oc-dr1-dev am:
9dec71f7d7
am:
2ab6e2ef9e
Change-Id: Idd8c5f5602a46e595077989dc03911367f633263
Julia Reynolds [Thu, 20 Jul 2017 14:24:03 +0000 (14:24 +0000)]
Merge "Zen priority settings update" into oc-dr1-dev
am:
9dec71f7d7
Change-Id: I1170215a15609f1ca5b4da0eeff0ecc112d9fbf3
Julia Reynolds [Thu, 20 Jul 2017 14:23:51 +0000 (14:23 +0000)]
Merge "Zen priority settings update" into oc-dr1-dev
am:
9dec71f7d7
Change-Id: I81e2609637537413bfd36ed9e0658d49d533a9cd
Julia Reynolds [Thu, 20 Jul 2017 14:19:33 +0000 (14:19 +0000)]
Merge "Zen priority settings update" into oc-dr1-dev
Bill Yi [Thu, 20 Jul 2017 06:13:29 +0000 (23:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1dad650eb3d6c49c1b1b8b6873a2f8a0ffe89a9c
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Rajeev Kumar [Wed, 19 Jul 2017 21:41:09 +0000 (21:41 +0000)]
Merge "Data plan usage summary activity."
TreeHugger Robot [Wed, 19 Jul 2017 20:39:05 +0000 (20:39 +0000)]
Merge "Delete " / " delimiter in Settings app."
Rajeev Kumar [Wed, 19 Jul 2017 02:21:34 +0000 (19:21 -0700)]
Data plan usage summary activity.
Change-Id: Ibb0889563d432591fd00ac00d03633b1894ad124
Note: These changes are required for Data balance UI.
Bug:
62349208
Test: make RunSettingsRoboTests -j40
TreeHugger Robot [Wed, 19 Jul 2017 16:52:57 +0000 (16:52 +0000)]
Merge "Settings: Add SMS Mirroring."
Julia Reynolds [Wed, 19 Jul 2017 16:50:55 +0000 (16:50 +0000)]
Merge "Add separator to auto zen rule listing." into oc-dr1-dev am:
afe4ce0927
am:
92f2cd5055
Change-Id: Iafd82b051b0e2f83dc797338bb121cf72f29c52c
Julia Reynolds [Wed, 19 Jul 2017 16:47:56 +0000 (16:47 +0000)]
Merge "Add separator to auto zen rule listing." into oc-dr1-dev
am:
afe4ce0927
Change-Id: I91c22aeb773e32d544bb658a61e94c2b740ae5c9
Julia Reynolds [Wed, 19 Jul 2017 16:44:07 +0000 (16:44 +0000)]
Merge "Add separator to auto zen rule listing." into oc-dr1-dev
Oren Blasberg [Thu, 13 Jul 2017 13:55:15 +0000 (06:55 -0700)]
Settings: Add SMS Mirroring.
Bug:
37546615
Test: Updated Robolectric suite with new unit tests.
Change-Id: I02e1723e1b125b004ff679d6242df14bca4f08ce
Evan Laird [Tue, 18 Jul 2017 20:37:42 +0000 (16:37 -0400)]
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
Alex Kulesza [Wed, 19 Jul 2017 03:22:39 +0000 (03:22 +0000)]
Merge "Make time remaining estimate debug mode more reliable." into oc-dr1-dev am:
f21bc100a6
am:
07bd51e98d -s ours
Change-Id: I972d5171ab5b94e4a3cfa1219a23cf0143630f1b
Alex Kulesza [Wed, 19 Jul 2017 03:17:43 +0000 (03:17 +0000)]
Merge "Make time remaining estimate debug mode more reliable." into oc-dr1-dev
am:
f21bc100a6
Change-Id: I145fa85f2a0ba2b6ff3d7fc6a586b823c959a768
TreeHugger Robot [Wed, 19 Jul 2017 03:15:29 +0000 (03:15 +0000)]
Merge "Make time remaining estimate debug mode more reliable." into oc-dr1-dev
Phil Weaver [Wed, 19 Jul 2017 01:37:05 +0000 (01:37 +0000)]
Merge "Back-port ag/
2491664" into nyc-mr1-dev am:
87c77fba92 am:
54e508ca63 am:
4fc6cbfa6a -s ours am:
b019e2c469 am:
072d4c282e
am:
f471234779
Change-Id: I3e91645f8b821aec766c07acc34c26e8c5efd987
Phil Weaver [Wed, 19 Jul 2017 01:33:28 +0000 (01:33 +0000)]
Merge "Back-port ag/
2491664" into nyc-mr1-dev am:
87c77fba92 am:
54e508ca63 am:
4fc6cbfa6a -s ours am:
b019e2c469 am:
ce007d328d
am:
6721c9306a
Change-Id: I2d906d4ac87deb6b1acd4310ed9a9b3cb3cfb99a
Phil Weaver [Wed, 19 Jul 2017 01:26:38 +0000 (01:26 +0000)]
Merge "Back-port ag/
2491664" into nyc-mr1-dev am:
87c77fba92 am:
54e508ca63 am:
4fc6cbfa6a -s ours am:
b019e2c469
am:
072d4c282e
Change-Id: If13f37325685c98d796e24334f00e5ae9bc9a3b8
Phil Weaver [Wed, 19 Jul 2017 01:24:33 +0000 (01:24 +0000)]
Merge "Back-port ag/
2491664" into nyc-mr1-dev am:
87c77fba92 am:
54e508ca63 am:
4fc6cbfa6a -s ours am:
b019e2c469
am:
ce007d328d
Change-Id: Ic95aaeb03f2cd1d77f4c4e31967bd1d23c81738e
Phil Weaver [Wed, 19 Jul 2017 01:18:04 +0000 (01:18 +0000)]
Merge "Back-port ag/
2491664" into nyc-mr1-dev am:
87c77fba92 am:
54e508ca63 am:
4fc6cbfa6a -s ours
am:
b019e2c469
Change-Id: I936fd8c441ed20e6616f00c603d22c4551923f27
Phil Weaver [Wed, 19 Jul 2017 01:17:52 +0000 (01:17 +0000)]
Merge "Back-port ag/
2491664" into nyc-mr1-dev am:
87c77fba92 am:
54e508ca63 am:
4fc6cbfa6a -s ours
am:
b019e2c469
Change-Id: Iaa681452ab197e1afea21b76c17441939a9fc6c7
Phil Weaver [Wed, 19 Jul 2017 01:16:58 +0000 (01:16 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec am:
f9d05230df am:
4f8be72b18 -s ours am:
2b8694c33d am:
533c1efbc7 am:
f5675a9ab0 am:
00143e1a7a am:
d68bd495ec am:
1faf81da83 am:
947133471e
am:
c64adcde84
Change-Id: I1d7272ebea3aa9fc9abaa3046bd700f697c96475
Phil Weaver [Wed, 19 Jul 2017 01:16:27 +0000 (01:16 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec am:
f9d05230df am:
4f8be72b18 -s ours am:
2b8694c33d am:
533c1efbc7 am:
f5675a9ab0 am:
00143e1a7a am:
d68bd495ec am:
1faf81da83 am:
7aaec13b05
am:
0666f394b5
Change-Id: Ic78f3f0b0839aecb5118fdc4777c14a7b787f5ce
Phil Weaver [Wed, 19 Jul 2017 01:11:09 +0000 (01:11 +0000)]
Merge "Back-port ag/
2491664" into nyc-mr1-dev am:
87c77fba92 am:
54e508ca63
am:
4fc6cbfa6a -s ours
Change-Id: Iaa96265da8e054b791e5d4b7852b91f4a4ace7b2
Phil Weaver [Wed, 19 Jul 2017 01:04:40 +0000 (01:04 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec am:
f9d05230df am:
4f8be72b18 -s ours am:
2b8694c33d am:
533c1efbc7 am:
f5675a9ab0 am:
00143e1a7a am:
d68bd495ec am:
1faf81da83
am:
947133471e
Change-Id: I791142486eb0d844483ea3eb6812f5a6f81501a0
Alex Kulesza [Thu, 29 Jun 2017 16:27:19 +0000 (12:27 -0400)]
Make time remaining estimate debug mode more reliable.
Previously, the long click handler was unregistered on first use and
never re-registered. This meant that, e.g., on plugging and unplugging
the phone, debug mode stopped working. This change moves long click
activation into restartBatteryInfoLoader().
Bug:
63133793
Test: make RunSettingsRoboTests
Merged-In: I4c25a1f05ab3718bf06faf455cf670b5460a7306
Change-Id: I4c25a1f05ab3718bf06faf455cf670b5460a7306
Phil Weaver [Wed, 19 Jul 2017 01:00:05 +0000 (01:00 +0000)]
Merge "Back-port ag/
2491664" into nyc-mr1-dev am:
87c77fba92
am:
54e508ca63
Change-Id: I87608a5fc71634d99adaf2aecd1e1c1be297659f
TreeHugger Robot [Wed, 19 Jul 2017 01:00:04 +0000 (01:00 +0000)]
Merge "Make time remaining estimate debug mode more reliable."
Phil Weaver [Wed, 19 Jul 2017 00:58:05 +0000 (00:58 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec am:
f9d05230df am:
4f8be72b18 -s ours am:
2b8694c33d am:
533c1efbc7 am:
f5675a9ab0 am:
00143e1a7a am:
d68bd495ec am:
1faf81da83
am:
7aaec13b05
Change-Id: If54ff20342b55d7c748472471993be43cd492196
Phil Weaver [Wed, 19 Jul 2017 00:53:20 +0000 (00:53 +0000)]
Merge "Back-port ag/
2491664" into nyc-mr1-dev
am:
87c77fba92
Change-Id: Ie540995d5b499a0e87bc13c11e28c4b8adab93f3
TreeHugger Robot [Wed, 19 Jul 2017 00:52:38 +0000 (00:52 +0000)]
Merge "BidiFormat wrap version code in installed app detail UI"
Phil Weaver [Wed, 19 Jul 2017 00:50:50 +0000 (00:50 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec am:
f9d05230df am:
4f8be72b18 -s ours am:
2b8694c33d am:
533c1efbc7 am:
f5675a9ab0 am:
00143e1a7a am:
d68bd495ec
am:
1faf81da83
Change-Id: I506146a00ad79f7faad2888a0f1063a2a1c078d2
Phil Weaver [Wed, 19 Jul 2017 00:46:36 +0000 (00:46 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec am:
f9d05230df am:
4f8be72b18 -s ours am:
2b8694c33d am:
533c1efbc7 am:
f5675a9ab0 am:
00143e1a7a am:
d68bd495ec
am:
1faf81da83
Change-Id: Ie2be7683a783e125a74b8d9383317fdf156d219c
Phil Weaver [Wed, 19 Jul 2017 00:46:35 +0000 (00:46 +0000)]
Merge "Back-port ag/
2491664" into nyc-mr1-dev
Phil Weaver [Wed, 19 Jul 2017 00:40:56 +0000 (00:40 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec am:
f9d05230df am:
4f8be72b18 -s ours am:
2b8694c33d am:
533c1efbc7 am:
f5675a9ab0 am:
00143e1a7a
am:
d68bd495ec
Change-Id: Ib2b14e63463ea041575e6d884cc155972264ae91
Phil Weaver [Wed, 19 Jul 2017 00:31:13 +0000 (00:31 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec am:
f9d05230df am:
4f8be72b18 -s ours am:
2b8694c33d am:
533c1efbc7 am:
f5675a9ab0
am:
00143e1a7a
Change-Id: I08371b60dbed3351a06f49bed71aaca1f46fb864
Phil Weaver [Wed, 19 Jul 2017 00:24:40 +0000 (00:24 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec am:
f9d05230df am:
4f8be72b18 -s ours am:
2b8694c33d am:
533c1efbc7
am:
f5675a9ab0
Change-Id: Icbc5147a6050058c78ece104f1c169673b93a373
Phil Weaver [Wed, 19 Jul 2017 00:15:50 +0000 (00:15 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec am:
f9d05230df am:
4f8be72b18 -s ours am:
2b8694c33d
am:
533c1efbc7
Change-Id: Ib54143b47f6c1b09d2d3c5f73630aebcc1fcba33
Sundeep Ghuman [Tue, 18 Jul 2017 22:25:38 +0000 (15:25 -0700)]
Delete " / " delimiter in Settings app.
Reference delimiter now defined in SettingsLib instead.
Bug: b/
62354743
Test: NA - refactor
Change-Id: I021d7cb9b06014b27df0003634ce53ecf1089fa1
Phil Weaver [Wed, 19 Jul 2017 00:05:08 +0000 (00:05 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec am:
f9d05230df am:
4f8be72b18 -s ours
am:
2b8694c33d
Change-Id: Icef5847bf3eaf4c9fdce6eaaff1d642828f89477
Rajeev Kumar [Wed, 19 Jul 2017 00:02:50 +0000 (00:02 +0000)]
Merge "Data plan usage summary fragment."
Phil Weaver [Tue, 18 Jul 2017 23:58:43 +0000 (23:58 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec am:
f9d05230df
am:
4f8be72b18 -s ours
Change-Id: I2b510d0b70eb303fb93a68a0eee0d32bf1226d76
Phil Weaver [Tue, 18 Jul 2017 23:41:33 +0000 (23:41 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e am:
a801d5e8ec
am:
f9d05230df
Change-Id: I63ffb648e39d06390a7f72951ad41bed0cf5aac9
Phil Weaver [Tue, 18 Jul 2017 23:35:31 +0000 (23:35 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev am:
7b3ca9886e
am:
a801d5e8ec
Change-Id: I26fad2824208aa46dbfac0bef585729e5424c24c
TreeHugger Robot [Tue, 18 Jul 2017 23:33:28 +0000 (23:33 +0000)]
Merge "Improve search indexing time."
Phil Weaver [Tue, 18 Jul 2017 23:29:03 +0000 (23:29 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev
am:
7b3ca9886e
Change-Id: Id4c50a2c37096f91accd2b2b28470c230dd655db
Phil Weaver [Tue, 18 Jul 2017 23:24:15 +0000 (23:24 +0000)]
Merge "Back-port ag/
2491664" into nyc-dev am:
3adf585961 -s ours am:
6fee9a5e91 am:
ade8640d4d am:
57f1af6a0b am:
ae07650724 am:
3ae8ac0911 am:
8c1c7cae13
am:
587467249a
Change-Id: Ia5e0909a885ff68c524c023d1815bdbdd56c2237
Phil Weaver [Tue, 18 Jul 2017 23:21:17 +0000 (23:21 +0000)]
Merge "Back-port ag/
2491664" into mnc-dev
Phil Weaver [Wed, 12 Jul 2017 21:07:07 +0000 (14:07 -0700)]
Back-port ag/
2491664
Bug:
62196835
Test: Verify overlays disappear on a11y capabilities
dialog.
Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992
Phil Weaver [Tue, 18 Jul 2017 22:45:36 +0000 (22:45 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b am:
c84dc8feb3 am:
4b029f8b0d am:
4c70016a94 am:
46592e90a9 am:
55b3b1f349 am:
af26bae8b3 am:
a1426f209c am:
2e690de9cf am:
7a7d6b1d0c am:
3099a7f794 am:
ce3fef5c99 am:
b2d3c5e392
am:
42371fc2b3
Change-Id: Iae7d283152a3bd01c3812bb020dad774ad9535dd
Phil Weaver [Tue, 18 Jul 2017 22:45:03 +0000 (22:45 +0000)]
Merge "Back-port ag/
2491664" into nyc-dev am:
3adf585961 -s ours am:
6fee9a5e91 am:
ade8640d4d am:
57f1af6a0b am:
ae07650724 am:
3ae8ac0911 am:
8ff3fd420c
am:
058b43c382
Change-Id: I8dfa0c4cd4c3ba804894238015b175a65d63ee0a
Phil Weaver [Tue, 18 Jul 2017 22:38:23 +0000 (22:38 +0000)]
Merge "Back-port ag/
2491664" into nyc-dev am:
3adf585961 -s ours am:
6fee9a5e91 am:
ade8640d4d am:
57f1af6a0b am:
ae07650724 am:
3ae8ac0911
am:
8c1c7cae13
Change-Id: Ic89f371e4c6d8b169ac2b3d314b74155d9c2c0bd
Phil Weaver [Tue, 18 Jul 2017 22:37:19 +0000 (22:37 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b am:
c84dc8feb3 am:
4b029f8b0d am:
4c70016a94 am:
46592e90a9 am:
55b3b1f349 am:
af26bae8b3 am:
a1426f209c am:
2e690de9cf am:
7a7d6b1d0c am:
3099a7f794 am:
ce3fef5c99 am:
7c3daa9ba5
am:
c62bb9efd7
Change-Id: I0c88909da60f3518b216a33aba3623c05c8ff5cf
Phil Weaver [Tue, 18 Jul 2017 22:28:15 +0000 (22:28 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b am:
c84dc8feb3 am:
4b029f8b0d am:
4c70016a94 am:
46592e90a9 am:
55b3b1f349 am:
af26bae8b3 am:
a1426f209c am:
2e690de9cf am:
7a7d6b1d0c am:
3099a7f794 am:
ce3fef5c99
am:
b2d3c5e392
Change-Id: I3d42e6f17755ffd20d60cb75e04931e4b168b027
Phil Weaver [Tue, 18 Jul 2017 22:22:39 +0000 (22:22 +0000)]
Merge "Back-port ag/
2491664" into nyc-dev am:
3adf585961 -s ours am:
6fee9a5e91 am:
ade8640d4d am:
57f1af6a0b am:
ae07650724
am:
3ae8ac0911
Change-Id: Ie3af58a1cfe48fadbf32d9634483571fc12c1d52
Phil Weaver [Tue, 18 Jul 2017 22:19:45 +0000 (22:19 +0000)]
Merge "Back-port ag/
2491664" into nyc-dev am:
3adf585961 -s ours am:
6fee9a5e91 am:
ade8640d4d am:
57f1af6a0b am:
ae07650724 am:
3ae8ac0911
am:
8ff3fd420c
Change-Id: I6efd0f0905c346036a0d9e3392cd7b464948764a
Phil Weaver [Tue, 18 Jul 2017 22:18:18 +0000 (22:18 +0000)]
Merge "Back-port ag/
2491664" into nyc-dev am:
3adf585961 -s ours am:
6fee9a5e91 am:
ade8640d4d am:
57f1af6a0b am:
ae07650724
am:
3ae8ac0911
Change-Id: Ib8797dc1e432871289cd528c0fe188132804e12f
Phil Weaver [Tue, 18 Jul 2017 22:15:51 +0000 (22:15 +0000)]
Merge "Back-port ag/
2491664" into lmp-dev am:
41492a1e2c am:
cbbdc18c7b am:
c84dc8feb3 am:
4b029f8b0d am:
4c70016a94 am:
46592e90a9 am:
55b3b1f349 am:
af26bae8b3 am:
a1426f209c am:
2e690de9cf am:
7a7d6b1d0c am:
3099a7f794 am:
ce3fef5c99
am:
7c3daa9ba5
Change-Id: I6d0d94bd7d9701e106ed3e8fe1852da5c1fedbc1
Phil Weaver [Tue, 18 Jul 2017 22:15:30 +0000 (22:15 +0000)]
Merge "Back-port ag/
2491664" into nyc-dev am:
3adf585961 -s ours am:
6fee9a5e91 am:
ade8640d4d am:
57f1af6a0b
am:
ae07650724
Change-Id: I43d075a57c5d327f3949408da7ed4890b0b045f4
Fan Zhang [Tue, 18 Jul 2017 22:14:38 +0000 (15:14 -0700)]
BidiFormat wrap version code in installed app detail UI
Change-Id: Ib592e4504331c4fc334ef5257e3d6d21c08098c0
Fix:
37862201
Test: visual
Phil Weaver [Tue, 18 Jul 2017 22:11:43 +0000 (22:11 +0000)]
Merge "Back-port ag/
2491664" into nyc-dev am:
3adf585961 -s ours am:
6fee9a5e91 am:
ade8640d4d
am:
57f1af6a0b
Change-Id: I50c783c642a0f1a86535c2423dd335d2e4ec2999