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

153391 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
962e3e8315 am 9cf01b63: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '9cf01b63cb0023aec0e05b1ce050ff572532b876':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 15:00:49 +00:00
Svetoslav
567c97881b am 44d4eeaa: Merge "Use default encryption password if an accessibility service is enabled." into lmp-dev 
* commit '44d4eeaa48721296663a05d01071f196a509dc34':
  Use default encryption password if an accessibility service is enabled.
 2014-10-01 15:00:44 +00:00
Fabrice Di Meglio
e353ccbf53 am 415393f4: Merge "Update for bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev 
* commit '415393f424c8df75194aa194c46acfb213866c08':
  Update for bug #17521147 Settings activity looks terrible on Volantis
 2014-10-01 15:00:33 +00:00
Winson Chung
b61dea2047 am da649073: Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev 
* commit 'da649073bd927fa69d02982745cc1d61e9a4f8b3':
  Fixing regression with black task bar background. (Bug 17584337)
 2014-10-01 15:00:17 +00:00
Chris Wren
b742c9a012 am c3328cac: Merge "Add a returns clause to the matchesInterruptionFilter javadoc." into lmp-dev 
* commit 'c3328cacdad67623f94b13fceb734d958461a475':
  Add a returns clause to the matchesInterruptionFilter javadoc.
 2014-10-01 14:59:59 +00:00
Chris Wren
4afe428f49 am af098c56: Merge "Update the documentation on EXTRA_PEOPLE." into lmp-dev 
* commit 'af098c5657942d645ec7362cc439718457abec64':
  Update the documentation on EXTRA_PEOPLE.
 2014-10-01 14:59:55 +00:00
Paul Jensen
a524b0f786 am 8df099df: Make CaptivePortalLogin app exit if underlying Network disconnects. 
* commit '8df099df1516d23c113be3121635dcd34984a4a0':
  Make CaptivePortalLogin app exit if underlying Network disconnects.
 2014-10-01 14:59:47 +00:00
Alexandra Gherghina
d7275ae2c2 am 75c33d9d: Merge "Adds the ability to start a user in background" into lmp-dev 
* commit '75c33d9d04d8c0a9884a70077681261b57c7833c':
  Adds the ability to start a user in background
 2014-10-01 14:59:23 +00:00
Dianne Hackborn
29a1152358 am c3014c8c: Merge "Fix issue #17705755: Battery stats resets at incorrect times" into lmp-dev 
* commit 'c3014c8cf8932cb6a482e985edc7def97c50eede':
  Fix issue #17705755: Battery stats resets at incorrect times
 2014-10-01 14:59:18 +00:00
Winson Chung
2396f13567 am e3206407: Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev 
* commit 'e3206407a5968dcf6690793f047bdfede0424df5':
  Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
 2014-10-01 14:59:12 +00:00
John Spurlock
260e6d542f am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev 
* commit 'a1b84165f9520c025c59f5b2d93a65d4609b8088':
  Don't play hint animations when dozing
 2014-10-01 14:59:07 +00:00
Jason Monk
1534999124 am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev 
* commit 'e7b18d2bab30ca257b63e9029c6e08b9700b89a6':
  Pull roaming from mServiceState for consistency
 2014-10-01 14:58:57 +00:00
George Mount
3dc0a91874 am 8afceda1: Merge "Clear preordered list after use." into lmp-dev 
* commit '8afceda14176b911cf755b8ebbcfbfa9eff60aae':
  Clear preordered list after use.
 2014-10-01 14:58:53 +00:00
John Spurlock
af41d8477a am ee98df79: Doze: Log screenOnFromTouch when flinging. 
* commit 'ee98df79a1797323aaa6d645e9cd5dc6a7cc0ee4':
  Doze: Log screenOnFromTouch when flinging.
 2014-10-01 14:58:45 +00:00
Selim Cinek
1aca1d4110 Adapting translation length for a string in a dialog 
Bug: 17344905
Change-Id: Id95bdfea30c8ffd86a44cfa259cf5417abb09528
 2014-10-01 14:12:11 +02:00
