3035 Commits

Author SHA1 Message Date
Treehugger Robot
beeb35f0de Merge "Simplify logic for disconnect and getConnectionStatus in MapProfile" 2018-09-11 03:49:37 +00:00
Chienyuan
f5b1c1d045 Simplify logic for disconnect and getConnectionStatus in MapProfile
* disconnect: remove connected device check logic. BluetoothMapService
  will check it.
* getConnectionStatus: remove connected device check logic.
  BluetoothMapService will check it.
* Rewrite the annotation about this class.
* Remove member variable V and related checks.
* wrap if/else statement in curly brackets.

Bug: 111812003
Test: manual - disconnect MAP from Settings UI
Change-Id: I2469821f0ae2e3f384844326b30c7d3c4c88ab63
2018-09-09 08:21:21 +00:00
Treehugger Robot
ef98a2ca1c Merge changes I7f1ef2e8,I498bc261
* changes:
  Convert sysui to bp
  Cleanup trying to move to bp
2018-09-05 22:42:52 +00:00
Jason Monk
2c3a8045cd Convert sysui to bp
Test: tests gonna test, builds gonna build
Change-Id: I7f1ef2e82ce2c74253c57de8d73079dcfe2d2264
Merged-In: I7f1ef2e82ce2c74253c57de8d73079dcfe2d2264
(cherry picked from commit a2f2d82f2698ca4d9fcfad2a94b5b683646c085d)
(cherry picked from commit 1a8ee9d2f9bda161301469488d9a27baf5398233)
(cherry picked from commit 83ce30d807c3621f47f753e75f41d2b887e3ccba)
2018-09-05 13:57:10 -07:00
Fan Zhang
09c5a1d208 DO NOT MERGE: Reordered imports according to Android style.
Test: rebuild
Change-Id: I7b1ad77039868c6a827478fbbb32e0fd5c9a29cf
2018-09-04 13:57:29 -07:00
Treehugger Robot
7aae482135 Merge "Simply logic for connect and disconnect in HeadsetProfile" 2018-08-30 01:55:56 +00:00
Treehugger Robot
8593fc6c06 Merge "Remove connected device check logic in getConnectionState" 2018-08-30 01:55:27 +00:00
Treehugger Robot
cdf75c3cc8 Merge changes from topic "androidx-settings-aosp"
* changes:
  Migrated various apps under frameworks/base/packages/Shell  to androidx
  Migrated SystemUI & SettingsLib to androidx
2018-08-29 18:31:09 +00:00
Chienyuan
c129df807f Remove connected device check logic in getConnectionState
From current code, it will check if the device connected before
getConnectionState. We can remove this check logic because
HidHostService will do it.

Bug: 111812003
Test: manual - connect/disconnect HID keyborad from Settings UI
Change-Id: Ib512b3f15109b6f4cacf1f1c517b69d17ddd5ac4
2018-08-29 23:14:55 +08:00
Chienyuan
edd44ec292 Simply logic for connect and disconnect in HeadsetProfile
* connect: remove debug log of connect connected device. HeadsetService
  will check it and print related log.
* disconnect: remove connected device check logic. HeadsetService will
  check it.
* getConnectionStatus: remove connected device check logic.
  HeadsetService will check it.
* wrap if/else statement in curly brackets.

Bug: 111812003
Test: manual - connect/disconnect headset from Settings UI

Change-Id: I2c58362c236a26b38c8aa67eb3a3433d76f97e45
2018-08-29 20:40:06 +08:00
Dario Freni
17115bdb02 Merge "Include NOTICE from /product and /product_services" 2018-08-29 09:12:52 +00:00
Aurimas Liutikas
b8616dc4d1 Migrated SystemUI & SettingsLib to androidx
Test: make SystemUI SettingsLib
Bug:76692459
Change-Id: I248fdf4042a0a97bc6349091da21c936c2d37c95
Merged-In: I248fdf4042a0a97bc6349091da21c936c2d37c95
(cherry picked from commit fd52c1433c4e4d3f53aef2454d03f6b58f2411a3)
(cherry picked from commit d366771e84f584330c21b6381c902518af110034)
(cherry picked from commit a14377a450a7172963ab7ec1b3e47444a3249216)
2018-08-28 14:19:51 -07:00
hjchangliao
5b02a33069 DO NOT MERGE: Cherry-pick misc fixes to AOSP
Remove wrapper for BluetoothA2dp

Remove BluetoothA2dpWrapper,
Use BluetoothA2dp to replace all of them.

Bug: 76167422
Test: RunSettingsLibRoboTests

Remove wrapper for LocationManager

Remove LocationManagerWrapper from SettingsLib

Bug: 76167422
Test: RunSettingsLibRoboTests
2018-08-28 12:38:44 -07:00
Fan Zhang
66aed6e8e6 DO NOT MERGE Remove old suggestion code.
Change-Id: I2ab9b32ea7622228b0d61b3a16f0695ab04597d7
Fixes: 110361022
Test: robotests
2018-08-28 17:29:29 +00:00
Dario Freni
a1766a1b2d Include NOTICE from /product and /product_services
Test: flashed on a device and checked Legal information webview
Bug: 111179267

