Commit Graph

41588 Commits

Author SHA1 Message Date
Jay Civelli
915eade5dc Merge "Add new intent to prompt user for their device credential." 2014-07-15 00:22:01 +00:00
Jay Civelli
42feda4229 Add new intent to prompt user for their device credential.
Change-Id: I152c5efda7186d59f63c341b046896c65e37de1b
2014-07-14 18:08:04 -07:00
Aravind Akella
c067440dea am badd6789: Merge "Add PackageManager feature strings for relative humidity and temperature sensors." into lmp-dev
* commit 'badd67890c16d26d15f88950cb7de0ce6bd1818d':
  Add PackageManager feature strings for relative humidity and temperature sensors.
2014-07-14 23:40:01 +00:00
Santos Cordon
33a90b121f am ca95854d: Merge "Implement multi-SIM capabilities (1/6) [DO NOT MERGE]" into lmp-dev
* commit 'ca95854d7402d7801364f7244a6d0b6f8e1c7845':
  Implement multi-SIM capabilities (1/6) [DO NOT MERGE]
2014-07-14 23:30:25 +00:00
Alan Viverette
896e20ef5a am a3e345b5: Add window elevation for dialogs, clean up surface insets API
* commit 'a3e345b5cfaf923ca77831d508ed7bc2c74c3cd4':
  Add window elevation for dialogs, clean up surface insets API
2014-07-14 23:25:58 +00:00
Ruben Brunk
ecc15fca80 am feec2391: camera2: Update shader scaling matrix for legacy mode.
* commit 'feec2391ab619307d92194ce23fd8a5ab8259272':
  camera2: Update shader scaling matrix for legacy mode.
2014-07-14 23:15:48 +00:00
Christopher Tate
3470903821 am 2b3009ab: Merge "Add Context.getNoBackupFilesDir()" into lmp-dev
* commit '2b3009abdab2c75de4f19787237e94310a004aee':
  Add Context.getNoBackupFilesDir()
2014-07-14 23:15:39 +00:00
Jason Monk
061c80dbdc am fdf5aba7: Merge "Add missing lock task API" into lmp-dev
* commit 'fdf5aba7fa80d59d017e8ea73233ff53392110b5':
  Add missing lock task API
2014-07-14 23:15:08 +00:00
Alan Viverette
49a22e8202 Add window elevation for dialogs, clean up surface insets API
BUG: 13211941
Change-Id: I9d605d0b2fb24f9bf8e73fbecd520b6b52ae5751
2014-07-14 23:13:28 +00:00
Ruben Brunk
28c49c9d20 camera2: Update shader scaling matrix for legacy mode.
Bug: 15116722
Change-Id: Idaa4311dfd027b2d2b8ea5e2c6cba2da5779d753
2014-07-14 22:57:07 +00:00
RoboErik
dd4bc240e0 am 1600b7d8: Merge changes I51f2e466,I5b67cb3e into lmp-dev
* commit '1600b7d81aa2e339aff715758e52f0e4cb1a12a7':
  Make PlaybackState immutable with a builder
  Add API to set a default session in Activity
2014-07-14 22:25:02 +00:00
Dake Gu
0bd23aeaa2 am ab8005c1: Merge "ActivityTransition: restore callee activity shared element position" into lmp-dev
* commit 'ab8005c15ede165822b94975f9ad4b6de52fe683':
  ActivityTransition: restore callee activity shared element position
2014-07-14 22:24:43 +00:00
dcashman
e3bd1ab5bf am 1a18a06e: Merge "Initial KeySet API." into lmp-dev
* commit '1a18a06eaa0cfcfcad4b63d9d4186735b4c6d281':
  Initial KeySet API.
2014-07-14 21:39:22 +00:00
Jeff Sharkey
f41b425383 am 5c6079a2: Merge "Pass install result message; path selection." into lmp-dev
* commit '5c6079a245d2e909327c639841b50e57dc2a39cc':
  Pass install result message; path selection.
2014-07-14 21:39:11 +00:00
Alan Viverette
ebb8d70f1f am 52a2f72e: DO NOT MERGE Remove sub-position scroller
* commit '52a2f72ee2c188540fa1242a38bb9cf77b0e674a':
  DO NOT MERGE Remove sub-position scroller
2014-07-14 21:39:01 +00:00
Svet Ganov
26d6b22db9 am cd24476f: Correct printer extra constant value.
* commit 'cd24476ffa314eb3b5589c1e7800929f14db86f9':
  Correct printer extra constant value.
2014-07-14 21:38:51 +00:00
Yorke Lee
3613519595 am 07f62944: Merge "Add TRANSCRIPTION column to Calls table" into lmp-dev
* commit '07f62944716836a696e46f903950a63bbba9a47e':
  Add TRANSCRIPTION column to Calls table
