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

4826 Commits

Author SHA1 Message Date
Fabrice Di Meglio
ce75fef756 Merge "Fix the build" into jb-mr1-dev 2012-09-30 11:36:47 -07:00
Fabrice Di Meglio
796e5bf9c3 Fix the build 
Change-Id: I82c31a0091ee46d9e4923cf08f73f3db213c0762
 2012-09-30 11:32:33 -07:00
Dianne Hackborn
fc4947491f Update APIs to JB MR1 level 17. 
17 is current, resources are fixed, cleanup is done.

Change-Id: I6de446e209f59c5dd5fe1cde311776ab222817ea
 2012-09-30 11:24:23 -07:00
Fabrice Di Meglio
93cea34a7f am f2e5cf48: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit 'f2e5cf487e9bda4da1b902cb5c816ba48c9b7004':
  Fix bug #6427629 Clean up layout direction APIs
 2012-09-30 10:55:18 -07:00
Fabrice Di Meglio
f2e5cf487e Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 2012-09-30 10:53:26 -07:00
Adam Cohen
82ebe6f777 Getting rid of keyguard widget flag that isn't used 
-> issue 7238875

Change-Id: Ifad890b4061784889f3fc7711a165452cf230fbd
 2012-09-28 19:33:05 -07:00
Fabrice Di Meglio
343e11345e Fix bug #6427629 Clean up layout direction APIs 
- remove onPaddingChanged(int) and fold it into onRtlPropertiesChanged(int)

Change-Id: I1d7f02d2b4538c6c991bd4285501bbc73e6aa5c3
 2012-09-28 18:26:07 -07:00
Dianne Hackborn
66e9275226 am 84215565: Merge "Fix issue #7255954: API Review: rename Dream to DreamService" into jb-mr1-dev 
* commit '84215565dd5dda84db7fd35b8ae4ccb571465cd2':
  Fix issue #7255954: API Review: rename Dream to DreamService
 2012-09-28 18:20:02 -07:00
Dianne Hackborn
be87e2f588 Fix issue #7255954: API Review: rename Dream to DreamService 
Change-Id: I89ecf2c3ec4fef09c0495aa68de11576f9cfd872
 2012-09-28 17:42:39 -07:00
Fabrice Di Meglio
3c26928062 am 2f37d37c: am 8af2a13d: Merge "Fix bug # 7172247 API REVIEW: android.view.ViewGroup.MarginLayoutParams" into jb-mr1-dev 
* commit '2f37d37c60ab3572b09fc06d2380624456a83666':
  Fix bug # 7172247 API REVIEW: android.view.ViewGroup.MarginLayoutParams
 2012-09-28 12:39:05 -07:00
Fabrice Di Meglio
658d260b1a am b1b6be8b: am 669aa7cb: Merge "Other improvements for bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit 'b1b6be8bc36a95eab263c04cc77d3b7d29ca06f4':
  Other improvements for bug #6427629 Clean up layout direction APIs
 2012-09-28 12:37:19 -07:00
Fabrice Di Meglio
4287bb6040 am 8af2a13d: Merge "Fix bug # 7172247 API REVIEW: android.view.ViewGroup.MarginLayoutParams" into jb-mr1-dev 
* commit '8af2a13d038002522c2f4e5d65bd703db9f86a08':
  Fix bug # 7172247 API REVIEW: android.view.ViewGroup.MarginLayoutParams
 2012-09-28 12:36:18 -07:00
Fabrice Di Meglio
778aea3926 am 669aa7cb: Merge "Other improvements for bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit '669aa7cb35e0d32fbf6f26a44e5ab8f6fae37de9':
  Other improvements for bug #6427629 Clean up layout direction APIs
 2012-09-28 12:34:33 -07:00
Fabrice Di Meglio
8af2a13d03 Merge "Fix bug # 7172247 API REVIEW: android.view.ViewGroup.MarginLayoutParams" into jb-mr1-dev 2012-09-28 12:33:49 -07:00
Fabrice Di Meglio
669aa7cb35 Merge "Other improvements for bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 2012-09-28 12:31:46 -07:00
Adam Powell
b2d4daac01 am 9e7bf523: am f7910e31: Merge "Add wireless display selection support to MediaRouter." into jb-mr1-dev 
* commit '9e7bf523468bc93a98d2117f3dc943f665a5a441':
  Add wireless display selection support to MediaRouter.
 2012-09-28 12:24:07 -07:00
Adam Powell
4adcf4d348 am f7910e31: Merge "Add wireless display selection support to MediaRouter." into jb-mr1-dev 
* commit 'f7910e3148cd5ea21c9c3cdb7023c997139264ce':
  Add wireless display selection support to MediaRouter.
 2012-09-28 12:22:16 -07:00
Adam Powell
705ab808cf Add wireless display selection support to MediaRouter. 
* Adds the new route type LIVE_VIDEO

* Wireless displays support both LIVE_VIDEO and LIVE_AUDIO, making
  wireless display routes valid selections in when apps make selecting
  live audio routes available.

* MediaRouter will only report/manipulate wireless displays that have
  already been paired at the system level.

