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

121897 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
RoboErik
2dfae9bea1 Merge "b/12068020 Make kb layouts only unique to vendor/product" 2014-01-08 22:07:14 +00:00
Adam Powell
fa18d182a3 Move ActionMenuView into android.widget and make it public 
Expose ActionMenuView as a way for applications to present
ActionBar-style menus in other embedded or repeating contexts.

Change-Id: I54b7ccd9b2116ca68bc72956da9262bca9d5085f
 2014-01-08 13:53:30 -08:00
Tim Murray
71a01b8648 Fix most logging macros for context pointers. 
Change-Id: I7f4a8db4f3a52c368cc32ce0428f8001df8a4166
 2014-01-08 13:29:48 -08:00
John Spurlock
fd3c089b1a Merge "Battery meter: remove bolt color compromise & improve pct." 2014-01-08 20:50:34 +00:00
Alan Viverette
25838002c8 Merge "Allow Views to specify a theme override" 2014-01-08 20:40:39 +00:00
John Spurlock
4b786ff4b5 Battery meter: remove bolt color compromise & improve pct. 
- Bolt remains opaque (white) below a threshold level, otherwise
   transparent.
 - Draw the entire shape using a path, removing the need for a
   software layer.
 - Use a similar approach to make the percentage text readable,
   but this still requires a software layer (since text is involved).

Bug: 12131168
Change-Id: Ifde5e99121155bf1be171f44b2c80c116b17c9e7
 2014-01-08 15:04:50 -05:00
Wink Saville
e72e85f42a am f05ae3fe: am bc0207fd: am 2626d0e1: am ad068837: am 76d5cdd8: Merge "telephony: Add same named operator configuration for some operators" 
* commit 'f05ae3fe0f7b845efc0733e77e7fbd723d6dc5d3':
  telephony: Add same named operator configuration for some operators
 2014-01-08 19:40:30 +00:00
Wink Saville
f05ae3fe0f am bc0207fd: am 2626d0e1: am ad068837: am 76d5cdd8: Merge "telephony: Add same named operator configuration for some operators" 
* commit 'bc0207fdbd6cd8b3f250704b07edef07ab376bcb':
  telephony: Add same named operator configuration for some operators
 2014-01-08 19:37:30 +00:00
Wink Saville
bc0207fdbd am 2626d0e1: am ad068837: am 76d5cdd8: Merge "telephony: Add same named operator configuration for some operators" 
* commit '2626d0e18dc9898d70f75540fabc67421f33fab3':
  telephony: Add same named operator configuration for some operators
 2014-01-08 19:34:12 +00:00
Wink Saville
2626d0e18d am ad068837: am 76d5cdd8: Merge "telephony: Add same named operator configuration for some operators" 
* commit 'ad06883730b4cd4af98c0c3ec69a7e851f9cace9':
  telephony: Add same named operator configuration for some operators
 2014-01-08 11:31:02 -08:00
Wink Saville
ad06883730 am 76d5cdd8: Merge "telephony: Add same named operator configuration for some operators" 
* commit '76d5cdd820b5d81af8de73180c272d7f8a01caae':
  telephony: Add same named operator configuration for some operators
 2014-01-08 11:28:58 -08:00
Wink Saville
76d5cdd820 Merge "telephony: Add same named operator configuration for some operators" 2014-01-08 19:25:11 +00:00
Mike Lockwood
613b60451d Merge "SettingsProvider: Allow disabling immersive mode confirmation for specific packages" 2014-01-08 18:54:05 +00:00
Mike Lockwood
c02c4a7c5b SettingsProvider: Allow disabling immersive mode confirmation for specific packages 
Change-Id: I2fac06cbe3321d7384278d875c91128bcc15d629
 2014-01-08 10:48:03 -08:00
Craig Mautner
b859449b71 resolved conflicts for merge of 88bfc6dd to master 
Change-Id: Ib656ac0591b21ad14f2df51021729552e9373515
 2014-01-08 09:51:33 -08:00
Narayan Kamath
4f84552784 Add new Java 7 concurrent APIs. 
Change-Id: I93b5ac5eefbb38204fc9f3d8ce0f948bdda67915
 2014-01-08 17:38:59 +00:00
Baligh Uddin
3104c96ee2 Import translations. DO NOT MERGE 
Change-Id: I0b5c058dcbb0fd0d8b410cc475c0342ae5477457
Auto-generated-cl: translation import
 2014-01-08 09:36:59 -08:00
