OSDN Git Service

android-x86/packages-apps-Settings.git
4 years agoUse DownloadManager to get native bridge libraries android-x86-9.0-r1 android-x86-9.0-r2
Chih-Wei Huang [Fri, 14 Feb 2020 10:07:33 +0000 (18:07 +0800)]
Use DownloadManager to get native bridge libraries

4 years agoMerge tag 'android-9.0.0_r53' into pie-x86
Chih-Wei Huang [Tue, 11 Feb 2020 02:01:27 +0000 (10:01 +0800)]
Merge tag 'android-9.0.0_r53' into pie-x86

Android 9.0.0 Release 53 (6107734)

4 years agoPrevent accounts page directly opening in screen pinning mode
Mill Chen [Tue, 16 Jul 2019 09:45:46 +0000 (17:45 +0800)]
Prevent accounts page directly opening in screen pinning mode

In Settings there is no auth mechanism to prevent accounts page being
opened in screen pinning mode. This CL makes it so that when users are
trying to navigate to any pages in Settings from other apps in screen
pinning mode, Settings app will directly close its page.

Bug: 137015265
Bug: 135604684
Test: manual
Change-Id: If26eda408a9ef6fa03ad82e5bee51bb7185950d6
Merged-In: If26eda408a9ef6fa03ad82e5bee51bb7185950d6
(cherry picked from commit f3242dab3546c019d4b79c502f7b8850d36123a5)
(cherry picked from commit ad2502a91a6d0814396b2d26a7270e8cbdb2ed38)

4 years agoAllow users to turn on or off Android-x86 statistics
Chih-Wei Huang [Thu, 14 Jun 2018 08:38:40 +0000 (16:38 +0800)]
Allow users to turn on or off Android-x86 statistics

4 years agoAdd Android-x86 dashboard
Chih-Wei Huang [Fri, 30 Mar 2018 09:40:06 +0000 (17:40 +0800)]
Add Android-x86 dashboard

Add an option to enable or disable native bridge.
More options will be added in the future.

4 years agoSettings: Add Superuser entry
Koushik Dutta [Thu, 28 Feb 2013 22:49:24 +0000 (14:49 -0800)]
Settings: Add Superuser entry

Amended for oreo-x86 porting by cwhuang.

Squashed commit of the following:

Author: Koushik Dutta <koushd@gmail.com>
Switch to new Superuser
Change-Id: I9d91392ad6fbc9953d19059ab59b91d214c00e0c

Author: Danny Baumann <dannybaumann@web.de>
Hide Superuser entry if root access for apps is disabled.
Change-Id: Ibb77ba5a0fccf22564a26b8b1e13f7762c65718e

Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Development: Root for apps is unavailable if the su daemon isn't running

The superuser options are tied to the Superuser app variant we use,
which in turn is tied to the su daemon. No daemon, no menu options.
Change-Id: I41d58e62986759336ab38e67f26a558c2eed5aa3

Change-Id: I9d91392ad6fbc9953d19059ab59b91d214c00e0c

4 years agoSettings: Add developer setting for root access
Steve Kondik [Mon, 19 Oct 2015 06:46:41 +0000 (23:46 -0700)]
Settings: Add developer setting for root access

Also includes following change:

    Settings: Set root access options appropriately

    It is possible to be running a user build with a debuggable boot image.
    In this case, "su" will not be available.  So only show none/adb.

    Issue-Id: BACON-4461
    Change-Id: Iaa7df8311b9ea81eabb1566ba6f9159fdc9fab34

Change-Id: If96219d893c0dfdcf4ad36e1cd8de3a413db0e8b

4 years agoAdd information about OpenGL driver version
Chih-Wei Huang [Tue, 12 Dec 2017 17:23:34 +0000 (01:23 +0800)]
Add information about OpenGL driver version

In order to get Mesa / OpenGL ES info, an EGL context is required.
Without it, GLES20.glGetString returns NULL.

4 years agoAdd Manufacturer to device info
Chih-Wei Huang [Fri, 8 Dec 2017 09:08:43 +0000 (17:08 +0800)]
Add Manufacturer to device info

Add an item to display manufacturer in device info page.

