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

164017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Filip Gruszczynski
b1ed0ab927 am 78b236b3: am d4a52a68: am baecc0b2: Merge "Disable activity\'s translucency until it starts being swiped away." into lmp-sprout-dev 
* commit '78b236b3d2be713f534a033b0deb0e00b0d436a8':
  Disable activity's translucency until it starts being swiped away.
 2014-10-22 21:18:15 +00:00
Guang Zhu
22f6f30c8e am 5cd90706: am 871cdeeb: am 55bc7dc4: am ccbeb61a: Block monkey from creating user profiles 
* commit '5cd907067d9882bf930d915b0fcb4f6dadfa1778':
  Block monkey from creating user profiles
 2014-10-22 21:18:09 +00:00
Adrian Roos
0c68420eb4 am 3768d224: am 96d3132b: am c19586a8: am 7b4a38b1: Delay discovery of system trust agents 
* commit '3768d22417a8efd3e6501486cfb6e042f7a40227':
  Delay discovery of system trust agents
 2014-10-22 21:18:03 +00:00
Ricardo Cervera
c9fb8f2d13 am 2b8f9f87: am e9438c7b: am 0ae6e37e: Merge "docs: Removing extra semicolons in Wear notif examples." into lmp-dev 
* commit '2b8f9f87ff127983af4c365b70d76d41c6f7f21c':
  docs: Removing extra semicolons in Wear notif examples.
 2014-10-22 21:07:12 +00:00
Quddus Chong
a4215870d7 am fd32fec2: am 52357721: am b8796e44: docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies. 
* commit 'fd32fec2ca4fc86b5361556e0903f3beaad8a650':
  docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies.
 2014-10-22 21:07:07 +00:00
John Reck
d83fc233bd am 7c8f44ae: am 36c2aa4a: Merge "Surface:lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev 
* commit '7c8f44ae529ce32356d83e92c26d9ba62be3298c':
  Surface:lockHardwareCanvas DO NOT MERGE
 2014-10-22 21:07:01 +00:00
Geoff Mendal
1d8d6fdd2c am 80d812b9: (-s ours) am c9e4f942: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '80d812b9b5cac86d74d8de6d72c83462c78087ba':
  Import translations. DO NOT MERGE
 2014-10-22 21:06:57 +00:00
Geoff Mendal
24acd22f58 am 4bfba71f: (-s ours) am b571b926: (-s ours) Import translations. DO NOT MERGE 
* commit '4bfba71f8b462e3f67eee61f47f8ec02388847f2':
  Import translations. DO NOT MERGE
 2014-10-22 21:06:53 +00:00
Deepanshu Gupta
22387d9d35 am 01c80f15: am 37779f07: Merge "Check Bridge init before disposing." into lmp-dev automerge: 568f16c 
* commit '01c80f155d095ccd77a5f3038d4d02663219684e':
  Check Bridge init before disposing.
 2014-10-22 21:06:49 +00:00
Jinsuk Kim
e02ae4843e am 9ad6a471: am 07b481a9: Merge "CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE" into lmp-dev automerge: 0c74939 -s ours 
* commit '9ad6a471867ab713109d1391d8047e0ed0a98442':
  CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE
 2014-10-22 21:06:45 +00:00
Santos Cordon
910f18eae9 am 05f4d8d1: am 40f15895: am 028217eb: Merge "Add hidden method to access a connection\'s service." into lmp-dev 
* commit '05f4d8d1d0e99dc76dfae7198b1c0ce6c98be466':
  Add hidden method to access a connection's service.
 2014-10-22 21:06:41 +00:00
Filip Gruszczynski
78b236b3d2 am d4a52a68: am baecc0b2: Merge "Disable activity\'s translucency until it starts being swiped away." into lmp-sprout-dev 
* commit 'd4a52a6878846ba0a69f6c2f814356ceaa4b8ec6':
  Disable activity's translucency until it starts being swiped away.
 2014-10-22 21:06:37 +00:00
Guang Zhu
5cd907067d am 871cdeeb: am 55bc7dc4: am ccbeb61a: Block monkey from creating user profiles 
* commit '871cdeebdaf9469c97959d90c12e36140bb14f4a':
  Block monkey from creating user profiles
 2014-10-22 21:06:32 +00:00
Adrian Roos
3768d22417 am 96d3132b: am c19586a8: am 7b4a38b1: Delay discovery of system trust agents 
* commit '96d3132bd0c57fbf8bb46624045fa1616452d346':
  Delay discovery of system trust agents
 2014-10-22 21:06:13 +00:00
Ricardo Cervera
2b8f9f87ff am e9438c7b: am 0ae6e37e: Merge "docs: Removing extra semicolons in Wear notif examples." into lmp-dev 
* commit 'e9438c7b17caf0253427031a010456f594741616':
  docs: Removing extra semicolons in Wear notif examples.
 2014-10-22 20:48:39 +00:00
Quddus Chong
fd32fec2ca am 52357721: am b8796e44: docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies. 
* commit '523577213072d63f6775ea3155bfc93080314494':
  docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies.
 2014-10-22 20:48:35 +00:00
