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

123446 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
9472cadd22 am ef2b35cc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'ef2b35cc2e87058ead622bd1858d358690c201fd':
  Import translations. DO NOT MERGE
 2014-05-21 15:38:26 +00:00
Baligh Uddin
ef2b35cc2e Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-05-21 15:34:11 +00:00
Jeff Brown
c28716964c am 6099fd21: Merge "Fix build." into klp-modular-dev 
* commit '6099fd21e190ffdf8e03ba6d96cce0d53c2765fd':
  Fix build.
 2014-05-21 08:40:39 +00:00
Jeff Brown
77669abb83 am 9beccf9f: Merge "Defer display ready until brightness ramp completes." into klp-modular-dev 
* commit '9beccf9f9e28f74bd78041e4381b59ce0a2351e7':
  Defer display ready until brightness ramp completes.
 2014-05-21 08:40:36 +00:00
Jeff Brown
fcc4fed3c1 am 6fb904bf: Merge "Make power button behavior configurable." into klp-modular-dev 
* commit '6fb904bfd1f943547d6e5bc6f199ffec2290da01':
  Make power button behavior configurable.
 2014-05-21 08:40:33 +00:00
Brian Carlstrom
1d26571695 am e77a77d0: am ec71fed0: Merge "Improve ABI handling for shared user ids." 
* commit 'e77a77d081ff9d05100702f5880f356da27fd087':
  Improve ABI handling for shared user ids.
 2014-05-21 08:27:03 +00:00
Brian Carlstrom
e77a77d081 am ec71fed0: Merge "Improve ABI handling for shared user ids." 
* commit 'ec71fed089965c4d731eaa90344849a1775f937a':
  Improve ABI handling for shared user ids.
 2014-05-21 06:46:26 +00:00
Brian Carlstrom
ec71fed089 Merge "Improve ABI handling for shared user ids." 2014-05-21 06:01:06 +00:00
Jeff Brown
6099fd21e1 Merge "Fix build." into klp-modular-dev 2014-05-21 05:17:31 +00:00
Jeff Brown
61116acdc6 Fix build. 
Change-Id: I00f040ab16cf8a3b7a995b4626d49e70b97fb294
 2014-05-20 22:16:25 -07:00
Jeff Brown
9beccf9f9e Merge "Defer display ready until brightness ramp completes." into klp-modular-dev 2014-05-21 05:09:15 +00:00
Jeff Brown
4255869ac0 Defer display ready until brightness ramp completes. 
Bug: 14494096
Change-Id: I6da6fffbbce2c7058170e5c6139eae4cb5a06d88
 2014-05-20 22:02:46 -07:00
Jeff Brown
6fb904bfd1 Merge "Make power button behavior configurable." into klp-modular-dev 2014-05-21 04:28:34 +00:00
Jeff Brown
6d8fd27e51 Make power button behavior configurable. 
Allow power button to be used to either go to sleep as usual,
which may doze, or skip that completely and really go to sleep.
May also really go to sleep and go home all at once.

Bug: 14406056
Change-Id: Ia19e2551b9c2a72271bb2eddd5c0d1749761e019
 2014-05-20 21:24:38 -07:00
Griff Hazen
08a8c2ca45 am ef6aae62: Merge "Fixes to WearableActionExtensions" into klp-modular-dev 
* commit 'ef6aae62f6c92bc9413db60c28cc4b3230f4d2fa':
  Fixes to WearableActionExtensions
 2014-05-21 02:44:16 +00:00
Griff Hazen
ef6aae62f6 Merge "Fixes to WearableActionExtensions" into klp-modular-dev 2014-05-21 02:41:02 +00:00
Jeff Brown
ccf51bef28 am 2d9b513d: Merge "I\'m feeling the good vibrations." into klp-modular-dev 
* commit '2d9b513dab78242281bca125b4abc6b8235089a6':
  I'm feeling the good vibrations.
 2014-05-21 02:38:11 +00:00
Jeff Brown
8f120dd6d6 am 0702786d: Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev 
* commit '0702786d81eb9f9bf47c3a0827d3f2824c3f4228':
  Allow display timeouts to be set in config.xml.
 2014-05-21 02:38:07 +00:00
Jeff Brown
2d9b513dab Merge "I'm feeling the good vibrations." into klp-modular-dev 2014-05-21 02:35:09 +00:00
Jeff Brown
0702786d81 Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev 2014-05-21 02:34:25 +00:00
Jeff Brown
969579bb9d I'm feeling the good vibrations. 
When the device enters a non-interactive state, we normally
cancel all active vibrations as a safety precaution.  However if
the system is performing haptic feedback then we want to allow
it to run to completion.

