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

120589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jinsuk Kim
8fe27e8818 Merge "Move logical address allocation logic into native service from HAL" into klp-modular-dev 2014-04-29 21:32:50 +00:00
Baligh Uddin
c2e5503dba Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-29 21:03:00 +00:00
Vinod Krishnan
fa8fc41bdc DialogAlert window changes for Micro 
Bug: 13243004

- The only difference between alert_dialog_micro.xml and alert_dialog_holo.xml is:
<     android:layout_height="match_parent"
---
>     android:layout_height="wrap_content"
>     android:layout_marginStart="8dip"
>     android:layout_marginEnd="8dip"

Change-Id: I84f9a88099a37aa7f5868e128b19cb1e812cb745
 2014-04-28 22:07:26 -07:00
Guang Zhu
e47ebbeec6 make success explicit in BT instrumentation util 
Change-Id: I6c8eb8cdb7928fa6a7c1bc96b374667d1d6ae6a1
 2014-04-28 20:12:35 -07:00
Yuling Liang
26a5c2dd74 Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev 2014-04-28 23:16:13 +00:00
David Friedman
0c18705bf1 am 3fef8e60: am 1053b2c5: Merge "Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html" into klp-docs 
* commit '3fef8e60668bb955763367ac17c1195e46b3078c':
  Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html
 2014-04-28 23:03:25 +00:00
David Friedman
3fef8e6066 am 1053b2c5: Merge "Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html" into klp-docs 
* commit '1053b2c5d43ca58e9f0fe611770b278e88c76fa3':
  Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html
 2014-04-28 21:56:07 +00:00
David Friedman
1053b2c5d4 Merge "Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html" into klp-docs 2014-04-28 21:52:45 +00:00
Griff Hazen
3c5a6cf935 am 2c6131bb: am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE. 
* commit '2c6131bba957dc5b4e1638bb8b0c10ebddf2049a':
  Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
 2014-04-28 20:33:22 +00:00
Adam Lesinski
8ea2d45122 Merge "Various CTS fixes" into klp-modular-dev 2014-04-28 20:30:35 +00:00
Griff Hazen
2c6131bba9 am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE. 
* commit '293977bdb028e2aa893fbeb370e20132646094a9':
  Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
 2014-04-28 20:29:12 +00:00
Raph Levien
d97b097a5b Followon fix for 14276128 Clipping at bottom of TextView 
The previous fix did not work when the text was ellipsized, because the
test for whether the line was the last line was incorrect. The new test
handles both the end of the buffer and the case where it is the last
line because of ellipsizing.

So this should be the proper fix for bug 14276128 Clipping at bottom of
TextView when lineSpacingMultiplier < 1

This version of the patch also handles the single-line case (which is
computed in BoringLayout rather than StaticLayout).

Change-Id: I88791acc2aa493cc8c599b374f4d213571260b4b
 2014-04-28 18:02:27 +00:00
Griff Hazen
293977bdb0 Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE. 
The logic was opposite.

Change-Id: I62e0b1e6701a4c9990119a1b94918e64783e9b1a
 2014-04-28 10:32:21 -07:00
Baligh Uddin
6f6ba132a7 Import translations. DO NOT MERGE 
Change-Id: I1d6579e5a984f30f7dd19dcb22d134645120ed8f
Auto-generated-cl: translation import
 2014-04-28 09:53:10 -07:00
Deepanshu Gupta
d4f0073f48 Remove references to java package class Objects. [DO NOT MERGE] 
Remove references to Java 7 class java.util.Objects and replace it with
a new class that can be loaded on Java 6.

Change-Id: Ibbd9b20b8bc89e247f1d0c48d743d06d1a4f0704
(cherry-picked from commit 45f5cd49fa898a59484edfd8e291dbe10df82db2)
 2014-04-25 18:49:40 -07:00
Vince Harron
4f50911aa1 am e9a4e9de: Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don\'t allocat 
* commit 'e9a4e9deaad6a3185269bf5696c2a2946962fbd2':
  Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.
 2014-04-25 23:22:07 +00:00
