Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
138,390 Commits 3 Branches 0 Tags
9da603973bcde2fb4566d6cc1bcb0f764fd383f4
Commit Graph

40433 Commits

Author SHA1 Message Date
Jessica Hummel
9da603973b Update documentation so it meets api requirements 
Change-Id: Ice52dc3d5ecca77f81d3df1b43179c94aece6fef
bug:15023443
 2014-06-09 13:01:03 +01:00
Nicolas Prevot
a61fbbd0c3 Merge "Adding an extra and an action to notify the mdm to start the provisioning." 2014-06-06 11:18:10 +00:00
Nicolas Prevot
07ac20bb2c Adding an extra and an action to notify the mdm to start the provisioning. 
Adding EXTRA_PROVISIONING_EMAIL_ADDRESS and ACTION_START_PROVISIONING to DevicePolicyManager.

BUG: 15157562

Change-Id: Ic3ecc6b0a501e1df9a5f803a44347dd024a7a07c
 2014-06-06 12:00:17 +01:00
Yohei Yukawa
c1026e17c6 Naming style fix for an internal constant 
This CL does nothing except for adding MSG_ prefix to
an internal constant.

Change-Id: Ic41a8f1e31f5a6a84e6ff8fe9214e9cbc92e04d9
 2014-06-06 15:46:10 +09:00
Vinod Krishnan
445d2139ef Merge "resolved conflicts for merge of a3d5d3b8 to master" 2014-06-06 01:54:11 +00:00
Vinod Krishnan
067351f876 resolved conflicts for merge of a3d5d3b8 to master 
Change-Id: If0fe0cb541adb0eb74f13cf557ee264aa76c650c
 2014-06-05 18:51:47 -07:00
Sol Boucher
fca5f52347 am af9a77d6: camera2: Fix ordering issue between #onOpened and createCaptureSession 
* commit 'af9a77d64912985a3fa9f91cd0e372316e790b9f':
  camera2: Fix ordering issue between #onOpened and createCaptureSession
 2014-06-06 01:51:25 +00:00
Sol Boucher
4b3f800438 camera2: Fix ordering issue between #onOpened and createCaptureSession 
This resolves an issue where the CameraDevice.StateListener callbacks were
erroneously called before the CameraCaptureSession.StateListener ones,
preventing e.g. creating a capture session from the
CameraDevice.StateListener#onOpened() callback.
It also explicitly ignores CameraDevice.StateListener#onUnconfigured() calls
occurring before the first call to #close .

Bug: 15449190
Change-Id: Ic0094d53a65e42108201d7bb50734d17290fa9bf
 2014-06-06 01:43:00 +00:00
Raph Levien
748a3779f3 am 455b351b: Merge "Make elegantTextHeight xml attribute public" into lmp-preview-dev 
* commit '455b351bba515c3a7e6139368c4110abbf1e4e89':
  Make elegantTextHeight xml attribute public
 2014-06-06 00:45:43 +00:00
Raph Levien
5b29e12cfb Merge "Make elegantTextHeight xml attribute public" into lmp-preview-dev 2014-06-06 00:42:34 +00:00
Vinod Krishnan
a3d5d3b8af am 90e96db0: Merge "Adding a way to stub Vpn ConfirmDialog" into klp-modular-dev 
* commit '90e96db0b5a200f528f1ca6a66d5aeaa5c915ca2':
  Adding a way to stub Vpn ConfirmDialog
 2014-06-06 00:16:40 +00:00
Yin-Chia Yeh
abfaf964a5 am 6d892689: Merge "Camera2: Do not hide TonemapCurve construtor" into lmp-preview-dev 
* commit '6d892689f569871e2e711669c0262a7d25b3e091':
  Camera2: Do not hide TonemapCurve construtor
 2014-06-05 23:37:07 +00:00
Yin-Chia Yeh
ffff217134 Merge "Camera2: Do not hide TonemapCurve construtor" into lmp-preview-dev 2014-06-05 23:33:38 +00:00
Zhijun He
169a149d55 am b67beb8e: Merge "Camera2: Hide input stream related key and enum" into lmp-preview-dev 
* commit 'b67beb8e8b9115c1ba796a57f1bb59822e6a1ce1':
  Camera2: Hide input stream related key and enum
 2014-06-05 23:21:03 +00:00
Zhijun He
f98a3c020d Merge "Camera2: Hide input stream related key and enum" into lmp-preview-dev 2014-06-05 23:15:17 +00:00
ztenghui
537d7ea039 am 42decb1b: Merge "API Review: move the CreateRevealAnimator to ViewAnimationUtils" into lmp-preview-dev 
* commit '42decb1bfe354923205a7cdf856f395f9070b64f':
  API Review: move the CreateRevealAnimator to ViewAnimationUtils
 2014-06-05 22:39:11 +00:00
