OSDN Git Service

android-x86/packages-apps-Settings.git
5 years agodeveloper-options: avoid oem-unlock preference controller crash
bohu [Thu, 14 Feb 2019 16:23:25 +0000 (08:23 -0800)]
developer-options: avoid oem-unlock preference controller crash

If there is no FEATURE_TELEPHONY_CARRIERLOCK.

BUG: 123583878

Test: lunch sdk_phone_x86-eng
make -j
emulator
the Settings->System->Developer options should not crash

Test:
make RunSettingsRoboTests ROBOTEST_FILTER=OemUnlockPreferenceControllerTest
should all pass (12 tests: 11 existing and 1 new)

Change-Id: I18c08c1ff1a7860616b0081ede4eb19dcfa8814b

5 years agoMerge "Move horizontal progress bar into SettingsLib."
TreeHugger Robot [Wed, 13 Feb 2019 13:53:56 +0000 (13:53 +0000)]
Merge "Move horizontal progress bar into SettingsLib."

5 years agoMerge "Fix some problems with the "Mobile network" preference"
TreeHugger Robot [Wed, 13 Feb 2019 05:44:06 +0000 (05:44 +0000)]
Merge "Fix some problems with the "Mobile network" preference"

5 years ago[automerger skipped] Merge "Support entitlement check in DSDS" am: e3b4e0262c am...
Mark Chien [Wed, 13 Feb 2019 04:58:48 +0000 (20:58 -0800)]
[automerger skipped] Merge "Support entitlement check in DSDS" am: e3b4e0262c am: 0ac1c323b2
am: edc4fd30ea -s ours
am skip reason: change_id Ia4279a418dfa6cd14942b7f4d2a313156066381b with SHA1 1dd1d79d90 is in history

Change-Id: Ie6064467c68640776ec4abffdea90943880effc2

5 years agoMerge "Show app usage data for the correct cycle."
TreeHugger Robot [Wed, 13 Feb 2019 04:49:42 +0000 (04:49 +0000)]
Merge "Show app usage data for the correct cycle."

5 years agoMerge "Add LOCAL_RESOURCE_DIR in Settings makefile" am: 3905ad125d am: dd3e2c4f27
Fan Zhang [Wed, 13 Feb 2019 04:12:49 +0000 (20:12 -0800)]
Merge "Add LOCAL_RESOURCE_DIR in Settings makefile" am: 3905ad125d am: dd3e2c4f27
am: 80fd417a58

Change-Id: I7b55262d7e3296a29e7efe4d33a4cab70e000175

5 years agoMerge "Support entitlement check in DSDS" am: e3b4e0262c
Mark Chien [Wed, 13 Feb 2019 04:06:32 +0000 (20:06 -0800)]
Merge "Support entitlement check in DSDS" am: e3b4e0262c
am: 0ac1c323b2

Change-Id: I9249eabb454648594ac5e303405f483266eee551

5 years agoMerge "Add LOCAL_RESOURCE_DIR in Settings makefile" am: 3905ad125d
Fan Zhang [Wed, 13 Feb 2019 03:33:56 +0000 (19:33 -0800)]
Merge "Add LOCAL_RESOURCE_DIR in Settings makefile" am: 3905ad125d
am: dd3e2c4f27

Change-Id: Ia2c1fa2eabcbe784e0d5525baf68d866f2366e6f

5 years agoMerge "Support entitlement check in DSDS"
Mark Chien [Wed, 13 Feb 2019 03:25:31 +0000 (19:25 -0800)]
Merge "Support entitlement check in DSDS"
am: e3b4e0262c

Change-Id: I6adb628af2a084f784fabe66ea2ba896fabc80b8

5 years agoMerge "Add LOCAL_RESOURCE_DIR in Settings makefile"
Fan Zhang [Wed, 13 Feb 2019 02:41:40 +0000 (18:41 -0800)]
Merge "Add LOCAL_RESOURCE_DIR in Settings makefile"
am: 3905ad125d

Change-Id: I04b1f12f0319c71b8bcf8703e6804c779a118782

5 years ago[automerger skipped] Merge "Schematize ADB system properties" am: 750b90a22b am:...
Kiyoung Kim [Wed, 13 Feb 2019 02:35:41 +0000 (18:35 -0800)]
[automerger skipped] Merge "Schematize ADB system properties" am: 750b90a22b am: 974ace22f9
am: de1971d7a0 -s ours
am skip reason: change_id Iec37f5f35b1452afdf7b15e9f31c4b4726127065 with SHA1 37bd3482ca is in history

