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

131449 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
9dad1cff17 am f14922db: am 6368a39d: am 883a17cd: am 14480abe: am bfc75f68: am 11243dd6: am 9f5f450d: am e5c518cb: am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 
* commit 'f14922db63c866eee3f3eda63c57e08955fa27cb':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 21:32:53 +00:00
Deepanshu Gupta
f14922db63 am 6368a39d: am 883a17cd: am 14480abe: am bfc75f68: am 11243dd6: am 9f5f450d: am e5c518cb: am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 
* commit '6368a39dd2b57907a47b7a1693de1c7744a0a39c':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 21:26:33 +00:00
Deepanshu Gupta
425f172ab5 am ae089999: am ef33848a: am a22e96bf: am 4e1023a1: am 89279ad1: (-s ours) am 9d3ec0be: am 48931fcc: am a312214f: (-s ours) am 9358cf04: am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO N 
* commit 'ae089999befdff1382266d11ac5fd3cc1e9270ae':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 21:25:04 +00:00
Deepanshu Gupta
a6bc2e68b7 am 52483b6d: am 110e3f48: am 7b228464: am ce33060c: am 563d0ee7: am 04f0cb6e: am 34aa1bd3: am 54b946fe: am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 
* commit '52483b6d398fa42b8ad9876f0fbebc8ed89ad579':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 21:25:00 +00:00
Svetoslav
04533dd3ba Teach print manager services about user profiles. 
For user profiles the printing layer will have a separate state and
set a set of print plugins. The rationale behind this is that if a user
uses different profiles for different domains he would expect that
each domain is separate as domains may have different security and
privacy requirements.

bug:14567366

Change-Id: I461ae4636294fa8968785295afb952aeb14a13b5
 2014-05-13 21:21:36 +00:00
