Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
180,288 Commits 3 Branches 0 Tags
3f221cf32530cdcdb011d1cb543187db501d09df
Commit Graph

45113 Commits

Author SHA1 Message Date
Alan Viverette
3f221cf325 Ensure spinner variables are initialized correctly 
Removes the popup context setter, since this property cannot change
after inflation without losing data from the AttributeSet.

Bug: 19046761
Change-Id: I622f50d1752446a5b5793706c388e67a46ad06da
 2015-01-16 14:40:04 -08:00
Ricardo Cervera
23a6d889aa am 1e59b338: am 08314642: am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev 
* commit '1e59b338e6d1a270947908e53cefd088e2e38fb3':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 20:06:53 +00:00
Ricardo Cervera
1e59b338e6 am 08314642: am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev 
* commit '083146428420dd3daa887d6e9c019e747a604cb5':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 18:47:08 +00:00
Ricardo Cervera
0831464284 am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev 
* commit '90312d808f4a5181b5cb99c78e64b7e5d1465895':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 18:41:59 +00:00
Ricardo Cervera
90312d808f am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev 
* commit '2287879039556ad3c8fce58974e2396b4a2dab45':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 18:36:45 +00:00
Ricardo Cervera
2287879039 am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev 
* commit '93f94c2ca5bf23533fc5a9bd70a4795584d20618':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 18:29:25 +00:00
Ricardo Cervera
93f94c2ca5 resolved conflicts for merge of e8f6bd48 to lmp-dev 
Change-Id: Idc370182914d5060a721d34c26cd72598f2c6dff
 2015-01-16 09:54:30 -08:00
Ricardo Cervera
e8f6bd4846 am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 
* commit '98f07d901492335f51258655fbfa032fa3f2d58e':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 17:21:32 +00:00
Ricardo Cervera
98f07d9014 am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 
* commit '92f6a747085b4b5ed692de4bdb0050c096eae393':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 17:14:44 +00:00
Narayan Kamath
d28f0fee61 am 2488c0ad: am 27d3e790: am 706f6cf3: Merge "Fix a property name that\'s longer than 31 chars." 
* commit '2488c0ad505846f7655a7434006edea4515b02d0':
  Fix a property name that's longer than 31 chars.
 2015-01-16 14:23:44 +00:00
Narayan Kamath
2488c0ad50 am 27d3e790: am 706f6cf3: Merge "Fix a property name that\'s longer than 31 chars." 
* commit '27d3e79031081ab131d5bc4680b80e46a466db53':
  Fix a property name that's longer than 31 chars.
 2015-01-16 14:16:59 +00:00
Narayan Kamath
e5515772af Fix a property name that's longer than 31 chars. 
The name wasn't chosen without much thought and is intended
to be a temporary fix to keep devices booting while a better
name is decided upon.

bug: 18335678
Change-Id: Ic3451255d870f3395cfbcaa08a7764d93defc350
 2015-01-16 14:04:56 +00:00
Jeff Sharkey
0ec9c29fb7 am c2ae6fb9: Merge commit \'605eb79c9519307147fc1795d0eb155638a7f542\' into manualmerge 
* commit 'c2ae6fb9ada52e9c990542a6d1cae80085318f31':
  Offer to detect non-SSL/TLS network traffic.
 2015-01-16 06:09:05 +00:00
Jeff Sharkey
c2ae6fb9ad Merge commit '605eb79c9519307147fc1795d0eb155638a7f542' into manualmerge 
Change-Id: Id6db8cce3a477572478a1d50f624823200848896
 2015-01-15 21:27:13 -08:00
Craig Mautner
8667eff6b8 Merge "Remove unused method moveTaskToBack." 2015-01-16 01:54:59 +00:00
Craig Mautner
428ecf2966 Remove unused method moveTaskToBack. 
Everyone uses moveActivityTaskToBack() instead.

Fixes item #3 of bug 18088522.

Change-Id: I16028335fe1eef8a2aa47804f46536e395a16d8c
 2015-01-15 17:20:40 -08:00