Change-Id: Ic69304743c51cb1c07d20ce8d60f8d1c3f269a42

5 years agoMerge "Support entitlement check in DSDS"
Mark Chien [Wed, 13 Feb 2019 02:29:01 +0000 (02:29 +0000)]
Merge "Support entitlement check in DSDS"

5 years agoMerge "Schematize ADB system properties" am: 750b90a22b
Kiyoung Kim [Wed, 13 Feb 2019 02:18:16 +0000 (18:18 -0800)]
Merge "Schematize ADB system properties" am: 750b90a22b
am: 974ace22f9

Change-Id: I04ab4b50e76d05341b4033c5e44cc6cb62964c39

5 years agoMerge "Misc ui tweaks."
TreeHugger Robot [Wed, 13 Feb 2019 02:15:54 +0000 (02:15 +0000)]
Merge "Misc ui tweaks."

5 years agoMerge "Schematize ADB system properties"
Kiyoung Kim [Wed, 13 Feb 2019 02:06:33 +0000 (18:06 -0800)]
Merge "Schematize ADB system properties"
am: 750b90a22b

Change-Id: Ic122a93723e15b4a00e061e38e2741af457ed576

5 years agoShow app usage data for the correct cycle.
Doris Ling [Sat, 9 Feb 2019 01:22:32 +0000 (17:22 -0800)]
Show app usage data for the correct cycle.

- when launching the app data usage from the data usage list, pass the
info about the current cycle that the user is looking at, and select
the same cycle by default when the page is first launched to match the
data on the previous page.

Change-Id: Ic91bd8ee78db4d76551dff4b132c1b74d4b3c19d
Fixes: 123192721
Test: make RunSettingsRoboTests

5 years agoMerge "Update spec for CardPreference"
TreeHugger Robot [Wed, 13 Feb 2019 00:39:24 +0000 (00:39 +0000)]
Merge "Update spec for CardPreference"

5 years agoMisc ui tweaks.
Fan Zhang [Tue, 12 Feb 2019 20:29:49 +0000 (12:29 -0800)]
Misc ui tweaks.

- Update conditional card layout
  - move action button from right side to bottom.
  - Get rid of the forking between small/big screens.

- Update a few icons

Fixes: 121189136
Fixes: 124315564
Fixes: 124316920

Test: visual
Change-Id: I205d9995a2d7ed06ad9d32f3cea74f2840a28aed

5 years agoMerge "Add LOCAL_RESOURCE_DIR in Settings makefile"
Fan Zhang [Wed, 13 Feb 2019 00:12:08 +0000 (00:12 +0000)]
Merge "Add LOCAL_RESOURCE_DIR in Settings makefile"

5 years agoMerge "Remove the drop shadow in Privacy screen"
Fan Zhang [Tue, 12 Feb 2019 23:30:21 +0000 (23:30 +0000)]
Merge "Remove the drop shadow in Privacy screen"

5 years agoMerge "Add intent action for BT device detail page"
Lei Yu [Tue, 12 Feb 2019 19:40:18 +0000 (19:40 +0000)]
Merge "Add intent action for BT device detail page"

5 years agoMerge "Schematize ADB system properties"
Treehugger Robot [Tue, 12 Feb 2019 18:35:23 +0000 (18:35 +0000)]
Merge "Schematize ADB system properties"

5 years agoMerge "Updated permission name according to API review"
TreeHugger Robot [Tue, 12 Feb 2019 18:27:46 +0000 (18:27 +0000)]
Merge "Updated permission name according to API review"

5 years agoMerge "Separate OTA data usage from SYSTEM_UID."
Doris Ling [Tue, 12 Feb 2019 18:27:30 +0000 (18:27 +0000)]
Merge "Separate OTA data usage from SYSTEM_UID."

5 years agoMerge "Remove sub-text from the lines of AP list in Wi-Fi Slice"
Fan Zhang [Tue, 12 Feb 2019 17:59:05 +0000 (17:59 +0000)]
Merge "Remove sub-text from the lines of AP list in Wi-Fi Slice"

5 years agoSupport entitlement check in DSDS
markchien [Fri, 11 Jan 2019 08:18:20 +0000 (16:18 +0800)]
Support entitlement check in DSDS

Get resource from preferred SIM's subId.

