Commit Graph

1154 Commits

Author SHA1 Message Date
Pavlin Radoslavov
607ed23030 Merge "Add Bluetooth Codec selection UI to the Developer Options" am: bfd7f9a1f8 am: d190040dd1 am: 8905569c67
am: afdf387e13

Change-Id: I493e5f8f639a0c7e0dccabed00b48e9216b3cc34
2017-01-07 01:40:55 +00:00
Pavlin Radoslavov
afdf387e13 Merge "Add Bluetooth Codec selection UI to the Developer Options" am: bfd7f9a1f8 am: d190040dd1
am: 8905569c67

Change-Id: I74b2606347e9b6e2a2424add4aa74d0db687f6ee
2017-01-07 01:36:47 +00:00
Pavlin Radoslavov
8905569c67 Merge "Add Bluetooth Codec selection UI to the Developer Options" am: bfd7f9a1f8
am: d190040dd1

Change-Id: I051932a98729e91f4e6512c9fa84a7e261b8cd96
2017-01-07 01:29:44 +00:00
Pavlin Radoslavov
60d704f841 Add Bluetooth Codec selection UI to the Developer Options
Test: A2DP streaming to headsets and manual UI interaction
Bug: 30958229
Change-Id: I88f6efedf1c89b524c863543135ef7be9b7e1a7c
2017-01-06 15:44:27 -08:00
Fan Zhang
d2d3e2cce8 Move category refresh call into a separeate method.
By default we no longer refresh category with each setTileEnabled.
Instead app will call update after all setTileEnabled are called.

This saves a lot of async task execution when Settings app starts

Bug: 34103984
Test: RunSettingsRoboTest (no regresssion)
Change-Id: I71ddcdb3e1fc0df6cacb53583a4f7e8ae8d675f1
2017-01-06 11:44:38 -08:00
TreeHugger Robot
0a454c39cb Merge "Only parse new IA category when needed." 2017-01-06 01:00:18 +00:00
Fan Zhang
8bfb3eac94 Only parse new IA category when needed.
Bug: 34103984
Test: RunSettingsLibRoboTests
Change-Id: I66dd023dc119e06fded9409f03fb8e12200857db
2017-01-05 15:30:42 -08:00
Fan Zhang
9db32f35fb Add Theme and ThemeOverride for new Settings
Bug: 33558692
Test: visual inspection

The new action bar theme has
- light background
- colorAccent as textColorPrimary
- no elevation

Change-Id: I4c1b88410701a35b0e2305d9162ba448d1f5d67b
2017-01-05 14:29:23 -08:00
Roger Xue
412706458e Merge "making changes to settingsLib so we can create car setting using settingsLib" 2017-01-05 19:54:33 +00:00
Lei Yu
2cba0e8b0f Merge "Remove hardcoded color for cellular data usage view" 2017-01-05 18:57:57 +00:00
roger xue
8f06ab0774 making changes to settingsLib so we can create car setting using settingsLib
Test: make -j40 RunSettingsLibRoboTests

Change-Id: I4eff074ebbbf1d4a4325580d68a2123d3f5ff930
2017-01-05 10:20:24 -08:00
Fan Zhang
97c5cdca4e Merge "Disable nav drawer in Settings app." 2017-01-05 17:38:20 +00:00
Bill Yi
b1871a2117 Import translations. DO NOT MERGE
Change-Id: I1f02709e81ed68998fb070d5a3f970ff4f645bbe
Auto-generated-cl: translation import
2017-01-04 17:07:41 -08:00
jackqdyulei
b68fd7ae0a Remove hardcoded color for cellular data usage view
1. Remove hardcoded color and create colorStateList instead
2. Remove warning color and use attr textColorError instead
3. Add function to extract color from colorStateList

Bug: 32592245
Test: manual - Take screenshots
Change-Id: I7f0a54b304b09b99ba1f255952e7e99e009a4d2a
2017-01-04 16:12:44 -08:00
Fan Zhang
cf439c0e80 Disable nav drawer in Settings app.
Bug: 34054123
Test: runtest --path frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/drawer/SettingsDrawerActivityTest.java
Change-Id: Ia6ae42315c3d1798803b9554aa8400aafa2f31fa
2017-01-03 16:41:50 -08:00
Lei Yu
50e0a9a396 Merge "Set background of DrawerLayout to statusBarColor" 2017-01-03 19:10:08 +00:00
Bill Yi
4e583acc33 Import translations. DO NOT MERGE
Change-Id: I3aeecfcbcf1a8c6c0cb1ca92982ac43ec4d87480
Auto-generated-cl: translation import
2016-12-30 00:22:37 -08:00
Shahriyar Amini
1fc3aee9a2 Make methods for Tile content provider data public.
Bug: 31002801
Test: make RunSettingsLibRoboTests