ztenghui
2050d39e08 Merge "API Review: move the CreateRevealAnimator to ViewAnimationUtils" into lmp-preview-dev 2014-06-05 22:32:41 +00:00
Raph Levien
e1c4a0d299 Make elegantTextHeight xml attribute public 
The elegantTextHeight attribute of TextView was made public through
Java code, but the corresponding attribute wasn't public. This patch
makes it so.

This is a fix for bug 15428791 "elegantTextHeight is hidden (not in
android.R.attr)"

Change-Id: I7011f10ae58fd2e212da9cbaca4a484f011d8fed
 2014-06-05 22:30:37 +00:00
Vinod Krishnan
b0e5bbb657 Adding a way to stub Vpn ConfirmDialog 
- This is needed to pass CTS tests on the wear devices
- Related CL: http://ar/479486

Bug: 15087985

Change-Id: I56673ff6085618a03ec61031e3af0f6631cb3425
 2014-06-05 15:28:50 -07:00
Kristian Monsen
3dba0546c4 Merge "Remove unused function from the WebView statics" 2014-06-05 21:51:00 +00:00
Eric Laurent
7de8c849d7 Merge "Add SoundTrigger native service interface" 2014-06-05 21:04:09 +00:00
Alan Viverette
c954e61cd7 am 3966c960: Merge "Add defaults for caption colors and edge type" into lmp-preview-dev 
* commit '3966c9604e55c9183a6d1ba8b3540add3be4434f':
  Add defaults for caption colors and edge type
 2014-06-05 21:00:32 +00:00
ztenghui
62f30e0bb1 API Review: move the CreateRevealAnimator to ViewAnimationUtils 
b/15451650

Change-Id: If270bbf757047ce7847cab457d3836d756830124
 2014-06-05 13:45:15 -07:00
Alan Viverette
4586b0da63 Merge "Add defaults for caption colors and edge type" into lmp-preview-dev 2014-06-05 20:37:22 +00:00
Matthew Williams
38b200fe6c am 1a2f47d4: Merge "Add persistence of tasks for TaskManager & BatteryController" into lmp-preview-dev 
* commit '1a2f47d4cdc0ea40dff1b88f7976d64c19d687b1':
  Add persistence of tasks for TaskManager & BatteryController
 2014-06-05 20:08:54 +00:00
Zhijun He
6593acd95d Camera2: Hide input stream related key and enum 
Bug: 14622091
Change-Id: Id8fc20b752da876f00a94d0262cd9468951bb36d
 2014-06-05 12:49:56 -07:00
Yin-Chia Yeh
83a9e4d864 Camera2: Do not hide TonemapCurve construtor 
Do not @hide TonemapCurve constructor since it's also a
control key.

bug: 14628001
Change-Id: I17384f42f5c2db2371d1c09030d04a1b9637045e
 2014-06-05 11:34:48 -07:00
Matthew Williams
3d86fd2bb9 Add persistence of tasks for TaskManager & BatteryController 
Tasks are persisted only if the client has the RECEIVE_BOOT_COMPLETED
permission. This applies to both periodic and one-off tasks.
Write out task as xml, using PersistableBundle for the extras data.
Todo: Add persistable bundle to xml when ag/468207 is merged.

Also added BatteryController logic.

Change-Id: I23eeeb8b3bc6ba155e7fa4ec25857a68ee8b1567
 2014-06-05 18:28:43 +00:00
Robin Lee
d450a3a995 am 7f993419: am 3c189e02: am 271251d7: Merge "Add Environment call: get config dir for some user" 
* commit '7f99341950273f5284186ea2e59a22ac71241c30':
  Add Environment call: get config dir for some user
 2014-06-05 17:56:58 +00:00
Robin Lee
7f99341950 am 3c189e02: am 271251d7: Merge "Add Environment call: get config dir for some user" 
* commit '3c189e02e42fba9d5be2c4f68f76620bae33618e':
  Add Environment call: get config dir for some user
 2014-06-05 17:53:25 +00:00
Hui Lu
1ce7f79ddd am 26f40cc3: am 61c0f547: Merge "Add interface name for proxy network type." into klp-modular-dev 
* commit '26f40cc36dc869fc8de3bf4c97de57aae0d626ca':
  Add interface name for proxy network type.
 2014-06-05 17:42:17 +00:00
