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

172476 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Selim Cinek
a6b61481a2 am 0ac91ce1: am 8f6719a1: am 140e3f88: Merge "Fixed a bug where the HUNs were not clickable" into lmp-mr1-dev 
* commit '0ac91ce179469f9dc23f292a6375a0ccc05d77f0':
  Fixed a bug where the HUNs were not clickable
 2014-11-06 16:26:20 +00:00
Selim Cinek
47b8913f8a am f17005f6: am 832607e4: am 6d7065f5: Merge "Fixed a bug that the notifications were not animating when reset" into lmp-mr1-dev 
* commit 'f17005f696440f1e652b572f20dddc91785b6ca3':
  Fixed a bug that the notifications were not animating when reset
 2014-11-06 16:26:13 +00:00
Adrian Roos
b2a6c7b83f am 418f4ed0: Merge "Round charging indication to nearest minute" into lmp-mr1-dev 
* commit '418f4ed077ee0559e7f61b8ea10d53e9784fd631':
  Round charging indication to nearest minute
 2014-11-06 16:26:12 +00:00
Selim Cinek
b8b78687fb am fc22dd58: am 49af6359: Merge "Adapted HUN behavior when swiping vertically" into lmp-mr1-dev 
* commit 'fc22dd58c98ae05705b2800a7eb97174a1bc281c':
  Adapted HUN behavior when swiping vertically
 2014-11-06 16:22:54 +00:00
Selim Cinek
0ac91ce179 am 8f6719a1: am 140e3f88: Merge "Fixed a bug where the HUNs were not clickable" into lmp-mr1-dev 
* commit '8f6719a15d818269fecf3760297004740aa8a0dd':
  Fixed a bug where the HUNs were not clickable
 2014-11-06 16:22:48 +00:00
Selim Cinek
f17005f696 am 832607e4: am 6d7065f5: Merge "Fixed a bug that the notifications were not animating when reset" into lmp-mr1-dev 
* commit '832607e4480a1fb04955654274681ec982406dee':
  Fixed a bug that the notifications were not animating when reset
 2014-11-06 16:22:43 +00:00
Adrian Roos
418f4ed077 Merge "Round charging indication to nearest minute" into lmp-mr1-dev 2014-11-06 16:22:06 +00:00
Selim Cinek
fc22dd58c9 am 49af6359: Merge "Adapted HUN behavior when swiping vertically" into lmp-mr1-dev 
* commit '49af6359e04095fa71162c7658f10cf93c94d341':
  Adapted HUN behavior when swiping vertically
 2014-11-06 16:15:54 +00:00
Selim Cinek
8f6719a15d am 140e3f88: Merge "Fixed a bug where the HUNs were not clickable" into lmp-mr1-dev 
* commit '140e3f88fbd176530f89b3f5f4a29b2a77b97bac':
  Fixed a bug where the HUNs were not clickable
 2014-11-06 16:15:49 +00:00
Selim Cinek
832607e448 am 6d7065f5: Merge "Fixed a bug that the notifications were not animating when reset" into lmp-mr1-dev 
* commit '6d7065f50d1e65707f7decc3f56042f808d5488f':
  Fixed a bug that the notifications were not animating when reset
 2014-11-06 16:15:43 +00:00
Selim Cinek
49af6359e0 Merge "Adapted HUN behavior when swiping vertically" into lmp-mr1-dev 2014-11-06 16:12:59 +00:00
Selim Cinek
140e3f88fb Merge "Fixed a bug where the HUNs were not clickable" into lmp-mr1-dev 2014-11-06 16:12:48 +00:00
Selim Cinek
6d7065f50d Merge "Fixed a bug that the notifications were not animating when reset" into lmp-mr1-dev 2014-11-06 16:12:01 +00:00
Nicolas Prevot
1985f4963a am aa1185dc: am ea728d75: Merge "Add a cross-profile intent filter only if it wasn\'t previously added." into lmp-mr1-dev automerge: b9744c1 
* commit 'aa1185dc44347d1af713ec78b4a294683758b806':
  Add a cross-profile intent filter only if it wasn't previously added.
 2014-11-06 15:25:55 +00:00
