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

105818 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
c0b998d295 am 865047f8: am 6e3c1222: am 47029086: am 2f55af55: add redirects for UI guideline docs, as per change: I9b896e6c88701044f572ab79813d43c2f34b81b9 
* commit '865047f80c04a2c539d6d5052fca5436dcb7e0e3':
  add redirects for UI guideline docs, as per change: I9b896e6c88701044f572ab79813d43c2f34b81b9
 2013-06-06 12:54:36 -07:00
Scott Main
865047f80c am 6e3c1222: am 47029086: am 2f55af55: add redirects for UI guideline docs, as per change: I9b896e6c88701044f572ab79813d43c2f34b81b9 
* commit '6e3c1222f06bf5b3be271a06e32d371c68fafb0e':
  add redirects for UI guideline docs, as per change: I9b896e6c88701044f572ab79813d43c2f34b81b9
 2013-06-06 12:51:53 -07:00
Scott Main
6e3c1222f0 am 47029086: am 2f55af55: add redirects for UI guideline docs, as per change: I9b896e6c88701044f572ab79813d43c2f34b81b9 
* commit '47029086ca4fee758df1ee015d6534bd566647a1':
  add redirects for UI guideline docs, as per change: I9b896e6c88701044f572ab79813d43c2f34b81b9
 2013-06-06 12:49:35 -07:00
Scott Main
47029086ca am 2f55af55: add redirects for UI guideline docs, as per change: I9b896e6c88701044f572ab79813d43c2f34b81b9 
* commit '2f55af55fca237b8d675dbe5b1b7da1821d630fc':
  add redirects for UI guideline docs, as per change: I9b896e6c88701044f572ab79813d43c2f34b81b9
 2013-06-06 12:46:41 -07:00
Scott Main
2f55af55fc add redirects for UI guideline docs, 
as per change: I9b896e6c88701044f572ab79813d43c2f34b81b9

Change-Id: I81edd9e30e8d522adb185c8dab8d303577ef6f01
 2013-06-06 12:44:16 -07:00
Scott Main
bf0abee6ce am b4825b0e: am c090ce8c: am c5131567: am 2d312a98: Merge "add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and includ 
* commit 'b4825b0e55b71ff0aca96a560802f3355e3db5a7':
  add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya know, irony.
 2013-06-06 12:09:56 -07:00
Scott Main
b4825b0e55 am c090ce8c: am c5131567: am 2d312a98: Merge "add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, 
* commit 'c090ce8c6f0d8c4fc176be4bb182548f11a3a13e':
  add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya know, irony.
 2013-06-06 12:07:14 -07:00
Scott Main
c090ce8c6f am c5131567: am 2d312a98: Merge "add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya k 
* commit 'c51315674f27a12840c9e12d1ec7e0006bdba054':
  add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya know, irony.
 2013-06-06 12:05:37 -07:00
Scott Main
c51315674f am 2d312a98: Merge "add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya know, irony." 
* commit '2d312a987aa768c148c16742d6ad622279fb6e42':
  add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya know, irony.
 2013-06-06 12:04:03 -07:00
Scott Main
2d312a987a Merge "add design tips to iconography page. Accounts for the removal of the previous UI guideline pages, which is where most of this new content came from. Also update figure to add xxhdpi and remove ldpi, and include 2x version, because ya know, irony." into jb-mr1.1-ub-dev 2013-06-06 19:02:41 +00:00
Joe Malin
7b34346d48 am a2425f68: Merge "Doc bug B9297954: Fixes to Location APIs" into jb-mr2-dev 
* commit 'a2425f6825a88fb04f3a22e018311bf2e2a5ac4e':
  Doc bug B9297954: Fixes to Location APIs
 2013-06-06 10:53:36 -07:00
Dirk Dougherty
36631b44f2 am 758cedd1: am f1469855: am 86927797: am cf35c5e3: am 497584ed: am 16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs 
* commit '758cedd116f1c6ea4b8b936a76cd77d592868209':
  Doc change: fix broken link to localization checklist.
 2013-06-06 10:50:04 -07:00
Joe Malin
a2425f6825 Merge "Doc bug B9297954: Fixes to Location APIs" into jb-mr2-dev 2013-06-06 17:49:27 +00:00
Dirk Dougherty
758cedd116 am f1469855: am 86927797: am cf35c5e3: am 497584ed: am 16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs 
* commit 'f14698551aeb57dc1952413480cb72a0c8ffb620':
  Doc change: fix broken link to localization checklist.
 2013-06-06 10:47:34 -07:00