Vince Harron
e9a4e9deaa Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory." into klp-ub-dev 2014-04-25 23:17:37 +00:00
Ricardo Cervera
6fe328c62a am 86afa0b5: am 039bd508: Merge "docs: Added release notes for ADT 22.6.3" into klp-docs 
* commit '86afa0b56bf8af0a2c94fcabf5eb7f64f6c66c2d':
  docs: Added release notes for ADT 22.6.3
 2014-04-25 22:33:25 +00:00
Ricardo Cervera
86afa0b56b am 039bd508: Merge "docs: Added release notes for ADT 22.6.3" into klp-docs 
* commit '039bd50825f7ea8b706c8ea6e54a1c893759309d':
  docs: Added release notes for ADT 22.6.3
 2014-04-25 22:21:10 +00:00
Ricardo Cervera
039bd50825 Merge "docs: Added release notes for ADT 22.6.3" into klp-docs 2014-04-25 22:15:28 +00:00
David Friedman
5fb79db94e Fixed missing line break, broken link. 
Bug: 13975265
Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html

Change-Id: I69f7e56f9b261c776672161cfb1649c4cd72c96e
 2014-04-25 14:02:16 -07:00
Craig Mautner
1a7e9e66a6 Merge "Throw exception from startActivity if not allowed." into klp-modular-dev 2014-04-25 18:39:46 +00:00
Craig Mautner
247ab65a49 Throw exception from startActivity if not allowed. 
The ActivityView.startActivity method may defer calling
ActivityContainer.startActivity if the ActivityView is not yet
visible. If the activity being started doesn't have allowEmbedded
attribute set to true then the SecurityException will not be
thrown until the ActivityView is visible. In such a case the caller
of ActivityView.startActivity cannot catch the SecurityException.

This fix checks the attribute at the time ActivityView.startActivity
is called.

Fixes bug 14317210.

Change-Id: I7fff23e39b67a9a0aa1b2e555920d02ae38906d9
 2014-04-25 11:20:01 -07:00
Adam Lesinski
2c8d67c9b0 Various CTS fixes 
WallpaperManager should always do a null check on the service object.
SystemServer should always bring up the DevicePolicyManagerService,
and let the service do appropriate default no-ops if the feature
is not supported.

Change-Id: Iaaf12b60ed375fe2e341ec11faa10c9344d7d9da
 2014-04-25 11:07:39 -07:00
Yuling Liang
eea94f060a Merge "Revert "Followon fix for 14276128 Clipping at bottom of TextView"" into klp-modular-dev 2014-04-25 17:32:28 +00:00
Yuling Liang
10973c7776 Revert "Followon fix for 14276128 Clipping at bottom of TextView" 
This reverts commit a10e19845ce76c0e4dd38018c84b83c9255dc9fe.

Change-Id: I6d40451c9eb6285859e16d251b55947663a3553a
 2014-04-25 17:32:08 +00:00
Yuling Liang
243e551ac3 Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev 2014-04-25 16:30:12 +00:00
Craig Mautner
3a656ea32e Merge "Too soon." into klp-modular-dev 2014-04-25 03:03:37 +00:00
Craig Mautner
2e46e65e9d Too soon. 
Change-Id: I1abb1d4841e4e6342c3b861d33ae22e22ed0a161
 2014-04-25 03:01:40 +00:00
Craig Mautner
3359bbe02c Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev 2014-04-25 00:39:06 +00:00
Andrew Solovay
3cb4430b07 am 27547e6d: am fdc9e56f: Correcting name of \'Backup & reset\' menu. 
* commit '27547e6d3a22fb9615594769e460c6a86f2dd44b':
  Correcting name of 'Backup & reset' menu.
 2014-04-24 23:41:26 +00:00
Andrew Solovay
27547e6d3a am fdc9e56f: Correcting name of \'Backup & reset\' menu. 
* commit 'fdc9e56ff8a1019c353e77f5d4b5f3566d173941':
  Correcting name of 'Backup & reset' menu.
 2014-04-24 23:37:40 +00:00
