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

161410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svet Ganov
a706c9079a am e39fc96c: Merge "Ignore accessibility overlay when computing window\'s interactive region." into lmp-mr1-dev 
* commit 'e39fc96c04a09a58acb2547a2066e0662791a69b':
  Ignore accessibility overlay when computing window's interactive region.
 2014-12-10 19:42:08 +00:00
Svet Ganov
e39fc96c04 Merge "Ignore accessibility overlay when computing window's interactive region." into lmp-mr1-dev 2014-12-10 19:35:05 +00:00
Luan Nguyen
ee501ed848 am 596d4e72: am c9e5c5f7: am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps 
* commit '596d4e7230ae1858aaafbae7987e46d65181f1bd':
  docs: Fix text on step 5 of the opt-in steps
 2014-12-10 19:34:30 +00:00
Luan Nguyen
596d4e7230 am c9e5c5f7: am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps 
* commit 'c9e5c5f72a563c7b8e030a57cf586941d32006f4':
  docs: Fix text on step 5 of the opt-in steps
 2014-12-10 19:26:37 +00:00
John Spurlock
24ca556dce am e03e2456: Merge "NoMan: Apply audio restrictions when effects are disabled by listeners." into lmp-mr1-dev 
* commit 'e03e245610c7f406a6cc0de998d71313a285953a':
  NoMan: Apply audio restrictions when effects are disabled by listeners.
 2014-12-10 19:22:41 +00:00
Luan Nguyen
c9e5c5f72a am 8a65df39: am 258da738: docs: Fix text on step 5 of the opt-in steps 
* commit '8a65df39e6ad2fc357c8a327626f40588ce00553':
  docs: Fix text on step 5 of the opt-in steps
 2014-12-10 19:19:05 +00:00
John Spurlock
e03e245610 Merge "NoMan: Apply audio restrictions when effects are disabled by listeners." into lmp-mr1-dev 2014-12-10 19:14:27 +00:00
Luan Nguyen
8a65df39e6 am 258da738: docs: Fix text on step 5 of the opt-in steps 
* commit '258da738463f547eab859c21d32cbfe0f8345ae2':
  docs: Fix text on step 5 of the opt-in steps
 2014-12-10 19:10:41 +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
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
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
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
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
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
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
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
Dan Sandler
3585062760 Merge "BluetoothControllerImpl: track bluetooth better" into lmp-mr1-dev 2014-12-10 15:43:43 +00:00
Jason Monk
4630c89a76 BluetoothControllerImpl: track bluetooth better 
Match settings behavior better:
 - Get connection info from profiles so it is for all devices
   (CONNECTION_STATE_CHANGED only updates one)
 - Disconnect from all known connections so that 'x' does something
 - When device is disconnected without CONNECTION_STATE_CHANGED
   then find a new 'last' device that is connected
 - Listen to a bunch more broadcasts to make sure info is always
   up to date.

Bug: 18210666
Bug: 18638010
Change-Id: Ie003b67bbdd0d452b7472c644d90bca929e5cd29
 2014-12-10 10:32:43 -05:00
Geoff Mendal
4ce2c654bd am fa3f4314: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'fa3f43145ac1af62ed063d3cd7ba1c30a81bb3fd':
  Import translations. DO NOT MERGE
 2014-12-10 15:00:58 +00:00
Geoff Mendal
83c26e18fc Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-10 15:00:16 +00:00
Geoff Mendal
da0571b7e5 Import translations. DO NOT MERGE 
Change-Id: I9cdc7fac5598329caf1ec9532c197d9a0fe8dbbf
Auto-generated-cl: translation import
 2014-12-10 06:59:21 -08:00
Geoff Mendal
fa3f43145a Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-10 14:54:48 +00:00
Geoff Mendal
a65ea3dfdc Import translations. DO NOT MERGE 
Change-Id: Icfd467c7b204b82119ee78b0bfa34d385786d251
Auto-generated-cl: translation import
 2014-12-10 06:52:52 -08:00
Geoff Mendal
2a5f0b4e3b am b7180c45: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'b7180c450e8364077f37f792160c94941d8839c6':
  Import translations. DO NOT MERGE
 2014-12-10 14:33:06 +00:00
Jason Monk
9309db894d am 28fffd58: Merge "CarrierText clear itself when no mob. data support" into lmp-mr1-dev 
* commit '28fffd58a1e9eea2e84c15b124cbfde1c8dbb2c8':
  CarrierText clear itself when no mob. data support
 2014-12-10 14:33:00 +00:00
Geoff Mendal
f6e388231d Import translations. DO NOT MERGE 
Change-Id: I76e8da5cbb1d3c5e39ea80ebdc0f4f9b129febf7
Auto-generated-cl: translation import
 2014-12-10 06:31:09 -08:00
Geoff Mendal
b7180c450e Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-10 14:30:40 +00:00
Geoff Mendal
aa72294174 Import translations. DO NOT MERGE 
Change-Id: I63ccbdea01d869627116121f95c9d35cd64da04e
Auto-generated-cl: translation import
 2014-12-10 06:26:53 -08:00
Jason Monk
28fffd58a1 Merge "CarrierText clear itself when no mob. data support" into lmp-mr1-dev 2014-12-10 14:25:39 +00:00
Erik Kline
56d2e8fb7b am 33cd463b: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev 
* commit '33cd463bbbbe47010ed44815fbfd0ab5e8fbf825':
  Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.
 2014-12-10 07:36:35 +00:00
Erik Kline
33cd463bbb Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lmp-mr1-dev 2014-12-10 07:29:47 +00:00
Ricardo Cervera
e4afef448d am 7cc203d7: am f49c37e7: am 933005e9: am 900efcc9: docs: Add details to Packaging Wearable apps. 
* commit '7cc203d73418316628818883ea66ad8f1eebaf45':
  docs: Add details to Packaging Wearable apps.
 2014-12-10 06:05:54 +00:00
Joe Fernandez
39409f28e6 am 17cf7789: am 5ff08052: am dfd05f0a: am 1832978c: Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs 
* commit '17cf77898af530dc8672e74b32ed4a210e951cef':
  docs: Update wording on Packaging requirement description. Add Watch Face requirement.
 2014-12-10 06:05:49 +00:00
Ricardo Cervera
7cc203d734 am f49c37e7: am 933005e9: am 900efcc9: docs: Add details to Packaging Wearable apps. 
* commit 'f49c37e723b2f1b4f03cce0b205feb84e9c18648':
  docs: Add details to Packaging Wearable apps.
 2014-12-10 05:57:22 +00:00
Joe Fernandez
17cf77898a am 5ff08052: am dfd05f0a: am 1832978c: Merge "docs: Update wording on Packaging requirement description. Add Watch Face requirement." into lmp-docs 
* commit '5ff0805238787f938bf5bcadba46ac8f92e8d440':
  docs: Update wording on Packaging requirement description. Add Watch Face requirement.
 2014-12-10 05:57:19 +00:00