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

103661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
ade20f49a1 am a068eedd: Revert "Make --non-constant-id generates non final IDs for styleable." 
* commit 'a068eeddc9d47af1a12afbe6efe7d00e8e903b9f':
  Revert "Make --non-constant-id generates non final IDs for styleable."
 2013-04-13 09:57:01 -07:00
Xavier Ducrohet
a068eeddc9 Revert "Make --non-constant-id generates non final IDs for styleable." 
This reverts commit 8730f46ae5ba9021a0e01c068ffc6b552b6c4510.
 2013-04-13 09:48:01 -07:00
Dianne Hackborn
00c4c67069 am 301e95f2: Merge "Add a little more resource load tracing." into jb-mr2-dev 
* commit '301e95f2e17164c6f432f1b68f55e5f12aa0ca78':
  Add a little more resource load tracing.
 2013-04-12 18:07:12 -07:00
Dianne Hackborn
301e95f2e1 Merge "Add a little more resource load tracing." into jb-mr2-dev 2013-04-13 01:03:47 +00:00
Dianne Hackborn
0acc1931d3 Add a little more resource load tracing. 
Change-Id: Id797adb67ab411d5b1a1c223863d3bb4655d10b1
 2013-04-12 17:49:17 -07:00
Romain Guy
5141bf801e am 80fccb4d: Merge "There should be a mandatory coder\'s license. Bug #8586560" into jb-mr2-dev 
* commit '80fccb4dda9b2c46955e05b8be9e6071e0cc347b':
  There should be a mandatory coder's license. Bug #8586560
 2013-04-12 17:41:35 -07:00
Xavier Ducrohet
9563701805 am 629b1c4f: Merge "Make --non-constant-id generates non final IDs for styleable." into jb-mr2-dev 
* commit '629b1c4f2042ef0f1da4fe543cca34deedd3ba5d':
  Make --non-constant-id generates non final IDs for styleable.
 2013-04-12 17:38:04 -07:00
Romain Guy
80fccb4dda Merge "There should be a mandatory coder's license. Bug #8586560" into jb-mr2-dev 2013-04-13 00:37:37 +00:00
Xavier Ducrohet
629b1c4f20 Merge "Make --non-constant-id generates non final IDs for styleable." into jb-mr2-dev 2013-04-13 00:35:54 +00:00
Mathias Agopian
4c87edfe4d am 1763d6f9: Merge "always trigger a re-draw when updating the transparent region hint" into jb-mr2-dev 
* commit '1763d6f957163faf6d3b629c36f4e8e90e0e31bd':
  always trigger a re-draw when updating the transparent region hint
 2013-04-12 17:32:32 -07:00
Mathias Agopian
1763d6f957 Merge "always trigger a re-draw when updating the transparent region hint" into jb-mr2-dev 2013-04-13 00:28:16 +00:00
Jaikumar Ganesh
d347d51976 am 02087754: Merge "Fix race condition and disable call." into jb-mr2-dev 
* commit '02087754fb49de7421b982267a283482b70bc297':
  Fix race condition and disable call.
 2013-04-12 17:25:41 -07:00
Jaikumar Ganesh
02087754fb Merge "Fix race condition and disable call." into jb-mr2-dev 2013-04-13 00:22:07 +00:00
Svetoslav Ganov
dd03b6dcb7 am 26257a09: Merge "Allow for setting test type as a monkey." into jb-mr2-dev 
* commit '26257a09a54cda5e8a0bc5b1edb0a5b401983a3b':
  Allow for setting test type as a monkey.
 2013-04-12 17:17:59 -07:00
Svetoslav
640769589b am 72ab9b80: Merge "Respect custom view drawing order when dispatching hover events." into jb-mr2-dev 
* commit '72ab9b801794d42de83d3e7afb70ccc96ade7dfb':
  Respect custom view drawing order when dispatching hover events.
 2013-04-12 17:17:57 -07:00
Svetoslav Ganov
26257a09a5 Merge "Allow for setting test type as a monkey." into jb-mr2-dev 2013-04-13 00:15:40 +00:00
Svetoslav
72ab9b8017 Merge "Respect custom view drawing order when dispatching hover events." into jb-mr2-dev 2013-04-13 00:14:56 +00:00
Kenny Root
019895e2e4 am 8692685a: Merge changes Ia802afe9,If9af0d99 into jb-mr2-dev 
* commit '8692685a54f6bf87dadc82fbd5576cdb81ba662b':
  AndroidKeyStore: Add encrypted flag
  keystore: Add flag for blobs to be unencrypted
 2013-04-12 17:09:57 -07:00
