Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,644 Commits 3 Branches 0 Tags
20f8c730a4d83a01ac92fc3f82129d523b4bc3ef
Commit Graph

85644 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
20f8c730a4 am c33f94e2: Merge "Fix API review bugs." into jb-mr1-dev 
* commit 'c33f94e2a50c9b03cb771237e8672743da8b1314':
  Fix API review bugs.
 2012-09-18 00:04:17 -07:00
Romain Guy
41dbb6fe35 am 82f385a3: Merge "Add extra EGL error checking" into jb-mr1-dev 
* commit '82f385a372329b767876ace2b3715a2d8ec13221':
  Add extra EGL error checking
 2012-09-18 00:04:12 -07:00
Michael Jurka
8075d7fa62 am 2bb25cd5: Merge "Fixing construction of handler in AppWidgetHost" into jb-mr1-dev 
* commit '2bb25cd57ae540160fa2fff2b929b68c448423a9':
  Fixing construction of handler in AppWidgetHost
 2012-09-18 00:04:08 -07:00
Irfan Sheriff
e8d79c87c2 am 218e2f19: Merge "Specify max go intent for wifi display" into jb-mr1-dev 
* commit '218e2f199b9ba568a815d64269ea0784e2d32935':
  Specify max go intent for wifi display
 2012-09-18 00:04:03 -07:00
Christopher Tate
1c9f740adb am f1aa107b: Merge "Per-user content observer APIs" into jb-mr1-dev 
* commit 'f1aa107b183189d65315d152148dc96b48f6e4b0':
  Per-user content observer APIs
 2012-09-18 00:03:57 -07:00
Irfan Sheriff
3323b6e66a am ca28410f: Merge "Increase idle time out to 25s" into jb-mr1-dev 
* commit 'ca28410f0d17f2ea0bd3455f9d21898c0790b301':
  Increase idle time out to 25s
 2012-09-18 00:03:53 -07:00
Adam Powell
52761d23b0 am 49a22f29: Merge "TaskStackBuilder correctness fixes" into jb-mr1-dev 
* commit '49a22f2969df6e4f53653d16400268e8d06aa1c2':
  TaskStackBuilder correctness fixes
 2012-09-18 00:03:49 -07:00
Chet Haase
21af425b4f am a8a402f8: Merge "Fix bad shader code" into jb-mr1-dev 
* commit 'a8a402f8ad1549e23f4238786269bd548b6b445d':
  Fix bad shader code
 2012-09-18 00:03:45 -07:00
Maxim Siniavine
7c6442ff06 am 04d5b9fb: Merge "Go to home screen after launching each app." into jb-mr1-dev 
* commit '04d5b9fbd1f9b8c7fa4af402166028c685574d62':
  Go to home screen after launching each app.
 2012-09-18 00:03:32 -07:00
Dianne Hackborn
c0b590932d am 4246f695: Merge "Try again to fix issue #6912004:tap on gmail notification sends me to home screen" into jb-mr1-dev 
* commit '4246f695f44386ce74d94f5be73cde409dc2dd12':
  Try again to fix issue #6912004:tap on gmail notification sends me to home screen
 2012-09-18 00:03:28 -07:00
Dianne Hackborn
c33f94e2a5 Merge "Fix API review bugs." into jb-mr1-dev 2012-09-17 18:22:38 -07:00
Romain Guy
82f385a372 Merge "Add extra EGL error checking" into jb-mr1-dev 2012-09-17 18:20:55 -07:00
Romain Guy
740ee65d46 Add extra EGL error checking 
Change-Id: I7cacef41ed08118c5eecf674e3d8461473692968
 2012-09-17 18:11:40 -07:00
Michael Jurka
2bb25cd57a Merge "Fixing construction of handler in AppWidgetHost" into jb-mr1-dev 2012-09-17 18:03:06 -07:00
Irfan Sheriff
218e2f199b Merge "Specify max go intent for wifi display" into jb-mr1-dev 2012-09-17 17:37:48 -07:00
Irfan Sheriff
7ab7260697 Specify max go intent for wifi display 
For p2p and sta single channel concurrency, we need the device
to be a GO

Change-Id: I8c3f180b8fc450238e24dace478f03cdf4e370a7
 2012-09-17 17:34:03 -07:00
Christopher Tate
f1aa107b18 Merge "Per-user content observer APIs" into jb-mr1-dev 2012-09-17 17:34:00 -07:00
Michael Jurka
e6d5545a53 Fixing construction of handler in AppWidgetHost 
Change-Id: I1253f8e2ea1621208ad7d65e5c860a1df075a44a
 2012-09-17 17:30:16 -07:00
