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

156660 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
152af6d630 am ec7467b0: Merge "Fix the underlined spinner asset to match text field" into lmp-dev 
* commit 'ec7467b019dd2c78e270e87cc76248680677cc4f':
  Fix the underlined spinner asset to match text field
 2014-09-18 22:41:11 +00:00
Craig Mautner
4767f4b3a9 Don't count finishing activities as effective activities. 
They were being counted as effectiveRoot even though they were
finishing.

Fixes bug 17550936.

Change-Id: Iaf7201e6150095e55f88344e4b257e4ae8f19a2b
 2014-09-18 22:40:12 +00:00
George Mount
1732f52895 Fix NPE when shared element listener is null. 
Bug 17544867

The shared element listener will be null after the transitions
have been canceled.

Change-Id: Id1182639b44ece27fc267702623641438f9974d5
 2014-09-18 15:32:47 -07:00
Alan Viverette
28c5d8e862 Merge "Fix the underlined spinner asset to match text field" into lmp-dev 2014-09-18 22:26:03 +00:00
George Mount
0b26e4d58a Fix exception when fragment container has no View. 
Bug 17535259

Change-Id: I29c9ef53dd693cbb4043ebfb4750753870c9e99a
 2014-09-18 15:24:48 -07:00
Amith Yamasani
c34dc7cdeb Allow primary user profile owner to set device restrictions 
In addition to device owners, profile owners on the primary user
can also set user restrictions that are necessary to lock down the
user.

This is to enable the case of a profile owner registered after setup
wizard is completed, on the primary user.

Also make managed profile vs. profile wording consistent in the
DevicePolicyManager docs.

Bug: 17555025
Change-Id: Ib9d08b8af34a99b25e11757fa7dc83673a7deb32
 2014-09-18 15:14:26 -07:00
Adrian Roos
54d5195236 am b74c9043: am 5e5c78a6: Merge "Additional check to determine insets for recents animation" into lmp-dev 
* commit 'b74c904364339f61eeee1a6b903e2cffa39dc715':
  Additional check to determine insets for recents animation
 2014-09-18 21:52:40 +00:00
Adrian Roos
50c076af5f am 717e144d: am 30defcc4: Merge "Disable QS user switcher when not supported" into lmp-dev 
* commit '717e144df74b6134fa3e1e131936a911f7ef451d':
  Disable QS user switcher when not supported
 2014-09-18 21:52:35 +00:00
Craig Mautner
bf11570614 am d28e4019: am 43ce5500: Merge "Remove activity icon bitmaps from system process." into lmp-dev 
* commit 'd28e40196d3bd5b697be4ed937978ce55f775772':
  Remove activity icon bitmaps from system process.
 2014-09-18 21:52:30 +00:00
Adrian Roos
c394dc4140 am 5e5c78a6: Merge "Additional check to determine insets for recents animation" into lmp-dev 
* commit '5e5c78a6a6edeab3bb06a7dafec479c1d92f040e':
  Additional check to determine insets for recents animation
 2014-09-18 21:36:13 +00:00
Adrian Roos
560d261c36 am 30defcc4: Merge "Disable QS user switcher when not supported" into lmp-dev 
* commit '30defcc4e1cfdb9792840577cfc7fa3708d2a521':
  Disable QS user switcher when not supported
 2014-09-18 21:36:08 +00:00
Craig Mautner
fd9417d69e am 43ce5500: Merge "Remove activity icon bitmaps from system process." into lmp-dev 
* commit '43ce550039eb45dd0b6ff6d4abd7833cba2d06e0':
  Remove activity icon bitmaps from system process.
 2014-09-18 21:36:02 +00:00
wsmlby
11fb1b7267 am 191f5d65: am fa3fb593: Merge "Add leanback support to AppCompatiblityTest" into lmp-dev 
* commit '191f5d656a333952ab420cc29dd0dcd46ab58b32':
  Add leanback support to AppCompatiblityTest
 2014-09-18 21:31:09 +00:00
Adrian Roos
8f2152c021 Merge "Additional check to determine insets for recents animation" into lmp-dev 2014-09-18 21:30:00 +00:00
Adrian Roos
59b17d83eb Merge "Disable QS user switcher when not supported" into lmp-dev 2014-09-18 21:28:11 +00:00
Craig Mautner
bc3126f859 Merge "Remove activity icon bitmaps from system process." into lmp-dev 2014-09-18 21:25:24 +00:00
Christopher Tate
31a1ae4a2e am 6b2b0b58: am 6330e891: Merge "Log alarm delivery only when localLOGV" into lmp-dev 
* commit '6b2b0b583c77c4ba2a9dbbf2d469592abb9ddf57':
  Log alarm delivery only when localLOGV
 2014-09-18 21:23:54 +00:00
Alan Viverette
b0560839e8 am c216a2df: am 8766bdcb: Merge "Fix parsing of old-style intent URIs" into lmp-dev 
* commit 'c216a2df8a92add1b04dbcf17ec8fb198409fe04':
  Fix parsing of old-style intent URIs
 2014-09-18 21:23:49 +00:00
