Bill Yi
fe385f4a14
[automerger skipped] Import translations. DO NOT MERGE
...
am: 935509aa3d
2018-11-02 21:26:36 -07:00
Bill Yi
935509aa3d
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ic830e9dc65c715010b562f0148821899114de819
2018-11-02 15:27:05 -07:00
Lei Yu
73c361b544
Revert "resolve merge conflicts of 7849607a7c to pi-dev-plus-aosp"
...
This reverts commit e81224d80c
2018-10-29 20:35:24 +00:00
Lei Yu
e81224d80c
resolve merge conflicts of 7849607a7c to pi-dev-plus-aosp
...
Bug: 115707279
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ifd8f2c090ccd9eadbc7b789b927550bce732f1d1
Merged-In: I3d2ebad2879479a870bcdfe596bb88b83c424389
2018-10-25 14:25:21 -07:00
Lei Yu
7849607a7c
Merge "Add entitlement check for usb tethering" into pi-dev
2018-10-25 19:58:53 +00:00
Bill Yi
816e75fbc3
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 8b16aba0dd -s ours
...
am: 27e14db009
2018-10-24 18:53:10 -07:00
Bill Yi
27e14db009
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
...
am: 8b16aba0dd
2018-10-24 16:31:58 -07:00
Bill Yi
8b16aba0dd
Merge pie-platform-release to aosp-master - DO NOT MERGE
...
Change-Id: Id291dd4e424711a8cb39927b9733214b92b81d78
2018-10-24 14:47:27 -07:00
Bill Yi
30984acbe3
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
...
am: 851a72f941
2018-10-24 10:45:20 -07:00
Bill Yi
851a72f941
Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
...
Change-Id: Ia33547dfec9adf4000d3ed2665f2c3804be97071
2018-10-24 09:07:12 -07:00
Fan Zhang
4c95f60b9e
Merge "Fix toast is covered by PIN code screen after wrong pin" am: d5abc0eb44
...
am: c150f5eb29
2018-10-23 19:30:39 -07:00
Fan Zhang
c150f5eb29
Merge "Fix toast is covered by PIN code screen after wrong pin"
...
am: d5abc0eb44
2018-10-23 19:24:29 -07:00
Fan Zhang
d5abc0eb44
Merge "Fix toast is covered by PIN code screen after wrong pin"
2018-10-24 02:16:57 +00:00
Hao Zhao
754930bc50
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
2018-10-24 06:39:45 +09:00
Bill Yi
58f707d162
Merge pi-dr1-dev to aosp-master am: c1fe9e6ac2
...
am: 89e733ee2c
2018-10-19 15:17:08 -07:00
Bill Yi
89e733ee2c
Merge pi-dr1-dev to aosp-master
...
am: c1fe9e6ac2
2018-10-19 15:00:40 -07:00
Bill Yi
c1fe9e6ac2
Merge pi-dr1-dev to aosp-master
...
Change-Id: I0cf933755a46ad6071cb085120a4b1b1c5d1976c
2018-10-19 12:20:48 -07:00
Hall Liu
322091c7eb
Merge "Start using CarrierConfig for 4G/LTE icon" am: 558535f3f2
...
am: e419904aa0
2018-10-18 15:31:05 -07:00
Hall Liu
e419904aa0
Merge "Start using CarrierConfig for 4G/LTE icon"
...
am: 558535f3f2
2018-10-18 14:56:56 -07:00
Hall Liu
558535f3f2
Merge "Start using CarrierConfig for 4G/LTE icon"
2018-10-18 20:36:06 +00:00
Stanley Tng
0a6d538879
[automerger skipped] resolve merge conflicts of b0e99e1472 to stage-aosp-master
...
am: 81edd9a286
2018-10-17 18:23:18 -07:00
Stanley Tng
81edd9a286
resolve merge conflicts of b0e99e1472 to stage-aosp-master
...
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ife619e714d451b6cb77bfaf50e3f45c969d37cb4
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953
2018-10-17 18:14:27 +00:00
Bill Yi
8744027668
[automerger skipped] Import translations. DO NOT MERGE
...
am: f896493c70
2018-10-16 23:24:58 -07:00
Treehugger Robot
b0e99e1472
Merge "Fix Connect State message in Device details for Hearing Aids"
2018-10-17 04:48:36 +00:00
Bill Yi
f896493c70
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 117801752
Change-Id: I43766c0d85af44370fa136fb4b54869ccfb9bdb4
2018-10-17 04:32:19 +00:00
Stanley Tng
0cc7d9a2af
resolve merge conflicts of a8af2d3664 to pi-dev-plus-aosp
...
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie95fe77f761197dee450e86bc0f7edba8d514959
Merged-In: I16b51d7feabc914219c24731eb39a23bd1782571
2018-10-16 15:31:00 +00:00
Stanley Tng
a8af2d3664
resolve merge conflicts of 019a771d2d to stage-aosp-master
...
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I2fc36f4ee9a600e7e9c5ce00708736a4d4548358
2018-10-15 17:30:02 -07:00
jackqdyulei
820e22d324
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
2018-10-15 16:58:21 -07:00
Bill Yi
dce00f9ae2
[automerger skipped] Import translations. DO NOT MERGE
...
am: 2a1a5cba81
2018-10-15 16:27:31 -07:00
Treehugger Robot
019a771d2d
Merge "Add Feature Flag for Hearing Aid Profile"
2018-10-15 23:10:41 +00:00
Stanley Tng
a6c927b51a
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
2018-10-15 22:51:02 +00:00
Bill Yi
2a1a5cba81
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I44be933d470fa7dad8e60b4ecb3dc038ff74c702
2018-10-15 12:34:57 -07:00
Youming Ye
6293483fce
Merge "Fix error message shown when SIM PIN enable/disable fails" am: f29392303a
...
am: 8bac59265e
2018-10-15 10:59:04 -07:00
Youming Ye
8bac59265e
Merge "Fix error message shown when SIM PIN enable/disable fails"
...
am: f29392303a
2018-10-15 10:42:52 -07:00
Youming Ye
f29392303a
Merge "Fix error message shown when SIM PIN enable/disable fails"
2018-10-15 17:08:22 +00:00
Bill Yi
31398ce165
[automerger skipped] Import translations. DO NOT MERGE
...
am: ebb0bbe3f7
2018-10-15 03:42:41 -07:00
Bill Yi
ebb0bbe3f7
Import translations. DO NOT MERGE
...
Change-Id: Id3ba67104115b2148f36fb26a94957ee6ac4a89d
Auto-generated-cl: translation import
2018-10-15 01:55:17 -07:00
Stanley Tng
a4fc23140a
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 068c2547f6
2018-10-13 16:21:15 -07:00
Brad Ebinger
be94f07e8d
Merge "RadioInfo: Disable ims provisioning switches in USER-build" am: 61c5a296e6
...
am: 59eb9e9d90
2018-10-12 16:07:09 -07:00
Brad Ebinger
59eb9e9d90
Merge "RadioInfo: Disable ims provisioning switches in USER-build"
...
am: 61c5a296e6
2018-10-12 16:03:02 -07:00
Brad Ebinger
61c5a296e6
Merge "RadioInfo: Disable ims provisioning switches in USER-build"
2018-10-12 22:46:21 +00:00
Takamasa Kuramitsu
7cb8223ce2
Merge "Move content later button doesn't work on Migration Wizard" am: 1308b56908
...
am: d77dfa200e
2018-10-12 14:14:33 -07:00
Takamasa Kuramitsu
d77dfa200e
Merge "Move content later button doesn't work on Migration Wizard"
...
am: 1308b56908
2018-10-12 14:07:25 -07:00
Treehugger Robot
1308b56908
Merge "Move content later button doesn't work on Migration Wizard"
2018-10-12 20:52:31 +00:00
Neil Fuller
92982f7167
Merge "Remove explicit dependency on bouncycastle" am: ed21203ea3
...
am: 6767ce9d24
2018-10-12 03:36:17 -07:00
Neil Fuller
6767ce9d24
Merge "Remove explicit dependency on bouncycastle"
...
am: ed21203ea3
2018-10-12 03:31:10 -07:00
Neil Fuller
ed21203ea3
Merge "Remove explicit dependency on bouncycastle"
2018-10-12 10:18:22 +00:00
Neil Fuller
d0821ca8c7
Remove explicit dependency on bouncycastle
...
The dependency is unnecessary once bouncycastle
is included in the "standard libraries".
Test: build
Bug: 113148576
Change-Id: I057bb0e277220389db3c77b1035044d93f35432a
2018-10-11 17:02:36 +01:00
Rick Yiu
31e062e640
Merge "Add null check for vrManager" into pi-dev
...
am: c9e2d80ade
2018-10-10 11:07:11 -07:00
TreeHugger Robot
c9e2d80ade
Merge "Add null check for vrManager" into pi-dev
2018-10-10 17:46:55 +00:00
