OSDN Git Service

android-x86/packages-apps-Settings.git
5 years agoImport translations. DO NOT MERGE
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

5 years agoImport translations. DO NOT MERGE
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

5 years agoMerge "Add null check for vrManager" into pi-dev
TreeHugger Robot [Wed, 10 Oct 2018 17:46:55 +0000 (17:46 +0000)]
Merge "Add null check for vrManager" into pi-dev

5 years agoMerge "Fix Connect State message in Device details for Hearing Aids" 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

5 years agoFix Connect State message in Device details for Hearing Aids
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

5 years agoMerge changes from topic "hearing-aid" into pi-dev
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

5 years agoImport translations. DO NOT MERGE
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

5 years agoMerge "Refresh subscription info when subid changes" into pi-dev
TreeHugger Robot [Fri, 28 Sep 2018 19:00:35 +0000 (19:00 +0000)]
Merge "Refresh subscription info when subid changes" into pi-dev

5 years agoAdd Feature Flag for Hearing Aid Profile
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)

5 years agoTo show hearing aids device in the available devices group
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)

5 years agoClean up task affinity.
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

5 years agoAdd null check for vrManager
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

5 years agoImport translations. DO NOT MERGE
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

5 years agoImport translations. DO NOT MERGE
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

5 years agoImport translations. DO NOT MERGE
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

5 years agoRefresh subscription info when subid changes
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

5 years agoImport translations. DO NOT MERGE
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

5 years ago[automerger skipped] Update PBAP info for all pairing dialogs. DO NOT MERGE am: ff171...
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

5 years agoUpdate PBAP info for all pairing dialogs. DO NOT MERGE am: ff171eff8e
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

5 years agoUpdate PBAP info for all pairing dialogs. DO NOT MERGE
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

5 years agoMerge "Move safety & regulatory manual closer to legal settings" into pi-dev
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

5 years agoUpdate PBAP info for all pairing dialogs. DO NOT MERGE
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)

5 years agoMove safety & regulatory manual closer to legal settings
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

5 years agoMerge "Update PBAP info for all pairing dialogs. DO NOT MERGE" into pi-dev
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

5 years agoImport translations. DO NOT MERGE
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

5 years agoImport translations. DO NOT MERGE
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

5 years agoUpdate PBAP info for all pairing dialogs. DO NOT MERGE
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)

5 years agoDO NOT MERGE leverage default_theme string for display_cutout_emulation_device_default
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

5 years agoMerge "Cutout emulation: string changes and ordering" into pi-dev
TreeHugger Robot [Tue, 21 Aug 2018 20:49:37 +0000 (20:49 +0000)]
Merge "Cutout emulation: string changes and ordering" into pi-dev

5 years agoCutout emulation: string changes and ordering
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

5 years agoMerge "Fix memory leaks in Settings" into pi-dev
TreeHugger Robot [Fri, 17 Aug 2018 18:04:44 +0000 (18:04 +0000)]
Merge "Fix memory leaks in Settings" into pi-dev

5 years agoMerge "Hide SettingsSlice provider" into pi-dev
TreeHugger Robot [Thu, 16 Aug 2018 21:23:17 +0000 (21:23 +0000)]
Merge "Hide SettingsSlice provider" into pi-dev

5 years agoHide SettingsSlice provider
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