Bug: 122108346
Bug: 120069528
Test: atest TetherServiceTest
Change-Id: Ia4279a418dfa6cd14942b7f4d2a313156066381b
Merged-in: Ia4279a418dfa6cd14942b7f4d2a313156066381b

5 years agoRemove sub-text from the lines of AP list in Wi-Fi Slice
Jason Chiu [Thu, 24 Jan 2019 08:32:31 +0000 (16:32 +0800)]
Remove sub-text from the lines of AP list in Wi-Fi Slice

- Remove sub-text from the lines of AP list
- Add colors to the AP names to indicate the connection status of each AP

Fixes: 120685004
Bug: 120786304
Test: make RunSettingsRoboTests -j
Change-Id: I7b879248528a293d14d959994bb054275f0d69a1

5 years agoMerge "Support entitlement check in DSDS"
Mark Chien [Tue, 12 Feb 2019 08:05:11 +0000 (08:05 +0000)]
Merge "Support entitlement check in DSDS"

5 years agoRemove the drop shadow in Privacy screen
tmfang [Tue, 12 Feb 2019 05:52:53 +0000 (13:52 +0800)]
Remove the drop shadow in Privacy screen

Remove shadow in action bar unless page is scrolling.

Test: visual, robotest
Change-Id: I199c659a7a7beecc3b715916b6829a5a879c4c74
Fixes: 123903344

5 years agoMerge "Add carrier settings version to network details page"
TreeHugger Robot [Tue, 12 Feb 2019 05:01:37 +0000 (05:01 +0000)]
Merge "Add carrier settings version to network details page"

5 years agoMerge "Increase timeout of contextual card pre-check."
TreeHugger Robot [Tue, 12 Feb 2019 04:38:35 +0000 (04:38 +0000)]
Merge "Increase timeout of contextual card pre-check."

5 years agoMerge "Handle simplified Slice deep link intent pattern."
TreeHugger Robot [Tue, 12 Feb 2019 04:21:34 +0000 (04:21 +0000)]
Merge "Handle simplified Slice deep link intent pattern."

5 years agoMerge "Add nearby device SlicePreference"
TreeHugger Robot [Tue, 12 Feb 2019 04:16:26 +0000 (04:16 +0000)]
Merge "Add nearby device SlicePreference"

5 years ago[automerger skipped] Merge "Schematize Display system properties" am: b139a4c16b...
Kiyoung Kim [Tue, 12 Feb 2019 03:47:09 +0000 (19:47 -0800)]
[automerger skipped] Merge "Schematize Display system properties" am: b139a4c16b am: 4d8f4919e0
am: b941bc46b5 -s ours
am skip reason: change_id I83b40ddfcde32d8d03fae73f5c252013933c466c with SHA1 1a3425ed2a is in history

Change-Id: I880ee2758010f1be44e9f24bbc35596fbccea0d8

5 years agoMerge "Schematize Display system properties" am: b139a4c16b
Kiyoung Kim [Tue, 12 Feb 2019 03:25:50 +0000 (19:25 -0800)]
Merge "Schematize Display system properties" am: b139a4c16b
am: 4d8f4919e0

Change-Id: I35412244d1fa97cb479d060e876bfddac6b523cb

5 years agoMerge "Fix Wi-Fi DPP fragment back stack problems"
TreeHugger Robot [Tue, 12 Feb 2019 03:17:57 +0000 (03:17 +0000)]
Merge "Fix Wi-Fi DPP fragment back stack problems"

5 years agoMerge "Schematize Display system properties"
Kiyoung Kim [Tue, 12 Feb 2019 03:13:51 +0000 (19:13 -0800)]
Merge "Schematize Display system properties"
am: b139a4c16b

Change-Id: I82b157865fb288044c251d6d78ca850b22502db0

5 years agoSchematize ADB system properties
Kiyoung Kim [Thu, 27 Dec 2018 05:31:48 +0000 (14:31 +0900)]
Schematize ADB system properties

Properties accessed across partitions are now schematized and will
become APIs to make explicit interfaces among partitions.

Bug: 117924132
Test: m -j
Change-Id: Iec37f5f35b1452afdf7b15e9f31c4b4726127065
Merged-In: Iec37f5f35b1452afdf7b15e9f31c4b4726127065

5 years agoMerge "Schematize Display system properties"
Treehugger Robot [Tue, 12 Feb 2019 02:50:08 +0000 (02:50 +0000)]
Merge "Schematize Display system properties"

