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

177873 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Cervera
b8217ea7f0 am 2a34e719: am c0d08616: am c6361d8d: Merge "docs: Add details to Packaging Wearable apps." into lmp-dev 
automerge: 7061697

* commit '7061697bfd7c2280ae780356b68ac5c47b3aa1d8':
  docs: Add details to Packaging Wearable apps.
 2014-12-10 19:00:49 +00:00
Ricardo Cervera
85cc409076 am 0342d70e: am f94ee2c1: am ec656c51: am 0024f12d: Merge "docs: Design guidelines for watch faces draft." into lmp-docs 
automerge: 1b46c2c

* commit '1b46c2ccb700749bf7d06c454b8f4337bacde371':
  docs: Design guidelines for watch faces draft.
 2014-12-10 18:59:28 +00:00
Patrick Tjin
6b4a1c6c46 am e3703050: Add recovery kmsg to dropbox 
automerge: 6aa6733

* commit '6aa6733cf8ae79adb703e4cdfd33de5385c970c1':
  Add recovery kmsg to dropbox
 2014-12-10 18:58:12 +00:00
smain@google.com
835ad71635 am 5a267e72: am 5b16e21b: am 6554bb45: am 1a2308bb: Merge "misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language." int 
automerge: 6c1facd

* commit '6c1facdc40bbb02ca5390e0281f1e72172c8065e':
  misc updates related to Android Studio. clarify a few doc titles for improved search results clarity. update "get started" page link to Android Studio, add First App link, and remove some biased language.
 2014-12-10 18:56:52 +00:00
John Spurlock
8403b7535b NoMan: Apply audio restrictions when effects are disabled by listeners. 
Bug: 17990185
Change-Id: Id946fab4dd27e2354919de6a98c009bc2e711240
 2014-12-10 13:56:13 -05:00
Joe Fernandez
b721e45a43 am 913a683d: am f8527c7f: am c3ae2596: am 1e824284: Merge "docs: Add Distributing to Android Wear doc" into lmp-docs 
automerge: caad620

* commit 'caad620d042628457bcad5850f889f46250a2d7c':
  docs: Add Distributing to Android Wear doc
 2014-12-10 18:55:29 +00:00
Ricardo Cervera
b33c8fb4b5 am 600224c9: am 730a52d0: am eb09f898: am d412b9ab: Merge "docs: Add new classes to Wearable UI library" into lmp-docs 
automerge: 768d97d

* commit '768d97d0b6f3e416deaf29d1c8ca139337af334c':
  docs: Add new classes to Wearable UI library
 2014-12-10 18:53:59 +00:00
Ricardo Cervera
9c6e82e70e am 45ea5690: am 5edaf136: am be80b984: am 0d8f1417: Merge "docs: Add links to wearable support zip for ADT" into lmp-docs 
automerge: 739d0a8c

* commit '739d0a8c6b08abcdc56d592e05f3ad7c01e5b5d2':
  docs: Add links to wearable support zip for ADT
 2014-12-10 18:52:44 +00:00
Adam Lesinski
5dce5e67db Fix issue where non-resource attributes would cause obtainStyleAttributes to fail 
A sentinal value of 0x00000000 was used to mark the first time an AttributeFinder
was used. If the resource ID of an attribute was also 0x00000000 (which occurs with
non-resource attributes, like 'style'), then it would be mistaken as the sentinel
start value.

Bug:18421787
Change-Id: I4be353e0f8c940cb6f262d155129f048dcc444ae
 2014-12-10 10:51:48 -08:00
Quddus Chong
d710011151 am 15e0f7fd: am bdb327ad: am c24c5797: am 09e72628: Merge "docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient." into lmp-docs 
automerge: 20baf9e

* commit '20baf9e47e8e89ff595a843de54867fb56a5580d':
  docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient.
 2014-12-10 18:51:16 +00:00
Andre Eisenbach
f60f29d060 am c9149984: Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev 
automerge: e832393

* commit 'e8323934c7dd01228b6550ac5dcad08999371a61':
  Prevent NullPointerException in getStringValue if no value is set
 2014-12-10 18:49:41 +00:00
Dianne Hackborn
d52589185f am d6372242: Merge "Further work on issue #18640385: Add procstats test mode" into lmp-mr1-dev 
* commit 'd63722429e311eca2ec9e9a9f80704bc521fef54':
  Further work on issue #18640385: Add procstats test mode
 2014-12-10 18:45:20 +00:00
Eric Laurent
093789755e resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aosp 
Change-Id: I34063a9a516e0d9d209d3176279ef4266b6a113d
 2014-12-10 10:42:08 -08:00
Dianne Hackborn
d63722429e Merge "Further work on issue #18640385: Add procstats test mode" into lmp-mr1-dev 2014-12-10 18:37:51 +00:00
Luan Nguyen
258da73846 docs: Fix text on step 5 of the opt-in steps 
Bug: 18702823
Change-Id: I294eb017592e896217d7eeea024aa32b9f4f1511
 2014-12-10 10:37:43 -08:00
