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

104528 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
343f581de2 Merge "fix typo and clarify class references in database lesson bug: 9372560" into jb-mr1.1-ub-dev 2013-06-10 23:14:32 +00:00
Marco Nelissen
ecba2e4b95 Unhide MediaExtractor.getPsshInfo() 
b/9373882

Change-Id: I2af42656d6a7eb19e8e9ec798b615dab0d9d33cb
 2013-06-10 15:06:28 -07:00
Scott Main
dc74caa7e8 add ViewGroup's layoutMode attribute to public resources 
bug: 9359960

Change-Id: I9d3d45c6494ded12170c88f5080bbb0a58d0fd74
 2013-06-10 14:51:37 -07:00
Baligh Uddin
ebb17713da Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-06-10 21:07:18 +00:00
Scott Main
802254faa1 fix typo and clarify class references in database lesson 
bug: 9372560

Change-Id: I703c4196a026cb0b1469ee55491ee674868768ca
 2013-06-10 13:54:37 -07:00
Ashish Sharma
58100fb813 Merge "Do not allow 0 or smaller periodicity for syncs. b/9295383" into jb-mr2-dev 2013-06-10 20:15:59 +00:00
John Spurlock
a9221987c0 Merge "Save Notification large icon to extras." into jb-mr2-dev 2013-06-10 20:11:19 +00:00
Scott Main
fe7c2220a1 Merge "add NA message for any "signature" level permissions" into jb-mr2-dev 2013-06-10 19:21:17 +00:00
Ashish Sharma
59dc7a8e75 Do not allow 0 or smaller periodicity for syncs. 
b/9295383

Change-Id: I5f758f4a033d74e42a04b214a6b70b94d394280d
(cherry picked from commit 4970974d74a2986a333e645a5c141ef5f9a753cc)
 2013-06-10 19:14:52 +00:00
Chris Craik
cb5d644fb8 Merge "Workaround possible use after delete" into jb-mr2-dev 2013-06-10 19:12:19 +00:00
Scott Main
93e60b5b26 add NA message for any "signature" level permissions 
Change-Id: If76e9e3b7ffc5d97422321db312a03869c407f08
 2013-06-10 12:03:07 -07:00
Daniel Sandler
4e5694aaa7 Merge "Do not block notifications or toasts for SYSTEM_UID or PHONE_UID." into jb-mr2-dev 2013-06-10 18:31:51 +00:00
Chris Craik
9abddd54d4 Workaround possible use after delete 
bug:9321162
Change-Id: Ic35af5b5925da56e9a143e6b33658831038f3b72
 2013-06-10 11:30:37 -07:00
Romain Guy
8d8fc46995 Merge "Don't orphan footers with transient state Bug #8725945" into jb-mr2-dev 2013-06-10 17:23:25 +00:00
Wink Saville
45ac9645da Allow carrier provisioning to turn toggle radio power. 
Previously CarrierProvisioning toggle airplane mode, but now that's
available only by the system.

Bug: 9356811
Change-Id: I5167f8614c07bafb688983a360a008f76403b2b8
 2013-06-10 10:10:42 -07:00
Daniel Sandler
7c011302b6 Do not block notifications or toasts for SYSTEM_UID or PHONE_UID. 
The specific bug is this: SIM PIN unlock attempt toasts are
sent from com.android.settings/.IccLockSettings which runs
as the phone process; NoMan wasn't having any of that and
was blocking the toasts.

With this change we treat SYSTEM_UID and PHONE_UID the same
for all security checks, and furthermore we guarantee that
all notifications and toasts from those UIDs will be
permitted.

Bug: 9098802
Change-Id: Idc788527aa2cb38e015fe92773766a514167999e
 2013-06-10 12:19:16 -04:00
John Spurlock
bf563368e1 Save Notification large icon to extras. 
This piece of semantic info was defined, cleared properly on
lightenPayload, but never saved.

Change-Id: Ib2c5372a57d2a01617e401231c150260d22b05d6
 2013-06-10 11:45:17 -04:00
Baligh Uddin
eca9982412 Import translations. DO NOT MERGE 
Change-Id: Iaa894cf0f19b3e153c980a9a48a92beb361124ec
Auto-generated-cl: translation import
 2013-06-10 07:52:12 -07:00
The Android Automerger
f4a87a6ff1 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-10 05:55:18 -07:00
The Android Automerger
8a63b45803 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-09 05:55:38 -07:00
Jean-Michel Trivi
1b16cc3de5 Let RemoteControlDisplay know more about playback position 
The BT stack needs to differentiate between applications that use
 the new RemoteControlClient APIs to pass a playback position but
 don't have one yet, and applications that use the legacy API and
 will never pass a position.

Bug 9294855

Change-Id: I05cba82a073e6e0aaea1d8bbf9cc8c99da715f58
 2013-06-07 15:48:22 -07:00
Romain Guy
b7e0f7942b Don't orphan footers with transient state 
Bug #8725945

Selecting text in an EditText causes the View to have transient
state. This would in turn cause the View to be removed from its
ListView parent. When removed, the EditText would lose its
AttachInfo, causing all sorts of problems. Headers and footers
must not be removed, only detached. This is the part of the fix
in AbsListView.

Fixing AbsListView triggered a second bug: when a View is removed
from the Window manager, it would keep its parent assigned, thus
making it impossible to add it again to the window manager. When
a ViewRootImpl goes through doDie(), it must set its content view's
parent to null to properly cleanup.

Change-Id: I0489daa74f8f7fcf85526f0928f8925ec30d4f42
 2013-06-07 15:36:49 -07:00
Jeff Sharkey
56cd646abe Avoid logging sensitive data. 
When building commands to send across NativeDaemonConnector, scrub
sensitive arguments to prevent them from being logged.

Bug: 8609800
Change-Id: I84b16791749264a010f7e59f9918f68d71bac6b9
 2013-06-07 15:09:32 -07:00
Scott Main
00d17f7aab add attributes to accessibility service info 
Change-Id: I3651544164f718003b8eb1235a7d723f1bcee5be
 2013-06-06 18:37:59 -07:00
Daniel Sandler
2fe71d013f Add LTE overlays for signal strength indicators. 
Note that operators that wish to show "4G" instead of "LTE"
on these networks can set config_show4GForLTE to true.

Bug: 9265513
Bug: 9265217
Change-Id: If7f3580da7266b0d0c62639e30684393d4e03392
 2013-06-06 21:31:04 -04:00
Scott Main
b8e4d95c22 am a7ba45ec: am 7381c7e5: am b2b216e7: add links to a couple intellij docs for Eclipse users 
* commit 'a7ba45ec7cbaaa1dbfcd6601bb42abd5ea39547f':
  add links to a couple intellij docs for Eclipse users
 2013-06-06 17:51:20 -07:00
Scott Main
a7ba45ec7c am 7381c7e5: am b2b216e7: add links to a couple intellij docs for Eclipse users 
* commit '7381c7e54b8dfb91b6fac5c7e00a62738c849135':
  add links to a couple intellij docs for Eclipse users
 2013-06-06 15:40:05 -07:00
Scott Main
7381c7e54b am b2b216e7: add links to a couple intellij docs for Eclipse users 
* commit 'b2b216e79880884f7ebbea6ee997fc88edc229fc':
  add links to a couple intellij docs for Eclipse users
 2013-06-06 15:38:16 -07:00
Scott Main
b2b216e798 add links to a couple intellij docs for Eclipse users 
Change-Id: I6f373c62781e9d4b6b296d92242f4296b1fe6fe4
 2013-06-06 15:22:30 -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
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
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
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
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