Kenny Root
8692685a54 Merge changes Ia802afe9,If9af0d99 into jb-mr2-dev 
* changes:
  AndroidKeyStore: Add encrypted flag
  keystore: Add flag for blobs to be unencrypted
 2013-04-13 00:04:17 +00:00
Dianne Hackborn
18e99d1d5f am 15fed390: Merge "Add new resources trace, also trace apk dex loading." into jb-mr2-dev 
* commit '15fed390c44972932f6dd7ce3bef1004e8b98b61':
  Add new resources trace, also trace apk dex loading.
 2013-04-12 17:03:03 -07:00
Mathias Agopian
54e3d38490 always trigger a re-draw when updating the transparent region hint 
since SF now relies on receiving a frame for latching the
transparent region hint, we make sure we will indeed redraw
something.

Bug: 8581533

Change-Id: Ia12ddf5654a7deeac7628b799bfde4b8c16c992b
 2013-04-12 17:01:44 -07:00
Svetoslav
0e5e9aa8e5 Respect custom view drawing order when dispatching hover events. 
1. The event dispatch methods should respect the child drawing order.
   Hover event dispatch in ViewGroup was not repsecting this order.

bug:8606799

Change-Id: Ie2fd3aff1292c21df23a04ca0aa03a97813c44ef
 2013-04-12 16:59:03 -07:00
Dianne Hackborn
15fed390c4 Merge "Add new resources trace, also trace apk dex loading." into jb-mr2-dev 2013-04-12 23:58:50 +00:00
Romain Guy
4abab937bf There should be a mandatory coder's license. 
Bug #8586560

And I don't deserve to pass the test.

Change-Id: Ic7886205511f16145a925fc860e4a03dfaf473d5
 2013-04-12 16:51:21 -07:00
Romain Guy
543c5dcfcb am efcb252f: Merge "Properly computer gradient textures width" into jb-mr2-dev 
* commit 'efcb252f767ab8737cc41cab4ee155faf2271417':
  Properly computer gradient textures width
 2013-04-12 16:42:20 -07:00
Romain Guy
efcb252f76 Merge "Properly computer gradient textures width" into jb-mr2-dev 2013-04-12 23:39:27 +00:00
Romain Guy
95aeff8f11 Properly computer gradient textures width 
Only on devices that do not have the npot extension

Change-Id: I472a13dc707d2abaf5fcc06f99c9da343b333558
 2013-04-12 16:32:05 -07:00
Xavier Ducrohet
8730f46ae5 Make --non-constant-id generates non final IDs for styleable. 
This was already done for all other types of resources, but not
for styleable (or the constants for the styleable array indices).

This fixes this. This only affects the SDK as this is used by the
SDK toolchain only.

Change-Id: Idfc2f7915be2b0e88590f38fd660610ffc7e160c
 2013-04-12 16:02:54 -07:00
Amith Yamasani
b0511d47eb am e107aa43: Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev 
* commit 'e107aa43866ce06cd08a7a3f2500a22bf81bbe79':
  Rename isUserRestricted to isUserLimited
 2013-04-12 15:36:22 -07:00
Amith Yamasani
e107aa4386 Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev 2013-04-12 22:33:05 +00:00
Chet Haase
d04215c440 am 0a41431d: Merge "API and doc cleanup, plus small animation/UI features" into jb-mr2-dev 
* commit '0a41431d697a34e7fe4ed2c481484d7a63949037':
  API and doc cleanup, plus small animation/UI features
 2013-04-12 15:23:22 -07:00
Kenny Root
2eeda7286f AndroidKeyStore: Add encrypted flag 
Add the encrypted flag for the KeyPairGenerator and the KeyStore so that
applications can choose to allow entries when there is no lockscreen.

Bug: 8122243
Change-Id: Ia802afe965f2377ad3f282dab8c512388c705850
 2013-04-12 15:19:48 -07:00
Chet Haase
0a41431d69 Merge "API and doc cleanup, plus small animation/UI features" into jb-mr2-dev 2013-04-12 22:18:24 +00:00
Amith Yamasani
46bc4ebb87 Rename isUserRestricted to isUserLimited 
Avoid confusion with user restrictions which can be applied to
non-limited users as well.

Updated the java docs.

Change-Id: I4097c50b528b01a49cebcb0832d09f2b06998faa
 2013-04-12 15:13:53 -07:00
