OSDN Git Service

android-x86/packages-apps-Settings.git
5 years ago1/n: Prepare ConfirmDeviceCredentials to use BiometricPrompt
Kevin Chyn [Thu, 4 Oct 2018 01:39:22 +0000 (18:39 -0700)]
1/n: Prepare ConfirmDeviceCredentials to use BiometricPrompt

CDC is going to use BiometricPrompt instead. This change
removes FingerprintManager from CDC. BiometricPrompt
will show before pin/pattern/pass is shown.

Bug: 111461540

Test: modified BiometricPromptDemo to use
      KeyguardManager#createConfirmDeviceCredentialIntent,
Test: Fingerprint is gone from CDC, rotation works
Test: atest SettingsRoboTests

Change-Id: I9ce2aad71961af8a0d5ee636600e2fbdb6154e47

5 years agoMerge "Rename a bunch of mobile network files"
Lei Yu [Wed, 31 Oct 2018 20:04:03 +0000 (20:04 +0000)]
Merge "Rename a bunch of mobile network files"

5 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 31 Oct 2018 19:40:26 +0000 (19:40 +0000)]
Merge "Import translations. DO NOT MERGE"

5 years agoMerge "Update network select page"
TreeHugger Robot [Wed, 31 Oct 2018 18:56:43 +0000 (18:56 +0000)]
Merge "Update network select page"

5 years agoMerge "Add a feature flag for new version of Network and internet settings page"
TreeHugger Robot [Wed, 31 Oct 2018 08:06:31 +0000 (08:06 +0000)]
Merge "Add a feature flag for new version of Network and internet settings page"

5 years agoMerge "Add ACL state listener for bt devices"
Lei Yu [Wed, 31 Oct 2018 06:12:46 +0000 (06:12 +0000)]
Merge "Add ACL state listener for bt devices"

5 years agoAdd a feature flag for new version of Network and internet settings page
Antony Sargent [Mon, 29 Oct 2018 21:59:15 +0000 (14:59 -0700)]
Add a feature flag for new version of Network and internet settings page

In addition to adding the flag, this also adds a new xml layout that is
the same as the existing network and internet page, but will begin to be
changed in subsequent CLs. There is also a change in code to use this
new layout when the flag is turned on.

One other change is to make the list of displayed feature flags in
developer options be in sorted order instead of whatever semirandom
order they come out of the map's key set.

Bug: 116349402
Test: Manual (settings_network_and_internet_v2 flag should should up in
Settings -> System -> Developer options -> Feature flags, and those
flags should be in sorted order)

Change-Id: I5520d286efb6bec50ba4ca99f64aeca94f01d533

5 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 31 Oct 2018 04:18:57 +0000 (21:18 -0700)]
Import translations. DO NOT MERGE

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

5 years agoRename a bunch of mobile network files
jackqdyulei [Mon, 29 Oct 2018 20:46:33 +0000 (13:46 -0700)]
Rename a bunch of mobile network files

1. Make them have "MobileNetwork" prefix
2. Also update WifiCallingPreference to remove its category
if it is invisible

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I25871d579d6495e902e5583030889942ed2506a8

5 years agoMerge "Update the mobile activity"
Lei Yu [Tue, 30 Oct 2018 22:56:01 +0000 (22:56 +0000)]
Merge "Update the mobile activity"

5 years agoAdd ACL state listener for bt devices
jackqdyulei [Tue, 30 Oct 2018 18:28:17 +0000 (11:28 -0700)]
Add ACL state listener for bt devices

Bug: 79947085
Test: RunSettingsRoboTests
Change-Id: Ic8bee34fa940f95265ed838f7c7f038ba3cf8143

5 years agoMerge "Stop showing account based cards in homepage."
Fan Zhang [Tue, 30 Oct 2018 22:31:04 +0000 (22:31 +0000)]
Merge "Stop showing account based cards in homepage."

5 years agoUpdate network select page
jackqdyulei [Mon, 29 Oct 2018 19:44:14 +0000 (12:44 -0700)]
Update network select page

1. use getPrefContext() to make sure it has correct style
2. Move operation back to bg thread so it won't block UI

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I7737ea8b21d44790617b9c4f13a8c4c41037fca4

5 years agoMerge "Fix Display settings summary when there is no wallpaper."
Fan Zhang [Tue, 30 Oct 2018 21:16:26 +0000 (21:16 +0000)]
Merge "Fix Display settings summary when there is no wallpaper."

5 years agoStop showing account based cards in homepage.
Fan Zhang [Tue, 30 Oct 2018 19:48:44 +0000 (12:48 -0700)]
Stop showing account based cards in homepage.

