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

149919 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christoph Studer
c649d4961d am 55c7c687: Merge "NoMan: Add flag to turn off aggregated in-mem stats" into lmp-dev 
* commit '55c7c68726c5027cdb5b794a1a732c38e3176d0c':
  NoMan: Add flag to turn off aggregated in-mem stats
 2014-08-22 19:48:05 +00:00
Christian Robertson
3b4a499257 Merge "Changed the color of buttonBarButtonStyle in the Material theme" into lmp-dev 2014-08-22 19:48:00 +00:00
Lajos Molnar
70d9c85fc0 am 202c366e: Merge "MediaCodeInfo: fix support for feature-can-swap-width-height" into lmp-dev 
* commit '202c366ee82f4d7c7b22330abfad686a3e5d4c76':
  MediaCodeInfo: fix support for feature-can-swap-width-height
 2014-08-22 19:48:00 +00:00
ztenghui
14aedd1fbf Fixing AVD animation with startOffset 
b/17160751

Change-Id: If030ca04f5a7dd7e732dcc5dfb18d51faa7e7b79
 2014-08-22 12:41:06 -07:00
Christoph Studer
28d6247b3d Merge "NoMan: Turn off aggregated stats" into lmp-dev 2014-08-22 19:40:57 +00:00
Christoph Studer
9e3618c28f Merge "NoMan: Add flag to turn off aggregated in-mem stats" into lmp-dev 2014-08-22 19:40:17 +00:00
Lajos Molnar
a802e26d08 Merge "MediaCodeInfo: fix support for feature-can-swap-width-height" into lmp-dev 2014-08-22 19:38:23 +00:00
Tyler Gunn
4d9598c9fa am 1bd00018: Merge "Hiding missed Video telephony related APIs." into lmp-dev 
* commit '1bd000182d8d2a6541294235f3f2de208e0590a5':
  Hiding missed Video telephony related APIs.
 2014-08-22 19:22:44 +00:00
Ronghua Wu
8d277863c0 am 29b2d44c: Merge "VideoView: unhide setVideoURI api and add document." into lmp-dev 
* commit '29b2d44caf400cef90f48b42076e8ff25fce5754':
  VideoView: unhide setVideoURI api and add document.
 2014-08-22 19:22:39 +00:00
Yigit Boyar
8a57a550fb am 907b5603: Merge "Fix RTL bug for actionbar tooltips" into lmp-dev 
* commit '907b56033d72cdb1548da0a7ed4dd958b09cc9dc':
  Fix RTL bug for actionbar tooltips
 2014-08-22 19:22:35 +00:00
Yigit Boyar
f12b03a2c4 am 1884afbf: Merge "Change actionbar title size for landscape" into lmp-dev 
* commit '1884afbf10694e1a5acbb73edd65a2049bf063ff':
  Change actionbar title size for landscape
 2014-08-22 19:22:31 +00:00
Tyler Gunn
9edf297055 Merge "Hiding missed Video telephony related APIs." into lmp-dev 2014-08-22 19:20:00 +00:00
Ronghua Wu
306afb9142 Merge "VideoView: unhide setVideoURI api and add document." into lmp-dev 2014-08-22 19:16:58 +00:00
Yigit Boyar
1960b32434 Merge "Fix RTL bug for actionbar tooltips" into lmp-dev 2014-08-22 19:15:40 +00:00
Yigit Boyar
a0a6d224ad Merge "Change actionbar title size for landscape" into lmp-dev 2014-08-22 19:15:25 +00:00
Svetoslav
7505e3315c Fix jank in when drawing magnification bounds 
There was an off-by-one error in computing the invalidated
rectangle when drawing the magnified region border.

bug:17199352

Change-Id: Id0a1af092b7124bbdca316534c035ed9af829326
 2014-08-22 12:14:47 -07:00
Christoph Studer
0a31453864 NoMan: Turn off aggregated stats 
Aggregated stats can grow unboundedly and shouldn't be enabled
for prod builds.

