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

180600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Solovay
b94f2ce07e am ea4c21ea: am a1838a9d: am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs automerge: e628954 automerge: d4cf09d automerge: 63e822d 
* commit 'ea4c21ea283bdb98b80140c697b27bb9eb2bb643':
  docs: WebView security notes for apps on pre-K devices
 2015-01-22 00:03:31 +00:00
Luan Nguyen
a36fb351f8 am 2c27edc0: am 349e3b5a: am f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-doc 
* commit '2c27edc0e043cb8fefa5eb1f5424f46d88712304':
  docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171).
 2015-01-22 00:03:28 +00:00
Alan Viverette
5e0908ac03 Merge "Ensure scroll drawables are managed correctly" 2015-01-21 23:57:51 +00:00
Andrew Solovay
ea4c21ea28 am a1838a9d: am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs automerge: e628954 automerge: d4cf09d automerge: 63e822d 
* commit 'a1838a9d78eeadc0e578e250b9ff71b1f720148e':
  docs: WebView security notes for apps on pre-K devices
 2015-01-21 23:46:27 +00:00
Luan Nguyen
2c27edc0e0 am 349e3b5a: am f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs automerge: 
* commit '349e3b5ad1e3d2f55fadce05a3726f27c8a2b5d5':
  docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171).
 2015-01-21 23:46:20 +00:00
Dianne Hackborn
4da9bbbbd9 Merge "Bring back voice interaction APIs." 2015-01-21 23:45:55 +00:00
Alan Viverette
029d039ea5 Ensure scroll drawables are managed correctly 
Bug: 19035677
Change-Id: Ib86666ddd1b6747f921a6e2f048405aba0c04ef7
 2015-01-21 15:41:53 -08:00
Andrew Solovay
a1838a9d78 am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs automerge: e628954 automerge: d4cf09d 
automerge: 63e822d

* commit '63e822df58b056e35a8a405103b53a2a033c7d33':
  docs: WebView security notes for apps on pre-K devices
 2015-01-21 23:40:51 +00:00
Luan Nguyen
349e3b5ad1 am f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs automerge: 8884eda automerge: de9bd40 
automerge: 2b01cfb

* commit '2b01cfbefcdb07640d61f09a92a26c7d3f302773':
  docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171).
 2015-01-21 23:39:29 +00:00
Andrew Solovay
63e822df58 am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs automerge: e628954 
automerge: d4cf09d

* commit 'd4cf09d3a0f90d61386eb1713ef2ed4ade00c061':
  docs: WebView security notes for apps on pre-K devices
 2015-01-21 23:33:10 +00:00
Luan Nguyen
2b01cfbefc am f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs automerge: 8884eda 
automerge: de9bd40

* commit 'de9bd40e21696ceeffc67ec24e6e43975461bc60':
  docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171).
 2015-01-21 23:31:44 +00:00
Andrew Solovay
d4cf09d3a0 am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs 
automerge: e628954

* commit 'e628954ea49da6a798879815d221f4d2d871e79a':
  docs: WebView security notes for apps on pre-K devices
 2015-01-21 23:22:45 +00:00
Luan Nguyen
de9bd40e21 am f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs 
automerge: 8884eda

* commit '8884edaaeb0375338f5cf6474c91c3f55f44a172':
  docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171).
 2015-01-21 23:21:24 +00:00
Andrew Solovay
e628954ea4 am 78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs 
* commit '78f4342fac982a130a62dac2a459cef2a4c29f5a':
  docs: WebView security notes for apps on pre-K devices
 2015-01-21 23:10:59 +00:00
Luan Nguyen
8884edaaeb am f082f898: Merge "docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171)." into lmp-docs 
* commit 'f082f8980e742e9a60aeb91271caff38e10cf0a8':
  docs: Fix conditional in ambient mode check method (18832168). Fix issue with non existent variable (18832287). Fix issue with outdated instructions (18832293). Fix issue with misleading time tick (18832171).
 2015-01-21 23:10:55 +00:00
Dianne Hackborn
4e106cedfe Bring back voice interaction APIs. 
Change-Id: I6039d7c0b188ac342441c56f7d19994b9a80ba17
 2015-01-21 15:07:20 -08:00
Chris Craik
3d8b365e93 Merge "Remove DisplayListLogBuffer" 2015-01-21 22:31:50 +00:00
Chris Craik
2ae0733982 Remove DisplayListLogBuffer 
Change-Id: I001832fc444b6d532f4a382e0a31cc1d8956dbd8
 2015-01-21 14:22:39 -08:00
