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

149400 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wei Wang
b54b014dd3 am f7dfa984: am b5d9d07e: Merge "Clean up advertise and scan clients upon bluetooth down." into lmp-dev 
* commit 'f7dfa984b57be7ed39b07f26cf9c74a2501a62a2':
  Clean up advertise and scan clients upon bluetooth down.
 2014-08-14 17:47:41 +00:00
Dongwon Kang
86bf8fffec am 9b46af77: am b2e06223: TIF: resolve SecurityException on loadCustomLabel(). 
* commit '9b46af775ca4ed3880311c110fe8a22f37bc7d75':
  TIF: resolve SecurityException on loadCustomLabel().
 2014-08-14 17:47:34 +00:00
Sungsoo Lim
b270f5fcee am 052d64a2: am 19e3564c: Merge "Update Java doc for TV Rating system" into lmp-dev 
* commit '052d64a25ea5feafb69ff6857bcf2e2451e81f5f':
  Update Java doc for TV Rating system
 2014-08-14 17:47:29 +00:00
Jose Lima
95f3c34848 am 06804518: am d361d4f9: Made AlarmClockInfo a nested class in AlarmManager 
* commit '068045187ef2b6011633b3a0bf273030ecb6d664':
  Made AlarmClockInfo a nested class in AlarmManager
 2014-08-14 17:47:08 +00:00
Jose Lima
f082842f2b am b991fd6e: am ec8834a3: Renamed "media playing" APIs to "visible behind" 
* commit 'b991fd6ec57b0f59e20f85a9cb9c63ac9d0ab98a':
  Renamed "media playing" APIs to "visible behind"
 2014-08-14 17:47:02 +00:00
Jeff Brown
d1ee11da70 am f281eea3: am 79bdc4d1: Log who is calling goToSleep(). 
* commit 'f281eea327ed9020333746cc77e48636662231b6':
  Log who is calling goToSleep().
 2014-08-14 17:46:57 +00:00
Jaewan Kim
68a7930468 am aa0b328f: am 640ec96b: TIF: Change data type of custom labels and hide inputs 
* commit 'aa0b328f2d85042c12c91e9958437dbd47c2a79c':
  TIF: Change data type of custom labels and hide inputs
 2014-08-14 17:46:51 +00:00
Dianne Hackborn
fc9eebe397 am 9f886b5d: am b344c188: Merge "Fix singleInstance usage when singleTop intended" into lmp-dev 
* commit '9f886b5d24b02978f56abe777819665d4eea4fbc':
  Fix singleInstance usage when singleTop intended
 2014-08-14 17:46:46 +00:00
Dianne Hackborn
ab843022e2 am 0bfe8aea: am b60a62ca: Merge "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..." into lmp-dev 
* commit '0bfe8aea12144bfdcc34673c5b14309f141d4de7':
  Fix issue #16794553: Duplicate ArrayMap entries in Bundle...
 2014-08-14 17:46:42 +00:00
Wonsik Kim
2c8d0d15fb am a4f76c98: am 21cdf598: Merge "TIF: handle HDMI CEC power status change" into lmp-dev 
* commit 'a4f76c98e66b1d1d45a57f88fffc75e63c3774c3':
  TIF: handle HDMI CEC power status change
 2014-08-14 17:46:37 +00:00
Deepanshu Gupta
de7f01641b am 7e1ba550: am 848c83b2: Merge "Update intelliJ copyright profile" into lmp-dev 
* commit '7e1ba55013c0f43941c0e53328f8b17cc113d03c':
  Update intelliJ copyright profile
 2014-08-14 17:46:07 +00:00
Deepanshu Gupta
e5817295e9 am 87267e4a: am 40748a08: Merge "Add KitKat wifi and battery icons." into lmp-dev 
* commit '87267e4a427ee85f125618925ed3e108a73d41a5':
  Add KitKat wifi and battery icons.
 2014-08-14 17:45:59 +00:00
Deepanshu Gupta
afef9a7413 am da1101ec: am 6f5604a6: Merge "Whitelist fonts instead of blacklist." into lmp-dev 
* commit 'da1101ec538c6d3999d2f4517258aecdf561c003':
  Whitelist fonts instead of blacklist.
 2014-08-14 17:45:54 +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
