Leon Scroggins III
89a2466a2a
Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
...
BUG:19270126
Change-Id: I075d1cefcd3208305a72b4fa629a262e92eb60ea
2015-02-10 20:57:45 +00:00
Shanea King-Roberson
accf077030
am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
...
automerge: 696b68c
* commit '696b68c4fc65b671a00cfa82e6bc29a7d665828e':
Adding videos for 5.0 changes and watch face development.
2015-02-10 20:25:34 +00:00
Shanea King-Roberson
696b68c4fc
am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
...
* commit '24513bc580024a8a90c1ceab6746c0abb452d678':
Adding videos for 5.0 changes and watch face development.
2015-02-10 20:17:53 +00:00
Shanea King-Roberson
24513bc580
am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
...
* commit '3162289445ebade804c422162578d328c4762372':
Adding videos for 5.0 changes and watch face development.
2015-02-10 20:10:38 +00:00
Luan Nguyen
891718acd5
docs: Fix notification api guide issues (7461154, 12765600)
...
bug: 7461154
bug: 12765600
Change-Id: Ib4aff7f6481a514bf01894cad4984fed09f015e2
2015-02-10 12:05:50 -08:00
Shanea King-Roberson
3162289445
am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
...
* commit 'c86ac21f7393e579ad1585396ce3c212bf7d3bfb':
Adding videos for 5.0 changes and watch face development.
2015-02-10 20:04:17 +00:00
Chris Warrington
449988872b
am 510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev
...
* commit '510c24e8930447811f6725cbf7f3cefec2194a5d':
Fix AAPT daemon mode with paths containg spaces.
2015-02-10 20:01:00 +00:00
Shanea King-Roberson
c86ac21f73
Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
2015-02-10 19:57:30 +00:00
Chris Warrington
510c24e893
Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev
2015-02-10 19:56:32 +00:00
Luan Nguyen
6ee90183ab
am 18fc7b85: am ba795593: am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
...
* commit '18fc7b85543cd21317475962521606038cd44383':
docs: Fix various issues with incorrect code samples.
2015-02-10 19:02:50 +00:00
Luan Nguyen
18fc7b8554
am ba795593: am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
...
* commit 'ba795593e5941d89a861bb848c3f98800a0be3d6':
docs: Fix various issues with incorrect code samples.
2015-02-10 18:56:32 +00:00
Luan Nguyen
ba795593e5
am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
...
* commit '9b432bbece3cca6316b2638a947983e21c65917f':
docs: Fix various issues with incorrect code samples.
2015-02-10 18:47:38 +00:00
Luan Nguyen
9b432bbece
am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
...
* commit 'e49fbfa21ccdeba56001b48604524794acea119e':
docs: Fix various issues with incorrect code samples.
2015-02-10 18:40:34 +00:00
Luan Nguyen
e49fbfa21c
Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
2015-02-10 18:31:30 +00:00
Eric Gilmore
d86211292e
Adding videos for 5.0 changes and watch face development.
...
On branch pilot-videos
Changes to be committed:
modified: docs/html/about/versions/android-5.0-changes.jd
modified: docs/html/training/wearables/watch-faces/index.jd
Change-Id: I2dd852f3af8ae39f91ec08aadd5c03ff9996b46b
2015-02-10 10:29:36 -08:00
Eric Gilmore
2b7f0cff1e
am f35e8159: am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs automerge: 2b36779
...
* commit 'f35e815939d60863ec84fdd906d96279b652e33c':
Doc change: refactor GCM docs to be platform-agnostic.
2015-02-10 18:12:47 +00:00
Eric Gilmore
f35e815939
am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs
...
automerge: 2b36779
* commit '2b36779f30a511cc4439a519c95963280a779fdc':
Doc change: refactor GCM docs to be platform-agnostic.
2015-02-10 18:05:23 +00:00
Eric Gilmore
2b36779f30
am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs
...
* commit '99b91b2fd28888b20511316cb6f81b510b05cdf5':
Doc change: refactor GCM docs to be platform-agnostic.
2015-02-10 17:56:51 +00:00
Eric Gilmore
99b91b2fd2
am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs
...
* commit 'c9dbaf0483b0274879164806297180d260689f1f':
Doc change: refactor GCM docs to be platform-agnostic.
2015-02-10 17:45:47 +00:00
Luan Nguyen
c25adda636
docs: Fix various issues with incorrect code samples.
...
bug: 15671968
Change-Id: I3219f9c5e492ee95257439d9f284120dadd277ac
2015-02-10 09:39:44 -08:00
John Spurlock
43c7741c28
Doze: pulse less often.
...
automerge: 618e420
* commit '618e420adf2ab2478f62891738320bb9cc5260ec':
Doze: pulse less often.
2015-02-10 17:32:27 +00:00
John Spurlock
618e420adf
Doze: pulse less often.
...
Remove the trailing pulse @ 2 minutes, and only allow 2 schedule resets.
Bug: 19330195
Change-Id: I492581c081fafd2a1e5e09f7cce08d7a14da6d6b
2015-02-10 09:23:29 -05:00
Chris Warrington
de3ab0a9e8
Fix AAPT daemon mode with paths containg spaces.
...
Use new line as a delimiter rather than space.
Fixes: https://code.google.com/p/android/issues/detail?id=135757
Gradle CL: https://android-review.googlesource.com/130423
Change-Id: I7c73e680b0417b0e7cff9e0110822675c53ae20f
2015-02-09 21:20:52 -08:00
Svetoslav
5521f39ff7
am c73cfa0f: Accessibiltiy: missed update to the previous patch.
...
* commit 'c73cfa0ffba344a83d61e2f4eb9715152a2807b8':
Accessibiltiy: missed update to the previous patch.
2015-02-10 02:51:30 +00:00
Svetoslav
c73cfa0ffb
Accessibiltiy: missed update to the previous patch.
...
Change-Id: I4c47d38f5e137dcc1c6db0561b3824a26572027d
2015-02-09 18:33:07 -08:00
Eric Gilmore
c9dbaf0483
Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs
2015-02-10 01:13:03 +00:00
Baligh Uddin
fbf9666f84
am b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
...
* commit 'b2ba6dfc7b33ec9e58d9f556206440a26069e264':
Accessibility: Handle a missed case when clicking focused views.
2015-02-10 01:07:08 +00:00
Baligh Uddin
b2ba6dfc7b
Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
2015-02-10 00:57:21 +00:00
kmccormick
0137175af9
Doc change: refactor GCM docs to be platform-agnostic.
...
Fix for:
b/17733410
Change-Id: I6dabe6d0985dac7cf280c780140339c6250ac6e2
2015-02-09 16:28:15 -08:00
Andre Eisenbach
3ca77ccf87
am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev
...
* commit '455502b7501bdbc55a739083878431c3ba7ef81a':
Add API to check if a Bluetooth connection is encrypted (1/2)
2015-02-10 00:26:51 +00:00
Andre Eisenbach
455502b750
Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev
2015-02-10 00:21:43 +00:00
Matthew Xie
d67aff686d
am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev
...
* commit 'a63ba4287e5c87f41cd7d4b43111fd18f3ec499b':
Separate the protection of mProxyServiceStateCallbacks from that of mService
2015-02-09 21:59:13 +00:00
Matthew Xie
a63ba4287e
Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev
2015-02-09 21:50:58 +00:00
Daniel Sandler
96ac73c357
am 6e3de6a1: Merge "Added TEXT_CHANGED event to PasswordTextView" into lmp-mr1-dev
...
* commit '6e3de6a19af1533a0661975b5440b7c922211d0a':
Added TEXT_CHANGED event to PasswordTextView
2015-02-09 20:49:43 +00:00
Daniel Sandler
6e3de6a19a
Merge "Added TEXT_CHANGED event to PasswordTextView" into lmp-mr1-dev
2015-02-09 20:43:38 +00:00
Amith Yamasani
d09878c13c
am 61333d1b: Merge "Limit cache update to packages that have changed" into lmp-mr1-dev
...
* commit '61333d1b51ae36c9e5b1f4ea95bd00731c5e991a':
Limit cache update to packages that have changed
2015-02-09 20:05:32 +00:00
Amith Yamasani
61333d1b51
Merge "Limit cache update to packages that have changed" into lmp-mr1-dev
2015-02-09 19:59:27 +00:00
Rubin Xu
df608e39b3
am 3d521c0a: Merge "Perform post installation operations directly if backup manager is disabled" into lmp-mr1-dev
...
* commit '3d521c0a0165dfef53e3c9d3d562bc0ec45405a8':
Perform post installation operations directly if backup manager is disabled
2015-02-09 19:33:19 +00:00
Andre Eisenbach
2b8696e3a9
Add API to check if a Bluetooth connection is encrypted (1/2)
...
Bug: 19186961
Change-Id: I24656a07ee23ebfe067a9dfb9c1bc4041c782d8c
2015-02-09 11:31:06 -08:00
Rubin Xu
3d521c0a01
Merge "Perform post installation operations directly if backup manager is disabled" into lmp-mr1-dev
2015-02-09 19:25:20 +00:00
Amith Yamasani
460a7b4619
Limit cache update to packages that have changed
...
When updating the RegisteredServicesCache, don't remove any packages
that are not in the list of modified packages.
Bug: 19228972
Change-Id: Id4f264403b7ceca9005854dfbbc25abfd7b54889
2015-02-09 11:10:31 -08:00
Adrian Roos
4e4c37a2da
am 991db77a: Only request IME if password view is showing
...
* commit '991db77a44f3352a8cf6351f79cad67bf955e4e4':
Only request IME if password view is showing
2015-02-09 16:07:32 +00:00
Adrian Roos
a48caee9a7
Added TEXT_CHANGED event to PasswordTextView
...
Also creates a TextView-like accessibility node
and populates accessibility events with text if
required.
Bug: 18528774
Change-Id: I4a918a092b1e97879c31f54604cf957e01f4bc86
2015-02-09 15:55:21 +00:00
Rubin Xu
99abeed2bb
Perform post installation operations directly if backup manager is disabled
...
bug: 19312753
Change-Id: I4acdd1e3af6a6be0c51affc42de167993c736b2f
2015-02-09 15:36:30 +00:00
Geoff Mendal
fba2dcc023
Import translations. DO NOT MERGE
...
Change-Id: I37f95c49e5696a1aed7c2eb5ff75798571116c8a
Auto-generated-cl: translation import
2015-02-09 06:53:05 -08:00
Adrian Roos
991db77a44
Only request IME if password view is showing
...
Bug: 19250277
Change-Id: I881b08ebc6900ba43289b772ed0d039dbb62149c
2015-02-09 13:26:02 +00:00
Zhijun He
f7f131105d
Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev
...
automerge: 07c745b
* commit '07c745b525d39309a9ea93605fb5f85c295502f1':
camera-metadata: clarify the AE precapture trigger spec
2015-02-08 21:04:38 +00:00
Zhijun He
07c745b525
Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev
2015-02-08 17:38:03 +00:00
Svet Ganov
f33fe1f486
Accessibility: Handle a missed case when clicking focused views.
...
The special logic for clicking on views in accessibility mode should not
prevent event interception and if a view interceptes the gesture we must
clear the special flag and do normal event dispatch. Also once we have a
view handling the touch gesture we do not need the special flag as we
know what will handle the event. This tightly follows standard event
dispatching.
bug:19252492
Change-Id: I0c9764c5050ec73f5f7980f3f0340dd9509a725a
2015-02-07 10:36:59 -08:00
Zhijun He
dd72be5971
camera-metadata: clarify the AE precapture trigger spec
...
Doc only change.
Bug: 19301706
Change-Id: I8f94ee5ace6dd3040ee2f350d589e24e53694f1b
2015-02-06 17:51:34 -08:00