OSDN Git Service
Jim Miller [Fri, 30 Aug 2013 02:13:41 +0000 (19:13 -0700)]
am
0d72b3e0: Merge "Disable hotword detection on low-memory devices" into klp-dev
* commit '
0d72b3e052e6289936286af6506bfd9fa8f7646b':
Disable hotword detection on low-memory devices
Jim Miller [Fri, 30 Aug 2013 02:12:26 +0000 (02:12 +0000)]
Merge "Disable hotword detection on low-memory devices" into klp-dev
Jim Miller [Fri, 30 Aug 2013 01:58:21 +0000 (18:58 -0700)]
Disable hotword detection on low-memory devices
Change-Id: If21f852af36a8f6dea17f3a87b22f39db3d1d6e8
John Spurlock [Fri, 30 Aug 2013 01:10:27 +0000 (18:10 -0700)]
am
8f1f0109: Remove unused status bar help and obsolete resources.
* commit '
8f1f0109d3c124bfcb09c99e69e6ad51b8208c24':
Remove unused status bar help and obsolete resources.
John Spurlock [Fri, 30 Aug 2013 00:47:03 +0000 (20:47 -0400)]
Remove unused status bar help and obsolete resources.
Bug:
10502089
Change-Id: I813244c4d5535256a56b242b92e6373edbbaba93
Matthew Williams [Fri, 30 Aug 2013 00:26:48 +0000 (17:26 -0700)]
am
fda4698c: Merge "Turn off debugging in SyncManager" into klp-dev
* commit '
fda4698c255075d7f0209834b364dfe344e3ee75':
Turn off debugging in SyncManager
Matthew Williams [Fri, 30 Aug 2013 00:24:11 +0000 (00:24 +0000)]
Merge "Turn off debugging in SyncManager" into klp-dev
Jason Sams [Fri, 30 Aug 2013 00:06:07 +0000 (17:06 -0700)]
am
c2b582c0: Merge "Cleanup API typo" into klp-dev
* commit '
c2b582c0b63df855a7492db3fb00dd194bf86fe3':
Cleanup API typo
Jason Sams [Fri, 30 Aug 2013 00:03:35 +0000 (00:03 +0000)]
Merge "Cleanup API typo" into klp-dev
Jason Sams [Fri, 30 Aug 2013 00:00:37 +0000 (17:00 -0700)]
Cleanup API typo
bug
10548782
Change-Id: I3654b7d1f8ea10eb51006804248cc2a7d20eabb0
Robert Greenwalt [Thu, 29 Aug 2013 23:22:22 +0000 (16:22 -0700)]
am
1c7674ef: Merge "Don\'t show roaming icon for specific operators" into klp-dev
* commit '
1c7674ef55d283bf253973a6c6b738423f2e0a05':
Don't show roaming icon for specific operators
Robert Greenwalt [Thu, 29 Aug 2013 23:17:49 +0000 (23:17 +0000)]
Merge "Don't show roaming icon for specific operators" into klp-dev
Svetoslav Ganov [Thu, 29 Aug 2013 23:02:22 +0000 (16:02 -0700)]
am
86d2db97: Merge "Print spooler security and some new print service facing APIs." into klp-dev
* commit '
86d2db9750657401deadea6766c94300c3bfc7cd':
Print spooler security and some new print service facing APIs.
Svetoslav Ganov [Thu, 29 Aug 2013 22:59:08 +0000 (22:59 +0000)]
Merge "Print spooler security and some new print service facing APIs." into klp-dev
Adam Powell [Thu, 29 Aug 2013 22:41:23 +0000 (15:41 -0700)]
am
27439903: Merge "GridLayout changes for API council" into klp-dev
* commit '
27439903438abfb24f5c36151386e723f2e57ebc':
GridLayout changes for API council
Svetoslav Ganov [Wed, 28 Aug 2013 21:37:54 +0000 (14:37 -0700)]
Print spooler security and some new print service facing APIs.
1. Updated the security mode of the print spooler. Now the spooler
is not signed with the system key, it is not a privileged app so if
it gets compromised (PDF rendering is a potential attack vector)
it cannot access dangerous permissions. Also only the system
can bind to the spooler.
2. Added APIs for asking a print service to start and stop tracking
a given printer. This is need for the case when the user selects
the printer and the print service should do a best effort to keep
the system updated for the current state of the printer.
3. Added APIs for putting a print job in a blocked state. A print
service would report the print job as blocked if for some reason
the printer cannot proceed, e.g. 99 pages are printed but there
is no paper for the last one. The user has to add more paper
and the print service can resume the job.
4. Changed the read/write APIs to use ParcelFileDescriptor instead
of FileDescriptor since the latter does not have a clean API for
detaching the wrapped Linux file descriptor when one wants to
push it to native.
5. Added API for getting the size of the printed document so the
print service can avoid handling big filed over cellular network
or ask the user if needed.
6. Now the print services that are preinstalled on the system image
are automatically enabled.
Change-Id: Ia06c311d3d21cabb9e1368f13928e11cd0030918
Adam Powell [Thu, 29 Aug 2013 22:38:24 +0000 (22:38 +0000)]
Merge "GridLayout changes for API council" into klp-dev
Matthew Williams [Thu, 29 Aug 2013 20:41:15 +0000 (13:41 -0700)]
Turn off debugging in SyncManager
Bug:
10549076
Change-Id: I63ad8af5fbe8736eb7ca8307a4beef5310a1c10c
Kenny Root [Thu, 29 Aug 2013 22:24:57 +0000 (15:24 -0700)]
am
9c83b968: am
85b666c3: Merge "Use core-tests-support instead of core-tests"
* commit '
9c83b96859a67080101823c91ef7617c3b12354e':
Use core-tests-support instead of core-tests
quddusc [Thu, 29 Aug 2013 22:17:46 +0000 (15:17 -0700)]
am
93c84e82: am
ee9d38ff: am
40765a4a: am
2ef3952d: cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
* commit '
93c84e8242fed75f838b53beea2b3116c4d3276a':
cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
quddusc [Thu, 29 Aug 2013 22:16:01 +0000 (15:16 -0700)]
am
ee9d38ff: am
40765a4a: am
2ef3952d: cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
* commit '
ee9d38ff24358774d194108128e99f09d08ddf8e':
cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
Wink Saville [Thu, 29 Aug 2013 22:14:02 +0000 (15:14 -0700)]
am
35bd30b1: Merge "Merge commit \'
270226b0\' into manualmerge" into klp-dev
* commit '
35bd30b184b321754697b992aa5c581e204d530a':
Add support for handling mobile provisioning networks.
Wink Saville [Thu, 29 Aug 2013 22:10:51 +0000 (22:10 +0000)]
Merge "Merge commit '
270226b0' into manualmerge" into klp-dev
Adam Powell [Thu, 29 Aug 2013 21:56:51 +0000 (14:56 -0700)]
GridLayout changes for API council
* Hide set/getPrinter methods. A change/addition like this should
happen for all views if it happens, not just for one specific view.
* Follow Android style guidelines for fields.
Bug
10549037
Change-Id: I1823d7bbbd8bcc678c5be2358ca23a8dc6dbfd15
(cherry picked from commit
916159461bf17e13c245a709935a0d1133e0ed91)
Wink Saville [Thu, 29 Aug 2013 21:57:08 +0000 (14:57 -0700)]
Merge commit '
270226b0' into manualmerge
* commit '
270226b0':
Add support for handling mobile provisioning networks.
Conflicts:
core/java/android/net/CaptivePortalTracker.java
core/java/android/net/ConnectivityManager.java
core/java/android/net/IConnectivityManager.aidl
core/java/android/net/MobileDataStateTracker.java
core/res/AndroidManifest.xml
services/java/com/android/server/ConnectivityService.java
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
Kenny Root [Thu, 29 Aug 2013 21:52:34 +0000 (14:52 -0700)]
am
85b666c3: Merge "Use core-tests-support instead of core-tests"
* commit '
85b666c3b61fd9a64731b144f00abe91e19cfe54':
Use core-tests-support instead of core-tests
Kenny Root [Thu, 29 Aug 2013 21:49:32 +0000 (21:49 +0000)]
Merge "Use core-tests-support instead of core-tests"
Amith Yamasani [Thu, 29 Aug 2013 21:49:28 +0000 (14:49 -0700)]
am
79a45c6f: Merge "Improve Intent disambig dialog behavior" into klp-dev
* commit '
79a45c6f1837d5921e512213904c96660b1a80b1':
Improve Intent disambig dialog behavior
Amith Yamasani [Thu, 29 Aug 2013 21:45:04 +0000 (21:45 +0000)]
Merge "Improve Intent disambig dialog behavior" into klp-dev
Kenny Root [Thu, 29 Aug 2013 21:27:20 +0000 (14:27 -0700)]
Use core-tests-support instead of core-tests
The core-tests-support library is newly created. It doesn't have any
tests itself but some support for tests that need to use mocked classes
for testing. In this case, some tests are using TestKeyStore for SSL
testing in frameworks tests.
Change-Id: I70dc31c9fcddf256b515e2c16f581648bc8cf880
Jason Sams [Thu, 29 Aug 2013 21:26:29 +0000 (14:26 -0700)]
am
6b115980: Merge "Unhide USAGE_IO_INPUT functions" into klp-dev
* commit '
6b115980483ec20cc3f7817c76dfea18c49a48f3':
Unhide USAGE_IO_INPUT functions
Jason Sams [Thu, 29 Aug 2013 21:24:28 +0000 (21:24 +0000)]
Merge "Unhide USAGE_IO_INPUT functions" into klp-dev
Craig Mautner [Thu, 29 Aug 2013 21:17:34 +0000 (14:17 -0700)]
am
a78d9a24: Merge "Reset activity\'s "return to home" flag on relaunch" into klp-dev
* commit '
a78d9a24d97818a6c9c071483d7854b560ecf228':
Reset activity's "return to home" flag on relaunch
Craig Mautner [Thu, 29 Aug 2013 21:14:30 +0000 (21:14 +0000)]
Merge "Reset activity's "return to home" flag on relaunch" into klp-dev
Martijn Coenen [Thu, 29 Aug 2013 21:06:22 +0000 (14:06 -0700)]
am
a6dcf1a2: Merge "Add an API for querying HCE service selection mode." into klp-dev
* commit '
a6dcf1a2d634bd8c26b6a5744fc38874bcac6dd9':
Add an API for querying HCE service selection mode.
Martijn Coenen [Thu, 29 Aug 2013 21:01:16 +0000 (21:01 +0000)]
Merge "Add an API for querying HCE service selection mode." into klp-dev
Jason Sams [Thu, 29 Aug 2013 20:30:59 +0000 (13:30 -0700)]
Unhide USAGE_IO_INPUT functions
Change-Id: I9c1a7e5d65adee133b99b9a94729ab0b3d5a097f
Martijn Coenen [Thu, 29 Aug 2013 02:23:41 +0000 (19:23 -0700)]
Add an API for querying HCE service selection mode.
This allows applications to differentiate between
the case where another app is the default, or the
case where the selection mode is "Ask every time".
Also, parse new requireDeviceUnlock attribute in
ApduServiceInfo.
Bug:
10262585
Change-Id: Icac508fe00054132574731532c05a1138edb24f5
Martijn Coenen [Thu, 29 Aug 2013 19:57:33 +0000 (12:57 -0700)]
am
c9c5d57e: Merge "Add requireDeviceUnlock attribute for NFC HCE." into klp-dev
* commit '
c9c5d57e4e900573b8f8b65af4215cb45b48ce93':
Add requireDeviceUnlock attribute for NFC HCE.
Martijn Coenen [Thu, 29 Aug 2013 19:56:00 +0000 (19:56 +0000)]
Merge "Add requireDeviceUnlock attribute for NFC HCE." into klp-dev
Craig Mautner [Thu, 29 Aug 2013 19:24:56 +0000 (12:24 -0700)]
Reset activity's "return to home" flag on relaunch
When relaunching an activity re-evaluate the flag that determines
whether to return to the next activity on the stack or to the home
activity upon return.
Fixes bug
10545580.
Change-Id: I5868ce1b494afffcc5afc22abe3b65aa339827bb
Sungmin Choi [Fri, 19 Jul 2013 04:36:29 +0000 (13:36 +0900)]
Don't show roaming icon for specific operators
bug:
9896815
bug:
10100304
bug:
10097969
bug:
10101601
Conflicts:
core/res/res/values/config.xml
Change-Id: I6165f42b2a3d7f4bbd16c97f7a2b8760a688e2d4
Igor Murashkin [Thu, 29 Aug 2013 19:03:27 +0000 (12:03 -0700)]
am
c7d515aa: Merge "media: ImageReader throws OutOfResourcesException when out of buffers" into klp-dev
* commit '
c7d515aa219a93dc487de2a1bd762897602160c7':
media: ImageReader throws OutOfResourcesException when out of buffers
Igor Murashkin [Thu, 29 Aug 2013 18:59:10 +0000 (18:59 +0000)]
Merge "media: ImageReader throws OutOfResourcesException when out of buffers" into klp-dev
quddusc [Thu, 29 Aug 2013 18:57:52 +0000 (11:57 -0700)]
am
40765a4a: am
2ef3952d: cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
* commit '
40765a4a5300914e8c7ce7ed6397cec7ab8d78a1':
cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
Vineeta Srivastava [Thu, 29 Aug 2013 18:44:03 +0000 (11:44 -0700)]
am
4fa9204d: Merge "uicc : add config_stkNoAlphaUsrCnf to config.xml" into klp-dev
* commit '
4fa9204d0f28ba3823ec9f4c8a9912a416eee397':
uicc : add config_stkNoAlphaUsrCnf to config.xml
Vineeta Srivastava [Thu, 29 Aug 2013 18:41:27 +0000 (18:41 +0000)]
Merge "uicc : add config_stkNoAlphaUsrCnf to config.xml" into klp-dev
duho.ro [Wed, 10 Jul 2013 03:01:06 +0000 (12:01 +0900)]
uicc : add config_stkNoAlphaUsrCnf to config.xml
Per 3GPP specification 102.223,
if the alpha identifier is not provided by the UICC,
the terminal MAY give information to the user.
set to false if we need to show user confirmation
when alpha identifier is not provided by the UICC.
Change-Id: Iece01f3775baf2c6438776f899ed53b1f1fb942f
Conflicts:
core/res/res/values/config.xml
quddusc [Thu, 29 Aug 2013 18:12:44 +0000 (11:12 -0700)]
am
2ef3952d: cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
* commit '
2ef3952d8e62b71baca176b3e17315a37facd34a':
cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
John Spurlock [Thu, 29 Aug 2013 18:05:48 +0000 (11:05 -0700)]
am
e87bc32e: Merge "More SystemUI asset updates." into klp-dev
* commit '
e87bc32e6d6991b1de72e914f268efc276837e47':
More SystemUI asset updates.
John Spurlock [Thu, 29 Aug 2013 18:03:58 +0000 (18:03 +0000)]
Merge "More SystemUI asset updates." into klp-dev
Geoffrey Borggaard [Thu, 29 Aug 2013 17:57:50 +0000 (10:57 -0700)]
am
06b9bb0c: Merge "UserManagerService upgrades users on first restart." into klp-dev
* commit '
06b9bb0c813b3d7f93d4069b97cd255f329c4c37':
UserManagerService upgrades users on first restart.
Isaac Katzenelson [Thu, 29 Aug 2013 17:57:47 +0000 (10:57 -0700)]
am
1d04b640: Merge "Add ACTION_SHOW_ALARMS to Clock API" into klp-dev
* commit '
1d04b640ec97e31b8d4fbef134a5b7f083eac9b7':
Add ACTION_SHOW_ALARMS to Clock API
John Spurlock [Thu, 29 Aug 2013 17:56:31 +0000 (13:56 -0400)]
More SystemUI asset updates.
White close handles, a few missed xx items.
Bug:
10502089
Change-Id: I788f3698249e72c3df3d039c68b438998db1b978
Geoffrey Borggaard [Thu, 29 Aug 2013 17:54:37 +0000 (17:54 +0000)]
Merge "UserManagerService upgrades users on first restart." into klp-dev
quddusc [Fri, 21 Jun 2013 23:49:46 +0000 (16:49 -0700)]
cherrypick from jb-mr2-docs docs: Android training for Activity testing. Change-Id: I7167732c849d5a4a36c808cc852ddfcdc8e60bd7
Change-Id: Idce540108d048d76fc2c4bc37ecf2118b82588c5
Isaac Katzenelson [Thu, 29 Aug 2013 17:52:31 +0000 (17:52 +0000)]
Merge "Add ACTION_SHOW_ALARMS to Clock API" into klp-dev
Sam Blitzstein [Wed, 28 Aug 2013 22:44:03 +0000 (15:44 -0700)]
Add ACTION_SHOW_ALARMS to Clock API
Add in an action to jump to the alarms page of a clock app.
Helpful for quick settings, for example.
Bug:
10506871
Change-Id: Ia18708c7962543911864dfaefa17d5356eed1b45
Wink Saville [Thu, 29 Aug 2013 17:26:06 +0000 (10:26 -0700)]
am
8cb2f42e: am
948282b0: Add support for handling mobile provisioning networks.
* commit '
8cb2f42eea2ef3b249528aa7913fc7a6dfc6b741':
Add support for handling mobile provisioning networks.
Wink Saville [Thu, 29 Aug 2013 17:22:55 +0000 (10:22 -0700)]
am
948282b0: Add support for handling mobile provisioning networks.
* commit '
948282b0e6cf5310f09db97a4ae939db7c1cef72':
Add support for handling mobile provisioning networks.
Leon Scroggins III [Thu, 29 Aug 2013 17:22:48 +0000 (10:22 -0700)]
am
4b299312: Merge "Replace stream wrap-function w/ more specific ones" into klp-dev
* commit '
4b2993123bf9a1c56d0a16b032612834dd418520':
Replace stream wrap-function w/ more specific ones
Leon Scroggins III [Thu, 29 Aug 2013 17:12:00 +0000 (17:12 +0000)]
Merge "Replace stream wrap-function w/ more specific ones" into klp-dev
Geoffrey Borggaard [Thu, 29 Aug 2013 02:11:10 +0000 (22:11 -0400)]
UserManagerService upgrades users on first restart.
This causes all restriction pins to be reset.
Bug:
10535070
Change-Id: Ia2abf904505514d7e555b420c2b032a0094e0643
Wink Saville [Thu, 29 Aug 2013 15:55:16 +0000 (08:55 -0700)]
Add support for handling mobile provisioning networks.
When a sim is new or it has expired it needs to be provisioned
with the carrier. Basically provisioning is associating a sim with
a user account. When a sim isn't provisioned then operators will
restrict access to the network and only allow certain addresses
or services to be used.
This set of changes allows two types of provisioning networks to be
recognized. The first is a network that causes all DNS lookups to be
redirected to a different address than was intended. This is exemplified
by how T-Mobile works.
The second technique uses a special apn for provisioning. An example is
AT&T where lwaactivate is the provisioning apn and broadband is the
normal apn. We first try broadband and if we are unable to connect we
try lwaactivate. When we see the activate we identify it as special and
the ApnContext.isProvisioningApn will return true.
In the future our plan is to create a new network type that can be added
to the apn list, but for now it identified by name.
Here is a list of significant changes:
- CaptivePortalTracker now only test WiFi networks instead of all networks
- checkMobileProvisioning checks for provisioning networks and doesn't
try to ping.
- IConnectivityManager.aidl changes:
* getProvisioningOrActiveNetworkInfo was added to and used by Manage
mobile plan in WirelessSettings so even when there is no active
network it will still allow provisioning. Otherwise it would report
no internet connection.
* setSignInErrorNotificationVisible is used by both
CaptiviePortalTracker and checkMobileProvisioning so they use the
same code for the notifications.
* checkMobileProvisioning was simplified to have only a timeout as
returning the result is now harder as we abort simultaneous call
otherwise we'd could get into loops because we now check every time
we connect to mobile.
- Enhanced MDST to handle the provisioning network.
- Added CONNECTED_TO_PROVISIONING_NETWORK to NetworkInfo to make a new
state so we don't announce to the world we're connected.
- TelephonyIntents.ACTION_DATA_CONNECTION_CONNECTED_TO_PROVISIONING_APN
is sent by the low level data connection code to notify Connectivity
Service that a provisioning apn has connected. This allows CS to
handle the connection differently than a normal connection.
Bug:
10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
Brian Carlstrom [Thu, 29 Aug 2013 07:10:56 +0000 (00:10 -0700)]
resolved conflicts for merge of
7be3a138 to klp-dev-plus-aosp
Change-Id: If562a3203b4e737c685ec533f2d8773cae7f16ac
Jeff Hao [Thu, 22 Aug 2013 22:53:12 +0000 (15:53 -0700)]
Add frameworks support for sample profiling from traceview gui.
(cherry picked from commit
ca307d3138ff1e5d0bcf190eb24f3b8dbcabfaa9)
Change-Id: I3553bafe24ac8deb4fa3f9a4d78939c3848b3850
Jeff Sharkey [Thu, 29 Aug 2013 04:32:08 +0000 (21:32 -0700)]
am
9fd81a90: Merge "Stronger DocumentsProvider contract." into klp-dev
* commit '
9fd81a9008d5c8dd33272b6a451d89fa2fa1841e':
Stronger DocumentsProvider contract.
Jeff Sharkey [Thu, 29 Aug 2013 04:27:02 +0000 (04:27 +0000)]
Merge "Stronger DocumentsProvider contract." into klp-dev
Jeff Sharkey [Wed, 28 Aug 2013 01:26:48 +0000 (18:26 -0700)]
Stronger DocumentsProvider contract.
Using a contract class requires that a provider implement it exactly
with little help. This change introduces a DocumentsProvider abstract
class that provides a client-side implementation of the contract that
greatly reduces developer burden, and improves correctness.
This also moves to first-class DocumentRoot objects, and moves calls
with complex side effects to be ContentProvider.call() invocations,
offering more granular permission control over Uri operations that
shouldn't be available through Uri grants.
This new design also relaxes the requirement that root information be
burned into every Uri. Migrate ExternalDocumentsProvider and
DocumentsUI to adopt new API.
Bug:
10497206
Change-Id: I6f2b3f519bfd62a9d693223ea5628a971ce2e743
Baligh Uddin [Thu, 29 Aug 2013 03:09:15 +0000 (20:09 -0700)]
am
166853e6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
166853e6c90abe84c556a574589419f576c5e986':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 03:09:11 +0000 (20:09 -0700)]
am
5c776270: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
5c7762707733fc2001a7cb62a3daf51bc111d7db':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 03:09:08 +0000 (20:09 -0700)]
am
9c359755: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
9c3597554686ab3a9fc73ab236c8c4ac31bc5083':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 29 Aug 2013 03:06:07 +0000 (03:06 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 29 Aug 2013 03:04:13 +0000 (03:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 29 Aug 2013 03:04:00 +0000 (03:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 29 Aug 2013 01:35:58 +0000 (18:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I665172800a06d780b92a5db2ab549980c87e8524
Auto-generated-cl: translation import
Alan Viverette [Thu, 29 Aug 2013 01:17:31 +0000 (18:17 -0700)]
am
b432ca60: Merge "Fix documentation regarding defStyle in View constructor" into klp-dev
* commit '
b432ca60c6c7af42989db28594137f6fe1e888b4':
Fix documentation regarding defStyle in View constructor
Alan Viverette [Thu, 29 Aug 2013 01:15:48 +0000 (01:15 +0000)]
Merge "Fix documentation regarding defStyle in View constructor" into klp-dev
Baligh Uddin [Thu, 29 Aug 2013 01:05:47 +0000 (18:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic6b1048f4afaa520fea602ec4367de5e192186bd
Auto-generated-cl: translation import
John Spurlock [Thu, 29 Aug 2013 01:04:25 +0000 (18:04 -0700)]
am
ab8fe692: Merge "Rename hideybars constant to SYSTEM_UI_FLAG_IMMERSIVE." into klp-dev
* commit '
ab8fe692961bb3bf71169fd7a43aff4de837ab26':
Rename hideybars constant to SYSTEM_UI_FLAG_IMMERSIVE.
John Spurlock [Thu, 29 Aug 2013 01:00:03 +0000 (01:00 +0000)]
Merge "Rename hideybars constant to SYSTEM_UI_FLAG_IMMERSIVE." into klp-dev
Robert Greenwalt [Thu, 29 Aug 2013 00:54:20 +0000 (17:54 -0700)]
am
9fe5b28d: Merge "More elaborate logs to debug missing APs" into klp-dev
* commit '
9fe5b28dc2a187f5974e42ac61841b46a5d91236':
More elaborate logs to debug missing APs
Robert Greenwalt [Thu, 29 Aug 2013 00:51:35 +0000 (00:51 +0000)]
Merge "More elaborate logs to debug missing APs" into klp-dev
Baligh Uddin [Thu, 29 Aug 2013 00:36:17 +0000 (17:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I22efa95394f7b572df2b43138fee45bd7eaf4229
Auto-generated-cl: translation import
Alan Viverette [Wed, 28 Aug 2013 23:57:42 +0000 (16:57 -0700)]
Fix documentation regarding defStyle in View constructor
BUG:
8912583
Change-Id: Ib8b1f8baa4ee98aae0e66edc547ab014b2401415
Sandeep Siddhartha [Wed, 28 Aug 2013 23:57:34 +0000 (16:57 -0700)]
am
720959cc: Merge "Start using the Hotword recognition APIs" into klp-dev
* commit '
720959cc7f9fffb45a57b928c66a045bfc256a7c':
Start using the Hotword recognition APIs
Chet Haase [Wed, 28 Aug 2013 23:57:31 +0000 (16:57 -0700)]
am
52485b0b: Merge "Better transition interruption and TextChange fixes" into klp-dev
* commit '
52485b0b7ef066241371393dc6060bccd090a222':
Better transition interruption and TextChange fixes
Sandeep Siddhartha [Wed, 28 Aug 2013 23:55:57 +0000 (23:55 +0000)]
Merge "Start using the Hotword recognition APIs" into klp-dev
Chet Haase [Wed, 28 Aug 2013 23:55:10 +0000 (23:55 +0000)]
Merge "Better transition interruption and TextChange fixes" into klp-dev
Isaac Katzenelson [Wed, 28 Aug 2013 23:54:02 +0000 (16:54 -0700)]
am
18f590a9: Merge "Remove EXTRA_DELETE_AFTER_USE and update descriptions accordingly." into klp-dev
* commit '
18f590a9b7d2690e5f4189d8d0c025ff1a5bf199':
Remove EXTRA_DELETE_AFTER_USE and update descriptions accordingly.
Chet Haase [Tue, 27 Aug 2013 23:06:26 +0000 (16:06 -0700)]
Better transition interruption and TextChange fixes
Previously, the TextChange transition didn't handle interruption/
cancellation at all, which made it problematic to use in any real
situation where a transition might get interrupted mid-animation.
Also, the way that it side-effected the text of TextView objects caused
errors in the UI when the transition was interrupted, because it would
not clean up after itself properly as new transitions queried the
current state of the UI.
Also, the prior cancellation logic for all transitions was not quite
correct; we were pausing transitions but resuming the animations, making it
tricky to write transitions that would restore state correctly.
Change-Id: I5a9f3c915e9834ec59ce1e1c3c96a88d11e4aa1b
Isaac Katzenelson [Wed, 28 Aug 2013 23:49:41 +0000 (23:49 +0000)]
Merge "Remove EXTRA_DELETE_AFTER_USE and update descriptions accordingly." into klp-dev
Sandeep Siddhartha [Wed, 28 Aug 2013 23:43:41 +0000 (16:43 -0700)]
am
bd31a483: Merge "Tweak the HotwordRecognizer API" into klp-dev
* commit '
bd31a483d358b02e4a16949b576560d4e0672ea3':
Tweak the HotwordRecognizer API
Sandeep Siddhartha [Tue, 27 Aug 2013 03:58:53 +0000 (20:58 -0700)]
Start using the Hotword recognition APIs
- Gets rid of all assumptions about the hotword service
- Fixes bug where the hotword detection would keep running accidentally
even when the screen got turned off
Change-Id: Ie86c1a4f4343bdf7e61f7c21114fd3b287bd5401
Sandeep Siddhartha [Wed, 28 Aug 2013 23:38:53 +0000 (23:38 +0000)]
Merge "Tweak the HotwordRecognizer API" into klp-dev
Sandeep Siddhartha [Tue, 27 Aug 2013 20:09:41 +0000 (13:09 -0700)]
Tweak the HotwordRecognizer API
- Make it more intuitive by enforcing callers to set a listener while
starting recognition
- Fix TODO to resolve the ComponentName if none is provided
- Unbind from the Hotword service if stopRecognition is called
- Get rid of the callback in onStopHotwordRecognition
Change-Id: I8edad0ef0f3671283aeb51eaed1d3b8dab01baa0
Mindy Pereira [Wed, 28 Aug 2013 23:10:36 +0000 (16:10 -0700)]
am
dd9b079c: Merge "Fix case when user touches the very edge of a view" into klp-dev
* commit '
dd9b079cdf57f13f38d2700f05650fd04d4009d6':
Fix case when user touches the very edge of a view
Mindy Pereira [Wed, 28 Aug 2013 23:08:53 +0000 (23:08 +0000)]
Merge "Fix case when user touches the very edge of a view" into klp-dev
Mindy Pereira [Wed, 28 Aug 2013 22:00:14 +0000 (15:00 -0700)]
Fix case when user touches the very edge of a view
This now counts touches at the exact top edge of the view as valid
Change-Id: I9e81a7001632c38d567dde40954e079e7145fa36
Vinit Deshapnde [Wed, 28 Aug 2013 20:13:40 +0000 (13:13 -0700)]
More elaborate logs to debug missing APs
Bug:
10375978
Change-Id: Ic9bb8f3a7a0684143e4e77f8da0d2c833293c94a