Andrew Solovay
fdc9e56ff8 Correcting name of 'Backup & reset' menu. 
Doc is staged at
http://asolovay.mtv.corp.google.com:9000/guide/topics/data/backup.html#Testing

Bug: 14253720
Change-Id: Ib8eb213d8708c02c93c8bc93233db2c828caa925
 2014-04-24 15:59:45 -07:00
Raph Levien
a10e19845c Followon fix for 14276128 Clipping at bottom of TextView 
The previous fix did not work when the text was ellipsized, because the
test for whether the line was the last line was incorrect. The new test
handles both the end of the buffer and the case where it is the last
line because of ellipsizing.

So this should be the proper fix for bug 14276128 Clipping at bottom of
TextView when lineSpacingMultiplier < 1

Change-Id: Iac5c96f2273142031c18a27f504f7d6d5fcf823e
 2014-04-24 20:00:05 +00:00
Craig Mautner
03981a4c2e Merge "Add activity attribute allowEmbedded" into klp-modular-dev 2014-04-24 16:30:14 +00:00
Raph Levien
e4ee0e3193 Merge "Fix bug 14276128 Clipping at bottom of TextView" into klp-modular-dev 2014-04-24 16:12:54 +00:00
Michael Kolb
e597d5f931 Merge "Use rotation to position circular display mask" into klp-modular-dev 2014-04-24 16:08:21 +00:00
Michael Kolb
8b275ca9d3 Use rotation to position circular display mask 
Bug: 14231785

Change-Id: Ib6d69f3b9c2a638731539f1c1e51b56ad1698adc
 2014-04-24 09:01:19 -07:00
Craig Mautner
75731016e9 Add test for attribute android:allowEmbedded 
Throw a SecurityException if it is not true for an activity launched
using ActivityContainer.startActivity().

Change-Id: Id1d70e630195a49a3eccdc64a0beccc420400332
 2014-04-24 08:42:32 -07:00
Craig Mautner
ffd14a13ce Add activity attribute allowEmbedded 
Activitys without allowEmbedded=true may not be launched in an ActivityView.

Fixes bug 13693121.

Change-Id: I431d554300fc3504ab1bc7d73a58d5dad24f8639
 2014-04-24 08:41:29 -07:00
Baligh Uddin
aed314e8f3 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-24 14:28:31 +00:00
Craig Mautner
7d2d2272f1 Merge "Force ActivityView activities to start in new task" into klp-modular-dev 2014-04-24 04:28:28 +00:00
Deepanshu Gupta
7406e4b810 am 7947ec71: am b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev 
* commit '7947ec715d8b4a0c82135553abb4947b61bf802b':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-04-24 01:31:24 +00:00
Deepanshu Gupta
1668ae8d2a am a019e772: am 6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev 
* commit 'a019e77252f86962b9803042c01b897f7f1aa89f':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-04-24 01:31:20 +00:00
Deepanshu Gupta
e17ed92200 am 126f4057: am 5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE] 
* commit '126f4057a06756fbb1c194b5d9d40f9f922d14ee':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-04-24 01:31:15 +00:00
Deepanshu Gupta
7947ec715d am b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev 
* commit 'b64732d977c023423cd01d32361a49401d9203cd':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-04-24 01:27:53 +00:00
Deepanshu Gupta
a019e77252 am 6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev 
* commit '6aaea1bd4aa056335776098cd9dc523e898716f1':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-04-24 01:27:50 +00:00
Deepanshu Gupta
126f4057a0 am 5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE] 
* commit '5ba2f230faa355eb9bc1e90f6c48eeeb437f390c':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-04-24 01:27:45 +00:00
Deepanshu Gupta
b64732d977 Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev 2014-04-24 01:21:55 +00:00
Deepanshu Gupta
6aaea1bd4a Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev 2014-04-24 01:21:46 +00:00