wsmlby
c970f7a60e am fa3fb593: Merge "Add leanback support to AppCompatiblityTest" into lmp-dev 
* commit 'fa3fb593e89921402640bb780de8194bf637300d':
  Add leanback support to AppCompatiblityTest
 2014-09-18 21:20:25 +00:00
Craig Mautner
648f69b95c Remove activity icon bitmaps from system process. 
When a TaskDescription is sent up to the system process, the Bitmap
contained in the mIcon member is immediately flushed to disk and the
name of the file replaces it in the TaskDescription. Thereby saving
mucho RAM for better uses.

Fixes bug 17527308.

Change-Id: Ifac63ea5d12ed091d1eb03e178b8b847a827f940
 2014-09-18 14:16:26 -07:00
wsmlby
9632a07123 Merge "Add leanback support to AppCompatiblityTest" into lmp-dev 2014-09-18 21:11:16 +00:00
wsmlby
e87cc9a2f2 Add leanback support to AppCompatiblityTest 
Change-Id: Ia9da14b8551c4ec5834a047f0792a5a213a3ac04
 2014-09-18 14:09:17 -07:00
Christopher Tate
03144da184 am 6330e891: Merge "Log alarm delivery only when localLOGV" into lmp-dev 
* commit '6330e8911f6d366e03a394a80c28c5ac5efc1abd':
  Log alarm delivery only when localLOGV
 2014-09-18 21:06:10 +00:00
Alan Viverette
9b27ee1a47 am 8766bdcb: Merge "Fix parsing of old-style intent URIs" into lmp-dev 
* commit '8766bdcb803698a2a2765bb46ab57bba655b41cf':
  Fix parsing of old-style intent URIs
 2014-09-18 21:06:05 +00:00
Adam Lesinski
82a2dd8efe Fix backwards compat problem with AAPT public attrs 
AAPT has traditionally assigned resource IDs to public attributes,
and then followed those public definitions with private attributes.

--- PUBLIC ---
| 0x01010234 | attr/color
| 0x01010235 | attr/background

--- PRIVATE ---
| 0x01010236 | attr/secret
| 0x01010237 | attr/shhh

Each release, when attributes are added, they take the place of the private
attributes and the private attributes are shifted down again.

--- PUBLIC ---
| 0x01010234 | attr/color
| 0x01010235 | attr/background
| 0x01010236 | attr/shinyNewAttr
| 0x01010237 | attr/highlyValuedFeature

--- PRIVATE ---
| 0x01010238 | attr/secret
| 0x01010239 | attr/shhh

Platform code may look for private attributes set in a theme. If an app
compiled against a newer version of the platform uses a new public
attribute that happens to have the same ID as the private attribute
the older platform is expecting, then the behavior is undefined.

We get around this by detecting any newly defined attributes (in L),
copy the resource into a -v21 qualified resource, and delete the
attribute from the original resource. This ensures that older platforms
don't see the new attribute, but when running on L+ platforms, the
attribute will be respected.

We still need to address this problem in the platform moving forward,
as this will only help us in the transition from pre L to L.

Bug:17520380
Change-Id: Ia2a985798b50006c21c7c3431d30d9598f27cd91
 2014-09-18 14:05:24 -07:00
Svetoslav
9bebc55d60 am 1c46bae1: am d972e2df: Merge "Print UI stuck when backing out of documents UI." into lmp-dev 
* commit '1c46bae1b483a851e2b02ca60c2901bd3baf9609':
  Print UI stuck when backing out of documents UI.
 2014-09-18 21:04:55 +00:00
Alan Viverette
194206c4d7 am c5073a81: am fb15b0e2: Merge "Use action bar theme for action modes, fix ViewStub inflation theme" into lmp-dev 
* commit 'c5073a812a82928ae681c9fcd328a3b1323b4edc':
  Use action bar theme for action modes, fix ViewStub inflation theme
 2014-09-18 20:57:26 +00:00
Jon Miranda
c5e711eeb2 am 1ae494de: am bff124f1: Merge "Adds support for Theme dumping via DDM." into lmp-dev 
* commit '1ae494deb79793c126e244c09ab9fd12a68df370':
  Adds support for Theme dumping via DDM.
 2014-09-18 20:57:19 +00:00
John Reck
7c48077877 am a0f5d726: am e182b60c: Merge "Revert "Make starting window hw-accelerated"" into lmp-dev 
* commit 'a0f5d726fc8a5610e41c40e289fd107704202327':
  Revert "Make starting window hw-accelerated"
 2014-09-18 20:57:13 +00:00
Jeff Brown
116e069cdb am 6fc160ed: am d510278d: Merge "Create an Application object for the system process." into lmp-dev 
* commit '6fc160ed30b6d194bbf824c5674403fc622b94f1':
  Create an Application object for the system process.
 2014-09-18 20:57:04 +00:00