Removed data usage/device info/emergency/storage cards

Bug: 118691898
Test: robotests
Change-Id: I9f1ef3f022be9ca37e3359a6820a716d4ebade0f

5 years agoFix Display settings summary when there is no wallpaper.
Fan Zhang [Mon, 29 Oct 2018 22:42:06 +0000 (15:42 -0700)]
Fix Display settings summary when there is no wallpaper.

Change-Id: I715cef9dc42de1231491b5a7184f0f151d94af11
Fixes: 69905032
Test: robotests

5 years agoMerge "Fix Settings crash on changing device orientation"
Raff Tsai [Tue, 30 Oct 2018 09:12:17 +0000 (09:12 +0000)]
Merge "Fix Settings crash on changing device orientation"

5 years agoFix Settings crash on changing device orientation
Raff Tsai [Mon, 29 Oct 2018 05:50:47 +0000 (13:50 +0800)]
Fix Settings crash on changing device orientation

- AppDataUsage assign preferences to Applist in loaderCallback.
When device rotate we will assign preference to Applist second
time which throw IllegalStateException Exception. We will use
restartLoader which create new loader rather than use existed
loader.

Change-Id: I540d645e930a29f989c4fe374e2103ca201da198
Fixes: 118195540
Test: manual

5 years agoMerge "Refine the logic to show/hide cdma preference"
TreeHugger Robot [Mon, 29 Oct 2018 22:55:57 +0000 (22:55 +0000)]
Merge "Refine the logic to show/hide cdma preference"

5 years agoMerge "Use ImeAwareEditText in FingerprintSettings"
TreeHugger Robot [Mon, 29 Oct 2018 22:48:29 +0000 (22:48 +0000)]
Merge "Use ImeAwareEditText in FingerprintSettings"

5 years agoMerge "Misc fixes to TTS settings."
Rakesh Iyer [Mon, 29 Oct 2018 21:26:26 +0000 (21:26 +0000)]
Merge "Misc fixes to TTS settings."

5 years agoRefine the logic to show/hide cdma preference
jackqdyulei [Fri, 26 Oct 2018 21:43:31 +0000 (14:43 -0700)]
Refine the logic to show/hide cdma preference

1. Add special check for "system select"
2. For cdma, need to check whether to hide carrier settings

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I0a20816912500725894208a60bba7a5c74912561

5 years ago[automerger skipped] Revert "resolve merge conflicts of 7849607a7ca9518f57fb22cca5665...
Lei Yu [Mon, 29 Oct 2018 20:55:51 +0000 (13:55 -0700)]
[automerger skipped] Revert "resolve merge conflicts of 7849607a7ca9518f57fb22cca5665b88e99134c2 to pi-dev-plus-aosp"
am: 73c361b544  -s ours

Change-Id: I93e8e42b3892dae3d2ab8ed7683503079e93df1a

5 years agoRevert "resolve merge conflicts of 7849607a7ca9518f57fb22cca5665b88e99134c2 to pi...
Lei Yu [Mon, 29 Oct 2018 20:33:19 +0000 (20:33 +0000)]
Revert "resolve merge conflicts of 7849607a7ca9518f57fb22cca5665b88e99134c2 to pi-dev-plus-aosp"

This reverts commit e81224d80c3af797003a40f06fc7563728a0da96.

Reason for revert: broke pi-dev-plus-aosp

Change-Id: Ib45b96216017d01b6301a558a0cd27bf1071779c
Merged-In: I3d2ebad2879479a870bcdfe596bb88b83c424389

5 years agoMerge "Add Connected Device slice to Contextual Settings Homepage"
TreeHugger Robot [Mon, 29 Oct 2018 20:27:24 +0000 (20:27 +0000)]
Merge "Add Connected Device slice to Contextual Settings Homepage"

5 years agoUse ImeAwareEditText in FingerprintSettings
Yohei Yukawa [Mon, 29 Oct 2018 20:09:12 +0000 (13:09 -0700)]
Use ImeAwareEditText in FingerprintSettings

Like we did the same thing in the Settings app [1][2][3],
FingerprintSetting is another instance that should use
ImeAwareEditText to make sure InputMethodManager#showSoftInput() is
called after the EditText gains IME focus.

This approach should be more robust and easier to maintain than trying
to control the software keyboard visibility with
SOFT_INPUT_STATE_ALWAYS_VISIBLE, which is more complicated that people
think.