Yuncheol Heo
4034241d99 am fb981efb: am 9188df6e: CEC: Allow no parameters with <System Audio Mode Request>. automerge: 0361147 
* commit 'fb981efbd0ba116433fc869ce3b1370a946eb057':
  CEC: Allow no parameters with <System Audio Mode Request>.
 2014-11-06 15:25:51 +00:00
Nicolas Prevot
aa1185dc44 am ea728d75: Merge "Add a cross-profile intent filter only if it wasn\'t previously added." into lmp-mr1-dev automerge: b9744c1 
* commit 'ea728d75ebb228822690365d147fc4021fb87ce9':
  Add a cross-profile intent filter only if it wasn't previously added.
 2014-11-06 15:20:57 +00:00
Yuncheol Heo
fb981efbd0 am 9188df6e: CEC: Allow no parameters with <System Audio Mode Request>. automerge: 0361147 
* commit '9188df6ef00a05fc15f2acf290e40c389ec7c847':
  CEC: Allow no parameters with <System Audio Mode Request>.
 2014-11-06 15:20:51 +00:00
Nicolas Prevot
ea728d75eb Merge "Add a cross-profile intent filter only if it wasn\'t previously added." into lmp-mr1-dev 
automerge: b9744c1

* commit 'b9744c1c1f5e8cc936da7f1832665f77ad5bb18f':
  Add a cross-profile intent filter only if it wasn't previously added.
 2014-11-06 10:22:13 +00:00
Yuncheol Heo
9188df6ef0 CEC: Allow no parameters with <System Audio Mode Request>. 
automerge: 0361147

* commit '03611473bc1d13f8e55ac92e37a9716c2fd8e412':
  CEC: Allow no parameters with <System Audio Mode Request>.
 2014-11-06 10:21:09 +00:00
Nicolas Prevot
b9744c1c1f Merge "Add a cross-profile intent filter only if it wasn't previously added." into lmp-mr1-dev 2014-11-06 09:42:47 +00:00
Yuncheol Heo
03611473bc CEC: Allow no parameters with <System Audio Mode Request>. 
Bug: 18266992
Change-Id: I4399e34d1178f3d4b17b4749ca543c2bb14c0765
 2014-11-06 08:27:58 +00:00
Yohei Yukawa
b21220efae Minimize the number of default enabled IMEs part 4 
This is a follow up CL for recent attempt to minimize
the number of default enabled IMEs.
- part1: I831502db502f4073c9c2f50ce7705a4e45e2e1e3
- part2: Ife93d909fb8a24471c425c903e2b7048826e17a3
- part3: I6571d464a46453934f0a8f5e79018a67a9a3c845

It turned out that the changes made in part2 and part3 are
a bit overkill, and users will see no software keyboards
in some particular situations. The problem we missed in
the previous CLs is the fact that
InputMethodInfo#isDefault is indeed a locale-dependent
value, hence it may vary depending on the system locale.
Existing unittests also failed to abstract such
locale-dependent nature.

In order to addresses that regression, the selection logic
is a bit widely reorganized in this CL.  Now the logic is
implemented as a series of fallback rules.

Also, unit tests are updated to be able to 1) test the
order of the enabled IMEs, and 2) emulate the
locale-dependent behavior of InputMethodInfo#isDefault
to enrich test cases.

BUG: 17347871
BUG: 18192576
Change-Id: I871ccda787eb0f1099ba3574356c1da4b33681f3
 2014-11-06 15:28:06 +09:00
Sailesh Nepal
55c3de783b am a4b3d3d3: am 8fafe7b4: am db66e1d2: Merge "Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause" into lmp-mr1-dev 
* commit 'a4b3d3d32f924bf29ba081aae8528cf617742667':
  Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause
 2014-11-06 06:26:32 +00:00