The public methods can be used to retrieve Tile data from a content
provider dynamically in other Settings components.

Change-Id: I2ce1f5620b09dcdb46f315c8ddf04e9f07084e91
2016-12-28 12:15:45 -08:00
TreeHugger Robot
f963b74e12 Merge "Make classes non-final so mockito can mock them." 2016-12-28 00:02:53 +00:00
Fan Zhang
82dd3b0bf6 Make classes non-final so mockito can mock them.
Bug: 33341275
Test: RunSettingsRoboTests
Change-Id: If83180d7caf3af29c9d0dcdc20d557d8d9827c74
2016-12-27 13:59:23 -08:00
Shahriyar Amini
62d80aa09f Merge "Allow Settings tiles to use content provider data." 2016-12-22 18:21:44 +00:00
Bill Yi
1d285a451f Import translations. DO NOT MERGE
Change-Id: I86a3a344112aeab07524a48d5946a93ab88954f3
Auto-generated-cl: translation import
2016-12-21 21:17:55 -08:00
Shahriyar Amini
676add4122 Allow Settings tiles to use content provider data.
Bug: 31002801
Test: make RunSettingsLibRoboTests

Adds optional metadata fields to specify a URI to a content provider
for reading the tile data.

Change-Id: Idc47eefc067fb9d4832dfbd58171943c29f0a529
2016-12-21 10:01:39 -08:00
Andrew Sapperstein
b9453be364 resolve merge conflicts of 4e10b37 to master
Change-Id: If5091133617285fdb7f3c0312e9e229ae8e53fe0
2016-12-20 15:31:32 -08:00
Andrew Sapperstein
4e10b37b71 Add flags to send package name for feedback.
am: 8dc3b870a0

Change-Id: I72a213a36de7459850e3f688569c901c192dcf9a
2016-12-20 23:03:26 +00:00
Andrew Sapperstein
8dc3b870a0 Add flags to send package name for feedback.
Bug: 32189956
Test: make RunSettingsLibRoboTests
Change-Id: I0bd40fdf60b4f3ee21afad6e3f7dc3e4e87212f0
(cherry picked from commit c05c740d60)
2016-12-20 21:06:38 +00:00
Andrew Sapperstein
c05c740d60 Add flags to send package name for feedback.
Bug: 32189956
Test: make RunSettingsLibRoboTests
Change-Id: I0bd40fdf60b4f3ee21afad6e3f7dc3e4e87212f0
2016-12-19 18:12:53 -08:00
jackqdyulei
63b5c2f4f5 Set background of DrawerLayout to statusBarColor
Bug: 30811708
Test: Manual
Change-Id: Ib77a7f65de04840c96c52b3ca2fa7bfdbadd25b3
2016-12-19 17:38:29 -08:00
Doris Ling
ec46371999 Merge "Overload TileUtils.getCategories() with an additional parameteri." 2016-12-19 23:53:36 +00:00
Doris Ling
485df11f77 Overload TileUtils.getCategories() with an additional parameteri.
Add a string parameter to specify any extra intent action to be used
to query all dashboard categories.

Bug: 32739952
Test: make RunSettingsLibRoboTests

Change-Id: I4df39acfde841ab0553fe01893e9e4a97d6f7bca
2016-12-19 14:24:36 -08:00
Paul Duffin
6690a19c68 Use junit instead of junit4-target
Bug: 30188076
Test: make checkbuild
Change-Id: I61bf0d812d433d3622e9be33c549da16e511a359
2016-12-19 14:01:32 +00:00
Fan Zhang
8e5823a4d7 Merge "Revert "Remove hardcoded actionbar background color."" 2016-12-16 20:56:56 +00:00
Fan Zhang
dbf79fe009 Revert "Remove hardcoded actionbar background color."
This reverts commit 697e186820.

