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

128510 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Mount
8c0ceb34c3 Properly filter out excluded views in createAnimators() call. 
Bug 14258783

Change-Id: I2d07e9d72a87674c215d36ccfc004c45623e7c24
 2014-04-22 16:21:23 -07:00
Zhijun He
f60194b115 Merge "Camera2: Update sync.frameNumber tag" 2014-04-17 20:40:19 +00:00
Zhijun He
4f91e2a459 Camera2: Update sync.frameNumber tag 
This is from the type mismapping bug fix in metadata generation.

Change-Id: Icaa9916e00e76b30cdc5688c3d3b7e9cadf84794
 2014-04-17 13:20:21 -07:00
Jorim Jaggi
bf19fa4fe6 Merge "Move bouncer to the bottom, but only on phones." 2014-04-17 19:57:25 +00:00
Jorim Jaggi
9a6eba3ce7 Move bouncer to the bottom, but only on phones. 
Change-Id: Ibe03964a10a8cab9e179ff0618a6ed312c8b1b4a
 2014-04-17 21:44:53 +02:00
Jason Sams
c99a9b28ef am 5170476c: am a4af5726: am 112d1b94: Merge "Add BiCubic resize instrinsic" 
* commit '5170476c5bf470b57616380aa7b15b44e5a24bea':
  Add BiCubic resize instrinsic
 2014-04-17 19:36:40 +00:00
Baligh Uddin
61e3991bf6 am 177d9b9a: (-s ours) am b279f527: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '177d9b9a25296d9cbe0f96497a8abf2fe28aa1da':
  Import translations. DO NOT MERGE
 2014-04-17 19:36:15 +00:00
Griff Hazen
d36e8df724 am 84f4adc9: Merge commit \'59dfbb91\' into klp-modular-dev-plus-aosp 
* commit '84f4adc9a5e3cc818ed972dc7fecbafb131a779a':
  Fix build [DO NOT MERGE]
 2014-04-17 19:36:04 +00:00
Scott Main
1b866eeb58 am 2b7345e4: am b04f3f74: am cb38ee51: am a106923e: Merge "add image itemprop to specify image for search result snippet" into klp-docs 
* commit '2b7345e4e3eaa7fcf2f24ba4d03ae00a265adedc':
  add image itemprop to specify image for search result snippet
 2014-04-17 19:35:31 +00:00
Ricardo Cervera
004263eda2 am f162266c: am f64feec2: am 4aa68e97: am dc9ca02c: docs: Watermark images with easter eggs 
* commit 'f162266cc44aa83e6a5b95fc4f629c80cf603416':
  docs: Watermark images with easter eggs
 2014-04-17 19:35:20 +00:00
Raph Levien
0613657426 Merge changes Ia693f512,If3b7d41f 
* changes:
  Enable elegant text metrics in Quantum theme
  Add elegantTextHeight text appearance attribute
 2014-04-17 19:21:14 +00:00
Jorim Jaggi
56d46cc95f Merge "Fix global screen rotation issue." 2014-04-17 19:08:37 +00:00
Jorim Jaggi
ca36cf7bca Fix global screen rotation issue. 
Bug: 14080683
Change-Id: I0144faafa0e01c14c8c8e6a6c9fc81a10d25f47d
 2014-04-17 20:49:30 +02:00
Jorim Jaggi
b91dfd95b1 Merge "Fix not being able to unlock SIM PIN." 2014-04-17 18:23:05 +00:00
Jorim Jaggi
fa9189fd74 Fix not being able to unlock SIM PIN. 
Bug: 14120902
Change-Id: I812d9679000242eabea617ea75cf8355d16926b2
 2014-04-17 20:17:30 +02:00
Raph Levien
37938fca72 Enable elegant text metrics in Quantum theme 
This changes the default quantum theme to use elegant text metrics,
which make use of a bit of extra vertical space to better render complex
scripts. It depends on the new elegantMetrics text attribute being
available.

