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

148695 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaewan Kim
e2c83c97fb TIF: Change data type of custom labels and hide inputs 
Change-Id: I2783245671a2a2a5500c6f97acf6375f44db8bf4
 2014-08-14 01:12:41 +00:00
Deepanshu Gupta
faf71d2002 am 848c83b2: Merge "Update intelliJ copyright profile" into lmp-dev 
* commit '848c83b21bde4f1c0724f54411cf10935301868f':
  Update intelliJ copyright profile
 2014-08-14 00:37:18 +00:00
Deepanshu Gupta
09dc8f82ee am 40748a08: Merge "Add KitKat wifi and battery icons." into lmp-dev 
* commit '40748a0852d73a2d76140910ef66bfdb79691dc3':
  Add KitKat wifi and battery icons.
 2014-08-14 00:37:14 +00:00
Deepanshu Gupta
e19e540598 am 6f5604a6: Merge "Whitelist fonts instead of blacklist." into lmp-dev 
* commit '6f5604a63a458addfdcfe4c5a3f0c1fb0a5899de':
  Whitelist fonts instead of blacklist.
 2014-08-14 00:37:09 +00:00
Dianne Hackborn
5b1500a7dc Merge "Fix singleInstance usage when singleTop intended" into lmp-dev 2014-08-14 00:12:29 +00:00
Craig Mautner
ad400af809 Fix singleInstance usage when singleTop intended 
In ag/499591 launchSingleInstance was mistakenly used to replace
r.launchMode==ActivityInfo.LAUNCH_SINGLE_TOP. This fixes that
and...

fixes bug 16898764.

Change-Id: I0c0cc3b67eda69276dbe1dd5da4f17556651b1ff
 2014-08-13 17:17:21 -07:00
Deepanshu Gupta
a3a3775599 Merge "Update intelliJ copyright profile" into lmp-dev 2014-08-14 00:12:29 +00:00
Deepanshu Gupta
aabf346d44 Merge "Add KitKat wifi and battery icons." into lmp-dev 2014-08-14 00:12:29 +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
Justin Mattson
d3a73b2545 Merge "Tweak leanback form style" into lmp-dev 2014-08-13 23:16:37 +00:00
Justin Mattson
90c8466216 Tweak leanback form style 
Change-Id: I2ecc691b6a0b83590b38cc676674a1d293d18e9e
 2014-08-14 16:06:42 -07:00
Yorke Lee
051bd7ea0e Merge "Show InCallScreen when swiping phone affordance while in a call" into lmp-dev 2014-08-13 23:16:37 +00:00
Yorke Lee
583a20247b Show InCallScreen when swiping phone affordance while in a call 
Bug: 16344259

Change-Id: Ifd7975295d9c98af302b5ce769076152acf59939
 2014-08-14 17:51:26 -07:00
Adrian Roos
f307633007 Merge "Add content description for brightness slider" into lmp-dev 2014-08-13 23:16:37 +00:00
Adrian Roos
4697d66918 Add content description for brightness slider 
Bug: 15696099
Change-Id: I834020c1505fd5e07a1ba4f120e0f811c598953a
 2014-08-14 13:59:22 +00:00
Robert Greenwalt
57e383b1cc Merge "Don't send NetworkMonitor bcast until systemReady" into lmp-dev 2014-08-13 23:16:37 +00:00
Deepanshu Gupta
84cc05cacd Add KitKat wifi and battery icons. 
This adds wifi and battery icons for Gingerbread and KitKat. This also
improves the icon resolution code by extracting it out in its own class.
The resources are now organized such that each API level resource
directory is used as a backup for all API levels lower than itself.

Change-Id: I937c83638adcc9fa8cd407e0a3023c3abe95530d
 2014-08-13 23:13:33 +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
Deepanshu Gupta
2e7a0355b4 Update intelliJ copyright profile 
Change-Id: Ib9386b686cb24e1f187d0b636b59b4b13d59bbcd
 2014-08-13 22:52:02 +00:00
RoboErik
24762bffc3 Add an onSessionDestroyed callback to MediaController.Callback 
Callbacks on the controller need to know when the session ceases
to exist.

bug:17009030
Change-Id: I0f1c1cfc51f7dd2203955287cc269667d3765ee4
 2014-08-13 15:00:21 -07:00
Adrian Roos
9dbdbb57a9 am 74deb86b: Fix detail header padding 
* commit '74deb86bb261d5e121eebeaf4f60cc6e6db28c19':
  Fix detail header padding
 2014-08-13 21:42:23 +00:00
