Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
150,245 Commits 3 Branches 0 Tags
58cd1df9781ebdaa96be83b04bd514cf7b63bda9
Commit Graph

150245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
58cd1df978 am 1cffe07a: am 9249840f: am eb2f9858: Merge "Don\'t send NetworkMonitor bcast until systemReady" into lmp-dev 
* commit '1cffe07a5c30c197344943ed3948109ddec01070':
  Don't send NetworkMonitor bcast until systemReady
 2014-08-14 17:56:00 +00:00
Winson Chung
21cbc935b8 am 17bec566: am e53ad496: am 11d62d14: Merge "Adding scrim to task views. (Bug 15704955)" into lmp-dev 
* commit '17bec5669075f028e66ec09ffeacbacac5db1e06':
  Adding scrim to task views. (Bug 15704955)
 2014-08-14 17:55:55 +00:00
Robert Greenwalt
2f0faca669 am 9249840f: am eb2f9858: Merge "Don\'t send NetworkMonitor bcast until systemReady" into lmp-dev 
* commit '9249840f7f5939d7f5efa233c1ef9f8ee57a57f7':
  Don't send NetworkMonitor bcast until systemReady
 2014-08-14 17:45:31 +00:00
Winson Chung
110d2ccdb8 am e53ad496: am 11d62d14: Merge "Adding scrim to task views. (Bug 15704955)" into lmp-dev 
* commit 'e53ad496018d28cfb625eaec8c7ccbc1edae0581':
  Adding scrim to task views. (Bug 15704955)
 2014-08-14 17:45:23 +00:00
Mike Reed
021a3443c6 SkBitmap::Config is deprecated 
Change-Id: I0bbd929074474ae3c1d497c2f645417e4876d9e3
 2014-08-14 09:57:06 -04:00
Glenn Kasten
45b851559c am a180cd0c: am 95ff26f9: am 1666a7c5: Merge "Move setting to disable automatic USB routing" into lmp-dev 
* commit 'a180cd0c87916551d01ae60d88bad68f68c19002':
  Move setting to disable automatic USB routing
 2014-08-14 05:20:09 +00:00
Adrian Roos
6d4c7a8413 am 0ad7a174: am 129b6ef3: am 74deb86b: Fix detail header padding 
* commit '0ad7a174772f5f72e546fc223d9e3f7880a38cb3':
  Fix detail header padding
 2014-08-14 05:20:03 +00:00
Glenn Kasten
032ec5a0f0 am 95ff26f9: am 1666a7c5: Merge "Move setting to disable automatic USB routing" into lmp-dev 
* commit '95ff26f927a8fc0179a5f3a5012090b1568b58c6':
  Move setting to disable automatic USB routing
 2014-08-14 04:20:14 +00:00
Adrian Roos
df215c7f9a am 129b6ef3: am 74deb86b: Fix detail header padding 
* commit '129b6ef36920cb572ce4529eb5fab7f86c16aff7':
  Fix detail header padding
 2014-08-14 04:15:08 +00:00
Robert Greenwalt
d357d0c5c9 am eb2f9858: Merge "Don\'t send NetworkMonitor bcast until systemReady" into lmp-dev 
* commit 'eb2f9858819abacc65c820a73483915459534126':
  Don't send NetworkMonitor bcast until systemReady
 2014-08-13 23:28:09 +00:00
Robert Greenwalt
57e383b1cc Merge "Don't send NetworkMonitor bcast until systemReady" into lmp-dev 2014-08-13 23:16:37 +00:00
Winson Chung
44b3469853 am 11d62d14: Merge "Adding scrim to task views. (Bug 15704955)" into lmp-dev 
* commit '11d62d14400d9b7c937820602f5b7b7f79d00337':
  Adding scrim to task views. (Bug 15704955)
 2014-08-13 23:13:01 +00:00
