Benjamin Franz
dd0027cfda
am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode intents.
...
* commit '40ab8bb22979b9e7c76e016b861319f6103eb800':
Fix the javadocs for lock task mode intents.
2015-02-12 16:52:34 +00:00
Benjamin Franz
40ab8bb229
am c70d0e71: Fix the javadocs for lock task mode intents.
...
* commit 'c70d0e71c09da0292958d748cedaa5fbacbec74a':
Fix the javadocs for lock task mode intents.
2015-02-12 16:45:06 +00:00
Benjamin Franz
c70d0e71c0
Fix the javadocs for lock task mode intents.
...
Bug: 19363651
Change-Id: Ia0da3ddad587ea842aad19818a62540889d6a9dd
2015-02-12 16:12:58 +00:00
Adam Powell
97e0ba6912
am b73e029f: am 0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev
...
* commit 'b73e029fea53fd5aeaf01ad7ba15560329d8de1c':
Add DENSITY_280
2015-02-12 02:25:29 +00:00
Adam Powell
b73e029fea
am 0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev
...
* commit '0ec652cf72bd8b7f619462f172ac0152d4d6c83d':
Add DENSITY_280
2015-02-12 02:13:03 +00:00
Adam Powell
0ec652cf72
Merge "Add DENSITY_280" into lmp-mr1-dev
2015-02-12 02:08:04 +00:00
Adam Powell
f6d4045d6c
Add DENSITY_280
...
Bug 19350604
Change-Id: I94f5162c31f9c8853908d7c4699974c236cc7fe7
2015-02-11 13:34:43 -08:00
Nick Vaccaro
f5021f6818
Update API to contain new wrist tilt sensor type and string.
...
Convert the wrist tilt sensor from being a vendor-defined sensor
type to being an official android sensor type.
Change-Id: I39807bdca4f4c853fa0f7e88e6d98c02245f2a8b
2015-02-10 20:43:44 +00:00
Svetoslav
cf2c8545bd
am 5521f39f: am c73cfa0f: Accessibiltiy: missed update to the previous patch.
...
* commit '5521f39ff75d2af909061581e27810afaa9ed242':
Accessibiltiy: missed update to the previous patch.
2015-02-10 03:01:50 +00: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
Baligh Uddin
2083173af9
am fbf9666f: am b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
...
* commit 'fbf9666f846284ee1d4d09e2d36f0d2b92120656':
Accessibility: Handle a missed case when clicking focused views.
2015-02-10 01:17:42 +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
Andre Eisenbach
8f31fa81e0
am 3ca77ccf: am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev
...
* commit '3ca77ccf873f12e116a66d1c1a417fe89f75af85':
Add API to check if a Bluetooth connection is encrypted (1/2)
2015-02-10 00:34:43 +00: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
24c02c4186
am d67aff68: am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev
...
* commit 'd67aff686d467c439970aef4a57a29838bf005c2':
Separate the protection of mProxyServiceStateCallbacks from that of mService
2015-02-09 22:07:50 +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
Amith Yamasani
a6318cd7f2
am d09878c1: am 61333d1b: Merge "Limit cache update to packages that have changed" into lmp-mr1-dev
...
* commit 'd09878c13c392b81633f4f748a85718cebd9f325':
Limit cache update to packages that have changed
2015-02-09 20:29:39 +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
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
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
Zhijun He
9f8e82ed96
am f7f13110: Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev automerge: 07c745b
...
* commit 'f7f131105d479d30b53b2366e29278fd09f36065':
camera-metadata: clarify the AE precapture trigger spec
2015-02-08 21:12:44 +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
Bryce Lee
1d97aa4d20
Merge "Allow single press of physical button to go home without sleeping." into lmp-mr1-modular-dev
2015-02-07 00:32:27 +00:00
Svet Ganov
eb642b60e7
am ff9b2525: am 34123f1c: Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev
...
* commit 'ff9b2525db61d4c175d9d61a0847586001cd4a11':
Accessibility: ignore children of a view with node provider.
2015-02-06 23:58:52 +00:00
Svet Ganov
763ce6c0c4
am 41daba00: am 060bca74: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
...
* commit '41daba0052f4a9146aad4977da9eccf3c72450ce':
Accessibility: Handle a missed case when clicking focused views.
2015-02-06 23:58:49 +00:00
Matthew Xie
60675b2273
Separate the protection of mProxyServiceStateCallbacks from that of mService
...
The overuse of mManagerCallback caused a deaklock.
Bug: 19264190
Change-Id: Iff20019ff0c99bb5f36435feb15e43e280a8e102
2015-02-06 14:13:56 -08:00
Svet Ganov
ff9b2525db
am 34123f1c: Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev
...
* commit '34123f1ce83e39a5a6045b1a90a148cd4c514e7e':
Accessibility: ignore children of a view with node provider.
2015-02-06 21:51:15 +00:00
Svet Ganov
41daba0052
am 060bca74: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
...
* commit '060bca7444b8bf34fa95a6a71daf72fa8a85d78e':
Accessibility: Handle a missed case when clicking focused views.
2015-02-06 21:51:11 +00:00
Svet Ganov
34123f1ce8
Merge "Accessibility: ignore children of a view with node provider." into lmp-mr1-dev
2015-02-06 21:49:02 +00:00
Svet Ganov
060bca7444
Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev
2015-02-06 21:46:25 +00:00
Svet Ganov
55bdb10c16
Accessibility: ignore children of a view with node provider.
...
A view that has an accessibility node provider should not have real children
since the provider is responsible to generate the node infos for the subtree
rooted at its hosting view. This is how the APIs are designed to work. However,
it is a common mistake and if this occurs the accessibility services
introspecting the screen get into an infinite loop.
The framework now does not add the real children of a view with a node provider
to the list of accessibility children. If the developer wants them exposed they
have to do that via the provider APIs as per contract.
bug:19297093
Change-Id: I1b01b1e4a85e1c397886fcd2506b434beb063687
2015-02-06 12:41:21 -08:00
Bryce Lee
53b9fbd161
Expose userActivityTimeout through @SystemApi getter/setter.
...
This reverts commit 0dad572090 .
System api documentation is not updated under PDK builds.
Change-Id: I851bcd66e0b764265e69ac104d5604bf316d5d10
2015-02-06 12:06:34 -08:00
Bryce Lee
13c7044186
Merge "Revert "Expose userActivityTimeout through @SystemApi getter/setter."" into lmp-mr1-modular-dev
2015-02-06 19:35:43 +00:00
Bryce Lee
0dad572090
Revert "Expose userActivityTimeout through @SystemApi getter/setter."
...
This reverts commit 40a0ee65f2 .
Change-Id: Ida1a40db25643f97e82d517bcf147f23e4a3a0fe
2015-02-06 19:35:33 +00:00
Bryce Lee
4a88acfcc3
Merge "Make THEATER_MODE_ON a System API." into lmp-mr1-modular-dev
2015-02-06 19:05:45 +00:00
Bryce Lee
4cccd58e42
Merge "Expose userActivityTimeout through @SystemApi getter/setter." into lmp-mr1-modular-dev
2015-02-06 19:05:22 +00:00
Svet Ganov
0a2cceebd5
Accessibility: Handle a missed case when clicking focused views.
...
The clicking logic was missing the case where a child of the accessibility
focused view reacts to the injected down up events for clicking. This
results of a whole class of views being non-interactive. Now if an event
is targeting accessibility focus and the dispatching view group has this
focus, we clear the flag before dispatching to children, so they can
handle the event rather ignoring it becuase they are not accessibility
focused.
bug:19252492
Change-Id: I6ac25bb7a50b35bb638ca4bfb9fc4198d08c2d4d
2015-02-06 10:23:33 -08:00
Neil Fuller
022cf57f82
am a08934cf: am f789d45b: Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev
...
* commit 'a08934cf54e3120d5019839a4b6d553b3364e8d1':
Avoid static initialization of Layout from TextUtils
2015-02-06 17:44:49 +00:00
Neil Fuller
a08934cf54
am f789d45b: Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev
...
* commit 'f789d45b24acc3745ccc97adb687502d488404f6':
Avoid static initialization of Layout from TextUtils
2015-02-06 17:37:32 +00:00
Neil Fuller
f789d45b24
Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev
2015-02-06 17:30:47 +00:00
Kenny Guy
b6332fd21a
am 70fb0ab4: am 8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev
...
* commit '70fb0ab44e1b8d56f2cbe33d73afd3897c7584d1':
Fix mangled javadoc for setPermittedInputMethods.
2015-02-06 15:37:53 +00:00
Kenny Guy
70fb0ab44e
am 8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev
...
* commit '8debf21357477083a716275e2a32cb7169d42c47':
Fix mangled javadoc for setPermittedInputMethods.
2015-02-06 15:28:21 +00:00