4 years agoTreat mode_default as denied for install_unknown_apps
Christopher Dombroski [Tue, 16 Apr 2019 19:22:56 +0000 (12:22 -0700)]
Treat mode_default as denied for install_unknown_apps

Test: atest SettingsRoboTests
Bug: 123700348
Change-Id: Ieeb6456854cc3d0faa0e9c407accd94f56a25813
Merged-In: Ieeb6456854cc3d0faa0e9c407accd94f56a25813
(cherry picked from commit 4b78bcd5cdff81168b5b08f72764ec9a5c0405c3)

4 years ago[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskCon...
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
(cherry picked from commit 687b18067cb3bf28282376b311ece73b1c893254)

4 years agoDo not allow draw on top for App notification settings
Raff Tsai [Fri, 8 Mar 2019 08:19:30 +0000 (16:19 +0800)]
Do not allow draw on top for App notification settings

Fixes: 119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit fe86a2a51f0b8e01e5f595bd60edc594eef58aba)
(cherry picked from commit 9fa8329b02d5db5c782ca815fd955ee7bceb5c86)

5 years agoDo not allow draw on top for default sms picker.
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)
(cherry picked from commit 95d0fb7f4911403844666632ece42467f60ad753)

5 years agoHide quicksetting tile for dev options when it's turned off
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
(cherry picked from commit 4220b1e50ccec65cb47007155e0df7672a94a68d)

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)
(cherry picked from commit 77b62b24c6d386f7913bfe16e1ab121404c3b50a)

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
(cherry picked from commit 6409cf5c94cc1feb72dc078e84e66362fbecd6d5)

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
(cherry picked from commit 770f4abf9de2bb7d74497cc4b5f6795023229ef2)