5 years agoAdd nearby device SlicePreference
jackqdyulei [Fri, 8 Feb 2019 22:09:12 +0000 (14:09 -0800)]
Add nearby device SlicePreference

Change-Id: I9e88602df9ab589c3eea087b1202cbc7615dc810
Fixes: 116327443
Test: RunSettingsRoboTests

5 years agoMerge "Remove intent-filters from SettingsSliceProvider"
TreeHugger Robot [Tue, 12 Feb 2019 00:43:03 +0000 (00:43 +0000)]
Merge "Remove intent-filters from SettingsSliceProvider"

5 years agoHandle simplified Slice deep link intent pattern.
Fan Zhang [Mon, 11 Feb 2019 23:51:20 +0000 (15:51 -0800)]
Handle simplified Slice deep link intent pattern.

Old intent:
settings://com.android.settings.slices?intent=android-app%3A%2F%2Fcom.android.settings%23Intent%3Baction%3Dcom.android.settings.action.VIEW_SLICE%3BS.slice%3Dcontent%253A%252F%252Fcom.android.settings.slices%252Faction%252Fscreen_magnification_navbar_preference_screen%3B

New intent:
settings://com.android.settings.slices?slice%3Dcontent%253A%252F%252Fcom.android.settings.slices%252Faction%252Fscreen_magnification_navbar_preference_screen%3B

Change-Id: Ia786812c68b5a2b1858203f62494c0d5f5a4a5ba
Fixes: 110156445
Test: manual

5 years agoMerge "Don't load anything from contextual card db in legacy mode."
TreeHugger Robot [Tue, 12 Feb 2019 00:15:25 +0000 (00:15 +0000)]
Merge "Don't load anything from contextual card db in legacy mode."

5 years agoRemove intent-filters from SettingsSliceProvider
Fan Zhang [Mon, 11 Feb 2019 22:38:13 +0000 (14:38 -0800)]
Remove intent-filters from SettingsSliceProvider

And remove unused methods from SliceDeepLinkSpringBoard.

This is part 1 of b/110156445

Bug: 110156445
Test: atest
Change-Id: Iab36a97332fd847ed911a9e34b505fd4a64522d3

5 years agoMerge "Create special case mobile data slice"
TreeHugger Robot [Mon, 11 Feb 2019 22:53:50 +0000 (22:53 +0000)]
Merge "Create special case mobile data slice"

5 years agoAdd carrier settings version to network details page
Antony Sargent [Mon, 11 Feb 2019 22:18:00 +0000 (14:18 -0800)]
Add carrier settings version to network details page

This adds a preference showing the carrier settings version to the
mobile network details page.

Bug: 123995414
Test: make RunSettingsRoboTests
Change-Id: I7b80ead0eadb7375b4404262337e47f75102125c

5 years agoAdd intent action for BT device detail page
jackqdyulei [Thu, 7 Feb 2019 23:47:52 +0000 (15:47 -0800)]
Add intent action for BT device detail page

Also update detail page to accept cold start:
1. Check whether profile is ready
2. When it is ready, refresh UI

Bug: 123665527
Test: SettingsRoboTests
Change-Id: I39382fd97e9da46fca08cd2e4a3ef15d32703664

5 years agoUpdate spec for CardPreference
jackqdyulei [Mon, 11 Feb 2019 21:42:41 +0000 (13:42 -0800)]
Update spec for CardPreference

Make icon and title align to other preference

Bug: 119618813
Test: Manual
Change-Id: I2b088fcfe0b005cde1d79db01806e1919cb131cc

5 years agoDon't load anything from contextual card db in legacy mode.
Fan Zhang [Mon, 11 Feb 2019 21:17:07 +0000 (13:17 -0800)]
Don't load anything from contextual card db in legacy mode.

Change-Id: I2fa1ee78bb8878c2cf46fd2f59499c9ed8eb0a09
Fixes: 124246284
Test: robotest

5 years agoMerge "Update search for mobile network settings"
Lei Yu [Mon, 11 Feb 2019 18:00:57 +0000 (18:00 +0000)]
Merge "Update search for mobile network settings"

5 years agoFix some problems with the "Mobile network" preference
Antony Sargent [Sat, 9 Feb 2019 00:41:30 +0000 (16:41 -0800)]
Fix some problems with the "Mobile network" preference

This fixes a few issues with the "Mobile network" preference that shows
on the Network & internet page:

-The pref should not be available at all if the device is wifi-only.

-The pref should be disabled in airplane mode.