Scott Main
e4a92e3a92 am faaaa223: am 27248105: am 044d08b0: am 7d62462b: am 8ab0f12f: am 64d51032: moar doc tags for search suggestions (Design docs) 
* commit 'faaaa223996308f1d666e3d9c8bfaa7e17eca4fe':
  moar doc tags for search suggestions (Design docs)
 2013-04-12 15:01:30 -07:00
Scott Main
faaaa22399 am 27248105: am 044d08b0: am 7d62462b: am 8ab0f12f: am 64d51032: moar doc tags for search suggestions (Design docs) 
* commit '27248105a17eb64564cb904d6c9019afbfc5ac0f':
  moar doc tags for search suggestions (Design docs)
 2013-04-12 14:57:34 -07:00
Scott Main
27248105a1 am 044d08b0: am 7d62462b: am 8ab0f12f: am 64d51032: moar doc tags for search suggestions (Design docs) 
* commit '044d08b0f10ca3a9e45c35bd6638763915c1f253':
  moar doc tags for search suggestions (Design docs)
 2013-04-12 14:54:27 -07:00
Dianne Hackborn
f7be4800df Add new resources trace, also trace apk dex loading. 
Change-Id: Ia48566efb21ee018659bd976ddb3a0f4997b9a3a
 2013-04-12 14:53:10 -07:00
Scott Main
044d08b0f1 am 7d62462b: am 8ab0f12f: am 64d51032: moar doc tags for search suggestions (Design docs) 
* commit '7d62462bacc4235d4e99dfe7a75783a70688537d':
  moar doc tags for search suggestions (Design docs)
 2013-04-12 14:50:15 -07:00
Scott Main
7d62462bac am 8ab0f12f: am 64d51032: moar doc tags for search suggestions (Design docs) 
* commit '8ab0f12f5ea44f5eb0f7c0cb6f05c289c33774d3':
  moar doc tags for search suggestions (Design docs)
 2013-04-12 14:48:13 -07:00
Scott Main
8ab0f12f5e am 64d51032: moar doc tags for search suggestions (Design docs) 
* commit '64d51032cc1f20ae496ba49ca975e822dea02b7c':
  moar doc tags for search suggestions (Design docs)
 2013-04-12 14:46:19 -07:00
Robert Greenwalt
b06cc749ae am e203384f: Merge "Disconnect from AP when teardown requested." into jb-mr2-dev 
* commit 'e203384f1627f27c81ff72426498927fb9d80698':
  Disconnect from AP when teardown requested.
 2013-04-12 14:14:20 -07:00
Robert Greenwalt
e203384f16 Merge "Disconnect from AP when teardown requested." into jb-mr2-dev 2013-04-12 21:10:53 +00:00
Kristian Monsen
82b6de03cf am 03499a23: Merge "Fix for bug 8589670: Marking a not called WebChromeClient as deprecated." into jb-mr2-dev 
* commit '03499a23f9d84fab95a7383b50cc7f87a974e4a8':
  Fix for bug 8589670: Marking a not called WebChromeClient as deprecated.
 2013-04-12 14:10:48 -07:00
Kristian Monsen
03499a23f9 Merge "Fix for bug 8589670: Marking a not called WebChromeClient as deprecated." into jb-mr2-dev 2013-04-12 21:05:15 +00:00
Romain Guy
a583a5ac7f am dec4bb9e: Merge "Trace ValueAnimator based animations in systrace" into jb-mr2-dev 
* commit 'dec4bb9e4b5a46b179a6aa3e90f9d9240d9c99cb':
  Trace ValueAnimator based animations in systrace
 2013-04-12 14:00:34 -07:00
Romain Guy
a378bab7a7 am 50b68bf8: Merge "Add async events tracing to android.os.Trace" into jb-mr2-dev 
* commit '50b68bf8364fd728553cb8066ece8f7905885625':
  Add async events tracing to android.os.Trace
 2013-04-12 14:00:31 -07:00
Scott Main
64d51032cc moar doc tags for search suggestions (Design docs) 
Change-Id: I842bc00f7ede23b1bebe4bf2e54ba32d026cf04c
 2013-04-12 14:00:30 -07:00
Romain Guy
dec4bb9e4b Merge "Trace ValueAnimator based animations in systrace" into jb-mr2-dev 2013-04-12 20:58:36 +00:00
Romain Guy
50b68bf836 Merge "Add async events tracing to android.os.Trace" into jb-mr2-dev 2013-04-12 20:58:00 +00:00