Change-Id: Ia693f5129057fe8b9a633609c72eef388b988fea
 2014-04-17 11:16:56 -07:00
Raph Levien
53c0077256 Add elegantTextHeight text appearance attribute 
This patch adds an elegantTextHeight text appearance attribute and
plumbs it through to the paint. This attribute selects the elegant
variant of fonts (when appropriate, which is typically Arabic and indic
scripts), and also specifies larger vertical metrics, to avoid clipping.

The intent is for this to be the default for quantum themes, but this
patch doesn't change any default behavior, just adds the attribute.

The larger vertical metrics are applied to top and bottom, but should
not affect line spacing in the common case. Also, with the setting,
metrics are no longer dependent on the font, so setting a custom font
will preserve layout and spacing.

Change-Id: If3b7d41f141deff50ca078f479ca90c2aa07829a
 2014-04-17 11:16:46 -07:00
Alan Viverette
f805b40c44 Merge changes Ia2bf4d17,I8242523d 
* changes:
  Fix alert dialog alignment and touch feedback masking
  Fix VectorDrawable states
 2014-04-17 18:06:57 +00:00
Leon Scroggins
7085d138b2 Merge "Call SkShader::isOpaque() to determine opaqueness." 2014-04-17 17:25:22 +00:00
Jason Sams
5170476c5b am a4af5726: am 112d1b94: Merge "Add BiCubic resize instrinsic" 
* commit 'a4af5726c4c8c882ca65a049bfa824922609d464':
  Add BiCubic resize instrinsic
 2014-04-17 17:07:48 +00:00
Chris Craik
ddd4a9b9c3 Merge "Revert "Add convenience methods, to encourage usage of ALL_SAVE_FLAG"" 2014-04-17 17:06:22 +00:00
Ji-Hwan Lee
e8ee783541 Merge "Minor fix to remove verbose logcat output in SyncStorageEngine" 2014-04-17 17:04:24 +00:00
Jason Sams
a4af5726c4 am 112d1b94: Merge "Add BiCubic resize instrinsic" 
* commit '112d1b94ee8456dba16842e6b964eb35aef95818':
  Add BiCubic resize instrinsic
 2014-04-17 17:02:10 +00:00
George Mount
99d2ffa126 Merge "Split Activity Transitions out of PhoneWindow." 2014-04-17 16:51:59 +00:00
George Mount
31a217290c Split Activity Transitions out of PhoneWindow. 
Bug 13622834
Made it possible to use shared elements without making
Views invisible.

Change-Id: I1e85c6bc19e634a9af225ad7f0309b4f003ea462
 2014-04-17 09:49:25 -07:00
Chris Craik
091ddb1374 Revert "Add convenience methods, to encourage usage of ALL_SAVE_FLAG" 
This reverts commit 39b7353acacf08a3c0204a9ec122fff420e53310.

Change-Id: I732eab8a2843dd23c86bd1526ec95db5352d39a0
 2014-04-17 16:37:23 +00:00
Chris Craik
0932cf87c1 Merge "Deprecate color array drawBitmap methods" 2014-04-17 16:31:16 +00:00
Chris Craik
2632f19728 Merge "Add convenience methods, to encourage usage of ALL_SAVE_FLAG" 2014-04-17 16:30:26 +00:00
Robin Lee
56a0a269cd Merge "Allow ProfileOwner apps to manage app restrictions" 2014-04-17 15:54:54 +00:00
Baligh Uddin
177d9b9a25 am b279f527: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'b279f5272e2c7554aeab930ba0aabab12efff9e2':
  Import translations. DO NOT MERGE
 2014-04-17 15:53:11 +00:00
