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

111541 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martijn Coenen
ff8ec5c56f am c9c5d57e: Merge "Add requireDeviceUnlock attribute for NFC HCE." into klp-dev 
* commit 'c9c5d57e4e900573b8f8b65af4215cb45b48ce93':
  Add requireDeviceUnlock attribute for NFC HCE.
 2013-08-29 12:57:33 -07:00
Martijn Coenen
c9c5d57e4e Merge "Add requireDeviceUnlock attribute for NFC HCE." into klp-dev 2013-08-29 19:56:01 +00:00
Igor Murashkin
d5d91948cd am c7d515aa: Merge "media: ImageReader throws OutOfResourcesException when out of buffers" into klp-dev 
* commit 'c7d515aa219a93dc487de2a1bd762897602160c7':
  media: ImageReader throws OutOfResourcesException when out of buffers
 2013-08-29 12:03:27 -07:00
Igor Murashkin
c7d515aa21 Merge "media: ImageReader throws OutOfResourcesException when out of buffers" into klp-dev 2013-08-29 18:59:10 +00:00
Vineeta Srivastava
1aa646113d am 4fa9204d: Merge "uicc : add config_stkNoAlphaUsrCnf to config.xml" into klp-dev 
* commit '4fa9204d0f28ba3823ec9f4c8a9912a416eee397':
  uicc : add config_stkNoAlphaUsrCnf to config.xml
 2013-08-29 11:44:03 -07:00
Vineeta Srivastava
4fa9204d0f Merge "uicc : add config_stkNoAlphaUsrCnf to config.xml" into klp-dev 2013-08-29 18:41:27 +00:00
duho.ro
54ad798aef 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
 2013-08-29 11:35:09 -07:00
John Spurlock
47a41af510 am e87bc32e: Merge "More SystemUI asset updates." into klp-dev 
* commit 'e87bc32e6d6991b1de72e914f268efc276837e47':
  More SystemUI asset updates.
 2013-08-29 11:05:48 -07:00
John Spurlock
e87bc32e6d Merge "More SystemUI asset updates." into klp-dev 2013-08-29 18:03:58 +00:00
Geoffrey Borggaard
114bf32f9c am 06b9bb0c: Merge "UserManagerService upgrades users on first restart." into klp-dev 
* commit '06b9bb0c813b3d7f93d4069b97cd255f329c4c37':
  UserManagerService upgrades users on first restart.
 2013-08-29 10:57:50 -07:00
Isaac Katzenelson
87fe4c28d3 am 1d04b640: Merge "Add ACTION_SHOW_ALARMS to Clock API" into klp-dev 
* commit '1d04b640ec97e31b8d4fbef134a5b7f083eac9b7':
  Add ACTION_SHOW_ALARMS to Clock API
 2013-08-29 10:57:47 -07:00
John Spurlock
fc3c06ef21 More SystemUI asset updates. 
White close handles, a few missed xx items.

Bug:10502089
Change-Id: I788f3698249e72c3df3d039c68b438998db1b978
 2013-08-29 13:56:31 -04:00
Geoffrey Borggaard
06b9bb0c81 Merge "UserManagerService upgrades users on first restart." into klp-dev 2013-08-29 17:54:37 +00:00
Isaac Katzenelson
1d04b640ec Merge "Add ACTION_SHOW_ALARMS to Clock API" into klp-dev 2013-08-29 17:52:32 +00:00
Sam Blitzstein
2f7acd19be 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
 2013-08-29 10:49:57 -07:00
Leon Scroggins III
af1725190f am 4b299312: Merge "Replace stream wrap-function w/ more specific ones" into klp-dev 
* commit '4b2993123bf9a1c56d0a16b032612834dd418520':
  Replace stream wrap-function w/ more specific ones
 2013-08-29 10:22:48 -07:00
Leon Scroggins III
4b2993123b Merge "Replace stream wrap-function w/ more specific ones" into klp-dev 2013-08-29 17:12:01 +00:00
Geoffrey Borggaard
15b8b2c068 UserManagerService upgrades users on first restart. 
This causes all restriction pins to be reset.

Bug: 10535070
Change-Id: Ia2abf904505514d7e555b420c2b032a0094e0643
 2013-08-29 13:07:49 -04:00
Brian Carlstrom
2b8408dab1 resolved conflicts for merge of 7be3a138 to klp-dev-plus-aosp 
Change-Id: If562a3203b4e737c685ec533f2d8773cae7f16ac
 2013-08-29 00:10:56 -07:00
Jeff Hao
7be3a138d5 Add frameworks support for sample profiling from traceview gui. 
(cherry picked from commit ca307d3138ff1e5d0bcf190eb24f3b8dbcabfaa9)

Change-Id: I3553bafe24ac8deb4fa3f9a4d78939c3848b3850
 2013-08-28 22:13:17 -07:00
Jeff Sharkey
6607275b3a am 9fd81a90: Merge "Stronger DocumentsProvider contract." into klp-dev 
* commit '9fd81a9008d5c8dd33272b6a451d89fa2fa1841e':
  Stronger DocumentsProvider contract.
 2013-08-28 21:32:08 -07:00
Jeff Sharkey
9fd81a9008 Merge "Stronger DocumentsProvider contract." into klp-dev 2013-08-29 04:27:02 +00:00
Jeff Sharkey
aeb16e2435 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
 2013-08-28 20:49:42 -07:00