Dianne Hackborn
8832c18d8b Fix API review bugs. 
7173152 API REVIEW: android.content.pm.PackageUserState
7172969 API REVIEW: android.app.PendingIntent
7172730 API REVIEW: android.content.Context
7172726 API REVIEW: android.manifest.permission

Change-Id: Iad470256d3b5ca5596487f6a699ec1871457c3b5
 2012-09-17 17:27:15 -07:00
Irfan Sheriff
ca28410f0d Merge "Increase idle time out to 25s" into jb-mr1-dev 2012-09-17 17:23:25 -07:00
Irfan Sheriff
968df85b8e Increase idle time out to 25s 
This is a work around for now. We will switch back to 5s once
the dongle is fixed

Change-Id: Ie21c2142c6a5db2cc2ae9247e42411c8daac4ff8
 2012-09-17 17:21:15 -07:00
Adam Powell
49a22f2969 Merge "TaskStackBuilder correctness fixes" into jb-mr1-dev 2012-09-17 17:15:09 -07:00
Chet Haase
a8a402f8ad Merge "Fix bad shader code" into jb-mr1-dev 2012-09-17 17:12:03 -07:00
Chet Haase
1c5c206953 Fix bad shader code 
Shader code missing "=" in a couple of cases.

Change-Id: Iff8a99a0ccb2903c30e2bdb2f698ef9b2e03d5d1
 2012-09-17 17:09:21 -07:00
Christopher Tate
16aa973617 Per-user content observer APIs 
Callers with INTERACT_ACROSS_USERS_FULL permission can now observe content
for a given user's view (and can notify content uri changes targeted to a
specific user).  An observer watching for UserHandle.USER_ALL will see all
notifications for the given uri across all users; similarly, a notifier
who specifies USER_ALL will broadcast the change to all observers across
all users.

The API handles both USER_ALL or USER_CURRENT, and explicitly forbids
any other "pseudouser" designations.

This CL also revs the Settings provider to notify with USER_ALL for
changes to global settings, and with only the affected user's handle
for all other changes.

Bug 7122169

Change-Id: I94248b11aa91d1beb0a36432e82fe5725bb1264f
 2012-09-17 16:35:36 -07:00
Maxim Siniavine
04d5b9fbd1 Merge "Go to home screen after launching each app." into jb-mr1-dev 2012-09-17 16:31:37 -07:00
Dianne Hackborn
4246f695f4 Merge "Try again to fix issue #6912004:tap on gmail notification sends me to home screen" into jb-mr1-dev 2012-09-17 16:19:14 -07:00
Adam Powell
75e0af8982 TaskStackBuilder correctness fixes 
* Don't mutate original intents when adding default flags.

* Add the relevant flags to the array returned by getIntents() such
  that it can be used directly in a call to startActivities or
  similar.

* Deep copy the component intents when building an intent array for
  getIntents()

* Clean up some internal code duplication

Change-Id: I71d3b7f30d4f7d8f1cce778d406ea0e513d382c5
 2012-09-17 16:16:55 -07:00
Geremy Condra
337e402657 am c31f5a7e: Merge "Add error information to event logs." into jb-mr1-dev 
* commit 'c31f5a7efe97952ba25b35e0eb9e6e59dc0d0e8e':
  Add error information to event logs.
 2012-09-17 16:09:28 -07:00
Geremy Condra
c31f5a7efe Merge "Add error information to event logs." into jb-mr1-dev 2012-09-17 16:07:46 -07:00
Geremy Condra
beb9d53971 Add error information to event logs. 
Change-Id: Ie4bbb888f4fac4db42a60b9fdd6818af24b834bd
 2012-09-17 16:06:17 -07:00
Dianne Hackborn
ad9b32115b Try again to fix issue #6912004:tap on gmail notification sends me to home screen 
Add a new call to the activity manager to tell it when the activity
is resumed, so it can mark its state as dirty then instead of when
it first tries to create it.

Also tweak things to update the LRU list for the upcoming activity
at the point we start pausing the current activity, to avoid an
inefficiency where we may decide to kill the process of the upcoming
activity if it is at the end of the LRU list.

Change-Id: Ia6dc8c34dc6d4b085a1efbe3a5d5f47721d55078
 2012-09-17 16:03:22 -07:00