Geoff Mendal
da409fea82 am 5431d1e9: (-s ours) am 2bb00d52: (-s ours) Import translations. DO NOT MERGE 
* commit '5431d1e9a4ad23debe007693f0be2dc8c31fa9e2':
  Import translations. DO NOT MERGE
 2014-12-10 18:37:38 +00:00
Dianne Hackborn
ae6cc8af26 Further work on issue #18640385: Add procstats test mode 
Tune sampling periods:

- Lower minimum sample interval when in test mode.
- Add a check when sampling pss to make sure this is at least 1
  second since the pss changed, to reduce the amount of bad
  data (very small pss samples) that we see.

Change-Id: I624a7d0480f3f6b22d229744e028d13a2c7b0e89
 2014-12-10 10:33:27 -08:00
Geoff Mendal
5431d1e9a4 am 2bb00d52: (-s ours) Import translations. DO NOT MERGE 
* commit '2bb00d5254b69d903728322cdd79fa2ce0fa491b':
  Import translations. DO NOT MERGE
 2014-12-10 18:31:30 +00:00
Dmitriy Ivanov
cc0c8f23f3 Switch to libsigchain.a 
Use LOCAL_WHOLE_STATIC_LIBRARIES to instruct static linker
 to export symbols from the static library.

(cherry picked from commit 5ba317cee071b718a163ab9acf2b6b4f6a337b39)

Bug: 18701723
Change-Id: Id9b567a1529574eab2225777f1f2a5ea10e540ad
 2014-12-10 10:27:50 -08:00
Rich Slogar
8866975b53 docs:studio basic links 
Change-Id: Ib097530baa3035bc83eeb49a3e14eadbac58aca1
 2014-12-10 10:18:09 -08:00
Craig Mautner
93c5cf6a6f am 7438b57c: am 2de55513: Merge "Only one task within the stack should moveToBack" 
* commit '7438b57c8d1e1649c51c570fe71aef861854730d':
  Only one task within the stack should moveToBack
 2014-12-10 18:04:52 +00:00
Mike Reed
d64d68d9c1 Merge "drawBitmapMatrix is deprecated, code work-around" 2014-12-10 18:02:12 +00:00
Wink Saville
afd6f5a37e am eb4de876: Merge "Update API and documentation for invalid subscriptions id\'s" into lmp-mr1-dev 
* commit 'eb4de87683a0d1959d64af08f3685e1b3701a314':
  Update API and documentation for invalid subscriptions id's
 2014-12-10 18:01:31 +00:00
Craig Mautner
7438b57c8d am 2de55513: Merge "Only one task within the stack should moveToBack" 
* commit '2de55513f81b238ea42b2b36cbf61e8c1a475c45':
  Only one task within the stack should moveToBack
 2014-12-10 17:57:34 +00:00
Wink Saville
eb4de87683 Merge "Update API and documentation for invalid subscriptions id's" into lmp-mr1-dev 2014-12-10 17:56:58 +00:00
Dianne Hackborn
6466126ab0 Fix issue #18683980: questions on LMK memory changes 
Getting the denominator right is kind of important.

Change-Id: Iff02a0a95eccd1231042e4ea96011c8cee0fee02
 2014-12-10 09:56:48 -08:00
Craig Mautner
2de55513f8 Merge "Only one task within the stack should moveToBack" 2014-12-10 17:51:32 +00:00
Ruben Brunk
fe6a5ae924 am 28089cc3: Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev automerge: 3ef5033 automerge: 6d98265 
* commit '28089cc39b0247d5e854a1a44cd8af17464b9e36':
  Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.
 2014-12-10 17:44:36 +00:00
Ricardo Cervera
3ccdac411c am 0318a228: am 614889aa: am 4a6bafcb: am 12a24dc9: am 47fa6355: am 5155840b: Merge "docs: Adding links to material design videos" into lmp-docs 
* commit '0318a2281d08e7988cd66ad6c1ef7cd5385c2a15':
  docs: Adding links to material design videos
 2014-12-10 17:44:31 +00:00
Elliott Hughes
2e360a4485 am 2931058b: am a04cd35d: am 0aac16bb: am b034de7e: am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs 
* commit '2931058b77dea89d0d16f62106c44fae59a71562':
  Fix typo.
 2014-12-10 17:42:59 +00:00
smain@google.com
848b1c2201 am b1d41255: am 92b6011d: am 9ecc18e2: am 4267450e: am 780a2231: am 2023bec7: revise ADT migration message b/18668828 and fix broken link 
* commit 'b1d41255540256136b058726e0e3efb0439e713f':
  revise ADT migration message b/18668828 and fix broken link
 2014-12-10 17:42:54 +00:00