Change-Id: I322ddc6903c80840b6f5db7fb9623bfd02b02b40
Merged-In: I5b88fd1c311011300e7db0f010a64150993ba52d
2018-08-28 18:11:26 +01:00
Fan Zhang
a0145d8dd4 Update owner file
Test: rebuild
Change-Id: I0b4093e986e3a73f4ddbd0a15e4366a9c3496172
2018-08-20 16:16:10 -07:00
Chienyuan
87f90bc6b1 Remove A2DP connect logic from settingslib
A2dpProfile will disconnect current device when receive connect event
and max connectable device is one. Ideally we shouldn't have any
bluetooth code in settingslib. The corresponding logic is moved to
the Bluetooth A2dpService.

Bug: 111812003
Test: 1. Developer options > Maxium connected Bluetooth device > 1.
      2. Connected 2 BT Headset respectively

Change-Id: I298c39942756523b8a2b34a4104bcd247d2455eb
2018-08-09 17:08:36 +08:00
Bill Yi
b346a42b78 Import translations. DO NOT MERGE
Change-Id: I3183c39b7e7dde75b962d23f5fdafc8e284d6b4c
Auto-generated-cl: translation import
2018-08-04 06:09:58 -07:00
Colin Cross
c5e5b64b04 Merge "Fix ManifestMerger issues"
am: 684b5f038b

Change-Id: I4a551483dd3f0093f11b557a8ee6e6a99cace256
2018-06-15 16:59:21 -07:00
Colin Cross
6719222fb7 Fix ManifestMerger issues
Set LOCAL_MIN_SDK_VERSION in SettingsLib so that the build system
doesn't raise the minSdkVersion value specified in the manifest,
which causes ManifestMerger to error when trying to merge it into
a package that specifies a lower minSdkVersion.

Bug: 78447299
Test: m java
Change-Id: Ie2c2458647cd6495418999b35894dc92343992cc
2018-06-14 15:25:20 -07:00
Ying Zheng
abb6aad8e5 Merge "Fix a calling loop for getAllUsers." into pi-dev
am: e02f32b921

Change-Id: I86015d504c1a893b8b77d41c804fac4c1ef22c5f
2018-06-05 17:25:13 -07:00
Ying Zheng
9b3422a5e1 Fix a calling loop for getAllUsers.
Bug: 109698349
Test: Manual
Change-Id: Id5def3c876ccfb390dd91f7cb24ebd43ebdeaef0
2018-06-05 11:47:40 -07:00
Ying Zheng
bbb033e6e4 Merge "Read build flag to determine user model." into pi-dev
am: 9b5267f914

Change-Id: I08c8e72fdbad7b20ac6039c441feabf2ac31205c
2018-06-04 17:16:19 -07:00
Ying Zheng
04e1ca0242 Read build flag to determine user model.
Bug: 109698349
Test: Manual
Change-Id: I180b6a877ead576b0ed1292376fe0e74b0df1fd9
2018-06-04 16:02:39 -07:00
Bill Yi
5d22d066f2 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id3ec2d329e661c984e51de0960c46c136ca69627
2018-05-31 19:29:24 -07:00
Bill Yi
bf77fe8ad9 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ia217e53a5c9e1c832f986eb4c90b6099f566d941
2018-05-30 21:32:21 -07:00
Fan Zhang
32cb24c5c9 Merge "Add default phone/sms to battery whitelist apps." into pi-dev
am: 89722d829e

Change-Id: Ide1af36c0e0b70d93cca44a4193f7e2a242d2de5
2018-05-29 20:20:08 -07:00
Fan Zhang
091a057301 Add default phone/sms to battery whitelist apps.
This is to prevent essential default apps from being restricted in using
battery in the background.

Change-Id: Iac9db9c425a477680e41f73b2c0e7bc4e161ce9e
Merged-In: Iac9db9c425a477680e41f73b2c0e7bc4e161ce9e
Fixes: 76435804
Bug: 80428049
Test: robotests
2018-05-29 22:30:49 +00:00
Evan Laird
e8682fbbe0 Merge "Update location icons (qs + status)" into pi-dev
am: 478923bded

Change-Id: I524eb54f32c297de6a5eca1d4ed7f2f753adce3d
2018-05-24 14:48:35 -07:00
TreeHugger Robot
478923bded Merge "Update location icons (qs + status)" into pi-dev 2018-05-24 20:50:41 +00:00
Evan Laird
50b1e2c1eb Merge "Wicked good battery saver + rotation icons!" into pi-dev
am: f354ba185a

Change-Id: I7936cfc374390bfde381759c6265b786d86e4248
2018-05-23 16:58:34 -07:00
Evan Laird
c10ddd448d Update location icons (qs + status)
Last call!

