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

85131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
e91f272b2b am 49a22f29: Merge "TaskStackBuilder correctness fixes" into jb-mr1-dev 
* commit '49a22f2969df6e4f53653d16400268e8d06aa1c2':
  TaskStackBuilder correctness fixes
 2012-09-17 17:18:13 -07:00
Adam Powell
49a22f2969 Merge "TaskStackBuilder correctness fixes" into jb-mr1-dev 2012-09-17 17:15:09 -07:00
Chet Haase
1335059e27 am a8a402f8: Merge "Fix bad shader code" into jb-mr1-dev 
* commit 'a8a402f8ad1549e23f4238786269bd548b6b445d':
  Fix bad shader code
 2012-09-17 17:14:42 -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
Marco Nelissen
c7fb118d90 Activity.onStop(Bundle) does not exist 
Since that method doesn't exist, the MediaFrameworkTest wake lock was
never released, which caused the test to be killed when the GC collected
the still active wake lock.

Change-Id: Iee2c0478470be987ade405a45abf42ca61b681ab
 2012-09-17 17:03:30 -07:00
Eric Laurent
b6397c7170 Update headphone volume safety warning message. 
Change-Id: Ic2d5d9d247b76b6ede0f90b861c235c1c0f5dc08
 2012-09-17 16:59:19 -07:00
Maxim Siniavine
a51c93b8a8 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-17 16:50:31 -07:00
Dianne Hackborn
131fa7fd55 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-17 16:50:27 -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
Geremy Condra
cd7f13475c Merge commit 'c31f5a7e' into manualmerge 
Conflicts:
	services/java/com/android/server/updatable/ConfigUpdateInstallReceiver.java

Change-Id: I40453434c04b2f41788b70e1d91f1777a8f7b120
 2012-09-17 16:23:57 -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
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
8ff52e113b am 417e267a: (-s ours) 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:49 -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
5acd08c197 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:32:21 -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
d945337174 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:34 -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
7b178ef6ec 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:35 -07:00
Amith Yamasani
54052ba0c5 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:53 -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
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
e09e3a1a0d 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:49 -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 989709a973448980f36dacd587b0a58f89ffa11e.

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
Scott Main
d67459ff19 new Google Play badges and some updates to corresponding pages 
Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468
 2012-09-17 14:15:34 -07:00
Adam Cohen
be2572af06 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:14:44 -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
Adam Cohen
5b50a25e6d Enabling hardware layers while overscrolling widget pager 
Change-Id: I94bef1aa614f91b115105adbb409def8027f3651
 2012-09-17 14:11:14 -07:00
Kenny Root
6a9b2cb7fe Use shared app gid for dalvik cache 
For forward-locked apps, we need to be able to read the optimized dex
file from a common place. Make it owned by the shared app GID as well.

Bug: 7178231
Change-Id: Ib36d79e8df69d58e8e1e0f167659df995dc84b84
 2012-09-17 14:02:39 -07:00
Nick Kralevich
5b1c8d33a7 Adjust FAQ. 
Change-Id: Ibab0e4be3b351bfcf3d759c3ddc77240334d9bfa
 2012-09-17 13:59:58 -07:00
Adam Powell
bf65d46f70 am e01538f2: Merge "TaskStackBuilder - use the correct package for looking up parents" into jb-mr1-dev 
* commit 'e01538f28b0e9bd0174d5e3f315747b3725b5bd4':
  TaskStackBuilder - use the correct package for looking up parents
 2012-09-17 13:56:26 -07:00
Adam Powell
e01538f28b Merge "TaskStackBuilder - use the correct package for looking up parents" into jb-mr1-dev 2012-09-17 13:54:31 -07:00
Jeff Brown
750963b467 am e2fb5190: Merge "Swap remote submix initialization order." into jb-mr1-dev 
* commit 'e2fb51900cb6df51b2dffc80c35ecbbaf47d3f4b':
  Swap remote submix initialization order.
 2012-09-17 13:35:21 -07:00
Jeff Brown
e2fb51900c Merge "Swap remote submix initialization order." into jb-mr1-dev 2012-09-17 13:32:41 -07:00
Adam Powell
6b6c90523e TaskStackBuilder - use the correct package for looking up parents 
Fix bug 7179104

Change-Id: Ia5d2d285cf22e97c452e0c385ef38c8bce330491
 2012-09-17 13:32:33 -07:00
Michael Jurka
82b38b6655 am 7109aad6: Merge "Fix issue where recents would not show up sometimes" into jb-mr1-dev 
* commit '7109aad6a17dbf8a4292477671b60f155effab38':
  Fix issue where recents would not show up sometimes
 2012-09-17 13:31:28 -07:00
Chet Haase
53615bccc4 am f74d2f2f: Merge "Fix occasional crash bug with layers" into jb-mr1-dev 
* commit 'f74d2f2fe8a157bee25516d2a6ae3e329507cb2c':
  Fix occasional crash bug with layers
 2012-09-17 13:31:25 -07:00
Michael Jurka
7109aad6a1 Merge "Fix issue where recents would not show up sometimes" into jb-mr1-dev 2012-09-17 13:29:03 -07:00
Chet Haase
f74d2f2fe8 Merge "Fix occasional crash bug with layers" into jb-mr1-dev 2012-09-17 13:29:03 -07:00
Romain Guy
3ca90f6788 am 9f5f80e7: Merge "Fix modulation and gamma correction issues" into jb-mr1-dev 
* commit '9f5f80e7a64d9388e3e73763b5c73dcddaa729fc':
  Fix modulation and gamma correction issues
 2012-09-17 13:02:29 -07:00
Romain Guy
9f5f80e7a6 Merge "Fix modulation and gamma correction issues" into jb-mr1-dev 2012-09-17 12:51:08 -07:00