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

131670 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
979b22fe78 am c99a9b28: am 5170476c: am a4af5726: am 112d1b94: Merge "Add BiCubic resize instrinsic" 
* commit 'c99a9b28ef9d480fcbffb070db79eb76a9aae30b':
  Add BiCubic resize instrinsic
 2014-04-17 19:43:36 +00:00
Baligh Uddin
dd9e59dc5c am 61e3991b: (-s ours) am 177d9b9a: (-s ours) am b279f527: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '61e3991bf64b86de32ad24ffcf1753f0f8a80166':
  Import translations. DO NOT MERGE
 2014-04-17 19:43:31 +00:00
Griff Hazen
5e2841d6e5 am d36e8df7: am 84f4adc9: Merge commit \'59dfbb91\' into klp-modular-dev-plus-aosp 
* commit 'd36e8df7241f2433233377bbc803468c91ae8ad9':
  Fix build [DO NOT MERGE]
 2014-04-17 19:43:27 +00:00
Scott Main
863cb17ff5 am 1b866eeb: am 2b7345e4: am b04f3f74: am cb38ee51: am a106923e: Merge "add image itemprop to specify image for search result snippet" into klp-docs 
* commit '1b866eeb58867fd9bb2496dacdd3283c18893792':
  add image itemprop to specify image for search result snippet
 2014-04-17 19:43:21 +00:00
Ricardo Cervera
d2a47ffc66 am 004263ed: am f162266c: am f64feec2: am 4aa68e97: am dc9ca02c: docs: Watermark images with easter eggs 
* commit '004263eda24b672dc4fb42fe2cc931652e4e12ad':
  docs: Watermark images with easter eggs
 2014-04-17 19:43:13 +00: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
Ricardo Cervera
a3b13847b0 docs: Added the play from search intent. Bug: 13473141. 
Change-Id: Icf483b5e0446e064b32a782717408484d5806859
 2014-04-17 12:31:18 -07:00
Raph Levien
2735a39c4e am 06136574: Merge changes Ia693f512,If3b7d41f 
* commit '0613657426aecb7ed6141c133f100baf24166ae0':
  Enable elegant text metrics in Quantum theme
  Add elegantTextHeight text appearance attribute
 2014-04-17 19:24:38 +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
240407311f am 56d46cc9: Merge "Fix global screen rotation issue." 
* commit '56d46cc95f761eabc6455f3e391835936b7d05e8':
  Fix global screen rotation issue.
 2014-04-17 19:14:58 +00:00
Jorim Jaggi
56d46cc95f Merge "Fix global screen rotation issue." 2014-04-17 19:08:37 +00:00
Vinit Deshapnde
72358802d6 am 45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev 
* commit '45e746766676681e4e191d0b7e521b8b3f6c284c':
  Don't reset country code once it is persisted
 2014-04-17 18:59:54 +00:00
Vinit Deshapnde
45e7467666 Merge "Don't reset country code once it is persisted" into klp-dev 2014-04-17 18:54:58 +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
d838997209 am b91dfd95: Merge "Fix not being able to unlock SIM PIN." 
* commit 'b91dfd95b19f13be5497ea521ed14df8471b0e2e':
  Fix not being able to unlock SIM PIN.
 2014-04-17 18:29:48 +00:00
Jorim Jaggi
b91dfd95b1 Merge "Fix not being able to unlock SIM PIN." 2014-04-17 18:23:05 +00:00
Stephen Hines
f0aa4cc0f2 am a4898534: Merge "Fix improper use of JNI_ABORT for operations where Java objects are written." 
* commit 'a48985349cb26757b6c4be18acc496ab6d1110e5':
  Fix improper use of JNI_ABORT for operations where Java objects are written.
 2014-04-17 18:20:47 +00:00
Alan Viverette
ae1248452a am f805b40c: Merge changes Ia2bf4d17,I8242523d 
* commit 'f805b40c44769a751d10d404e8ea778a23d5a51a':
  Fix alert dialog alignment and touch feedback masking
  Fix VectorDrawable states
 2014-04-17 18:19:51 +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
Stephen Hines
a48985349c Merge "Fix improper use of JNI_ABORT for operations where Java objects are written." 2014-04-17 18:15:38 +00:00
Leon Scroggins
1a2a6b474c am 7085d138: Merge "Call SkShader::isOpaque() to determine opaqueness." 
* commit '7085d138b21bbce7c9c989c719b35769267b422e':
  Call SkShader::isOpaque() to determine opaqueness.
 2014-04-17 18:13:44 +00:00
Chris Craik
7e9fe8548b am ddd4a9b9: Merge "Revert "Add convenience methods, to encourage usage of ALL_SAVE_FLAG"" 
* commit 'ddd4a9b9c329274d56a72d84f11dc0148215c406':
  Revert "Add convenience methods, to encourage usage of ALL_SAVE_FLAG"
 2014-04-17 18:13:40 +00:00