5 years agoMerge cherrypicks of [4562103, 4560827, 4563998, 4563999, 4564000, 4564001, 4564351...
android-build-team Robot [Tue, 17 Jul 2018 23:29:09 +0000 (23:29 +0000)]
Merge cherrypicks of [456210345608274563998456399945640004564001456435145643524564333456403345604554564034456067445606754563620456160745610624561063] into pi-release

Change-Id: Ie308d644fd0a0f4f72fd54d7bf86c1cf63e720b7

5 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
(cherry picked from commit f14de789f4cc7d145e6011e5a5562876e25c3f31)

5 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
(cherry picked from commit f87897b84cf09da3d25ea0222fce876fdf62f302)

5 years agoMerge cherrypicks of [4315359, 4315389, 4315390, 4315519, 4315520, 4315360, 4317665...
android-build-team Robot [Tue, 12 Jun 2018 01:49:25 +0000 (01:49 +0000)]
Merge cherrypicks of [4315359431538943153904315519431552043153604317665431770143153914316085] into pi-release

Change-Id: I913d48556bf01f9baf0b1e2d6dfc41127a9816d1

5 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)
(cherry picked from commit 9ecf3e0c1110e6900f63a600e483f8925e366b4c)

5 years agoSnap for 4832339 from 29eec443e06abe949b522f114d2c0879baedac22 to pi-release
android-build-team Robot [Sun, 10 Jun 2018 19:05:22 +0000 (19:05 +0000)]
Snap for 4832339 from 29eec443e06abe949b522f114d2c0879baedac22 to pi-release

Change-Id: I17fd812e30dbfff2a563e67ebfee988306fb5b97

5 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

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

Test: manual
Bug: 109925028
Change-Id: I87ec517249567123df1a8eace17109ed7e0bae2b

5 years agoSnap for 4829593 from ee96c3a259ad1ee3a8604730f8c722224ec07a50 to pi-release
android-build-team Robot [Fri, 8 Jun 2018 07:21:01 +0000 (07:21 +0000)]
Snap for 4829593 from ee96c3a259ad1ee3a8604730f8c722224ec07a50 to pi-release

Change-Id: Iee7304c974f4b903c116c161ec38a4e8c3491c78

5 years ago2nd attempt handle BT is not supported on emulator
ryanywlin [Fri, 8 Jun 2018 06:36:34 +0000 (14:36 +0800)]
2nd attempt handle BT is not supported on emulator

Error handle before using LocalBluetoothManager in the onStart
and onStop

Bug: 80491267
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j42
Change-Id: I47f7d3b7cddc2fbbafb8fb5cf0fb6adb2d0d2d55

5 years agoFix context leak in AudioSwitchPreferenceController.
Fan Zhang [Thu, 7 Jun 2018 18:51:09 +0000 (11:51 -0700)]
Fix context leak in AudioSwitchPreferenceController.

In this controller the context is stored into a global singleton but was
not cleared, thus leaking context and associated views.

Change-Id: I4247f8ff753bc0a331c6c81a0e4b5b4bc41588de
Fixes: 80507279
Test: robotests
Test: inspected hprof before/after change

5 years agoMerge "Add comments and additional constants for the known bad anomaly types." into...
TreeHugger Robot [Thu, 7 Jun 2018 16:48:51 +0000 (16:48 +0000)]
Merge "Add comments and additional constants for the known bad anomaly types." into pi-dev

5 years agoSnap for 4826885 from daea8be9abd408f39a8b7451bc171cb60f8e6274 to pi-release
android-build-team Robot [Thu, 7 Jun 2018 07:27:26 +0000 (07:27 +0000)]
Snap for 4826885 from daea8be9abd408f39a8b7451bc171cb60f8e6274 to pi-release

Change-Id: I7724348225353adb6ccf98febc86010556248f97

5 years ago[RadioInfo] Save PreferredNetworkMode to Settings
Nathan Harold [Tue, 5 Jun 2018 21:02:35 +0000 (14:02 -0700)]
[RadioInfo] Save PreferredNetworkMode to Settings

Historically, the debug menu intentionally did not
save the preferred network mode once chosen. This
causes problems because some settings cause a phone
switch which overrides the preferred network mode,
which can cause another phone switch and again
override the preferred network mode, completely
obliterating the requested debug setting. This change
will now save the debug menu setting to the system
settings, which will prevent the circular changes and
loss of setting due to phone switching.

However, caching the debug setting to prevent the phone
switch logic from overriding the setting has a side
effect, which is why it wasn't done historically.
If a debug setting of the preferred network mode
is set, it will cause the UX of the non-debug network
preference screen to change. Thus, someone who uses
the debug menu to make changes must be careful to
re-set the setting to return to the correct UX of the
publicly displayed menu.

Bug: 95133265
Test: -manually set preferred network mode using the
       RadioInfo menu and observed that there is no
       phone switch when setting CDMA.
      -confirmed that changing the network mode in
       RadioInfo will cause UX changes to the public
       network preference menu.

Change-Id: I91f669956a6d02515530855c4617cd0a767d73fa

5 years agoAdd comments and additional constants for the known bad anomaly types.
Joe Onorato [Tue, 22 May 2018 20:37:30 +0000 (13:37 -0700)]
Add comments and additional constants for the known bad anomaly types.

They aren't being used now, but by declaring them now we can consolidate
what we are encouraging OEMs to do in the PI timeframe.

Bug: 78013987
Test: treehugger
Change-Id: I7f86491448e799081b18d71274d2629a902d4972

5 years agoMerge "If zen settings are updated, don't show onboarding" into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 21:40:43 +0000 (21:40 +0000)]
Merge "If zen settings are updated, don't show onboarding" into pi-dev