Deepanshu Gupta
6368a39dd2 am 883a17cd: am 14480abe: am bfc75f68: am 11243dd6: am 9f5f450d: am e5c518cb: am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 
* commit '883a17cd954c31fb7742fb415e3949623e81ba6b':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 21:21:33 +00:00
Deepanshu Gupta
ae089999be am ef33848a: am a22e96bf: am 4e1023a1: am 89279ad1: (-s ours) am 9d3ec0be: am 48931fcc: am a312214f: (-s ours) am 9358cf04: am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit 'ef33848aae9c482b43087ae4e326e0a40e7474f2':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 21:19:10 +00:00
Deepanshu Gupta
52483b6d39 am 110e3f48: am 7b228464: am ce33060c: am 563d0ee7: am 04f0cb6e: am 34aa1bd3: am 54b946fe: am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 
* commit '110e3f48f3f58a5178676112eb8c2693c62c640f':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 21:19:07 +00:00
Deepanshu Gupta
b09506dad9 am ecf80ad3: am 0efb0759: am 9d0fcb73: am 9cc952e7: am b7b64cc4: am e0105901: am 52b49665: am eff94bc3: am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 
* commit 'ecf80ad35c15b96ef11034716a73bc607011e1bd':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 21:17:25 +00:00
Deepanshu Gupta
883a17cd95 am 14480abe: am bfc75f68: am 11243dd6: am 9f5f450d: am e5c518cb: am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 
* commit '14480abeb6642d7b779d50f03e5340356a4e4b2b':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 21:14:56 +00:00
Deepanshu Gupta
ef33848aae am a22e96bf: am 4e1023a1: am 89279ad1: (-s ours) am 9d3ec0be: am 48931fcc: am a312214f: (-s ours) am 9358cf04: am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit 'a22e96bfecb933cb52a055c6f9d8f243d436b123':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 21:12:39 +00:00
Deepanshu Gupta
110e3f48f3 am 7b228464: am ce33060c: am 563d0ee7: am 04f0cb6e: am 34aa1bd3: am 54b946fe: am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 
* commit '7b22846433508139f466c66cfa78d94bbec3582e':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 21:12:35 +00:00
Deepanshu Gupta
ecf80ad35c am 0efb0759: am 9d0fcb73: am 9cc952e7: am b7b64cc4: am e0105901: am 52b49665: am eff94bc3: am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 
* commit '0efb07592a6a2fa0ecfe41fa617c99dfe4a45348':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 21:11:51 +00:00
Deepanshu Gupta
14480abeb6 am bfc75f68: am 11243dd6: am 9f5f450d: am e5c518cb: am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 
* commit 'bfc75f6895171aeac68f2506fd318a3eb5d4b9e4':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 21:09:22 +00:00
Deepanshu Gupta
0efb07592a am 9d0fcb73: am 9cc952e7: am b7b64cc4: am e0105901: am 52b49665: am eff94bc3: am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 
* commit '9d0fcb73e23beb5baa62cb8e5b428e5f0ef7a571':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 21:07:35 +00:00
Deepanshu Gupta
a22e96bfec am 4e1023a1: am 89279ad1: (-s ours) am 9d3ec0be: am 48931fcc: am a312214f: (-s ours) am 9358cf04: am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit '4e1023a1fccc06f382a976a94bcb29c3764183f5':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 21:07:01 +00:00
Deepanshu Gupta
7b22846433 am ce33060c: am 563d0ee7: am 04f0cb6e: am 34aa1bd3: am 54b946fe: am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 
* commit 'ce33060c92a8e0d739f020b6227f2ee6007724fe':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 21:06:58 +00:00
Deepanshu Gupta
bfc75f6895 am 11243dd6: am 9f5f450d: am e5c518cb: am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 
* commit '11243dd66484d0f99f56454491d5d82acfca6070':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 21:04:28 +00:00
Deepanshu Gupta
4e1023a1fc am 89279ad1: (-s ours) am 9d3ec0be: am 48931fcc: am a312214f: (-s ours) am 9358cf04: am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit '89279ad140a30e5d134d6d948c4c6d835b5ca5b3':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 21:02:23 +00:00
Deepanshu Gupta
ce33060c92 am 563d0ee7: am 04f0cb6e: am 34aa1bd3: am 54b946fe: am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 
* commit '563d0ee7d48df767c2d4da127f1224140fa65cfd':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 21:02:19 +00:00
Deepanshu Gupta
9d0fcb73e2 am 9cc952e7: am b7b64cc4: am e0105901: am 52b49665: am eff94bc3: am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 
* commit '9cc952e74a8f82b85a9bd8cbd7cbfb286c9b65d6':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 21:02:06 +00:00
Deepanshu Gupta
11243dd664 am 9f5f450d: am e5c518cb: am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 
* commit '9f5f450dca41bcea94b2abae1c782a84c0387f6d':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 20:59:25 +00:00
Deepanshu Gupta
89279ad140 am 9d3ec0be: am 48931fcc: am a312214f: (-s ours) am 9358cf04: am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit '9d3ec0be302acf9f29d0fb2be644841d71ed5e63':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 20:58:36 +00:00
Deepanshu Gupta
563d0ee7d4 am 04f0cb6e: am 34aa1bd3: am 54b946fe: am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 
* commit '04f0cb6e958cc1529e3be04ef454a35f416d9667':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 20:58:33 +00:00
Deepanshu Gupta
9cc952e74a am b7b64cc4: am e0105901: am 52b49665: am eff94bc3: am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 
* commit 'b7b64cc4884e933d0da4664ce7195caa5003ef65':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 20:57:20 +00:00
Deepanshu Gupta
9f5f450dca am e5c518cb: am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 
* commit 'e5c518cbd0544a44bae8cb2a0b90d18bb91c5b8a':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 20:54:20 +00:00
Deepanshu Gupta
9d3ec0be30 am 48931fcc: am a312214f: (-s ours) am 9358cf04: am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit '48931fcc0d7f6d82011414ffc234a52a1cce11a4':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 20:53:35 +00:00
Deepanshu Gupta
04f0cb6e95 am 34aa1bd3: am 54b946fe: am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 
* commit '34aa1bd392ab71b22e8b2bc2a0fe29be88428762':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 20:53:32 +00:00
Deepanshu Gupta
b7b64cc488 am e0105901: am 52b49665: am eff94bc3: am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 
* commit 'e0105901ea442e2f760f4fb657afc5db2d65e02a':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 20:51:32 +00:00
Deepanshu Gupta
48931fcc0d am a312214f: (-s ours) am 9358cf04: am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit 'a312214f736638486983874b4f266bb537bab723':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 20:49:25 +00:00
Deepanshu Gupta
34aa1bd392 am 54b946fe: am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 
* commit '54b946fe3c0f86f4cba3bc5bc07d920b654a0ef0':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 20:49:22 +00:00
Deepanshu Gupta
e5c518cbd0 am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 
* commit '4e8b055b2ad23f6e336872f775058bcf18c46dfd':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 20:49:06 +00:00
Deepanshu Gupta
e0105901ea am 52b49665: am eff94bc3: am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 
* commit '52b49665f526c7b4de977f3c424dc85d1b9a5d1f':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 20:46:41 +00:00
Deepanshu Gupta
4e8b055b2a am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 
* commit '6dad59e146dc16a2386124a5cd3b28411c024c4f':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 20:43:51 +00:00
Deepanshu Gupta
a312214f73 am 9358cf04: am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit '9358cf04dc0db493a8702a4a8051f9839e9de6d7':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 20:43:18 +00:00
Deepanshu Gupta
54b946fe3c am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 
* commit 'f46900c5eaeff0fbba7f20466be87db67002d6bf':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 20:43:16 +00:00
Aaron Whyte
8f8c7f413f am 8452776b: am 5ff35f8a: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev 
* commit '8452776b950b26f86324636242dd302a596fae1d':
  Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859
 2014-05-13 20:41:38 +00:00
