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

86952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
45ada3ac78 am 45937740: am b1861c3e: Minor fixes/clarifications for previous patch. 
* commit '4593774015ada7fb92f846fced136e487cd1e522':
  Minor fixes/clarifications for previous patch.
 2012-09-17 14:44:34 -07:00
Jim Miller
c2624e8c91 am d95129a7: am b45965f5: Merge "Fix keyguard timeout dialog messages" into jb-mr1-dev 
* commit 'd95129a76eb77d881ee138d7ae654ab01995733a':
  Fix keyguard timeout dialog messages
 2012-09-17 14:44:30 -07:00
Adam Powell
c86dae2337 am 3b6dc021: am 7db4eec5: Merge "Squish!" into jb-mr1-dev 
* commit '3b6dc021de2d19c021058df5af4fb8a05613d113':
  Squish!
 2012-09-17 14:44:26 -07:00
Craig Mautner
7ecd0387d2 am 2386be50: am a91f9e29: Make more items per-Display. 
* commit '2386be50d03df41d183fe0017c7560e078374439':
  Make more items per-Display.
 2012-09-17 14:44:18 -07:00
Dianne Hackborn
397c1d8467 am 0fd909ba: am d65afc65: Merge "More multi-user stuff." into jb-mr1-dev 
* commit '0fd909bad1151cc39061abb52ae5b8be090e05dd':
  More multi-user stuff.
 2012-09-17 14:44:10 -07:00
Dianne Hackborn
c2ce886339 am 6b655130: am 398bad04: Merge "Fix debug log." into jb-mr1-dev 
* commit '6b655130e7258da1aa40860e58852f9f5370bfbd':
  Fix debug log.
 2012-09-17 14:44:05 -07:00
Jeff Sharkey
40210f98ba am 06f01326: am d0c6ccba: Move NetworkPolicy from apps to UID. 
* commit '06f01326dfd9e2ee557fd817481081bc3f36e35e':
  Move NetworkPolicy from apps to UID.
 2012-09-17 14:43:36 -07:00
Jeff Sharkey
de878ea4e9 am a6bb5cd8: am ee100445: Updating public API. 
* commit 'a6bb5cd8d2a8daf7f5fdecb675c35bc1fd4459c5':
  Updating public API.
 2012-09-17 14:43:32 -07:00
Jeff Sharkey
e048529645 am d57f7dc4: am b3571a6c: Merge "Fix build" into jb-mr1-dev 
* commit 'd57f7dc4646617c30c1e2d11da32c4622807de87':
  Fix build
 2012-09-17 14:43:28 -07:00
Elliott Hughes
4ab0a648eb am cbcf02a8: am edf60d3d: Fix up symbols.xml. 
* commit 'cbcf02a84c51f5b4251f90fe1c7576f08f5afb19':
  Fix up symbols.xml.
 2012-09-17 14:43:24 -07:00
Elliott Hughes
89d2ce747d am fdd1b659: am c3ff72f5: Use icu4c for CLDR "yesterday", "today", and "tomorrow" strings. 
* commit 'fdd1b6597bfcc7efc2d0cee4717253e40f718459':
  Use icu4c for CLDR "yesterday", "today", and "tomorrow" strings.
 2012-09-17 14:43:21 -07:00
Elliott Hughes
d4d642c9e7 resolved conflicts for merge of 138ab322 to master 
Change-Id: I88155002a396dbe196de6178e7c2c16cfa30c819
 2012-09-17 14:34:50 -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
Baligh Uddin
9513aa7bab Merge "Import translations. DO NOT MERGE" 2012-09-17 14:26:19 -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
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
Elliott Hughes
8e15aba660 resolved conflicts for merge of c3fb4a16 to master 
Change-Id: I59f6bc36fcdac09c08ebe4510c5360464b4e7c01
 2012-09-17 14:12:31 -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
3987a03261 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:16 -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
Baligh Uddin
78e148a0a7 Import translations. DO NOT MERGE 
Change-Id: Iac097c30e92b1e1550be710b3cc6705e1df7d29a
Auto-generated-cl: translation import
 2012-09-17 13:39:16 -07:00
Elliott Hughes
08870affdc resolved conflicts for merge of 8b1109a9 to master 
Change-Id: I37fff092e4e6534caa97e1af57da75818ea14b30
 2012-09-17 13:37:35 -07:00
Jeff Brown
39b9c91ebf am e2fb5190: Merge "Swap remote submix initialization order." into jb-mr1-dev 
* commit 'e2fb51900cb6df51b2dffc80c35ecbbaf47d3f4b':
  Swap remote submix initialization order.
 2012-09-17 13:35:15 -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