Bug 7177920

Change-Id: Ic221b8687d77b4c0df9801c396b74870e86206e9
 2012-09-28 11:46:40 -07:00
Jeff Sharkey
b81c7bb932 am 65f4de10: am 3a8af8ef: Merge "Migrate more Secure settings to Global." into jb-mr1-dev 
* commit '65f4de101fa8d5752603c6e79536c3a17f585490':
  Migrate more Secure settings to Global.
 2012-09-28 00:36:41 -07:00
Adam Cohen
a2ba6f9202 am 080ee3ef: am 580ee8b0: Merge "Fixing AppWidgetService / AppWidgetHost to work in system process" into jb-mr1-dev 
* commit '080ee3ef55ec32bc6a3254814f9fd717767dfa7e':
  Fixing AppWidgetService / AppWidgetHost to work in system process
 2012-09-28 00:33:42 -07:00
Jeff Sharkey
ae1af49a91 am 3a8af8ef: Merge "Migrate more Secure settings to Global." into jb-mr1-dev 
* commit '3a8af8efff93ca8ee80fc8c7841e7bee9a8b7786':
  Migrate more Secure settings to Global.
 2012-09-27 19:34:28 -07:00
Fabrice Di Meglio
03b8d3a9a4 Fix bug # 7172247 API REVIEW: android.view.ViewGroup.MarginLayoutParams 
- remove isLayoutRtl() from public API

Change-Id: If700e3f5f30e3c98403b48dbcdd892535d929e2d
 2012-09-27 17:05:27 -07:00
Fabrice Di Meglio
9a04856d5e Other improvements for bug #6427629 Clean up layout direction APIs 
- hide isLayoutRtl() from public API

- canResolveXXX() is now smarter: use recursion to get its returned value

- in ViewGroup, if resolution cannot be done then dont ask resolution for
its children

- in ViewGroup, addViewInner() needs to ask to resolve the child. This is
needed for example by ListView which is using the same measurespec before
and after its childs being attached.

It also take care of the general case where a measure pass is done when not
attached to a parent (and thus asking for resolution that will "fail" if we
are using IHNERIT) and never done again. That would lead to never do a
resolution.

- some code refactoring

Change-Id: I120dd2fef7397944f5ba8deff0686b108dc827d2
 2012-09-27 16:39:14 -07:00
Jeff Sharkey
625239a054 Migrate more Secure settings to Global. 
Migrate networking, storage, battery, DropBox, and PackageManager
related Secure settings to Global table.

Bug: 7232014, 7231331, 7231198
Change-Id: I772c2a9586a2f708c9db95622477f235064b8f4d
 2012-09-27 16:22:53 -07:00
Adam Cohen
d086ee036e am 580ee8b0: Merge "Fixing AppWidgetService / AppWidgetHost to work in system process" into jb-mr1-dev 
* commit '580ee8b0c6e1aea1e2e1d60499b603b9168b44f0':
  Fixing AppWidgetService / AppWidgetHost to work in system process
 2012-09-27 11:19:28 -07:00
Adam Cohen
580ee8b0c6 Merge "Fixing AppWidgetService / AppWidgetHost to work in system process" into jb-mr1-dev 2012-09-27 11:17:20 -07:00
Jeff Sharkey
4cabbc5be7 am f57fcddb: am 68b7a6d1: Merge "First step towards cleaning up Global settings." into jb-mr1-dev 
* commit 'f57fcddb61236c6e9c145d8f310bf1f4b1daafbb':
  First step towards cleaning up Global settings.
 2012-09-26 20:23:07 -07:00
Jeff Sharkey
031c410adc am 68b7a6d1: Merge "First step towards cleaning up Global settings." into jb-mr1-dev 
* commit '68b7a6d14b68b38324ffd275c7227805c7d99b2d':
  First step towards cleaning up Global settings.
 2012-09-26 20:19:32 -07:00
Jeff Sharkey
68b7a6d14b Merge "First step towards cleaning up Global settings." into jb-mr1-dev 2012-09-26 20:15:45 -07:00
Adam Cohen
3ff2d867d4 Fixing AppWidgetService / AppWidgetHost to work in system process 
-> Fixes issue 7208464
-> Fixed issue with partial update as well, should address
   issue 7214731

Change-Id: Ib8d9d5bee68b4fa7d6b4fbbc2f6609c287689958
 2012-09-26 18:00:12 -07:00
Philip Milne
9ac0a9af26 am 2bbc3257: am eed8f06f: Merge "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev 
* commit '2bbc32575fc746026e9cc1dae897754a0ba1dcb7':
  Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()
 2012-09-26 17:37:02 -07:00
Philip Milne
ac4b97caed am eed8f06f: Merge "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev 
* commit 'eed8f06f7f5d8f934ea99f16ef987a3ae1bd99b2':
  Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()
 2012-09-26 17:34:10 -07:00
Philip Milne
eed8f06f7f Merge "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev 2012-09-26 17:30:20 -07:00
Jeff Sharkey
bdfce2ec05 First step towards cleaning up Global settings. 
Remove all @Deprecated @hide settings, and clean up any stragglers.