This CL also removes RenameDialog#mTextHadFocus since
RenameDialog#mDialogTextField is always focused when the dialog is
shown [4].

This CL also removes the following fields since they can just be a
local final variables that will be captured into callback.

 * RenameDialog#mFingerName
 * RenameDialog#mTextSelectionStart
 * RenameDialog#mTextSelectionEnd

 [1]: I182b05d3ff59fb3b4732d60d0d5a464f0e0e0235
      f6af093e2dfd156768a3937e94d405c04c541fea
 [2]: I892d639f3cc5d43db553b682d5278b8ce2fe72da
      480326710681b1ef1c1a55cf38b3de10ed75f27e
 [3]: Ib75ba0f361b8b46c3b717cc1ffb864726958ed82
      b0bcbed3722bcd16ba16f49f36c84ed8f8825ae3
 [4]: I5bb1b7227c1323595bf7f483e11e87e2c3550093
      7a1d52eb061a7b936f15aa99b997a87f5bb0b16f

Fix: 118473687
Test: Manually verified as follows.
      1. Build and flash aosp_taimen-userdebug to Taimen
      2. Set up a fingerprint unlock.
      3. Rotate the device to landscape mode.
      4. Open Settings -> Security & location -> Fingerprint
      5. Re-enter password if necessary
      6. Tap "Finger 1"
      7. Make sure that AOSP Keyboard shows up
Change-Id: I2a137aa8f6a1ee2b67923bcf40e82320a56c7b59

5 years agoUpdate the mobile activity
jackqdyulei [Fri, 26 Oct 2018 00:16:49 +0000 (17:16 -0700)]
Update the mobile activity

1. Add listener to ACTION_RADIO_TECHNOLOGY_CHANGED
2. Update fragment switch by using replace
3. Remove todo for sort because list is already sorted by sim slot
4. Make actiivty accept SUB_ID from intent
5. Add icon for multi-sim support

Bug: 114749736
Test: RunSettingsRoboTests && Screenshot

Change-Id: I11c472b1479ec9243266cb2a7ef4292370ac6894

5 years agoMerge changes I57d59aa3,Ib7453a79
TreeHugger Robot [Mon, 29 Oct 2018 19:35:29 +0000 (19:35 +0000)]
Merge changes I57d59aa3,Ib7453a79

* changes:
  Report fully drawn when all settings are loaded.
  Make android.settings.SETTINGS intent go into homepage.

5 years agoMisc fixes to TTS settings.
Rakesh Iyer [Fri, 26 Oct 2018 19:45:38 +0000 (12:45 -0700)]
Misc fixes to TTS settings.

1. Remove an extra PreferenceGroup that was causing some spacing
   issues.
2. Remove the animations when elements resize because this causes
   items to slide around unnecessarily.
3. While we're in the file, lambda-ify some of the older code.

Bug: 77981482
Bug: 79897262
Test: Manually verified.
Change-Id: I9c79beea3a231ba62aeef3543802faebd775e128

5 years ago[automerger skipped] resolve merge conflicts of 7849607a7ca9518f57fb22cca5665b88e9913...
Lei Yu [Mon, 29 Oct 2018 17:15:01 +0000 (10:15 -0700)]
[automerger skipped] resolve merge conflicts of 7849607a7ca9518f57fb22cca5665b88e99134c2 to pi-dev-plus-aosp
am: e81224d80c  -s ours

Change-Id: Ic45574c2b07d33682ef8f68518c7ee99d38d171c

5 years agoAdd Connected Device slice to Contextual Settings Homepage
Yanting Yang [Fri, 5 Oct 2018 11:03:55 +0000 (19:03 +0800)]
Add Connected Device slice to Contextual Settings Homepage

- Support Bluetooth device information.
- Not yet integrate slice background worker.

Bug: 114807655
Test: robotests, visual
Change-Id: I23f902137b0468349ee627bed6a394d42ea4a00d

5 years agoReport fully drawn when all settings are loaded.
Fan Zhang [Fri, 26 Oct 2018 21:53:12 +0000 (14:53 -0700)]
Report fully drawn when all settings are loaded.

We do not want to wait for contextual cards in app start
instrumentation, as user can already do everything in settings without
them.

Change-Id: I57d59aa3d623bf6911972ec310d558c25e44bf14
Fixes: 117494071
Fixes: 118495692
Test: perftest

5 years agoMake android.settings.SETTINGS intent go into homepage.
Fan Zhang [Fri, 26 Oct 2018 20:40:38 +0000 (13:40 -0700)]
Make android.settings.SETTINGS intent go into homepage.

