OSDN Git Service
TreeHugger Robot [Mon, 5 Nov 2018 22:29:31 +0000 (22:29 +0000)]
Merge "Clarify notification dots/icons strings"
TreeHugger Robot [Mon, 5 Nov 2018 19:55:55 +0000 (19:55 +0000)]
Merge "Remove the unnecessary preferenceCategory"
Beverly Tai [Mon, 5 Nov 2018 18:58:39 +0000 (18:58 +0000)]
Merge "Set modified=true when user changes zen rule name"
Vadim Tryshev [Mon, 5 Nov 2018 18:42:29 +0000 (18:42 +0000)]
Merge "Using intent action for DWB properties exposed as an API"
Lei Yu [Mon, 5 Nov 2018 18:29:56 +0000 (18:29 +0000)]
Merge "Add null check for carrierConfig"
Rakesh Iyer [Mon, 5 Nov 2018 17:44:29 +0000 (17:44 +0000)]
Merge "Disable controls during playback."
Beverly [Mon, 5 Nov 2018 15:55:07 +0000 (10:55 -0500)]
Clarify notification dots/icons strings
In the Custom Notification DND options, clarify
what notification dots and notification icons are by
adding more information in the strings
Test: manual
Change-Id: I54ef19d46e54ec10da7179fd142043e3a3af0a40
Fixes:
112188372
Sunny Shao [Mon, 5 Nov 2018 05:31:03 +0000 (05:31 +0000)]
Merge "Added the icon displayed on no account in search bar"
Sunny Shao [Tue, 30 Oct 2018 03:55:15 +0000 (11:55 +0800)]
Added the icon displayed on no account in search bar
Mofidied the search_bar layout and added this icon in the right side of the search_bar.
Added the hasAccount api in AvatarViewMixin and display this icon when there is no any account in device.
Added the test case of the AvatarViewMixin.
Bug:
117509285
Test: robotest
Change-Id: I6ceaa457af4fb20acd0211ca840df5b530c47e0f
Emily Chuang [Wed, 31 Oct 2018 09:38:20 +0000 (17:38 +0800)]
Update the layout of contextual cards.
Fixes:
118849830
Test: visual
Change-Id: Ia3f7f155271a22f4f6214fad861475442c23c2f6
TreeHugger Robot [Sat, 3 Nov 2018 07:10:34 +0000 (07:10 +0000)]
Merge "Update show4GForLTE config"
TreeHugger Robot [Sat, 3 Nov 2018 06:28:19 +0000 (06:28 +0000)]
Merge "Clean up useless layout"
Bill Yi [Sat, 3 Nov 2018 04:59:49 +0000 (21:59 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
935509aa3d -s ours
am:
fe385f4a14 -s ours
Change-Id: I0ef2cfa586b4f2ac083de597c1a2770e4e7d4715
Bill Yi [Sat, 3 Nov 2018 04:26:36 +0000 (21:26 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
935509aa3d -s ours
Change-Id: I6d5663483003b55aaa03856e41adf086d888eec0
Bill Yi [Fri, 2 Nov 2018 22:27:05 +0000 (15:27 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ic830e9dc65c715010b562f0148821899114de819
jackqdyulei [Wed, 31 Oct 2018 20:40:10 +0000 (13:40 -0700)]
Update show4GForLTE config
Get it from CarrierConfigManager instead of config in systemui package.
Also remove unused CdmaOptions
Bug:
114749736
Test: RunSettingsRoboTests
Change-Id: Iac47a60e51f68047b8f800dbdcf0efbcd432a015
jackqdyulei [Thu, 1 Nov 2018 20:09:33 +0000 (13:09 -0700)]
Remove the unnecessary preferenceCategory
In talkback, it counts the untitled preferenceCategory as an visiable
item. This CL remove unnecessary cateogry and add divider line manually.
Bug:
118796245
Test: RunSettingsRoboTests
Change-Id: I77151fdce671cf91322b3c1badc06a3b7861dcc0
Rakesh Iyer [Fri, 2 Nov 2018 19:34:52 +0000 (12:34 -0700)]
Disable controls during playback.
The controls were enabled during playback earlier,
however changing them did nothing to the current
playout. Disable them during playout and re-enable
them once playout is done.
Bug:
77976922
Test: Repro case in linked bug.
Change-Id: I0fbe1c97e794fccc49172ee7542018aeef956c8f
jackqdyulei [Fri, 2 Nov 2018 18:25:37 +0000 (11:25 -0700)]
Add null check for carrierConfig
Since it may return null when Crash happens in CarrierConfigManager
Bug:
118402844
Test: RunSettingsRoboTests
Change-Id: I9db0f1a873b3e24936b021989f6716369569b17b
Eugene Susla [Fri, 2 Nov 2018 18:18:51 +0000 (18:18 +0000)]
Merge "Add developer option for sms access kill switch"
Fan Zhang [Fri, 2 Nov 2018 18:00:11 +0000 (18:00 +0000)]
Merge "Remove db restriction for category column."
Beverly [Fri, 2 Nov 2018 17:13:13 +0000 (13:13 -0400)]
Set modified=true when user changes zen rule name
Test: make RunSettingsRoboTests -j40
Bug:
118789422
Change-Id: I3df3ce4c86a100c2c1287e3650d7fb331d5fa71c
Fan Zhang [Fri, 2 Nov 2018 16:43:50 +0000 (16:43 +0000)]
Merge "Clean up ConditionalCards"
tmfang [Fri, 2 Nov 2018 05:40:35 +0000 (13:40 +0800)]
Clean up useless layout
There is no any reference to this layout
Bug:
116340579
Test: robotest
Change-Id: I1ec97c6e30cb9e39a2a366dbe7f7b52f49390936
Raff Tsai [Fri, 2 Nov 2018 02:56:21 +0000 (02:56 +0000)]
Merge "Add Category for contextual cards"
Cosmo Hsieh [Fri, 2 Nov 2018 01:39:47 +0000 (01:39 +0000)]
Merge "Implement NetworkRequestDialog architecture"
Kenny Root [Fri, 2 Nov 2018 00:43:05 +0000 (00:43 +0000)]
Merge "Track change to add ADB service"
Kevin Chyn [Fri, 2 Nov 2018 00:37:24 +0000 (00:37 +0000)]
Merge changes from topic "biometric-cc"
* changes:
3/n: Make CDCA transparent and add BiometricPrompt
2/n: Add comments to launchConfirmationActivity parameters
1/n: Prepare ConfirmDeviceCredentials to use BiometricPrompt
TreeHugger Robot [Thu, 1 Nov 2018 23:47:36 +0000 (23:47 +0000)]
Merge "Dnd settings pages redesign (round 1)"
Fan Zhang [Thu, 1 Nov 2018 23:28:15 +0000 (16:28 -0700)]
Remove db restriction for category column.
SettingsIntelligence should be able to extend support to more categories
without changing Settings.
Bug:
118708391
Test: rebuild
Change-Id: I420394f718bb3712e94040fb3e3c4f66cca629af
Kevin Chyn [Thu, 4 Oct 2018 22:01:43 +0000 (15:01 -0700)]
3/n: Make CDCA transparent and add BiometricPrompt
ConfirmDeviceCredentials now uses BiometricPrompt instead of
FingerprintManager
Bug:
111461540
Test: FRP does not display BiometricPrompt (as expected)
adb shell settings put global device_provisioned 0 && adb shell am start -a android.app.action.CONFIRM_FRP_CREDENTIAL
Test: Using KeyguardManager API to launch, all corner cases seem OK
Test: Tested with work profile + one lock enabled/disabled, seems OK
Test: Enroll normal FP but not work FP, BiometricPromptDemo for both works
OK
Test: Test CC on work version of BPD, then BP on normal version of BPD,
both accept correct FP's (no regression from P)
Change-Id: Iacdaf76ab76971850212dc79513bfa3f4b89eb9a
TreeHugger Robot [Thu, 1 Nov 2018 21:59:45 +0000 (21:59 +0000)]
Merge "Remove "See more" from wifi/bluetooth slices"
Fan Zhang [Thu, 1 Nov 2018 21:04:45 +0000 (14:04 -0700)]
Clean up ConditionalCards
Use ConditionalContextualCard directly.
Change-Id: If2e51cdd2cbed27b0094bbb9be06ee9a67f328ec
Fixes:
114307767
Test: robotests
Kevin Chyn [Thu, 4 Oct 2018 19:59:35 +0000 (12:59 -0700)]
2/n: Add comments to launchConfirmationActivity parameters
Bug:
111461540
Test: builds
Change-Id: I9b2cd9ee472bc67604664671ba022e8589269ee1
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
TreeHugger Robot [Thu, 1 Nov 2018 20:51:30 +0000 (20:51 +0000)]
Merge "Remove emptry preference category for Talkback"
Emily Chuang [Thu, 1 Nov 2018 03:38:25 +0000 (11:38 +0800)]
Remove "See more" from wifi/bluetooth slices
- Also set the height of SliceView back to wrap_content as the space our
content needs can be satisfied with MODE_LARGE.
Change-Id: Ibaa514ac9c022c2723d99e5104f8d5ec63f14661
Fixes:
118763869
Test: robotests, visual
Kevin Chyn [Thu, 1 Nov 2018 19:29:23 +0000 (19:29 +0000)]
Merge "Add android.settings.BIOMETRIC_ENROLL action intent"
Fan Zhang [Thu, 1 Nov 2018 19:14:40 +0000 (19:14 +0000)]
Merge "Fix slice card layout so show more button works correctly"
Fan Zhang [Thu, 1 Nov 2018 19:13:37 +0000 (19:13 +0000)]
Merge "Use safe icon when building unavailable slices."
Fan Zhang [Thu, 1 Nov 2018 18:19:08 +0000 (18:19 +0000)]
Merge "Change Google Settings position"
jackqdyulei [Thu, 1 Nov 2018 17:08:35 +0000 (10:08 -0700)]
Remove emptry preference category for Talkback
In this way talkback can get correct list size.
Bug:
117198438
Test: Manual
Change-Id: Ie0cd78fb20fe416ee517d6c35458a4805ce9c17f
TreeHugger Robot [Thu, 1 Nov 2018 16:58:10 +0000 (16:58 +0000)]
Merge "Click "Users & Profile" in Settings Search displays a blueline"
Beverly [Fri, 26 Oct 2018 20:01:17 +0000 (16:01 -0400)]
Dnd settings pages redesign (round 1)
Test: make RunSettingsRoboTests -j40
Bug:
111475013
Change-Id: Idb6bbfdfe377b61a8fe1f7e81171bbefe23a4ebf
Raff Tsai [Thu, 1 Nov 2018 08:52:58 +0000 (16:52 +0800)]
Change Google Settings position
- PreferenceGroup defines dynamic insert order starts from 0. It is
bigger than System Settings definition -10, therefore Google Settings
will be placed below System Settings.
Fixes:
118735593
Test: Visual
Change-Id: Id2d187810a8539ea50e14ef802db6eae58b846e4
Raff Tsai [Thu, 1 Nov 2018 06:37:04 +0000 (14:37 +0800)]
Add Category for contextual cards
Fixes:
118650494
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.homepage"
Change-Id: I46800c41402260351f146d0da42ec9f2329001af
James Lemieux [Thu, 1 Nov 2018 05:48:14 +0000 (05:48 +0000)]
Merge "Make Settings robotest work with tot Robolectric"
Stanley Wang [Thu, 1 Nov 2018 02:09:33 +0000 (02:09 +0000)]
Merge "Fix Developer options page memory leak"
Kevin Chyn [Wed, 31 Oct 2018 20:30:44 +0000 (13:30 -0700)]
Add android.settings.BIOMETRIC_ENROLL action intent
Fixes:
112925362
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL
Change-Id: I8dc37520b290483dab46cee2f6ca8612f4cf870e
Fan Zhang [Thu, 11 Oct 2018 22:37:36 +0000 (15:37 -0700)]
Make Settings robotest work with tot Robolectric
Bug:
116278591
Test: make -j RunSettingsRoboTests
Change-Id: I32cb2fcf6094675f79d2fc24702ef6298a9691e4
Lei Yu [Wed, 31 Oct 2018 20:04:03 +0000 (20:04 +0000)]
Merge "Rename a bunch of mobile network files"
TreeHugger Robot [Wed, 31 Oct 2018 19:40:26 +0000 (19:40 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 31 Oct 2018 18:56:43 +0000 (18:56 +0000)]
Merge "Update network select 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"
Kenny Root [Tue, 23 Jan 2018 12:53:53 +0000 (21:53 +0900)]
Track change to add ADB service
The ADB code has moved to its own service, so this is needed to change
which AIDL is called.
Test: make
Bug:
63820489
Change-Id: I5397a3431db414f58dae060c96cf1386da231c50
Lei Yu [Wed, 31 Oct 2018 06:12:46 +0000 (06:12 +0000)]
Merge "Add ACL state listener for bt devices"
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
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
cosmohsieh [Tue, 23 Oct 2018 10:47:10 +0000 (18:47 +0800)]
Implement NetworkRequestDialog architecture
Bug:
117399926
Test: RunSettingsRoboTests
Change-Id: Ibf0a62a84bc3de080e4537ba084b0ff9a5e0e9a9
Fan Zhang [Tue, 30 Oct 2018 22:21:42 +0000 (15:21 -0700)]
Fix slice card layout so show more button works correctly
Change padding top/bottom to margin, so the sliceview can use the full
288dp height (4 rows + see more button).
Side effect is that ripple doesn't fill the entire cardview. But it
never did anyway.
Change-Id: Ie57187fbe2b8caa2cf9d0dc31d7678eee07085f4
Fixes:
118398695
Test: visual
Raff Tsai [Wed, 31 Oct 2018 02:50:12 +0000 (10:50 +0800)]
Click "Users & Profile" in Settings Search displays a blueline
- It is a preference category, remove it from search result.
Fixes:
118654997
Test: Clear Settings Sugggestion data and search again.
Change-Id: I5a41e03c3fa703913233353a90b65ae18a7ab06b
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
Lei Yu [Tue, 30 Oct 2018 22:56:01 +0000 (22:56 +0000)]
Merge "Update the mobile activity"
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
Fan Zhang [Tue, 30 Oct 2018 22:31:04 +0000 (22:31 +0000)]
Merge "Stop showing account based cards in homepage."
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
Fan Zhang [Tue, 30 Oct 2018 20:38:13 +0000 (13:38 -0700)]
Use safe icon when building unavailable slices.
And move ic_a11y_generic from mipmap to drawable. IconCompat doesn't
support mipmap.
Bug:
118691898
Test: robotests
Change-Id: I6799f3d31d2c5654319e5a97bf8ca14992e785a7
Fan Zhang [Tue, 30 Oct 2018 21:16:26 +0000 (21:16 +0000)]
Merge "Fix Display settings summary when there is no wallpaper."
Eugene Susla [Wed, 10 Oct 2018 17:57:02 +0000 (10:57 -0700)]
Add developer option for sms access kill switch
Cleanup tracking bug: b/
118694572
Test: ensure switch toggles global setting
Change-Id: I1faa873a91a933a7693a4b799495cf3877d37888
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
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
Stanley Wang [Mon, 29 Oct 2018 09:04:53 +0000 (17:04 +0800)]
Fix Developer options page memory leak
Change-Id: I12d53c41adee56850cd294ae89e7a56328639558
Fixes:
117583710
Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.development
Raff Tsai [Tue, 30 Oct 2018 09:12:17 +0000 (09:12 +0000)]
Merge "Fix 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
TreeHugger Robot [Mon, 29 Oct 2018 22:55:57 +0000 (22:55 +0000)]
Merge "Refine the logic to show/hide cdma preference"
TreeHugger Robot [Mon, 29 Oct 2018 22:48:29 +0000 (22:48 +0000)]
Merge "Use ImeAwareEditText in FingerprintSettings"
Rakesh Iyer [Mon, 29 Oct 2018 21:26:26 +0000 (21:26 +0000)]
Merge "Misc fixes to TTS settings."
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
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
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
TreeHugger Robot [Mon, 29 Oct 2018 20:27:24 +0000 (20:27 +0000)]
Merge "Add Connected Device slice to Contextual Settings Homepage"
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
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
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.
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
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
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
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
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
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
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
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.
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"
Vadim Tryshev [Tue, 23 Oct 2018 19:25:28 +0000 (12:25 -0700)]
Using intent action for DWB properties exposed as an API
The intent opens digital wellbeing properties for an app.
Bug:
118319143
Test: Building Android
Change-Id: I0921ba5e8a6cb357ba12a08cafcab64503417dc9
Fan Zhang [Thu, 25 Oct 2018 23:33:52 +0000 (16:33 -0700)]
Delete some unused resources
Test: rebuild
Change-Id: Idbb639605bf92888d71a07a62553e2d943494635
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
TreeHugger Robot [Fri, 26 Oct 2018 15:02:18 +0000 (15:02 +0000)]
Merge "Import translations. DO NOT MERGE"
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
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
Hugh Chen [Fri, 26 Oct 2018 01:57:24 +0000 (01:57 +0000)]
Merge "Make HearingAid code more generic"