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

159641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
96d7041866 Add some flags to reduce memory usage on svelte devices. 
Bug: 10918599
Change-Id: I235413a243d47fdd9be4a27f6bd726311a51cb6f
 2014-11-17 14:52:29 -08:00
xinhe
a8e6d6fd99 Merge "air plane mode only send to the owner through the quick setting" into lmp-mr1-dev 2014-11-17 22:18:11 +00:00
Robert Greenwalt
5e4e2b589e Merge "telephony: Add tethering profiles to support mvno" into lmp-mr1-dev 2014-11-17 22:07:29 +00:00
Robert Greenwalt
9a53c1137b Merge "telephony: Change string to string-array config_tether_apndata to support mvno" into lmp-mr1-dev 2014-11-17 22:04:49 +00:00
Andres Morales
5aadd5b6fa Merge "Add UserHandle to BeamShareData" into lmp-mr1-dev 2014-11-17 21:53:58 +00:00
Winson Chung
fe79d62db3 Merge "Adding additional null checks to prevent crash after task stack view callback is reset. (Bug 18376798)" into lmp-mr1-dev 2014-11-17 21:43:51 +00:00
Geoff Mendal
df944b30c2 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-17 21:42:48 +00:00
Geoff Mendal
6e523a077f Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-17 21:33:38 +00:00
Craig Stout
36fbc43787 Merge "Use dark theme for usb dialogs on television." into lmp-mr1-dev 2014-11-17 21:28:25 +00:00
Geoff Mendal
4e214b0399 Import translations. DO NOT MERGE 
Change-Id: I8dba08bbfd5fa95d472a82968b1bf16a756d7504
Auto-generated-cl: translation import
 2014-11-17 13:10:15 -08:00
Geoff Mendal
44e4ff746a Import translations. DO NOT MERGE 
Change-Id: I67abea60870f468d3ad9a6be7ee600de99b8ff54
Auto-generated-cl: translation import
 2014-11-17 13:07:17 -08:00
Jeff Davidson
9a1da68bf7 Expose a SystemApi method to prepare a VPN without consent. 
This is NOT designed to be called normally. Most apps (even
system-privileged ones) should request user consent before launching a
VPN. However, it is needed to support flows where consent can be
obtained through other means external to the VPN flow itself.

The API requires a system-privileged permission, CONTROL_VPN.

Bug: 18327583
Change-Id: I1bcdcf0fb5707faeb861ec4535e7ccffea369ae7
 2014-11-17 21:03:10 +00:00
Jeff Davidson
e0cb56b02e Merge "Enforce VPN control "permission" with an actual permission." into lmp-mr1-dev 2014-11-17 21:02:10 +00:00
Christopher Tate
93fb155344 am 94d96338: Merge "Don\'t crash just because invalid datasets were offered for restore" into lmp-mr1-dev 
* commit '94d963381d7bd75e60da1c3038c7970e47d2ac35':
  Don't crash just because invalid datasets were offered for restore
 2014-11-17 20:59:46 +00:00
Geoff Mendal
cf71886c2f am 9d8c7598: (-s ours) am 27b80331: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '9d8c759879b7d56a7bf1678f7f1a1a8807ce5636':
  Import translations. DO NOT MERGE
 2014-11-17 20:55:25 +00:00
Craig Stout
9eef7bce56 Use dark theme for usb dialogs on television. 
b/16488215

Change-Id: I8ea2a184b2df36e3f55ba5bd0e8fb121ef0ed48e
 2014-11-17 12:36:15 -08:00
John Reck
c99d3c99f8 Fix invalidateOutline 
Bug: 18175261

invalidateOutline was switched to a lazy-method, but this doesn't
work because invalidateViewProperty intentionally does not
do a traversal, therefore the invalidate was never consumed.

However it was attempting to be lazy about work that is cheap to
do, so nuke the lazy aspect and restore invalidateOutline's previous,
correct behavior. rebuildOutline is kept to avoid triggering
traversals in places they are not needed

Change-Id: I70f8cbacd54a607c0bf0bc7fe6eea78554cb2ea3
 2014-11-17 12:35:53 -08:00
