drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
206,170 Commits 1 Branch 0 Tags
Commit Graph

163 Commits

Author SHA1 Message Date
Sanket Padawe
761af3d27d Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev am: 5b6ad87630 
am: 4f822bbf2a

* commit '4f822bbf2a1c44c9dc5668857aa8cf7f0e5969cc':
  Don't allow contact sharing by default for device not recognized as carkit.
 2015-11-13 00:07:47 +00:00
Sanket Padawe
4f822bbf2a Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dr-dev 
am: 5b6ad87630

* commit '5b6ad87630756751471f7224672328d955c8f2fb':
  Don't allow contact sharing by default for device not recognized as carkit.
 2015-11-12 23:58:48 +00:00
Sanket Padawe
07533dbfff Don't allow contact sharing by default for device not recognized as carkit. 
+ Don't allow contact sharing by default for devices not recognized
as carkit at pair time.

Bug: 23607427
Change-Id: If6babb10117ba7ee5008a4a29450a7cb981bea4a
 2015-11-11 15:01:35 -08: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
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
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
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
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
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
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
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
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
Prem Kumar
482ba34383 am 04e2cf6b: Merge "Make default selection for contact sharing to "Checked"." into mnc-dev 
* commit '04e2cf6bc5167583d686c2a118ec2b50a7b88547':
  Make default selection for contact sharing to "Checked".
 2015-08-04 01:00:47 +00:00
Prem Kumar
04e2cf6bc5 Merge "Make default selection for contact sharing to "Checked"." into mnc-dev 2015-08-04 00:41:46 +00:00
Geoff Mendal
02f42ca497 Import translations. DO NOT MERGE 
Change-Id: I35c0512c48a8b1d8f4cb738a879d58421df8d747
Auto-generated-cl: translation import
 2015-08-03 06:55:08 -07:00
Geoff Mendal
f4f146723d Import translations. DO NOT MERGE 
Change-Id: I2b1557f5ff69d19dadcf7be20a4a34eb55740466
Auto-generated-cl: translation import
 2015-07-29 06:44:19 -07:00
Zach Johnson
0117bc33e2 am f8c99378: am bd388372: am 5faa0336: Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev 
* commit 'f8c99378367ef025b9da981d62806d1d06ef299e':
  Add filter for personal apps that are not disabled until first use
 2015-07-28 23:43:50 +00:00
Zach Johnson
f8c9937836 am bd388372: am 5faa0336: Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev 
* commit 'bd388372a81472aa3a5f40e57f9f541f85931495':
  Add filter for personal apps that are not disabled until first use
 2015-07-28 23:23:38 +00:00
Zach Johnson
bd388372a8 am 5faa0336: Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev 
* commit '5faa033615dcb4297fcb6a81828099285364942d':
  Add filter for personal apps that are not disabled until first use
 2015-07-28 22:58:11 +00:00
Zach Johnson
5faa033615 Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev 2015-07-28 22:36:30 +00:00
Jorim Jaggi
04f61ee85d am f040100c: am 6a601960: am 9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev 
* commit 'f040100cbde4b551dd551a8b0b9eb7194116a95b':
  Move PIN/Pattern appear animation to RenderThread (1/2)
 2015-07-27 19:48:37 +00:00
Jorim Jaggi
f040100cbd am 6a601960: am 9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev 
* commit '6a601960a3cbfbed1f0ac6df65791a3149eec92e':
  Move PIN/Pattern appear animation to RenderThread (1/2)
 2015-07-27 19:35:06 +00:00
Jorim Jaggi
6a601960a3 am 9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev 
* commit '9e49b5d679672ea4a64382f9a36663c73603961b':
  Move PIN/Pattern appear animation to RenderThread (1/2)
 2015-07-27 19:18:37 +00:00
Zach Johnson
b6d17ee7ae Add filter for personal apps that are not disabled until first use 
Needed for the battery settings UI.

b/22667081

Change-Id: I25ed5c1866dc3027e450c7ce9031de5def4f839a
 2015-07-24 15:48:52 -07:00
Jorim Jaggi
613f55fbbb Move PIN/Pattern appear animation to RenderThread (1/2) 
Bug: 22205322
Change-Id: I253f20a397ab89cb78254338a0254619232d7300
 2015-07-22 15:23:52 -07:00
Geoff Mendal
b568f3fdc9 Import translations. DO NOT MERGE 
Change-Id: I51a4605c050aab170712962b4cc2a7df7ca9174d
Auto-generated-cl: translation import
 2015-07-22 06:49:42 -07:00
Geoff Mendal
c0fa470da0 Import translations. DO NOT MERGE 
Change-Id: Icbd56819c58f38f5e254bf06203fae83a9dddd07
Auto-generated-cl: translation import
 2015-07-20 06:52:40 -07:00
Sanket Padawe
9debd5106e Make default selection for contact sharing to "Checked". 
Bug: 22556703
Change-Id: I33343301c4097f0e966f11a8d503ca30949e9a82
 2015-07-17 12:35:58 -07:00
Geoff Mendal
a000d1fe4d Import translations. DO NOT MERGE 
Change-Id: Ie56e8483ffa87f863bb76f29f73fcdeeb7b4b2b2
Auto-generated-cl: translation import
 2015-07-15 07:05:22 -07:00
Geoff Mendal
bb24571ae8 Import translations. DO NOT MERGE 
Change-Id: I4e7c446cc9fd0a34b81173a74cddc40c22b7b74b
Auto-generated-cl: translation import
 2015-07-15 06:47:39 -07:00
Jason Monk
4345912dc8 am b9b50eff: am a7542155: am 2061049d: Merge "Move wifi accessibility strings to SettingsLib" into mnc-dev 
* commit 'b9b50effa1ddd66c999e25af1f8bf2e2a9c07566':
  Move wifi accessibility strings to SettingsLib
 2015-07-14 20:47:46 +00:00
Jason Monk
b9b50effa1 am a7542155: am 2061049d: Merge "Move wifi accessibility strings to SettingsLib" into mnc-dev 
* commit 'a75421557651d7016124f8ed1fa5c0bab834d121':
  Move wifi accessibility strings to SettingsLib
 2015-07-14 20:42:41 +00:00