Craig Mautner
7b15552692 Merge "Refactor removeApp and removeTask for last removals." 2015-01-21 22:19:25 +00:00
Craig Mautner
e3119b7d35 Refactor removeApp and removeTask for last removals. 
Move app token removal to the AppWindowToken class so cleanup can
be done locally. Move task removal to the Task class so cleanup can
be done locally. Call task removal when the last app is removed.
Merge actions done prior to method calls into methods.

Fixes bug 18088522 item #12.

Change-Id: I5ce85d2bb309ceb82bd7404e27a56a7c31cd7359
 2015-01-21 13:57:24 -08:00
Alan Viverette
8ac90a0609 Avoid ripple buffer creation for empty bounds automerge: b74155c automerge: e6e216c 
automerge: 2aacb86

* commit '2aacb861f4c7b80c5d2bb22956c9a5d4ace4df67':
  Avoid ripple buffer creation for empty bounds
 2015-01-21 21:13:33 +00:00
Alan Viverette
2aacb861f4 Avoid ripple buffer creation for empty bounds automerge: b74155c 
automerge: e6e216c

* commit 'e6e216c48ea25bdbc2d0a262c74670fb6513e42b':
  Avoid ripple buffer creation for empty bounds
 2015-01-21 21:09:39 +00:00
Alan Viverette
e6e216c48e Avoid ripple buffer creation for empty bounds 
automerge: b74155c

* commit 'b74155cf01f959fc9b7909de5a22806ad519f7c9':
  Avoid ripple buffer creation for empty bounds
 2015-01-21 21:02:58 +00:00
Alan Viverette
b74155cf01 Avoid ripple buffer creation for empty bounds 
Bug: 19068439
Change-Id: I031d4303bbf101a25612dce6f02d81ce4cf58e2b
 2015-01-21 12:30:49 -08:00
Mike Lockwood
767cddd3dd Merge "Watch for NumberFormatExceptions in AlsaCardsParser and AlsaDevicesParser" 2015-01-21 20:09:51 +00:00
Robert Greenwalt
fe0e33495c am b73f431d: Merge "Add + code handling logic for SMS Global Roaming" automerge: f19176f 
automerge: 52f25f7

* commit '52f25f7b30b684a46814cff60538e6a7636ed618':
  Add + code handling logic for SMS Global Roaming
 2015-01-21 20:05:30 +00:00
Robert Greenwalt
52f25f7b30 am b73f431d: Merge "Add + code handling logic for SMS Global Roaming" automerge: f19176f 
* commit 'b73f431dddc0ba9260a342f2322e818460cf6f34':
  Add + code handling logic for SMS Global Roaming
 2015-01-21 20:01:50 +00:00
Robert Greenwalt
b73f431ddd Merge "Add + code handling logic for SMS Global Roaming" 
automerge: f19176f

* commit 'f19176ff2f1deb672172f953626fabc45304d435':
  Add + code handling logic for SMS Global Roaming
 2015-01-21 19:56:25 +00:00
Robert Greenwalt
f19176ff2f Merge "Add + code handling logic for SMS Global Roaming" 2015-01-21 19:52:21 +00:00
Andrew Solovay
78f4342fac Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs 2015-01-21 19:20:58 +00:00
Mike Lockwood
a1329aebe7 Watch for NumberFormatExceptions in AlsaCardsParser and AlsaDevicesParser 
Bug: 19082426
Change-Id: I130d4df290716339326a28d249217a8a04220176
 2015-01-21 11:11:14 -08:00
Dianne Hackborn
4b94649ce3 Merge "Work on issue #18201239: ANRs in com.google.process.gapps:" into lmp-mr1-dev automerge: 2132695 automerge: 5346a21 
automerge: f6b4b1a

* commit 'f6b4b1a43253d5ea94763cf9750224c7b7b618c0':
  Work on issue #18201239: ANRs in com.google.process.gapps:
 2015-01-21 19:00:55 +00:00
Dianne Hackborn
f6b4b1a432 Merge "Work on issue #18201239: ANRs in com.google.process.gapps:" into lmp-mr1-dev automerge: 2132695 
automerge: 5346a21

* commit '5346a21bad95796611760d40c1540d1659038216':
  Work on issue #18201239: ANRs in com.google.process.gapps:
 2015-01-21 18:55:12 +00:00
Dianne Hackborn
5346a21bad Merge "Work on issue #18201239: ANRs in com.google.process.gapps:" into lmp-mr1-dev 
automerge: 2132695

* commit '213269599bdec3d83d3d811f5e8f62b9fd8d245c':
  Work on issue #18201239: ANRs in com.google.process.gapps:
 2015-01-21 18:47:11 +00:00