Raph Levien
396879f3f8 Fix missing ellipsis when just one character is truncated 
The "moreChars" test in StaticLayout's generate method would evaluate to
false when the last character in a word caused the break. This in turn
suppressed the ellipsis in this case. The proposed fix is always to set
moreChars true in the code path where the line is broken because more
text wouldn't fit.

Bug: 17738112
Change-Id: Ifa1a69841ca952da4d1937dc8326778179b026b3
 2014-11-17 12:32:06 -08:00
Christopher Tate
94d963381d Merge "Don't crash just because invalid datasets were offered for restore" into lmp-mr1-dev 2014-11-17 20:20:12 +00:00
Geoff Mendal
9d8c759879 am 27b80331: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '27b8033175a748438891dc9da498ff354cce82a0':
  Import translations. DO NOT MERGE
 2014-11-17 19:51:34 +00:00
Geoff Mendal
e8e6b933a7 am c81a3e16: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'c81a3e16e77c83d30395d36dc907cbef80dd7ac6':
  Import translations. DO NOT MERGE
 2014-11-17 19:48:07 +00:00
Winson Chung
fe03b40da4 Adding additional null checks to prevent crash after task stack view callback is reset. (Bug 18376798) 
Change-Id: I46a324b3b6acba6b6519506ff2431d285e3b57f9
 2014-11-17 11:47:09 -08:00
Ye Wen
643d5caf64 Addressing API review issues for SmsManager (2/3) 
b/18356155

Change-Id: I2941284c48db7734f1b056263e4b53790f665a1c
 2014-11-17 11:46:36 -08:00
Jason Monk
29f7a7b0ae SysUI Tests: Make tests not break SysUI 
Now you can run the tests without getting the blank broken sysui.
The tests instrument themselves so they include all of the source
they need to run rather than piggybacking on the sysui process.

A couple of changes were needed for this.  The xml files cannot
reference com.android.systemui, instead they must use res-auto.
The tests can no longer make privileged calls, so some restructuring
to avoid those calls was needed.

Bug: 18222975
Change-Id: I67b794af854f1420583d48960bd6e52ca753b56d
 2014-11-17 14:46:11 -05:00
Geoff Mendal
27b8033175 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-11-17 19:45:13 +00:00
Geoff Mendal
6558805316 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-17 19:44:50 +00:00
Adam Lesinski
06d8b7b8d2 am cd6f00c3: Merge "Implement back-tracking when searching for attributes in XML or resource bag" into lmp-mr1-dev 
* commit 'cd6f00c3a05717862a88b7409d11176ae53fd9a9':
  Implement back-tracking when searching for attributes in XML or resource bag
 2014-11-17 19:43:24 +00:00
Geoff Mendal
c81a3e16e7 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-17 19:43:10 +00:00
Adam Lesinski
cd6f00c3a0 Merge "Implement back-tracking when searching for attributes in XML or resource bag" into lmp-mr1-dev 2014-11-17 19:39:17 +00:00
xinhe
98e25fc377 air plane mode only send to the owner through the quick setting 
It should send to all the uesers as it behaves in setting

Bug:18353278
Change-Id: Ib46a97e30bfba73dd78fab0c8139d6ccb7ad210f
 2014-11-17 11:35:01 -08:00
Jim Miller
58b9ee2826 am cd75f59f: Merge "Fix deadlock caused by synchronous setOccluded() method in keyguard" into lmp-mr1-dev 
* commit 'cd75f59f8cdeda95a50155ad0c9f4abd559037ec':
  Fix deadlock caused by synchronous setOccluded() method in keyguard
 2014-11-17 19:34:37 +00:00
Wale Ogunwale
58cdb919d1 am 465e9967: Merge "Consolidated processing of package boardcasts in AM service." into lmp-mr1-dev 
* commit '465e996776d916d8d1b62c539142827bd96a42bc':
  Consolidated processing of package boardcasts in AM service.
 2014-11-17 19:30:16 +00:00
Ricardo Cervera-Navarro
af56f97973 am b04c3d62: am bb987493: am 96424f4a: am 5b11c51d: Merge "docs:eclipse-migrate update" into lmp-docs 
* commit 'b04c3d6208c127bd70502b556e6215d22b8d6192':
  docs:eclipse-migrate update
 2014-11-17 19:30:11 +00:00
