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

129019 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
d0af9589ff am aed314e8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'aed314e8f3e53627518222777c2fe89666bfd643':
  Import translations. DO NOT MERGE
 2014-04-24 14:34:02 +00:00
John Spurlock
10459a5411 Merge "Move notification listener management into helper." 2014-04-24 14:32:41 +00:00
Baligh Uddin
6ec0b32173 Merge "Import translations. DO NOT MERGE" 2014-04-24 14:28:38 +00:00
Baligh Uddin
aed314e8f3 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-04-24 14:28:31 +00:00
Baligh Uddin
0dea3a6eea Merge "Import translations. DO NOT MERGE" 2014-04-24 14:28:30 +00:00
Baligh Uddin
b2cb3a2518 Merge "Import translations. DO NOT MERGE" 2014-04-24 14:28:20 +00:00
Baligh Uddin
781d1ca2c5 Merge "Import translations. DO NOT MERGE" 2014-04-24 14:28:14 +00:00
Baligh Uddin
9ea712006d Merge "Import translations. DO NOT MERGE" 2014-04-24 14:28:12 +00:00
George Mount
19d1381752 Merge "Properly filter out excluded views in createAnimators() call." 2014-04-24 14:12:17 +00:00
Kenny Guy
1a4e0b9980 Fix bug with getLauncherActivities ignoring packageName. 
Change-Id: Ica5817378a24cb4b68e2c99e37cd214d3fde8ba4
 2014-04-24 12:28:04 +01:00
Craig Mautner
7e28afd956 am 7d2d2272: Merge "Force ActivityView activities to start in new task" into klp-modular-dev 
* commit '7d2d2272f1dc91f27983797349f8253bfa25e8b4':
  Force ActivityView activities to start in new task
 2014-04-24 09:11:30 +00:00
Alexandra Gherghina
385124d8ce Modify getUserProfiles to return only enabled profiles: 
Add a new enabled state for a managed profile.
Expose that as a new API on DevicePolicyManager.
Set the new state when enabling the profile.
Return only enabled profiles from the user manager.

Bug: 13755441
Bug: 13755091
Change-Id: I2907b182e19b3562592da688b3f68ef5f4088557
 2014-04-24 10:07:51 +01:00
Elliott Hughes
56cc5ba79b am 8d47f23e: am dbb0de21: Merge "Fix a typo in an assertion." 
* commit '8d47f23e43760dcbf051aaeffff668c3c6340276':
  Fix a typo in an assertion.
 2014-04-24 09:01:44 +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
6dd5a1d348 am 8f9d92c4: (-s ours) am 7406e4b8: am 7947ec71: am b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev 
* commit '8f9d92c4ca5233607ca01dac0b3b66fde5539307':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-04-24 03:24:18 +00:00
Deepanshu Gupta
36ec9c9581 am 057dca97: (-s ours) am 1668ae8d: am a019e772: am 6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev 
* commit '057dca97d9a486b94c82673a95a7a3933bca9a4d':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-04-24 03:24:14 +00:00
Deepanshu Gupta
dba62dc904 am 5dee1a09: (-s ours) am e17ed922: am 126f4057: am 5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE] 
* commit '5dee1a093abc4d6fd197ba2c3be012c9536ba1c5':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-04-24 03:24:10 +00:00
Deepanshu Gupta
8f9d92c4ca am 7406e4b8: am 7947ec71: am b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev 
* commit '7406e4b8102ffd71affd55a9f453c0ecce13a097':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-04-24 01:36:22 +00:00
Deepanshu Gupta
057dca97d9 am 1668ae8d: am a019e772: am 6aaea1bd: Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev 
* commit '1668ae8d2a29b491c3ae421c5b0eca101fb10824':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-04-24 01:36:18 +00:00
Deepanshu Gupta
5dee1a093a am e17ed922: am 126f4057: am 5ba2f230: Add view cookies for action bar menus. [DO NOT MERGE] 
* commit 'e17ed922001cf70c48969eb7b10ee2e2557b41f9':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-04-24 01:36:14 +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
John Spurlock
b408e8ecd2 Move notification listener management into helper. 
Part of a larger effort to reuse service management code.  This is
mostly algebraic, simply move code related to listener management
into a new helper, and cut the backreference to NoMan.  Put
user-profile code into reusable inner helper, and common uid-checking
code into a new static util helper.

Resist the urge to rewrite / reformat, but replace HashSet with
ArraySet.

Bug:13743109
Change-Id: I59e0131f632c3bbf555b5276dc5092422113cdc3
 2014-04-23 21:12:45 -04:00
Deepanshu Gupta
8deae79d9f Merge "Bug fix in layoutlib" 2014-04-24 01:10:36 +00:00
Deepanshu Gupta
7d3ae4f17d Bug fix in layoutlib 
Renaming a method wasn't completed properly.
The bug was introduced in the following change:
Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca
(1001961f904bac5294aaf73a47c2497aa764bf7f)

