OSDN Git Service
Jonathan Scott [Tue, 30 Apr 2019 14:52:52 +0000 (15:52 +0100)]
[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController.
Bug:
127605586
Test: Manual
Change-Id: Id85632b5e6975fc5f92d6e8126a6603a07f097e1
Bill Yi [Fri, 5 Apr 2019 19:44:47 +0000 (12:44 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I27c0efa466b676aafccb399704805959704fe165
Rich Cannings [Thu, 28 Mar 2019 21:15:33 +0000 (21:15 +0000)]
Merge "DO NOT MERGE Refactor passwords/pins/patterns to byte[]" into pi-dev
Bill Yi [Sun, 24 Mar 2019 22:43:53 +0000 (15:43 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id87c2f36401630b5a5e6b1537ec2a44340cadbec
Rich Cannings [Tue, 19 Feb 2019 21:15:30 +0000 (13:15 -0800)]
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
b27c4308a2ab839cff4f4751451440f6dc752e8e)
Fan Zhang [Fri, 8 Mar 2019 23:07:53 +0000 (15:07 -0800)]
[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
Change-Id: I501ba68b3f6691a627a8828aeca16d495ee52126
Fan Zhang [Fri, 8 Mar 2019 23:01:41 +0000 (15:01 -0800)]
[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
Change-Id: Icd4cf6000dd9d72f486417f1d11dde008d49c513
Fan Zhang [Fri, 8 Mar 2019 22:55:32 +0000 (14:55 -0800)]
[automerger] Do not allow draw on top for default sms picker. am:
95d0fb7f49 am:
b810aee20f am:
7a58589114 am:
7926131837 am:
d6bde3f5b8
am:
ba87cf7444
Change-Id: I3b3a2411f4be05e1b8f6ecfce3521c5932028038
Bill Yi [Fri, 22 Feb 2019 00:40:33 +0000 (16:40 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ibed56c778ac43fbfa0c4ca9973b894b9cf8e5f63
Android Build Merger (Role) [Wed, 20 Feb 2019 21:54:41 +0000 (21:54 +0000)]
[automerger] Do not allow draw on top for default sms picker. am:
95d0fb7f49 am:
b810aee20f am:
7a58589114 am:
7926131837 am:
d6bde3f5b8
Change-Id: I029a177108cbe0c6646b9c717e910266c9a5a410
Android Build Merger (Role) [Wed, 20 Feb 2019 21:54:39 +0000 (21:54 +0000)]
[automerger] Do not allow draw on top for default sms picker. am:
95d0fb7f49 am:
b810aee20f am:
7a58589114 am:
7926131837
Change-Id: I16c54cab9346d161d668dc4183ae4a9eb7117996
Android Build Merger (Role) [Wed, 20 Feb 2019 21:54:37 +0000 (21:54 +0000)]
[automerger] Do not allow draw on top for default sms picker. am:
95d0fb7f49 am:
b810aee20f am:
7a58589114
Change-Id: I9212ffd96f974268c0069e80e68347102967e7e5
Android Build Merger (Role) [Wed, 20 Feb 2019 21:54:34 +0000 (21:54 +0000)]
[automerger] Do not allow draw on top for default sms picker. am:
95d0fb7f49 am:
b810aee20f
Change-Id: Ic6e4308ee65a83e7d00801452323569301e65d66
Android Build Merger (Role) [Wed, 20 Feb 2019 21:54:31 +0000 (21:54 +0000)]
[automerger] Do not allow draw on top for default sms picker. am:
95d0fb7f49
Change-Id: I9466105a6de960efb4513d4e856450459aec2560
Fan Zhang [Fri, 15 Feb 2019 00:07:37 +0000 (16:07 -0800)]
Do not allow draw on top for default sms picker.
Fixes:
120484087
Test: manual
Change-Id: I4be265565678302fad207839216d5cd65dcb6e94
Merged-In: I4be265565678302fad207839216d5cd65dcb6e94
(cherry picked from commit
9d46e1fdfe1b70618c5a92c3e3461a4b379db236)
Bill Yi [Sat, 19 Jan 2019 19:34:19 +0000 (11:34 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ie074fc1d702ed2775866c82a126bd8efa8b2865b
Bill Yi [Sun, 13 Jan 2019 07:00:35 +0000 (23:00 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I8d9dbbd271f3d3eb6e889e213fc2cfa4a6546cbe
Bill Yi [Fri, 28 Dec 2018 21:41:40 +0000 (13:41 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I2fd8dffe12b55f223316b37c9c097194e7cf426f
Bill Yi [Sat, 22 Dec 2018 00:07:42 +0000 (16:07 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
118717573
Change-Id: Ifd74addec939651ce1aafca0d422f7fb65553a3a
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
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
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
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 [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 12:15:12 +0000 (04:15 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ie15195c81e11f67f4bd72be18c6af0d273666ceb
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
Lei Yu [Thu, 25 Oct 2018 19:58:53 +0000 (19:58 +0000)]
Merge "Add entitlement check for usb tethering" into pi-dev
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 [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
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 19:34:57 +0000 (12:34 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I44be933d470fa7dad8e60b4ecb3dc038ff74c702
TreeHugger Robot [Wed, 10 Oct 2018 17:46:55 +0000 (17:46 +0000)]
Merge "Add null check for vrManager" into pi-dev
TreeHugger Robot [Tue, 2 Oct 2018 20:30:17 +0000 (20:30 +0000)]
Merge "Fix Connect State message in Device details for Hearing Aids" into pi-dev
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.
Bug:
116725094
Bug:
117074814
Test: Manual tests and also ran RunSettingsLibRoboTests and RunSettingsRoboTests.
Change-Id: I169cda4a1658b0a67cc7c7367b38d57a021e6953
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953
TreeHugger Robot [Tue, 2 Oct 2018 00:53:40 +0000 (00:53 +0000)]
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
Bill Yi [Sat, 29 Sep 2018 21:09:31 +0000 (14:09 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I6d821fb3a3ccf99fa8f11e165773772ded38b608
TreeHugger Robot [Fri, 28 Sep 2018 19:00:35 +0000 (19:00 +0000)]
Merge "Refresh subscription info when subid changes" into pi-dev
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)
timhypeng [Fri, 25 May 2018 06:01:02 +0000 (14:01 +0800)]
To show hearing aids device in the available devices group
Bug:
116725094
Bug:
116044083
Bug:
79553082
Test: make -j50 RunSettingsRoboTests
Change-Id: I8fe5eb653d332ef5ac4a566146f150774581167c
Merged-In: I8fe5eb653d332ef5ac4a566146f150774581167c
(cherry picked from commit
1c21bff1034b5124b69bda22c2fc9f70a449ffa7)
Fan Zhang [Fri, 27 Jul 2018 23:16:43 +0000 (16:16 -0700)]
Clean up task affinity.
If activity is launched through external intent, back button should just
go back to previous screen.
Change-Id: I5b2e57d2751f5ed7c17140d3eb8d54736b78053c
Merged-In: I5b2e57d2751f5ed7c17140d3eb8d54736b78053c
Bug:
112254258
Fixes:
111864355
Test: manual
Rick Yiu [Tue, 28 Aug 2018 06:06:46 +0000 (14:06 +0800)]
Add null check for vrManager
If VrManagerService is not started, vrManager will be null. Need
add check for it.
Test: robotests
Bug:
116427118
Change-Id: I899337bb5a996efffe82970fa690f2c5d59c1bb5
Merged-In: I899337bb5a996efffe82970fa690f2c5d59c1bb5
Bill Yi [Sat, 22 Sep 2018 18:38:37 +0000 (11:38 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I4317549e4010bb2cf75b07ade3cb8d54ba6dc708
Bill Yi [Mon, 17 Sep 2018 19:35:35 +0000 (12:35 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I0c4b9cded799380c969e2acf1aac3c5a785dc81f
Bill Yi [Wed, 12 Sep 2018 19:07:42 +0000 (12:07 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I6f84ca21470e0f9224b2c038b25757f70ff25c8a
Jordan Liu [Tue, 14 Aug 2018 23:52:07 +0000 (16:52 -0700)]
Refresh subscription info when subid changes
We store the initial subId and check if it has changed so that we always
have the updated subscription info in fillList().
Fixes:
111731641
Test: manually verify that swapping the SIM loads new APNs
Change-Id: I3475915f2c380fb67b2e56436423d491e489d91e
Merged-In: I29492ef016c8ca9836ecf28c787e441629cfecb0
Bill Yi [Sun, 9 Sep 2018 01:11:46 +0000 (18:11 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I77779e462781ec27ccf1122e7dcac6fd170cad5f
jackqdyulei [Fri, 7 Sep 2018 17:51:10 +0000 (10:51 -0700)]
[automerger skipped] Update PBAP info for all pairing dialogs. DO NOT MERGE am:
ff171eff8e am:
618b808b61
am:
c05958ecdd -s ours
Change-Id: I57dfe29eff8188f32d64d003781d4b63b4d151ad
jackqdyulei [Fri, 7 Sep 2018 17:46:08 +0000 (10:46 -0700)]
Update PBAP info for all pairing dialogs. DO NOT MERGE am:
ff171eff8e
am:
618b808b61
Change-Id: Id92a02a67661e0b7707564b7d83a7ff7f27854e1
jackqdyulei [Fri, 7 Sep 2018 17:42:16 +0000 (10:42 -0700)]
Update PBAP info for all pairing dialogs. DO NOT MERGE
am:
ff171eff8e
Change-Id: I21d048a1ad2d0e37870d380c30e95ee8e3a48091
TreeHugger Robot [Fri, 7 Sep 2018 01:05:45 +0000 (01:05 +0000)]
Merge "Move safety & regulatory manual closer to legal settings" into pi-dev
jackqdyulei [Tue, 19 Jun 2018 23:52:07 +0000 (16:52 -0700)]
Update PBAP info for all pairing dialogs. DO NOT MERGE
This is a bug from ag/
4210612, in which it only update PBAP info
for USER_ENTRY_DIALOG. So in other kind of dialogs it never upload
correct PBAP info to bluetooth backend.
This CL fix it by updating PBAP for all dialogs.
Change-Id: Ia39eee1acaece555e8e5a305ec2c803294d7efbd
Merged-In: Ia39eee1acaece555e8e5a305ec2c803294d7efbd
Bug:
109842273
Bug:
72872376
Test: RunSettingsRoboTests
(cherry picked from commit
7015e20a554fd7f8f7ded7359a5ecc13a82a0464)
Fan Zhang [Thu, 6 Sep 2018 19:21:30 +0000 (12:21 -0700)]
Move safety & regulatory manual closer to legal settings
Bug:
113788849
Test: visual
Change-Id: Ie9a706bad9a4c65ff06c2350171ad55f46dd8386
Merged-In: Ie9a706bad9a4c65ff06c2350171ad55f46dd8386
TreeHugger Robot [Thu, 6 Sep 2018 20:00:37 +0000 (20:00 +0000)]
Merge "Update PBAP info for all pairing dialogs. DO NOT MERGE" into pi-dev
Bill Yi [Fri, 31 Aug 2018 02:02:59 +0000 (19:02 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I6b44e763661339eab9182743abd1e3cb4d8bdbcd
Bill Yi [Sat, 25 Aug 2018 23:44:47 +0000 (16:44 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I3e4f6e468679eec2ad1d8b821115e686e5a4c19a
jackqdyulei [Tue, 19 Jun 2018 23:52:07 +0000 (16:52 -0700)]
Update PBAP info for all pairing dialogs. DO NOT MERGE
This is a bug from ag/
4210612, in which it only update PBAP info
for USER_ENTRY_DIALOG. So in other kind of dialogs it never upload
correct PBAP info to bluetooth backend.
This CL fix it by updating PBAP for all dialogs.
Change-Id: Ia39eee1acaece555e8e5a305ec2c803294d7efbd
Bug:
109842273
Bug:
72872376
Test: RunSettingsRoboTests
(cherry picked from commit
7015e20a554fd7f8f7ded7359a5ecc13a82a0464)
Adrian Roos [Tue, 21 Aug 2018 18:25:47 +0000 (20:25 +0200)]
DO NOT MERGE leverage default_theme string for display_cutout_emulation_device_default
Bug:
112876936
Test: manual
Change-Id: I1a41b96f9f19a5d5854eb1cce214616e303ca4f9
TreeHugger Robot [Tue, 21 Aug 2018 20:49:37 +0000 (20:49 +0000)]
Merge "Cutout emulation: string changes and ordering" into pi-dev
Adrian Roos [Tue, 21 Aug 2018 16:26:29 +0000 (18:26 +0200)]
Cutout emulation: string changes and ordering
Updates strings according to spec. Also ensures
that the emulation overlays are shown in the
order of their priority.
Bug:
112876936
Test: Open developer options, go to "display cutout", verify strings.
Change-Id: If2d05595d02a277896202ab2a6262c99508a3a17
Merged-In: If2d05595d02a277896202ab2a6262c99508a3a17
TreeHugger Robot [Fri, 17 Aug 2018 18:04:44 +0000 (18:04 +0000)]
Merge "Fix memory leaks in Settings" into pi-dev
TreeHugger Robot [Thu, 16 Aug 2018 21:23:17 +0000 (21:23 +0000)]
Merge "Hide SettingsSlice provider" into pi-dev
Matthew Fritze [Mon, 30 Jul 2018 21:12:50 +0000 (14:12 -0700)]
Hide SettingsSlice provider
Explicitly set the Settings SliceBroadcastReceiver to
be non-exported and remove the intent-filter.
Add a second provider: SliceRelayReceiver to receive
broadcasts from SysUI to alert Settings to potential
changes to bound Settings Slices. The new receiver is
exported, but only notifies changes to Settings, and
doesn't make any changes itself.
Change-Id: I422c0b07a61efa8996e9fdfa398eee84bbc1796f
Merged-In: I80d070f7636614135ebe4f57a16f12a3eb6dee81
Fixes:
111330641
Test: boot, robolectric, Slicebrowser
Doris Ling [Thu, 9 Aug 2018 22:32:03 +0000 (15:32 -0700)]
[automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev am:
62158f0943 -s ours am:
2ef0e15b66 -s ours
am:
bea56da7d6 -s ours
Change-Id: I60cf60a6158d8c498b6b1f2a67b88c10ebb7e072
Doris Ling [Thu, 9 Aug 2018 22:26:36 +0000 (15:26 -0700)]
[automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev am:
62158f0943 -s ours
am:
2ef0e15b66 -s ours
Change-Id: I3c13ee22f6e19d1ba45dd9fc34489d45c887ef35
Doris Ling [Thu, 9 Aug 2018 22:19:19 +0000 (15:19 -0700)]
[automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev
am:
62158f0943 -s ours
Change-Id: I892834c6c0655f40954ee94d98b29ac271b3de4c
TreeHugger Robot [Thu, 9 Aug 2018 21:51:32 +0000 (21:51 +0000)]
Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev
Doris Ling [Thu, 9 Aug 2018 20:08:34 +0000 (13:08 -0700)]
[automerger skipped] Merge "Disable changing lock when device is not provisioned." into oc-mr1-dev
am:
38b9504a41 -s ours
Change-Id: I4b2ec56d290a83730e111012dd5ab02855860c27
TreeHugger Robot [Thu, 9 Aug 2018 19:47:07 +0000 (19:47 +0000)]
Merge "Disable changing lock when device is not provisioned." into oc-mr1-dev
Doris Ling [Thu, 9 Aug 2018 19:14:46 +0000 (12:14 -0700)]
Merge changes from topic "am-
c29676a7-0c49-4630-a71f-
e8774428272f-nyc-mr1-dev" into oc-dev am:
197a10b053 am:
9245b98d0f
am:
4a6da68af7
Change-Id: Iaa83729685f24a2504b9142c17f87452ac1d9d85
Doris Ling [Thu, 9 Aug 2018 19:13:30 +0000 (12:13 -0700)]
Merge changes from topic "am-
cffdd762-a2a7-44ac-bcee-
f8a14942d37e" into oc-dev am:
528be61eeb am:
78a7ee2f10
am:
d1146af517
Change-Id: Ic63e27409f0e1b5fe3c4cb9d152c50d9f1cef351
Doris Ling [Thu, 9 Aug 2018 19:11:59 +0000 (12:11 -0700)]
[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped:
94ea2dad5b am:
3672a1fe7f am:
cff5200146
am:
0f0147213e -s ours
Change-Id: I65bcaaf997de93f005d331a1df0e396792906ff0
Doris Ling [Thu, 9 Aug 2018 19:06:31 +0000 (12:06 -0700)]
Merge changes from topic "am-
c29676a7-0c49-4630-a71f-
e8774428272f-nyc-mr1-dev" into oc-dev am:
197a10b053
am:
9245b98d0f
Change-Id: Ia674ef3fc7eb8042c58ca3da03ecb8b08df91eed
Doris Ling [Thu, 9 Aug 2018 19:05:08 +0000 (12:05 -0700)]
Merge changes from topic "am-
cffdd762-a2a7-44ac-bcee-
f8a14942d37e" into oc-dev am:
528be61eeb
am:
78a7ee2f10
Change-Id: I82960fb637152698cb676fae82862408b1a2db75
Doris Ling [Thu, 9 Aug 2018 19:03:48 +0000 (12:03 -0700)]
[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped:
94ea2dad5b am:
3672a1fe7f
am:
cff5200146
Change-Id: I44df485b49098b69371d1248067e51559dcd4964
Doris Ling [Thu, 9 Aug 2018 19:02:34 +0000 (12:02 -0700)]
Merge changes from topic "am-
c29676a7-0c49-4630-a71f-
e8774428272f-nyc-mr1-dev" into oc-dev
am:
197a10b053
Change-Id: I398a80b0e514f9c2439b3852996a4190b0d32b96
Doris Ling [Thu, 9 Aug 2018 19:00:42 +0000 (12:00 -0700)]
Merge changes from topic "am-
cffdd762-a2a7-44ac-bcee-
f8a14942d37e" into oc-dev
am:
528be61eeb
Change-Id: I8ee97a35c41ef54dde584ddd61b2afea577a9ad3
Doris Ling [Thu, 9 Aug 2018 18:58:38 +0000 (11:58 -0700)]
[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped:
94ea2dad5b
am:
3672a1fe7f
Change-Id: Ia9b1b5a4dee46b3a66b21080b54b6f9b92629c0f
TreeHugger Robot [Thu, 9 Aug 2018 18:43:34 +0000 (18:43 +0000)]
Merge changes from topic "am-
c29676a7-0c49-4630-a71f-
e8774428272f-nyc-mr1-dev" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
cd0b97e86f am:
d98908e7c7
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
cd0b97e86f
DO NOT MERGE Disable changing lock when device is not provisioned.
TreeHugger Robot [Thu, 9 Aug 2018 18:43:34 +0000 (18:43 +0000)]
Merge changes from topic "am-
c29676a7-0c49-4630-a71f-
e8774428272f-nyc-mr1-dev" into cw-f-dev
* changes:
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
cd0b97e86f
DO NOT MERGE Disable changing lock when device is not provisioned.
TreeHugger Robot [Thu, 9 Aug 2018 18:43:34 +0000 (18:43 +0000)]
Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into nyc-mr1-dev
TreeHugger Robot [Thu, 9 Aug 2018 18:43:34 +0000 (18:43 +0000)]
Merge changes from topic "am-
c29676a7-0c49-4630-a71f-
e8774428272f-nyc-mr1-dev" into oc-dev
* changes:
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
cd0b97e86f am:
d98908e7c7 skipped:
3503445e59
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
cd0b97e86f am:
d98908e7c7
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
cd0b97e86f
DO NOT MERGE Disable changing lock when device is not provisioned.
TreeHugger Robot [Thu, 9 Aug 2018 18:34:12 +0000 (18:34 +0000)]
Merge changes from topic "am-
cffdd762-a2a7-44ac-bcee-
f8a14942d37e" into oc-dev
* changes:
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
c624deaff5 am:
c056ac3011 am:
782fc16dc4 am:
aaa67659a6 skipped:
1b622b07be
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
c624deaff5 am:
c056ac3011 am:
782fc16dc4 am:
aaa67659a6
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
c624deaff5 am:
c056ac3011 am:
782fc16dc4
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
c624deaff5 am:
c056ac3011
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
c624deaff5
DO NOT MERGE Disable changing lock when device is not provisioned.
TreeHugger Robot [Thu, 9 Aug 2018 18:34:12 +0000 (18:34 +0000)]
Merge changes from topic "am-
cffdd762-a2a7-44ac-bcee-
f8a14942d37e" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
c624deaff5 am:
c056ac3011 am:
782fc16dc4 am:
aaa67659a6
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
c624deaff5 am:
c056ac3011 am:
782fc16dc4
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
c624deaff5 am:
c056ac3011
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
c624deaff5
DO NOT MERGE Disable changing lock when device is not provisioned.
Fan Zhang [Thu, 7 Jun 2018 18:33:48 +0000 (11:33 -0700)]
Fix memory leaks in Settings
Bug:
80507279
Test: inspected hprof before and after fix
Change-Id: I6ea2925695deb6261263649e858484e1667ec522
Merged-In: I6ea2925695deb6261263649e858484e1667ec522
Android Build Merger (Role) [Fri, 3 Aug 2018 21:04:11 +0000 (21:04 +0000)]
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
c624deaff5 am:
c056ac3011 am:
782fc16dc4 am:
aaa67659a6 skipped:
1b622b07be
Change-Id: I2755a79cc942e8dc063f3a420e0ed02817959cec
Android Build Merger (Role) [Fri, 3 Aug 2018 21:04:09 +0000 (21:04 +0000)]
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
c624deaff5 am:
c056ac3011 am:
782fc16dc4 am:
aaa67659a6
Change-Id: I9c1ba2599a78d6518531a2bff2b899eecb3b6554
Android Build Merger (Role) [Fri, 3 Aug 2018 21:04:08 +0000 (21:04 +0000)]
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
c624deaff5 am:
c056ac3011 am:
782fc16dc4
Change-Id: Ic801ec29d08cf8600e3f04cd9b311d6fbbb315a8
Android Build Merger (Role) [Fri, 3 Aug 2018 21:04:06 +0000 (21:04 +0000)]
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
c624deaff5 am:
c056ac3011
Change-Id: If73d439ccad4d5a317de59de48427e6f406f1fa2
Android Build Merger (Role) [Fri, 3 Aug 2018 21:04:04 +0000 (21:04 +0000)]
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am:
c624deaff5
Change-Id: I8b74b9105db55d8b8cdb3f7bc7b8b42ee9998de8
Doris Ling [Thu, 2 Aug 2018 00:24:34 +0000 (17:24 -0700)]
DO NOT MERGE Disable changing lock when device is not provisioned.
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- remove the search panel from settings home page
Bug:
110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
Doris Ling [Thu, 2 Aug 2018 00:24:34 +0000 (17:24 -0700)]
DO NOT MERGE Disable changing lock when device is not provisioned.
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- set display search menu to false
- disallow update to display the search menu
Bug:
110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
Merged-In: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
OSDN Git Service
