OSDN Git Service
Bill Yi [Wed, 13 Dec 2017 13:22:04 +0000 (13:22 +0000)]
Import translations. DO NOT MERGE
am:
e30af484ff -s ours
Change-Id: If2100d09d2f2c16f27e3c77ecaeded8fee5ebc90
Hemant Gupta [Wed, 13 Dec 2017 01:57:51 +0000 (01:57 +0000)]
Merge "Bluetooth: Add support for PBAP UI preference" am:
f689d1aaa7
am:
0b4c0ebbe4
Change-Id: I5419efe379ee5bf0622ac8070b6ef3886d277bdf
Wang wenrui [Wed, 13 Dec 2017 01:56:50 +0000 (01:56 +0000)]
Merge "Fix screen freeze when changing display size in Multi-Window mode" am:
2051822bb9
am:
b2a6489139
Change-Id: I791f25687e37448659b3e0d91ad35f28dca0fed6
Hemant Gupta [Wed, 13 Dec 2017 01:27:46 +0000 (01:27 +0000)]
Merge "Bluetooth: Add support for PBAP UI preference"
am:
f689d1aaa7
Change-Id: Ic4ffc6a26b11cdf0a937402c3bdcd68441fe4aed
Wang wenrui [Wed, 13 Dec 2017 01:26:52 +0000 (01:26 +0000)]
Merge "Fix screen freeze when changing display size in Multi-Window mode"
am:
2051822bb9
Change-Id: I974abe3dd2114aa439c0db46fa4930a947912de6
Treehugger Robot [Wed, 13 Dec 2017 00:30:42 +0000 (00:30 +0000)]
Merge "Bluetooth: Add support for PBAP UI preference"
Bill Yi [Wed, 13 Dec 2017 00:19:14 +0000 (16:19 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I37fb135ddf373093ede9b1d56bf6452ea52ef093
Treehugger Robot [Tue, 12 Dec 2017 23:59:23 +0000 (23:59 +0000)]
Merge "Fix screen freeze when changing display size in Multi-Window mode"
Adam Lesinski [Tue, 12 Dec 2017 23:16:37 +0000 (23:16 +0000)]
Merge "Update the way OMS records details about overlays" into oc-mr1-dev
am:
15b42b89b8
Change-Id: I15809e100fc46691f0f60ed2729c18a07d904313
TreeHugger Robot [Tue, 12 Dec 2017 21:48:17 +0000 (21:48 +0000)]
Merge "Update the way OMS records details about overlays" into oc-mr1-dev
Bill Yi [Fri, 8 Dec 2017 06:01:46 +0000 (06:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
814fb3b7a1 -s ours
Change-Id: Ic4696096352546cb962ab57470ed569535791665
TreeHugger Robot [Fri, 8 Dec 2017 05:52:37 +0000 (05:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Fri, 8 Dec 2017 05:42:43 +0000 (05:42 +0000)]
Import translations. DO NOT MERGE am:
3ed385256a -s ours
am:
14c47203b3 -s ours
Change-Id: Ic512ba80a6900175986841430f1b69e170bbd845
Bill Yi [Fri, 8 Dec 2017 05:39:41 +0000 (05:39 +0000)]
Import translations. DO NOT MERGE
am:
3ed385256a -s ours
Change-Id: Idb17affa2264a9b46343c3bc9dea1978e5a92a32
Bill Yi [Fri, 8 Dec 2017 01:08:40 +0000 (17:08 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I35a94b9a271e88bf4f0384d5619c59661516131d
Bill Yi [Fri, 8 Dec 2017 01:08:11 +0000 (17:08 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I59dde21252b7681bb6dfcf9dae1f27192a3cd19e
Fan Zhang [Fri, 8 Dec 2017 00:25:31 +0000 (00:25 +0000)]
Merge "Update asset for no search result image" into oc-mr1-dev
am:
afa1efabad
Change-Id: Ib77d2973bf4f2155a7bdd73174fd4c4b9903bc17
TreeHugger Robot [Fri, 8 Dec 2017 00:19:09 +0000 (00:19 +0000)]
Merge "Update asset for no search result image" into oc-mr1-dev
Adam Lesinski [Tue, 14 Nov 2017 19:10:08 +0000 (11:10 -0800)]
Update the way OMS records details about overlays
Use flags, since we keep introducing boolean traits which would
be wasteful to encode as booleans.
Bug:
69383160
Test: builds
Change-Id: Ic09ae1086c7afa039b5df11e4c8c968125784586
Merged-In: Ic09ae1086c7afa039b5df11e4c8c968125784586
Xin Li [Thu, 7 Dec 2017 15:23:18 +0000 (15:23 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am:
cb1056f9b4 -s ours
am:
4f83509810
Change-Id: I72dd8e97a660beaca9343cea99ef117a202fdf35
Xin Li [Thu, 7 Dec 2017 15:17:25 +0000 (15:17 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am:
cb1056f9b4 -s ours
Change-Id: Iba281b420566a85ffebf98941dbb5e456b724362
Xin Li [Thu, 7 Dec 2017 07:05:14 +0000 (07:05 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master am:
7b017d5a2f -s ours
am:
2ba6a22abb
Change-Id: Id5dd78948fe46817fdb0c65b2c4dc8d6536f3a37
Xin Li [Thu, 7 Dec 2017 04:36:38 +0000 (04:36 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master
am:
7b017d5a2f -s ours
Change-Id: I38ef4306a74fb9c1ca39903d5a74df5db0753290
Hemant Gupta [Wed, 4 Nov 2015 11:08:15 +0000 (16:38 +0530)]
Bluetooth: Add support for PBAP UI preference
Usecase:
1) Connect with carkit that supports PBAP/MAP
2) Try to uncheck the checkbox for contact sharing from device sub
settings menu
Expected Result:
1) DUT should display "Connected (No Media or Phone)"
1) Should be able to disconnect when checkbox moves from selected->unselected,
and carkit should be able to connect when checkbox is selected again
Observation:
1) No UI updates when PBAP/MAP are connected.
2) On unchecking Contact sharing checkbox nothing happens. PBAP connection
remains active and user is not asked to disconnect profile level connection.
Fix:
Add support for PBAP UI preference in SettingsLib. Also Fix issues related to MAP
profile addition/removal.
Test: Connect from carkit, try disconnecting from sub settings menu by unchecking
Contact Sharing checkbox and check if PBAP is successfully disconnected.
Bug:
35014213
Change-Id: I4981aa063b2541b58ce1d36e3576578cbeb02acc
Xin Li [Wed, 6 Dec 2017 23:18:29 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
Xin Li [Wed, 6 Dec 2017 19:52:09 +0000 (11:52 -0800)]
DO NOT MERGE: Merge Oreo MR1 into master
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Iab7fd863c422780055277093cb9621197e09d969
Wang wenrui [Mon, 13 Feb 2017 04:51:24 +0000 (12:51 +0800)]
Fix screen freeze when changing display size in Multi-Window mode
The device screen freezes when launching two Display size settings
screen and changing display size in Multi-Window mode.
To fix this issue, OnSeekBarChangeListener should be set in onStart() to
avoid onProgressChanged() is called during onRestoreInstanceState which
is caused by display size change.
Fixes:
70253030
Test: manual - open two Display size settings in Multi-Window mode.
Change-Id: I779954aeeb1da526ba1b0fac2676e2f7d8289352
Antony Sargent [Tue, 5 Dec 2017 23:23:05 +0000 (23:23 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207 am:
3d7dbd6407 am:
9867a3ef85 am:
acacd658f1 am:
db6e747ab9 am:
26e5f828f7 am:
fe20f69e3f
am:
51950965e9
Change-Id: I30014b81a3eb514caf030ea5efb72694f434e305
Antony Sargent [Tue, 5 Dec 2017 23:17:11 +0000 (23:17 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207 am:
3d7dbd6407 am:
9867a3ef85 am:
acacd658f1 am:
db6e747ab9 am:
26e5f828f7
am:
fe20f69e3f
Change-Id: I1d1eb74920d9b191bb7f0365620d0dd1d372b923
Antony Sargent [Tue, 5 Dec 2017 23:10:05 +0000 (23:10 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207 am:
3d7dbd6407 am:
9867a3ef85 am:
acacd658f1 am:
db6e747ab9
am:
26e5f828f7
Change-Id: Ia88d8014f221c5079ff33f9a10e58c2eed7b329a
Antony Sargent [Tue, 5 Dec 2017 17:36:29 +0000 (17:36 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207 am:
3d7dbd6407 am:
9867a3ef85 am:
acacd658f1
am:
db6e747ab9
Change-Id: Ibf7cb8c3c7947dbc8cbf019ab32b872756ed7c63
Antony Sargent [Tue, 5 Dec 2017 17:32:41 +0000 (17:32 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207 am:
3d7dbd6407 am:
9867a3ef85
am:
acacd658f1
Change-Id: If9851b0b24c020d3a10b197fc15b6777bd88401c
Antony Sargent [Tue, 5 Dec 2017 17:28:54 +0000 (17:28 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207 am:
3d7dbd6407
am:
9867a3ef85
Change-Id: Ic9195106304da657092f113817ec7ad86618a2b1
Antony Sargent [Tue, 5 Dec 2017 17:26:51 +0000 (17:26 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1 am:
24f063a207
am:
3d7dbd6407
Change-Id: Ifa4509bbabbb346ce581f17d33e3f48fc7014971
Antony Sargent [Tue, 5 Dec 2017 17:24:48 +0000 (17:24 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846 am:
9cf1fc73f1
am:
24f063a207
Change-Id: I44b42f37a638cda455bbeb3ab4bab5c02fc9c7d9
Antony Sargent [Tue, 5 Dec 2017 17:21:14 +0000 (17:21 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3 am:
eee62e1846
am:
9cf1fc73f1
Change-Id: I4906dc8f97cfcfeef7bfda0896b39c032ef26ec6
Antony Sargent [Tue, 5 Dec 2017 17:19:12 +0000 (17:19 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383 am:
b2b401b5f3
am:
eee62e1846
Change-Id: Ie6fff7cf9df6827a29c04473ed3a0f1332c08ff2
Antony Sargent [Tue, 5 Dec 2017 17:17:08 +0000 (17:17 +0000)]
Reword bluetooth confirmation dialog am:
e14d38a383
am:
b2b401b5f3
Change-Id: I21921d41d35a87a48ad627e9889e4d00219e912b
Antony Sargent [Tue, 5 Dec 2017 17:13:36 +0000 (17:13 +0000)]
Reword bluetooth confirmation dialog
am:
e14d38a383
Change-Id: Ibb19504f6a74015a2a4d25d5c268db975da4ebb5
Jordan Liu [Tue, 5 Dec 2017 00:27:13 +0000 (00:27 +0000)]
Merge "Hide signal strength when told by carrier" am:
9afa720abe
am:
ed9508f3a6
Change-Id: I43c22e7f6950adcf27a5b600a194927cbd06fb9b
Jordan Liu [Mon, 4 Dec 2017 23:45:57 +0000 (23:45 +0000)]
Merge "Hide signal strength when told by carrier"
am:
9afa720abe
Change-Id: I64b6eece29d475d8fdbaf8f6d1fb2c62701fd6e4
Jordan Liu [Mon, 4 Dec 2017 23:20:31 +0000 (23:20 +0000)]
Merge "Hide signal strength when told by carrier"
Chien-Yu Chen [Sun, 3 Dec 2017 03:28:40 +0000 (03:28 +0000)]
Merge changes from topic "easel-dev-to-oc-mr1-dev" into oc-mr1-dev
am:
fa3af7b0e7
Change-Id: I67347d636270ab4995dcb315c0adc0f67bf82795
Chien-Yu Chen [Sun, 3 Dec 2017 03:28:03 +0000 (03:28 +0000)]
Revert "Revert "Settings: Enable HAL HDR+ by default""
am:
24721e7d96
Change-Id: Iec2832d2ae85edb92576af5688a067b88528fb1a
TreeHugger Robot [Sun, 3 Dec 2017 03:20:19 +0000 (03:20 +0000)]
Merge changes from topic "easel-dev-to-oc-mr1-dev" into oc-mr1-dev
* changes:
Settings: Remove HAL HDR+ option
Revert "Revert "Settings: Enable HAL HDR+ by default""
Antony Sargent [Fri, 1 Dec 2017 21:26:05 +0000 (21:26 +0000)]
Fix BluetoothPairingDialogTest to not expect device name am:
f20e0a492b am:
0ceadf9fb8
am:
4b47184df3
Change-Id: Id5e9801e9fcea4e8395f3406b94d3790c0ab27be
Antony Sargent [Fri, 1 Dec 2017 21:23:59 +0000 (21:23 +0000)]
Fix BluetoothPairingDialogTest to not expect device name am:
f20e0a492b
am:
0ceadf9fb8
Change-Id: I2d48521b73bb75fbbc92c54ff353ec491397f81c
Antony Sargent [Fri, 1 Dec 2017 21:21:38 +0000 (21:21 +0000)]
Fix BluetoothPairingDialogTest to not expect device name
am:
f20e0a492b
Change-Id: I4a74ac865db27415b232b0f460b058344adcc0ce
Chien-Yu Chen [Fri, 10 Nov 2017 21:51:24 +0000 (13:51 -0800)]
Settings: Remove HAL HDR+ option
Test: RunSettingsRoboTests
Bug:
68223991
Merged-In: I9eb27c7e205ac005c6a71726e125ed1e512da33b
Change-Id: I9eb27c7e205ac005c6a71726e125ed1e512da33b
Chien-Yu Chen [Tue, 10 Oct 2017 18:36:57 +0000 (11:36 -0700)]
Revert "Revert "Settings: Enable HAL HDR+ by default""
This reverts commit
781e762c2c68027c6b4bf8bcb71979c5e8c595c3.
Test: CTS
Bug:
67590972
Change-Id: I3c1459e432df10d075072e531ef6fc65e3ae4f24
Merged-In: I3c1459e432df10d075072e531ef6fc65e3ae4f24
Bill Yi [Thu, 30 Nov 2017 23:01:17 +0000 (23:01 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
ec4fe2a0c6 -s ours
Change-Id: I8979949845d4722a448047f31beb6fa11ff60434
TreeHugger Robot [Thu, 30 Nov 2017 20:59:07 +0000 (20:59 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Hemant Gupta [Thu, 30 Nov 2017 17:43:08 +0000 (17:43 +0000)]
Merge "Bluetooth: Give PBAP permission only if device is AUDIO_VIDEO_HANDSFREE" am:
b21a10b2ff
am:
a84a535729
Change-Id: Ia8ed56e2da6641a107af912efdf497d90c0d43ed
Hemant Gupta [Thu, 30 Nov 2017 17:40:31 +0000 (17:40 +0000)]
Merge "Bluetooth: Give PBAP permission only if device is AUDIO_VIDEO_HANDSFREE"
am:
b21a10b2ff
Change-Id: Id0378b1c410afcc0566652e3308cd812dcd68470
Treehugger Robot [Thu, 30 Nov 2017 17:38:01 +0000 (17:38 +0000)]
Merge "Bluetooth: Give PBAP permission only if device is AUDIO_VIDEO_HANDSFREE"
Bill Yi [Thu, 30 Nov 2017 12:05:41 +0000 (04:05 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
69925163
Change-Id: I4c880093e20e7178ce80006b158fefd490b4e061
Fan Zhang [Wed, 29 Nov 2017 18:53:37 +0000 (10:53 -0800)]
Update asset for no search result image
Bug:
68863351
Test: visual
Change-Id: Ia4d411e5d7d1db8b321fdfde006a93c6ff52ecb3
(cherry picked from commit
cb721bd870f73af7e156076f5fe57314436a5312)
Hemant Gupta [Fri, 22 Sep 2017 06:54:14 +0000 (12:24 +0530)]
Bluetooth: Give PBAP permission only if device is AUDIO_VIDEO_HANDSFREE
Step by step:
1. Pair and connect with BTHS (e.g. SBH50).
2. Click the settings icon of paired device, and check "Use for" items.
-----------------------------------------------------------------
Expected Result:
After step 2, "Contact sharing" should not be checked.
Actual Result:
After step 2, "Contact sharing" is checked.
Fix:
Set phone book permission as REJECTED if class of Device is
not AUDIO_VIDEO_HANDSFREE
Test: Checked above usecase and issue is not observed
Bug:
64372703
Change-Id: I178a09dd9e76d67c461c4b04d9b2ee0078ed24c9
Patrik Bannura [Fri, 24 Nov 2017 11:33:24 +0000 (12:33 +0100)]
Hide signal strength when told by carrier
Bug:
69730732
Test: Add different values for two carriers in vendor.xml
and see them change when swapping sim card
Depends-On: I155c8f619a451edab85cf6422cef73e8e1686629
Change-Id: I241ddb3c20002db781308d94c6c165b8d13b2474
Malcolm Chen [Wed, 29 Nov 2017 00:36:54 +0000 (00:36 +0000)]
Merge "Remove extra newline in AndroidManifest." am:
8aeb69396d
am:
9d30592308
Change-Id: I2b4480c0d1a98ce4bb87d6fa30f347b929703fe9
Malcolm Chen [Wed, 29 Nov 2017 00:31:49 +0000 (00:31 +0000)]
Merge "Remove extra newline in AndroidManifest."
am:
8aeb69396d
Change-Id: I36ea57db56ff985da118fb7ab117bf939b7b2dc1
Treehugger Robot [Wed, 29 Nov 2017 00:22:47 +0000 (00:22 +0000)]
Merge "Remove extra newline in AndroidManifest."
Bill Yi [Sun, 26 Nov 2017 23:05:52 +0000 (23:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
419407eaea -s ours
Change-Id: I5689ca60c3bf9a29c59380c7d3002c6007f8eb05
TreeHugger Robot [Sun, 26 Nov 2017 23:02:14 +0000 (23:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sun, 26 Nov 2017 22:52:50 +0000 (22:52 +0000)]
Import translations. DO NOT MERGE am:
9ae05458f0 -s ours
am:
b2cc06ea43 -s ours
Change-Id: I6e6335049140a4cb73bb694dd4636f264e1876a4
Bill Yi [Sun, 26 Nov 2017 22:49:49 +0000 (22:49 +0000)]
Import translations. DO NOT MERGE
am:
9ae05458f0 -s ours
Change-Id: I829586defb2cf0da3395bc8eb41ae243faf02173
Bill Yi [Sun, 26 Nov 2017 20:19:05 +0000 (12:19 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I970b01d5df730bd739ef0ad5a40d28916bf53b02
Bill Yi [Sun, 26 Nov 2017 20:15:58 +0000 (12:15 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ibfb674f157b342ea77c07cd88c47dc25b2fcd03e
songkailun [Wed, 22 Nov 2017 18:57:13 +0000 (18:57 +0000)]
Merge "DO NOT MERGE translate arrays in Settings/res" am:
992a4e5500 -s ours
am:
94cd0e4373
Change-Id: I8c60234d38a9aedd6b2bec24ff053aa2049790bd
songkailun [Wed, 22 Nov 2017 18:49:59 +0000 (18:49 +0000)]
Merge "DO NOT MERGE translate arrays in Settings/res"
am:
992a4e5500 -s ours
Change-Id: Ia5c69f39d1796acd79e453744cc7e5c487c43042
Treehugger Robot [Wed, 22 Nov 2017 18:36:14 +0000 (18:36 +0000)]
Merge "DO NOT MERGE translate arrays in Settings/res"
songkailun [Tue, 14 Nov 2017 13:57:20 +0000 (21:57 +0800)]
DO NOT MERGE translate arrays in Settings/res
"None" should be translated
Change-Id: I12a30e6476ec41c2a3bf1878d6b5596bf5ee8ed7
Signed-off-by: songkailun <songkailun@xiaomi.com>
Malcolm Chen [Fri, 14 Jul 2017 00:59:58 +0000 (17:59 -0700)]
Remove extra newline in AndroidManifest.
Remove extra newline in AndroidManifest which caused
android.settings.MOBILE_DATA_USAGE not received.
Bug: b/
63670955
Test: testcase MobileDataUsageActivityTest
Change-Id: I4a4178141010b128e3d9c8c9721a51b81cbdffff
jackqdyulei [Tue, 21 Nov 2017 16:46:24 +0000 (16:46 +0000)]
Merge "Add owners to setting packages." am:
f82cd59476
am:
e6f052e928
Change-Id: Ie9bcc92888073e504ac444c42bc801c50aac7eb5
jackqdyulei [Tue, 21 Nov 2017 16:41:50 +0000 (16:41 +0000)]
Merge "Add owners to setting packages."
am:
f82cd59476
Change-Id: Ic7c94f6ba65149cdc799332a0cc5976ff285f16f
Treehugger Robot [Tue, 21 Nov 2017 16:35:30 +0000 (16:35 +0000)]
Merge "Add owners to setting packages."
Malcolm Chen [Tue, 21 Nov 2017 00:58:56 +0000 (00:58 +0000)]
Merge "Add an activity that starts DataUsageList fragment for mobile." am:
942d418da9 -s ours
am:
5b59b71f12 -s ours
Change-Id: I236ee8d17bef986af509692cbbd5788ab653d3ae
Malcolm Chen [Tue, 21 Nov 2017 00:48:50 +0000 (00:48 +0000)]
Merge "Add an activity that starts DataUsageList fragment for mobile."
am:
942d418da9 -s ours
Change-Id: I23e52f28f5e0873094476eda4698677e4c736f4e
jackqdyulei [Mon, 11 Sep 2017 19:44:27 +0000 (12:44 -0700)]
Add owners to setting packages.
Bug:
65294119
Fixes:
69384604
Test: Build
Change-Id: Ib4fddc1f04087671d8445fd967d4262287e5c4f3
Merged-In: I927052a73f639d0894600611cd5c79293f43ff5e
Merged-In: Ia1eb8155f2d4359d56b0babd474083295ba38a0b
Merged-In: I24ec103ff5013ad416e3dfb1c548acd387b4ba64
Merged-In: If9fddc8b4e2e6d4d7db185ab16063e824323b9a7
Merged-In: I49159950521a013422b1087ea2c3e6cd5151457c
Merged-In: I69af58183c5b89af96c1a8808665fa506a620012
Merged-In: Ie9492f497824cd2b2727dde9d3a48452c72f1084
Merged-In: I2fd0249fd8b555e5ca93c3aec13857e6c74e157c
Merged-In: Id1c2d9233643a18c1e104255a9e2b8b1aaefc44e
Merged-In: Icdcfaaf6cc7a1e1cf77e89a79d0425cab4405ffc
Merged-In: I697528ff260a0f8e54aa1188e35143e668800e7d
Merged-In: I1486782f476acaf1e2e4b66df57869409239986f
Merged-In: I804b50a38c877da80b5ef3251e16029259014152
Merged-In: I39eec9ebc1db2dc14669f27b17624394e25eb47f
Merged-In: I054a6df08046cda1c2f202390ed24839a6b10349
Merged-In: I9da5bd71ed6aa3922a7f2e2ac4729e3247a204ce
Merged-In: I63778c68f1ab9edc36a9e12aa1729f8fd6a5e073
Treehugger Robot [Tue, 21 Nov 2017 00:35:41 +0000 (00:35 +0000)]
Merge "Add an activity that starts DataUsageList fragment for mobile."
Bill Yi [Mon, 20 Nov 2017 22:53:31 +0000 (22:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
59a800d0ec -s ours
Change-Id: I1a74337f7fb7ac6d5b157f5a8baa62d0703e2ec4
TreeHugger Robot [Mon, 20 Nov 2017 22:46:59 +0000 (22:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Mon, 20 Nov 2017 22:36:07 +0000 (22:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
ae351b3266 -s ours
am:
9a7789a0fc -s ours
Change-Id: I26f441bc84359e2ef490cc70867ee1b738ec85d8
Bill Yi [Mon, 20 Nov 2017 22:31:36 +0000 (22:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
ae351b3266 -s ours
Change-Id: I7004ff8745bf3ecbb1e947d5c064cca955f9e35e
TreeHugger Robot [Mon, 20 Nov 2017 22:20:05 +0000 (22:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Mon, 20 Nov 2017 19:40:38 +0000 (11:40 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ic55e0c95b19c299b290f9f22b935b0e553917264
Bill Yi [Mon, 20 Nov 2017 19:39:36 +0000 (11:39 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id4c5ecbe846aca0a08b60c7a08d548cbae3458b1
Jie Cheng [Thu, 16 Nov 2017 20:20:45 +0000 (20:20 +0000)]
Merge "Preference SimSettingsActivity not aligned correctly" am:
8d3d166823
am:
c6525f5e24
Change-Id: I2516b9132982104ef870d79a7c63c7d002f036de
Jie Cheng [Thu, 16 Nov 2017 20:18:44 +0000 (20:18 +0000)]
Merge "Preference SimSettingsActivity not aligned correctly"
am:
8d3d166823
Change-Id: I67a977b974ddbf42b01647e4ca02d7d9dfe1b61d
Treehugger Robot [Thu, 16 Nov 2017 20:14:27 +0000 (20:14 +0000)]
Merge "Preference SimSettingsActivity not aligned correctly"
Jie Cheng [Mon, 25 Sep 2017 05:54:55 +0000 (13:54 +0800)]
Preference SimSettingsActivity not aligned correctly
The preference SimSettingsActivity in the screen "Network & Internet"
never uses a summary. However the text for this preference ("SIM cards")
is top aligned in order to make room for an extra line for the
non-existing summary.
Solved by setting the summary to @string/summary_empty for the
preference SimSettingsActivity. This will make the text in the
preference to align correctly and not leave extra room for a summary.
Test: manual - Checked that preference SimSettingsActivity is correctly
aligned in screen "Network & Internet".
Bug:
69405185
Change-Id: I1a1b3fa7253bbf2a5299f54cc8c4d3e857ca059c
Fan Zhang [Thu, 16 Nov 2017 01:36:10 +0000 (01:36 +0000)]
Merge "Catch exception when checking WifiDisplay availability" am:
7a08901d1b
am:
6d5e7bf41f
Change-Id: I8e1453bdd39ce220381a3368846bb137c4878dd4
Fan Zhang [Thu, 16 Nov 2017 01:33:31 +0000 (01:33 +0000)]
Merge "Catch exception when checking WifiDisplay availability"
am:
7a08901d1b
Change-Id: I426208a605e3771238bd91c135e47faf1b559e58
Treehugger Robot [Thu, 16 Nov 2017 01:27:57 +0000 (01:27 +0000)]
Merge "Catch exception when checking WifiDisplay availability"
Fan Zhang [Thu, 19 Oct 2017 23:49:21 +0000 (16:49 -0700)]
Catch exception when checking WifiDisplay availability
Change-Id: Ic2f17905babf43e92a825b8b5b4f8aac7d8ff001
Fixes:
68013053
Test: robotests
Bruno Martins [Wed, 15 Nov 2017 21:56:18 +0000 (21:56 +0000)]
Merge "Settings: Add notification channel for SIM selection" am:
c543d5ba26
am:
7431ad3a80
Change-Id: Ic3241dfe4bc53a1206fb92a1a5c8f0b91cedfca0
Bruno Martins [Wed, 15 Nov 2017 21:54:16 +0000 (21:54 +0000)]
Merge "Settings: Add notification channel for SIM selection"
am:
c543d5ba26
Change-Id: I72ac5944b8b4dc3eb2ad38c89ec8eb12f83b019d
Treehugger Robot [Wed, 15 Nov 2017 21:45:41 +0000 (21:45 +0000)]
Merge "Settings: Add notification channel for SIM selection"
Antony Sargent [Wed, 6 Sep 2017 23:15:59 +0000 (16:15 -0700)]
Reword bluetooth confirmation dialog
Changing the text near the checkbox allowing contacts/call history
access from "Allow $device_name to access your contacts and call
history" to just "Allow access to your contacts and call history" to
avoid problem where a properly crafted remote device name can make the
"to access your contacts and call history" text get pushed down below
the fold, and mislead users into thinking the checkbox has a different
meaning.
Bug:
62672248
Test: manual (initiate bluetooth pairing with another phone or a
computer, observe pairing dialog text)
Change-Id: I770852739f6791c2b9a36ab45c526bab3f3b9be1
Antony Sargent [Thu, 7 Sep 2017 18:46:58 +0000 (11:46 -0700)]
Fix BluetoothPairingDialogTest to not expect device name
The functional fix for b/
62672248 in ag/
2856166 removes the device name
from the text near the checkbox in the bluetooth pairing dialog, so we
need to stop checking for it in this robotest. However, that functional
fix needs to be in a separate CL from this fix for the robotest, because
the robotest doesn't exist on some of the older branches where the
functional fix needs to be backported.
Bug:
62672248
Test: RunSettingsRoboTests
Change-Id: I17ff3e4f13c20d58cc4027557f275d296ecccc95
OSDN Git Service