Bug: 7232125
Change-Id: Ibf67093c728d4a28565129b923edb1701d3b2789
 2012-09-26 17:18:49 -07:00
Brian Carlstrom
b66e30373c am 0b6cb84b: am 13987fb4: Merge "Reverting public setSoWriteTimeout" into jb-mr1-dev 
* commit '0b6cb84b909c40ceeb37cbcf2ce82a2b0129be7a':
  Reverting public setSoWriteTimeout
 2012-09-26 16:09:29 -07:00
Brian Carlstrom
cd4a962a84 am 13987fb4: Merge "Reverting public setSoWriteTimeout" into jb-mr1-dev 
* commit '13987fb43255ccb3802d415e32b1c5caf14291bb':
  Reverting public setSoWriteTimeout
 2012-09-26 16:09:03 -07:00
Brian Carlstrom
13987fb432 Merge "Reverting public setSoWriteTimeout" into jb-mr1-dev 2012-09-26 16:05:00 -07:00
Brian Carlstrom
992f238d13 Reverting public setSoWriteTimeout 
This reverts fd901f735c858af8ec8884b2e7ab71a46a9639e6 and 5e21bf934b2a71b595deb9856a2044eea4dbce86

Bug: 7237764
Bug: 6693087
Change-Id: I7cc9657e4df219481eb33de803081a01b13ee0f2
 2012-09-26 15:48:21 -07:00
Philip Milne
4118012da9 Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos() 
Change-Id: Ie38952bbaace080e81e41e61350cda172951d548
 2012-09-26 11:29:25 -07:00
John Spurlock
46193469c7 am ccb06b41: am fddedc94: Merge "Dream metadata now specified using an xml-resource." into jb-mr1-dev 
* commit 'ccb06b415747655cead26a801560b68ee061b870':
  Dream metadata now specified using an xml-resource.
 2012-09-26 11:20:17 -07:00
John Spurlock
5d15dd08bf am fddedc94: Merge "Dream metadata now specified using an xml-resource." into jb-mr1-dev 
* commit 'fddedc94b77812ea13afe8cae32ad27d7266f787':
  Dream metadata now specified using an xml-resource.
 2012-09-26 11:17:55 -07:00
John Spurlock
f41f505fac Dream metadata now specified using an xml-resource. 
Removed old metadata key for dream settings activity, now defined in attrs.xml.

Also took this opportunity to remove Dream#lightsOut.

Bug:7172816
Bug:7211867
Change-Id: Ied18a527d2dc2aacc19d7a9543f090653232f0ed
 2012-09-26 12:44:39 -04:00
Jeff Brown
9da4d74477 am 876f95ed: am b32e2216: Merge changes I332f020f,I632648ac into jb-mr1-dev 
* commit '876f95ed7f914b4d86634db552277f835d288805':
  Update references to migrated global settings.
  Handle user switched for settings changes.
 2012-09-25 17:11:25 -07:00
Jeff Brown
3476cb8ec2 am b32e2216: Merge changes I332f020f,I632648ac into jb-mr1-dev 
* commit 'b32e221699201cb647beae3fe0a1771fd5a41cf4':
  Update references to migrated global settings.
  Handle user switched for settings changes.
 2012-09-25 17:05:56 -07:00
Jeff Brown
b32e221699 Merge changes I332f020f,I632648ac into jb-mr1-dev 
* changes:
  Update references to migrated global settings.
  Handle user switched for settings changes.
 2012-09-25 17:03:11 -07:00
Svetoslav Ganov
2a0168615b am dfd00788: am c91fb587: Merge "Adding a global accessibility action to open quick settings." into jb-mr1-dev 
* commit 'dfd007884d104417b8d39fd2002f09b11ac875f8':
  Adding a global accessibility action to open quick settings.
 2012-09-25 16:52:34 -07:00
Brian Carlstrom
1802935852 am bee07548: am fe54290d: Merge "Add a static generator that takes a Socket Write Timeout Argumanet" into jb-mr1-dev 
* commit 'bee07548d5beda94538a211383847889dc9224b5':
  Add a static generator that takes a Socket Write Timeout Argumanet
 2012-09-25 16:50:47 -07:00
Svetoslav Ganov
53da9d3490 am c91fb587: Merge "Adding a global accessibility action to open quick settings." into jb-mr1-dev 
* commit 'c91fb5875bfd7f91d50d6fe939873872b53c8b2f':
  Adding a global accessibility action to open quick settings.
 2012-09-25 16:49:56 -07:00
Brian Carlstrom
71d2b48fb7 am fe54290d: Merge "Add a static generator that takes a Socket Write Timeout Argumanet" into jb-mr1-dev 
* commit 'fe54290df0c5d495b7f388035a4ae3a20821a183':
  Add a static generator that takes a Socket Write Timeout Argumanet
 2012-09-25 16:48:02 -07:00
Svetoslav Ganov
c91fb5875b Merge "Adding a global accessibility action to open quick settings." into jb-mr1-dev 2012-09-25 16:47:06 -07:00