Ye Wen
5d1a21e96a am 2fc00600: am 3b5939fc: Merge "Add new error result code for mms config loading failure (1/2)" into lmp-dev 
* commit '2fc0060027f917f7d798bf1e5412696df4bba708':
  Add new error result code for mms config loading failure (1/2)
 2014-09-18 20:56:59 +00:00
Dianne Hackborn
1e5223977e am 85e4d515: am 9d301c82: Merge "Lock in final resource IDs." into lmp-dev 
* commit '85e4d515a7610207cde07521c05d12297117d6cf':
  Lock in final resource IDs.
 2014-09-18 20:56:41 +00:00
Martijn Coenen
bc65b5cbdf am 95bd8257: am 15af6c4e: Merge "Upper-case incoming AIDs." into lmp-dev 
* commit '95bd8257caa7d0cff6dfb06bec6d72361d4f6625':
  Upper-case incoming AIDs.
 2014-09-18 20:56:34 +00:00
Nancy Chen
53c5a99c8e am 8e15e306: am 93c75e45: Merge "Replace get*PhoneAccounts* public API methods with new method (1/3)" into lmp-dev 
* commit '8e15e3060db3982adadc917dfccc4b144982dd6d':
  Replace get*PhoneAccounts* public API methods with new method (1/3)
 2014-09-18 20:56:28 +00:00
Christopher Tate
547f97ac93 Merge "Log alarm delivery only when localLOGV" into lmp-dev 2014-09-18 20:56:25 +00:00
Alan Viverette
50572be361 Merge "Fix parsing of old-style intent URIs" into lmp-dev 2014-09-18 20:54:44 +00:00
Christopher Tate
2ff5a73c3c Log alarm delivery only when localLOGV 
Logspam is spam.

Change-Id: I3bb63f3026fc6222eb8e1496b3a5db4cdf3c7f57
 2014-09-18 13:47:57 -07:00
Svetoslav
f05441f21b am d972e2df: Merge "Print UI stuck when backing out of documents UI." into lmp-dev 
* commit 'd972e2dff33679a3c7fddd058396fd6437266709':
  Print UI stuck when backing out of documents UI.
 2014-09-18 20:46:00 +00:00
Alan Viverette
42f36235af am fb15b0e2: Merge "Use action bar theme for action modes, fix ViewStub inflation theme" into lmp-dev 
* commit 'fb15b0e2566d80dbedc8f91bdc0a1edb88ce1ec2':
  Use action bar theme for action modes, fix ViewStub inflation theme
 2014-09-18 20:35:34 +00:00
Svetoslav
688a994f4d Merge "Print UI stuck when backing out of documents UI." into lmp-dev 2014-09-18 20:34:23 +00:00
Svetoslav
b75632c736 Print UI stuck when backing out of documents UI. 
When user chooses to save to PDF we open the document chooser UI.
Now if the user now backs to the print UI without choosing a file,
the print UI has all options disabled and the back button does
not work - the user is stuck. This is because we were not
transitioning the print UI in the correct state.

bug:17557454

Change-Id: I385129e106ed41564b89137ca54d409127ba8ff0
 2014-09-18 13:32:38 -07:00
Alan Viverette
07ecc748fb Merge "Use action bar theme for action modes, fix ViewStub inflation theme" into lmp-dev 2014-09-18 20:25:22 +00:00
Jon Miranda
3fe02fbba0 am bff124f1: Merge "Adds support for Theme dumping via DDM." into lmp-dev 
* commit 'bff124f1e86a6cfc1710d41bedd060b7378de06b':
  Adds support for Theme dumping via DDM.
 2014-09-18 20:24:00 +00:00
Jon Miranda
3c7f018f42 Merge "Adds support for Theme dumping via DDM." into lmp-dev 2014-09-18 20:14:05 +00:00
John Reck
c4005d2bfe am e182b60c: Merge "Revert "Make starting window hw-accelerated"" into lmp-dev 
* commit 'e182b60cb71437d1f2adf258a248b2e6b0f59821':
  Revert "Make starting window hw-accelerated"
 2014-09-18 20:11:59 +00:00
John Reck
7e3d6c988c Merge "Revert "Make starting window hw-accelerated"" into lmp-dev 2014-09-18 20:01:15 +00:00
Jeff Brown
9e835ea03a am d510278d: Merge "Create an Application object for the system process." into lmp-dev 
* commit 'd510278d491ed9669c198ee79377a0ff1ab2fc48':
  Create an Application object for the system process.
 2014-09-18 20:00:54 +00:00
Ye Wen
9cacaffceb am 3b5939fc: Merge "Add new error result code for mms config loading failure (1/2)" into lmp-dev 
* commit '3b5939fc093043d4bfa4c1cfda80f4c5e9ab8548':
  Add new error result code for mms config loading failure (1/2)
 2014-09-18 20:00:49 +00:00
Jeff Brown
2b5f91fe98 Merge "Create an Application object for the system process." into lmp-dev 2014-09-18 19:53:37 +00:00
Ye Wen
9f5638ed23 Merge "Add new error result code for mms config loading failure (1/2)" into lmp-dev 2014-09-18 19:53:25 +00:00