Baligh Uddin
28b8eb91bc am 166853e6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '166853e6c90abe84c556a574589419f576c5e986':
  Import translations. DO NOT MERGE
 2013-08-28 20:09:15 -07:00
Baligh Uddin
8432461f6e am 5c776270: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '5c7762707733fc2001a7cb62a3daf51bc111d7db':
  Import translations. DO NOT MERGE
 2013-08-28 20:09:11 -07:00
Baligh Uddin
141e2d3444 am 9c359755: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '9c3597554686ab3a9fc73ab236c8c4ac31bc5083':
  Import translations. DO NOT MERGE
 2013-08-28 20:09:08 -07:00
Baligh Uddin
166853e6c9 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-29 03:06:07 +00:00
Baligh Uddin
5c77627077 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-29 03:04:13 +00:00
Baligh Uddin
9c35975546 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-29 03:04:01 +00:00
Baligh Uddin
612db0a007 Import translations. DO NOT MERGE 
Change-Id: I665172800a06d780b92a5db2ab549980c87e8524
Auto-generated-cl: translation import
 2013-08-28 18:35:58 -07:00
Alan Viverette
de16f5f605 am b432ca60: Merge "Fix documentation regarding defStyle in View constructor" into klp-dev 
* commit 'b432ca60c6c7af42989db28594137f6fe1e888b4':
  Fix documentation regarding defStyle in View constructor
 2013-08-28 18:17:31 -07:00
Alan Viverette
b432ca60c6 Merge "Fix documentation regarding defStyle in View constructor" into klp-dev 2013-08-29 01:15:48 +00:00
Baligh Uddin
62ee6fab65 Import translations. DO NOT MERGE 
Change-Id: Ic6b1048f4afaa520fea602ec4367de5e192186bd
Auto-generated-cl: translation import
 2013-08-28 18:05:47 -07:00
John Spurlock
0d669d6d67 am ab8fe692: Merge "Rename hideybars constant to SYSTEM_UI_FLAG_IMMERSIVE." into klp-dev 
* commit 'ab8fe692961bb3bf71169fd7a43aff4de837ab26':
  Rename hideybars constant to SYSTEM_UI_FLAG_IMMERSIVE.
 2013-08-28 18:04:25 -07:00
John Spurlock
ab8fe69296 Merge "Rename hideybars constant to SYSTEM_UI_FLAG_IMMERSIVE." into klp-dev 2013-08-29 01:00:03 +00:00
Robert Greenwalt
36672fa0c9 am 9fe5b28d: Merge "More elaborate logs to debug missing APs" into klp-dev 
* commit '9fe5b28dc2a187f5974e42ac61841b46a5d91236':
  More elaborate logs to debug missing APs
 2013-08-28 17:54:20 -07:00
Robert Greenwalt
9fe5b28dc2 Merge "More elaborate logs to debug missing APs" into klp-dev 2013-08-29 00:51:35 +00:00
Baligh Uddin
ad155cdacc Import translations. DO NOT MERGE 
Change-Id: I22efa95394f7b572df2b43138fee45bd7eaf4229
Auto-generated-cl: translation import
 2013-08-28 17:36:17 -07:00
Alan Viverette
fb410d219f Fix documentation regarding defStyle in View constructor 
BUG: 8912583
Change-Id: Ib8b1f8baa4ee98aae0e66edc547ab014b2401415
 2013-08-28 16:57:42 -07:00
Sandeep Siddhartha
088e904680 am 720959cc: Merge "Start using the Hotword recognition APIs" into klp-dev 
* commit '720959cc7f9fffb45a57b928c66a045bfc256a7c':
  Start using the Hotword recognition APIs
 2013-08-28 16:57:34 -07:00
Chet Haase
3ddc33e26c am 52485b0b: Merge "Better transition interruption and TextChange fixes" into klp-dev 
* commit '52485b0b7ef066241371393dc6060bccd090a222':
  Better transition interruption and TextChange fixes
 2013-08-28 16:57:31 -07:00
Sandeep Siddhartha
720959cc7f Merge "Start using the Hotword recognition APIs" into klp-dev 2013-08-28 23:55:57 +00:00
Chet Haase
52485b0b7e Merge "Better transition interruption and TextChange fixes" into klp-dev 2013-08-28 23:55:10 +00:00
Isaac Katzenelson
b889b546e8 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.
 2013-08-28 16:54:02 -07:00
Chet Haase
af78bdd615 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
 2013-08-28 16:50:13 -07:00
Isaac Katzenelson
18f590a9b7 Merge "Remove EXTRA_DELETE_AFTER_USE and update descriptions accordingly." into klp-dev 2013-08-28 23:49:41 +00:00
Sandeep Siddhartha
529763b690 am bd31a483: Merge "Tweak the HotwordRecognizer API" into klp-dev 
* commit 'bd31a483d358b02e4a16949b576560d4e0672ea3':
  Tweak the HotwordRecognizer API
 2013-08-28 16:43:41 -07:00
Sandeep Siddhartha
42c3e02c52 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
 2013-08-28 23:40:32 +00:00
Sandeep Siddhartha
bd31a483d3 Merge "Tweak the HotwordRecognizer API" into klp-dev 2013-08-28 23:39:00 +00:00
Sandeep Siddhartha
823393477b 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
 2013-08-28 16:27:36 -07:00