Hui Lu
26f40cc36d am 61c0f547: Merge "Add interface name for proxy network type." into klp-modular-dev 
* commit '61c0f547339ec870d42b15e84f9628631308f22f':
  Add interface name for proxy network type.
 2014-06-05 17:39:09 +00:00
Hui Lu
61c0f54733 Merge "Add interface name for proxy network type." into klp-modular-dev 2014-06-05 17:36:02 +00:00
Kristian Monsen
638c078c87 Remove unused function from the WebView statics 
Change-Id: I47c47c44d4b5b6f4a4f366affa9d110de440ade5
 2014-06-05 10:14:23 -07:00
Hui Lu
c80fa71e88 Add interface name for proxy network type. 
This will make test
android.net.cts.ConnectivityManagerTest#testRequestRouteToHost pass.
Change-Id: I5a14b6d705e87018e1e2c031aaacee533536a50b

Bug: 15320910
 2014-06-05 17:06:13 +00:00
Yorke Lee
b68bf447f6 am d6138017: Merge "API changes per API review for contacts" into lmp-preview-dev 
* commit 'd6138017d9d435b176dff424ff75c8e8ea298d06':
  API changes per API review for contacts
 2014-06-05 15:21:22 +00:00
Yohei Yukawa
bd12056154 Merge "Trivial method renaming for notifyTextCommitted" 2014-06-05 15:20:53 +00:00
Robin Lee
6959133d84 Add Environment call: get config dir for some user 
This returns a read-only directory accessible to any app running as the
same user, containing various configuration files written by the system.

Change-Id: I635de184fc285b8fef166b782bbc1ac79f8f0687
 2014-06-05 14:34:23 +00:00
Kenny Guy
d0969135aa Merge "Badge notification from managed profiles." 2014-06-05 14:20:35 +00:00
Yohei Yukawa
0297051162 Trivial method renaming for notifyTextCommitted 
This CL does not change existing behavior but only renames
notifyTextCommitted with notifyUserAction so that we can use
not only text commit but also other actions such as just typing
a character will be used as a trigger to update the IME
rotation order for better IME switching experience.

BUG: 7043015
Change-Id: I7f3e13a7226ef0dceee82b67e8a0d8536f7e9807
 2014-06-05 23:07:05 +09:00
Selim Cinek
63c8b6c325 am 71ea5814: Merge "Changed the LockPatternView assets to quantum" into lmp-preview-dev 
* commit '71ea5814716a191b3ab2bc9045007865cbad3e34':
  Changed the LockPatternView assets to quantum
 2014-06-05 13:45:58 +00:00
Yorke Lee
8089ce7cbc Merge "API changes per API review for contacts" into lmp-preview-dev 2014-06-05 13:43:35 +00:00
Adam Connors
7283f963d3 Merge "API Review: rename FEATURE_MANAGEDPROFILES" 2014-06-05 13:07:12 +00:00
Adam Connors
551c0789bc API Review: rename FEATURE_MANAGEDPROFILES 
To be FEATURE_MANAGED_PROFILES

Bug: 15025371
Change-Id: I2f818b4d8488fe7943fe5ff6051d6b1f84ca9e8c
 2014-06-05 12:13:03 +01:00
Selim Cinek
35066c385f Merge "Changed the LockPatternView assets to quantum" into lmp-preview-dev 2014-06-05 05:03:11 +00:00
Selim Cinek
2cb687e7b9 Changed the LockPatternView assets to quantum 
Bug: 13735707
Change-Id: Id999adbd8a4aeb3ca91fcb9957ec38ec75ff91b0
 2014-06-05 06:59:08 +02:00
Craig Mautner
b6011c1c2a Merge commit '21483b9f' into manualmerge 
Change-Id: If9261cc1625f9f492697fe16c21d2b71c0cc0e11
 2014-06-04 20:59:13 -07:00
Craig Mautner
21483b9f0b am e34fcf8f: Merge "Add callback when ActivityView activities complete" into klp-modular-dev 
* commit 'e34fcf8ff9a023641505a8decdeb1b77232d8a16':
  Add callback when ActivityView activities complete
 2014-06-05 03:31:06 +00:00
Craig Mautner
e34fcf8ff9 Merge "Add callback when ActivityView activities complete" into klp-modular-dev 2014-06-05 03:28:21 +00:00
Eino-Ville Talvala
85e5f85f2e am 4b1b33ef: Merge "Camera2: Invoke onError callbacks for failure to open" into lmp-preview-dev 
* commit '4b1b33eff0eabd17f1078d55188b40e9a27d047a':
  Camera2: Invoke onError callbacks for failure to open
 2014-06-05 02:30:08 +00:00