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

143738 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
a85cecf39c am d778b6f5: Fixing issue where we weren\'t restoring touch state on dismissed Task cards. (Bug 16322100) 
* commit 'd778b6f58cfbe68d7ce5f769e4146d88d14bfdc6':
  Fixing issue where we weren't restoring touch state on dismissed Task cards. (Bug 16322100)
 2014-07-18 23:46:53 +00:00
Winson Chung
76053fa803 Fixing issue where we weren't restoring touch state on dismissed Task cards. (Bug 16322100) 2014-07-18 23:44:17 +00:00
Ihab Awad
bad8bb994c am 98abc9d1: Merge "Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata" into lmp-dev 
* commit '98abc9d111449309a718c76842e9fef05f08f4bd':
  Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata
 2014-07-18 23:38:46 +00:00
Ricardo Cervera
7c0fd4621b am 3b74e378: am 9c36b835: am 7a425360: am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs 
* commit '3b74e3787a5853f6094f55d6649fadf4518c1cb5':
  docs: Fixed RecyclerView example. Bug: 15973665
 2014-07-18 23:23:35 +00:00
Robert Ly
2611d3a9b7 am ec571ec0: am ee65b63d: am 049cadd8: am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs 
* commit 'ec571ec09d9b745ee0400f5109ccf80d96f67fc4':
  docs: Fix typo in Wear docs. Bug: 16327298
 2014-07-18 23:23:32 +00:00
Prashant Malani
b32bc91e59 am 269ac24f: am 162d9433: (-s ours) am 9353e1a2: Merge "Make the booting flag update unconditional" into klp-modular-dev 
* commit '269ac24ff2e4409d07a965c864ab2c4bf5636e05':
  Make the booting flag update unconditional
 2014-07-18 23:23:28 +00:00
Amith Yamasani
c89b076e9c am 65d3279b: Merge "Add a hidden API to expose cross profile caller id check" into lmp-dev 
* commit '65d3279be34b27e8a7834d3f4ee11793e7c15138':
  Add a hidden API to expose cross profile caller id check
 2014-07-18 23:19:18 +00:00
Ricardo Cervera
cbaecd0f35 am 9c36b835: am 7a425360: am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs 
* commit '9c36b83519804000a3d83e141c3ce7455828b4db':
  docs: Fixed RecyclerView example. Bug: 15973665
 2014-07-18 23:18:09 +00:00
Robert Ly
860a6ce6d1 am ee65b63d: am 049cadd8: am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs 
* commit 'ee65b63d257f2318c10b7d5bd6797a54ca65a4cd':
  docs: Fix typo in Wear docs. Bug: 16327298
 2014-07-18 23:18:00 +00:00
Prashant Malani
84318e52db am 162d9433: (-s ours) am 9353e1a2: Merge "Make the booting flag update unconditional" into klp-modular-dev 
* commit '162d9433502c05c544ddb10d38f9c4b129a82352':
  Make the booting flag update unconditional
 2014-07-18 23:17:52 +00:00
Prashant Malani
10a2eb5389 am c61f26fa: Make the booting flag update unconditional 
* commit 'c61f26fae8c2c0b0c47c98204b07b2be8bd9a8ee':
  Make the booting flag update unconditional
 2014-07-18 23:15:04 +00:00
Prashant Malani
84b08adcbb Make the booting flag update unconditional 
In case an Activity is started before we idle, there is a chance
the booting flag might never get updated.

Bug: 16015648
Change-Id: I46504bd126573e3a2ce1f914be922765ae9fe560

Conflicts:
	services/core/java/com/android/server/am/ActivityStackSupervisor.java
 2014-07-18 23:10:08 +00:00
Quddus Chong
9fc983f56a am f0804df1: am 349e5760: docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463 
* commit 'f0804df14263bd4f4f3a8bd1f21edd1f741dd8da':
  docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463
 2014-07-18 23:08:59 +00:00
Yin-Chia Yeh
f59f29a5bc am 861dd642: Merge "Camera2: add highSpeedVideoConfig wrapper and APIs" into lmp-dev 
* commit '861dd6429d2d8fe13ec9021fc56d8d0c26440890':
  Camera2: add highSpeedVideoConfig wrapper and APIs
 2014-07-18 23:06:50 +00:00