2014-07-14 21:38:46 +00:00
Jeff Brown
295f679ce0 am bb1ecd35: Merge changes I3c19e008,I2c7c6013,I5cfd37d9 into lmp-dev
* commit 'bb1ecd35760b9e9ddc030a73d014ae9b11df17ac':
  Update media session test application for new media router.
  Initial draft of new MediaRouter APIs.
  Delete first draft of media routing APIs.
2014-07-14 21:01:13 +00:00
Alexandra Gherghina
d858ac241a am 895cf4b7: Merge "Adds hidden startActivityForResultAsUser APIs" into lmp-dev
* commit '895cf4b76e7d697229bc0589c7646d1be815b24a':
  Adds hidden startActivityForResultAsUser APIs
2014-07-14 21:01:07 +00:00
Eino-Ville Talvala
ea60143852 am eecbafe8: Deprecate android.hardware.Camera
* commit 'eecbafe85de924a1ed6c4c3ecfcfc2353a9c6fcf':
  Deprecate android.hardware.Camera
2014-07-14 21:00:46 +00:00
Amith Yamasani
6b792a5d78 am 45316d2e: Improvements to Restrictions API
* commit '45316d2ebf8b4fb198d68c74c5bb94e9431bcc3d':
  Improvements to Restrictions API
2014-07-14 19:18:49 +00:00
Narayan Kamath
1692b42f26 am beaf9be6: Merge "Unhide Build.SUPPORTED_ABIS and friends."
* commit 'beaf9be6bab5dbbc96929c5b66847e7b49fcda12':
  Unhide Build.SUPPORTED_ABIS and friends.
2014-07-14 19:18:35 +00:00
Jeff Sharkey
a54bfb0963 am 847712f4: Merge "Package installation listener events."
* commit '847712f4e7a4614bd350a85b3d60113db002255a':
  Package installation listener events.
2014-07-14 19:18:28 +00:00
Alan Viverette
9dbf31379b am f2e70fee: Merge "Specify light and shadow properties in theme"
* commit 'f2e70fee223f08ce8f986f5d1b6dbeb018561e84':
  Specify light and shadow properties in theme
2014-07-14 19:18:04 +00:00
Adam Powell
da41e890da am eb61f0f4: Updated "with-default" layout added for ResolverActivity
* commit 'eb61f0f47e0be8361cd6269281908e303152dac9':
  Updated "with-default" layout added for ResolverActivity
2014-07-14 19:17:56 +00:00
Jeff Sharkey
75d0fb51a2 am b525f6c2: Merge "Surface detailed error messages from PMS."
* commit 'b525f6c22425524da82b8fbaf4581ef7acd78844':
  Surface detailed error messages from PMS.
2014-07-14 19:17:52 +00:00
Lajos Molnar
75ec1407bd am 2c14b8d5: Merge "Fix build"
* commit '2c14b8d50df4f47ab1470bd5af0ed4dd41c49897':
  Fix build
2014-07-14 19:17:43 +00:00
Lajos Molnar
489af22f4b am 9b3fa2de: add utility methods to util.Range, Rational and Size
* commit '9b3fa2de42bb77eab31ce6a76aa7715ec136c77e':
  add utility methods to util.Range, Rational and Size
2014-07-14 19:17:15 +00:00
dcashman
0d25db5789 am 0f11491d: Merge "Revert "Initial KeySet API.""
* commit '0f11491dd87e527766c5324c3bc9aeeed57fa690':
  Revert "Initial KeySet API."
2014-07-14 19:17:10 +00:00
dcashman
a210e7b46d am 74023057: Merge "Initial KeySet API."
* commit '740230577a37984ee39a2b7baeb87c743af1f1bf':
  Initial KeySet API.
2014-07-14 19:17:01 +00:00
Alan Viverette
a3c16df3dd am 8ce5c32a: Fix switch text position when thumb is null
* commit '8ce5c32a37db3c6c5182047053ee0651fc93eff2':
  Fix switch text position when thumb is null
2014-07-14 19:16:53 +00:00
Tadashi G. Takaoka
80ba85db92 am 41020598: Make InputMethodUtils.getLanguageFromLocaleString public
* commit '41020598ff45370c8441163d879842e3c6550238':
  Make InputMethodUtils.getLanguageFromLocaleString public
2014-07-14 19:16:49 +00:00
Yuncheol Heo
3c51ff4a23 am 31d92474: Add the system feature for HDMI-CEC.
* commit '31d92474638227b63b17a2d0984e83abc7dac45f':
  Add the system feature for HDMI-CEC.
2014-07-14 19:16:20 +00:00
Chris Craik
2aeee24eea am d15c3bd8: Merge "Disable setOutline() functionality, pending full removal"
* commit 'd15c3bd840b4a4f7a7a76372d5752d86a5fd3d63':
  Disable setOutline() functionality, pending full removal