Wei Wang
9acc27e39c am b5d9d07e: Merge "Clean up advertise and scan clients upon bluetooth down." into lmp-dev 
* commit 'b5d9d07e771f51e95b8a75507e8d044dad8e8df5':
  Clean up advertise and scan clients upon bluetooth down.
 2014-08-14 04:59:31 +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
Dongwon Kang
bcc8084098 am b2e06223: TIF: resolve SecurityException on loadCustomLabel(). 
* commit 'b2e06223ca1ef64f4c2313bae131f4be5b461f0f':
  TIF: resolve SecurityException on loadCustomLabel().
 2014-08-14 03:56:42 +00:00
Sungsoo Lim
906b8497dd am 19e3564c: Merge "Update Java doc for TV Rating system" into lmp-dev 
* commit '19e3564ce1db19b35d3843f5f349946ca0659e6b':
  Update Java doc for TV Rating system
 2014-08-14 03:49:18 +00:00
Dongwon Kang
d4eb10a88d TIF: resolve SecurityException on loadCustomLabel(). 
Bug: 17001118
Change-Id: I357ac2506562c028116c3e4f6dd611ef2b744d28
 2014-08-14 03:43:07 +00:00
Jose Lima
9c47f59c0d am d361d4f9: Made AlarmClockInfo a nested class in AlarmManager 
* commit 'd361d4f95e7d1cb7b59371bf19fa64fef35881b0':
  Made AlarmClockInfo a nested class in AlarmManager
 2014-08-14 03:16:50 +00:00
Jose Lima
da7f797de6 am ec8834a3: Renamed "media playing" APIs to "visible behind" 
* commit 'ec8834a3da1848515ba016e15f1255a72dd7d3bc':
  Renamed "media playing" APIs to "visible behind"
 2014-08-14 03:16:37 +00:00
Jeff Brown
92c1d5670b am 79bdc4d1: Log who is calling goToSleep(). 
* commit '79bdc4d16f2c0a8337065f39b6b66cb0889bcce9':
  Log who is calling goToSleep().
 2014-08-14 03:16:26 +00:00
Jaewan Kim
6fe329bdbb am 640ec96b: TIF: Change data type of custom labels and hide inputs 
* commit '640ec96b078df5471e3041490bd8bb494836af75':
  TIF: Change data type of custom labels and hide inputs
 2014-08-14 03:15:58 +00:00
Dianne Hackborn
e5878600dc am b344c188: Merge "Fix singleInstance usage when singleTop intended" into lmp-dev 
* commit 'b344c188b3e97255fd35724200e356ed71229155':
  Fix singleInstance usage when singleTop intended
 2014-08-14 03:15:25 +00:00
Dianne Hackborn
dee0beefed am b60a62ca: Merge "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..." into lmp-dev 
* commit 'b60a62ca88eb73c7cdf45f75587db3cb68fbd978':
  Fix issue #16794553: Duplicate ArrayMap entries in Bundle...
 2014-08-14 03:15:18 +00:00
Wonsik Kim
2fe0c2e098 am 21cdf598: Merge "TIF: handle HDMI CEC power status change" into lmp-dev 
* commit '21cdf598ee5576592f7806053c5aea472caa04ef':
  TIF: handle HDMI CEC power status change
 2014-08-14 03:15:12 +00:00
Jose Lima
235510e672 Made AlarmClockInfo a nested class in AlarmManager 
Bug: 16959028
Change-Id: I150eaaff765d1e214c3621c1bf50162ec0dac8ec
 2014-08-14 02:10:41 +00:00
Jose Lima
4b6c6697da Renamed "media playing" APIs to "visible behind" 
- Request from API Review: rename the media playing APIs to a more
     generic name, reflecting the background visibility feature these
     methods actually control.
   - Made the new isActivityVisibleBehind().
   - Changed convertFromTranslucent() and convertToTranslucent() to be
     SystemApi.

Bug: 16959028
Change-Id: I526eac22f44273b3254dd6201f89194d13e597e2
 2014-08-14 02:00:04 +00:00
Jeff Brown
c12035cd40 Log who is calling goToSleep(). 
Change-Id: Ibae61c90ee115735835e878bb3bf79eedaa0ae44
 2014-08-14 01:56:48 +00:00
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
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
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
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
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