Adrian Roos
37f100ea51 Fix detail header padding 
Bug: 17007279
Change-Id: If0d20f69306a7c0cee89cc0c9a1fb81e7d0bf3c0
 2014-08-13 21:39:34 +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
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
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
RoboErik
83e3152449 Fix dates on copywrite in new test code 
Some of the copywrites in the new browser test code still had 2010
as the year instead of 2014.

Change-Id: I33d19b1ad7f4bbbc8f93d9fb6acc8a92db401807
 2014-08-13 13:54:49 -07: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
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
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
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
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
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
Adrian Roos
ffefed058f am d63b258c: Trust: Insecure unlock also removes disable-trust-on-boot restriction 
* commit 'd63b258c0b40e0177ec8d508281a905ae3dc53ce':
  Trust: Insecure unlock also removes disable-trust-on-boot restriction
 2014-08-13 19:36:05 +00:00
Chulwoo Lee
04bd234142 am f62931dc: Merge "TIF: Enable to build uri for browsableOnly channels" into lmp-dev 
* commit 'f62931dc0f2f44325a47bb7e099734ab8ceeea4d':
  TIF: Enable to build uri for browsableOnly channels
 2014-08-13 19:31:53 +00:00
Adrian Roos
9dbe190099 Trust: Insecure unlock also removes disable-trust-on-boot restriction 
Bug: 16485702
Change-Id: I437f619eb680fa9461a5e0d854db2d9f84dc602c
 2014-08-13 19:31:29 +00:00
Ihab Awad
4368a26040 am 5ba3f456: Merge "Final structural tweaks to Telecomm API (1/8)" into lmp-dev 
* commit '5ba3f4563231fd81e3e1c7c56eab66fd9d02d570':
  Final structural tweaks to Telecomm API (1/8)
 2014-08-13 19:01:31 +00:00
kmccormick
271e19f3d6 am 625e3f89: am 7b708ec3: am 0672ea6f: am a0197180: Merge "Doc Change: Remove obsolete sample link." into klp-modular-docs 
* commit '625e3f89f20ff7282e095cd48cfa1da64abb17db':
  Doc Change: Remove obsolete sample link.
 2014-08-13 19:01:27 +00:00
kmccormick
a33ec00e49 am 7b708ec3: am 0672ea6f: am a0197180: Merge "Doc Change: Remove obsolete sample link." into klp-modular-docs 
* commit '7b708ec3178e30a18e4680a9903a65a13b4c32d2':
  Doc Change: Remove obsolete sample link.
 2014-08-13 18:55:37 +00:00
kmccormick
7b708ec317 am 0672ea6f: am a0197180: Merge "Doc Change: Remove obsolete sample link." into klp-modular-docs 
* commit '0672ea6f3f9f5a8dfcea75b405eb83057746e4e9':
  Doc Change: Remove obsolete sample link.
 2014-08-13 18:50:43 +00:00
kmccormick
0672ea6f3f am a0197180: Merge "Doc Change: Remove obsolete sample link." into klp-modular-docs 
* commit 'a0197180e76bad29a4b6eaed5c43cd922bc1803d':
  Doc Change: Remove obsolete sample link.
 2014-08-13 18:43:20 +00:00
ztenghui
ba69a2454b am e629d02b: Bring back the shadow strength tweak 
* commit 'e629d02ba346bf7f14557786ae3171b201cd179f':
  Bring back the shadow strength tweak
 2014-08-13 18:35:12 +00:00
ztenghui
14a4e35208 Bring back the shadow strength tweak 
bug:16712006

Change-Id: Ifc0ecca139d58140b45d7d227536a53069e1d480
 2014-08-13 18:22:42 +00:00
Craig Mautner
c94196c6d2 am 3e8ccb9c: Clean up app following death when creating service 
* commit '3e8ccb9ca4e01ff446c22f932cf4d1ab803f3108':
  Clean up app following death when creating service
 2014-08-13 18:20:43 +00:00
Craig Mautner
4a8dddbf18 Clean up app following death when creating service 
If an app has died, run through the cleanup before relaunching its
service.

Also a little simplifying refactor.

Fixes bug 16979752.

Change-Id: I376cbef2ea00fc626588386317f092cc6dea0bdc
 2014-08-13 18:15:28 +00:00
Craig Mautner
29d8f9103a am 8844c75a: Merge "Disassociate system windows from apps" into lmp-dev 
* commit '8844c75aea3708ab29f7dd3cba4b1b8eaaf799aa':
  Disassociate system windows from apps
 2014-08-13 18:12:40 +00:00