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

143534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
cd92f6a730 am 5d6322a5: (-s ours) 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 '5d6322a527c81fa261642582a508f39a617a206a':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-19 00:41:52 +00:00
Deepanshu Gupta
580c3d823b am 90824671: (-s ours) 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 '90824671b6467919e7aa12a09a6c21797764bca3':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-19 00:41:48 +00:00
Deepanshu Gupta
96c280aa1d am 4ff3c7f0: (-s ours) 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 '4ff3c7f0072d1c56d241b234e7f208009c86112f':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-19 00:41:43 +00:00
Deepanshu Gupta
1386fc647b am 276ae4ee: (-s ours) am 8613f826: am efd29681: am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '276ae4eee5450674fbc7e27f638f18ddc748b7f6':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-19 00:41:39 +00:00
Deepanshu Gupta
0dfccbc911 am 0804e0ad: (-s ours) am a9e488a6: am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev 
* commit '0804e0aded17c1aee8cbd2c34247b390051123c3':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-19 00:41:35 +00:00
Deepanshu Gupta
e4e37ed5cc am d7f2bf06: (-s ours) am f75489f2: am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE] 
* commit 'd7f2bf067fce644ed902122fffb9e22b6596a0ff':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-19 00:41:31 +00:00
Guang Zhu
422ea1f9a0 am 5a0f7e41: am f59ce468: am b477fc6c: Merge "add command to enable bt snoop log" into klp-modular-dev 
* commit '5a0f7e414e9a41ebc3845d0158f59afd8899d8b1':
  add command to enable bt snoop log
 2014-07-19 00:40:28 +00:00
Jean-Michel Trivi
e03f9227fb am 981fcf46: Merge "Hide AudioManager.startBluetoothScoVirtualCall()" into lmp-dev 
* commit '981fcf46c2876541de3fe1e6c030899c582ae198':
  Hide AudioManager.startBluetoothScoVirtualCall()
 2014-07-19 00:36:05 +00:00
Guang Zhu
7d41c138d2 am f59ce468: am b477fc6c: Merge "add command to enable bt snoop log" into klp-modular-dev 
* commit 'f59ce46880ebe2c2466a2c862ec2ed401f635d51':
  add command to enable bt snoop log
 2014-07-19 00:33:58 +00:00
Santos Cordon
632008662f am db2f81b0: Fixing ADD_CALL (1/3) 
* commit 'db2f81b07d0b29e2fff87be3293945fd9aeaf13d':
  Fixing ADD_CALL (1/3)
 2014-07-19 00:28:01 +00:00
Santos Cordon
6b45642f36 Fixing ADD_CALL (1/3) 
Bug: 16241726
Change-Id: Ie1dd72a79c2430b10b0239dbdda5508edbc8eb26
 2014-07-19 00:23:21 +00:00
Chris Craik
484f067b0e am e25d7792: Merge "Tweaks to outline API" into lmp-dev 
* commit 'e25d7792af090ef3c692ad157c3cbfeadf1db7b8':
  Tweaks to outline API
 2014-07-19 00:23:13 +00:00
Adam Powell
fdceab301a am d0cb5fd8: Merge "Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER" into lmp-dev 
* commit 'd0cb5fd810d1b9002c330435da89c1465deb8d37':
  Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER
 2014-07-19 00:23:09 +00:00
Yorke Lee
6891ebfdb0 am c5a8e2f1: Rename voicemail permissions 
* commit 'c5a8e2f13cc92802768aacac4ae3baa9676db422':
  Rename voicemail permissions
 2014-07-19 00:19:03 +00:00
Yorke Lee
a19d7bfacf Rename voicemail permissions 
Rename READ_ALL_VOICEMAIL to READ_VOICEMAIL, and MANAGE_VOICEMAIL
to WRITE_VOICEMAIL

Bug: 16400686
Change-Id: I4c87a7e2fb3aa71d7de3865301f110bcfb29221b
 2014-07-18 17:11:50 -07:00
Shishir Agrawal
3e30aeedf7 am 47bbd460: Merge "Adding the ability for carrier app to override SPN and carrier name." into lmp-dev 
* commit '47bbd4608e423efd310a894b275724792268beba':
  Adding the ability for carrier app to override SPN and carrier name.
 2014-07-19 00:11:11 +00:00
Christopher Tate
79f7a50363 am 12e9b896: Fix which index goes where 
* commit '12e9b896f1fb40489a56e7ade81ffc807eb17065':
  Fix which index goes where
 2014-07-19 00:06:46 +00:00
Sreeram Ramachandran
4c51dbedb6 am 4000b01f: Merge "Allow VPN interfaces to be put into blocking mode." into lmp-dev 
* commit '4000b01f1eb14e6e1a4a9c1aa955193ced7d5d94':
  Allow VPN interfaces to be put into blocking mode.
 2014-07-19 00:06:43 +00:00
Christopher Tate
4a79daeaf7 Fix which index goes where 
Change-Id: If4cf7efd4d7962eb5c10b487482653d86d92d2c6
 2014-07-19 00:04:09 +00:00
Winson Chung
edaefc452a am 51b044a2: Merge "Add setting to guard the lock-to-app recents icon" into lmp-dev 
* commit '51b044a29d73fc05c95ecf0e237efc531adbb3cb':
  Add setting to guard the lock-to-app recents icon
 2014-07-18 23:50:59 +00:00
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
Evan Charlton
a37cb8b6e3 Merge "@hide CAPABILITY_CALL_PROVIDER" into lmp-dev 2014-07-18 22:16:50 +00:00