PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,490 Commits 1 Branch 0 Tags
f2a135ec5af72bc67f11f5ff1231a148fa79403e
Commit Graph

44490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atanas Kirilov
f2a135ec5a Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev am: 826b14e43e am: 74d98110f3 
am: a50293f72c

Change-Id: I20749db43dcab2085bcb9733601000cd96be14ce
 2018-06-04 16:40:10 -07:00
Atanas Kirilov
a50293f72c Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev am: 826b14e43e 
am: 74d98110f3

Change-Id: Ie334ee442e46dffa11926b471b0a096a3c4f1f92
 2018-06-04 16:07:36 -07:00
Atanas Kirilov
74d98110f3 Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev 
am: 826b14e43e

Change-Id: If4056f03d27f845d30862b04dcbdb119141f2bf8
 2018-06-04 15:36:29 -07:00
TreeHugger Robot
1db4027355 Merge "Revert "Settings: Add logical camera default switch"" into pi-dev 2018-06-04 20:45:51 +00:00
Atanas Kirilov
826b14e43e 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
 2018-06-04 20:24:19 +00:00
Shuzhen Wang
8f9fc06a18 Revert "Settings: Add logical camera default switch" 
This reverts commit a9578a2b8a.

Test: Build
Bug: 80007047
Merged-In: Id5f01e5de94ffaa86de1e96f6bde1092b0c586a2
 2018-06-04 17:37:25 +00:00
Bill Yi
d9bd267146 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I7d788703ce218cc211305bf078fde78ce7dde2af
 2018-06-03 14:55:40 -07:00
Bill Yi
8c56825ecd Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I67611d91d92e62641467382da0079497eb5dcd06
 2018-05-31 22:05:33 -07:00
Ryan Lin
942b07da93 Merge "Handle Bluetooth is not supported on emulator" into pi-dev 2018-05-31 23:22:30 +00:00
TreeHugger Robot
fa01fcb2c9 Merge "No need for "and" - ListFormatter adds it" into pi-dev 2018-05-31 18:12:00 +00:00
TreeHugger Robot
4199198ec2 Merge "Make Settings Slider Slices one row" into pi-dev 2018-05-31 16:03:25 +00:00
Beverly
ab5a016e26 No need for "and" - ListFormatter adds it 
Test: manual, visual inspection
Change-Id: I5ce1442cc762c9c0ca22827df429dc64714c2f20
Fixes: 80303010
 2018-05-31 09:32:26 -04:00
ryanywlin
d67314e771 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
 2018-05-31 12:48:13 +08:00
Matthew Fritze
93307cdb69 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
 2018-05-30 15:39:43 -07:00
Hansong Zhang
acfbc0eff4 [automerger skipped] DO NOT MERGE Give PBAP permission only after user confirms am: e36ca3e96d am: 48aa959b14 
am: 7cc441bf2f  -s ours

Change-Id: I19de0cbe315d298550edfb85039fbc87c42e6dc6
 2018-05-30 13:41:41 -07:00
Hansong Zhang
7cc441bf2f DO NOT MERGE Give PBAP permission only after user confirms am: e36ca3e96d 
am: 48aa959b14

Change-Id: I13480b0bf786ddd05959cb597492041e273d920c
 2018-05-30 13:32:52 -07:00
Hansong Zhang
48aa959b14 DO NOT MERGE Give PBAP permission only after user confirms 
am: e36ca3e96d

Change-Id: I6fe221ad379ab6398b01bfb96fe7390d0369c15d
 2018-05-30 13:23:53 -07:00
TreeHugger Robot
fcac34d723 Merge "Give PBAP permission only after user confirms" into pi-dev 2018-05-30 17:35:57 +00:00
TreeHugger Robot
cf2e1fd593 Merge "Plumb context object to PowerWhitelistBackend." into pi-dev 2018-05-30 03:08:20 +00:00
TreeHugger Robot
ce7d1ab3bb Merge "Prevent disabling default phone/sms apps in battery setting" into pi-dev 2018-05-30 00:18:45 +00:00
Fan Zhang
3489f65024 Plumb context object to PowerWhitelistBackend. 
Change-Id: Ice0d037625d47f1f668b00499a7f1ad2302cc0ba
Merged-In: Ice0d037625d47f1f668b00499a7f1ad2302cc0ba
Fixes: 76435804
Test: robotests
 2018-05-29 22:33:01 +00:00
Fan Zhang
9ab2f37226 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
 2018-05-29 22:25:56 +00:00
Hansong Zhang
500c83c1bc Give PBAP permission only after user confirms 
Bug: 72872376
Test: manual
Change-Id: I9617e3c10bf19e22f9a8f172332a83bbbebaf4a4
 2018-05-29 22:15:51 +00:00
TreeHugger Robot
f14bfcbfa6 Merge "Fix bluetooth search result no-op" into pi-dev 2018-05-29 19:40:14 +00:00
TreeHugger Robot
75b3e6f302 Merge "Fix a bug where device index is not skipped correct." into pi-dev 2018-05-29 18:48:24 +00:00
TreeHugger Robot
3f790b76b0 Merge "Fix DND crash from SpringboardActivity" into pi-dev 2018-05-29 18:47:23 +00:00
Matthew Fritze
d5fc3a95c6 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
 2018-05-29 11:38:52 -07:00