Bug: 14319563
Change-Id: I673781bbf32562e45c1595689e6b423bd178ea73
 2014-05-20 19:29:29 -07:00
Dirk Dougherty
3dc330af6b am f7963fab: am c1bb79d9: am bb0b8449: Remove monetization image in edu guidelines. 
* commit 'f7963fab0decb70b72b848fe3d7a14c5ed54ff95':
  Remove monetization image in edu guidelines.
 2014-05-21 02:29:04 +00:00
Dirk Dougherty
f7963fab0d am c1bb79d9: am bb0b8449: Remove monetization image in edu guidelines. 
* commit 'c1bb79d966c5fee256a349d8902c7abd362ddc39':
  Remove monetization image in edu guidelines.
 2014-05-21 02:25:09 +00:00
Dirk Dougherty
c1bb79d966 am bb0b8449: Remove monetization image in edu guidelines. 
* commit 'bb0b8449f80338a35768c9264e9c1e5eae54c7fa':
  Remove monetization image in edu guidelines.
 2014-05-21 02:20:16 +00:00
Dirk Dougherty
bb0b8449f8 Remove monetization image in edu guidelines. 
Change-Id: I2cea7a3507eda30ab185560304d64fc455ba19f7
 2014-05-20 19:10:26 -07:00
Griff Hazen
4ae73202c3 Fixes to WearableActionExtensions 
* Add missing parcelable creator.
* Review fixes.
* Minor doc fixes.
* Kill SIZE_FULLSCREEN

Change-Id: Iaf6458fdd3482202aa416ebaf2302f79cb48635e
 2014-05-20 18:46:16 -07:00
Jeff Brown
27736f5c0a Allow display timeouts to be set in config.xml. 
Bug: 13671523
Change-Id: I79fc21999bc62743178d2d22071455a0c11070c9
 2014-05-20 17:17:10 -07:00
Griff Hazen
cbe69ec18d am 7ea18e1c: Add wearable notification extensions to frameworks/base. 
* commit '7ea18e1c92ab84d1a0d00087e6e3784646661fe8':
  Add wearable notification extensions to frameworks/base.
 2014-05-20 23:21:01 +00:00
Griff Hazen
7ea18e1c92 Add wearable notification extensions to frameworks/base. 
Change-Id: Ic312cec7dc11e637002ff2be3975940a93a6babf
 2014-05-20 13:50:06 -07:00
Jeff Brown
9777fdb7af am b0a7f84b: am 63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown" 
* commit 'b0a7f84b6de20edc6337163a4a07e3c524991ddb':
  Fix NullException in QwertyKeyListener.KeyDown
 2014-05-20 20:44:21 +00:00
Jeff Brown
b0a7f84b6d am 63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown" 
* commit '63bf04d88bcc00876c30c9f2848da8c44b42185b':
  Fix NullException in QwertyKeyListener.KeyDown
 2014-05-20 20:40:20 +00:00
Jeff Brown
63bf04d88b Merge "Fix NullException in QwertyKeyListener.KeyDown" 2014-05-20 20:37:44 +00:00
Griff Hazen
7ba69dd8bd am 9e1379f1: Fix sdk docs build for framework from remote input api addition. 
* commit '9e1379f1126c1101f69445572bd441b2211791fa':
  Fix sdk docs build for framework from remote input api addition.
 2014-05-20 20:07:32 +00:00
Griff Hazen
9e1379f112 Fix sdk docs build for framework from remote input api addition. 
Change-Id: I6a6f3df06d924fe72f67466d67d9feced8d8719f
 2014-05-20 12:51:29 -07:00
Griff Hazen
8f1e7aded3 am 5cadc3b0: Add RemoteInput, Grouping, and Extender to Notification api. 
* commit '5cadc3b00aa775a63518383046c902b130e09b4c':
  Add RemoteInput, Grouping, and Extender to Notification api.
 2014-05-20 18:41:46 +00:00
Griff Hazen
5cadc3b00a Add RemoteInput, Grouping, and Extender to Notification api. 
RemoteInputs annotate actions and content intents to request
input from the user as part of an intent being sent. Results
are sent along using ClipData to avoid unparcel of developer
provided bundle values. A helper method is expexted to be used
to extract results.

Grouping allows notifications to be bundled together, with an optional
summary notification for display on older platforms. SortKey is an
important part of grouping since child notifications will likely have
a prescribed ordering. It is also useful in top level notifications
for apps that want to provide an ordering all other fields being equal.