Svetoslav
220dbc4a7f AlertActivity now behaves as a dialog for accessibility purposes. automerge: 76ff4dd automerge: 03944ce 
automerge: 2b2b1a9

* commit '2b2b1a9b890f40fd24bce27580d3124c2c98f373':
  AlertActivity now behaves as a dialog for accessibility purposes.
 2015-01-21 18:43:41 +00:00
Dianne Hackborn
213269599b Merge "Work on issue #18201239: ANRs in com.google.process.gapps:" into lmp-mr1-dev 2015-01-21 18:41:38 +00:00
Svetoslav
2b2b1a9b89 AlertActivity now behaves as a dialog for accessibility purposes. automerge: 76ff4dd 
automerge: 03944ce

* commit '03944ce664c733d1922247229fc56f6630c0a5e4':
  AlertActivity now behaves as a dialog for accessibility purposes.
 2015-01-21 18:39:34 +00:00
Svetoslav
03944ce664 AlertActivity now behaves as a dialog for accessibility purposes. 
automerge: 76ff4dd

* commit '76ff4dd0de8d9747b9341f064dd270c5762705c6':
  AlertActivity now behaves as a dialog for accessibility purposes.
 2015-01-21 18:31:46 +00:00
Svetoslav
76ff4dd0de AlertActivity now behaves as a dialog for accessibility purposes. 
AlertActivity is intended to look like a dialog but for accessibility
purposes it was populated as an activity. As a result the content of
the "dialog" was not properly announced to the user.

bug:18865632

Change-Id: I27166fc74678981f4f3ad71d6d25727b5110340c
 2015-01-21 18:28:03 +00:00
Dianne Hackborn
455625e298 Work on issue #18201239: ANRs in com.google.process.gapps: 
Reason: Executing service com.google.android.syncadapters.contacts
/.SyncHighResPhotoIntentService

Make the code more robust when destroying services, so that if
the nesting count gets out of sync we don't just hang.

Change-Id: If117d5ef242e7c148fd9576bd89a1a092583d6ad
 2015-01-21 09:55:13 -08:00
Craig Mautner
9ba23db50c Merge "[ActivityManager] No home activity resumed and cause key dispatch ANR" automerge: 247e828 automerge: ad55787 
automerge: 7748fd8

* commit '7748fd81350ba2db9864527281d62fbf02a90145':
  [ActivityManager] No home activity resumed and cause key dispatch ANR
 2015-01-21 17:17:18 +00:00
Craig Mautner
7748fd8135 Merge "[ActivityManager] No home activity resumed and cause key dispatch ANR" automerge: 247e828 
automerge: ad55787

* commit 'ad55787db2f9e4b56a8406026566564d6aa08d5a':
  [ActivityManager] No home activity resumed and cause key dispatch ANR
 2015-01-21 17:09:30 +00:00
Craig Mautner
ad55787db2 Merge "[ActivityManager] No home activity resumed and cause key dispatch ANR" 
automerge: 247e828

* commit '247e828b5cd63efeae3226c2a9d3bd1f466141dc':
  [ActivityManager] No home activity resumed and cause key dispatch ANR
 2015-01-21 17:04:26 +00:00
Craig Mautner
247e828b5c Merge "[ActivityManager] No home activity resumed and cause key dispatch ANR" 2015-01-21 17:01:02 +00:00
Geoff Mendal
d7211ef8bc Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge: bae67d3 -s ours 
automerge: 893e388  -s ours

* commit '893e388fc3406da103733584474e88950ea8ab25':
  Import translations. DO NOT MERGE
 2015-01-21 16:40:45 +00:00
Geoff Mendal
893e388fc3 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
automerge: bae67d3  -s ours

* commit 'bae67d30304853ce3898b922ab0753718c89f82c':
  Import translations. DO NOT MERGE
 2015-01-21 16:35:14 +00:00
Geoff Mendal
bae67d3030 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-01-21 16:32:07 +00:00
Jorim Jaggi
ab75f63787 Merge "Remove dead code #12: Remove KeyButtonView.quiescentAlpha" 2015-01-21 16:32:03 +00:00
Geoff Mendal
66f4901bc8 Merge "Import translations. DO NOT MERGE" 2015-01-21 16:31:32 +00:00
Kenny Guy
2e0072d730 Merge "Only hide cross profile disclosure when showing resolver." into lmp-mr1-dev automerge: 06ab0ca automerge: 11c4cc1 
automerge: 3458e18

* commit '3458e180cf1dab2be19d00758b64033061aa62d2':
  Only hide cross profile disclosure when showing resolver.
 2015-01-21 16:30:22 +00:00