Jeff Sharkey
f24e490058 Merge "Offer to detect non-SSL/TLS network traffic." 2015-01-16 01:11:27 +00:00
Mike Lockwood
61369de03e Merge "MidiManager bug fixing:" 2015-01-16 00:09:57 +00:00
Mike Lockwood
98cc8e5a64 MidiManager bug fixing: 
- fix off by one error that caused failure handling one byte messages

- poll thread now terminates properly in UsbMidiDevice

- fix cleanup logic in MidiDeviceServer

Change-Id: I0c13a98b6542cfb271b51678e81d1822c8da2985
 2015-01-15 16:07:28 -08:00
Craig Mautner
c62d355b3f am b523c55d: am 41d54237: am 92cf3608: Merge "Debug for bug 18201239." into lmp-mr1-dev 
* commit 'b523c55d76ef3215538158a65bdea70c9897993e':
  Debug for bug 18201239.
 2015-01-16 00:06:29 +00:00
Alan Viverette
f6e92936c7 am 78dfb182: am dbe54533: am 77e1f7a2: Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev 
* commit '78dfb182d29259630277ee40d51c7350df1e7dac':
  Ensure scroll assets are drawn with correct opacity
 2015-01-16 00:05:51 +00:00
Jeff Sharkey
605eb79c95 Offer to detect non-SSL/TLS network traffic. 
Introduces new module that provides network-related features for
the StrictMode developer API.  The first feature offers to detect
sockets sending data not wrapped inside a layer of SSL/TLS
encryption.

When a developer enables, we ask netd to watch all outgoing traffic
from our UID, and penalize us accordingly if cleartext sockets are
detected.  When enabled, netd captures the offending packet and
passes it back to the owning process to aid investigations.  When
death penalty is requested, all future traffic on the socket is
blocked, which usually results in a useful stacktrace before the
app is actually killed.

Bug: 18335678
Change-Id: I3adbc974efd8d3766b4b1a23257563bb82d53c29
 2015-01-15 15:59:03 -08:00
Todd Kennedy
28432f0360 Merge "Rename the binder call createActivityContainer" 2015-01-15 23:37:22 +00:00
Craig Mautner
b523c55d76 am 41d54237: am 92cf3608: Merge "Debug for bug 18201239." into lmp-mr1-dev 
* commit '41d54237380d5f3c06ab2a71715e22f048278ecf':
  Debug for bug 18201239.
 2015-01-15 23:30:41 +00:00
Craig Mautner
41d5423738 am 92cf3608: Merge "Debug for bug 18201239." into lmp-mr1-dev 
* commit '92cf3608b8f171f84f74ab1f7193a6a816063d14':
  Debug for bug 18201239.
 2015-01-15 23:24:40 +00:00
Todd Kennedy
ca4d842205 Rename the binder call createActivityContainer 
Change the call to createVirtualActivityContainer to better describe what's
actually being created with the call.

Change-Id: Id3a32df19a5bb6740cbabcd65897349e9f2f2946
 2015-01-15 15:22:17 -08:00
Craig Mautner
92cf3608b8 Merge "Debug for bug 18201239." into lmp-mr1-dev 2015-01-15 23:18:40 +00:00
Alan Viverette
3c8e3a96e9 Merge "Add popup theme for Spinner, use for actionBarPopupTheme default" 2015-01-15 22:50:26 +00:00
Alan Viverette
3355414b09 Merge "Allow views to be positioned relative to baseline-aligned views" 2015-01-15 22:48:59 +00:00
Craig Mautner
9776ad41b9 Debug for bug 18201239. 
Change-Id: I06281bd76b8c1d887324d3efa39b6cb11c9e71ae
 2015-01-15 14:38:39 -08:00
Alan Viverette
78dfb182d2 am dbe54533: am 77e1f7a2: Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev 
* commit 'dbe54533499571f34ddc126ea21379932ea1d6d7':
  Ensure scroll assets are drawn with correct opacity
 2015-01-15 22:37:40 +00:00
Alan Viverette
dbe5453349 am 77e1f7a2: Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev 
* commit '77e1f7a27bfdd040b00d7ec97440d3cb1e5b79a1':
  Ensure scroll assets are drawn with correct opacity
 2015-01-15 22:32:27 +00:00
