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

181236 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Davidson
5c7daaf776 resolved conflicts for merge of b9470f3a to master 
Change-Id: I85a975253b0b18b8c9e6d069c88fc12c93ed82ad
 2015-01-27 16:24:32 -08:00
Alan Viverette
ca360e14af Merge "Fix fallout from merging e5743753 conflicts" 2015-01-28 00:22:03 +00:00
Alan Viverette
4c05c4c216 Fix fallout from merging e5743753 conflicts 
Change-Id: Iad16381bdf925a05e2ec609c3a5442c2a0354be9
 2015-01-27 16:21:25 -08:00
Alan Viverette
b032cd1f52 Merge "Expose View.OnScrollChangeListener interface" 2015-01-28 00:02:21 +00:00
Christopher Tate
14d0e1a4e1 Enforce backup encryption in the UI, not just in effect 
Encryption is required when using 'adb backup' on encrypted devices,
but the UI has not been enforcing this.  The failure mode is quite
confusing: the user can tap "back up my data" with no encryption
phrase supplied, and the confirmation activity disappears, but
the backup doesn't actually happen.

We now disallow confirming the backup unless a non-empty passphrase
has been entered into the UI.

In addition, tapping "do not back up my data" now finishes
the confirmation activity instead of just leaving it in a
confusing "dead" state.

Bug 19081192

Change-Id: I9ca69a08ff4322fe25129f9ca880b066c31525d0
 2015-01-27 15:58:36 -08:00
Ricardo Cervera
d05d91358d am 8ff85c5e: am be3731f0: am f5386a9a: am 8ec3eb4e: am de113066: docs: Transitions training class. 
automerge: 3c6cd62

* commit '3c6cd6273ce89598c10cc15aa2843a7f8301ff27':
  docs: Transitions training class.
 2015-01-27 23:44:52 +00:00
Craig Mautner
4baf8d9e9e am 604a9e28: am 5426e7ae: Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev 
automerge: bf6af73

* commit 'bf6af73de6b24e53e9656da75b542d2f8caa77e6':
  Defer tap outside stack until multiwindows
 2015-01-27 23:43:26 +00:00
Jason Sams
bf58b6861e am 02236295: am 4dd0cf42: Merge "Initialize clipping structure" 
automerge: 45e6c8b

* commit '45e6c8b31253d864d55c9835c76180a9b3d5bd59':
  Initialize clipping structure
 2015-01-27 23:41:56 +00:00
Marco Nelissen
565bca4e19 am 3ea395dd: am 4e853598: Merge "Fix printf format" 
automerge: 2c2415a

* commit '2c2415a552b62016886af62419080ca7ac327871':
  Fix printf format
 2015-01-27 23:40:39 +00:00
Alan Viverette
f9d7eedc46 Expose View.OnScrollChangeListener interface 
Allows clients to observe changes to scrollX / scrollY.

Bug: 19098033
Change-Id: I070e61a9532fe1f6cb5437eab94f7fffc1b17e97
 2015-01-27 15:38:19 -08:00
Mike Lockwood
aadd020849 Merge "AndroidManifest.xml: Remove two obsolete protected broadcasts" 2015-01-27 23:35:46 +00:00
Leon Scroggins III
283ddb9d4f am 3523e4fc: am efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-dev 
automerge: 8475144

* commit '847514499f5920d073f5cd402dd0d3bbd19ac2c1':
  Handle bad ninepatch data.
 2015-01-27 23:34:35 +00:00
Marco Nelissen
0a3f0b020e am 99985d98: am e74da38e: Merge "Make SoundPool use MediaCodec" 
automerge: 6e14c57

* commit '6e14c5705c5acf9d6036060252f257a084cd7578':
  Make SoundPool use MediaCodec
 2015-01-27 23:33:05 +00:00
Matthew Xie
f4244f579d am 46c3304a: am 485813a0: Merge "Delay the second message for 30ms more than the last message for a2dp" into lmp-mr1-dev 
automerge: e213c68

* commit 'e213c6813e5abe51d1359bacc1ae5f0ca5367505':
  Delay the second message for 30ms more than the last message for a2dp
 2015-01-27 23:31:32 +00:00
George Mount
206db8a70f am fff84a23: Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev automerge: aa6945a 
automerge: 5c25f5b

* commit '5c25f5b0a7de7c05e71a88373223d579c3823415':
  Activity Transition: fix quick back after enter.
 2015-01-27 23:30:18 +00:00
Lorenzo Colitti
b805dd3a8e am b84e0040: am 525588c5: Merge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-dev 
automerge: 9461526