Craig Mautner
88bfc6ddc8 Merge "Extend stack management to other displays." into klp-modular-dev 2014-01-08 17:33:42 +00:00
Baligh Uddin
1dbd3feaff Import translations. DO NOT MERGE 
Change-Id: I6b4ea2167d53edba65aebefe0ca6f22134a9dd8a
Auto-generated-cl: translation import
 2014-01-08 09:30:38 -08:00
Marco Nelissen
8964cbbb50 sqlite integer fields are long 
Change-Id: I350ccfe91af707cfc234bead9341d68b55623d7b
 2014-01-08 17:19:45 +00:00
Baligh Uddin
267bba6f64 Import translations. DO NOT MERGE 
Change-Id: Ia1ebb3566930294e42b3310a5d8ffa845852fa77
Auto-generated-cl: translation import
 2014-01-08 09:01:38 -08:00
Mike Lockwood
7b925fbb87 am 43bc1c07: am d9e708e3: am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters" 
* commit '43bc1c07d25b7f278a860bbb9118f46ac732593a':
  Added missing USB device descriptor fields needed for intent filters
 2014-01-08 16:10:42 +00:00
Mike Lockwood
43bc1c07d2 am d9e708e3: am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters" 
* commit 'd9e708e365d94e83ec135f1486129febd3f8eaea':
  Added missing USB device descriptor fields needed for intent filters
 2014-01-08 16:08:17 +00:00
Mike Lockwood
d9e708e365 am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters" 
* commit '12ec2e6d71bc69ca11946f7f051931863c934273':
  Added missing USB device descriptor fields needed for intent filters
 2014-01-08 16:05:29 +00:00
Mike Lockwood
12ec2e6d71 am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters" 
* commit '992065938a95e5273b22dea009b8581bcc693e61':
  Added missing USB device descriptor fields needed for intent filters
 2014-01-08 08:01:42 -08:00
Mike Lockwood
992065938a am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters" 
* commit '9607d78f5144792993bd254a4b5983b2a9d5bf83':
  Added missing USB device descriptor fields needed for intent filters
 2014-01-08 07:59:06 -08:00
Mike Lockwood
9607d78f51 Merge "Added missing USB device descriptor fields needed for intent filters" 2014-01-08 15:56:13 +00:00
Narayan Kamath
bcf40bcda5 am e853de1f: am 2d87407e: am 136c0219: am c156021d: am 8a927cfa: Merge "Fix a bug introduced in change 73712" 
* commit 'e853de1f10820da1bc7b6bf13faadaf835239c29':
  Fix a bug introduced in change 73712
 2014-01-08 13:09:05 +00:00
Narayan Kamath
e853de1f10 am 2d87407e: am 136c0219: am c156021d: am 8a927cfa: Merge "Fix a bug introduced in change 73712" 
* commit '2d87407e5765228a3469b9681ebff6c0c7eee140':
  Fix a bug introduced in change 73712
 2014-01-08 13:06:55 +00:00
Narayan Kamath
2d87407e57 am 136c0219: am c156021d: am 8a927cfa: Merge "Fix a bug introduced in change 73712" 
* commit '136c02191790aa937c490341df49e966735f6857':
  Fix a bug introduced in change 73712
 2014-01-08 13:04:15 +00:00
Narayan Kamath
136c021917 am c156021d: am 8a927cfa: Merge "Fix a bug introduced in change 73712" 
* commit 'c156021debb8e13324e451cb288da7edd7e112ca':
  Fix a bug introduced in change 73712
 2014-01-08 05:00:33 -08:00
Narayan Kamath
c156021deb am 8a927cfa: Merge "Fix a bug introduced in change 73712" 
* commit '8a927cfa4ea8e4a78f6a9fa1e2b1da9187a3d1e8':
  Fix a bug introduced in change 73712
 2014-01-08 04:49:24 -08:00
Narayan Kamath
8a927cfa4e Merge "Fix a bug introduced in change 73712" 2014-01-08 12:47:31 +00:00
Narayan Kamath
0203d58ecf am db47efd3: am 651807fc: am 3f589e5d: am 2842bd02: am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup" 
* commit 'db47efd3f8581c2c0d72a1b8617aeae9830f7ea4':
  AArch64: Use long for pointers in App/Backup
 2014-01-08 12:38:37 +00:00
Narayan Kamath
ee864c0a04 am 55a12adc: am 72a8fe6d: am 74661ff1: am b5558817: am 002ae75b: Merge "AArch64: Use long for pointers" 
* commit '55a12adc19b15df4068b90439dccb868534002c7':
  AArch64: Use long for pointers
 2014-01-08 12:38:30 +00:00