5 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Wed, 6 Jun 2018 21:38:42 +0000 (21:38 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

5 years agoIf zen settings are updated, don't show onboarding
Beverly [Wed, 6 Jun 2018 15:00:09 +0000 (11:00 -0400)]
If zen settings are updated, don't show onboarding

Change-Id: I33c328e5d90f1b948c7dacb2e7f6265a1e496d35
Fixes: 109668117
Test: ZenOnboardingActivity
(cherry picked from commit da412f07e5a8833dc96f820ac13c44bb70114ac6)

5 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 6 Jun 2018 20:20:03 +0000 (13:20 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I8cc9d67a4676ed8db1d8c48a76478efc715375fb

5 years agoRequest Focus in fingerprint rename dialog
Evan Rosky [Wed, 6 Jun 2018 19:52:05 +0000 (12:52 -0700)]
Request Focus in fingerprint rename dialog

Bug: 68841055
Test: Manual. dialog comes up with focused entry
Change-Id: I5bb1b7227c1323595bf7f483e11e87e2c3550093

5 years agoSnap for 4824048 from 688d1d81cba16deb03e0f495b1e65c71a981d5a4 to pi-release
android-build-team Robot [Wed, 6 Jun 2018 07:21:25 +0000 (07:21 +0000)]
Snap for 4824048 from 688d1d81cba16deb03e0f495b1e65c71a981d5a4 to pi-release

Change-Id: I9646c90ca902eb5e5cec740582c6336448923041

5 years agoOnly add entry with unique package name to default browser list.
Doris Ling [Tue, 5 Jun 2018 20:58:48 +0000 (13:58 -0700)]
Only add entry with unique package name to default browser list.

When we query the package manager for activities that can handle the
web data uri, different capable activities within the same package will
be returned as separate entries. However, when we show the default
browser apps to the user, the entries are simply base on package name.
So, if there are multiple activities within the same package that can
handle the web data, they will be shown as duplicate entries.

When we process the resolved activities, check the corresponding package
name for duplicate entries before adding it to the default browser list.

Change-Id: I4e1f1e1ea22781efe24d791b367246423ca7a3c4
Merged-In: I70c88866eb3d5fe6466554749e23c85f429dd30c
Fixes: 84207432
Test: make RunSettingsRoboTests

5 years agoSnap for 4821244 from bed0aff4a21d89f0b6b2bb2351aa6e63e9f60170 to pi-release
android-build-team Robot [Tue, 5 Jun 2018 07:23:31 +0000 (07:23 +0000)]
Snap for 4821244 from bed0aff4a21d89f0b6b2bb2351aa6e63e9f60170 to pi-release

Change-Id: I99b6ac5df600ded3e48e026f2be8f75735017ae3

5 years ago[automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into...
Atanas Kirilov [Tue, 5 Jun 2018 00:41:55 +0000 (17:41 -0700)]
[automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev am: 8994d1f0a4  -s ours am: b072779789  -s ours
am: 71046c3d10  -s ours

Change-Id: If9297fdc320c747d213dc81b4639e7c9f76cdedf

5 years ago[automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into...
Atanas Kirilov [Tue, 5 Jun 2018 00:10:35 +0000 (17:10 -0700)]
[automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev am: 8994d1f0a4  -s ours
am: b072779789  -s ours

Change-Id: I517819e05e5283e6c50555c713d79b34179a4f7c

5 years ago[automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into...
Atanas Kirilov [Mon, 4 Jun 2018 23:59:14 +0000 (16:59 -0700)]
[automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev
am: 8994d1f0a4  -s ours

Change-Id: I91de7cf39aee69aab379cfd81085965cabf0ae81

5 years agoMerge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev am...
Atanas Kirilov [Mon, 4 Jun 2018 23:46:48 +0000 (16:46 -0700)]
Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev am: 9b4f5525b4 am: dededea9f3
am: 5e66879b53

Change-Id: Ib02ca4cd840e86f0287c5b02f45419b894f044ea

5 years agoMerge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev am...
Atanas Kirilov [Mon, 4 Jun 2018 23:45:39 +0000 (16:45 -0700)]
Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev am: 75f0072c94 am: 67892acff1
am: 463ea747f6

Change-Id: I059ddf801b8cc60d78b209b37af37db25c049b5f

5 years agoMerge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev am...
Atanas Kirilov [Mon, 4 Jun 2018 23:42:39 +0000 (16:42 -0700)]
Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev am: 438cf9da52 am: a29108a778
am: 0d59c0d23d

Change-Id: Ie2cfc61ddd94e49a6794bf08949b3a60f4ee98df

5 years agoMerge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev am...
Atanas Kirilov [Mon, 4 Jun 2018 23:41:45 +0000 (16:41 -0700)]
Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev am: 9e626734bb am: 65db9c47b9
am: 2f38890832

Change-Id: I9532ffd77827da2ee932e150d6f75c4022a8bba9

5 years agoMerge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev am...
Atanas Kirilov [Mon, 4 Jun 2018 23:40:10 +0000 (16:40 -0700)]
Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev am: 826b14e43e am: 74d98110f3
am: a50293f72c

Change-Id: I20749db43dcab2085bcb9733601000cd96be14ce

5 years agoMerge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev am...
Atanas Kirilov [Mon, 4 Jun 2018 23:14:11 +0000 (16:14 -0700)]
Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev am: 9b4f5525b4
am: dededea9f3

Change-Id: Ia42df7f876f964d153b217de4f501a0b7f03d363

5 years agoMerge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev am...
Atanas Kirilov [Mon, 4 Jun 2018 23:13:02 +0000 (16:13 -0700)]
Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev am: 75f0072c94
am: 67892acff1

Change-Id: I4ca44d469bf063ba68b078ba830a5b7f4d86a2cb

5 years agoMerge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev am...
Atanas Kirilov [Mon, 4 Jun 2018 23:10:32 +0000 (16:10 -0700)]
Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev am: 438cf9da52
am: a29108a778

Change-Id: I24bdca64cf308155ae9499fc0db629ba31c85e90

5 years agoMerge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev am...
Atanas Kirilov [Mon, 4 Jun 2018 23:09:33 +0000 (16:09 -0700)]
Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev am: 9e626734bb
am: 65db9c47b9

Change-Id: I86cff1a6b90fbf53738d76f26fee07637db7da95

5 years agoMerge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev am...
Atanas Kirilov [Mon, 4 Jun 2018 23:07:36 +0000 (16:07 -0700)]
Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev am: 826b14e43e
am: 74d98110f3

Change-Id: Ie334ee442e46dffa11926b471b0a096a3c4f1f92

5 years agoMerge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev
Atanas Kirilov [Mon, 4 Jun 2018 22:43:14 +0000 (15:43 -0700)]
Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev
am: 9b4f5525b4

Change-Id: I325923e835cf57736106da3ce8cc26aefa4ee3f7

5 years agoMerge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev
Atanas Kirilov [Mon, 4 Jun 2018 22:41:42 +0000 (15:41 -0700)]
Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev
am: 75f0072c94

Change-Id: Ife69a5cf4637ef6b605415c5fa9f818f2644d54c

5 years agoMerge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev
Atanas Kirilov [Mon, 4 Jun 2018 22:39:29 +0000 (15:39 -0700)]
Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev
am: 438cf9da52

Change-Id: I0964b2320f0b6d55923847bbba779bb8ee5c2794

5 years agoMerge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev
Atanas Kirilov [Mon, 4 Jun 2018 22:38:17 +0000 (15:38 -0700)]
Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev
am: 9e626734bb

Change-Id: I6536e0423a261da7232b6229d96019fea35f5bfe

5 years agoMerge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev
Atanas Kirilov [Mon, 4 Jun 2018 22:36:29 +0000 (15:36 -0700)]
Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev
am: 826b14e43e

Change-Id: If4056f03d27f845d30862b04dcbdb119141f2bf8

5 years agoMerge "Revert "Settings: Add logical camera default switch"" into pi-dev
TreeHugger Robot [Mon, 4 Jun 2018 20:45:51 +0000 (20:45 +0000)]
Merge "Revert "Settings: Add logical camera default switch"" into pi-dev

5 years agoMerge "Merge translations of Bluetooth confirmation text" into oc-dev
Atanas Kirilov [Mon, 4 Jun 2018 20:37:42 +0000 (20:37 +0000)]
Merge "Merge translations of Bluetooth confirmation text" into oc-dev

5 years agoMerge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev
Atanas Kirilov [Mon, 4 Jun 2018 20:25:15 +0000 (20:25 +0000)]
Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev

* changes:
  [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa am: b176eaa85e am: e20b700ac1
  [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa am: b176eaa85e
  [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa
  [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a
  Merge translations of Bluetooth confirmation text

5 years agoMerge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev
Atanas Kirilov [Mon, 4 Jun 2018 20:24:37 +0000 (20:24 +0000)]
Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev

* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293 skipped: e9345782e2 skipped: c874b450af
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293 skipped: e9345782e2
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5
  Merge translations of Bluetooth confirmation text

5 years agoMerge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev
Atanas Kirilov [Mon, 4 Jun 2018 20:24:34 +0000 (20:24 +0000)]
Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev

* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 732b65ca4d
  Merge translations of Bluetooth confirmation text

5 years agoMerge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev
Atanas Kirilov [Mon, 4 Jun 2018 20:24:25 +0000 (20:24 +0000)]
Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev

* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e skipped: 2d1bae1bd8 skipped: 8bc91c3b8b skipped: 3e48235bf6
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e skipped: 2d1bae1bd8 skipped: 8bc91c3b8b
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e skipped: 2d1bae1bd8
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71
  Merge translations of Bluetooth confirmation text

5 years agoMerge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev
Atanas Kirilov [Mon, 4 Jun 2018 20:24:19 +0000 (20:24 +0000)]
Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev

* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e skipped: 30d0145ead skipped: b9aa0fbfe9
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e skipped: 30d0145ead
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d
  Merge translations of Bluetooth confirmation text

5 years agoMerge translations of Bluetooth confirmation text
Antony Sargent [Tue, 13 Feb 2018 00:17:54 +0000 (16:17 -0800)]
Merge translations of Bluetooth confirmation text

This is a manual merge of the translated strings from the master branch
of the 'bluetooth_pairing_shares_phonebook' string. The fix for this bug
requires these translations because the fix was to slightly reword the
confirmation text in the pairing dialog and stop substituting in the
device name.

Bug: 62672248
Test: manual
Change-Id: I829baada46cdb2314021d8772feb8811072e41d8
Merged-In: I2d8c57680d1d98b74193654e9fe77016304f6ac5

5 years agoRevert "Settings: Add logical camera default switch"
Shuzhen Wang [Thu, 31 May 2018 21:12:06 +0000 (14:12 -0700)]
Revert "Settings: Add logical camera default switch"

This reverts commit a9578a2b8a2c88d87999dafb3bcc3fae623b44ed.

Test: Build
Bug: 80007047
Merged-In: Id5f01e5de94ffaa86de1e96f6bde1092b0c586a2

5 years ago[automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped...
Android Build Merger (Role) [Mon, 4 Jun 2018 17:23:18 +0000 (17:23 +0000)]
[automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa am: b176eaa85e am: e20b700ac1

Change-Id: Ib56a32b88c58c7b1a54ba4522cd9bf4bd80cd6e5

5 years ago[automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped...
Android Build Merger (Role) [Mon, 4 Jun 2018 17:23:16 +0000 (17:23 +0000)]
[automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa am: b176eaa85e

Change-Id: Ib1f576348a4e89028ddb3d731ecdc1c92599723d

5 years ago[automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped...
Android Build Merger (Role) [Mon, 4 Jun 2018 17:23:08 +0000 (17:23 +0000)]
[automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa

Change-Id: I0d88fc2ba7016327ab0ebbe05b016c4585ee965f

5 years agoSnap for 4818837 from d9bd2671462d218243a59c0d934839473bc22292 to pi-release
android-build-team Robot [Mon, 4 Jun 2018 07:23:07 +0000 (07:23 +0000)]
Snap for 4818837 from d9bd2671462d218243a59c0d934839473bc22292 to pi-release

Change-Id: I3ec942fd2e7c035929d65229220f20017175f888

5 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 3 Jun 2018 21:55:40 +0000 (14:55 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I7d788703ce218cc211305bf078fde78ce7dde2af

5 years agoSnap for 4818534 from 8c56825ecdab17f0d52614ca5e6ac1b8b7a75e98 to pi-release
android-build-team Robot [Sun, 3 Jun 2018 07:27:44 +0000 (07:27 +0000)]
Snap for 4818534 from 8c56825ecdab17f0d52614ca5e6ac1b8b7a75e98 to pi-release

Change-Id: Iec88470ae82ce808e46985adf182cead5eec5d61

5 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 1 Jun 2018 05:05:33 +0000 (22:05 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I67611d91d92e62641467382da0079497eb5dcd06

5 years agoMerge "Handle Bluetooth is not supported on emulator" into pi-dev
Ryan Lin [Thu, 31 May 2018 23:22:30 +0000 (23:22 +0000)]
Merge "Handle Bluetooth is not supported on emulator" into pi-dev

5 years agoMerge "No need for "and" - ListFormatter adds it" into pi-dev
TreeHugger Robot [Thu, 31 May 2018 18:12:00 +0000 (18:12 +0000)]
Merge "No need for "and" - ListFormatter adds it" into pi-dev

5 years agoMerge "Make Settings Slider Slices one row" into pi-dev
TreeHugger Robot [Thu, 31 May 2018 16:03:25 +0000 (16:03 +0000)]
Merge "Make Settings Slider Slices one row" into pi-dev

5 years agoNo need for "and" - ListFormatter adds it
Beverly [Fri, 25 May 2018 19:04:16 +0000 (15:04 -0400)]
No need for "and" - ListFormatter adds it

Test: manual, visual inspection
Change-Id: I5ce1442cc762c9c0ca22827df429dc64714c2f20
Fixes: 80303010

5 years agoSnap for 4813226 from acfbc0eff45a8724817a90d81bd7173aeff732ff to pi-release
android-build-team Robot [Thu, 31 May 2018 07:27:50 +0000 (07:27 +0000)]
Snap for 4813226 from acfbc0eff45a8724817a90d81bd7173aeff732ff to pi-release

Change-Id: I9ced22149e80ae7a8fdd08ed0f0649cef5081be3

5 years agoHandle Bluetooth is not supported on emulator
ryanywlin [Thu, 31 May 2018 01:37:20 +0000 (09:37 +0800)]
Handle Bluetooth is not supported on emulator

- Disable audio swicher while Bluetooth feature is not supported
- Error handle before using LocalBluetoothManager in the constructor

Bug: 80491267
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j42

Change-Id: I971f31cd08dd0a2778548f6d1d675f279d92ef8e

5 years agoMake Settings Slider Slices one row
Matthew Fritze [Wed, 30 May 2018 22:39:43 +0000 (15:39 -0700)]
Make Settings Slider Slices one row

To unify all Settings slices into one row, we change
Settings Slider from user a header and a input range to
only using an Input Range.

Change-Id: I61715a45b29b6a52a47711811e5c6b2c83d50901
Fixes: 80430118
Test: robotests

5 years ago[automerger skipped] DO NOT MERGE Give PBAP permission only after user confirms am...
Hansong Zhang [Wed, 30 May 2018 20:41:41 +0000 (13:41 -0700)]
[automerger skipped] DO NOT MERGE Give PBAP permission only after user confirms am: e36ca3e96d am: 48aa959b14
am: 7cc441bf2f  -s ours

Change-Id: I19de0cbe315d298550edfb85039fbc87c42e6dc6

5 years agoDO NOT MERGE Give PBAP permission only after user confirms am: e36ca3e96d
Hansong Zhang [Wed, 30 May 2018 20:32:52 +0000 (13:32 -0700)]
DO NOT MERGE Give PBAP permission only after user confirms am: e36ca3e96d
am: 48aa959b14

Change-Id: I13480b0bf786ddd05959cb597492041e273d920c

5 years agoDO NOT MERGE Give PBAP permission only after user confirms
Hansong Zhang [Wed, 30 May 2018 20:23:53 +0000 (13:23 -0700)]
DO NOT MERGE Give PBAP permission only after user confirms
am: e36ca3e96d

Change-Id: I6fe221ad379ab6398b01bfb96fe7390d0369c15d

5 years agoMerge "Give PBAP permission only after user confirms" into pi-dev
TreeHugger Robot [Wed, 30 May 2018 17:35:57 +0000 (17:35 +0000)]
Merge "Give PBAP permission only after user confirms" into pi-dev

5 years agoSnap for 4810559 from cf2e1fd5936aae877615e2061908151ea1530596 to pi-release
android-build-team Robot [Wed, 30 May 2018 07:27:12 +0000 (07:27 +0000)]
Snap for 4810559 from cf2e1fd5936aae877615e2061908151ea1530596 to pi-release

Change-Id: I1de4fc4bb46e0815a23cf5601fc212b793b2ded0

5 years agoMerge "Plumb context object to PowerWhitelistBackend." into pi-dev
TreeHugger Robot [Wed, 30 May 2018 03:08:20 +0000 (03:08 +0000)]
Merge "Plumb context object to PowerWhitelistBackend." into pi-dev

5 years agoMerge "Prevent disabling default phone/sms apps in battery setting" into pi-dev
TreeHugger Robot [Wed, 30 May 2018 00:18:45 +0000 (00:18 +0000)]
Merge "Prevent disabling default phone/sms apps in battery setting" into pi-dev

5 years agoPlumb context object to PowerWhitelistBackend.
Fan Zhang [Tue, 29 May 2018 18:14:42 +0000 (11:14 -0700)]
Plumb context object to PowerWhitelistBackend.

Change-Id: Ice0d037625d47f1f668b00499a7f1ad2302cc0ba
Merged-In: Ice0d037625d47f1f668b00499a7f1ad2302cc0ba
Fixes: 76435804
Test: robotests

5 years agoPrevent disabling default phone/sms apps in battery setting
Fan Zhang [Fri, 25 May 2018 21:59:40 +0000 (14:59 -0700)]
Prevent disabling default phone/sms apps in battery setting

- In handleDisableable(), call getKeepEnabledPackages() in the same way
  as AppActionButtonPreferenceController.
- Update getKeepEnabledPackages() to dynamically query default phone/sms
  app packages.

Change-Id: I8dc7d6248cf440dcc053f6acba9d5548d5670c41
Merged-In: I8dc7d6248cf440dcc053f6acba9d5548d5670c41
Fixes: 80328396
Bug: 80312809
Test: robotests

5 years agoGive PBAP permission only after user confirms
Hansong Zhang [Thu, 17 May 2018 20:54:00 +0000 (13:54 -0700)]
Give PBAP permission only after user confirms

Bug: 72872376
Test: manual
Change-Id: I9617e3c10bf19e22f9a8f172332a83bbbebaf4a4

5 years agoMerge "Fix bluetooth search result no-op" into pi-dev
TreeHugger Robot [Tue, 29 May 2018 19:40:14 +0000 (19:40 +0000)]
Merge "Fix bluetooth search result no-op" into pi-dev

5 years agoMerge "Fix a bug where device index is not skipped correct." into pi-dev
TreeHugger Robot [Tue, 29 May 2018 18:48:24 +0000 (18:48 +0000)]
Merge "Fix a bug where device index is not skipped correct." into pi-dev

5 years agoMerge "Fix DND crash from SpringboardActivity" into pi-dev
TreeHugger Robot [Tue, 29 May 2018 18:47:23 +0000 (18:47 +0000)]
Merge "Fix DND crash from SpringboardActivity" into pi-dev

5 years agoFix bluetooth search result no-op
Matthew Fritze [Tue, 29 May 2018 18:38:52 +0000 (11:38 -0700)]
Fix bluetooth search result no-op

Bluetooth fragment was manually setting intent information,
which meant that the result didn't fire an intent properly.

This type of regression or mistake will be caught in the fix for
b/77921040.

Change-Id: I49f87f40acbfc3f74ea2e97835f2644d443169e2
Fixes: 80317645
Test: robotests

5 years agoMerge "Another refresh of swipe up gesture video" into pi-dev
TreeHugger Robot [Tue, 29 May 2018 18:34:23 +0000 (18:34 +0000)]
Merge "Another refresh of swipe up gesture video" into pi-dev

5 years agoSnap for 4807121 from 8c60fc69b72493f4f46e79b0011cccb7ee46f415 to pi-release
android-build-team Robot [Sun, 27 May 2018 07:23:47 +0000 (07:23 +0000)]
Snap for 4807121 from 8c60fc69b72493f4f46e79b0011cccb7ee46f415 to pi-release

Change-Id: Ic7648d7b9e99e2adc9b0b33e5013e1504f590928

5 years agoMerge "Hide haptic intensity settings for devices without enough dynamic range."...
TreeHugger Robot [Sat, 26 May 2018 02:03:09 +0000 (02:03 +0000)]
Merge "Hide haptic intensity settings for devices without enough dynamic range." into pi-dev

5 years agoMerge "Add vibration preview" into pi-dev
TreeHugger Robot [Sat, 26 May 2018 00:58:16 +0000 (00:58 +0000)]
Merge "Add vibration preview" into pi-dev

5 years agoMerge "Add michaelwr to OWNERS for haptics settings in accessibility" into pi-dev
TreeHugger Robot [Sat, 26 May 2018 00:20:44 +0000 (00:20 +0000)]
Merge "Add michaelwr to OWNERS for haptics settings in accessibility" into pi-dev