Ahming Chen
9804cf5b7d
Revert "DO NOT MERGE Refactor passwords/pins/patterns to byte[]"
...
This reverts commit 34042bbf1d
2019-05-03 10:23:05 +00:00
android-build-team Robot
feddc93ab6
Snap for 5443865 from 83d678bdc4 to pi-qpr3-b-release
...
Change-Id: I2a91bc8fc571563e2d90a88da091b3916d07c44f
2019-04-07 21:08:16 +00:00
Bill Yi
83d678bdc4
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I27c0efa466b676aafccb399704805959704fe165
2019-04-05 12:44:47 -07:00
android-build-team Robot
468a189129
Snap for 5422807 from 5d9189fab2 to pi-qpr3-b-release
...
Change-Id: Iffef7cc1a559bae689f7d1a6e91cfcd7d835dc3b
2019-03-31 21:10:41 +00:00
Rich Cannings
5d9189fab2
Merge "DO NOT MERGE Refactor passwords/pins/patterns to byte[]" into pi-dev
2019-03-28 21:15:33 +00:00
android-build-team Robot
56cbe0bb50
Snap for 5408106 from e6d11ed962 to pi-qpr3-b-release
...
Change-Id: I0edf56b1eb9e991b541850f291ef6504f6790a2f
2019-03-26 21:05:34 +00:00
Bill Yi
e6d11ed962
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Id87c2f36401630b5a5e6b1537ec2a44340cadbec
2019-03-24 15:43:53 -07:00
Rich Cannings
34042bbf1d
DO NOT MERGE Refactor passwords/pins/patterns to byte[]
...
Relating to packages/apps/Settings
Bug: 120484642
Test: manual - test setting and unlocking passwords/pins/patterns.
automated - atest packages/apps/Settings/tests/robotests/src/com/android/settings/password/
Change-Id: Idec8338d141c185bef67ade12035fdb2fa9d17ea
(cherry picked from commit b27c4308a2
2019-03-19 11:15:14 -07:00
android-build-team Robot
e7fbf98e1f
Snap for 5363709 from 1b29c28aef to pi-qpr3-b-release
...
Change-Id: I2e593b097e6b96acb34bf137771685b2a875bfba
2019-03-10 21:09:22 +00:00
Fan Zhang
1b29c28aef
[automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f am: 7a58589114 am: 7926131837 am: d6bde3f5b8 am: ba87cf7444 am: 9366d11e6d
...
am: 657f8713ff
2019-03-08 15:07:53 -08:00
Fan Zhang
657f8713ff
[automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f am: 7a58589114 am: 7926131837 am: d6bde3f5b8 am: ba87cf7444
...
am: 9366d11e6d
2019-03-08 15:01:41 -08:00
Fan Zhang
9366d11e6d
[automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f am: 7a58589114 am: 7926131837 am: d6bde3f5b8
...
am: ba87cf7444
2019-03-08 14:55:32 -08:00
android-build-team Robot
25aa39eeb2
Snap for 5335558 from 02681df33f to pi-qpr3-b-release
...
Change-Id: I092e92d261ea159aa836a0b9ccff8f0e4a005b8f
2019-02-26 06:09:41 +00:00
Bill Yi
02681df33f
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ibed56c778ac43fbfa0c4ca9973b894b9cf8e5f63
2019-02-21 16:40:33 -08:00
Android Build Merger (Role)
ba87cf7444
[automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f am: 7a58589114 am: 7926131837 am: d6bde3f5b8
...
Change-Id: I029a177108cbe0c6646b9c717e910266c9a5a410
2019-02-20 21:54:41 +00:00
Android Build Merger (Role)
d6bde3f5b8
[automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f am: 7a58589114 am: 7926131837
...
Change-Id: I16c54cab9346d161d668dc4183ae4a9eb7117996
2019-02-20 21:54:39 +00:00
Android Build Merger (Role)
7926131837
[automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f am: 7a58589114
...
Change-Id: I9212ffd96f974268c0069e80e68347102967e7e5
2019-02-20 21:54:37 +00:00
Android Build Merger (Role)
7a58589114
[automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49 am: b810aee20f
...
Change-Id: Ic6e4308ee65a83e7d00801452323569301e65d66
2019-02-20 21:54:34 +00:00
Android Build Merger (Role)
b810aee20f
[automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49
...
Change-Id: I9466105a6de960efb4513d4e856450459aec2560
2019-02-20 21:54:31 +00:00
Fan Zhang
95d0fb7f49
Do not allow draw on top for default sms picker.
...
Fixes: 120484087
Test: manual
Change-Id: I4be265565678302fad207839216d5cd65dcb6e94
Merged-In: I4be265565678302fad207839216d5cd65dcb6e94
(cherry picked from commit 9d46e1fdfe
2019-02-20 13:53:51 -08:00
Bill Yi
e60e0d2291
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ie074fc1d702ed2775866c82a126bd8efa8b2865b
2019-01-19 11:34:19 -08:00
Bill Yi
e18f734843
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I8d9dbbd271f3d3eb6e889e213fc2cfa4a6546cbe
2019-01-12 23:00:35 -08:00
Bill Yi
9e39db9d62
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I2fd8dffe12b55f223316b37c9c097194e7cf426f
2018-12-28 13:41:40 -08:00
Bill Yi
05cf17a925
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 118717573
Change-Id: Ifd74addec939651ce1aafca0d422f7fb65553a3a
2018-12-21 16:07:42 -08:00
Fan Zhang
b232d21e3d
[automerger skipped] Hide quicksetting tile for dev options when it's turned off am: 73469d9de1 am: eeaff5deeb -s ours
...
am: 622444d488
2018-11-20 02:43:38 -08:00
Fan Zhang
622444d488
[automerger skipped] Hide quicksetting tile for dev options when it's turned off am: 73469d9de1
...
am: eeaff5deeb
2018-11-20 02:34:38 -08:00
Fan Zhang
eeaff5deeb
Hide quicksetting tile for dev options when it's turned off
...
am: 73469d9de1
2018-11-20 02:28:15 -08:00
Fan Zhang
cb560b65f5
[automerger skipped] Hide quicksetting tile for dev options when it's turned off
...
am: 04f1e38dc3
2018-11-19 22:38:50 -08:00
TreeHugger Robot
4c16ad5abf
Merge "Hide quicksetting tile for dev options when it's turned off" into pi-dev
2018-11-20 05:00:03 +00:00
TreeHugger Robot
1ba1a70dfb
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-11-14 00:49:33 +00:00
Bill Yi
0301470757
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ic00cbf2b25c019d77c85c93203e58f4a1cf102c1
2018-11-13 14:42:50 -08:00
Fan Zhang
4220b1e50c
Hide quicksetting tile for dev options when it's turned off
...
Merged-In: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Change-Id: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Fixes: 78652607
Bug: 117770924
Test: robotests
2018-11-13 09:22:06 +08:00
Edgar Wang
96d829be9a
Merge "Move "About Phone" to bottom of Settings main IA, above "Tips & Support"" into pi-dev
2018-11-13 01:16:48 +00:00
Fan Zhang
73469d9de1
Hide quicksetting tile for dev options when it's turned off
...
Merged-In: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Change-Id: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Fixes: 78652607
Bug: 117770924
Test: robotests
2018-11-12 20:25:51 +08:00
Fan Zhang
04f1e38dc3
Hide quicksetting tile for dev options when it's turned off
...
Merged-In: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Change-Id: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Fixes: 78652607
Bug: 117770924
Test: robotests
2018-11-12 19:52:32 +08:00
Edgar Wang
bea5b289ff
Move "About Phone" to bottom of Settings main IA, above "Tips & Support"
...
Merged-In: I0a0f03bdb27d9eea48eb758496eefeebcbc57b6c
Change-Id: If839a7199992104cc0abac9327844145d148cd68
Fixes: 118168552
Test: robotests
2018-11-09 11:24:48 +08:00
Fan Zhang
0eea3b6c9e
Merge "DO NOT MERGE Fix summary text for advanced button." into pi-dev
2018-11-07 20:44:59 +00:00
Fan Zhang
d9c6692f25
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
2018-11-06 23:47:24 +00:00
Bill Yi
222dca5b7c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ie15195c81e11f67f4bd72be18c6af0d273666ceb
2018-11-06 04:15:12 -08: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
7849607a7c
Merge "Add entitlement check for usb tethering" into pi-dev
2018-10-25 19:58:53 +00:00
Doris Ling
03fb1a93ca
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
2018-10-23 18:36:47 +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
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
2a1a5cba81
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I44be933d470fa7dad8e60b4ecb3dc038ff74c702
2018-10-15 12:34:57 -07:00
TreeHugger Robot
c9e2d80ade
Merge "Add null check for vrManager" into pi-dev
2018-10-10 17:46:55 +00:00
TreeHugger Robot
31703ca227
Merge "Fix Connect State message in Device details for Hearing Aids" into pi-dev
2018-10-02 20:30:17 +00:00
Stanley Tng
69e1bb1cf3
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.
Bug: 116725094
Bug: 117074814
Test: Manual tests and also ran RunSettingsLibRoboTests and RunSettingsRoboTests.
Change-Id: I169cda4a1658b0a67cc7c7367b38d57a021e6953
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953
2018-10-02 00:55:19 +00:00
TreeHugger Robot
f9658e13bb
Merge changes from topic "hearing-aid" into pi-dev
...
* changes:
Add Feature Flag for Hearing Aid Profile
To show hearing aids device in the available devices group
2018-10-02 00:53:40 +00:00
Bill Yi
0b7858e7d9
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6d821fb3a3ccf99fa8f11e165773772ded38b608
2018-09-29 14:09:31 -07:00