Philip Milne
87c86a9392 am 417e267a: Merge "Revert "Simple MVC based binding mechanism for android controls." Do not merge." into jb-mr1-dev 
* commit '417e267a7507abfaddf9303dd2e925438bb7f0a6':
  Revert "Simple MVC based binding mechanism for android controls." Do not merge.
 2012-09-17 15:49:37 -07:00
Philip Milne
417e267a75 Merge "Revert "Simple MVC based binding mechanism for android controls." Do not merge." into jb-mr1-dev 2012-09-17 15:47:11 -07:00
Kenny Root
9c7ec4af3b am 4215017c: Merge "Use shared app gid for dalvik cache" into jb-mr1-dev 
* commit '4215017c12a4d522e20a6164ff33e8ca7da3a3bd':
  Use shared app gid for dalvik cache
 2012-09-17 15:31:56 -07:00
Kenny Root
4215017c12 Merge "Use shared app gid for dalvik cache" into jb-mr1-dev 2012-09-17 15:29:38 -07:00
Victoria Lease
976ed4711e am d6991106: Merge "Avert crash when dragging text in same TextView" into jb-mr1-dev 
* commit 'd6991106b02760749b974a2e369f72b2e0eed5a0':
  Avert crash when dragging text in same TextView
 2012-09-17 15:10:23 -07:00
Victoria Lease
d6991106b0 Merge "Avert crash when dragging text in same TextView" into jb-mr1-dev 2012-09-17 15:08:07 -07:00
Winson Chung
97b927a665 am f9c6a10d: Merge "Making QS scrollable and making numerous tweaks." into jb-mr1-dev 
* commit 'f9c6a10d3f5b6e9f478c31e3f989358edcc62db0':
  Making QS scrollable and making numerous tweaks.
 2012-09-17 15:02:29 -07:00
Winson Chung
f9c6a10d3f Merge "Making QS scrollable and making numerous tweaks." into jb-mr1-dev 2012-09-17 14:59:45 -07:00
Amith Yamasani
58cb80f6ce am 1d31d5ba: Merge "Start userId from 10, reserving 1-9 for special use in the future." into jb-mr1-dev 
* commit '1d31d5ba129007fc13bd0ed49a3e3cd60e748e7c':
  Start userId from 10, reserving 1-9 for special use in the future.
 2012-09-17 14:59:42 -07:00
Winson Chung
5f623011db Making QS scrollable and making numerous tweaks. 
- Updating new assets (all line up)
- Updating brightness tile to reflect auto state
- Fixing network tile asset colors
- Adding press feedback

Change-Id: I857f141258eefec65243454cb69905cbd2a10bf6
 2012-09-17 14:59:39 -07:00
Amith Yamasani
1d31d5ba12 Merge "Start userId from 10, reserving 1-9 for special use in the future." into jb-mr1-dev 2012-09-17 14:56:03 -07:00
Amith Yamasani
07a0ede729 Start userId from 10, reserving 1-9 for special use in the future. 
Change-Id: I3d0c1717d8b3add75ba43ed98e53ba02e6682c34
 2012-09-17 14:54:26 -07:00
Elliott Hughes
45b09c0044 am 7134ef60: Merge "Fix date formatting for fa locales." into jb-mr1-dev 
* commit '7134ef60b7ebe81b37dffdd65f22a9aae80e3d14':
  Fix date formatting for fa locales.
 2012-09-17 14:48:46 -07:00
Elliott Hughes
7134ef60b7 Merge "Fix date formatting for fa locales." into jb-mr1-dev 2012-09-17 14:45:42 -07:00
Philip Milne
8e1c2b6b71 Revert "Simple MVC based binding mechanism for android controls." Do not merge. 
This reverts commit 989709a973.

Change-Id: Ifc2c511b0d99d4a3a164b4a2281ca140015b366d
 2012-09-17 14:31:03 -07:00
Maxim Siniavine
a9d9decf87 Go to home screen after launching each app. 
Instead of starting one app after another the MemoryUsage
instrumentation goes to the home screen between
launching apps.

Change-Id: Ia0acf9f6f65a23f537b96c98743b59d746681447
 2012-09-17 14:21:20 -07:00
Adam Cohen
9999cf53f8 am e2f0ec89: Merge "Enabling hardware layers while overscrolling widget pager" into jb-mr1-dev 
* commit 'e2f0ec8923d42b47225225345a960e41dfbb5bd1':
  Enabling hardware layers while overscrolling widget pager
 2012-09-17 14:13:53 -07:00
Adam Cohen
e2f0ec8923 Merge "Enabling hardware layers while overscrolling widget pager" into jb-mr1-dev 2012-09-17 14:12:06 -07:00