Narayan Kamath
6bbda22e1c am 29eadb32: am 9a743575: am 71cdc73d: am 53acc7ae: am f5598210: Merge "AArch64: Use long for pointers in hardware classes" 
* commit '29eadb328a71f912b0d479860286cd606ed3dc87':
  AArch64: Use long for pointers in hardware classes
 2014-01-08 12:38:24 +00:00
Narayan Kamath
2c0971eeec am 3f7b8d0c: resolved conflicts for merge of 92ae0347 to klp-modular-dev 
* commit '3f7b8d0c6c2b1b6a8d183769621f5fd9c36cfc85':
  AArch64: Use long for pointers in services
 2014-01-08 12:34:29 +00:00
Narayan Kamath
db47efd3f8 am 651807fc: am 3f589e5d: am 2842bd02: am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup" 
* commit '651807fcd0b1012ea848efe5f67b4381d8ce6797':
  AArch64: Use long for pointers in App/Backup
 2014-01-08 12:33:16 +00:00
Narayan Kamath
55a12adc19 am 72a8fe6d: am 74661ff1: am b5558817: am 002ae75b: Merge "AArch64: Use long for pointers" 
* commit '72a8fe6d03a7c9e88e8fdd7181ca6896a2d475eb':
  AArch64: Use long for pointers
 2014-01-08 12:33:11 +00:00
Narayan Kamath
29eadb328a am 9a743575: am 71cdc73d: am 53acc7ae: am f5598210: Merge "AArch64: Use long for pointers in hardware classes" 
* commit '9a743575254d7d5d456456517171f0ee31bc9247':
  AArch64: Use long for pointers in hardware classes
 2014-01-08 12:33:06 +00:00
Narayan Kamath
87d6cd4537 Fix a bug introduced in change 73712 
"return (bool) true" was incorrectly changed to
"return (jboolean) JNI_FALSE"

Change-Id: I45f62f60c5affbae7970bb8889c55981e26d01ba
 2014-01-08 12:26:28 +00:00
Narayan Kamath
3f7b8d0c6c resolved conflicts for merge of 92ae0347 to klp-modular-dev 
Change-Id: I703aea4f20985a4bbda0f685254721d6480bb20f
 2014-01-08 12:19:40 +00:00
Narayan Kamath
651807fcd0 am 3f589e5d: am 2842bd02: am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup" 
* commit '3f589e5d1e09e17a2aaa0a52fc15e16520d1bd5a':
  AArch64: Use long for pointers in App/Backup
 2014-01-08 12:05:13 +00:00
Narayan Kamath
3f589e5d1e am 2842bd02: am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup" 
* commit '2842bd021c11274720d6a10219538b536b7d2050':
  AArch64: Use long for pointers in App/Backup
 2014-01-08 04:02:05 -08:00
Narayan Kamath
72a8fe6d03 am 74661ff1: am b5558817: am 002ae75b: Merge "AArch64: Use long for pointers" 
* commit '74661ff119b274e58d1b2f15cff97cfa6a1e64fa':
  AArch64: Use long for pointers
 2014-01-08 12:01:13 +00:00
Narayan Kamath
9a74357525 am 71cdc73d: am 53acc7ae: am f5598210: Merge "AArch64: Use long for pointers in hardware classes" 
* commit '71cdc73d2808944fca0a9e200696253d1f4a5bf4':
  AArch64: Use long for pointers in hardware classes
 2014-01-08 12:01:09 +00:00
Narayan Kamath
92ae034756 am cbf339f6: am ab169215: am f210044f: Merge "AArch64: Use long for pointers in services" 
* commit 'cbf339f6e4bf45a7d41cd0327d2dd7975875b8aa':
  AArch64: Use long for pointers in services
 2014-01-08 12:01:04 +00:00
Narayan Kamath
2842bd021c am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup" 
* commit 'de8c3cf13b0fc0655cf49934658e652b441ee019':
  AArch64: Use long for pointers in App/Backup
 2014-01-08 03:59:46 -08:00
Narayan Kamath
74661ff119 am b5558817: am 002ae75b: Merge "AArch64: Use long for pointers" 
* commit 'b5558817c78e3140fa3f9cbbe167cacf6481f47f':
  AArch64: Use long for pointers
 2014-01-08 03:58:22 -08:00
Narayan Kamath
71cdc73d28 am 53acc7ae: am f5598210: Merge "AArch64: Use long for pointers in hardware classes" 
* commit '53acc7ae00ba921e8c7afb9415dbf473785a3be6':
  AArch64: Use long for pointers in hardware classes
 2014-01-08 03:58:17 -08:00