Ji-Hwan Lee
a7f66b36c4 am e8ee7835: Merge "Minor fix to remove verbose logcat output in SyncStorageEngine" 
* commit 'e8ee7835410f531808d5e60eeacf922ae41aa0d9':
  Minor fix to remove verbose logcat output in SyncStorageEngine
 2014-04-17 18:13:36 +00:00
George Mount
bd032bf1dc am 99d2ffa1: Merge "Split Activity Transitions out of PhoneWindow." 
* commit '99d2ffa1268da1258390fa6f272bf41687084d7b':
  Split Activity Transitions out of PhoneWindow.
 2014-04-17 18:13:30 +00:00
Chris Craik
1dbe43ed69 am 0932cf87: Merge "Deprecate color array drawBitmap methods" 
* commit '0932cf87c131f9238538fd7137b282adbe71dc37':
  Deprecate color array drawBitmap methods
 2014-04-17 18:13:20 +00:00
Chris Craik
f570ae264e am 2632f197: Merge "Add convenience methods, to encourage usage of ALL_SAVE_FLAG" 
* commit '2632f19728e388b85ecb77095bbb4b0aa18b75e2':
  Add convenience methods, to encourage usage of ALL_SAVE_FLAG
 2014-04-17 18:13:15 +00:00
Robin Lee
766a442a5e am 56a0a269: Merge "Allow ProfileOwner apps to manage app restrictions" 
* commit '56a0a269cd7309476c5f49a21563249e97f70a9e':
  Allow ProfileOwner apps to manage app restrictions
 2014-04-17 18:12:57 +00:00
Baligh Uddin
4d55927706 am 5f0f5487: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '5f0f54871fc6014af06d6c265b8ae42e7da0b9d5':
  Import translations. DO NOT MERGE
 2014-04-17 18:12:54 +00:00
Baligh Uddin
bd37992743 am cdb6bb59: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit 'cdb6bb59c7790e3c811171b4a9a646cb704e301e':
  Import translations. DO NOT MERGE
 2014-04-17 18:12:50 +00:00
Baligh Uddin
9cb38525c5 am 0c4d25f7: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '0c4d25f79987577d4b5a4c63d4ee25773c0fb472':
  Import translations. DO NOT MERGE
 2014-04-17 18:12:45 +00:00
Baligh Uddin
6aec970252 am 16b5480b: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '16b5480bd0a0e9e6830e3bcf36c923a5e872aff2':
  Import translations. DO NOT MERGE
 2014-04-17 18:12:41 +00:00
Baligh Uddin
0cb7d688e5 am 715ec84d: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '715ec84d4cd67dcb8227228b41a9d0bc5b95c953':
  Import translations. DO NOT MERGE
 2014-04-17 18:12:37 +00:00
Baligh Uddin
6a49dadc63 am b1a19c51: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit 'b1a19c513419f951a4cd12a69773b0ae56f4386e':
  Import translations. DO NOT MERGE
 2014-04-17 18:12:33 +00:00
Baligh Uddin
5aef650932 am 48bd1b19: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '48bd1b195f0137f17cde28e3667f2973244a01e2':
  Import translations. DO NOT MERGE
 2014-04-17 18:12:28 +00:00
Baligh Uddin
5c6adb0436 am 72f8056d: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '72f8056db184e48bc4bd4ebb4511d1b4de8fda14':
  Import translations. DO NOT MERGE
 2014-04-17 18:12:24 +00:00
John Spurlock
f4ba09d699 am 9b5d028c: Merge "Interim quick settings update." 
* commit '9b5d028c695d2d6f1612648b2ac27a7b7577c436':
  Interim quick settings update.
 2014-04-17 18:12:09 +00:00
Adrian Roos
9fd78cd5db am 379ac2d8: Merge "Fix broken status bar when activity is showing above keyguard" 
* commit '379ac2d8b69065eb22ee24d9f3e4d90ec62bc413':
  Fix broken status bar when activity is showing above keyguard
 2014-04-17 18:12:03 +00:00
Adrian Roos
147eb42d27 am c8ba7d3f: Make camera affordance fly away 
* commit 'c8ba7d3f871bb7f4487ea54430f22b7a479b52b0':
  Make camera affordance fly away
 2014-04-17 18:11:57 +00: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
Vinit Deshapnde
b5ee95edf9 Don't reset country code once it is persisted 
This change simply ignores resetting of country code by cellular
networks to avoid disconnecting existing wifi connections. It also
defers setting newly found country code until after existing Wifi
connection is torn down.

Also removes some dead code related to resetting of country codes.

Bug: 13894807
Change-Id: Ie2fcfdd4b3be8ba94542772c132fb1acb6a2c683
 2014-04-17 11:05:21 -07:00
Winson Chung
ecd9b3031c Initial changes to add search bar. 
- Scaling touch overscroll

Change-Id: Iee0523ca32efaae3491cbf5dbf3ea2e388f9d644
 2014-04-17 10:52:34 -07: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