John Reck
7c8f44ae52 am 36c2aa4a: Merge "Surface:lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev 
* commit '36c2aa4a6394047f02c4f236233b41d738ff56c1':
  Surface:lockHardwareCanvas DO NOT MERGE
 2014-10-22 20:48:27 +00:00
Geoff Mendal
80d812b9b5 am c9e4f942: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'c9e4f942276506c25922e0d61a3978cc2b1c9bc6':
  Import translations. DO NOT MERGE
 2014-10-22 20:48:22 +00:00
Geoff Mendal
4bfba71f8b am b571b926: (-s ours) Import translations. DO NOT MERGE 
* commit 'b571b926f00aee176792aedd964de8230c75c401':
  Import translations. DO NOT MERGE
 2014-10-22 20:48:15 +00:00
Deepanshu Gupta
01c80f155d am 37779f07: Merge "Check Bridge init before disposing." into lmp-dev automerge: 568f16c 
* commit '37779f07496462afa4b5d88725e8a004a7e10bc0':
  Check Bridge init before disposing.
 2014-10-22 20:47:37 +00:00
Jinsuk Kim
9ad6a47186 am 07b481a9: Merge "CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE" into lmp-dev automerge: 0c74939 -s ours 
* commit '07b481a9f77a7ac0dc430706aadfa262802cfdba':
  CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE
 2014-10-22 20:47:34 +00:00
Santos Cordon
05f4d8d1d0 am 40f15895: am 028217eb: Merge "Add hidden method to access a connection\'s service." into lmp-dev 
* commit '40f158954491c4d2587e0b2a13cd07195bc27b25':
  Add hidden method to access a connection's service.
 2014-10-22 20:47:15 +00:00
Filip Gruszczynski
d4a52a6878 am baecc0b2: Merge "Disable activity\'s translucency until it starts being swiped away." into lmp-sprout-dev 
* commit 'baecc0b2d111c3bc930b85d5450f1ff8b7b83395':
  Disable activity's translucency until it starts being swiped away.
 2014-10-22 20:45:59 +00:00
Guang Zhu
871cdeebda am 55bc7dc4: am ccbeb61a: Block monkey from creating user profiles 
* commit '55bc7dc4288e2c2cdd0bd9c2d06c38e00d139d5c':
  Block monkey from creating user profiles
 2014-10-22 20:45:55 +00:00
Adrian Roos
96d3132bd0 am c19586a8: am 7b4a38b1: Delay discovery of system trust agents 
* commit 'c19586a8055b27bc7c7cc3ac3e1f38eec8cc82a9':
  Delay discovery of system trust agents
 2014-10-22 20:45:26 +00:00
Craig Mautner
5cd68ee4df Merge "Cherry pick task movement changes from aosp" into lmp-sprout-dev 2014-10-22 20:38:06 +00:00
Christopher Tate
44d7556bfa am 339f0a57: am 6ab86274: Merge "Don\'t cancel scheduled jobs when packages are updated" into lmp-mr1-dev 
* commit '339f0a57d46447b1bd9286b8f891686f80b746a4':
  Don't cancel scheduled jobs when packages are updated
 2014-10-22 20:37:15 +00:00
Bryce Lee
f03ba4f13b Merge "[Theater Mode] framework implementation through global setting" into lmp-sprout-dev 2014-10-22 20:33:08 +00:00
Nancy Chen
36c62f3e3c Add an option to set the selected phone account as the default. (1/3) 
Modify the phoneAccountSelected method to support the option to set the
selected phone account as the default for outgoing phone calls.

Bug: 18078232
Change-Id: I2689bc9611366d521dfd3dc2086fd31eb6393876
 2014-10-22 13:32:57 -07:00
Christopher Tate
339f0a57d4 am 6ab86274: Merge "Don\'t cancel scheduled jobs when packages are updated" into lmp-mr1-dev 
* commit '6ab862747b913353ff63b7c9bd6c7ddcecb348c6':
  Don't cancel scheduled jobs when packages are updated
 2014-10-22 20:31:05 +00:00
Craig Mautner
cbd84af39a Cherry pick task movement changes from aosp 
The following cherry picks from aosp contain code that keep windows
tracking the task movement.

https://android-review.googlesource.com/#/c/111380/
https://android-review.googlesource.com/#/c/109930

Maybe fixes bug 15729183.

Change-Id: Ida69fe365b06025d119e32b22a8d04958cdbabf3
 2014-10-22 13:28:40 -07:00
Christopher Tate
6ab862747b Merge "Don't cancel scheduled jobs when packages are updated" into lmp-mr1-dev 2014-10-22 20:27:15 +00:00
Alan Viverette
a0579ad00f am 5eaf0064: am 410f7ee4: Merge "Check MenuItem.isVisible() for keyboard shortcuts" into lmp-mr1-dev 
* commit '5eaf00641a8dd31b4d7779749db28669e4010af3':
  Check MenuItem.isVisible() for keyboard shortcuts
 2014-10-22 20:14:35 +00:00