Glenn Kasten
cfd12009e4 am 1666a7c5: Merge "Move setting to disable automatic USB routing" into lmp-dev 
* commit '1666a7c5a654ae2f44e1e0d3083dd25720f42778':
  Move setting to disable automatic USB routing
 2014-08-13 22:56:11 +00:00
Adrian Roos
9dbdbb57a9 am 74deb86b: Fix detail header padding 
* commit '74deb86bb261d5e121eebeaf4f60cc6e6db28c19':
  Fix detail header padding
 2014-08-13 21:42:23 +00:00
Yorke Lee
5963c95a0e am 548c4642: am 31183c57: am 571d2642: Disable call log for users with DISALLOW_OUTGOING_CALLS restriction 
* commit '548c4642fbb55dcbbfb5f08da388b4e978307c36':
  Disable call log for users with DISALLOW_OUTGOING_CALLS restriction
 2014-08-13 21:39:57 +00:00
Adrian Roos
37f100ea51 Fix detail header padding 
Bug: 17007279
Change-Id: If0d20f69306a7c0cee89cc0c9a1fb81e7d0bf3c0
 2014-08-13 21:39:34 +00:00
Yorke Lee
2a96238c72 am 31183c57: am 571d2642: Disable call log for users with DISALLOW_OUTGOING_CALLS restriction 
* commit '31183c57c7f0f568d7902479fe862370b57af3fa':
  Disable call log for users with DISALLOW_OUTGOING_CALLS restriction
 2014-08-13 21:35:35 +00:00
Yorke Lee
b698b4ccb6 am 571d2642: Disable call log for users with DISALLOW_OUTGOING_CALLS restriction 
* commit '571d26420e22c0890c2cf851b03a6571b6cfbb4c':
  Disable call log for users with DISALLOW_OUTGOING_CALLS restriction
 2014-08-13 21:30:35 +00:00
Chris Craik
c540fb7778 am 272fea95: am 26efb5bf: am e6e0bfed: Merge "Fix action bar background drawing" into lmp-dev 
* commit '272fea95a9ce26593f0cfe79924487c3758d22a6':
  Fix action bar background drawing
 2014-08-13 21:20:13 +00:00
Yorke Lee
15f83c6f64 Disable call log for users with DISALLOW_OUTGOING_CALLS restriction 
Bug: 16217514
Change-Id: Iacd5699d0a540ca0e5a678662379bf8c611f7462
 2014-08-13 21:17:53 +00:00
Chris Craik
0feb86b0d7 am 26efb5bf: am e6e0bfed: Merge "Fix action bar background drawing" into lmp-dev 
* commit '26efb5bf4ebc90a15cecdb38be70e7239ea3723f':
  Fix action bar background drawing
 2014-08-13 21:15:20 +00:00
Chris Craik
722b9568af am e6e0bfed: Merge "Fix action bar background drawing" into lmp-dev 
* commit 'e6e0bfed05ad1bbfa6c4818db55d7631cc88ce67':
  Fix action bar background drawing
 2014-08-13 21:10:35 +00:00
Robert Greenwalt
fb68f8fbe0 Don't send NetworkMonitor bcast until systemReady 
bug:16913951
Change-Id: I26c5c3353c2d8821452f81765875958d5b9d385b
 2014-08-13 13:43:32 -07:00
Jae Seo
8e19370aac am 97508a38: am 930ab23a: am 7d206d9b: Merge "TIF: Create TvInputState only once per each input" into lmp-dev 
* commit '97508a38bde74b00d6e9f252ff5a86de38c9998e':
  TIF: Create TvInputState only once per each input
 2014-08-13 20:29:58 +00:00
Amith Yamasani
e8d12b6440 am b2c95e74: am 6648994f: am 5884bca0: Decouple user limit from guest creation 
* commit 'b2c95e74187539d78a9df70ae3361a67b5e72de9':
  Decouple user limit from guest creation
 2014-08-13 20:25:40 +00:00
