Rob Tsuk
3440fa156a
am 48b2c775: am 7e391cb8: Merge "Replace blue pressed feedback with gray." into klp-dev
...
* commit '48b2c775d5a59d98375b8db49fdff1618709e58d':
Replace blue pressed feedback with gray.
2013-09-25 18:52:05 -07:00
Rob Tsuk
48b2c775d5
am 7e391cb8: Merge "Replace blue pressed feedback with gray." into klp-dev
...
* commit '7e391cb8acc36eb7a9f489e60e127ca8dfab37ac':
Replace blue pressed feedback with gray.
2013-09-25 18:49:31 -07:00
Rob Tsuk
7e391cb8ac
Merge "Replace blue pressed feedback with gray." into klp-dev
2013-09-26 01:45:01 +00:00
Ari Sachter-Zeltzer
6f7be89b32
am 61050196: am a53b8541: Merge "removing unused kg_* assets from fbc" into klp-dev
...
* commit '61050196dd4f54159b67dbfd3a0bf3225eb7747a':
removing unused kg_* assets from fbc
2013-09-25 17:34:10 -07:00
Ari Sachter-Zeltzer
61050196dd
am a53b8541: Merge "removing unused kg_* assets from fbc" into klp-dev
...
* commit 'a53b854103c06f194a1883275d5cdfd78882a248':
removing unused kg_* assets from fbc
2013-09-25 17:31:11 -07:00
Ari Sachter-Zeltzer
a53b854103
Merge "removing unused kg_* assets from fbc" into klp-dev
2013-09-26 00:26:29 +00:00
Ari Sachter-Zeltzer
ca32b0c346
removing unused kg_* assets from fbc
...
Change-Id: I536eab0bbbaefc7fb01afe1ccac108dca45d9bf9
2013-09-25 17:15:23 -07:00
Zhijun He
72dd6c0f4c
am fbf38016: am 822ac0ba: Merge "Camera2: Implement CameraManager#getCameraCharacteristics" into klp-dev
...
* commit 'fbf38016371d2827969429feadc7414a7eb7809d':
Camera2: Implement CameraManager#getCameraCharacteristics
2013-09-25 17:05:05 -07:00
Scott Main
93dfacbd3f
am 8adfffe3: am 8b21bbe4: am 6b1f6feb: am ad95c415: am 857814c6: add mention of google cloud to Android Studio landing page
...
* commit '8adfffe3f3d91141556241a576d9cc5b51f5b07d':
add mention of google cloud to Android Studio landing page
2013-09-25 17:01:14 -07:00
Adam Powell
5117bf3bc3
am 81e6e547: am 4598cd65: Merge "Update toast appearance" into klp-dev
...
* commit '81e6e547e9c7ab8239de94de0eb8d32a0581b61d':
Update toast appearance
2013-09-25 17:01:11 -07:00
Zhijun He
fbf3801637
am 822ac0ba: Merge "Camera2: Implement CameraManager#getCameraCharacteristics" into klp-dev
...
* commit '822ac0bada06b2185b4d5e8304160b680a72cff2':
Camera2: Implement CameraManager#getCameraCharacteristics
2013-09-25 17:00:05 -07:00
Zhijun He
822ac0bada
Merge "Camera2: Implement CameraManager#getCameraCharacteristics" into klp-dev
2013-09-25 23:57:24 +00:00
Scott Main
8adfffe3f3
am 8b21bbe4: am 6b1f6feb: am ad95c415: am 857814c6: add mention of google cloud to Android Studio landing page
...
* commit '8b21bbe440f1561107bc09d26c7dc12eef01fb21':
add mention of google cloud to Android Studio landing page
2013-09-25 16:56:10 -07:00
Adam Powell
81e6e547e9
am 4598cd65: Merge "Update toast appearance" into klp-dev
...
* commit '4598cd65ccc7989fda531dc8fb3ee80d461f0c82':
Update toast appearance
2013-09-25 16:56:07 -07:00
Scott Main
8b21bbe440
am 6b1f6feb: am ad95c415: am 857814c6: add mention of google cloud to Android Studio landing page
...
* commit '6b1f6febdcf8f70d74ffa3fb7d0e0a088afd3d5d':
add mention of google cloud to Android Studio landing page
2013-09-25 16:54:04 -07:00
Scott Main
6b1f6febdc
am ad95c415: am 857814c6: add mention of google cloud to Android Studio landing page
...
* commit 'ad95c41518c22264540a777562db23a8ccfa792a':
add mention of google cloud to Android Studio landing page
2013-09-25 16:51:51 -07:00
Adam Powell
4598cd65cc
Merge "Update toast appearance" into klp-dev
2013-09-25 23:51:38 +00:00
Dianne Hackborn
f3647c7bdc
am f9ad7b9d: am 66a9b2d7: Merge "Fix issue #10903002 : com.facebook.katana keeps itself in A Services" into klp-dev
...
* commit 'f9ad7b9d92f0464bdffb36f4b9f9f63292ba9863':
Fix issue #10903002 : com.facebook.katana keeps itself in A Services
2013-09-25 16:50:14 -07:00
Jeff Sharkey
20269bd7c4
Merge "resolved conflicts for merge of 687c6221 to master"
2013-09-25 23:49:32 +00:00
Scott Main
ad95c41518
am 857814c6: add mention of google cloud to Android Studio landing page
...
* commit '857814c688e6c867cf1e433091931bc84d15d1cb':
add mention of google cloud to Android Studio landing page
2013-09-25 16:48:58 -07:00
Jeff Sharkey
5023a4df73
resolved conflicts for merge of 687c6221 to master
...
Change-Id: I9e8a24d9151f31bc3284ad7f8686fa7f3c25c0d9
2013-09-25 16:48:01 -07:00
Fabrice Di Meglio
331a7aae20
Merge "Decouple CalendarView code"
2013-09-25 23:47:45 +00:00
Fabrice Di Meglio
f1f93b3863
Merge "Decouple DatePicker code"
2013-09-25 23:47:31 +00:00
Adam Powell
1f1b6430af
Update toast appearance
...
Use a condensed font and give the toast frame a more rounded look.
Bug 10734759
Change-Id: I6a4366dbf2fd5a81f0ad2d50697ea2399a7942fc
2013-09-25 16:37:08 -07:00
Scott Main
857814c688
add mention of google cloud to Android Studio landing page
...
Change-Id: Ia363f5384f509722aee0ef83964069767b4911f8
2013-09-25 16:20:05 -07:00
Jake Hamby
6e0f3df07c
am 4f447cfa: am c499f5b2: Merge "wappush: Use valid index for pdu including garbages" into klp-dev
...
* commit '4f447cfa5bd528494d52f2aaa8b9f8f2cd1e42e8':
wappush: Use valid index for pdu including garbages
2013-09-25 16:09:29 -07:00
Dianne Hackborn
f9ad7b9d92
am 66a9b2d7: Merge "Fix issue #10903002 : com.facebook.katana keeps itself in A Services" into klp-dev
...
* commit '66a9b2d7392a7f6334b5fe23d00ba718f3fa1851':
Fix issue #10903002 : com.facebook.katana keeps itself in A Services
2013-09-25 16:09:13 -07:00
Jeff Sharkey
687c6221c8
am be17a614: Merge "Require that persistable Uri permissions be taken." into klp-dev
...
* commit 'be17a61447e1a7992a6c855059a3c43ab3216610':
Require that persistable Uri permissions be taken.
2013-09-25 16:05:36 -07:00
Jake Hamby
4f447cfa5b
am c499f5b2: Merge "wappush: Use valid index for pdu including garbages" into klp-dev
...
* commit 'c499f5b2f7713507541ef655f65fbe154b34070a':
wappush: Use valid index for pdu including garbages
2013-09-25 16:05:33 -07:00
Dianne Hackborn
66a9b2d739
Merge "Fix issue #10903002 : com.facebook.katana keeps itself in A Services" into klp-dev
2013-09-25 23:04:50 +00:00
Jeff Sharkey
be17a61447
Merge "Require that persistable Uri permissions be taken." into klp-dev
2013-09-25 23:01:26 +00:00
Jake Hamby
c499f5b2f7
Merge "wappush: Use valid index for pdu including garbages" into klp-dev
2013-09-25 23:01:02 +00:00
Winson Chung
e5a8b028c3
am 54e3e7b5: am 92baafb4: Merge "Moving Launcher permission to Framework. (Bug 10343529)" into klp-dev
...
* commit '54e3e7b5d43b87bddabfb2e312becb33a8c46582':
Moving Launcher permission to Framework. (Bug 10343529)
2013-09-25 15:48:46 -07:00
Jim Miller
d0ee92408f
am 4bf2c790: am 04b0840b: Merge "Accessibility improvements in keyguard - add accessibility descriptions to camera and search light - add new onClick handler to simplify launching search and camera - plumb camera launch through KeyguardService interface" into klp-dev
...
* commit '4bf2c790b971cf43c65d8e9e5721a2a9dde474b5':
Accessibility improvements in keyguard - add accessibility descriptions to camera and search light - add new onClick handler to simplify launching search and camera - plumb camera launch through KeyguardService interface
2013-09-25 15:48:42 -07:00
Dianne Hackborn
cbd9a52f25
Fix issue #10903002 : com.facebook.katana keeps itself in A Services
...
Now when memory low, if a service's process is above
a selected pss, then the process is not allowed to go
in to the service a list.
Also simplified the normal meminfo details dump to not
include the shared dirty and shared clean sizes by
default, since these can be very confusing. You will
still get to see them with the "-a" flag.
Finally some small steps to better managing service
processes in the LRU list, so hopefully we can some
day be better about letting them drop down in the list
when there isn't really much interesting happening in
the process. Not yet used at this point.
Change-Id: I654bfd6d05de2a63120185ebb15ffda8cbeb5dac
2013-09-25 15:45:56 -07:00
Winson Chung
54e3e7b5d4
am 92baafb4: Merge "Moving Launcher permission to Framework. (Bug 10343529)" into klp-dev
...
* commit '92baafb43a825e7585259dcb2da9c7b03d0cf72c':
Moving Launcher permission to Framework. (Bug 10343529)
2013-09-25 15:44:18 -07:00
Jim Miller
4bf2c790b9
am 04b0840b: Merge "Accessibility improvements in keyguard - add accessibility descriptions to camera and search light - add new onClick handler to simplify launching search and camera - plumb camera launch through KeyguardService interface" into klp-dev
...
* commit '04b0840b2e5367547fdd92f4e2c68cde16486062':
Accessibility improvements in keyguard - add accessibility descriptions to camera and search light - add new onClick handler to simplify launching search and camera - plumb camera launch through KeyguardService interface
2013-09-25 15:44:15 -07:00
Winson Chung
92baafb43a
Merge "Moving Launcher permission to Framework. (Bug 10343529)" into klp-dev
2013-09-25 22:43:16 +00:00
Jim Miller
04b0840b2e
Merge "Accessibility improvements in keyguard - add accessibility descriptions to camera and search light - add new onClick handler to simplify launching search and camera - plumb camera launch through KeyguardService interface" into klp-dev
2013-09-25 22:41:26 +00:00
Romain Guy
ac56414b92
am b4d4d687: am 318ae7bb: Take SkBitmap\'s stride into account when uploading textures Bug #10151807
...
* commit 'b4d4d68795a10401e3cb50df491a2e5d5b1ac96e':
Take SkBitmap's stride into account when uploading textures Bug #10151807
2013-09-25 15:37:41 -07:00
Romain Guy
b4d4d68795
am 318ae7bb: Take SkBitmap\'s stride into account when uploading textures Bug #10151807
...
* commit '318ae7bb92869d99a05388c598ad105e7aa4cdbd':
Take SkBitmap's stride into account when uploading textures Bug #10151807
2013-09-25 15:34:31 -07:00
Leon Scroggins III
afbd777fda
am ae1e8855: am 8e4b16d6: Merge "Update docs to state that mark is no longer called." into klp-dev
...
* commit 'ae1e88553fa628dbf22aa5ed2659f5ea2c12793a':
Update docs to state that mark is no longer called.
2013-09-25 15:33:54 -07:00
Romain Guy
318ae7bb92
Take SkBitmap's stride into account when uploading textures
...
Bug #10151807
Change-Id: I7ba4804fa3619088fea70eb55f10519fff0bf5f0
2013-09-25 22:31:31 +00:00
Leon Scroggins III
ae1e88553f
am 8e4b16d6: Merge "Update docs to state that mark is no longer called." into klp-dev
...
* commit '8e4b16d67851ad5eb91c82955b3c3d59f0770b6b':
Update docs to state that mark is no longer called.
2013-09-25 15:30:55 -07:00
Leon Scroggins III
8e4b16d678
Merge "Update docs to state that mark is no longer called." into klp-dev
2013-09-25 22:27:25 +00:00
Alan Viverette
e4b0a9a940
am 607ea331: am 812b6426: Merge "Fix caption rendering" into klp-dev
...
* commit '607ea331ebe6f133a7e95a0e37d4c00085646708':
Fix caption rendering
2013-09-25 15:26:57 -07:00
Alan Viverette
607ea331eb
am 812b6426: Merge "Fix caption rendering" into klp-dev
...
* commit '812b64264176cb8a253a8253074bc9595503d2ac':
Fix caption rendering
2013-09-25 15:23:50 -07:00
Alan Viverette
812b642641
Merge "Fix caption rendering" into klp-dev
2013-09-25 22:21:08 +00:00
Winson Chung
4516798862
Moving Launcher permission to Framework. (Bug 10343529)
...
Change-Id: Ic48c254c844e65171b5f92d81272962cdc673acc
2013-09-25 15:20:14 -07:00
Jeff Sharkey
e66c1778f8
Require that persistable Uri permissions be taken.
...
Change our Intent flag to indicate that a Uri permission grant is
persistable, but don't actually persist it until explicitly taken by
the receiving app. This prevents apps from spamming each other if
persisted permissions aren't really required.
Remember the last time a persisted grant was taken by an app, and
use this to prune away the oldest grants when the number of grants
grows too large. Allow apps to query persisted grants they are
holding, and allow them to release previously persisted grants. Add
public UriPermission class to return grant details and timestamp.
Track various permission strengths separately, and combine together
after each mutation pass. Persistable grants are currently treated
like global grants, but they could be moved to have owners in the
future. Require that grant holders trying to extend a persistable
permission actually hold a persistable permission themselves.
Bug: 10835779
Change-Id: I95b2f797c04ce7fd2612f9a644685dbd44e03759
2013-09-25 15:16:41 -07:00