Narayan Kamath
7dc7f676d6 Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev 2014-10-01 09:53:34 +00:00
Baligh Uddin
42d0c353ff Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-01 04:25:43 +00:00
Baligh Uddin
3022aa2175 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-01 04:25:35 +00:00
Brian Carlstrom
7123bd690f Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev 2014-10-01 04:21:26 +00:00
Ricardo Cervera
1ed09f9b5b am e906b38b: am 781c988a: am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs 
* commit 'e906b38b7e692d05cf57ce12aabcb103a9a8b775':
  docs: ADT beginner text fix
 2014-10-01 03:15:45 +00:00
Ricardo Cervera
e906b38b7e am 781c988a: am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs 
* commit '781c988a767eabf9b1b03b4a74f21e3b687902b6':
  docs: ADT beginner text fix
 2014-10-01 03:08:30 +00:00
Ricardo Cervera
781c988a76 am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs 
* commit 'ae7b5dc49381e76c82cda928cc37a6a8b529da25':
  docs: ADT beginner text fix
 2014-10-01 02:57:29 +00:00
Jeff Brown
62434d6a4b Merge "Reduce latency from doze to screen on." into lmp-dev 2014-10-01 02:31:30 +00:00
Ricardo Cervera
ae7b5dc493 Merge "docs: ADT beginner text fix" into klp-modular-docs 2014-10-01 02:07:15 +00:00
Sungsoo Lim
ee33c661ef Merge "Update java doc for content rating systems" into lmp-dev 2014-10-01 01:46:26 +00:00
Jerome Poichet
72079f7f9b Merge "Make sure cancel is called on tear down." into lmp-dev 2014-10-01 01:22:42 +00:00
Dianne Hackborn
62321ab114 Merge "Maybe fix issue #17700474: manta: high occurrence of device booted..." into lmp-dev 2014-10-01 01:16:15 +00:00
Dianne Hackborn
7622a0f8e4 Maybe fix issue #17700474: manta: high occurrence of device booted... 
...but dev.bootcomplete flag is not set

Rework things to address a few issues I found:

- When the activity goes idle, the way we were handling finishing the
  boot there was calling finishBooting() with the lock held, but it
  shouldn't.  We now dispatch that and turning on the screen together
  in a separate message.

- Make sure we don't try to start the home activity until we have
  reached the point of the system being ready and mBooting being set.
  This ensures we don't do any work prematurely.

Change-Id: If30c1f287af73bc2164e7aadbe98022ae42cc5e7
 2014-09-30 18:05:18 -07:00
Jeff Brown
0a434776b8 Reduce latency from doze to screen on. 
Don't wait for the brightness ramp to complete before reporting
display ready.  Keep track of whether we have any unfinished
brightness changes and take care to grab a wakelock to ensure
they are eventually applied.

Ideally we would rewrite the whole state machine to more carefully
coordinate screen state and brightness changes but that's too
risky for now.

The pixel fairies are having a bad day.

Bug: 17718416

(cherry picked from commit 875f80c2732a3fbe652a6e8fc14031041f791308)

Change-Id: I7a2d8ba4591a12b773653d3dbf86c7db016f967e
 2014-09-30 18:00:40 -07:00
Jerome Poichet
c1fb6dc1a4 Make sure cancel is called on tear down. 
- Make sure cancel is called when consumer of SpeechRecognizer calls
  destroy.
- If consumer goes away, make sure to call cancel as well.

b/17584947 Pressing mic button in Music hoses audio

Change-Id: Ibe1198b37fe6167493a8694f9089d970f1eb07de
 2014-09-30 17:56:27 -07:00
Matthew Williams
d55d3c597a am bc156ba4: Merge "Fix deadlock caused by clearAllBackoffs in SSE" into lmp-dev 
* commit 'bc156ba430d286aaab8deb7bbb3bccc655cd2e92':
  Fix deadlock caused by clearAllBackoffs in SSE
 2014-10-01 00:52:38 +00:00
Lorenzo Colitti
6c1d0e0784 am d8f7e048: Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev 
* commit 'd8f7e048281559462f9c590f9d7d48fb7fe065ce':
  Update LegacyTypeTracker state before sending connect broadcasts.
 2014-10-01 00:52:34 +00:00
Scott Rowe
8cfba20560 am d1462247: am 6287a65c: am 294d5347: am 9d20628b: docs: b/16044763 Update IAB docs to give notice of v2 turndown 
* commit 'd1462247e05dab10d20372249e9a3ef7ef93fc2e':
  docs: b/16044763 Update IAB docs to give notice of v2 turndown
 2014-10-01 00:52:07 +00:00