-If eSIM support is disabled, we need to disable entry points for adding
 a new eSIM subscription (the summary and click handler in single-SIM
 mode with no physical SIM, and the 'add' button in dual-SIM mode).

Bug: 116349402
Test: make RunSettingsRoboTests
Change-Id: Ic6fe426e9f890d80b399d48a2c9984d4d8b02a10

5 years agoFix Wi-Fi DPP fragment back stack problems
Arc Wang [Thu, 31 Jan 2019 03:07:38 +0000 (11:07 +0800)]
Fix Wi-Fi DPP fragment back stack problems

1. When a Wi-Fi network connected and receiving
   intent android.settings.PROCESS_WIFI_EASY_CONNECT_QR_CODE,
   show WifiDppAddDeviceFragment from WifiDppConfiguratorActivity
   instead of WifiNetworkListFragment

2. Only handle intent when savedInstanceState is null

3. To show a fragment
   I. do nothing when a fragment is already visible on screen,
   II. pop back stack if it's in back stack, we can do this because
   current fragment transactions are arranged in an order

Bug: 124194531
Test: atest WifiQrCodeTest
      atest WifiDppConfiguratorActivityTest
      atest WifiDppEnrolleeActivityTest
      atest WifiDppQrCodeGeneratorFragmentTest
      atest WifiDppQrCodeScannerFragmentTest
      atest WifiNetworkListFragmentTest
      atest WifiDppChooseSavedWifiNetworkFragmentTest

Change-Id: I1d44eeb3bdc7bfb2ec2e4d81efaab64b066651ad

5 years agoMerge "Remove hardcode class path for CredentialStorage."
TreeHugger Robot [Sat, 9 Feb 2019 01:47:35 +0000 (01:47 +0000)]
Merge "Remove hardcode class path for CredentialStorage."

5 years agoUpdate search for mobile network settings
jackqdyulei [Wed, 9 Jan 2019 21:15:53 +0000 (13:15 -0800)]
Update search for mobile network settings

This CL make all mobile related preferences support:
1. If subId is manually set, check visibility by subId
2. If not, try find whether there is one active subId meets requirement.
If so, isAvailable() will return true to enable search.

Bug: 77276236
Test: RunSettingsRoboTests
Change-Id: I24e2d2f5e882284ba8e997b844caee7722b6b07d

5 years agoMerge "Add divider line in battery page"
Lei Yu [Sat, 9 Feb 2019 00:20:35 +0000 (00:20 +0000)]
Merge "Add divider line in battery page"

5 years agoRemove hardcode class path for CredentialStorage.
Fan Zhang [Fri, 8 Feb 2019 22:54:05 +0000 (14:54 -0800)]
Remove hardcode class path for CredentialStorage.

It can launch with a intent action directly.

Change-Id: I26a3a63d1790c1fd184b38711c736428f86f3659
Fixes: 124124110
Test: manual

5 years agoMerge changes I9185949e,Ia0f15fd7
TreeHugger Robot [Fri, 8 Feb 2019 22:41:40 +0000 (22:41 +0000)]
Merge changes I9185949e,Ia0f15fd7

* changes:
  Remove advanced button from location settings
  Update strings on date & time setting.

5 years agoMerge "Set summary for SIM entries in multi-SIM header"
TreeHugger Robot [Fri, 8 Feb 2019 22:06:18 +0000 (22:06 +0000)]
Merge "Set summary for SIM entries in multi-SIM header"

5 years agoMerge "Use system attr instead of hardcoding for searchbar radius"
TreeHugger Robot [Fri, 8 Feb 2019 21:32:47 +0000 (21:32 +0000)]
Merge "Use system attr instead of hardcoding for searchbar radius"

5 years agoAdd divider line in battery page
jackqdyulei [Fri, 8 Feb 2019 21:11:04 +0000 (13:11 -0800)]
Add divider line in battery page

Change-Id: Ib5b1d7980cb6c453bb656a36ff6f1bb62bffc803
Fixes: 119618813
Test: Manual

5 years agoCreate special case mobile data slice
Matthew Fritze [Thu, 10 Jan 2019 18:02:49 +0000 (10:02 -0800)]
Create special case mobile data slice

Build the special case mobile data slice for general use,
and for the Internet Connectivity Panel. The Slice controls
the default data subscription, and links to the subscriptions
page.

Bug: 117804089
Fixse: 119411534
Test: robotests & test app.

Change-Id: I31b524a8fe3182a244d940848090e97250632f39