Also provide a fluid way to to extend Actions and Notifications
using Extenders, e.g.:

Notification n = new NotificationCompat.Builder(context)
    .setOption1()
    .apply(new SomeExtender()
        .setOption2())
    .build();

This helps extension libraries provide a nice API experience for devs.

Change-Id: Ib3438ef854772c2c34d21bf1eb4ed7c9e032106f
 2014-05-20 09:55:39 -07:00
Baligh Uddin
e5762bc2b4 Import translations. DO NOT MERGE 
Change-Id: I813af1cbb2db0674a3cf81649f0d130ebb2d6164
Auto-generated-cl: translation import
 2014-05-20 08:27:22 -07:00
Narayan Kamath
b851c89d22 Improve ABI handling for shared user ids. 
The key improvement is that we need to keep track of
the package that's currently being scanned (this includes
new installs and upgrades of existing packages) and treat
it specially. If we didn't do that, In the case of upgrades
we would perform the shared UID calculation based on the ABI
of the old package, and not the current package.

This change also allows us to perform the CPU ABI calculation
before dexopt, which saves us from having to do it twice and
fixes a bug where we were using the wrong package path to
dexopt a package.

This also has the side effect of fixing 15081286.

bug: 15081286

Change-Id: I20f8ad36941fc3df29007f0e83ce82f38f3585c8
 2014-05-20 14:09:12 +01:00
Ben Murdoch
ecf09321c5 am e0d6a6b0: Merge "Add PackagManager flag for WebView system feature." into klp-modular-dev 
* commit 'e0d6a6b05b0861a5aa6dd8189de61a4da8d39dae':
  Add PackagManager flag for WebView system feature.
 2014-05-20 09:39:05 +00:00
Ben Murdoch
e0d6a6b05b Merge "Add PackagManager flag for WebView system feature." into klp-modular-dev 2014-05-20 09:32:43 +00:00
Michael Wright
b3ce4b1b78 am 889814ce: resolved conflicts for merge of 32912e0a to stage-aosp-master 
* commit '889814cee0ebcf70069d04d3ae77c97c09efb5a1':
  wallpaper: limit wallpaper width to sys.max_texture_size
 2014-05-20 09:28:40 +00:00
Guang Zhu
cd98ecc66b am 6071e45a: Merge "add a command to list all bonded devices" into klp-modular-dev 
* commit '6071e45a64ab764eb86603f2f4496cfd5c8de708':
  add a command to list all bonded devices
 2014-05-20 09:26:18 +00:00
Michael Wright
889814cee0 resolved conflicts for merge of 32912e0a to stage-aosp-master 
Change-Id: I140e2024bd0e6e81ab550718103d45220d8bde26
 2014-05-19 22:42:58 -07:00
Guang Zhu
6071e45a64 Merge "add a command to list all bonded devices" into klp-modular-dev 2014-05-20 04:36:48 +00:00
Guang Zhu
d22b2413b9 add a command to list all bonded devices 
Bug: 14601515

Change-Id: I3cc5bb664485ef768bb81f1f8870ed9bf62f8329
 2014-05-19 21:36:10 -07:00
Michael Wright
32912e0a73 Merge "wallpaper: limit wallpaper width to sys.max_texture_size" 2014-05-20 04:04:01 +00:00
Donghan Ryu
289c273ec4 wallpaper: limit wallpaper width to sys.max_texture_size 
Image wallpapers are created ~1.5x screen size.  On some devices this
may exceed the maximum supported texture size, which will either fail
allocation or fail to composite.

Bug 991597

Change-Id: I9948b09f6e00a724212e73d36901f2bbea42e2f4
 2014-05-20 12:00:31 +09:00
quddusc
9d1c381446 am 9e58b46b: am f269e732: am 728dbf8c: Merge "docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4)." into klp-docs 
* commit '9e58b46b566e2b1963ea1e42a9696a32784859f4':
  docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4).
 2014-05-19 21:03:02 +00:00
Quddus Chong
11f069764b am 4b2b91d4: am 47064793: am f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs 
* commit '4b2b91d47c1430f3c69893466cf2b8b025876888':
  docs: Updated Javadoc for GMS Kenafa release.
 2014-05-19 21:02:57 +00:00
quddusc
9e58b46b56 am f269e732: am 728dbf8c: Merge "docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4)." into klp-docs 
* commit 'f269e732bf76d7dc4b37f2ce023684b4fe691c60':
  docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4).
 2014-05-19 20:58:49 +00:00