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

173700 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
da029217c8 am a4293a9b: (-s ours) am 7608492d: (-s ours) Import translations. DO NOT MERGE 
* commit 'a4293a9b91a41c80e3af255da3cee22f6cb974d9':
  Import translations. DO NOT MERGE
 2015-01-28 15:36:25 +00:00
Geoff Mendal
a4293a9b91 am 7608492d: (-s ours) Import translations. DO NOT MERGE 
* commit '7608492dea3e05e6c6ace5bceb17dceb512dbc6d':
  Import translations. DO NOT MERGE
 2015-01-28 15:26:16 +00:00
Geoff Mendal
7608492dea Import translations. DO NOT MERGE 
Change-Id: I1c7abd76bf9a24b5e05058f17d1c64d9051b5f81
Auto-generated-cl: translation import
 2015-01-28 08:21:29 -06:00
Jinsuk Kim
c9914a22d8 CEC: Let <Active Source> from the active source work 
<Active Source> from the device which is already in active
source state is being ignored now, but it should work with an effect
of putting input view foreground in case it is hidden behind
home launcher overlay.

For better user experience, this change lets the command from
the active source takes effect to hide the overlay if present.

Bug: 19171319
Change-Id: I43d2646f2ad470b3636e82ff71ac83cf0031ef6c
 2015-01-28 16:37:17 +09:00
Joe Fernandez
617af27167 am 3961def5: am f8afd564: am c6326f44: am 05defb99: Merge "docs: plugin for gradle typo" into lmp-docs automerge: 5421eee 
* commit '3961def5a917eff8afcb50aa4c718bd9cd4351a5':
  docs: plugin for gradle typo
 2015-01-28 04:30:47 +00:00
Leon Scroggins III
beeec02225 am ca4aee06: am 1fa564ef: am cae216f8: am 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. automerge: 714b651 
* commit 'ca4aee06ccf3bb92c4c1ad9c554186dbf5f9f095':
  Handle bad ninepatch data.
 2015-01-28 04:30:42 +00:00
Joe Fernandez
3961def5a9 am f8afd564: am c6326f44: am 05defb99: Merge "docs: plugin for gradle typo" into lmp-docs automerge: 5421eee 
* commit 'f8afd564066f95dd724c9de499ee9acabf45787d':
  docs: plugin for gradle typo
 2015-01-28 04:21:13 +00:00
Leon Scroggins III
ca4aee06cc am 1fa564ef: am cae216f8: am 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. automerge: 714b651 
* commit '1fa564ef54787287a3fdfe6ee97d4a0295f0d8c7':
  Handle bad ninepatch data.
 2015-01-28 04:21:09 +00:00
Joe Fernandez
f8afd56406 am c6326f44: am 05defb99: Merge "docs: plugin for gradle typo" into lmp-docs 
automerge: 5421eee

* commit '5421eee195265d05c821814501aae1bf3f468661':
  docs: plugin for gradle typo
 2015-01-28 04:14:54 +00:00
Leon Scroggins III
1fa564ef54 am cae216f8: am 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. 
automerge: 714b651

* commit '714b6517dcca03a1a6496b33064d54a6b781914a':
  Handle bad ninepatch data.
 2015-01-28 04:13:25 +00:00
Christopher Tate
134aedd2c9 am 46e657bd: am 26faa0be: Merge "Enforce backup encryption in the UI, not just in effect" into lmp-mr1-dev 
* commit '46e657bdbc4323fcab14882f87ece86bc8838892':
  Enforce backup encryption in the UI, not just in effect
 2015-01-28 01:47:53 +00:00
Christopher Tate
46e657bdbc am 26faa0be: Merge "Enforce backup encryption in the UI, not just in effect" into lmp-mr1-dev 
* commit '26faa0be670484b3f32b9e4b07533c3fbef540f5':
  Enforce backup encryption in the UI, not just in effect
 2015-01-28 01:36:33 +00:00
Christopher Tate
ff1876d1fb am 0c607b97: am f37b20e1: Merge "Fix \'always\' preferred app assignment" into lmp-mr1-dev 
* commit '0c607b97f068ca486036a501052572e9207c0926':
  Fix 'always' preferred app assignment
 2015-01-28 01:35:58 +00:00
Christopher Tate
26faa0be67 Merge "Enforce backup encryption in the UI, not just in effect" into lmp-mr1-dev 2015-01-28 01:23:49 +00:00
Christopher Tate
0c607b97f0 am f37b20e1: Merge "Fix \'always\' preferred app assignment" into lmp-mr1-dev 
* commit 'f37b20e1aa03fe662e7cef8e6aee2ded9ea5e514':
  Fix 'always' preferred app assignment
 2015-01-28 01:20:44 +00:00
Christopher Tate
f37b20e1aa Merge "Fix 'always' preferred app assignment" into lmp-mr1-dev 2015-01-28 01:14:12 +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
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
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
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
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
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
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
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
Craig Mautner
bf6af73de6 am 604a9e28: am 5426e7ae: Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev 
* commit '604a9e280e8273f6ed1f1a50724c0d510cf09bb0':
  Defer tap outside stack until multiwindows
 2015-01-27 21:00:29 +00:00
Craig Mautner
604a9e280e am 5426e7ae: Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev 
* commit '5426e7ae93e0e728e0e12bc98a02c957d464cfe0':
  Defer tap outside stack until multiwindows
 2015-01-27 20:54:42 +00:00
Jason Sams
45e6c8b312 am 02236295: am 4dd0cf42: Merge "Initialize clipping structure" 
* commit '02236295a43380b21e4cae10b13da3398d607627':
  Initialize clipping structure
 2015-01-27 20:54:08 +00:00
Craig Mautner
5426e7ae93 Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev 2015-01-27 20:48:55 +00:00
Jason Sams
02236295a4 am 4dd0cf42: Merge "Initialize clipping structure" 
* commit '4dd0cf42f5941d9e25aa042bf75fa003b1f5ec76':
  Initialize clipping structure
 2015-01-27 20:48:04 +00:00
Jason Sams
4dd0cf42f5 Merge "Initialize clipping structure" 2015-01-27 20:41:43 +00:00
Marco Nelissen
2c2415a552 am 3ea395dd: am 4e853598: Merge "Fix printf format" 
* commit '3ea395ddc7785bf8fb6df1e5e6ed142c9336a7eb':
  Fix printf format
 2015-01-27 20:33:09 +00:00
Marco Nelissen
3ea395ddc7 am 4e853598: Merge "Fix printf format" 
* commit '4e85359879cb417f0540a5cfbf91242ebd9546c7':
  Fix printf format
 2015-01-27 20:25:59 +00:00
Marco Nelissen
4e85359879 Merge "Fix printf format" 2015-01-27 20:19:46 +00:00
Marco Nelissen
6cd6110773 Fix printf format 
Change-Id: Ied2f10bb59fe0e13b23bf1f9913ab3b081348a28
 2015-01-27 12:17:48 -08:00