Quddus Chong
f0804df142 am 349e5760: docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463 
* commit '349e5760e701750babdc0f776e51ff2672f7ed2d':
  docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463
 2014-07-18 23:04:21 +00:00
Dake Gu
21fed59c67 am bd497879: ActivityTransition: fix wrong width/height applied to sharedelement. 
* commit 'bd497879f75bf081bec8fa560a136c630d503317':
  ActivityTransition: fix wrong width/height applied to sharedelement.
 2014-07-18 22:54:09 +00:00
Dake Gu
7bf379c8af ActivityTransition: fix wrong width/height applied to sharedelement. 
transform screen position/size to position/size in parent of sharedelement.
fixed bug of transformMatirxToLocal() and transformMatrixToGlobal() that gets

Change-Id: I4c7b12f1ada7004ab7594961df4079be4ca4c909
 2014-07-18 22:49:57 +00:00
Andre Eisenbach
30d462daee am decb3109: Merge "Reduce GATT logging output" into lmp-dev 
* commit 'decb310973362b9849310dd0e087d256196ac62b':
  Reduce GATT logging output
 2014-07-18 22:49:52 +00:00
Niels Egberts
4daa84f255 am 40268fc5: Merge "Add money as a new TtsSpan type." into lmp-dev 
* commit '40268fc5bb1d56ed64ee5011371f18717eb6243a':
  Add money as a new TtsSpan type.
 2014-07-18 22:41:41 +00:00
Deepanshu Gupta
296459ffbb am f4989910: am d32dd294: am b86675f1: am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit 'f498991062d86e4cbf1c9880346a7feb8c428912':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:39:22 +00:00
Deepanshu Gupta
f498991062 am d32dd294: am b86675f1: am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit 'd32dd2948d95a01e6b581ffbc357cf759bae0242':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:35:37 +00:00
Deepanshu Gupta
d32dd2948d am b86675f1: am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit 'b86675f14bea0c833f0ac3f0ec4d3e5f46784569':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:31:17 +00:00
Adam Lesinski
fe355f25d5 am e0b92a6b: First iteration of a public UsageStats API 
* commit 'e0b92a6b9017912fd6f4df96cad4b832288610a2':
  First iteration of a public UsageStats API
 2014-07-18 22:29:07 +00:00
Deepanshu Gupta
b86675f14b am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit 'f2c5a9ee4944b5ca995d0c6b11ccaddecf6432e1':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:26:45 +00:00
Adam Lesinski
0debc9aff4 First iteration of a public UsageStats API 
UsageStats API that allows apps to get a list of packages that have been
recently used, along with basic stats like how long they have been in
the foreground and the most recent time they were running.

Bug: 15165667

Change-Id: I2a2d1ff69bd0b5703ac3d9de1780df42ad90d439
 2014-07-18 15:24:20 -07:00
Deepanshu Gupta
f2c5a9ee49 am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit 'b9efa1e5a11d1542d0bab9c945ce1e920b819764':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:22:24 +00:00
Deepanshu Gupta
5d6322a527 am ad3ccc74: am 3f51ab0d: am 3c92b932: am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'ad3ccc741b867c4344e4c6c2338e02052244ae60':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:17:36 +00:00
Quddus Chong
349e5760e7 docs: Fixed bugs in Game Controller training doc. 
bug: 16375247, 14671463

Change-Id: I51f595065435c3990a979a66b402acc2b6867a1a
 2014-07-18 22:17:22 +00:00
Deepanshu Gupta
b9efa1e5a1 am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit '14a4e69cc656b60c705d2f05229aed2a7049693c':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:17:00 +00:00
John Reck
98bba797d1 am 3406fe19: Add RT-enabled reveal animator 
* commit '3406fe19f70e057b77a7f597e87b4b8511e72aa5':
  Add RT-enabled reveal animator
 2014-07-18 22:14:45 +00:00