2014-07-14 19:16:11 +00:00
Sreeram Ramachandran
209cb2db8e am 1f66a4e6: Remove unnecessary code and APIs.
* commit '1f66a4e632df31f6e7b718c48dbc8b1d806b05c0':
  Remove unnecessary code and APIs.
2014-07-14 19:16:02 +00:00
Adam Powell
77d1bb4c4b am 2e4f8306: Merge "Correctly set the window callback for ToolbarActionBar"
* commit '2e4f830677e675d947e0324415bc725be636d860':
  Correctly set the window callback for ToolbarActionBar
2014-07-14 19:15:32 +00:00
Jeff Sharkey
fe7e12cc25 am f0a0dabe: Merge "Progress toward installer public API: callbacks."
* commit 'f0a0dabe8f38989b49e2f28173423093c5d596fb':
  Progress toward installer public API: callbacks.
2014-07-14 19:15:24 +00:00
Adam Powell
65de6e633c am d4ca69be: Add ViewGroup#getClipToPadding()
* commit 'd4ca69be9af4b8371f15bdbf2750cf731a98918e':
  Add ViewGroup#getClipToPadding()
2014-07-14 19:15:04 +00:00
Alan Viverette
41c0785655 am 85c9f08f: Remove old listener when rebinding SwitchPreference
* commit '85c9f08fae4a3173672b76137e3b6379208b4567':
  Remove old listener when rebinding SwitchPreference
2014-07-14 19:14:50 +00:00
destradaa
8a3ad12a61 am 5fc6961e: Add support in the platform for Activity Recognition Hardware.
* commit '5fc6961e3a23ffc044beeefb7a1b2976a81edea3':
  Add support in the platform for Activity Recognition Hardware.
2014-07-14 19:14:45 +00:00
Sreeram Ramachandran
6b3a3bc864 am 1953eca2: Merge "Delete unused APIs in NetworkManagementService."
* commit '1953eca28076134648183744dc96ee9464ad2199':
  Delete unused APIs in NetworkManagementService.
2014-07-14 19:14:23 +00:00
Fabrice Di Meglio
d195411294 am c3b52889: Fix TimePicker behavior
* commit 'c3b528898371119444c76929925c7f360914544c':
  Fix TimePicker behavior
2014-07-14 19:14:12 +00:00
Alan Viverette
1dada3da99 DO NOT MERGE Remove sub-position scroller
BUG: 14477472
Change-Id: I019c58dedb383e9e906831c8e44bab8b88e92604
(cherry picked from commit 66072fe0e1494a851e54bc7756734141dfbf4fe0)
2014-07-14 19:03:43 +00:00
Aravind Akella
8b674abf4d Merge "Add PackageManager feature strings for relative humidity and temperature sensors." into lmp-dev 2014-07-14 18:38:08 +00:00
Dake Gu
2178cee064 Merge "ActivityTransition: restore callee activity shared element position" into lmp-dev 2014-07-14 18:38:08 +00:00
Dake Gu
c18f4cc0f2 ActivityTransition: restore callee activity shared element position
Move the shared element of callee activity to animation start position,
then restore the measured size and locations to original values before
call requestLayout(),  this fixes cases for RecyclerView optimized layout
which offsets siblings by delta of measure size.

Change-Id: I6e43c036e26986605ff008aba476e30ebd270fd1
2014-07-14 13:59:43 -07:00
dcashman
9f92ffa927 Merge "Initial KeySet API." into lmp-dev 2014-07-14 18:38:08 +00:00
dcashman
9d2f441f9b Initial KeySet API.
Previously submitted but reverted due to doc-compilation bug.

Bug: 6967056
Change-Id: I9bd7ef299a4c92c4b327f5b5d7e951f0753b4c8a
2014-07-14 12:50:51 -07:00
Santos Cordon
a5a2cf419d Merge "Implement multi-SIM capabilities (1/6) [DO NOT MERGE]" into lmp-dev 2014-07-14 18:38:02 +00:00
Christopher Tate
a7835b6b6b Add Context.getNoBackupFilesDir()
This is an app-private filesystem space exactly like the one
reported by Context.getFilesDir(), with one exception:  files
placed here are never backed up by the full-backup infrastructure.
If an app attempts to back up any of its contents via the normal
API it's immediately ignored with a logged warning.

The restriction is also enforced on the restore side, because
apps using support libraries might wind up creating full backup
archives containing no_backup subdirs on pre-L devices (via
adb backup, Helium, &c.).  We check for this before passing the
restore data to the app, and drop it if we detect the situation
so that the app never sees the bits.

Bug 16240573

Change-Id: I11216a391f1d32117ec7ce15aafc9cd93d0337de
2014-07-14 22:56:04 +00:00