Alan Viverette
5eaf00641a am 410f7ee4: Merge "Check MenuItem.isVisible() for keyboard shortcuts" into lmp-mr1-dev 
* commit '410f7ee4031bb754600ad9c984158b6ff4f056c8':
  Check MenuItem.isVisible() for keyboard shortcuts
 2014-10-22 20:08:02 +00:00
Alan Viverette
410f7ee403 Merge "Check MenuItem.isVisible() for keyboard shortcuts" into lmp-mr1-dev 2014-10-22 20:03:46 +00:00
Christopher Tate
2203e532d6 am 04e6827a: Fix settings db update sequence 
automerge: 281763b

* commit '281763ba1b4a6255799046f78930b586cd7e541c':
  Fix settings db update sequence
 2014-10-22 18:44:40 +00:00
John Reck
5c9d717d3e Fix damage bug 
Bug: 18087374
Change-Id: Ie183392122c73f93010fb3f4be071c924b352966
 2014-10-22 11:32:27 -07:00
Leon Scroggins III
8e8a0d6eaf Remove outdated tests for custom decoder. 
These tests don't appear to be meaningful. We are comparing an
unused decoder against one that is used.

Keeping this test building (the primary changes to this directory
in a while) is not believed to be worth the effort.

BUG:17419670
Change-Id: Ia0862f2a1de1fb9d744382bb949f6c1638a1a12a
 2014-10-22 18:17:14 +00:00
Christopher Tate
aad67a3e48 Don't cancel scheduled jobs when packages are updated 
Only cancel the app's jobs when it is fully uninstalled, not when
it's being updated to a newer version.

Bug 18059252

Change-Id: I6cf617013ec8e9e9abd90e366d7a6ab0711790de
 2014-10-22 11:16:33 -07:00
Christopher Tate
281763ba1b am 04e6827a: Fix settings db update sequence 
* commit '04e6827ace936e0cbb666d8ef94635b73672aa41':
  Fix settings db update sequence
 2014-10-22 18:06:09 +00:00
Christopher Tate
04e6827ace Fix settings db update sequence 
The 'global' table only exists in the owner-user db instance; make
sure to apply global-setting update steps only when bringing up that
instance.

Bug 18069830

Change-Id: I843eabe710d9487de94690921d61adb181b45ed2
 2014-10-22 10:36:42 -07:00
xin He
265e3da006 am 5085c4c2: Merge "Show ProgressDialog when waiting for radio to turn on when provisioning." into lmp-dev 
* commit '5085c4c2933219831bde11a482c8b2934e4a259f':
  Show ProgressDialog when waiting for radio to turn on when provisioning.
 2014-10-22 17:22:51 +00:00
xin He
5085c4c293 Merge "Show ProgressDialog when waiting for radio to turn on when provisioning." into lmp-dev 2014-10-22 17:19:26 +00:00
John Spurlock
eb47ce6058 am 0c42c693: am 95dc663d: Merge "PowerUI: Post/cancel notification as UserHandle.ALL." into lmp-mr1-dev 
* commit '0c42c693615cc6c7ba288241a908e1a47ee9fabc':
  PowerUI: Post/cancel notification as UserHandle.ALL.
 2014-10-22 17:15:32 +00:00
Ye Wen
3356b4780c am 9921a1db: am 91590bae: Merge "Send HTTP status code back in case of MMS HTTP failure (1/3)" into lmp-mr1-dev 
* commit '9921a1dbb6c38b2b9148cee4bb05660ecaa7689c':
  Send HTTP status code back in case of MMS HTTP failure (1/3)
 2014-10-22 17:15:21 +00:00
Ricardo Cervera
e9438c7b17 am 0ae6e37e: Merge "docs: Removing extra semicolons in Wear notif examples." into lmp-dev 
* commit '0ae6e37e64144dc180c164cfe42fa8faf59f0d53':
  docs: Removing extra semicolons in Wear notif examples.
 2014-10-22 17:06:56 +00:00
Ricardo Cervera
0ae6e37e64 Merge "docs: Removing extra semicolons in Wear notif examples." into lmp-dev 2014-10-22 17:03:44 +00:00
Quddus Chong
5235772130 am b8796e44: docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies. 
* commit 'b8796e441ce8b4f2e2f75df9689637f6e18f18db':
  docs: Updated Android 5.0 API overview to reflect changed WebView behavior for mixed content and 3rd party cookies.
 2014-10-22 17:01:51 +00:00
smain@google.com
61139c8d44 add helpouts widget to first round of pages 
Change-Id: I2afafb2bf682c5d514eb1adde27bf0277e709198
 2014-10-22 09:53:40 -07:00
John Spurlock
0c42c69361 am 95dc663d: Merge "PowerUI: Post/cancel notification as UserHandle.ALL." into lmp-mr1-dev 
* commit '95dc663d1815704c63a5b18c94c3768068f2ff21':
  PowerUI: Post/cancel notification as UserHandle.ALL.
 2014-10-22 16:48:34 +00:00