TreeHugger Robot
d87ce094cd Merge "Another refresh of swipe up gesture video" into pi-dev 2018-05-29 18:34:23 +00:00
TreeHugger Robot
8c60fc69b7 Merge "Hide haptic intensity settings for devices without enough dynamic range." into pi-dev 2018-05-26 02:03:09 +00:00
TreeHugger Robot
1ec06d4623 Merge "Add vibration preview" into pi-dev 2018-05-26 00:58:16 +00:00
TreeHugger Robot
76e0cb6678 Merge "Add michaelwr to OWNERS for haptics settings in accessibility" into pi-dev 2018-05-26 00:20:44 +00:00
Fan Zhang
548485336f Fix a bug where device index is not skipped correct. 
When checking language/build fingerprint to skip reindex, language check
was comparing Locale object and String object, so they would never be
equal, so we accidentally reindex every time.

- Switched Objects.equal to TextUtils.equal, this catches the error at
compiler level.

Bug: 80065409
Test: compile/robotest
Change-Id: I2b3c68bb1c2fd876338f42321605567d7e64d64b
 2018-05-25 16:25:14 -07:00
Michael Wright
c93dfd8f48 Add michaelwr to OWNERS for haptics settings in accessibility 
Bug: 80243632
Test: N/A
Change-Id: Id315d626af527946230affc292ed9b329efe8b5b
 2018-05-25 23:38:59 +01:00
Michael Wright
3dbaac6e71 Hide haptic intensity settings for devices without enough dynamic range. 
Despite our hope, devices prior to P18 just don't have the dynamic range
to give three distinct vibration intensity settings. Given this, only
show an on / off toggle for devices by default unless they explicitly
opt-in to multiple intensity levels.

Test: m -j RunSettingsRoboTests
Bug: 80243632
Change-Id: I14ece855cf20f9fa44b0648d28f89c0053be5c5f
 2018-05-25 22:57:03 +01:00
TreeHugger Robot
e4999751ab Merge "Remove Advanced dropdown from "About phone" screen" into pi-dev 2018-05-25 21:35:23 +00:00
Matthew Fritze
a559103b1b Fix DND crash from SpringboardActivity 
Special case Uris need to explicitly add their intents.
This unfortunately duplicates a list of special-cased Slices,
but I have attached a bug with a plan to address this duplicity in Q.

Change-Id: I346915c32543713d33716422018d7c950cce323d
Fixes: 80065409
Test: atest SliceDeepLinkSpringBoardTest
 2018-05-25 13:35:23 -07:00
Antony Sargent
24283d3076 Remove Advanced dropdown from "About phone" screen 
All the items will appear in the list instead of hiding some under an Advanced
dropdown.

Bug: 80302533
Test: manual (Settings->System->About phone)

Change-Id: I82857ec8e027b00762c1191d9450d30dfe47016f
 2018-05-25 13:05:27 -07:00
Antony Sargent
9ba04de58a Another refresh of swipe up gesture video 
Bug: 77474484
Test: manual (Settings->System->Gestures->Swipe up on Home button)
Change-Id: I62c46ef38cf67b4bf200ad2420138fe6677d6999
 2018-05-25 13:02:26 -07:00
TreeHugger Robot
7d214f99ee Merge "2nd attempt to fix Slice strict mode." into pi-dev 2018-05-25 19:44:32 +00:00
TreeHugger Robot
da07a66365 Merge "Add remaining whitelisted controllers" into pi-dev 2018-05-25 16:53:44 +00:00
Fan Zhang
2313b24215 2nd attempt to fix Slice strict mode. 
1. Use real BluetoothAdapter instead of settingslib version. The
   settingslib version contains calls that violates strictmode rules.
2. Override StrictMode rules in SettingsSliceProvider when it's called
   in background thread. When in background, the enforcement from Slice
   framework (StrictMode#ThreadPolicy) is not useful and can be safely
   ignored.

Change-Id: I68523148f4c1dc88a54e207447d21ec439478cdf
Merged-In: I68523148f4c1dc88a54e207447d21ec439478cdf
Fixes: 79985175
Test: robotests
 2018-05-25 16:37:56 +00:00
Fan Zhang
5431191163 Merge "Update storage header background to colorPrimary" into pi-dev 2018-05-25 15:49:59 +00:00
TreeHugger Robot
b915f3566b Merge "Make summary text update after settings changes" into pi-dev 2018-05-25 15:01:26 +00:00
Jason Monk
d68ed5c92c Merge "Follow SliceManager API changes" into pi-dev 2018-05-25 01:21:35 +00:00
Matthew Fritze
a2ea991101 Make summary text update after settings changes 
The uri's being pinged when changes happened were incorrect, because
of a hard coded '/'.

Change-Id: I4d04642bc80b97c5191bf0e1e7a5e15a2c58d6c9
Merged-In: I6735c5a60dc7df6894bd17e67d7702a7ec6c07d4
Fixes: 79779837
Test: robotest
 2018-05-24 20:10:24 +00:00
Android Build Merger (Role)
1871d3d3a7 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e skipped: 30d0145ead skipped: b9aa0fbfe9 
Change-Id: Ib0b9bdb830263bbfb7c81033b388cd9e07e591ef
 2018-05-24 18:22:37 +00:00
Android Build Merger (Role)
b9aa0fbfe9 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e skipped: 30d0145ead 
Change-Id: I164f89c547721b6b02fcd2bf57b224c92816e25b
 2018-05-24 18:22:35 +00:00
Android Build Merger (Role)
30d0145ead [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e 
Change-Id: I72e34eb278333a310cab6845c79f55df50478860
 2018-05-24 18:22:34 +00:00
Android Build Merger (Role)
93ee1bd17e [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f 
Change-Id: Ic7873dae0f097a546b250ebcb96cf88a437e1173
 2018-05-24 18:22:33 +00:00
Android Build Merger (Role)
551be9a85f [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f 
Change-Id: Ibb61117b7475504a756dafece07c5d79eba0f73f
 2018-05-24 18:22:32 +00:00