OSDN Git Service
Chen Xu [Fri, 7 Dec 2018 00:39:36 +0000 (16:39 -0800)]
Merge "address API council feedbacks for Telephony.Carriers" am:
71f9fe4dfa
am:
1bf36a6a72
Change-Id: I9775826417d2df6284bf0273b48c3a9814a01cf4
Chen Xu [Fri, 7 Dec 2018 00:19:11 +0000 (16:19 -0800)]
Merge "address API council feedbacks for Telephony.Carriers"
am:
71f9fe4dfa
Change-Id: I834e4f1fe9457af586a0fe7856c4ab351a4b26a3
Chen Xu [Thu, 6 Dec 2018 21:45:47 +0000 (21:45 +0000)]
Merge "address API council feedbacks for Telephony.Carriers"
Fan Zhang [Tue, 4 Dec 2018 18:10:50 +0000 (10:10 -0800)]
Merge "Make migrate option menu invisible when src volume is not mounted" am:
6db9f21256
am:
b084c60686
Change-Id: Ia3990dc8fa2c73079b997bda0e1656d173c65212
Fan Zhang [Tue, 4 Dec 2018 18:01:10 +0000 (10:01 -0800)]
Merge "Make migrate option menu invisible when src volume is not mounted"
am:
6db9f21256
Change-Id: Ie4ca0c854de854172a0eccf4e56ec86a8e18d71c
Fan Zhang [Tue, 4 Dec 2018 17:33:33 +0000 (17:33 +0000)]
Merge "Make migrate option menu invisible when src volume is not mounted"
chen xu [Wed, 28 Nov 2018 08:22:42 +0000 (00:22 -0800)]
address API council feedbacks for Telephony.Carriers
Bug:
118296421
Test: telephony unit test
Change-Id: Idf8bcad4fe9d765a73563e9b0c1c659175835447
Merged-in: Idf8bcad4fe9d765a73563e9b0c1c659175835447
Neil Fuller [Mon, 26 Nov 2018 23:48:38 +0000 (15:48 -0800)]
Merge "Track move of timezone classes to libcore.timezone" am:
3ddcb6a90a
am:
de0bd5321f
Change-Id: I69516fa31c07a67621e8740ca14c19c40d5dd126
Neil Fuller [Mon, 26 Nov 2018 23:27:52 +0000 (15:27 -0800)]
Merge "Track move of timezone classes to libcore.timezone"
am:
3ddcb6a90a
Change-Id: Id7db6339cf9c5f886be9c8ba80b47e15783a4ea3
Neil Fuller [Mon, 26 Nov 2018 23:04:33 +0000 (23:04 +0000)]
Merge "Track move of timezone classes to libcore.timezone"
Youming Ye [Mon, 26 Nov 2018 21:51:57 +0000 (13:51 -0800)]
Merge "Display a toast to notify user that Preset APN setting cannot be viewed" am:
a995cb334b
am:
e29c62ea04
Change-Id: If37a038a2a226d0165293d7c40f133002bcd2991
Youming Ye [Mon, 26 Nov 2018 21:38:30 +0000 (13:38 -0800)]
Merge "Display a toast to notify user that Preset APN setting cannot be viewed"
am:
a995cb334b
Change-Id: If2bb27e7e9452ebcaab1d421adc07259b4b3b31c
Youming Ye [Mon, 26 Nov 2018 21:14:14 +0000 (21:14 +0000)]
Merge "Display a toast to notify user that Preset APN setting cannot be viewed"
Neil Fuller [Fri, 16 Nov 2018 21:23:33 +0000 (21:23 +0000)]
Track move of timezone classes to libcore.timezone
Some time zone related libcore classes are moving from
libcore.util to libcore.timezone.
Bug:
119026403
Test: build only
Merged-In: I920411dfa7e000a0da9678826a035e0461211619
Change-Id: I920411dfa7e000a0da9678826a035e0461211619
(cherry picked from commit
1e1961a5b30dd93560bff2301b95e6a99a603cba)
taiki tsutsumi [Fri, 29 Jun 2018 05:21:39 +0000 (14:21 +0900)]
Display a toast to notify user that Preset APN setting cannot be viewed
When KEY_HIDE_PRESET_APN_DETAILS_BOOL is set to true, Preset APN setting
is hidden. When user taps Preset APN, a toast should be shown to inform
that user cannot view the APN.
Test: manual - check Preset APN setting details are hidden
Bug:
115453290
Depends-On: I8a5c6f92f876d349b304acf89b4ffab86ff3f24b
Change-Id: I0078b3492ae87a4297f24871b8bea1579e6a79af
Maurice Lam [Wed, 21 Nov 2018 16:06:22 +0000 (08:06 -0800)]
Merge "Remove ShadowLibcoreTimeZoneNames" am:
45f8352422
am:
918c0c5896
Change-Id: I43ce51a3947ddb5e3f9deadfbbce2403ece9a182
Maurice Lam [Wed, 21 Nov 2018 15:44:39 +0000 (07:44 -0800)]
Merge "Remove ShadowLibcoreTimeZoneNames"
am:
45f8352422
Change-Id: I65b07e67025ad0dfaa85fc1c873e695d69ff0a9c
Treehugger Robot [Wed, 21 Nov 2018 15:17:51 +0000 (15:17 +0000)]
Merge "Remove ShadowLibcoreTimeZoneNames"
Maurice Lam [Tue, 20 Nov 2018 23:01:22 +0000 (15:01 -0800)]
Remove ShadowLibcoreTimeZoneNames
Bug:
119829838
Test: Treehugger
(cherry picked from commit
cc2cf5ba5a8ffa1eb95b71534f256046e429f9ea)
Change-Id: I756265945dcf7c3b7a78a627c4dc32cff3c8e55c
Merged-In: I756265945dcf7c3b7a78a627c4dc32cff3c8e55c
Fan Zhang [Wed, 21 Nov 2018 05:42:26 +0000 (21:42 -0800)]
[automerger skipped] Hide quicksetting tile for dev options when it's turned off am:
73469d9de1 am:
eeaff5deeb -s ours am:
622444d488 -s ours
am:
b232d21e3d -s ours
Change-Id: I3556cb37a1ed60059fea16f4ffd91772ca15fbb3
Fan Zhang [Wed, 21 Nov 2018 05:41:34 +0000 (21:41 -0800)]
[automerger skipped] Hide quicksetting tile for dev options when it's turned off am:
04f1e38dc3 -s ours
am:
cb560b65f5 -s ours
Change-Id: I1d6e775641db02ec58b378382d997569ef97cd06
Fan Zhang [Wed, 21 Nov 2018 05:40:53 +0000 (21:40 -0800)]
[automerger skipped] Merge "Hide quicksetting tile for dev options when it's turned off" into pi-dev
am:
4c16ad5abf -s ours
Change-Id: I7a8f95eda10b14e0fd067a15dae38cd3751566f2
Fan Zhang [Tue, 20 Nov 2018 10:43:38 +0000 (02:43 -0800)]
[automerger skipped] Hide quicksetting tile for dev options when it's turned off am:
73469d9de1 am:
eeaff5deeb -s ours
am:
622444d488 -s ours
Change-Id: I48cc472fb0d99b88f3affb69708f7107fe3ea2dc
Fan Zhang [Tue, 20 Nov 2018 10:34:38 +0000 (02:34 -0800)]
[automerger skipped] Hide quicksetting tile for dev options when it's turned off am:
73469d9de1
am:
eeaff5deeb -s ours
Change-Id: I1da9e0c3e5a170eb16a11a616d8a76fe6424d420
Fan Zhang [Tue, 20 Nov 2018 10:28:15 +0000 (02:28 -0800)]
Hide quicksetting tile for dev options when it's turned off
am:
73469d9de1
Change-Id: Ibd19748e11218a958a00eaf501d9d8ab7cfc96e0
Fan Zhang [Tue, 20 Nov 2018 06:38:50 +0000 (22:38 -0800)]
[automerger skipped] Hide quicksetting tile for dev options when it's turned off
am:
04f1e38dc3 -s ours
Change-Id: I3dfc8d889fb440846e4b70193350c665389f9b89
TreeHugger Robot [Tue, 20 Nov 2018 05:00:03 +0000 (05:00 +0000)]
Merge "Hide quicksetting tile for dev options when it's turned off" into pi-dev
Bill Yi [Wed, 14 Nov 2018 00:58:03 +0000 (16:58 -0800)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
1ba1a70dfb -s ours
Change-Id: I190d08a244052ea324a288252848acf87fd12b53
TreeHugger Robot [Wed, 14 Nov 2018 00:49:33 +0000 (00:49 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Tue, 13 Nov 2018 22:42:50 +0000 (14:42 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ic00cbf2b25c019d77c85c93203e58f4a1cf102c1
Risan [Tue, 13 Nov 2018 19:57:54 +0000 (11:57 -0800)]
Merge "Allow StubVolume to be browseable in Settings" am:
8f516adef7
am:
e613923d66
Change-Id: I8eea682dec3eba70a2d44c32ba6e28641118300a
Risan [Tue, 13 Nov 2018 19:45:08 +0000 (11:45 -0800)]
Merge "Allow StubVolume to be browseable in Settings"
am:
8f516adef7
Change-Id: Idddb5b90367bbb5c1f1a5146fdd7b1fc01cf0cf9
Treehugger Robot [Tue, 13 Nov 2018 19:20:38 +0000 (19:20 +0000)]
Merge "Allow StubVolume to be browseable in Settings"
Neil Fuller [Tue, 13 Nov 2018 10:03:38 +0000 (02:03 -0800)]
Merge "Remove the feature flag and dead code for the old time zone picker" am:
6bb4b5ca43
am:
78e132773a
Change-Id: Ie8890265b7dd1b5248ccef4dbb0f6fd58da55f85
Neil Fuller [Tue, 13 Nov 2018 09:50:08 +0000 (01:50 -0800)]
Merge "Remove the feature flag and dead code for the old time zone picker"
am:
6bb4b5ca43
Change-Id: If338977d818193950ed428b70ed6d6a3aa87082b
Neil Fuller [Tue, 13 Nov 2018 09:33:16 +0000 (09:33 +0000)]
Merge "Remove the feature flag and dead code for the old time zone picker"
Victor Chang [Thu, 29 Mar 2018 17:52:09 +0000 (18:52 +0100)]
Remove the feature flag and dead code for the old time zone picker
This commit backports commit
6be6c5820639c1f7ed60dd2a03dab80cbb1b5afb
to aosp/master.
Bug:
72376227
Test: build only
Merged-In: I332077a67cc9f9c83b298e25feea71463e1ee98b
Change-Id: I332077a67cc9f9c83b298e25feea71463e1ee98b
(cherry picked from commit
6be6c5820639c1f7ed60dd2a03dab80cbb1b5afb)
Edgar Wang [Tue, 13 Nov 2018 01:39:43 +0000 (17:39 -0800)]
Merge "Move "About Phone" to bottom of Settings main IA, above "Tips & Support"" into pi-dev
am:
96d829be9a
Change-Id: I93b59d6f62c713bb49f1088ea3911b9b9313894e
Fan Zhang [Tue, 12 Jun 2018 19:06:17 +0000 (12:06 -0700)]
Hide quicksetting tile for dev options when it's turned off
Merged-In: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Change-Id: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Fixes:
78652607
Bug:
117770924
Test: robotests
Edgar Wang [Tue, 13 Nov 2018 01:16:48 +0000 (01:16 +0000)]
Merge "Move "About Phone" to bottom of Settings main IA, above "Tips & Support"" into pi-dev
Fan Zhang [Tue, 12 Jun 2018 19:06:17 +0000 (12:06 -0700)]
Hide quicksetting tile for dev options when it's turned off
Merged-In: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Change-Id: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Fixes:
78652607
Bug:
117770924
Test: robotests
Fan Zhang [Tue, 12 Jun 2018 19:06:17 +0000 (12:06 -0700)]
Hide quicksetting tile for dev options when it's turned off
Merged-In: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Change-Id: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Fixes:
78652607
Bug:
117770924
Test: robotests
Edgar Wang [Mon, 29 Oct 2018 12:22:11 +0000 (20:22 +0800)]
Move "About Phone" to bottom of Settings main IA, above "Tips & Support"
Merged-In: I0a0f03bdb27d9eea48eb758496eefeebcbc57b6c
Change-Id: If839a7199992104cc0abac9327844145d148cd68
Fixes:
118168552
Test: robotests
Youming Ye [Fri, 9 Nov 2018 01:32:00 +0000 (17:32 -0800)]
Merge "Fix issue that read-only apns can be edited" am:
e871464053
am:
6b0237ebfb
Change-Id: Id45080ae655a90bbdc3bf1601bc4aff33c42de3e
Youming Ye [Fri, 9 Nov 2018 01:20:26 +0000 (17:20 -0800)]
Merge "Fix issue that read-only apns can be edited"
am:
e871464053
Change-Id: Iab9783bfc462e5232df260f701c8f05e099bf55e
Youming Ye [Fri, 9 Nov 2018 01:00:35 +0000 (01:00 +0000)]
Merge "Fix issue that read-only apns can be edited"
Risan [Sun, 28 Oct 2018 23:59:06 +0000 (08:59 +0900)]
Allow StubVolume to be browseable in Settings
Test: Unit test + manual test: Mount and unmount stubvolume in ARC++,
check settings show the device correctly and could browse it using
DocumentsUI.
Bug:
110380403
Change-Id: I96fc82e731225776ac7070ef035687f83da94245
Fan Zhang [Wed, 7 Nov 2018 20:59:32 +0000 (12:59 -0800)]
Merge "DO NOT MERGE Fix summary text for advanced button." into pi-dev
am:
0eea3b6c9e
Change-Id: I25c2e6859a5a62997e6e23ffdf7dbd95f0486313
Fan Zhang [Wed, 7 Nov 2018 20:44:59 +0000 (20:44 +0000)]
Merge "DO NOT MERGE Fix summary text for advanced button." into pi-dev
Fan Zhang [Wed, 7 Nov 2018 18:51:48 +0000 (10:51 -0800)]
Fix crash when starting daydream setting with wrong context
am:
d9c6692f25
Change-Id: I723b66eced5ace06f5821463c3dd783a18496327
Clown SHEN [Wed, 7 Nov 2018 07:35:41 +0000 (23:35 -0800)]
Merge "Launch WfcActivation with subscription ID" am:
bd57f94a4c
am:
74fe4a9177
Change-Id: Ib61988a9f84ed10d4ac0d6b1a0d8b7d4f8897224
Clown SHEN [Wed, 7 Nov 2018 07:30:23 +0000 (23:30 -0800)]
Merge "Launch WfcActivation with subscription ID"
am:
bd57f94a4c
Change-Id: Id76cb09a81158ce069f5200b99c19b1c9840f9f8
Clown SHEN [Wed, 7 Nov 2018 07:09:27 +0000 (07:09 +0000)]
Merge "Launch WfcActivation with subscription ID"
Fan Zhang [Tue, 6 Nov 2018 23:21:07 +0000 (15:21 -0800)]
Fix crash when starting daydream setting with wrong context
The context must be a UI context. This is a new requirement in P.
Change-Id: I3e2de5068f44010da7d57af030e9f029dd97a7f8
Merged-In: I28874f296da617f4cedf6706b0663b76671f1780
Fixes:
111375261
Fixes:
113312592
Test: robotests
Bill Yi [Tue, 6 Nov 2018 15:07:33 +0000 (07:07 -0800)]
[automerger skipped] Import translations. DO NOT MERGE
am:
222dca5b7c -s ours
Change-Id: I36cfe2ffff510c8e4d3d96bf4f463d21ef00b24a
Bill Yi [Tue, 6 Nov 2018 12:15:12 +0000 (04:15 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ie15195c81e11f67f4bd72be18c6af0d273666ceb
Bill Yi [Sat, 3 Nov 2018 04:26:36 +0000 (21:26 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
935509aa3d -s ours
Change-Id: I6d5663483003b55aaa03856e41adf086d888eec0
Bill Yi [Fri, 2 Nov 2018 22:27:05 +0000 (15:27 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ic830e9dc65c715010b562f0148821899114de819
Yuming Mao [Wed, 15 Aug 2018 07:10:23 +0000 (15:10 +0800)]
Fix issue that read-only apns can be edited
When entering to ApnEditor with ApnSettings#onPreferenceTreeClick(),
subId is not passed.
So invalid subId is used and it gets wrong carrier config values.
To resolve this issue, remove unnecessary ApnSettings click event.
The only click event for launching ApnEditor is ApnPreference click
event.
Test: manual - Check that the read-only APN can't be edited when tap
the edge of the APN settings screen
Bug:
117302653
Change-Id: I0a61b409539d6e4f6aa9860235e61c43c76640fa
clownshen [Wed, 31 Oct 2018 05:28:09 +0000 (13:28 +0800)]
Launch WfcActivation with subscription ID
For multi SIM project, need to have subscription ID information in the
intent for launching WFC activation activity.
Bug:
112826472
Test: manual test
Change-Id: I9f470c014054efa612c87ff16e574fc9fd286b3d
Lei Yu [Mon, 29 Oct 2018 20:33:19 +0000 (20:33 +0000)]
Revert "resolve merge conflicts of
7849607a7ca9518f57fb22cca5665b88e99134c2 to pi-dev-plus-aosp"
This reverts commit
e81224d80c3af797003a40f06fc7563728a0da96.
Reason for revert: broke pi-dev-plus-aosp
Change-Id: Ib45b96216017d01b6301a558a0cd27bf1071779c
Merged-In: I3d2ebad2879479a870bcdfe596bb88b83c424389
Lei Yu [Thu, 25 Oct 2018 21:20:08 +0000 (14:20 -0700)]
resolve merge conflicts of
7849607a7ca9518f57fb22cca5665b88e99134c2 to pi-dev-plus-aosp
Bug:
115707279
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ifd8f2c090ccd9eadbc7b789b927550bce732f1d1
Merged-In: I3d2ebad2879479a870bcdfe596bb88b83c424389
Lei Yu [Thu, 25 Oct 2018 19:58:53 +0000 (19:58 +0000)]
Merge "Add entitlement check for usb tethering" into pi-dev
Bill Yi [Thu, 25 Oct 2018 01:53:10 +0000 (18:53 -0700)]
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am:
8b16aba0dd -s ours
am:
27e14db009 -s ours
Change-Id: Ic2e8292d1f5936b943ba084611456fcf19651004
Bill Yi [Wed, 24 Oct 2018 23:31:58 +0000 (16:31 -0700)]
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am:
8b16aba0dd -s ours
Change-Id: I6072677fc094b42e0a1356aa440151f829e100a0
Bill Yi [Wed, 24 Oct 2018 21:47:27 +0000 (14:47 -0700)]
Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: Id291dd4e424711a8cb39927b9733214b92b81d78
Bill Yi [Wed, 24 Oct 2018 17:45:20 +0000 (10:45 -0700)]
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am:
851a72f941 -s ours
Change-Id: I9eb1bf07cd24821c999cdb31a7d7f51ca7ffc85c
Bill Yi [Wed, 24 Oct 2018 16:07:12 +0000 (09:07 -0700)]
Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
Change-Id: Ia33547dfec9adf4000d3ed2665f2c3804be97071
Fan Zhang [Wed, 24 Oct 2018 02:30:39 +0000 (19:30 -0700)]
Merge "Fix toast is covered by PIN code screen after wrong pin" am:
d5abc0eb44
am:
c150f5eb29
Change-Id: Ia4e59e195720919f2baa52e7d5667aed27c5ce7c
Fan Zhang [Wed, 24 Oct 2018 02:24:29 +0000 (19:24 -0700)]
Merge "Fix toast is covered by PIN code screen after wrong pin"
am:
d5abc0eb44
Change-Id: Ie2cfeeb5573ae6b79855edbd87210bfe0e0a8287
Fan Zhang [Wed, 24 Oct 2018 02:16:57 +0000 (02:16 +0000)]
Merge "Fix toast is covered by PIN code screen after wrong pin"
Hao Zhao [Tue, 8 Aug 2017 07:21:49 +0000 (15:21 +0800)]
Fix toast is covered by PIN code screen after wrong pin
The error toast is displayed when user input wrong PIN
code three times, but at that moment the SIM PUK code input
page in SystemUI pop up and covers the toast, so the user
can't seen the error message.
Adjust the toast window layer, let the the toast pop up
over the SIM pin code input page.
Bug:
74056527
Change-Id: I569a2fc2adac15c4713b4c95e9720335bd4df88a
Doris Ling [Fri, 13 Jul 2018 19:32:00 +0000 (12:32 -0700)]
DO NOT MERGE Fix summary text for advanced button.
- the resource for the summary text is in the support library. However,
the prebuilt version in the build does not contain the latest change for
the summary text. Add the overlay for the summary resource here with the
updated translation to remove the redundant summary prefix in the
advanced button.
Change-Id: I0fa8e3c9e02090d7d8a3e18608181ab73d2f46a1
Fixes:
118315852
Test: manual
Bill Yi [Fri, 19 Oct 2018 22:17:08 +0000 (15:17 -0700)]
Merge pi-dr1-dev to aosp-master am:
c1fe9e6ac2
am:
89e733ee2c
Change-Id: I0808d725397294f4a19add88b278472360f48b64
Bill Yi [Fri, 19 Oct 2018 22:00:40 +0000 (15:00 -0700)]
Merge pi-dr1-dev to aosp-master
am:
c1fe9e6ac2
Change-Id: I6a6eafb34b31bc343dfe4117f17ccba771a7f111
Bill Yi [Fri, 19 Oct 2018 19:20:48 +0000 (12:20 -0700)]
Merge pi-dr1-dev to aosp-master
Change-Id: I0cf933755a46ad6071cb085120a4b1b1c5d1976c
Hall Liu [Thu, 18 Oct 2018 22:31:05 +0000 (15:31 -0700)]
Merge "Start using CarrierConfig for 4G/LTE icon" am:
558535f3f2
am:
e419904aa0
Change-Id: I63428a32d201aa7260cc4aa96ad229e5bd83cf16
Hall Liu [Thu, 18 Oct 2018 21:56:56 +0000 (14:56 -0700)]
Merge "Start using CarrierConfig for 4G/LTE icon"
am:
558535f3f2
Change-Id: I9bb6a91c0c3a79f4b3fae4d50c431e0286b8c06f
Hall Liu [Thu, 18 Oct 2018 20:36:06 +0000 (20:36 +0000)]
Merge "Start using CarrierConfig for 4G/LTE icon"
Stanley Tng [Thu, 18 Oct 2018 01:23:18 +0000 (18:23 -0700)]
[automerger skipped] resolve merge conflicts of
b0e99e147253df35932c8c7c15911d091a07dda1 to stage-aosp-master
am:
81edd9a286 -s ours
Change-Id: I5d08af8af8e4056f49d8006f454c347f64ef643c
Stanley Tng [Wed, 17 Oct 2018 18:07:29 +0000 (11:07 -0700)]
resolve merge conflicts of
b0e99e147253df35932c8c7c15911d091a07dda1 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ife619e714d451b6cb77bfaf50e3f45c969d37cb4
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953
Bill Yi [Wed, 17 Oct 2018 06:24:58 +0000 (23:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
f896493c70 -s ours
Change-Id: I4d93781a7e2f2d20b1d0e25338af6e24f1b5a448
Treehugger Robot [Wed, 17 Oct 2018 04:48:36 +0000 (04:48 +0000)]
Merge "Fix Connect State message in Device details for Hearing Aids"
Bill Yi [Wed, 17 Oct 2018 04:28:11 +0000 (21:28 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
117801752
Change-Id: I43766c0d85af44370fa136fb4b54869ccfb9bdb4
Stanley Tng [Tue, 16 Oct 2018 04:56:50 +0000 (21:56 -0700)]
resolve merge conflicts of
a8af2d3664eab2eae6f670ef0fb79969010c34c3 to pi-dev-plus-aosp
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie95fe77f761197dee450e86bc0f7edba8d514959
Merged-In: I16b51d7feabc914219c24731eb39a23bd1782571
Stanley Tng [Tue, 16 Oct 2018 00:30:02 +0000 (17:30 -0700)]
resolve merge conflicts of
019a771d2d8b9bec19ae81042097e633d6110ead to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I2fc36f4ee9a600e7e9c5ce00708736a4d4548358
jackqdyulei [Tue, 2 Oct 2018 21:19:27 +0000 (14:19 -0700)]
Add entitlement check for usb tethering
Before this CL, usb tethering in detail page doesn't have entitlement
check. This CL fix it by using the correct API
Also polish it by updating the UI before entitlement check to align
hotspot page. So in UI it will first check "usb tethering". If
entitlement check fail, it will revoke and go back to previous selection.
Bug:
115707279
Test: RunSettingsRoboTests
Merged-In: I3d2ebad2879479a870bcdfe596bb88b83c424389
Change-Id: I3d2ebad2879479a870bcdfe596bb88b83c424389
Bill Yi [Mon, 15 Oct 2018 23:27:31 +0000 (16:27 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
2a1a5cba81 -s ours
Change-Id: I79a8495fa76bbcb9dcee9e66a48ff4c3875f454d
Treehugger Robot [Mon, 15 Oct 2018 23:10:41 +0000 (23:10 +0000)]
Merge "Add Feature Flag for Hearing Aid Profile"
Stanley Tng [Mon, 1 Oct 2018 05:47:22 +0000 (22:47 -0700)]
Fix Connect State message in Device details for Hearing Aids
In the Device details of Settings App and when using two Hearing Aids
devices (left and right sides), this will fix the connect state messages
for these two devices. Also added Robo tests for the changes.
Test: Manual tests and also ran RunSettingsLibRoboTests and RunSettingsRoboTests.
Bug:
117074814
Bug:
116725094
Change-Id: I169cda4a1658b0a67cc7c7367b38d57a021e6953
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953
Bill Yi [Mon, 15 Oct 2018 19:34:57 +0000 (12:34 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I44be933d470fa7dad8e60b4ecb3dc038ff74c702
Youming Ye [Mon, 15 Oct 2018 17:59:04 +0000 (10:59 -0700)]
Merge "Fix error message shown when SIM PIN enable/disable fails" am:
f29392303a
am:
8bac59265e
Change-Id: If28ef5f32183918404896ed395a49c9c2d87067a
Youming Ye [Mon, 15 Oct 2018 17:42:52 +0000 (10:42 -0700)]
Merge "Fix error message shown when SIM PIN enable/disable fails"
am:
f29392303a
Change-Id: I060d7e0e02b56d9fea5260ba1f2cf8a1ea746414
Youming Ye [Mon, 15 Oct 2018 17:08:22 +0000 (17:08 +0000)]
Merge "Fix error message shown when SIM PIN enable/disable fails"
Bill Yi [Mon, 15 Oct 2018 10:42:41 +0000 (03:42 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
ebb0bbe3f7 -s ours
Change-Id: I0b288ed9e17d6598d7b20cc724ea88a42309d984
Bill Yi [Mon, 15 Oct 2018 08:55:17 +0000 (01:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id3ba67104115b2148f36fb26a94957ee6ac4a89d
Auto-generated-cl: translation import
Stanley Tng [Wed, 20 Jun 2018 22:32:02 +0000 (15:32 -0700)]
Add Feature Flag for Hearing Aid Profile
Using the Settings App-Developer Options-Feature Flag, allow the user to
enable or disable the Hearing Aid Profile.
Bug:
116725094
Bug:
116044083
Test: Manual testing using Settings App
Change-Id: I16b51d7feabc914219c24731eb39a23bd1782571
Merged-In: I16b51d7feabc914219c24731eb39a23bd1782571
(cherry picked from commit
068c2547f6f877273b09bf3ace5b4a4b61c7647a)
Brad Ebinger [Fri, 12 Oct 2018 23:07:09 +0000 (16:07 -0700)]
Merge "RadioInfo: Disable ims provisioning switches in USER-build" am:
61c5a296e6
am:
59eb9e9d90
Change-Id: Ia0f24f55c529b166cfcd2bba4ca7af85d2e70759
Brad Ebinger [Fri, 12 Oct 2018 23:03:02 +0000 (16:03 -0700)]
Merge "RadioInfo: Disable ims provisioning switches in USER-build"
am:
61c5a296e6
Change-Id: I3211ffb7e25af0e60ac20175bf86466ee4c85998
Brad Ebinger [Fri, 12 Oct 2018 22:46:21 +0000 (22:46 +0000)]
Merge "RadioInfo: Disable ims provisioning switches in USER-build"
OSDN Git Service