Jim Miller
cd75f59f8c Merge "Fix deadlock caused by synchronous setOccluded() method in keyguard" into lmp-mr1-dev 2014-11-17 19:29:01 +00:00
Wale Ogunwale
465e996776 Merge "Consolidated processing of package boardcasts in AM service." into lmp-mr1-dev 2014-11-17 19:27:08 +00:00
Jorim Jaggi
dd907b1a94 am 6a388ef8: Merge "Don\'t play hint animation when touching to wake up" into lmp-mr1-dev 
* commit '6a388ef85eed7659cc5175591e4c7bbaa1b448f6':
  Don't play hint animation when touching to wake up
 2014-11-17 19:25:45 +00:00
Jorim Jaggi
477226bb63 am da5a2863: Merge "Always set correct policy visibility" into lmp-mr1-dev 
* commit 'da5a28635af883c330fe57e98e78eff127706ed4':
  Always set correct policy visibility
 2014-11-17 19:25:40 +00:00
Ricardo Cervera-Navarro
b04c3d6208 am bb987493: am 96424f4a: am 5b11c51d: Merge "docs:eclipse-migrate update" into lmp-docs 
* commit 'bb987493d6d858948b294b7b2f15b6ba67e39fd0':
  docs:eclipse-migrate update
 2014-11-17 19:24:30 +00:00
Jorim Jaggi
6a388ef85e Merge "Don't play hint animation when touching to wake up" into lmp-mr1-dev 2014-11-17 19:22:39 +00:00
Stuart Scott
343a88da1b am b19acb99: Merge "Updating Subscription Info Icon" into lmp-mr1-dev 
* commit 'b19acb999353b8c1bce4f5acdc2ac9c29093bf99':
  Updating Subscription Info Icon
 2014-11-17 19:21:12 +00:00
Ricardo Cervera-Navarro
bb987493d6 am 96424f4a: am 5b11c51d: Merge "docs:eclipse-migrate update" into lmp-docs 
* commit '96424f4a43dfe52cb156a19194984ece3eab6699':
  docs:eclipse-migrate update
 2014-11-17 19:20:19 +00:00
Jorim Jaggi
da5a28635a Merge "Always set correct policy visibility" into lmp-mr1-dev 2014-11-17 19:20:13 +00:00
Stuart Scott
b19acb9993 Merge "Updating Subscription Info Icon" into lmp-mr1-dev 2014-11-17 19:16:51 +00:00
Ricardo Cervera-Navarro
96424f4a43 am 5b11c51d: Merge "docs:eclipse-migrate update" into lmp-docs 
* commit '5b11c51d87ad99d0ccad6bf8b3d1bd4f626e5f48':
  docs:eclipse-migrate update
 2014-11-17 19:14:40 +00:00
Stuart Scott
da5be611d8 Updating Subscription Info Icon 
bug: 18356155

Change-Id: I8d944e9b547701d51a9c58709cb9777a07c5227e
 2014-11-17 19:11:40 +00:00
Ricardo Cervera-Navarro
5b11c51d87 Merge "docs:eclipse-migrate update" into lmp-docs 2014-11-17 19:07:04 +00:00
Geoff Mendal
db7fca54b9 Import translations. DO NOT MERGE 
Change-Id: Idd82327920b27757f3d124092f9d5cf1c36cc938
Auto-generated-cl: translation import
 2014-11-17 10:55:47 -08:00
Geoff Mendal
27b86af514 Import translations. DO NOT MERGE 
Change-Id: Icdcfccda67a6a347e21ba85729eb6ecac01ec144
Auto-generated-cl: translation import
 2014-11-17 10:50:04 -08:00
Dianne Hackborn
0a3e11fe42 am 76919595: Merge "Issue #17551667: Voice interaction service should be disabled..." into lmp-mr1-dev 
* commit '76919595f4dd3b61f132422372ce4350584a1d42':
  Issue #17551667: Voice interaction service should be disabled...
 2014-11-17 18:42:30 +00:00
Geoff Mendal
adaa819bb7 Import translations. DO NOT MERGE 
Change-Id: I31a7c6bc19264abd28b4c6d85e2fd94e6fd8f8ff
Auto-generated-cl: translation import
 2014-11-17 10:41:15 -08:00