Deepanshu Gupta
52b49665f5 am eff94bc3: am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 
* commit 'eff94bc3647c23c223abe4946595d51d80985eec':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 20:41:24 +00:00
Deepanshu Gupta
9358cf04dc am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit 'ccf6b34799efb14e5883ed4901ff03bf75ac4c1c':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 20:38:17 +00:00
Deepanshu Gupta
f46900c5ea am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 
* commit '87a54055e61918986021eb5e1e3dbefe40839367':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 20:38:15 +00:00
Deepanshu Gupta
6dad59e146 am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 
* commit '85b751949b3d383494523bb98b016157d76787f3':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 20:38:12 +00:00
Aaron Whyte
8452776b95 am 5ff35f8a: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev 
* commit '5ff35f8a7fa543e43b2e1ea8a23ba6d32563e34b':
  Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859
 2014-05-13 20:36:31 +00:00
Deepanshu Gupta
eff94bc364 am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 
* commit '8c19c6a17d8a019086a36988937462acfb6b830f':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 20:36:24 +00:00
Deepanshu Gupta
ccf6b34799 am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit 'a154687620a6d53f17c7abc36d419884cd6df2b7':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 20:33:33 +00:00
Deepanshu Gupta
87a54055e6 am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 
* commit '5878115a6e19041439b335efae066862e21775a1':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 20:33:30 +00:00
Deepanshu Gupta
85b751949b resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 2014-05-13 13:32:59 -07:00
Aaron Whyte
5ff35f8a7f Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev 2014-05-13 20:32:21 +00:00
Deepanshu Gupta
a154687620 am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE] 
* commit '7ef276450f3157cc68f714b0d5805319e6f4c555':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 20:31:33 +00:00
Deepanshu Gupta
8c19c6a17d am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 
* commit '16f3a6167bdcbd49e47d843fcb43fe9ffd461531':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 20:30:39 +00:00
Deepanshu Gupta
5878115a6e resolved conflicts for merge of 9978c036 to jb-mr1.1-dev 2014-05-13 13:29:07 -07:00