5 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 8 Feb 2019 20:57:24 +0000 (20:57 +0000)]
Merge "Import translations. DO NOT MERGE"

5 years agoRemove advanced button from location settings
Fan Zhang [Fri, 8 Feb 2019 20:36:13 +0000 (12:36 -0800)]
Remove advanced button from location settings

Change-Id: I9185949edffbc4588287221b81d30e136e755f85
Fixes: 124059127
Test: manual

5 years agoSet summary for SIM entries in multi-SIM header
Antony Sargent [Thu, 7 Feb 2019 18:22:29 +0000 (10:22 -0800)]
Set summary for SIM entries in multi-SIM header

On the Network & internet page, when you have multiple active SIMs we
add a header with an entry for each one. This CL sets the summary for
those entries to be a 1 or 2 line indication of what services (calls,
SMS, and data) that SIM is used for by default, or just an indication
that the SIM is available. And for the SIM used by default for data, we
include status information about whether it's connected or not.

Bug: 116349402
Test: make RunSettingsRoboTests
Change-Id: I46f37433f753724bbde8876f0d89c3155b2c3812

5 years agoUpdate strings on date & time setting.
Fan Zhang [Fri, 8 Feb 2019 19:16:05 +0000 (11:16 -0800)]
Update strings on date & time setting.

Change-Id: Ia0f15fd7e680d6dd864567a31186b7e2090c435f
Fixes: 123812588
Test: visual

5 years agoUse system attr instead of hardcoding for searchbar radius
Fan Zhang [Fri, 8 Feb 2019 17:46:31 +0000 (09:46 -0800)]
Use system attr instead of hardcoding for searchbar radius

Change-Id: I41aa10b7fc13271e2d9369fe4dc4e1808a0c1044
Fixes: 123985440
Test: visual

5 years agoSeparate OTA data usage from SYSTEM_UID.
Andrew Sapperstein [Fri, 14 Dec 2018 21:25:48 +0000 (13:25 -0800)]
Separate OTA data usage from SYSTEM_UID.

Prior to this CL, Process.OTA_UPDATE_UID was included with SYSTEM_UID
for the purposes of per-app data usage in the DataUsageList. With this
change, it is now separated into its own category.

This change also deletes the duplicate ic_system_update* icons and
moves the one implementation into SettingsLib.

Fixes: 70640191
Test: manually verified locally that there is an item in the list
with the proper title. Required setting up a custom OTA for my
test device.

Change-Id: Iecc45648f68a12c9f8e2370577ab017863e7fcb2

5 years agoMerge "Fix failing test"
Julia Reynolds [Fri, 8 Feb 2019 17:53:43 +0000 (17:53 +0000)]
Merge "Fix failing test"

5 years agoUpdated permission name according to API review
Bernard Chau [Fri, 8 Feb 2019 15:50:24 +0000 (15:50 +0000)]
Updated permission name according to API review

Fix: 123661671
Test: N/A
Change-Id: Ia06c4ede8b9379e84a87454dbca8ba361a4f49b4

5 years agoFix failing test
Julia Reynolds [Fri, 8 Feb 2019 15:49:11 +0000 (10:49 -0500)]
Fix failing test

Test: robo tests
Change-Id: Ic4c927948b3c91a126ab830960e12550a5fd80fa
Fixes: 124077441

5 years agoMerge "Logging SetNewPasswordActivity events"
TreeHugger Robot [Fri, 8 Feb 2019 13:59:19 +0000 (13:59 +0000)]
Merge "Logging SetNewPasswordActivity events"

5 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 8 Feb 2019 09:07:35 +0000 (01:07 -0800)]
Import translations. DO NOT MERGE

Change-Id: Id12a885466480f418f45a1b6e881477771a4b86a
Auto-generated-cl: translation import

5 years agoMerge "Fix broken tests."
TreeHugger Robot [Fri, 8 Feb 2019 05:10:48 +0000 (05:10 +0000)]
Merge "Fix broken tests."

5 years agoMerge "Use correct default subscription id to get default network template."
TreeHugger Robot [Fri, 8 Feb 2019 04:09:00 +0000 (04:09 +0000)]
Merge "Use correct default subscription id to get default network template."

5 years agoFix broken tests.
Joel Galenson [Fri, 8 Feb 2019 03:36:21 +0000 (19:36 -0800)]
Fix broken tests.

This test was passing in invalid values for the namespace and key.
Modify it to use the correct ones.