Jeff Sharkey
99974c3921 am 21500a27: am c9c98188: am 9096e1b2: Merge "Fix javadoc attr reference." into lmp-dev 
* commit '21500a277e7b14531a63394f482c9054ec8aa610':
  Fix javadoc attr reference.
 2014-08-13 20:25:36 +00:00
Jae Seo
6b8ea6e56d am 930ab23a: am 7d206d9b: Merge "TIF: Create TvInputState only once per each input" into lmp-dev 
* commit '930ab23aaf41163f09a83a3060e1f1b78cb5af0c':
  TIF: Create TvInputState only once per each input
 2014-08-13 20:24:16 +00:00
Jae Seo
87b02e9ccc am 7d206d9b: Merge "TIF: Create TvInputState only once per each input" into lmp-dev 
* commit '7d206d9b71b35814c81d601a098cdad6438f7676':
  TIF: Create TvInputState only once per each input
 2014-08-13 20:18:56 +00:00
Amith Yamasani
b0dd621ef3 am 6648994f: am 5884bca0: Decouple user limit from guest creation 
* commit '6648994f02769f957a197deef011291d11a390b8':
  Decouple user limit from guest creation
 2014-08-13 20:18:50 +00:00
Jeff Sharkey
d468092c24 am c9c98188: am 9096e1b2: Merge "Fix javadoc attr reference." into lmp-dev 
* commit 'c9c9818872697b17e84fa329603264bcd6210e73':
  Fix javadoc attr reference.
 2014-08-13 20:18:45 +00:00
Amith Yamasani
170ad7f32d am 5884bca0: Decouple user limit from guest creation 
* commit '5884bca02326813ae809e80e5f3678cedde2a706':
  Decouple user limit from guest creation
 2014-08-13 20:13:11 +00:00
Jeff Sharkey
ba8d9fa70c am 9096e1b2: Merge "Fix javadoc attr reference." into lmp-dev 
* commit '9096e1b2791f1feb49fb53e327de150e0e0b5e67':
  Fix javadoc attr reference.
 2014-08-13 20:13:06 +00:00
Amith Yamasani
95ab784944 Decouple user limit from guest creation 
Allow Guest to be created even if there are N users.
Allow N users to be created even if there are N-1 users
   and a Guest.
Limit number of guests and managed profiles that can
be added.

Added unit tests.

Bug: 15934700
Change-Id: I1a8f0fa38a91d71ef7b2980e05c974244dfc337a
 2014-08-13 20:09:20 +00:00
keunyoung
28ba176957 am 14a3d969: am a90c8cba: am 64c0b0b6: Merge "rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP" into lmp-dev 
* commit '14a3d9696ae79fa774b9787fd4e658b1018886f0':
  rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP
 2014-08-13 20:06:00 +00:00
Andres Morales
2b2850baa7 am f1270c94: am aabd0ad4: am 98b4b65c: Mark PDBManager as a SystemApi 
* commit 'f1270c940af4d8e80ebf8607e330d922c9f4b22c':
  Mark PDBManager as a SystemApi
 2014-08-13 20:05:53 +00:00
keunyoung
fa4c60cf63 am a90c8cba: am 64c0b0b6: Merge "rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP" into lmp-dev 
* commit 'a90c8cba81ab4721e4d440d4ddd0a9710bf62def':
  rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP
 2014-08-13 20:00:50 +00:00
Andres Morales
3e7951c9f1 am aabd0ad4: am 98b4b65c: Mark PDBManager as a SystemApi 
* commit 'aabd0ad4149928935af1c2a3d4e331a6cdfe7d96':
  Mark PDBManager as a SystemApi
 2014-08-13 20:00:45 +00:00
keunyoung
1cae0ebdd9 am 64c0b0b6: Merge "rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP" into lmp-dev 
* commit '64c0b0b68d9d1321cc1772d6d875001c5f37c33b':
  rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP
 2014-08-13 19:55:40 +00:00