5 years ago[automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not...
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

5 years ago[automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not...
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

5 years ago[automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not...
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

5 years agoMerge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev
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

5 years ago[automerger skipped] Merge "Disable changing lock when device is not provisioned...
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

5 years agoMerge "Disable changing lock when device is not provisioned." into oc-mr1-dev
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

5 years agoMerge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into...
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

5 years agoMerge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev am...
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

5 years ago[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisione...
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

5 years agoMerge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into...
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

5 years agoMerge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev am...
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

5 years ago[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisione...
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

5 years agoMerge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into...
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

5 years agoMerge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev
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

5 years ago[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisione...
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

5 years agoMerge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into...
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.

5 years agoMerge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev
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.

5 years agoFix memory leaks in Settings
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

5 years ago[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am...
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

5 years ago[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am...
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

5 years ago[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am...
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

5 years ago[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am...
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

5 years ago[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am...
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

5 years agoDO NOT MERGE Disable changing lock when device is not provisioned.
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

5 years agoDO NOT MERGE Disable changing lock when device is not provisioned.
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

5 years agoDisable changing lock when device is not provisioned.
Doris Ling [Thu, 2 Aug 2018 00:24:34 +0000 (17:24 -0700)]
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
Merged-In: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2

5 years ago[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am...
Android Build Merger (Role) [Fri, 3 Aug 2018 01:03:04 +0000 (01:03 +0000)]
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f am: d98908e7c7 skipped: 3503445e59

Change-Id: I83aa2c1573b6310112b3575b4b4b35ef3c7f57d9

5 years ago[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am...
Android Build Merger (Role) [Fri, 3 Aug 2018 01:03:02 +0000 (01:03 +0000)]
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f am: d98908e7c7

Change-Id: I67d4821190d4a6283a54a23a087984b9ca18063f

5 years ago[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am...
Android Build Merger (Role) [Fri, 3 Aug 2018 01:03:00 +0000 (01:03 +0000)]
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f

Change-Id: If3f680b663909bd4e40b3e9033fed9cd0c8f537a

5 years agoDO NOT MERGE Disable changing lock when device is not provisioned.
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

5 years ago[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisione...
Android Build Merger (Role) [Fri, 3 Aug 2018 01:00:48 +0000 (01:00 +0000)]
[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b

Change-Id: Ia238fa6c7245d14b40c8abd4b08e4d591f776ece

5 years agoDO NOT MERGE Disable changing lock when device is not provisioned.
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

5 years agoDisable changing lock when device is not provisioned.
Doris Ling [Tue, 31 Jul 2018 21:04:44 +0000 (14:04 -0700)]
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
- remove the search menu

Bug: 110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
Merged-In: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 20 Jul 2018 02:35:10 +0000 (19:35 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I26fa1f1f72571d0541556649bf104446c9522830

6 years agoDO NOT MERGE Fix summary text for advanced button.
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: Ib6db0c402d79a2d965e6060b1851d7b898ae3f94
Fixes: 111195268
Test: manual

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 11 Jul 2018 05:28:21 +0000 (22:28 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id9deb2f66c09d1b17c35d8226673768d40d7eef7

6 years agoMerge "Fix incorrect method call to wifiManager in Tether" into pi-dev
TreeHugger Robot [Tue, 10 Jul 2018 19:33:29 +0000 (19:33 +0000)]
Merge "Fix incorrect method call to wifiManager in Tether" into pi-dev

6 years agoFix incorrect method call to wifiManager in Tether
Salvador Martinez [Mon, 9 Jul 2018 18:52:34 +0000 (11:52 -0700)]
Fix incorrect method call to wifiManager in Tether

In the WifiTetherApBandController the incorrect method was
being called to check if the device is 5Ghz compatible. We
were calling is5GhzBandSupported directly, but we were
supposed to call isDualBandSupported instead.

Test: robotests updated
Bug: 110793581
Change-Id: I61d3ff10abedde6196b8e29591ebfd3272dbbcd9

6 years agoMerge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS." into pi-dev
TreeHugger Robot [Mon, 9 Jul 2018 17:37:19 +0000 (17:37 +0000)]
Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS." into pi-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 5 Jul 2018 04:09:50 +0000 (21:09 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id2d2fbe5bc2473fa6de24605fc5dbef0ae4e626f

6 years agoUse primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS.
Pavel Grafov [Tue, 3 Jul 2018 19:31:42 +0000 (20:31 +0100)]
Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS.

Only primary user can set LOCK_SCREEN_SHOW_NOTIFICATIONS,
profile can only set notifications to be redacted. When the
user changes notification settings for a work app, this class
is invoked from the profile, meaning it attempts to read
LOCK_SCREEN_SHOW_NOTIFICATIONS for the profile, which is not
there. As a result the function always returs 0 for work apps.

Bug: 111112011
Test: atest packages/apps/Settings/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
Change-Id: Ifb50209ea8ea8fb6639f00ca8b7cf8a4295890ad
Merged-In: Ifb50209ea8ea8fb6639f00ca8b7cf8a4295890ad
(cherry picked from commit f14de789f4cc7d145e6011e5a5562876e25c3f31)

6 years agoMerge "Conditionally block battery percantage from search" into pi-dev
TreeHugger Robot [Tue, 3 Jul 2018 21:35:32 +0000 (21:35 +0000)]
Merge "Conditionally block battery percantage from search" into pi-dev

6 years agoMerge "Unrestrict app if it been set as device admin app" into pi-dev
TreeHugger Robot [Tue, 3 Jul 2018 20:24:58 +0000 (20:24 +0000)]
Merge "Unrestrict app if it been set as device admin app" into pi-dev

6 years agoConditionally block battery percantage from search
Matthew Fritze [Mon, 2 Jul 2018 18:22:59 +0000 (11:22 -0700)]
Conditionally block battery percantage from search

The PowerUsageSummary fragment doesn't use the regular pattern
of a static method to build preference controllers, which can be
accessed by both DashboardFragment and BaseSearchIndexProvider,
because it depends on the Activity & Fragment in the creation of
the preference controllers.

The correct & long-term solution here would be to move those dependencies
out of the getPreferenceControllers method, such that the we could use a
static buildPreferenceControllers method, as seen in DisplaySettings.java.

In the mean time, we know that BatteryPercentagePrefController should not
show up on devices, so we conditionally add the the preference controller's
into getNonIndexableKeys method based on controller Availability, which
BasePreferenceController normally does automatically with a getPreferenceController
method in the host fragment's SEARCH_INDEX_DATA_PROVIDER.

Since this is a short-term solution, it should not be merged into master, and thus
I am not marking the bug as fixed.

Bug: 110894466
Test: Robotests
Change-Id: I06f814571d0b72fbf020dd11a9d23a9eb9907bfd
Merged-In: I5993d332dbd218c981ef5432aebb735d0000f67a

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 3 Jul 2018 01:11:20 +0000 (18:11 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 110524699
Change-Id: I80e63cc3fe9148fa5c6986dfc7b470e870d683ca

6 years agoUnrestrict app if it been set as device admin app
Lei Yu [Thu, 28 Jun 2018 21:08:42 +0000 (14:08 -0700)]
Unrestrict app if it been set as device admin app

Bug: 110337989
Test: RunSettingsRoboTests
Change-Id: I8229bee97d970f8b16351193cfd99ca05ff041bf
Merged-In: I8229bee97d970f8b16351193cfd99ca05ff041bf

6 years ago[automerger skipped] Delete obsolete activity alias for dev settings am: 0e1393ae8c...
Fan Zhang [Thu, 28 Jun 2018 05:01:57 +0000 (22:01 -0700)]
[automerger skipped] Delete obsolete activity alias for dev settings am: 0e1393ae8c am: afbdbeb7d5
am: 192cc156b0  -s ours

Change-Id: Ib02c4b16500eaf479106c2e70b02fdaa401141e7

6 years agoDelete obsolete activity alias for dev settings am: 0e1393ae8c
Fan Zhang [Thu, 28 Jun 2018 04:56:41 +0000 (21:56 -0700)]
Delete obsolete activity alias for dev settings am: 0e1393ae8c
am: afbdbeb7d5

Change-Id: I0bbd3a65b7f1ab11e0f182ca4421c8c5911e6ad2

6 years agoDelete obsolete activity alias for dev settings
Fan Zhang [Thu, 28 Jun 2018 04:53:33 +0000 (21:53 -0700)]
Delete obsolete activity alias for dev settings
am: 0e1393ae8c

Change-Id: I879550b9dda19f42aec9d5cecc4f66a5ad0c23e4

6 years agoMerge "Rename Automatic color to Adaptive color" into pi-dev
Peiyong Lin [Fri, 22 Jun 2018 21:08:37 +0000 (21:08 +0000)]
Merge "Rename Automatic color to Adaptive color" into pi-dev

6 years agoRename Automatic color to Adaptive color
Chia-I Wu [Thu, 21 Jun 2018 16:13:42 +0000 (00:13 +0800)]
Rename Automatic color to Adaptive color

Rename the new mode (only available on 2018 devices) from Automatic to Adaptive.

Bug: 110524699
Test: manual
Change-Id: I56e87ad11a94915155cff56a6a13a9e167383e0c

6 years agoMerge "Add unofficial intent for WifiTetherSettings" into pi-dev
Salvador Martinez [Thu, 21 Jun 2018 22:21:20 +0000 (22:21 +0000)]
Merge "Add unofficial intent for WifiTetherSettings" into pi-dev

6 years agoMerge "Allow config to disable battery percent setting" into pi-dev
TreeHugger Robot [Thu, 21 Jun 2018 21:18:36 +0000 (21:18 +0000)]
Merge "Allow config to disable battery percent setting" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Thu, 21 Jun 2018 19:26:04 +0000 (19:26 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 21 Jun 2018 18:31:13 +0000 (11:31 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ieb6af16365681984ceafb048d338d8132df0e3bc

6 years agoMerge "DO NOT MERGE Revert "DO NOT MERGE Revert "Fix gray out previously connected...
TreeHugger Robot [Thu, 21 Jun 2018 02:30:43 +0000 (02:30 +0000)]
Merge "DO NOT MERGE Revert "DO NOT MERGE Revert "Fix gray out previously connected device preference issue""" into pi-dev

6 years agoAdd unofficial intent for WifiTetherSettings
Salvador Martinez [Tue, 19 Jun 2018 17:27:30 +0000 (10:27 -0700)]
Add unofficial intent for WifiTetherSettings

This CL adds an intent that can be used to start
WifiTether Settings.

Test: SettingsGatewayTest still passes
Bug: 110235497
Bug: 80251951
Change-Id: Iac94e563a91b1f821f69f18234d8176350ae5f29

6 years agoAllow config to disable battery percent setting
Evan Laird [Thu, 14 Jun 2018 00:13:47 +0000 (20:13 -0400)]
Allow config to disable battery percent setting

Respect config_battery_percentage_setting_available to determine whether
or not to allow showing battery percentage in the status bar.

Test: visual
Bug: 80129194
Change-Id: I23b0065ed99865a8df37c098b2f0f16d57799706

6 years agoAdd help uri for prevent ringing gesture
Beverly [Thu, 7 Jun 2018 14:43:32 +0000 (10:43 -0400)]
Add help uri for prevent ringing gesture

Test: build
Bug: 79270169
Change-Id: Iea5598f26649854521202363cad6ee297cef3057
(cherry picked from commit 486d1facfab222c686e03c344619aaf19280ea2a)

6 years agoChange UI for wireless AP tether band selection
Salvador Martinez [Wed, 30 May 2018 00:53:02 +0000 (17:53 -0700)]
Change UI for wireless AP tether band selection

We decided to use the list preference after all due to
some devices not supporting various combinations of AP
configurations. This change makes it so that there are
three different UIs depending on the configurations
which are supported.
- 5.0 GHz unsupported: disable the preference and just
set the value to 2.4 GHz
- all supported, no dual mode: allow the user to choose
EITHER 2.4 GHz or 5.0 GHz
- all supported, dual mode: allow the user to choose
2.4 GHz or BOTH 2.4 GHz & 5.0 GHz with 5.0 being
preferred

Test: atest SettingsRoboTests
Bug: 80315296
Change-Id: I888d35811a98b8cf0155a3cb96c42ff762763378
Merged-In: I888d35811a98b8cf0155a3cb96c42ff762763378

6 years agoDO NOT MERGE Revert "DO NOT MERGE Revert "Fix gray out previously connected device...
Ivan Chiang [Tue, 12 Jun 2018 15:27:25 +0000 (15:27 +0000)]
DO NOT MERGE Revert "DO NOT MERGE Revert "Fix gray out previously connected device preference issue""

This reverts commit ca85cc9d278d19eef92d9ed37668e906522f56c2.

Reason for revert: This patch should be submitted with whole topic.

Bug: 80227045
Change-Id: I446329aa3370b64b2a943a0f970d0236258455a3

6 years agoMerge "DO NOT MERGE Revert "Fix gray out previously connected device preference issue...
TreeHugger Robot [Tue, 12 Jun 2018 12:47:36 +0000 (12:47 +0000)]
Merge "DO NOT MERGE Revert "Fix gray out previously connected device preference issue"" into pi-dev

6 years agoDO NOT MERGE Revert "Fix gray out previously connected device preference issue"
Artem Iglikov [Tue, 12 Jun 2018 11:40:24 +0000 (11:40 +0000)]
DO NOT MERGE Revert "Fix gray out previously connected device preference issue"

This reverts commit 95abf59af43bafe4922b8cc096b10b65440419b8.

Reason for revert: Crashes settings (b/110075201)

Bug: 110075201
Change-Id: Ie6ea94e0891754f18576bd21447b64410d2fd23a

6 years agoMerge "Fix gray out previously connected device preference issue" into pi-dev
TreeHugger Robot [Tue, 12 Jun 2018 07:34:15 +0000 (07:34 +0000)]
Merge "Fix gray out previously connected device preference issue" into pi-dev

6 years agoSkip device index job if caller is not Settings app.
Fan Zhang [Wed, 30 May 2018 16:50:52 +0000 (09:50 -0700)]
Skip device index job if caller is not Settings app.

Change-Id: I96184f111e83477b46ddf321ec74917bab330048
Fixes: 80437512
Fixes: 109713077
Test: robotests
(cherry picked from commit 74ba1a51d74a4fb7fc2ccd62fd38087974c20020)

6 years agoMerge "Fix typo" into pi-dev
TreeHugger Robot [Fri, 8 Jun 2018 18:32:47 +0000 (18:32 +0000)]
Merge "Fix typo" into pi-dev

6 years agoFix typo
Beverly [Fri, 8 Jun 2018 14:44:05 +0000 (10:44 -0400)]
Fix typo

Test: manual
Bug: 109925028
Change-Id: I87ec517249567123df1a8eace17109ed7e0bae2b