* commit '94615260a8fc51fc6b9a0407b1caa13849082af5':
  Make NetworkMonitor less aggressive on broken networks.
 2015-01-27 23:29:02 +00:00
Yabin Cui
026111bc56 am f7049289: am 3812e68e: Merge "kill HAVE_PTHREADS." 
automerge: 3a10a67

* commit '3a10a672f05735be46256617b8a61cdb1e589008':
  kill HAVE_PTHREADS.
 2015-01-27 23:27:37 +00:00
Svetoslav
85d6a63d41 am fcecdccc: am 369f1ec6: Merge "Add a missing file to print spooler resources" into lmp-mr1-dev 
automerge: 3fd1ebf

* commit '3fd1ebff6c017ba4495070cb34f1ed7652b33cc9':
  Add a missing file to print spooler resources
 2015-01-27 23:26:24 +00:00
Alan Viverette
d8111138ab resolve merge conflicts of e5743753 to master. 
Change-Id: I83f4b6abb669963b9c4fcdf9870317e019360d46
 2015-01-27 15:23:09 -08:00
Craig Mautner
165be0c70d Remove TYPE_UNIVERSE_BACKGROUND from system 
An experiment that is over and has been occupying space.

Fixes bug 18088522 item #7

Change-Id: Ib0fcaa24243ed9b0581143e1d5114c1fd2b0aa6e
 2015-01-27 15:16:58 -08:00
Joe Fernandez
5421eee195 am c6326f44: am 05defb99: Merge "docs: plugin for gradle typo" into lmp-docs 
* commit 'c6326f44bf0634f58a7bf6f322b4b676352baeed':
  docs: plugin for gradle typo
 2015-01-27 23:09:12 +00:00
Mike Lockwood
98a0b38819 AndroidManifest.xml: Remove two obsolete protected broadcasts 
android.media.action.USB_AUDIO_ACCESSORY_PLUG and android.media.action.USB_AUDIO_DEVICE_PLUG
were removed in a previous change.

Change-Id: I22d09b9a0eb4f6f29a31a50ed8bfa7e09c52b064
 2015-01-27 15:07:29 -08:00
Joe Fernandez
c6326f44bf am 05defb99: Merge "docs: plugin for gradle typo" into lmp-docs 
* commit '05defb992eefb8a32742d64c06e8e8fd02dbf670':
  docs: plugin for gradle typo
 2015-01-27 23:03:49 +00:00
Leon Scroggins III
714b6517dc am cae216f8: am 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. 
* commit 'cae216f8dc3e1d752f2c353e488da07cadd95570':
  Handle bad ninepatch data.
 2015-01-27 23:02:57 +00:00
Joe Fernandez
05defb992e Merge "docs: plugin for gradle typo" into lmp-docs 2015-01-27 22:57:30 +00:00
Leon Scroggins III
cae216f8dc am 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. 
* commit '1e0d4b5611f9a7134c9ab5fdb62b9385c5161c7c':
  Handle bad ninepatch data.
 2015-01-27 22:55:00 +00:00
Leon Scroggins III
1e0d4b5611 am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. 
* commit '1dbbc2045ae16a4923b30c9576703d02a4363529':
  Handle bad ninepatch data.
 2015-01-27 22:48:29 +00:00
Leon Scroggins III
1dbbc2045a am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. 
* commit '6106f6a490cb5816602e8e3ae84a5c653dda44d3':
  Handle bad ninepatch data.
 2015-01-27 22:42:03 +00:00
Leon Scroggins III
6106f6a490 am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. 
* commit '9352296810926eae663477526545a55e1b1f7a27':
  Handle bad ninepatch data.
 2015-01-27 22:31:47 +00:00
Wale Ogunwale
783f28691e Merge "Support activities in the same process having different resources." 2015-01-27 22:24:15 +00:00
Leon Scroggins III
9352296810 am 01287549: am 9a6143fa: Handle bad ninepatch data. 
* commit '01287549ad415c51377683696eb37c362d43061a':
  Handle bad ninepatch data.
 2015-01-27 22:17:11 +00:00
Craig Mautner
a171ae1bb2 Merge "Precompute FLAG_ACTIVITY_NO_ANIMATION" 2015-01-27 22:15:56 +00:00
Tim Kilbourn
00483559b3 am a8a4ce97: am 597bb696: Merge "Add a config for whether to start in touch mode." into lmp-mr1-dev 
* commit 'a8a4ce97b3dd901d047a436943e9f80e0e8be820':
  Add a config for whether to start in touch mode.
 2015-01-27 22:15:42 +00:00