Change-Id: I698437b428d696c656e2268ded654a612a3e0c80
 2014-04-23 18:07:07 -07:00
Deepanshu Gupta
1ea1b21acd Fix style warnings in RenderSessionImpl [DO NOT MERGE] 
Change-Id: I9d3cb23e4ea692f737a3e3d6c18cc8de18b66a3c
(cherry-picked from commit fbfeb1a90b6f8f3966c60a69d50ce8f608d9d861)
 2014-04-23 18:04:26 -07:00
Deepanshu Gupta
5ba2f230fa Add view cookies for action bar menus. [DO NOT MERGE] 
The change adds the view cookies for the menus rendered in the action
bar. This enables the IDE to map the menu to the relevant XML Tag in the
menu xml and show the highlighting accordingly.

The change also contains a bugfix where a method wasn't renamed
properly.

Change-Id: Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca
(cherry-picked from commit 1001961f904bac5294aaf73a47c2497aa764bf7f)
 2014-04-23 18:04:21 -07:00
Aravind Akella
3f3823308a Merge "Bug fix for wakeup sensors." 2014-04-24 00:40:59 +00:00
Elliott Hughes
8d47f23e43 am dbb0de21: Merge "Fix a typo in an assertion." 
* commit 'dbb0de21d35343504b096ae6cbf97d122ac410c9':
  Fix a typo in an assertion.
 2014-04-24 00:25:01 +00:00
Winson Chung
628f896674 Merge "Fixing crash in SystemServicesProxy getting activity label (Bug. 14260718)" 2014-04-24 00:14:03 +00:00
Chris Craik
717f39c7d9 Merge "Clip TouchFeedbackDrawable effect to receiver Outline" 2014-04-24 00:08:09 +00:00
Aravind Akella
35187bd5c1 Bug fix for wakeup sensors. 
SensorService should hold a wakelock till the app reads events from a wakeup sensor. Currently drivers hold a wakelock with a
timeout while delivering events from a wake up sensor like Significant Motion. This hack can be removed now.
Bug: 9774884

Change-Id: I6cab0147c63f57a494a61f4dfe2a64a27dfe1b4e
 2014-04-23 17:05:41 -07:00
Elliott Hughes
dbb0de21d3 Merge "Fix a typo in an assertion." 2014-04-23 23:55:33 +00:00
Elliott Hughes
6bd762289b Fix a typo in an assertion. 
Change-Id: I3e97bb3cb8070c0ec0c6b97769f1da3e7b4ef8f5
 2014-04-23 16:54:33 -07:00
Winson Chung
80693f9fb5 Fixing crash in SystemServicesProxy getting activity label (Bug. 14260718) 
- Fixing issue with wrong margins due to moved activity icon

Change-Id: Ib3631dc4cf4244d44737ee95b597bd25653815c8
 2014-04-23 16:48:33 -07:00
John Reck
f4201925d9 Merge "Add missing try/finallys" 2014-04-23 23:34:51 +00:00
Amith Yamasani
5451c559ec Merge "Don't show managed profiles in the user switcher" 2014-04-23 23:33:05 +00:00
Raph Levien
936df68016 Fix bug 14276128 Clipping at bottom of TextView 
Avoid applying "extra" linespacing to the last line of a layout, because
when that is negative, it causes clipping.

Change-Id: I4cc8792fd3444e4118604cc3d0f816d59dfc1e74
 2014-04-23 23:17:12 +00:00
Chris Craik
3f085429fd Clip TouchFeedbackDrawable effect to receiver Outline 
Projected RenderNodes are now wrapped with a ClipRect or masked
SaveLayer, so that they are clipped to the outline of the projection
receiver surface.

Change-Id: I1d4afc1bb5d638d650bc0b1dac51a498f216773e
 2014-04-23 16:15:11 -07:00
Deepanshu Gupta
6f9baea477 Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE] 
The bug caused some classes to be missed when computing the dependencies
of the existing classes.

Change-Id: I7285ff67e016ce5d73a8550501f49acc73cfadfa
(cherry-picked from 4a0f93bd32b8dd9b3c351680ad82e461d5111f38)
 2014-04-23 16:11:57 -07:00
John Reck
05e858400a Add missing try/finallys 
Change-Id: I32be65f5a46768449f26b69f72f502acd1e72769
 2014-04-23 14:48:28 -07:00
Amith Yamasani
921b71e95f Don't show managed profiles in the user switcher 
Only show users that you can switch to.

Change-Id: Iff6dfccc27230f824d73d02731a045c69419b814
 2014-04-23 14:43:23 -07:00
Chris Craik
3c37bcee9b Merge "Fix translationZ matrix computation" 2014-04-23 21:39:07 +00:00
Winson Chung
1b244f44a7 Merge "Piping through ability for an Activity to remove its own task. (Bug 13735914)" 2014-04-23 21:35:33 +00:00