Dirk Dougherty
f14698551a am 86927797: am cf35c5e3: am 497584ed: am 16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs 
* commit '86927797869512f87e0ba6be5b83564e4a773b71':
  Doc change: fix broken link to localization checklist.
 2013-06-06 10:46:14 -07:00
Dirk Dougherty
8692779786 am cf35c5e3: am 497584ed: am 16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs 
* commit 'cf35c5e35d15f9ced64e739bd216dae7d0cbd8ae':
  Doc change: fix broken link to localization checklist.
 2013-06-06 10:43:34 -07:00
Dirk Dougherty
cf35c5e35d am 497584ed: am 16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs 
* commit '497584edbacb15b174901da21bc94f37528ac7d1':
  Doc change: fix broken link to localization checklist.
 2013-06-06 10:41:45 -07:00
Dirk Dougherty
497584edba am 16fdbd17: Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs 
* commit '16fdbd1729e9473f6176c88c59538fc5c371154f':
  Doc change: fix broken link to localization checklist.
 2013-06-06 10:39:22 -07:00
The Android Open Source Project
3fbf896c1f Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge 
Change-Id: I7ad4d9cdf2b0e666af7ac5791eb357703900969c
 2013-06-06 10:37:18 -07:00
Dirk Dougherty
16fdbd1729 Merge "Doc change: fix broken link to localization checklist." into jb-mr1.1-docs 2013-06-06 17:36:29 +00:00
Dirk Dougherty
f4483eca3a Doc change: fix broken link to localization checklist. 
Change-Id: I95bb57dcc0afe4ed31f89d9d2e9b31b1a7224bc7
 2013-06-06 10:34:40 -07:00
The Android Automerger
11dc1b3686 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-06 05:55:33 -07:00
kmccormick
cdd271d421 am 38bdf107: am 57394e3d: am 2fbe1094: am 3ef445a8: am 68291f33: am db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs 
* commit '38bdf107ba0abcce8b87bc87653c73191566d002':
  Doc update: Refactoring to client/server.
 2013-06-05 18:33:38 -07:00
kmccormick
38bdf107ba am 57394e3d: am 2fbe1094: am 3ef445a8: am 68291f33: am db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs 
* commit '57394e3daff094c28ee2a2fb886e1764a1b7728d':
  Doc update: Refactoring to client/server.
 2013-06-05 18:32:23 -07:00
kmccormick
57394e3daf am 2fbe1094: am 3ef445a8: am 68291f33: am db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs 
* commit '2fbe109466ba582663fdc0f98ff4b9aeeb15ce32':
  Doc update: Refactoring to client/server.
 2013-06-05 18:30:19 -07:00
kmccormick
2fbe109466 am 3ef445a8: am 68291f33: am db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs 
* commit '3ef445a80aea4670855f4cabe8072f16c1ff5128':
  Doc update: Refactoring to client/server.
 2013-06-05 18:27:50 -07:00
kmccormick
3ef445a80a am 68291f33: am db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs 
* commit '68291f33e03be5180dc5c921d71cafbc83507301':
  Doc update: Refactoring to client/server.
 2013-06-05 18:26:16 -07:00
kmccormick
68291f33e0 am db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs 
* commit 'db3158ead35f28ea31a7b6d87c50108cf972a9c0':
  Doc update: Refactoring to client/server.
 2013-06-05 18:25:12 -07:00
kmccormick
db3158ead3 Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs 2013-06-06 01:22:55 +00:00
kmccormick
f788ac1ab1 Doc update: Refactoring to client/server. 
Change-Id: I14e958958e69a6a56d2cc6da70b9123febd9955b
 2013-06-05 18:01:06 -07:00
Elliott Hughes
340df6c4f7 am 4d33a8ab: am fa6d6256: Merge "change "next" to "done" in minute IME option under 24-hour format" 
* commit '4d33a8aba33fa70e1e1a1c713e487a26a090bc25':
  change "next" to "done" in minute IME option under 24-hour format
 2013-06-05 16:26:04 -07:00
Elliott Hughes
4d33a8aba3 am fa6d6256: Merge "change "next" to "done" in minute IME option under 24-hour format" 
* commit 'fa6d6256e9052a5f5155ac97364170f6518e37a4':
  change "next" to "done" in minute IME option under 24-hour format
 2013-06-05 16:23:34 -07:00
Elliott Hughes
fa6d6256e9 Merge "change "next" to "done" in minute IME option under 24-hour format" 2013-06-05 23:20:37 +00:00
Dianne Hackborn
d270028c10 Maybe fix issue #9296868: Crash in system process 
There were some paths in LocationManagerService where
mRecivers was being accessed/modified without the lock held.
Update method names to indicate they need to be called with
lock held to make it more clear in the future when such a
problem may happen.