Change-Id: Ib7453a79a473410c44bdcf06019446cedd34f837
Fixes: 117281845
Test: robotests

5 years agoRemove all task affinities
Fan Zhang [Fri, 26 Oct 2018 22:39:39 +0000 (15:39 -0700)]
Remove all task affinities

Now every activity shares the same default affinity.

Change-Id: I0ad811334e57efdb8ba91547ef14e408fa179975
Fixes: 115666900
Test: manual

5 years agoAnimate contextual cards in after loading.
Fan Zhang [Fri, 26 Oct 2018 18:34:00 +0000 (11:34 -0700)]
Animate contextual cards in after loading.

After initial loading, all cards slide down per material guideline.

Test: visual
Change-Id: I115e086a43fc9a2d4b4da3acad20be689fdee09d

5 years agoMerge changes Idbb63960,Id7889566
TreeHugger Robot [Fri, 26 Oct 2018 19:18:19 +0000 (19:18 +0000)]
Merge changes Idbb63960,Id7889566

* changes:
  Delete some unused resources
  Move all contextual card related classes.

5 years agoMerge "Fix crash on Wi-Fi Slice when it's continuously pinned and unpinned"
TreeHugger Robot [Fri, 26 Oct 2018 19:10:29 +0000 (19:10 +0000)]
Merge "Fix crash on Wi-Fi Slice when it's continuously pinned and unpinned"

5 years agoDelete some unused resources
Fan Zhang [Thu, 25 Oct 2018 23:33:52 +0000 (16:33 -0700)]
Delete some unused resources

Test: rebuild
Change-Id: Idbb639605bf92888d71a07a62553e2d943494635

5 years agoMove all contextual card related classes.
Fan Zhang [Thu, 25 Oct 2018 21:19:43 +0000 (14:19 -0700)]
Move all contextual card related classes.

... from homepage to contextualcards.

Test: rebuild
Change-Id: Id7889566ce1e7257eb699d963ae996906fdb58ff

5 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 26 Oct 2018 15:02:18 +0000 (15:02 +0000)]
Merge "Import translations. DO NOT MERGE"

5 years agoFix crash on Wi-Fi Slice when it's continuously pinned and unpinned
Jason Chiu [Tue, 23 Oct 2018 07:31:54 +0000 (15:31 +0800)]
Fix crash on Wi-Fi Slice when it's continuously pinned and unpinned

It's because WifiTracker's initialization and onStop is on different
thread. Fine tune the thread logic in SliceBackgroundWorker.

Fixes: 118165942
Test: manual
Change-Id: Icc86b5df7ec3c6fd0e4a79a62ea0c84465e9528d

5 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 26 Oct 2018 10:44:01 +0000 (03:44 -0700)]
Import translations. DO NOT MERGE

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

5 years agoMerge "Make HearingAid code more generic"
Hugh Chen [Fri, 26 Oct 2018 01:57:24 +0000 (01:57 +0000)]
Merge "Make HearingAid code more generic"

5 years agoMerge "Remove unused code in telephony fragment"
Lei Yu [Fri, 26 Oct 2018 01:14:27 +0000 (01:14 +0000)]
Merge "Remove unused code in telephony fragment"

5 years agoMerge changes Iafe111bf,Ie9d8e935
Lei Yu [Fri, 26 Oct 2018 00:28:30 +0000 (00:28 +0000)]
Merge changes Iafe111bf,Ie9d8e935

* changes:
  update CdmaApnPreferenceController
  Add network selection preferences

5 years agoMerge changes Iad3bc131,Id43cb480
Lei Yu [Thu, 25 Oct 2018 22:32:32 +0000 (22:32 +0000)]
Merge changes Iad3bc131,Id43cb480

* changes:
  Update NetworkSelectSettings page
  Recopy NetworkSelectSetting from phone to settings

5 years agoRemove unused code in telephony fragment
jackqdyulei [Thu, 25 Oct 2018 02:08:53 +0000 (19:08 -0700)]
Remove unused code in telephony fragment

Bug: 114749736
Test: Manual
Change-Id: Ifff0cd03b024a482ce2c61e0d052c95a77e714ee

5 years agoresolve merge conflicts of 7849607a7ca9518f57fb22cca5665b88e99134c2 to pi-dev-plus...
Lei Yu [Thu, 25 Oct 2018 21:20:08 +0000 (14:20 -0700)]
resolve merge conflicts of 7849607a7ca9518f57fb22cca5665b88e99134c2 to pi-dev-plus-aosp