Craig Mautner
1ab8674be0 Merge "Eliminate groupId and add task to AppWindowToken" 2015-01-27 22:15:19 +00:00
Tim Kilbourn
a8a4ce97b3 am 597bb696: Merge "Add a config for whether to start in touch mode." into lmp-mr1-dev 
* commit '597bb6968be56c1b8b0629ba89fec409084cc112':
  Add a config for whether to start in touch mode.
 2015-01-27 22:09:21 +00:00
Jeff Davidson
b9470f3a23 am 9490c597: am bae051f6: Merge "Use consistent logic for data icon overlays." into lmp-mr1-dev 
* commit '9490c597460a2fcaaf0d510576f4f752b7a725ce':
  Use consistent logic for data icon overlays.
 2015-01-27 22:09:08 +00:00
Tim Kilbourn
597bb6968b Merge "Add a config for whether to start in touch mode." into lmp-mr1-dev 2015-01-27 22:03:50 +00:00
Jeff Davidson
9490c59746 am bae051f6: Merge "Use consistent logic for data icon overlays." into lmp-mr1-dev 
* commit 'bae051f6bd8ae4f103d8067ed96accbced173664':
  Use consistent logic for data icon overlays.
 2015-01-27 22:03:24 +00:00
Leon Scroggins III
01287549ad am 9a6143fa: Handle bad ninepatch data. 
* commit '9a6143fab7d93797e4b22a12b89e07c160e5c31d':
  Handle bad ninepatch data.
 2015-01-27 22:01:08 +00:00
Jeff Davidson
bae051f6bd Merge "Use consistent logic for data icon overlays." into lmp-mr1-dev 2015-01-27 21:57:06 +00:00
Craig Mautner
8f5f7e9245 Precompute FLAG_ACTIVITY_NO_ANIMATION 
Save lots of passing around of ActivityRecords when all you care
about is the flag.

Fixes bug 18088522 item #14

Change-Id: Ib6d95ef06b44faa1715a196ab710f96ed4517213
 2015-01-27 13:56:39 -08:00
Craig Mautner
83162a9027 Eliminate groupId and add task to AppWindowToken 
Simplifies access by eliminating indirect referencing.

Fixes bug 18088522 item #15.

Change-Id: I9049192a7f3e1028d60c4f2d4d4a0d4aad590aa4
 2015-01-27 13:56:20 -08:00
Christopher Tate
57792912ee Fix 'always' preferred app assignment 
In the case when some possible resolutions of a given intent are at
different priorities (typically when they're intended as fallbacks when
no "normal" handler for the intent exists) the check for "is this the
same set of possible handlers that we saw last time?" was broken.  We
now ignore resolver priority entirely in that check: match set comparison
should be orthogonal to prioritization within the set, and indeed the
priority is dealt with separately in any event.

Bug 19011225

Change-Id: I3c1658442cc88b1f4a5c5f2fe9f64472799e156c
 2015-01-27 13:52:17 -08:00
Tim Kilbourn
9626854543 Add a config for whether to start in touch mode. 
Bug: 18925810
Change-Id: Ic9b956cde380cffcad7ca229f1669692b1743e6d
 2015-01-27 13:51:58 -08:00
Ricardo Cervera
3c6cd6273c am 8ff85c5e: am be3731f0: am f5386a9a: am 8ec3eb4e: am de113066: docs: Transitions training class. 
* commit '8ff85c5ecb09f297d8926bae5ad09f0423594ed0':
  docs: Transitions training class.
 2015-01-27 21:43:26 +00:00
Alan Viverette
d8c2af5542 Fix build 
Change-Id: I134e40dbabcb9b111b3d7851a7adc247f5c92e3b
 2015-01-27 13:35:14 -08:00
Ricardo Cervera
8ff85c5ecb am be3731f0: am f5386a9a: am 8ec3eb4e: am de113066: docs: Transitions training class. 
* commit 'be3731f028cf815d51e7c49b7415d7d1e8ac3639':
  docs: Transitions training class.
 2015-01-27 21:34:45 +00:00
Ricardo Cervera
be3731f028 am f5386a9a: am 8ec3eb4e: am de113066: docs: Transitions training class. 
* commit 'f5386a9a949297be1321cce7eed5d0975c7b64ad':
  docs: Transitions training class.
 2015-01-27 21:28:14 +00:00
Ricardo Cervera
f5386a9a94 am 8ec3eb4e: am de113066: docs: Transitions training class. 
* commit '8ec3eb4e7c38c3c368c62bc47805d802df15f2a8':
  docs: Transitions training class.
 2015-01-27 21:23:19 +00:00
Ricardo Cervera
8ec3eb4e7c am de113066: docs: Transitions training class. 
* commit 'de113066d80c3f19979eb531484af73f64640de9':
  docs: Transitions training class.
 2015-01-27 21:16:53 +00:00