Sailesh Nepal
a4b3d3d32f am 8fafe7b4: am db66e1d2: Merge "Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause" into lmp-mr1-dev 
* commit '8fafe7b454c27e1ba2850c04e8ef4e16795e13fb':
  Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause
 2014-11-06 06:21:56 +00:00
Sailesh Nepal
8fafe7b454 am db66e1d2: Merge "Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause" into lmp-mr1-dev 
* commit 'db66e1d2b9b63eb1612820dc6572de1e42880646':
  Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause
 2014-11-06 06:17:54 +00:00
Sailesh Nepal
db66e1d2b9 Merge "Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause" into lmp-mr1-dev 2014-11-06 06:14:15 +00:00
Yuncheol Heo
02d5ee944f am 472cfdb9: am d87c32aa: am ff636d38: Merge "CEC: Don\'t send <Feature Abort> on the short message" into lmp-mr1-dev 
* commit '472cfdb967a3ead8bf41e0845897e8a8a338e7c3':
  CEC: Don't send <Feature Abort> on the short message
 2014-11-06 06:03:28 +00:00
Yuncheol Heo
472cfdb967 am d87c32aa: am ff636d38: Merge "CEC: Don\'t send <Feature Abort> on the short message" into lmp-mr1-dev 
* commit 'd87c32aa859ef54c6bce923c52725edf44538488':
  CEC: Don't send <Feature Abort> on the short message
 2014-11-06 05:58:53 +00:00
Yuncheol Heo
d87c32aa85 am ff636d38: Merge "CEC: Don\'t send <Feature Abort> on the short message" into lmp-mr1-dev 
* commit 'ff636d383c8f0464e543866ae73ec4a367efd15a':
  CEC: Don't send <Feature Abort> on the short message
 2014-11-06 05:53:31 +00:00
Yuncheol Heo
ff636d383c Merge "CEC: Don't send <Feature Abort> on the short message" into lmp-mr1-dev 2014-11-06 05:47:49 +00:00
Dirk Dougherty
61a76f2d79 am f15017fc: am 326c70ef: Doc change: Add play dev guide page with index card and shareable download. 
* commit 'f15017fc0af505e8fd5efab3791d153020621084':
  Doc change: Add play dev guide page with index card and shareable download.
 2014-11-06 05:25:51 +00:00
Dirk Dougherty
f15017fc0a am 326c70ef: Doc change: Add play dev guide page with index card and shareable download. 
* commit '326c70efeed9c01e8c8d0f38f7ae27891f726e6b':
  Doc change: Add play dev guide page with index card and shareable download.
 2014-11-06 05:20:29 +00:00
Sailesh Nepal
7a69c9277f Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause 
This CL adds a new disconnect cause. Connection managers
can specify this disconnect cause when it doesn't want
to route calls.

Bug: 16903083
Change-Id: I05822991c5c34ca3533652a10fbcb8845a604925
 2014-11-05 21:02:37 -08:00
Dirk Dougherty
326c70efee Doc change: Add play dev guide page with index card and shareable download. 
Change-Id: I08f5c2a6b863ecb747c90d677f635fab511d91d3
(cherry picked from commit 0ce73219be7f37170eb19dba690a5cd8d3e22e21)
 2014-11-06 04:37:34 +00:00
Dirk Dougherty
2acfc3b9e2 am d7476cf4: Merge "Doc change: Add play dev guide page with index card and shareable download." into lmp-dev 
* commit 'd7476cf42fd397ae8dc70fd9eae636c845842df1':
  Doc change: Add play dev guide page with index card and shareable download.
 2014-11-06 04:29:44 +00:00
Joe Fernandez
93f8965768 am ab6e9048: am 2490ec83: Merge "docs: Add more information for getting started with TV app" into lmp-docs 
* commit 'ab6e9048ebe2ac6cd4897378b56017267d6ee16e':
  docs: Add more information for getting started with TV app
 2014-11-06 04:23:30 +00:00