Change-Id: Id3223eeba6f07f9b90d1f5e0e4fd42bae1cf3f1b
2016-12-16 20:26:09 +00:00
Shinji Sogo
3bd405bd72 Merge "[HS2.0] Need to compare with not only FQDN but SSID" am: 69e7f9683d am: e67395a97a am: 80fba49386
am: ee05b648c7

Change-Id: I29e7c9ce4c437ac3e012516a2bfd4c3cf8981aae
2016-12-16 01:42:55 +00:00
Shinji Sogo
ee05b648c7 Merge "[HS2.0] Need to compare with not only FQDN but SSID" am: 69e7f9683d am: e67395a97a
am: 80fba49386

Change-Id: I15cabf9e4146f1f0d0c31b24d222c34b8477cdb7
2016-12-15 23:38:59 +00:00
Shinji Sogo
80fba49386 Merge "[HS2.0] Need to compare with not only FQDN but SSID" am: 69e7f9683d
am: e67395a97a

Change-Id: Idff19dcb2c95c4f8b359863fe8545fc478040723
2016-12-15 23:04:21 +00:00
Fan Zhang
697e186820 Remove hardcoded actionbar background color.
Bug: 33558692
Test: visual
Change-Id: Ia95799f86eab5b9566cca52ee0409d303e16a3c6
2016-12-15 14:34:26 -08:00
Treehugger Robot
69e7f9683d Merge "[HS2.0] Need to compare with not only FQDN but SSID" 2016-12-15 22:17:48 +00:00
Lei Yu
5ed0692b25 Merge "Change animation based on visibility of the drawable" 2016-12-14 19:00:56 +00:00
Lei Yu
7bf650a65e Merge "Add tint for ic_menu.xml" 2016-12-14 18:51:20 +00:00
Lorenzo Colitti
68457bfc1e Display "Sign into network" in settings when on a captive portal. am: 1317e049f5
am: 38938279a4

Change-Id: I3f836ff459850e48def89be69b6c7cda4986907b
2016-12-14 05:05:54 +00:00
Lorenzo Colitti
38938279a4 Display "Sign into network" in settings when on a captive portal.
am: 1317e049f5

Change-Id: I9d15780cb49e365da98e09ba0149a8d31df4373c
2016-12-14 04:59:47 +00:00
jackqdyulei
2254d87273 Add tint for ic_menu.xml
Bug: 32592245
Test: Visual
Change-Id: I4aa46ac558a466f06bae39e93a1fabc57a7a9967
2016-12-13 13:35:15 -08:00
TreeHugger Robot
686ec7a62b Merge "Always reserve space for icon in RestrictedSwitchPreference." 2016-12-13 19:47:34 +00:00
jackqdyulei
089b6ac75a Change animation based on visibility of the drawable
Bug: 27633363
Test: make RunSettingsLibRoboTests
Change-Id: I589056eb95ee0af046e39d2a646b51c754886b4d
2016-12-13 10:04:17 -08:00
TreeHugger Robot
aa5f515b1a Merge "Extract checking profiles for restrictions into a shared method." 2016-12-13 16:48:17 +00:00
Andrew Scull
4e201486b5 Extract checking profiles for restrictions into a shared method.
Test: m RunSettingsLibRoboTests
Change-Id: Ie8fd3121771a7a2213ee441aef5a0746ad09a6c9
2016-12-13 10:45:37 +00:00
Lorenzo Colitti
1317e049f5 Display "Sign into network" in settings when on a captive portal.
Test: Manually observed UI when connected to captive portal.
Bug: 33532675
Change-Id: I3906cd7c13f7bb14242d8a4ec1ca37febccee8c6
2016-12-13 17:55:50 +09:00
Bill Yi
53ca81fee7 Import translations. DO NOT MERGE
Change-Id: Ib707e6db3da131afd77fe1e56a3d30fbc8142bd0
Auto-generated-cl: translation import
2016-12-12 16:52:27 -08:00
Fan Zhang
89ae66c322 Always reserve space for icon in RestrictedSwitchPreference.
Bug: 33430928
Test: RunSettingsLibRoboTests
Change-Id: I60e712f33d9fc7d3617fcaf5b217a2435ff18540
2016-12-12 11:37:33 -08:00