Bug: 16777910
Change-Id: I1c9303fc3aab93fd75f4dfbbf2e3de467a72f99e
 2014-08-22 21:03:48 +02:00
Christoph Studer
856b2b8135 NoMan: Add flag to turn off aggregated in-mem stats 
Bug: 16777910
Change-Id: Ic5baa910988f027c82ba16d713a44cc5d55b8333
 2014-08-22 21:03:37 +02:00
Elliott Hughes
dee5cde1ec Don't show the pseudolocales unless we're in developer mode. 
The old zz_ZY and zz_ZZ pseudolocales are gone, replaced by ar_XB and en_XA.
The existing check for "developer mode" wasn't working, and now the
pseudolocales are there by default, we want to _remove_ them if we're not
in developer mode rather than add them if we are in developer mode.

Bug: 17190407
Change-Id: I6ee6eba53f5b816ef8e0d1768c94cd3484a196b5
 2014-08-22 11:57:15 -07:00
Jae Seo
bdb7dccd8b am 48ca66c3: Merge "TIF: Fix comments in TvContentRating" into lmp-dev 
* commit '48ca66c3e9ae6fe0c689ba40780dfdbe2b9d99a1':
  TIF: Fix comments in TvContentRating
 2014-08-22 18:48:03 +00:00
Selim Cinek
2ee5f8ff5e Fixed a ltr bug where the buttons disappeared 
Bug: 15280748
Change-Id: If2fdeef42cba867c234300f4e5484022c405c587
 2014-08-22 20:43:02 +02:00
Jae Seo
ae06aec9bb Merge "TIF: Fix comments in TvContentRating" into lmp-dev 2014-08-22 18:41:32 +00:00
Tyler Gunn
75537ae00d Hiding missed Video telephony related APIs. 
Bug: 17188135
Change-Id: I9b569936bff285463d32df878efb26041917c51b
 2014-08-22 11:33:13 -07:00
Jae Seo
ceb51abc74 TIF: Fix comments in TvContentRating 
Bug: 16876068
Change-Id: I4c8be4ecbbdefac8e85531fa9b918f454b9e45d8
 2014-08-22 11:27:10 -07:00
Paul Lawrence
32d06732cd Fix adb backup for encrypted case 
New behavior. Backup no longer uses the encryption password. This is in
part because that is hard with patterns, in part because it is a security
issue - the off line backup is much easier to brute force than the phone.

Instead, we simply insist on an encryption password if your device is encrypted
and locked.

Bug: 17159330
Change-Id: Ia22f84722522abf0b569a3ef1e16ead5527c726d
 2014-08-22 11:22:43 -07:00
John Reck
01edef10b9 Revert immutable Shader change 
Bug: 16733996

Change-Id: I51686aaf8f6ae8d0e390e298ad70f98f81c5f555
 2014-08-22 11:15:37 -07:00
Adam Powell
93ecba34c6 am f8e73a96: Merge "Add a missing condition when checking measurement for ActionBarContainer" into lmp-dev 
* commit 'f8e73a967defce9e76c3f6e78a79d542647427d3':
  Add a missing condition when checking measurement for ActionBarContainer
 2014-08-22 18:10:03 +00:00
Michael Wright
3afd7e7ca7 am f3091f94: Merge "Add Voice Assist key." into lmp-dev 
* commit 'f3091f94ba00b32afaa42e1897e10639ad7ec4fc':
  Add Voice Assist key.
 2014-08-22 18:09:44 +00:00
Adam Powell
c793c9eb24 Merge "Add a missing condition when checking measurement for ActionBarContainer" into lmp-dev 2014-08-22 18:03:20 +00:00
Michael Wright
931b2e7c3a Merge "Add Voice Assist key." into lmp-dev 2014-08-22 18:02:27 +00:00
Yorke Lee
59432a6b67 am 82f28d2d: Merge "Update normalized phone number for contact for successful call" into lmp-dev 
* commit '82f28d2df6bfeac3102f8b35907d853c879b559c':
  Update normalized phone number for contact for successful call
 2014-08-22 18:01:58 +00:00