Bug: 115707279
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ifd8f2c090ccd9eadbc7b789b927550bce732f1d1
Merged-In: I3d2ebad2879479a870bcdfe596bb88b83c424389

5 years agoupdate CdmaApnPreferenceController
jackqdyulei [Thu, 25 Oct 2018 01:22:04 +0000 (18:22 -0700)]
update CdmaApnPreferenceController

Rename it to ApnPreferenceController since it support both Gsm and
Cdma. Also add check for Gsm sim card.

Bug: 118402844
Test: RunSettingsRoboTests
Change-Id: Iafe111bfdc8f8e7d91d104df652ae9b27c9b166f

5 years agoMerge "Add entitlement check for usb tethering" into pi-dev
Lei Yu [Thu, 25 Oct 2018 19:58:53 +0000 (19:58 +0000)]
Merge "Add entitlement check for usb tethering" into pi-dev

5 years agoAdd network selection preferences
jackqdyulei [Wed, 24 Oct 2018 21:58:29 +0000 (14:58 -0700)]
Add network selection preferences

1. Toggle to decide whether to auto select
2. Preference to go to network selection page

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: Ie9d8e9353bf2a99b8cba1fb14d5a440a43fde66e

5 years agoRemove DashboardSummary and all related classes.
Fan Zhang [Mon, 1 Oct 2018 19:14:06 +0000 (12:14 -0700)]
Remove DashboardSummary and all related classes.

- Condition is already supported in PersonalSettingsFragment
- Suggestion is already supported in PersonalSettingsFragment
- Static/dynamic tiles are supported in TopLevelSettings

Change-Id: I51882e3bd0919ad95109baefac683d98667c11e3
Fixes: 110405144
Test: robotests

5 years agoUpdate NetworkSelectSettings page
jackqdyulei [Wed, 24 Oct 2018 17:10:49 +0000 (10:10 -0700)]
Update NetworkSelectSettings page

Clean it up and make it compatiable with all devices. Before this CL
it only used in Pixel 3 with new moderm.

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: Iad3bc131e294d34cff90b9130715780182adccd7

5 years agoMerge "[Settings] Use 1030 opcode, deprecate 1024."
TreeHugger Robot [Thu, 25 Oct 2018 08:00:01 +0000 (08:00 +0000)]
Merge "[Settings] Use 1030 opcode, deprecate 1024."

5 years agoMerge "Revert "Add Support for Virtual High Refresh Rate mode""
TreeHugger Robot [Thu, 25 Oct 2018 05:59:24 +0000 (05:59 +0000)]
Merge "Revert "Add Support for Virtual High Refresh Rate mode""

5 years agoMake HearingAid code more generic
timhypeng [Tue, 9 Oct 2018 03:19:23 +0000 (11:19 +0800)]
Make HearingAid code more generic

-handle UI updating when sub device connection state changes
-add test case

Bug: 112735753
Test: make -j42 RunSettingsRoboTests
Change-Id: Ie2643657c47a0956aac3f8cac4bfdbdea0399ce8