Baligh Uddin
5f0f54871f Merge "Import translations. DO NOT MERGE" 2014-04-17 15:49:05 +00:00
Baligh Uddin
cdb6bb59c7 Merge "Import translations. DO NOT MERGE" 2014-04-17 15:49:05 +00:00
Baligh Uddin
0c4d25f799 Merge "Import translations. DO NOT MERGE" 2014-04-17 15:48:48 +00:00
Baligh Uddin
16b5480bd0 Merge "Import translations. DO NOT MERGE" 2014-04-17 15:48:45 +00:00
Baligh Uddin
b279f5272e Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-17 15:48:38 +00:00
Baligh Uddin
715ec84d4c Merge "Import translations. DO NOT MERGE" 2014-04-17 15:48:37 +00:00
Baligh Uddin
b1a19c5134 Merge "Import translations. DO NOT MERGE" 2014-04-17 15:48:37 +00:00
Baligh Uddin
48bd1b195f Merge "Import translations. DO NOT MERGE" 2014-04-17 15:48:29 +00:00
Baligh Uddin
72f8056db1 Merge "Import translations. DO NOT MERGE" 2014-04-17 15:48:22 +00:00
Robin Lee
66e5d96cf9 Allow ProfileOwner apps to manage app restrictions 
Simple wrapper around the UserManager.{get|set}ApplicationRestrictions
APIs. Also added a new Intent to signal to running apps that the set
of restrictions has changed since startup.

Change-Id: Ifd108108a73f87325b499d9de2e1b2aacc59b264
 2014-04-17 15:58:03 +01:00
John Spurlock
9b5d028c69 Merge "Interim quick settings update." 2014-04-17 14:38:05 +00:00
John Spurlock
73203ebf97 Interim quick settings update. 
Make existing QS panel available via pulldown from header
(or keyguard status view on keyguard), update the affordances
as a hint.

Don't allow QS to scroll, cap to max rows.

Add scrim over panel to indicate that this is purely temporary.

Bug:14081801
Bug:14059974
Change-Id: I166033975cbc44b91f45ee70ea5c7540390670dd
 2014-04-17 10:26:45 -04:00
Skia_Android Canary Bot
5932b0d8fc Call SkShader::isOpaque() to determine opaqueness. 
It is invalid to call SkShader::getFlags() before calling
SkShader::setContext() - it will always return 0. Instead, call
SkShader::isOpaque().

Change-Id: If35108dc7f0eca55d2ec8466b8a50fd54dfb13a2
 2014-04-17 09:55:59 -04:00
Adrian Roos
379ac2d8b6 Merge "Fix broken status bar when activity is showing above keyguard" 2014-04-17 13:54:57 +00:00
Adrian Roos
25ab3d9438 Fix broken status bar when activity is showing above keyguard 
Bug: 14077213
Change-Id: I5d45fd1780498983995a469d0799e024ca25f3c7
 2014-04-17 15:46:41 +02:00
Adrian Roos
c8ba7d3f87 Make camera affordance fly away 
Stop gap measure to differenciate the accepted vs rejected
response of the camera affordance on the lockscreen.

Bug: 14081010
Change-Id: I04d170aa3f07ce5f440fb1d27f7c62ef2a903a03
 2014-04-17 15:09:41 +02:00
Griff Hazen
84f4adc9a5 Merge commit '59dfbb91' into klp-modular-dev-plus-aosp 
Remove all changes from the merge to stop propagation.

Conflicts:
	tools/layoutlib/bridge/src/android/content/res/AssetManager_Delegate.java
 2014-04-17 02:53:18 -07:00
Deepanshu Gupta
59dfbb91ca Fix build [DO NOT MERGE] 
The branch is missing some CLs for 64-bit support. So, until they are
added, this change will fix the build.

Change-Id: Ia838caf60ca49b406101a3fb48a96afdcfb30c66
 2014-04-17 00:14:28 -07:00
Ji-Hwan Lee
886113dfca Minor fix to remove verbose logcat output in SyncStorageEngine 
Change-Id: I93b936202a99338329e73a41d4c1651369ecb70f
 2014-04-17 14:16:38 +09:00
Sungsoo Lim
33ac0dfc9f Merge "Replace sessionStateMap with sessionTokens." 2014-04-17 04:53:43 +00:00