Ronghua Wu
0e9e3b213e VideoView: unhide setVideoURI api and add document. 
Bug: 16899444
Change-Id: I576a4b334d8b1fe89f93df3587386ac7f9455687
 2014-08-22 10:56:36 -07:00
Yorke Lee
eda777592b Merge "Update normalized phone number for contact for successful call" into lmp-dev 2014-08-22 17:55:49 +00:00
Adam Powell
a12aaa75df Add a missing condition when checking measurement for ActionBarContainer 
It even said "non-tab" right there.

Bug 17202141

Change-Id: Iacc7ec9610d2639aab59dd57ba7194178fb6391f
 2014-08-22 10:46:55 -07:00
Tyler Gunn
60627b8347 am 0eb2ba88: Merge "Hiding Video telephony related APIs." into lmp-dev 
* commit '0eb2ba88f847730b96a4899e4661a4c99edac419':
  Hiding Video telephony related APIs.
 2014-08-22 17:20:46 +00:00
Tyler Gunn
705e9879fc Merge "Hiding Video telephony related APIs." into lmp-dev 2014-08-22 17:12:57 +00:00
Brian Carlstrom
5bdacd71fe am 0830d164: Merge "Move SystemBackupAgent from services.jar to frameworks.jar" into lmp-dev 
* commit '0830d1649d4dfa74f9e055930d205bf271611187':
  Move SystemBackupAgent from services.jar to frameworks.jar
 2014-08-22 17:08:59 +00:00
Jason Monk
f45161aa07 am 8db91925: Merge "Switch to proper networkcallback api" into lmp-dev 
* commit '8db919252fec6cb7b7311f2e186315f05a9a9a02':
  Switch to proper networkcallback api
 2014-08-22 17:04:36 +00:00
Jeff Davidson
fde0437069 am 3277eb42: Merge "Allow NetworkRequest release from the system process." into lmp-dev 
* commit '3277eb42f56f19584b7b53475287b5577232d1a5':
  Allow NetworkRequest release from the system process.
 2014-08-22 17:04:31 +00:00
Brian Carlstrom
9a434ae00f Merge "Move SystemBackupAgent from services.jar to frameworks.jar" into lmp-dev 2014-08-22 17:03:49 +00:00
Jason Monk
2180d39407 Merge "Switch to proper networkcallback api" into lmp-dev 2014-08-22 16:56:44 +00:00
Jeff Davidson
717d95161a Merge "Allow NetworkRequest release from the system process." into lmp-dev 2014-08-22 16:52:33 +00:00
Baligh Uddin
490d724b2a am e90ad6e3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'e90ad6e3a8ca4cc8ca0dbcd310816072fe1da9a5':
  Import translations. DO NOT MERGE
 2014-08-22 16:52:10 +00:00
Baligh Uddin
51adc1093e am 74331893: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '743318934f52ff0ba8f640bc40a5385db1872cd4':
  Import translations. DO NOT MERGE
 2014-08-22 16:52:04 +00:00
Baligh Uddin
a79cdd0485 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-22 16:50:08 +00:00
Baligh Uddin
84cd553454 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-22 16:41:28 +00:00
John Spurlock
b49d837ef8 am d2792dae: Merge "Zen: "Muted by <x>" indicator string." into lmp-dev 
* commit 'd2792dae7f4bf729f39706a04809a03f38fd64a0':
  Zen: "Muted by <x>" indicator string.
 2014-08-22 16:14:47 +00:00
John Spurlock
2b0fea9b1a Merge "Zen: "Muted by <x>" indicator string." into lmp-dev 2014-08-22 16:06:06 +00:00
Youngsang Cho
e6325b239d am deeb5e37: Merge "Send notification messages immediatelly" into lmp-dev 
* commit 'deeb5e374eebb2d6520fa4ccc784d01681e254fb':
  Send notification messages immediatelly
 2014-08-22 16:05:17 +00:00
Youngsang Cho
e91f83c88e Merge "Send notification messages immediatelly" into lmp-dev 2014-08-22 15:54:12 +00:00