Alan Viverette
14af813940 Merge "Update radial time picker styling, clean up code" 2015-01-15 22:27:54 +00:00
Alan Viverette
77e1f7a27b Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev 2015-01-15 22:25:08 +00:00
Roozbeh Pournader
60f8df9339 am a601d44b: am a4d1e250: am 9787039d: Merge "Fudge getRightPaddingOffset in TextView to match clipRect." into lmp-mr1-dev 
* commit 'a601d44baa4ff21d3888dd624c016dc07c5ff937':
  Fudge getRightPaddingOffset in TextView to match clipRect.
 2015-01-15 22:17:35 +00:00
Alan Viverette
03748a5707 Ensure scroll assets are drawn with correct opacity 
Bug: 18903443
Change-Id: I5a7e738b1a09c22857683e2540c96a050b82866e
 2015-01-15 13:00:21 -08:00
Scott Kennedy
db5fd42a03 Mark the root argument as @Nullable in LayoutInflater#inflate() 
Change-Id: I174ff06268ece7a47ce22c98eb0377fa1b5a4a36
 2015-01-15 11:56:33 -08:00
Scott Kennedy
069db2ae23 Merge "Add @Nullable annotation where necessary in Rfc822Token" 2015-01-15 19:52:28 +00:00
Roozbeh Pournader
a601d44baa am a4d1e250: am 9787039d: Merge "Fudge getRightPaddingOffset in TextView to match clipRect." into lmp-mr1-dev 
* commit 'a4d1e25000195b2349cb29e389d1ded4b23dc7a6':
  Fudge getRightPaddingOffset in TextView to match clipRect.
 2015-01-15 19:21:01 +00:00
Roozbeh Pournader
a4d1e25000 am 9787039d: Merge "Fudge getRightPaddingOffset in TextView to match clipRect." into lmp-mr1-dev 
* commit '9787039d91ad23805a1e73e1cd973b85295b85c2':
  Fudge getRightPaddingOffset in TextView to match clipRect.
 2015-01-15 19:10:33 +00:00
Roozbeh Pournader
9787039d91 Merge "Fudge getRightPaddingOffset in TextView to match clipRect." into lmp-mr1-dev 2015-01-15 18:56:08 +00:00
Chet Haase
e1039c6f83 Merge "Add resource attributes for Keyframes and PropertyValuesHolders" 2015-01-15 18:53:36 +00:00
Scott Kennedy
adc6b85072 Add @Nullable annotation where necessary in Rfc822Token 
Change-Id: I9b3088cbdfa09a8085b525674ff2540f23d4c96e
 2015-01-15 10:50:31 -08:00
Raph Levien
a239ef91e5 Merge "Track TextView locale changes if not explicitly set" 2015-01-15 17:27:56 +00:00
Chet Haase
d430753cba Add resource attributes for Keyframes and PropertyValuesHolders 
Issue #17939329 Expose multi-property and multi-keyframe capabilities in animation resources

Change-Id: I14822ced47665fa6cde4996f74d3078da2ada38a
 2015-01-15 07:21:54 -08:00
Nicolas Prevot
a55e3ed8bf am 97c18827: am 97f1ac01: am a9f9c4b9: Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev 
* commit '97c1882719437d4b4d8ce99d53ffc400975fdd5e':
  Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING
 2015-01-15 12:50:29 +00:00
Nicolas Prevot
97c1882719 am 97f1ac01: am a9f9c4b9: Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev 
* commit '97f1ac016b6c116dc2964ba60ffe1e405578756a':
  Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING
 2015-01-15 12:42:47 +00:00
Nicolas Prevot
97f1ac016b am a9f9c4b9: Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev 
* commit 'a9f9c4b90a8af25974bc74971efeafa521073df2':
  Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING
 2015-01-15 12:35:05 +00:00
Nicolas Prevot
a9f9c4b90a Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev 2015-01-15 12:28:13 +00:00
Dianne Hackborn
e6eb0772d6 am fce232b4: am 5a4b4084: am b96a6916: Merge "Fix issue android-app doc, bump battery stats checkin version" into lmp-mr1-dev 
* commit 'fce232b4080a12220821568ab670a0cdce4893c5':
  Fix issue android-app doc, bump battery stats checkin version
 2015-01-15 04:57:52 +00:00