Jason Monk
51a942380b
Updates to Drawer
...
Support doing nothing on tvs and watches. Also better not doing
anything with no categories existing.
Change-Id: I4a12d4d907a08e75ed3cdcd3f7c68a3a100c687d
2015-11-05 08:52:41 -05:00
Jason Monk
2cf0995439
Merge "Settings Drawer: Handle multi-profile/user correctly"
2015-11-04 21:10:21 +00:00
Jason Monk
48237a76fc
Merge "First pass at drawer support for SettingsLib"
2015-11-04 20:19:18 +00:00
Jason Monk
0d72d20c2f
Settings Drawer: Handle multi-profile/user correctly
...
Change-Id: Ibef3cb38325415d514dc86fcd4ce7b95825361f8
2015-11-04 15:04:45 -05:00
Jason Monk
744b63632a
First pass at drawer support for SettingsLib
...
Change-Id: I9669bd511dd3c4b7f59b8600a5af65d9837af015
2015-11-04 15:02:55 -05:00
Geoff Mendal
8221b05981
Import translations. DO NOT MERGE
...
Change-Id: I8adfd4484cde6c32adab9b939cb7698370e2ec6f
Auto-generated-cl: translation import
2015-11-04 06:56:32 -08:00
Mitchell Wills
c856be1653
Merge "Don't cache ScanResults in WifiTracker if there is no SSID"
2015-11-04 00:58:16 +00:00
Tony Mantler
5fb3a7f666
Move more Accessibility stuff to SettingsLib
...
Change-Id: I081bffea6ff4da455f9040fc3f45198d1de85d26
2015-10-30 16:20:25 -07:00
Geoff Mendal
fbe4ba4fc9
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 25390707
Change-Id: Ief847dab50086dfc1c38d5a3fd50c5971efc7238
2015-10-30 14:30:15 -07:00
Tony Mantler
5789c3e24f
Move AccessibilityUtils to SettingsLib
...
Change-Id: I99eeb79b03e56a0150a8dbebc3cc5c292ad9bcfe
2015-10-29 13:17:06 -07:00
Tony Mantler
65cd70b7fb
Merge "Move some app methods to AppUtils in SettingsLib"
2015-10-26 18:39:15 +00:00
Tony Mantler
ed03f451c8
Move some app methods to AppUtils in SettingsLib
...
Change-Id: If9a1e997ff92957905039cd13143e26324eb7e92
2015-10-21 11:30:49 -07:00
Michael Wright
244f776855
resolve merge conflicts of f013c3f111 to master.
...
Change-Id: I2045187f8fa948a1733cb9a2cdc0a69ae97b5907
2015-10-20 23:48:55 +01:00
Michael Wright
b959ce872c
resolve merge conflicts of 57a5cba606 to cw-e-dev.
...
am: bab2b42445
* commit 'bab2b424453e556a2e7bb9470d70673793dd82df':
Add SystemUI component to watch for keyboard attachment.
2015-10-20 17:23:23 +00:00
Michael Wright
bab2b42445
resolve merge conflicts of 57a5cba606 to cw-e-dev.
...
Change-Id: Ib43f0cf0b285c9799239658859af735279f87fff
2015-10-20 17:06:27 +01:00
Michael Wright
9209c9cd9a
Add SystemUI component to watch for keyboard attachment.
...
Add a new SystemUI component to watch for keyboard attachment /
detachment. If the config specifies the name of a keyboard that is
packaged with the device, then SystemUI will ask the user if they
would like to enable BT (if disabled) and then attempt to pair to the
device.
Bug: 22876536
Change-Id: I786db35524d49706d5e61d8b8bc71194d50113f3
2015-10-12 15:21:37 +01:00
Tony Mantler
e43853ce2f
Move DreamBackend to SettingsLib
...
Change-Id: Ib0251d48ba287eeca4141eb54b0b0273ef636e63
2015-10-09 14:37:32 -07:00
Baligh Uddin
9a2979b27d
Import translations. DO NOT MERGE
...
Change-Id: Iac1fe89a00d3f4e30b20e8f07c48a0845ce41d81
Auto-generated-cl: translation import
2015-09-24 19:36:51 -07:00
Baligh Uddin
effcd9f4ac
Import translations. DO NOT MERGE
...
Change-Id: I45408b967515cd8e66d922507127a392dacbdf4f
Auto-generated-cl: translation import
2015-09-22 21:42:46 -07:00
Baligh Uddin
41cb1b8aac
Import translations. DO NOT MERGE
...
Change-Id: I5b25c04b472923b1334df87d5a271d3164694d20
Auto-generated-cl: translation import
2015-09-18 10:18:08 -07:00
Chris Manton
85f7f790df
am e8c98b77: am f40365f1: am ae0b7ca9: am c9180528: Merge "Add capability to ignore carrier entitlement checks" into mnc-dr-dev
...
* commit 'e8c98b77854d39606960b0b6f5b5332c61e9a3d9':
Add capability to ignore carrier entitlement checks
2015-09-14 17:54:26 +00:00
Chris Manton
f40365f17a
am ae0b7ca9: am c9180528: Merge "Add capability to ignore carrier entitlement checks" into mnc-dr-dev
...
* commit 'ae0b7ca9ad2e21853af06a68c02da068f748f8bd':
Add capability to ignore carrier entitlement checks
2015-09-14 17:39:31 +00:00
Chris Manton
ae0b7ca9ad
am c9180528: Merge "Add capability to ignore carrier entitlement checks" into mnc-dr-dev
...
* commit 'c9180528452d67359618eda4aa2edd39112c83ca':
Add capability to ignore carrier entitlement checks
2015-09-14 17:29:09 +00:00
Chris Manton
1ba0fa04de
Add capability to ignore carrier entitlement checks
...
Boolean to check to ignore carrier entitlement check.
API to follow later.
Carrier configuration manager has an option
to override tethering entitlement checks.
Ignore entitlement checks if overridden by
the carrier configuration flag.
bug:23712807
Change-Id: I6c9b3b9994279e592db304debef54809338fe9cf
2015-09-11 14:33:22 -07:00
Sanket Padawe
0775a98e20
Fix AP showing up forever in Settings after shutting down that AP.
...
Bug: 22129483
Change-Id: I1f6abdb0b80c2d2fec5a7dc4026b5230cd29af7b
2015-09-11 01:06:48 +00:00
Andre Eisenbach
fef961ccbb
am b013468b: am f1ed1fdb: am 1b03cd8e: am 1d5e2e29: Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev
...
* commit 'b013468beca1ec7397c22111b187ffecb20f070a':
Bluetooth: Fix profile auto-connect logic
2015-09-04 14:28:39 +00:00
Andre Eisenbach
f1ed1fdb45
am 1b03cd8e: am 1d5e2e29: Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev
...
* commit '1b03cd8e1b79280e892f81709ced42b990a8905d':
Bluetooth: Fix profile auto-connect logic
2015-09-04 00:28:09 +00:00
Andre Eisenbach
1b03cd8e1b
am 1d5e2e29: Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev
...
* commit '1d5e2e291d4c3fbcde1425af74644a24c94e1577':
Bluetooth: Fix profile auto-connect logic
2015-09-04 00:12:33 +00:00
Andre Eisenbach
7be83c578c
Bluetooth: Fix profile auto-connect logic
...
The fix in commit 05e08c3a2f27d5027b34e81b7c0a67e4da7341f6 caused a
duplicate connect message to be sent to A2DP devices (and others),
causing the A2DP state machine to disconnect a device shortly after
connecting it.
This patch reverts the relevant part of commit 05e06c that causes the
faulty auto-connect behaviour.
Bug: 22128169
Change-Id: Ie0dadd5c9583bf2b64a8434a2a3603cb749b21d0
2015-09-03 15:20:09 -07:00
Mitchell Wills
9df7904390
Don't cache ScanResults in WifiTracker if there is no SSID
...
Bug: 23528076
Change-Id: I118cfafb526fe760bf1d545e09a1559e3867ce06
2015-09-01 12:23:46 -07:00
Wei Liu
f143830914
am 61428288: am 8a6f55e7: am 30275c19: Refactor UidDetailProvider and its dependencies to SettingsLib.
...
* commit '6142828872e7c3ce4f747e7620ef222c059d7b2a':
Refactor UidDetailProvider and its dependencies to SettingsLib.
2015-08-25 18:45:41 +00:00
Wei Liu
8a6f55e743
am 30275c19: Refactor UidDetailProvider and its dependencies to SettingsLib.
...
* commit '30275c1924b2bd45b05bd9c98f8648ecbc71374f':
Refactor UidDetailProvider and its dependencies to SettingsLib.
2015-08-25 18:32:47 +00:00
Wei Liu
80c320624d
am 1148d54f: am 608cf688: am 37e1db23: Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev
...
* commit '1148d54f08c646fe10bbe696864623c4b46b98ea':
Move SummaryForAllUidLoader to SettingsLib.
2015-08-25 18:22:35 +00:00
Wei Liu
608cf688f4
am 37e1db23: Merge "Move SummaryForAllUidLoader to SettingsLib." into cw-e-dev
...
* commit '37e1db2320acd850e0738f3972d3ba4334f59949':
Move SummaryForAllUidLoader to SettingsLib.
2015-08-25 18:07:17 +00:00
Wei Liu
30275c1924
Refactor UidDetailProvider and its dependencies to SettingsLib.
...
so that it can be reused by Wear app data usage.
Change-Id: Ifd5709647ba031bb38b2293c35def01bcdee1448
2015-08-25 11:01:36 -07:00
Wei Liu
c0b99c9a24
Move SummaryForAllUidLoader to SettingsLib.
...
In order to show the data usage per app on Android Wear,
I'm moving SummaryForAllUidLoader to SettingsLib so that
the code can be reused.
Change-Id: I4819ee96a75d62a86968376556258270b3bb8ba1
2015-08-24 11:43:09 -07:00
Mitchell Wills
658b8c258c
am a578ac88: am 9fde6f2c: am edf93764: am b460cc88: Merge "Remove wifi enabled checking from settings TetherUtil" into mnc-dr-dev
...
* commit 'a578ac888622a6b46bbaac78b04adebec9b9979b':
Remove wifi enabled checking from settings TetherUtil
2015-08-20 18:58:56 +00:00
Mitchell Wills
9fde6f2c66
am edf93764: am b460cc88: Merge "Remove wifi enabled checking from settings TetherUtil" into mnc-dr-dev
...
* commit 'edf93764f09357f6062eee2e4da8da925247834a':
Remove wifi enabled checking from settings TetherUtil
2015-08-20 18:45:11 +00:00
Mitchell Wills
edf93764f0
am b460cc88: Merge "Remove wifi enabled checking from settings TetherUtil" into mnc-dr-dev
...
* commit 'b460cc88865bbdafe3f343e43bd08382c6745fe0':
Remove wifi enabled checking from settings TetherUtil
2015-08-20 17:28:01 +00:00
Mitchell Wills
8ba94ba2ab
Remove wifi enabled checking from settings TetherUtil
...
TetherUtil no longer needs to reenable wifi when leaving SAP mode as
it is now done by WifiController. WifiController will also disable
wifi if needed when enabling SAP.
Bug: 22729316
Change-Id: I2ffe50e6468519ca964b27ba70a7e3019fd96eb1
2015-08-17 18:47:08 +00:00
Geoff Mendal
283c030130
Import translations. DO NOT MERGE
...
Change-Id: Ib02888af570eee35060b2c624eaaaee25df11ea6
Auto-generated-cl: translation import
2015-08-08 07:14:55 -07:00
Mitchell Wills
ca2227811c
am 7aafd7fa: am 0b09eefa: am e69acd7a: am 104999b9: am d14c4844: Merge "Pass connection configuration when setting wifi info" into mnc-dev
...
* commit '7aafd7faacf0e31dbfc4931c137d0bad8862df87':
Pass connection configuration when setting wifi info
2015-08-06 03:14:08 +00:00
Mitchell Wills
0b09eefa35
am e69acd7a: am 104999b9: am d14c4844: Merge "Pass connection configuration when setting wifi info" into mnc-dev
...
* commit 'e69acd7a456fb97d7c816629dedb42026eabdd2e':
Pass connection configuration when setting wifi info
2015-08-06 02:45:46 +00:00
Mitchell Wills
e69acd7a45
am 104999b9: am d14c4844: Merge "Pass connection configuration when setting wifi info" into mnc-dev
...
* commit '104999b957440251610dc31939938ef0c85ab23f':
Pass connection configuration when setting wifi info
2015-08-06 02:37:19 +00:00
Mitchell Wills
104999b957
am d14c4844: Merge "Pass connection configuration when setting wifi info" into mnc-dev
...
* commit 'd14c48444a40fa2f964461e2f1317bcc3e256295':
Pass connection configuration when setting wifi info
2015-08-06 02:29:19 +00:00
Mitchell Wills
5a42db2e9c
Pass connection configuration when setting wifi info
...
This allows the both the ssid and connection info to be verified when
updating wifi info.
Bug: 22797622
Change-Id: I82d771a299e17469683516c6b1077cb260981812
2015-08-05 15:39:19 -07:00
Xiaohui Chen
2b45f8a6ce
Clean up USER_OWNER references in settingslib.
...
Bug: 19913735
Change-Id: I0ccaed63c8fbc3bcbbd8d5cf8047e33c6e2edb5c
2015-08-05 16:31:19 +00:00
Geoff Mendal
90b6961570
Import translations. DO NOT MERGE
...
Change-Id: I46c802cd1fbcb8dff8893a353b46a4717bfa1a41
Auto-generated-cl: translation import
2015-08-05 06:53:22 -07:00
Prem Kumar
fca292a7ac
am 54c7ddbc: am 482ba343: am 04e2cf6b: Merge "Make default selection for contact sharing to "Checked"." into mnc-dev
...
* commit '54c7ddbccd71c387c75deb36777b4aede8f226a1':
Make default selection for contact sharing to "Checked".
2015-08-04 01:18:12 +00:00
Prem Kumar
54c7ddbccd
am 482ba343: am 04e2cf6b: Merge "Make default selection for contact sharing to "Checked"." into mnc-dev
...
* commit '482ba34383796d87e4832ace98b0bb1934c8ef72':
Make default selection for contact sharing to "Checked".
2015-08-04 01:09:20 +00:00