5 years ago[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am...
Bill Yi [Thu, 25 Oct 2018 02:38:25 +0000 (19:38 -0700)]
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 8b16aba0dd  -s ours am: 27e14db009  -s ours
am: 816e75fbc3  -s ours

Change-Id: I44155262f8685a56f4c678d9d2ca7d60e04707d4

5 years agoMerge "Repro b/118398695"
Fan Zhang [Thu, 25 Oct 2018 02:26:15 +0000 (02:26 +0000)]
Merge "Repro b/118398695"

5 years ago[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am...
Bill Yi [Thu, 25 Oct 2018 01:53:10 +0000 (18:53 -0700)]
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 8b16aba0dd  -s ours
am: 27e14db009  -s ours

Change-Id: Ic2e8292d1f5936b943ba084611456fcf19651004

5 years agoRecopy NetworkSelectSetting from phone to settings
jackqdyulei [Tue, 23 Oct 2018 22:01:49 +0000 (15:01 -0700)]
Recopy NetworkSelectSetting from phone to settings

NetworkSelectSetting is changed during the migration, recopy it
to make it up to date

Following CL will refactor to reuse this fragment for all devices.

Bug: 114749736
Test: Build
Change-Id: Id43cb480cf31447a6e4a23eb3709f9ab972a2930

5 years ago[Settings] Use 1030 opcode, deprecate 1024.
Peiyong Lin [Thu, 25 Oct 2018 01:23:01 +0000 (18:23 -0700)]
[Settings] Use 1030 opcode, deprecate 1024.

Previously we separated wide color gamut out of color management and added a
new opcode 1030 to query whether the device's built-in display is color
managed. This patch deprecated 1024 opcode.

BUG: 111505327
Test: Build, flash, boot and check Settings>Display>Color
Change-Id: Ifaf03d02d21c47b7b3be987ceaabb61fa4449c8c

5 years ago[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
Bill Yi [Wed, 24 Oct 2018 23:31:58 +0000 (16:31 -0700)]
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am: 8b16aba0dd  -s ours

Change-Id: I6072677fc094b42e0a1356aa440151f829e100a0

5 years agoRepro b/118398695
Fan Zhang [Wed, 24 Oct 2018 22:46:21 +0000 (15:46 -0700)]
Repro b/118398695

Bug: 118398695
Test: robotests
Change-Id: I09331e042368f849651dbb1273d802f4ca24a832

5 years agoMerge pie-platform-release to aosp-master - DO NOT MERGE
Bill Yi [Wed, 24 Oct 2018 21:47:27 +0000 (14:47 -0700)]
Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: Id291dd4e424711a8cb39927b9733214b92b81d78

5 years agoMerge "Add Battery slice in Contextual Settings Homepage"
TreeHugger Robot [Wed, 24 Oct 2018 21:26:50 +0000 (21:26 +0000)]
Merge "Add Battery slice in Contextual Settings Homepage"

5 years agoRevert "Add Support for Virtual High Refresh Rate mode"
David Sodman [Mon, 15 Oct 2018 20:43:22 +0000 (13:43 -0700)]
Revert "Add Support for Virtual High Refresh Rate mode"

This reverts commit 7915fda7eea56a8461be3025dc7a6f18cf26c15a
as this feature has been cancelled.

Test: None
Change-Id: I5ea9afcc3191576e84742ccf316b030b5c00e5c4

5 years agoMerge "Fix a bug where cards overlap when rotating the screen"
Fan Zhang [Wed, 24 Oct 2018 20:25:54 +0000 (20:25 +0000)]
Merge "Fix a bug where cards overlap when rotating the screen"

5 years ago[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE...
Bill Yi [Wed, 24 Oct 2018 18:03:50 +0000 (11:03 -0700)]
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 851a72f941  -s ours
am: 30984acbe3  -s ours

Change-Id: Ic94a1cba03952f0d720fc8a7d3892b88e0f3cf69

5 years ago[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
Bill Yi [Wed, 24 Oct 2018 17:45:20 +0000 (10:45 -0700)]
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am: 851a72f941  -s ours

Change-Id: I9eb1bf07cd24821c999cdb31a7d7f51ca7ffc85c

5 years agoMerge pi-platform-release to stage-aosp-master - DO NOT MERGE
Bill Yi [Wed, 24 Oct 2018 16:07:12 +0000 (09:07 -0700)]
Merge pi-platform-release to stage-aosp-master - DO NOT MERGE

Change-Id: Ia33547dfec9adf4000d3ed2665f2c3804be97071

5 years agoAdd Battery slice in Contextual Settings Homepage
Mill Chen [Fri, 5 Oct 2018 14:11:45 +0000 (22:11 +0800)]
Add Battery slice in Contextual Settings Homepage

- Add Battery card that implements CustomSliceable in Contextual
Settings Homepage.
- Add test case for Battery slice.
- Created a loadBatteryInfo method for BatterySlice.
- Add a map in CustomSliceManager to cache CustomSliceable instances,
let existing battery slice be able to update battery info.
- Use a flag to avoid triggering an infinite loop when calling
notifyChange in the callback function.

Bug: 114796623115971399
Test: manual, robotests
Change-Id: I4b785708bf8456c6c4de7cae4b44f8a060bccbae

5 years agoFix a bug where cards overlap when rotating the screen
Emily Chuang [Wed, 24 Oct 2018 11:42:17 +0000 (19:42 +0800)]
Fix a bug where cards overlap when rotating the screen

Check if a certain fragment has been added before. If it's added, then
just show it instead of re-adding it again.

Bug: 118344247
Test: visual
Change-Id: I039a3a7372e163c6bcda386d2aea99e6f8c8e9b1

5 years agoMerge "Fix toast is covered by PIN code screen after wrong pin" am: d5abc0eb44 am...
Fan Zhang [Wed, 24 Oct 2018 02:36:50 +0000 (19:36 -0700)]
Merge "Fix toast is covered by PIN code screen after wrong pin" am: d5abc0eb44 am: c150f5eb29
am: 4c95f60b9e

Change-Id: I651be252786c84156be901ef30f7cab37c1d4fdb

5 years agoMerge "Fix toast is covered by PIN code screen after wrong pin" am: d5abc0eb44
Fan Zhang [Wed, 24 Oct 2018 02:30:39 +0000 (19:30 -0700)]
Merge "Fix toast is covered by PIN code screen after wrong pin" am: d5abc0eb44
am: c150f5eb29

Change-Id: Ia4e59e195720919f2baa52e7d5667aed27c5ce7c

5 years agoMerge "Fix toast is covered by PIN code screen after wrong pin"
Fan Zhang [Wed, 24 Oct 2018 02:24:29 +0000 (19:24 -0700)]
Merge "Fix toast is covered by PIN code screen after wrong pin"
am: d5abc0eb44

Change-Id: Ie2cfeeb5573ae6b79855edbd87210bfe0e0a8287

5 years agoMerge "Fix toast is covered by PIN code screen after wrong pin"
Fan Zhang [Wed, 24 Oct 2018 02:16:57 +0000 (02:16 +0000)]
Merge "Fix toast is covered by PIN code screen after wrong pin"

5 years agoMerge "Add place holder rows to wifi slice."
Fan Zhang [Wed, 24 Oct 2018 02:15:18 +0000 (02:15 +0000)]
Merge "Add place holder rows to wifi slice."

5 years agoMerge "Refactor Cdma preference in ECM"
Lei Yu [Tue, 23 Oct 2018 23:53:29 +0000 (23:53 +0000)]
Merge "Refactor Cdma preference in ECM"

5 years agoAdd place holder rows to wifi slice.
Fan Zhang [Tue, 23 Oct 2018 20:59:59 +0000 (13:59 -0700)]
Add place holder rows to wifi slice.

When loading wifi slice, the wifitracker is super slow to scan and
return APs. So we will show up to 3 rows of placeholder in the slice UI.

- When building slice, if there are at least 3 APs, show first 3.
- When there aren't enough APs, show them all and fill the rest of
  placeholder rows.

Bug: 118224581
Test: robotests
Change-Id: Id332f64bfa335543ea406f73b249f93504d63d4f

5 years agoFix toast is covered by PIN code screen after wrong pin
Hao Zhao [Tue, 8 Aug 2017 07:21:49 +0000 (15:21 +0800)]
Fix toast is covered by PIN code screen after wrong pin

The error toast is displayed when user input wrong PIN
code three times, but at that moment the SIM PUK code input
page in SystemUI pop up and covers the toast, so the user
can't seen the error message.

Adjust the toast window layer, let the the toast pop up
over the SIM pin code input page.

Bug: 74056527
Change-Id: I569a2fc2adac15c4713b4c95e9720335bd4df88a

5 years agoRefactor Cdma preference in ECM
jackqdyulei [Mon, 22 Oct 2018 23:10:41 +0000 (16:10 -0700)]
Refactor Cdma preference in ECM

When phone is in ECM mode and Cdma preference is clicked, it should
first pop up ECM exit dialog. If user click yes, then it should launch
normal dialog.

This CL create a Cdma preference to stop launch normal dialog when in
ECM mode.

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: Iba887d9fc49770b21cf0421ecc0120d63da43ef9

5 years agoRemove calling to deprecated API.
Fan Zhang [Tue, 23 Oct 2018 20:33:04 +0000 (13:33 -0700)]
Remove calling to deprecated API.

Bug: 117860032
Test: robotests
Change-Id: I98b464b33c1f7f5aca6a002284247d36131c16e4

5 years agoChange homepage layout
Raff Tsai [Sat, 20 Oct 2018 15:59:52 +0000 (23:59 +0800)]
Change homepage layout

- merge PersonalSettingsFragment and TopLevelSettings together

Bug: 118224579
Test: manual
Change-Id: Ieee50a22babb25023e2a1767793e220862a38363

5 years agoMerge "Adjust Wifi Privacy preference."
Johnson Lu [Tue, 23 Oct 2018 03:20:39 +0000 (03:20 +0000)]
Merge "Adjust Wifi Privacy preference."

5 years agoMerge "Add DiffCallback to handle Contextual Cards update."
TreeHugger Robot [Tue, 23 Oct 2018 00:46:53 +0000 (00:46 +0000)]
Merge "Add DiffCallback to handle Contextual Cards update."

5 years agoAdd DiffCallback to handle Contextual Cards update.
Emily Chuang [Tue, 16 Oct 2018 10:49:29 +0000 (18:49 +0800)]
Add DiffCallback to handle Contextual Cards update.

Use DiffCallback in ContextualCardsAdapter to only update items that
are changed instead of touching those unchanged ones.

Also fix a bug where ConditionContexualCardCard#onStart is incorrectly
skipped.

Fixes: 112245748
Bug: 118165942
Test: robotests
Change-Id: I7989d621764fe40a3fceb8c9f40baced840818ba

5 years agoRefactor wifi calling and video calling
jackqdyulei [Fri, 19 Oct 2018 18:25:15 +0000 (11:25 -0700)]
Refactor wifi calling and video calling

Also add a Callback for 4gLte to notify update to video calling
preference controller

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I0b5009733251162327f02ccfae8b10ae56b961bc

5 years agoMerge "Use main looper for PhoneStateListener"
TreeHugger Robot [Mon, 22 Oct 2018 19:57:35 +0000 (19:57 +0000)]
Merge "Use main looper for PhoneStateListener"

5 years agoUse main looper for PhoneStateListener
jackqdyulei [Mon, 22 Oct 2018 17:22:00 +0000 (10:22 -0700)]
Use main looper for PhoneStateListener

Also init all subIds to INVALID in constructor

Change-Id: Ic66a2e5a24dbc10d52db0069f0e863c96ec12513
Fixes: 118070636
Test: Manual

5 years agoAdjust Wifi Privacy preference.
Johnson Lu [Mon, 22 Oct 2018 08:23:54 +0000 (16:23 +0800)]
Adjust Wifi Privacy preference.

Show Wifi MAC Randomization preference in both "Add network" and "Join
Network" flows.

Bug: 1227787
Test: RunSettingsRoboTests
Change-Id: Iff422eb870e661ceda5ae04f55de802a91f08aeb

5 years agoMerge "SliceLiveData should remove observers."
TreeHugger Robot [Mon, 22 Oct 2018 03:29:42 +0000 (03:29 +0000)]
Merge "SliceLiveData should remove observers."

5 years agoMerge "Refactor EuiccPreference"
TreeHugger Robot [Mon, 22 Oct 2018 02:28:14 +0000 (02:28 +0000)]
Merge "Refactor EuiccPreference"

5 years agoMerge "Add preference for WiFi MAC randomization."
Johnson Lu [Mon, 22 Oct 2018 00:53:54 +0000 (00:53 +0000)]
Merge "Add preference for WiFi MAC randomization."

5 years agoMerge "Fix sound settings affinity"
TreeHugger Robot [Sat, 20 Oct 2018 00:56:22 +0000 (00:56 +0000)]
Merge "Fix sound settings affinity"

5 years agoMerge pi-dr1-dev to aosp-master am: c1fe9e6ac2 am: 89e733ee2c
Bill Yi [Fri, 19 Oct 2018 22:23:53 +0000 (15:23 -0700)]
Merge pi-dr1-dev to aosp-master am: c1fe9e6ac2 am: 89e733ee2c
am: 58f707d162

Change-Id: I6799e0168f4f32adc78888426a5591a9b1bd7fc7

5 years agoFix sound settings affinity
Fan Zhang [Fri, 19 Oct 2018 22:19:11 +0000 (15:19 -0700)]
Fix sound settings affinity

Change-Id: Id92d7473f1d77ee5640a9da8f320777df496f635
Fixes: 117586503
Test: manual

5 years agoMerge pi-dr1-dev to aosp-master am: c1fe9e6ac2
Bill Yi [Fri, 19 Oct 2018 22:17:08 +0000 (15:17 -0700)]
Merge pi-dr1-dev to aosp-master am: c1fe9e6ac2
am: 89e733ee2c

Change-Id: I0808d725397294f4a19add88b278472360f48b64

5 years agoMerge pi-dr1-dev to aosp-master
Bill Yi [Fri, 19 Oct 2018 22:00:40 +0000 (15:00 -0700)]
Merge pi-dr1-dev to aosp-master
am: c1fe9e6ac2

Change-Id: I6a6eafb34b31bc343dfe4117f17ccba771a7f111

5 years agoRefactor EuiccPreference
jackqdyulei [Thu, 18 Oct 2018 23:46:58 +0000 (16:46 -0700)]
Refactor EuiccPreference

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I7192e40c5ff6eb064f29517c21021a095d505d7f

5 years agoMerge changes I773aeabd,I6a9d7044
Lei Yu [Fri, 19 Oct 2018 20:42:12 +0000 (20:42 +0000)]
Merge changes I773aeabd,I6a9d7044

* changes:
  Refactor DataServicePreference
  Refactor 4gForLTE preference