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

105163 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
6011355635 am 6064c5cf: am e1375908: Rename isUserLimited to isLinkedUser 
* commit '6064c5cf22b16464a82f04f0a9560f412ba2a90a':
  Rename isUserLimited to isLinkedUser
 2013-04-13 17:25:16 -07:00
Amith Yamasani
6064c5cf22 am e1375908: Rename isUserLimited to isLinkedUser 
* commit 'e1375908a5f05e5c926e95049970c4505e4dfad9':
  Rename isUserLimited to isLinkedUser
 2013-04-13 17:22:09 -07:00
Amith Yamasani
e1375908a5 Rename isUserLimited to isLinkedUser 
A linked user is derived from another user and shares their accounts.

Change-Id: Ia2e63d573ccb635495ec54f31ac7b174725ad7a8
 2013-04-13 16:48:35 -07:00
Amith Yamasani
dc97936e36 Fix attr id update due to api change upstream 
Change-Id: Ief2e90522322ecc6e3832f27d7b00b146dce54fc
 2013-04-13 16:40:00 -07:00
Amith Yamasani
362c4ddff3 am 19c95bcc: am e188c984: Merge "Introducing manifest flag requiredAccountType" into jb-mr2-dev 
* commit '19c95bcc76cd68e241e3d29a5e49fc892521527d':
  Introducing manifest flag requiredAccountType
 2013-04-13 16:01:59 -07:00
Amith Yamasani
19c95bcc76 am e188c984: Merge "Introducing manifest flag requiredAccountType" into jb-mr2-dev 
* commit 'e188c984ddd4ae4b109c3f204b03a8f798f7e9e8':
  Introducing manifest flag requiredAccountType
 2013-04-13 15:56:31 -07:00
Amith Yamasani
e188c984dd Merge "Introducing manifest flag requiredAccountType" into jb-mr2-dev 2013-04-13 22:54:01 +00:00
Xavier Ducrohet
974dc1f4f8 am ade20f49: am a068eedd: Revert "Make --non-constant-id generates non final IDs for styleable." 
* commit 'ade20f49a1a0226c06a6ae5d8074c9c1cc14a152':
  Revert "Make --non-constant-id generates non final IDs for styleable."
 2013-04-13 09:59:07 -07:00
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
de1fae77b6 am 00c4c670: am 301e95f2: Merge "Add a little more resource load tracing." into jb-mr2-dev 
* commit '00c4c67069b9d13005ae072b8744c728aa73f99a':
  Add a little more resource load tracing.
 2013-04-12 18:09:58 -07:00
Kenny Root
e7cf8c2302 keystore: remove old APIs 
Remove the APIs that don't specify the flags so callers know what
they're getting.

Bug: 8122243
Change-Id: Ifaef6fb1d16010237c01f9d11f2053bb6b3980c0
 2013-04-12 18:09:04 -07:00
Kenny Root
b2c0ff64d8 Remove old KeyStore call sites 
Remove the call sites that don't have the flags specified. This is to
ensure that callers know what flags they're setting.

Bug: 8122243
Change-Id: Ifbd178fddbf8dbd8f7b821ea739a20d056ef9fa7
 2013-04-12 18:09:04 -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
Romain Guy
5069101c08 am 5141bf80: am 80fccb4d: Merge "There should be a mandatory coder\'s license. Bug #8586560" into jb-mr2-dev 
* commit '5141bf801e9d58e618c76e4cdc042218b24193fc':
  There should be a mandatory coder's license. Bug #8586560
 2013-04-12 18:05:48 -07:00
Xavier Ducrohet
b2d17bc5b4 am 95637018: am 629b1c4f: Merge "Make --non-constant-id generates non final IDs for styleable." into jb-mr2-dev 
* commit '95637018052655783a25e8123c5b6f898c4171e6':
  Make --non-constant-id generates non final IDs for styleable.
 2013-04-12 18:05:46 -07:00
Mathias Agopian
cc6dda7750 am 4c87edfe: am 1763d6f9: Merge "always trigger a re-draw when updating the transparent region hint" into jb-mr2-dev 
* commit '4c87edfe4d2dce71b7b723f25078cd4bd5d48456':
  always trigger a re-draw when updating the transparent region hint
 2013-04-12 18:05:43 -07:00
Jaikumar Ganesh
7abfc34cd6 am d347d519: am 02087754: Merge "Fix race condition and disable call." into jb-mr2-dev 
* commit 'd347d519766e80b27c4f469f391c388c78f75373':
  Fix race condition and disable call.
 2013-04-12 18:05:38 -07:00
Svetoslav
14210466bf resolved conflicts for merge of dd03b6dc to master 
Change-Id: Ie6628e26d8a033bdce54f9d20156b0358a0956c3
 2013-04-12 18:03:50 -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
Amith Yamasani
ccbe389b4d Introducing manifest flag requiredAccountType 
This can be used by apps that won't work without an account of that
type in the limited user environment. This way we can avoid letting
users select these apps when setting up a limited user.

Bug: 8600261
Change-Id: Iaa0dd5ff88e89fa7a1d8a4e70317290268411bdb
 2013-04-12 17:52:42 -07: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
cbd5fe843d am 64076958: am 72ab9b80: Merge "Respect custom view drawing order when dispatching hover events." into jb-mr2-dev 
* commit '640769589b5eb6a4c9a09f8710c3a585320fa075':
  Respect custom view drawing order when dispatching hover events.
 2013-04-12 17:21:52 -07: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
520c1036cb am 019895e2: am 8692685a: Merge changes Ia802afe9,If9af0d99 into jb-mr2-dev 
* commit '019895e2e4744f9ddd76f5df6d59a74dbc5bcd42':
  AndroidKeyStore: Add encrypted flag
  keystore: Add flag for blobs to be unencrypted
 2013-04-12 17:13:39 -07: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
Dianne Hackborn
11dc37686f am 18e99d1d: am 15fed390: Merge "Add new resources trace, also trace apk dex loading." into jb-mr2-dev 
* commit '18e99d1d5f7bb2e35fb9f5c3edbb4265d66e3d93':
  Add new resources trace, also trace apk dex loading.
 2013-04-12 17:06:37 -07:00
Craig Mautner
fd7e534b1f Merge "Implement separate stacks." 2013-04-13 00:05:50 +00: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
0f6ba07732 am 543c5dcf: am efcb252f: Merge "Properly computer gradient textures width" into jb-mr2-dev 
* commit '543c5dcfcb93925a5b9ac073eedb0bd813b2ebe0':
  Properly computer gradient textures width
 2013-04-12 16:49:14 -07:00
Geremy Condra
f0dffd0ab5 Merge "Add logic to handle changes to file_contexts during update." 2013-04-12 23:48:20 +00: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
Geremy Condra
7951ceb0d1 Add logic to handle changes to file_contexts during update. 
Bug: 8116902
Change-Id: I961a202f583eccd30f923c2f0882597096e8175c
 2013-04-12 16:36:31 -07:00