Ricardo Cervera
d4a2da0494 am 3910b5d2: am 6ea34ddf: am 9f483941: am 808440cd: Merge "docs: Fixed path for build output." into klp-modular-docs 
* commit '3910b5d2f55b613191610905a4ae25aa3d3a1d15':
  docs: Fixed path for build output.
 2014-10-01 00:52:04 +00:00
Justin Koh
8dd8818bde am 91bd8769: am 92ffd6b5: (-s ours) am 28d01e67: Merge "DO NOT MERGE Disable vibration from notificationmanagerservice when on watch" into klp-modular-dev 
* commit '91bd87699137a4ec9f4dc249592401005303f945':
  DO NOT MERGE Disable vibration from notificationmanagerservice when on watch
 2014-10-01 00:52:00 +00:00
Alan Viverette
5220859012 am 76e15c4b: Merge "Decrease date picker height to avoid cutting off calendar" into lmp-dev 
* commit '76e15c4b3affbca016f6ecc3dbf302db9b64bbe4':
  Decrease date picker height to avoid cutting off calendar
 2014-10-01 00:51:57 +00:00
Alan Viverette
35ebdd0514 am b805da9b: Merge "Fix drawable container tinting" into lmp-dev 
* commit 'b805da9b592e67cb777b78db3a96d47c60e31ca7':
  Fix drawable container tinting
 2014-10-01 00:51:37 +00:00
Jean-Michel Trivi
0ed179d185 am 4a154af9: Merge "Send volume keys to the default stream if not actually playing" into lmp-dev 
* commit '4a154af9aad13c09821ada6187440feaec2d38e8':
  Send volume keys to the default stream if not actually playing
 2014-10-01 00:51:32 +00:00
Dianne Hackborn
069de2045e am 38646c19: Merge "Work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '38646c19d8badea143113c0dc48ccdacb18badc4':
  Work on issue #17656716: Unhandled exception in Window Manager
 2014-10-01 00:51:10 +00:00
Chris Craik
505c9d2ce0 am e910cc88: Merge "Implement alpha as documented for drawables" into lmp-dev 
* commit 'e910cc88387f49b119bb2f8e579849864970ac87':
  Implement alpha as documented for drawables
 2014-10-01 00:50:59 +00:00
Fabrice Di Meglio
b08fc7ec1b am df61d004: Fix bug #17682629 Crash while accessing apps\' settings 
* commit 'df61d0046cb901f75d2758aa443190371b4cc746':
  Fix bug #17682629 Crash while accessing apps' settings
 2014-10-01 00:50:56 +00:00
Amit Mahajan
496aeb1a61 Merge "Roaming blacklist" into lmp-dev 2014-10-01 00:44:03 +00:00
Sungsoo Lim
d3f17921bd Update java doc for content rating systems 
- DVB and ISDB ratings are added.
- Remove rating systems whose countries uses DVB and ISDB.
- Updated java doc for AR, AU, and BR.

Bug: 17494772
Change-Id: Ia2a63c7914148b42078decb8de1ae45baefb010d
 2014-10-01 09:41:51 +09:00
Adam Lesinski
cd8e73817d Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev 2014-10-01 00:39:57 +00:00
w19976
a902fe5fbf Roaming blacklist 
Bug: 17684236
Change-Id: I3e4a293ed8ae134d77fe3ce0c0cfa3b6012500a8
 2014-10-01 00:37:19 +00:00
Alan Viverette
c2379e005d Merge "Add activated text colors, update Material preference header" into lmp-dev 2014-10-01 00:35:02 +00:00
Alan Viverette
191807e386 Merge "Remove baked-in shadow insets from Material dialog minHeight" into lmp-dev 2014-10-01 00:32:39 +00:00
Alan Viverette
b21e5662d5 Remove baked-in shadow insets from Material dialog minHeight 
We don't bake in shadows anymore, so this was making the minimum
content area way too tall.

BUG: 17700338
Change-Id: I728693654a6dc1c8d75a258746409b61639dccfc
 2014-09-30 17:07:25 -07:00
Vineeta Srivastava
ab1e241d38 Merge "Show one name if both plmn and spn are equal" into lmp-dev 2014-10-01 00:03:34 +00:00
Vineeta Srivastava
575bf7e6cc Merge "Correct MTU size for Bell" into lmp-dev 2014-10-01 00:00:02 +00:00