Change-Id: Idc6971c20d64b711953bdde9fe710f592b04e807
Fixes: 124077137
Test: atest VibrateWhenRingPreferenceControllerTest

5 years agoUse correct default subscription id to get default network template.
Doris Ling [Thu, 31 Jan 2019 00:39:29 +0000 (16:39 -0800)]
Use correct default subscription id to get default network template.

- when launching the app info page and no network template is defined in
the launch arguments, use the correct default data subscription id to
check whether mobile network template should be used or not.

Change-Id: If9341abf3416c775a2b7407c1d6d0b33f4aad67f
Fixes: 120098637
Test: make RunSettingsRoboTests

5 years agoMerge "Update strings"
TreeHugger Robot [Thu, 7 Feb 2019 22:29:40 +0000 (22:29 +0000)]
Merge "Update strings"

5 years agoUpdate strings
Fan Zhang [Thu, 7 Feb 2019 19:53:59 +0000 (11:53 -0800)]
Update strings

Change-Id: Idbf1e3a8b0c7116271e424548ef37340199eaea2
Fixes: 124049901
Test: manual

5 years agoMerge "Revert "Update proguard""
TreeHugger Robot [Thu, 7 Feb 2019 17:42:47 +0000 (17:42 +0000)]
Merge "Revert "Update proguard""

5 years agoMerge "Fix mobile data on/off switch for multi-sim case"
TreeHugger Robot [Thu, 7 Feb 2019 16:51:02 +0000 (16:51 +0000)]
Merge "Fix mobile data on/off switch for multi-sim case"

5 years agoMove horizontal progress bar into SettingsLib.
Joel Galenson [Tue, 29 Jan 2019 21:33:48 +0000 (13:33 -0800)]
Move horizontal progress bar into SettingsLib.

Remove the horizontal progress bar as it is being moved into
SettingsLib.

Bug: 123538370
Test: See progress bar in wifi settings screen.
Change-Id: I8fc94b1f3a7a52559cfcf89f3e4a604784ec9995

5 years agoMerge "Use ColorDisplayManager for night display settings"
Christine Franks [Thu, 7 Feb 2019 16:11:14 +0000 (16:11 +0000)]
Merge "Use ColorDisplayManager for night display settings"

5 years agoMerge "Enable data when user selects default data through popped up dialog."
Xiangyu/Malcolm Chen [Thu, 7 Feb 2019 03:34:14 +0000 (03:34 +0000)]
Merge "Enable data when user selects default data through popped up dialog."

5 years agoMerge "Retrieve effectiveUserId after userId is set/re-set"
TreeHugger Robot [Thu, 7 Feb 2019 02:01:21 +0000 (02:01 +0000)]
Merge "Retrieve effectiveUserId after userId is set/re-set"

5 years agoMerge "Merge bool.xml and config.xml into one file."
TreeHugger Robot [Thu, 7 Feb 2019 00:16:30 +0000 (00:16 +0000)]
Merge "Merge bool.xml and config.xml into one file."

5 years agoMerge "Change device ID developer setting to disable option"
Michael Groover [Thu, 7 Feb 2019 00:03:59 +0000 (00:03 +0000)]
Merge "Change device ID developer setting to disable option"

5 years agoMerge changes I690fa4c2,I53632e4e
Fan Zhang [Wed, 6 Feb 2019 23:51:57 +0000 (23:51 +0000)]
Merge changes I690fa4c2,I53632e4e

* changes:
  Use system defined card corners instead of hardcoding to 8.
  Add PRIVACY_SETTINGS intent to privacy, not backup, page.

5 years agoEnable data when user selects default data through popped up dialog.
Malcolm Chen [Wed, 6 Feb 2019 23:23:23 +0000 (15:23 -0800)]
Enable data when user selects default data through popped up dialog.

In DSDS device, when user explicitly selects a SIM as data SIM, we
should not only set it as default data SIM in Telephony, but also
enable its data.

Bug: 120712558
Test: manual
Change-Id: I429efa090ebf5bb71ee491ae66525abee00f62c6

5 years agoFix mobile data on/off switch for multi-sim case
Antony Sargent [Wed, 6 Feb 2019 21:55:08 +0000 (13:55 -0800)]
Fix mobile data on/off switch for multi-sim case

In multi-sim, the on/off switch for mobile data on the mobile network
details page doesn't quite work right. The thing it's missing is
checking whether the current sim is the default one used for data - if
it's not the default, then the switch should be off even if mobile data
is turned on. And clicking to enable needs to prompt the user to ask if
this sim should be become the new default one, which we already have
code for, but we weren't triggering it properly.