Change-Id: Ie2a9d019155ac7cedd1db298caca75b8fe382ca7
 2013-06-05 15:39:13 -07:00
Jeff Brown
5087b7f27c Fix regression in long-press home behavior on tablets. 
Some config.xml resources have values that vary based on the
configuration.  A previous change caused initialization to
occur at a time when the configuration is was not yet available.
This change fixes the problem.

Bug: 8891502
Change-Id: Ia768dc2308cc6ae5f11812c6bce6a6e116cfd759
 2013-06-05 15:39:07 -07:00
Baligh Uddin
3f77c59688 Import translations. DO NOT MERGE 
Change-Id: I9a9d3071332508b3efbb0bed4eeb435cdc5ba3d9
Auto-generated-cl: translation import
 2013-06-05 15:39:00 -07:00
Jeff Sharkey
85eae9c1aa Create missing Uids when recording network stats. 
Bug: 5543387
Change-Id: I138c8d2f84e6fd737f2f6ef0945e75ca31256e3d
 2013-06-05 15:38:53 -07:00
Dianne Hackborn
a79aaeae55 am 8c1d1b3e: Merge "Maybe fix issue #9296868: Crash in system process" into jb-mr2-dev 
* commit '8c1d1b3edff299ca6ef5739e044343b7f2c57f73':
  Maybe fix issue #9296868: Crash in system process
 2013-06-05 15:17:26 -07:00
Dianne Hackborn
8c1d1b3edf Merge "Maybe fix issue #9296868: Crash in system process" into jb-mr2-dev 2013-06-05 22:14:39 +00:00
Jeff Brown
b093ea59fe am f8038bdd: Merge "Fix regression in long-press home behavior on tablets." into jb-mr2-dev 
* commit 'f8038bddcea53d8dfe98e17c5d996b52a8eb5c4e':
  Fix regression in long-press home behavior on tablets.
 2013-06-05 15:03:25 -07:00
Jeff Brown
f8038bddce Merge "Fix regression in long-press home behavior on tablets." into jb-mr2-dev 2013-06-05 22:00:58 +00:00
Dianne Hackborn
f5fdca9dc1 Maybe fix issue #9296868: Crash in system process 
There were some paths in LocationManagerService where
mRecivers was being accessed/modified without the lock held.
Update method names to indicate they need to be called with
lock held to make it more clear in the future when such a
problem may happen.

Change-Id: Ie2a9d019155ac7cedd1db298caca75b8fe382ca7
 2013-06-05 14:53:33 -07:00
Scott Main
63fcfd5a52 am 06543a45: small cleanup of trigger event javadoc 
* commit '06543a4559b34abf91e34cb44438683e77e7db36':
  small cleanup of trigger event javadoc
 2013-06-05 14:41:51 -07:00
Scott Main
06543a4559 small cleanup of trigger event javadoc 
Change-Id: Ib8a0fc0a7ddac6259cc1bb9e8701b0d570a101c6
 2013-06-05 14:29:50 -07:00
Tim Murray
92b1bd5e6a am 47c892e5: Merge "Update RenderScript API guide." into jb-mr2-dev 
* commit '47c892e5b0224f7088202ecd1ef469556ed29209':
  Update RenderScript API guide.
 2013-06-05 13:46:59 -07:00
Tim Murray
379641a7ef am ea45ab6f: Merge "Improve RS documentation." into jb-mr2-dev 
* commit 'ea45ab6fbc1e45727b08cea0c865f4302a494412':
  Improve RS documentation.
 2013-06-05 13:46:56 -07:00
Tim Murray
47c892e5b0 Merge "Update RenderScript API guide." into jb-mr2-dev 2013-06-05 20:45:00 +00:00
Tim Murray
ea45ab6fbc Merge "Improve RS documentation." into jb-mr2-dev 2013-06-05 20:44:36 +00:00
Joe Malin
5b4438ebb3 Doc bug B9297954: Fixes to Location APIs 
Change-Id: I6c496fb46e0b35f3ee2be83369326ebf7be1a874
 2013-06-05 13:16:39 -07:00
Winson Chung
18748035bb am 379517b0: Merge "Fixing issue where AppWidgetHost.onProvidersChanged() was not being called. (Bug 9270309)" into jb-mr2-dev 
* commit '379517b0d4d47b45b52b40f09ba0eb1a039cb773':
  Fixing issue where AppWidgetHost.onProvidersChanged() was not being called. (Bug 9270309)
 2013-06-05 11:47:45 -07:00