Test: visual
Change-Id: I946691fc06152c56c4c3a2772aaacf5ac1f96ff7
Fixes: 80152065
2018-05-23 16:00:06 -04:00
TreeHugger Robot
f354ba185a Merge "Wicked good battery saver + rotation icons!" into pi-dev 2018-05-23 18:46:47 +00:00
Evan Laird
8190516490 Wicked good battery saver + rotation icons!
Still drawing battery saver QS icon in code, though it's gaining some
hackery

Test: visual
Change-Id: Id773c036a5823dcb6c679fa0e6b649f26da4e017
Fixes: 80152065
2018-05-23 11:10:29 -04:00
Bill Yi
cdd2c69213 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ia64d541d43542bffd17cb0cfba7e23419a84cfdc
2018-05-22 12:26:11 -07:00
Stanley Tng
898361c1c4 Merge "Fix the Hearing Aids connected state in Settings App" into pi-dev
am: aef6efeef5

Change-Id: Ic4ac46d5de65f83ca9e5b27bef44de17c5b94fe8
2018-05-21 13:39:49 -07:00
Stanley Tng
6159842dec Fix the Hearing Aids connected state in Settings App
When two Hearing Aids devices are bonded, we should only show one device
in the Settings App and at the correct location based on the connected
state of the HA devices. When at least one HA device is connected, then
the Settings App should show it as connected. Otherwise, the Settings
App should show it as disconnected when both devices are disconnected.

Bug: 79760469
Test: Run the robotests for Settings and SettingsLib
Change-Id: I33e19af054b686b3d71b00dcbd6ff16febde6099
2018-05-21 10:24:32 -07:00
Evan Laird
4811db16a5 Merge "Status bar icons 15 dp" into pi-dev
am: 97abc762cc

Change-Id: I9d33e4b766952a29ef67fabc17a2ed47ba9114ef
2018-05-21 08:06:29 -07:00
TreeHugger Robot
97abc762cc Merge "Status bar icons 15 dp" into pi-dev 2018-05-21 14:55:11 +00:00
Bill Yi
9a8f7863d8 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id6f7b7b77a60fc3d42cd583a6d7e77f75b6b6bc4
2018-05-20 00:45:08 -07:00
Antony Sargent
6d3558be94 Merge "Update auto-rotate and print icons" into pi-dev
am: bca78e76b3

Change-Id: I4b697311dc3d8ea32d7f969e385ca2e3e96588c1
2018-05-18 18:33:44 -07:00
TreeHugger Robot
bca78e76b3 Merge "Update auto-rotate and print icons" into pi-dev 2018-05-19 01:20:52 +00:00
Evan Laird
39ea810070 Status bar icons 15 dp
Shrink all status bar icons by 2dp. This means setting a scale factor on
anything that is a StatusBarIconView, and manually scaling down wifi and
mobile data groups.

Also fix the padding between the mobile data view and the battery

Also snuck in a fix for the battery saver icon clipping on QS

Change-Id: I5f5430d9e9c66f5c2794dcf4974cf18aa3bff061
Test: visual
Fixes: 74985733
Fixes: 79967193
Bug: 77822905
2018-05-18 19:52:23 -04:00
Antony Sargent
d56ece7477 Update auto-rotate and print icons
Bug: 77982107
Test: manual
Change-Id: I7c5183c7e12819204ce5ecda1017b968ef4a9957
2018-05-18 15:47:26 -07:00
Beverly
8d28303afc Merge "Zen radio button is width 48dp" into pi-dev
am: 24f3d3aba8

Change-Id: I535ab0a2b8127e35f437cac877ad3a5be34df8f4
2018-05-18 13:30:19 -07:00
TreeHugger Robot
24f3d3aba8 Merge "Zen radio button is width 48dp" into pi-dev 2018-05-18 20:19:00 +00:00
Stanley Tng
321fa78629 Merge "Remove Hearing Aid toggle in Settings" into pi-dev
am: 03ca09dac1

Change-Id: I647b2cc3d721ba6d6c2ab65b488dcfc597aec1ee
2018-05-18 11:34:25 -07:00
Beverly
df694f60f6 Zen radio button is width 48dp
Test: manual
Change-Id: Ia39be61c3217901145d2e4d7ab7970239b9c5c44
Fixes: 79698561
2018-05-18 14:28:57 -04:00
TreeHugger Robot
03ca09dac1 Merge "Remove Hearing Aid toggle in Settings" into pi-dev 2018-05-18 18:11:29 +00:00
Stanley Tng
854714d5ea Remove Hearing Aid toggle in Settings
The Hearing Aid toggle in the Device Details page of Hearing Aids in the
Settings App is to be removed.

Bug: 79921361
Test: Manual testing with the Settings App
Change-Id: I8a557112c45fc0004181a58fa5c7794dc0ebe107
2018-05-17 08:55:32 -07:00