6b045d3a13 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:24 -07:00
Chet Haase
ee6113a620 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:20 -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
62fb1abca1 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:03:18 -07:00
Romain Guy
9f5f80e7a6 Merge "Fix modulation and gamma correction issues" into jb-mr1-dev 2012-09-17 12:51:08 -07:00
Amith Yamasani
83385eccc5 am e645324e: Merge "Add UserManager.getUserIcon()" into jb-mr1-dev 
* commit 'e645324e6bb42075b2e3b37d776e180a51091f96':
  Add UserManager.getUserIcon()
 2012-09-17 12:48:10 -07:00
Elliott Hughes
3405dbb7a7 am 0e29ed2e: am a8deafb4: Merge "Deprecate those parts of DateUtils the documentation says not to use." into jb-mr1-dev 
* commit '0e29ed2ed5c2b22a99474ad8b8414fade13a1ea9':
  Deprecate those parts of DateUtils the documentation says not to use.
 2012-09-17 12:47:10 -07:00
Christopher Tate
5067ea3751 am 5bae602c: am 2892dfbe: Merge "Fix default population of wifi settings" into jb-mr1-dev 
* commit '5bae602cbbb96af3290d430ab25600149d4d073d':
  Fix default population of wifi settings
 2012-09-17 12:47:03 -07:00
Daniel Sandler
dc5a1b8758 am 2dd7cb6f: am 8dd9206a: Fix NPE in rotation lock QS. 
* commit '2dd7cb6f6af8622c2b0b3c4f07466010f45b9460':
  Fix NPE in rotation lock QS.
 2012-09-17 12:46:59 -07:00
Geremy Condra
393760861d am 81953a34: am 74a550fa: Merge "Change verifyServerDomainAndCertificates to pass in a hostname." into jb-mr1-dev 
* commit '81953a3437c3af24dfb53cc7c106147d9a89be1f':
  Change verifyServerDomainAndCertificates to pass in a hostname.
 2012-09-17 12:46:56 -07:00
Kenny Root
24499c9e50 am 049005e3: am 1c9894aa: Merge "Remove AndroidKeyStore from API" into jb-mr1-dev 
* commit '049005e3c55b5f5dfda1c69482c6104d5931a2fc':
  Remove AndroidKeyStore from API
 2012-09-17 12:46:13 -07:00
Irfan Sheriff
e05c46df9c am 0c913cda: am 42496826: Merge "Fix suspend bugs" into jb-mr1-dev 
* commit '0c913cda955464d18f798eb47d7f8b19a46dfd35':
  Fix suspend bugs
 2012-09-17 12:46:08 -07:00
Amith Yamasani
e645324e6b Merge "Add UserManager.getUserIcon()" into jb-mr1-dev 2012-09-17 12:46:01 -07:00
Elliott Hughes
7850a41871 am 42e7af25: am 9ceede6d: am 086676a4: am f5437ee8: am 297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use." 
* commit '42e7af25c06e2d1dbf8201d1ff1528311cf8c44e':
  Deprecate those parts of DateUtils the documentation says not to use.
 2012-09-17 12:45:47 -07:00
rich cannings
ecfc9d8253 am d063b14d: am 0b62fa23: Merge "Send more information to verifiers" into jb-mr1-dev 
* commit 'd063b14dc8ef3cdf63d658b5375bf84b5cb1dc02':
  Send more information to verifiers
 2012-09-17 12:45:31 -07:00
Svetoslav Ganov
f701d1eb71 am 873d49a6: am 8b681cb8: Some formatting missed in the previous patch 
* commit '873d49a670df369c6ad5d125581fdc182114d05b':
  Some formatting missed in the previous patch
 2012-09-17 12:45:18 -07:00
Svetoslav Ganov
664222b066 am acbea737: am 3efa8bab: Merge "Adding accessibility events for touch and gesture detection states." into jb-mr1-dev 
* commit 'acbea737ec97f0fd15f2818196495b2355094065':
  Adding accessibility events for touch and gesture detection states.
 2012-09-17 12:45:14 -07:00
Irfan Sheriff
55f713c787 am 8e05462e: am b4ad71ae: Merge "Increase GO idle time out to 5 seconds" into jb-mr1-dev 
* commit '8e05462e5499eac7efa61b324e357a598de1c8dc':
  Increase GO idle time out to 5 seconds
 2012-09-17 12:45:10 -07:00
Baligh Uddin
8b2ce341dc am 316ac07a: (-s ours) am c3a691ec: Merge "Add day_of_week_medium_* and day_of_week_short_* for Persian [fa]" into jb-mr1-dev 
* commit '316ac07afaf9a97034dc7b39f4b2068984bc23bd':
  Add day_of_week_medium_* and day_of_week_short_* for Persian [fa]
 2012-09-17 12:45:04 -07:00
Amith Yamasani
3b49f07a45 Add UserManager.getUserIcon() 
So that we don't abuse the setUserIcon() for reading. So the new method won't try
to create the file, only return it if it exists.

Change-Id: I7a81d3f1b29d14d37e71f531744ce39f21d827ac
 2012-09-17 12:42:00 -07:00