Andres Morales
46d9143405 am 98b4b65c: Mark PDBManager as a SystemApi 
* commit '98b4b65c921c9d7f4d2664c2142133041494411c':
  Mark PDBManager as a SystemApi
 2014-08-13 19:55:36 +00:00
Adrian Roos
625d22de69 am f3af1026: am 9244bd6d: am cf4d504e: Merge "QS UserSwitcher: Update exit guest string" into lmp-dev 
* commit 'f3af10268ef35321f3efe4fc1f7f6e9c9ef3f743':
  QS UserSwitcher: Update exit guest string
 2014-08-13 19:53:00 +00:00
Adrian Roos
7867cbfddd am e296bbf5: am fa2dca7e: am 009cd491: Merge "Status bar header: Fix Settings shortcut content description" into lmp-dev 
* commit 'e296bbf580fbd91a17d10aaca94130129cf6ba80':
  Status bar header: Fix Settings shortcut content description
 2014-08-13 19:52:56 +00:00
Adrian Roos
7e8502fdf3 am 9244bd6d: am cf4d504e: Merge "QS UserSwitcher: Update exit guest string" into lmp-dev 
* commit '9244bd6d100b25099f7d3c0e05755451b3fe3fe6':
  QS UserSwitcher: Update exit guest string
 2014-08-13 19:48:56 +00:00
Adrian Roos
dcf2c2ddb1 am fa2dca7e: am 009cd491: Merge "Status bar header: Fix Settings shortcut content description" into lmp-dev 
* commit 'fa2dca7ec0fa55dd78589bb20c7c62401dd83609':
  Status bar header: Fix Settings shortcut content description
 2014-08-13 19:48:52 +00:00
Andres Morales
396181b0cb Mark PDBManager as a SystemApi 
This will allow us to XTS test these APIs

Change-Id: Ife942f73580ea24eb6801b079b642d7c67107ab0
 2014-08-13 19:48:08 +00:00
Adrian Roos
d4070b70dd am 20abcf55: am df08e58a: am d63b258c: Trust: Insecure unlock also removes disable-trust-on-boot restriction 
* commit '20abcf55452371381fd8191f121022406347d935':
  Trust: Insecure unlock also removes disable-trust-on-boot restriction
 2014-08-13 19:44:56 +00:00
Chulwoo Lee
c93fe58a2c am 5a77ccac: am 63fd6565: am f62931dc: Merge "TIF: Enable to build uri for browsableOnly channels" into lmp-dev 
* commit '5a77ccacd83166dbb163bc1fc98284bc09728efa':
  TIF: Enable to build uri for browsableOnly channels
 2014-08-13 19:44:52 +00:00
Adrian Roos
02bb98b3b2 am df08e58a: am d63b258c: Trust: Insecure unlock also removes disable-trust-on-boot restriction 
* commit 'df08e58a28a604e29ad4e0cb81d0d7f2aadaa048':
  Trust: Insecure unlock also removes disable-trust-on-boot restriction
 2014-08-13 19:40:49 +00:00
Adrian Roos
15931b1d99 am cf4d504e: Merge "QS UserSwitcher: Update exit guest string" into lmp-dev 
* commit 'cf4d504e708a18bf804191f88ef59c748993e1c7':
  QS UserSwitcher: Update exit guest string
 2014-08-13 19:40:24 +00:00
Adrian Roos
7214a63250 am 009cd491: Merge "Status bar header: Fix Settings shortcut content description" into lmp-dev 
* commit '009cd49180827302ff63c67a83efcbf20a8f424f':
  Status bar header: Fix Settings shortcut content description
 2014-08-13 19:40:19 +00:00
Chulwoo Lee
976fc317a3 am 63fd6565: am f62931dc: Merge "TIF: Enable to build uri for browsableOnly channels" into lmp-dev 
* commit '63fd6565f5fac0dc0fc6df1df2b91f24bde6eb25':
  TIF: Enable to build uri for browsableOnly channels
 2014-08-13 19:36:40 +00:00