Dirk Dougherty
d7476cf42f Merge "Doc change: Add play dev guide page with index card and shareable download." into lmp-dev 2014-11-06 04:22:11 +00:00
Joe Fernandez
ab6e9048eb am 2490ec83: Merge "docs: Add more information for getting started with TV app" into lmp-docs 
* commit '2490ec83702985bd70ac2d28322dc5c9625dc26a':
  docs: Add more information for getting started with TV app
 2014-11-06 04:14:26 +00:00
Dirk Dougherty
0ce73219be Doc change: Add play dev guide page with index card and shareable download. 
Change-Id: I08f5c2a6b863ecb747c90d677f635fab511d91d3
 2014-11-05 20:14:15 -08:00
Jim Miller
cc56956025 am 767ae175: am 6230cdf5: am 262dc4da: Merge "Update TrustAgentService API after review" into lmp-mr1-dev 
* commit '767ae175fab5a93f4948b3722549448eb4b55e41':
  Update TrustAgentService API after review
 2014-11-06 03:12:08 +00:00
Paul Lawrence
70c9a06af0 DO NOT MERGE: Don't log passwords returned from vdc 
Turns off logging of responses from native daemon connector altogether.
Proper solution to follow in LMP MR1

Bug: 18260068
Change-Id: I25bc9cb61049a3efdd9a9cd11195864a04ef05fd
 2014-11-05 19:07:57 -08:00
Jim Miller
767ae175fa am 6230cdf5: am 262dc4da: Merge "Update TrustAgentService API after review" into lmp-mr1-dev 
* commit '6230cdf5721f11660e2c0fec1c5695346a9001d0':
  Update TrustAgentService API after review
 2014-11-06 03:07:09 +00:00
mike dooley
3f60f6c084 am 9beb54db: am 6b93e2b0: am 8355c500: Merge "Adding method to get disconnect cause from conference" into lmp-mr1-dev 
* commit '9beb54db9ef78c23dd06822a6e3426d6374b26c2':
  Adding method to get disconnect cause from conference
 2014-11-06 03:01:54 +00:00
Jim Miller
6230cdf572 am 262dc4da: Merge "Update TrustAgentService API after review" into lmp-mr1-dev 
* commit '262dc4dafede871712d89f35d630ab2a332ee6cb':
  Update TrustAgentService API after review
 2014-11-06 02:57:39 +00:00
mike dooley
9beb54db9e am 6b93e2b0: am 8355c500: Merge "Adding method to get disconnect cause from conference" into lmp-mr1-dev 
* commit '6b93e2b02620034e79cb3bdf6d543c3f96abadd7':
  Adding method to get disconnect cause from conference
 2014-11-06 02:55:28 +00:00
Jeff Tinker
9e522f3432 am 0d8d6ba8: am e7f66ada: am fc4e6f70: Merge "Add missing secure stop methods" into lmp-mr1-dev 
* commit '0d8d6ba807078b70eae53e676443ef5ac7598560':
  Add missing secure stop methods
 2014-11-06 02:54:57 +00:00
Jim Miller
262dc4dafe Merge "Update TrustAgentService API after review" into lmp-mr1-dev 2014-11-06 02:52:20 +00:00
Jeff Tinker
0d8d6ba807 am e7f66ada: am fc4e6f70: Merge "Add missing secure stop methods" into lmp-mr1-dev 
* commit 'e7f66ada24c2b4098e9fea1c07d570543149c806':
  Add missing secure stop methods
 2014-11-06 02:49:08 +00:00
mike dooley
6b93e2b026 am 8355c500: Merge "Adding method to get disconnect cause from conference" into lmp-mr1-dev 
* commit '8355c500ea6f809ef2e6885aee673d39f1cb223b':
  Adding method to get disconnect cause from conference
 2014-11-06 02:48:58 +00:00
mike dooley
8355c500ea Merge "Adding method to get disconnect cause from conference" into lmp-mr1-dev 2014-11-06 02:44:00 +00:00