smain@google.com
b953e28e89 resolved conflicts for merge of cf8a8019 to master 
Change-Id: I7de213adcad766d113c47ae88d8494445c3036f7
 2014-12-10 09:40:09 -08:00
Rich Slogar
f988310cd5 am 05672d36: am 6b07b40d: am 00d635c0: am fbbab546: am d3d4fe4d: am 01ab09c2: docs:studio basics images updates 
* commit '05672d36fe040cc3e01eaf5914b878f03c059e7b':
  docs:studio basics images updates
 2014-12-10 17:35:06 +00:00
Joe Fernandez
349d5f028e am 4ddf70db: am 55677d8a: am 33a0828e: am 2a83bc2b: am 4c3b3324: am f4814b87: docs: Change Eclipse deprecation language on sdk/index.html page 
* commit '4ddf70db557cceaf8b19140026844ca9bdd9de00':
  docs: Change Eclipse deprecation language on sdk/index.html page
 2014-12-10 17:35:01 +00:00
Dianne Hackborn
7557ec128f am 6bdbae07: Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev 
* commit '6bdbae07cf9b3929dca471072bea7001f7996efb':
  Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#...
 2014-12-10 17:29:35 +00:00
Dianne Hackborn
6bdbae07cf Merge "Fix issue #18665625 CTS:android.app.cts.InstrumentationTest#..." into lmp-mr1-dev 2014-12-10 17:23:07 +00:00
Geoff Mendal
e1bc1c6c9f Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-10 17:15:50 +00:00
Geoff Mendal
2bb00d5254 Import translations. DO NOT MERGE 
Change-Id: I5bd1364488d92127594b2f8d6d39ae9b18495be1
Auto-generated-cl: translation import
 2014-12-10 09:13:28 -08:00
Geoff Mendal
2f5e130d4d am 295dc004: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '295dc00409b295d4353eefa6131189a83a29ea5f':
  Import translations. DO NOT MERGE
 2014-12-10 17:13:19 +00:00
Geoff Mendal
295dc00409 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-10 17:07:24 +00:00
Benjamin Franz
5b614593e1 Only add successfully bound profile services to mProfileServices. 
This causes crashes on all devices that disable the BluetoothHeadset
service when disabling bluetooth and thereby trying to unbind all
services.

Bug: 18669882
Change-Id: I48978a1556ead967c848c5bd9f6e001d38754b8d
 2014-12-10 17:06:06 +00:00
Geoff Mendal
5b736551cc Import translations. DO NOT MERGE 
Change-Id: I3a7d9612bf4b18c14981c0a9e115fc4d320069d6
Auto-generated-cl: translation import
 2014-12-10 09:03:48 -08:00
Craig Mautner
864280369c am 7a17e0b6: Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev 
* commit '7a17e0b601c7f65a2ae0b53d8494ae1722c7a28b':
  Add put/getBoolean/Array to PersistableBundle
 2014-12-10 17:02:10 +00:00
Craig Mautner
7a17e0b601 Merge "Add put/getBoolean/Array to PersistableBundle" into lmp-mr1-dev 2014-12-10 16:56:15 +00:00
Geoff Mendal
7e7646487e Import translations. DO NOT MERGE 
Change-Id: I101fba3b08265cb881495252573df6088a439955
Auto-generated-cl: translation import
 2014-12-10 08:40:30 -08:00
Jorim Jaggi
57b440e206 am c79343ce: Merge "Fix SysUI when an app started from the affordances crashes" into lmp-mr1-dev 
* commit 'c79343ce6545a78fd7673f05ec0a41209be9b27d':
  Fix SysUI when an app started from the affordances crashes
 2014-12-10 16:40:09 +00:00
Nick Kralevich
d5180176cb resolved conflicts for merge of ef7708f8 to master 
Change-Id: I9cc71d672141c23c0c2ed0a73d3e80aac10f3eb6
 2014-12-10 08:36:37 -08:00
Jorim Jaggi
c79343ce65 Merge "Fix SysUI when an app started from the affordances crashes" into lmp-mr1-dev 2014-12-10 16:32:20 +00:00
Jorim Jaggi
826730aeb9 Fix SysUI when an app started from the affordances crashes 
- Fix infinite recursion in this case.
- If the app crashes, we are waiting for either setOccluded or
  hideKeyguard to be called. However, neither of these gets called
  in this case, so we recover from it by adding a timeout of 5
  seconds.

Bug: 18652789
Change-Id: Ib9a043f5692a8578703df1db08e1a6b9dcfbc742
 2014-12-10 17:22:58 +01:00
Dan Sandler
b394253a3f am 35850627: Merge "BluetoothControllerImpl: track bluetooth better" into lmp-mr1-dev 
* commit '3585062760990b8ec3148b266155ae9ec033934d':
  BluetoothControllerImpl: track bluetooth better
 2014-12-10 15:53:59 +00:00