Deepanshu Gupta
90824671b6 am 98b24366: am c35afdfd: am cee55fc1: am 99286edc: (-s ours) am aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '98b243660c56129a0e2962e2faeeef1b65409210':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 22:12:11 +00:00
Deepanshu Gupta
ad3ccc741b am 3f51ab0d: am 3c92b932: am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '3f51ab0d81b3f24a0246f3bfe28ea5b364b48210':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:12:10 +00:00
Deepanshu Gupta
14a4e69cc6 am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit 'c735197420948ffff757dbe6d00028a87ed09c15':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:12:02 +00:00
John Reck
d3de42cae8 Add RT-enabled reveal animator 
Bug: 16161431

 Also re-writes RevealAnimator to avoid using any listeners internally,
 removing the logic around shadowing the update listeners.

Change-Id: I6ed8126398eed971a87f20bccb7584c9acafbb6c
 2014-07-18 22:10:22 +00:00
Makoto Onuki
b472f495ac am 24cc3627: am 38bfa1ba: Merge "Use "current" cp2 from telephony" into lmp-dev 
* commit '24cc3627b4d4f62f490f56acddebe596045b3eee':
  Use "current" cp2 from telephony
 2014-07-18 22:09:19 +00:00
ztenghui
504590f0c0 am 47325dcd: am f101ebb0: Fix FIT_XY scaleType issue on VectorDrawable 
* commit '47325dcd542a676a43488648e49ed794e569c844':
  Fix FIT_XY scaleType issue on VectorDrawable
 2014-07-18 22:09:10 +00:00
ztenghui
991e5a9d6e am 736171e3: am 22fd0f85: Fix caching in VectorDrawable to pass the CTS test 
* commit '736171e33ee60d8a047b58c3ce8dbb25fa98652f':
  Fix caching in VectorDrawable to pass the CTS test
 2014-07-18 22:08:57 +00:00
Deepanshu Gupta
4ff3c7f007 am 08840806: am 7f98066d: am 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev 
* commit '08840806b8dbc6c81ec69f409e38ca07f64da528':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:07:47 +00:00
Deepanshu Gupta
c735197420 am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit 'a3966c66ee24109ca4b71f591f0d740ee37987de':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:07:40 +00:00
Deepanshu Gupta
3f51ab0d81 am 3c92b932: am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '3c92b93226195523ff857763901a33847165ee9e':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:07:31 +00:00
Deepanshu Gupta
98b243660c am c35afdfd: am cee55fc1: am 99286edc: (-s ours) am aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'c35afdfd4c40e55e235791341c515bd012d77146':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 22:06:44 +00:00
Zhijun He
015fa94da6 am 3ea4b9d0: Camera2: send the partial result with onCaptureProgressed 
* commit '3ea4b9d066bffe3e2faeb49b6e8d59068e0ccdba':
  Camera2: send the partial result with onCaptureProgressed
 2014-07-18 22:04:11 +00:00
Sailesh Nepal
775363cf31 am 92119b9f: Merge "Add Connection.startActivityFromInCall" into lmp-dev 
* commit '92119b9f8cb357223fca86407799d0d5a274b028':
  Add Connection.startActivityFromInCall
 2014-07-18 22:04:07 +00:00
Deepanshu Gupta
08840806b8 am 7f98066d: am 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev 
* commit '7f98066dd1a2a05d53ba39108dd4d44430e89c71':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:02:28 +00:00
Deepanshu Gupta
3c92b93226 am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '62b81acbcad6ceaa269c7f788068bdf32f403040':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:02:14 +00:00
Deepanshu Gupta
c35afdfd4c am cee55fc1: am 99286edc: (-s ours) am aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'cee55fc19bc9542d17081568ba082b56b5e5d04d':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 22:02:07 +00:00
Zhijun He
fac77c46fe Camera2: send the partial result with onCaptureProgressed 
When partial results are receieved, call onCaptureProgressed instead of
onCapturePartial.

Change-Id: If97233d7b980f490821bca0a722d527f19034cd9
 2014-07-18 22:01:48 +00:00
Deepanshu Gupta
a3966c66ee am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit '627439401ec86a083eefdc61728d6aa75ce9a4e5':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 22:01:45 +00:00
Deepanshu Gupta
276ae4eee5 am 8613f826: am efd29681: am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '8613f826289d627df07971f074a2852012fc98b7':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 22:00:01 +00:00
Deepanshu Gupta
627439401e am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE] 
* commit '8c71ff298b10ebdd3e5dec6f69f70176161b7e0a':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:58:42 +00:00