Bug: 124005813
Test: make RunSettingsRoboTests
Change-Id: Ifdf58addfde94b3bac85c68e4b22ddfbaf01dff7

5 years agoMerge bool.xml and config.xml into one file.
Fan Zhang [Wed, 6 Feb 2019 22:17:53 +0000 (14:17 -0800)]
Merge bool.xml and config.xml into one file.

Bug: 124008048
Test: rebuild
Change-Id: I3a6522e6d0939ef1f80406d91b35492360916aa1

5 years agoChange device ID developer setting to disable option
Michael Groover [Wed, 6 Feb 2019 22:09:13 +0000 (14:09 -0800)]
Change device ID developer setting to disable option

Bug: 123646983
Test: Manually verified toggling the option set the expected value
Change-Id: Ia219c154d9572111c4fce1af4128a103ba0409ec

5 years agoUse system defined card corners instead of hardcoding to 8.
Fan Zhang [Wed, 6 Feb 2019 18:43:54 +0000 (10:43 -0800)]
Use system defined card corners instead of hardcoding to 8.

Change-Id: I690fa4c2d5a52d1cb6e1606b5c961d0116a5707b
Fixes: 123985440
Test: visual

5 years agoAdd PRIVACY_SETTINGS intent to privacy, not backup, page.
Fan Zhang [Wed, 6 Feb 2019 18:37:03 +0000 (10:37 -0800)]
Add PRIVACY_SETTINGS intent to privacy, not backup, page.

Bug: 123878762
Test: updated backupSettingsHelper
Change-Id: I53632e4eeb5fa42447aa5fc075be69eeb68cdd52

5 years agoRetrieve effectiveUserId after userId is set/re-set
Kevin Chyn [Wed, 6 Feb 2019 02:55:52 +0000 (18:55 -0800)]
Retrieve effectiveUserId after userId is set/re-set

Fixes: 123502937

Test: Followed steps in comment #1 of the first bug above
      Note that the test should be done with unified lock disabled, e.g.
      have separate pin/pattern/pass for owner and work profile

Change-Id: I01d66a8a1d3ed1811497c2acb7db6158d99727a0

5 years agoMerge "Add master audio balance setting"
Andy Hung [Wed, 6 Feb 2019 18:51:35 +0000 (18:51 +0000)]
Merge "Add master audio balance setting"

5 years agoMerge "Add an on/off switch to the top of mobile network details page"
TreeHugger Robot [Wed, 6 Feb 2019 18:00:25 +0000 (18:00 +0000)]
Merge "Add an on/off switch to the top of mobile network details page"

5 years agoRevert "Update proguard"
Beverly Tai [Wed, 6 Feb 2019 15:44:20 +0000 (15:44 +0000)]
Revert "Update proguard"

This reverts commit dbd48da49aea77397b0418130cb798fa46851a84.

Reason for revert: was only hiding aware settings for beta 1
Bug: 123532083
Change-Id: I7d07f9ec62a3bd6f81838da1e2639102d501e1c4

5 years agoMerge "Add settings for notification bubbling"
Julia Reynolds [Wed, 6 Feb 2019 13:41:43 +0000 (13:41 +0000)]
Merge "Add settings for notification bubbling"

5 years agoUpdate header test to 'Work profile input & assistance'
Yohei Yukawa [Wed, 6 Feb 2019 03:54:59 +0000 (19:54 -0800)]
Update header test to 'Work profile input & assistance'

Per suggestion from UX, this CL updates the category header of
work-profile specific enties in Languages & input from
  Work profile
to
  Work profile input & assistance.

Other than that, there is no user-visible behavior change.

Bug: 123314089
Test: Manually verified as follows.
  1. Build and flash an AOSP build
  2. Install Test DPC
  3. Open Settings -> System -> Languages & input
  4. Make sure that the new category header for work-profile specific
     entries is now shown as "Work profile input & assistance"
Change-Id: I4a4fb7c8a31d8d849780e71796b92ec0a2f026e3

5 years agoMerge "Move android.settings.PRIVACY_SETTINGS to PrivacySettings."
TreeHugger Robot [Wed, 6 Feb 2019 03:20:35 +0000 (03:20 +0000)]
Merge "Move android.settings.PRIVACY_SETTINGS to PrivacySettings."