139207 Commits

Author SHA1 Message Date
Bryan Mawhinney
aa00ae0a67 am 99017c01: Merge "Fix issue preventing aapt from stripping all unwanted densities" into lmp-preview-dev
* commit '99017c01bac525ca4b5b10768052ced398b4a493':
  Fix issue preventing aapt from stripping all unwanted densities
2014-06-09 15:55:43 +00:00
Deepanshu Gupta
75814c19d3 am e23620e6: Merge "Build LayoutLib with Java 6" into lmp-preview-dev
* commit 'e23620e684ae73558e42a51f93004c8de07ba8d5':
  Build LayoutLib with Java 6
2014-06-09 15:55:24 +00:00
Dianne Hackborn
e294f40b1d am 50bfc3ac: Merge "[system transitions] + merge all transition work into new branch for commiting to master + new task switching animations to support doc-centric recents + new default activity transitions + new app -> home (wallpaper close) + updated fragment close"
* commit '50bfc3ac0fadbb5413e9de07141d1eff4fc7321e':
  [system transitions] + merge all transition work into new branch for commiting to master + new task switching animations to support doc-centric recents + new default activity transitions + new app -> home (wallpaper close) + updated fragment close
2014-06-09 15:55:18 +00:00
Robin Lee
a54c8246a5 am 0b889cd6: am db9e0a67: am 01c07a85: Merge "Choose CA certificate storage according to userId"
* commit '0b889cd66fdb739a8078fb50212501849e35eb1e':
  Choose CA certificate storage according to userId
2014-06-09 14:47:04 +00:00
Jessica Hummel
f89fa83374 Merge "Update documentation so it meets api requirements" 2014-06-09 13:55:19 +00:00
George Mount
446956f789 Merge "Capture right/bottom of images properly when doing Activity Transitions." 2014-06-09 13:50:14 +00:00
Nicolas Prevot
e8b8f99dde Merge "Updating documentation for the flags of addCrossProfileIntentFilter" 2014-06-09 13:01:09 +00:00
Adam Connors
d4b584ea7f Api review: Make ACTION_MANAGED_PROFILE_REMOVED registered only.
And update the javadoc to explain use-case.

Bug: 15025562
Change-Id: I8eb2666c8480f873e042687223b1a1f82e7919c9
2014-06-09 13:55:47 +01:00
Robin Lee
0b889cd66f am db9e0a67: am 01c07a85: Merge "Choose CA certificate storage according to userId"
* commit 'db9e0a674ac3a9c71699618cb525fdd3c4669e30':
  Choose CA certificate storage according to userId
2014-06-09 12:55:13 +00:00
Robin Lee
db9e0a674a am 01c07a85: Merge "Choose CA certificate storage according to userId"
* commit '01c07a856de163dc9a6fd31ea4b42293d221ee63':
  Choose CA certificate storage according to userId
2014-06-09 12:51:19 +00:00
Jason Monk
1e7bdd7174 Merge "Add an API to clear the device owner." 2014-06-09 12:48:35 +00:00
Robin Lee
01c07a856d Merge "Choose CA certificate storage according to userId" 2014-06-09 12:47:08 +00:00
Robin Lee
3d076afc37 Choose CA certificate storage according to userId
Sets the default CA certificate directory at first instantiation so
that only certificates for the current user are searched.

This means that if one user decides to trust a CA no other user of the
device will be forced into trusting that CA as well.

Change-Id: Iaca14a94dd14c598e49a598290e1a80917269eac
2014-06-09 12:45:17 +00:00
Yohei Yukawa
39dd1510ea Use more user actions to update the IME rotation order
Previously, only the text update event in composing mode
is used to update the IME rotation order. This may look strange
to a user especially when the character is input without
composition.

With this CL, to cover above cased, sending a key event is also
used as a trigger to update update the rotation order.

Note that the cost of calling IMM#notifyUserAction multiple times
is now cheap enough because of the optimization made in
I19ad8542659bc092b92ee13e.

BUG: 7043015
Change-Id: I03fa436df0a5e348b3f93170aab3a8ac5a7e1677
2014-06-09 21:19:18 +09:00
Yohei Yukawa
0fcedfd8ea Merge "Introduce a sequence number to avoid redundant IPCs" 2014-06-09 12:02:30 +00:00
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
41d926e3e4 Updating documentation for the flags of addCrossProfileIntentFilter
Change-Id: I32ed07aecdc8009cbb5708777da5085feabfd4ef
2014-06-09 11:55:23 +01:00
Calin Juravle
66e29d08c7 am ee20e16d: am 337f97be: am 97f7f24c: Merge "Fixed comments related to profile properties."
* commit 'ee20e16d7b7d9882054855e7ce2a2dbbd6849d2d':
  Fixed comments related to profile properties.
2014-06-09 10:05:04 +00:00
Adam Connors
89b3b4a0b2 API Review: rename FEATURE_MANAGEDPROFILES
To be FEATURE_MANAGED_PROFILES

Bug: 15025371
Change-Id: I2f818b4d8488fe7943fe5ff6051d6b1f84ca9e8c
(cherry picked from commit 687efd6f5c05dc1e4a9c284bf3edae901af45942)
2014-06-09 10:58:22 +01:00
Calin Juravle
ee20e16d7b am 337f97be: am 97f7f24c: Merge "Fixed comments related to profile properties."
* commit '337f97bedc09354ea9a8a506aefccc39dd4248e8':
  Fixed comments related to profile properties.
2014-06-09 09:56:37 +00:00
Yohei Yukawa
3d1e8129eb Introduce a sequence number to avoid redundant IPCs
This CL introduces a sequence number to avoid redundant IPCs
between IMM and IMMS. The basic concept is that:
1. IMMS maintains a sequence number for #notifyUserAction.
2. IMMS increases the sequence number whenever the current
   IME/subtype is changed.
3. IMMS notifies the new sequence number to IMM.
4. IMM maintains the last sent sequence number and the next
   sequence number. IMM should call #notifyUserAction only
   once per particular sequence number.
5. IMMS ignores #notifyUserAction if the specified sequence
   number is not the expected one.

BUG: 7043015
Change-Id: I19ad8542659bc092b92ee13eb9f1d68ddd4b815a
2014-06-09 18:30:02 +09:00
Calin Juravle
337f97bedc am 97f7f24c: Merge "Fixed comments related to profile properties."
* commit '97f7f24c9d9ea35a2e360fb86beb0a9fca4fc2d7':
  Fixed comments related to profile properties.
2014-06-09 09:23:18 +00:00
Calin Juravle
97f7f24c9d Merge "Fixed comments related to profile properties." 2014-06-09 09:18:23 +00:00
Calin Juravle
de99f08f65 Fixed comments related to profile properties.
Change-Id: Idd6de8fe2a193a36cf1ea6bcadacb3289973c5ab
2014-06-09 10:13:55 +01:00
Ji-Hwan Lee
8719611744 Merge "Set mBound only when bind succeeds" into lmp-preview-dev 2014-06-09 08:16:07 +00:00
Ji-Hwan Lee
e17b2dd7bc Set mBound only when bind succeeds
Fixes an issue that TV input is disabled forever after package upgrade,
when it's upgraded while in use.  The root cause is as below:

- Package is killed while upgrade.
- Service disconnects, and tries to rebind for reconnecting, but bind fails
  because service is not available temporarily.  Still ServiceState.mBound is
  set to true.
- Should rebind next when callback is registered or new session is created,
  but doesn't because ServiceState is already marked bound.

Bug: 14981201
Change-Id: Ia5b0acb33f1247064213024438f114bc40238648
2014-06-09 15:22:59 +09:00
Wonsik Kim
55f933f715 Merge "Make TvInputs aware of whether it's hardware-based or not" into lmp-preview-dev 2014-06-09 06:07:21 +00:00
Jerome Poichet
efc3c465cf Using Manufacturer and not brand for device name
We are aware that there will be some devices out there using brand but
we are OK with this.

b/15478133 Build.MANUFACTURER is all lower case

Change-Id: Iecf8bc8777f21341abfaad1623c9da93ee159520
2014-06-08 21:50:46 -07:00
Jinsuk Kim
f43cea0094 Merge "Remove HdmiCecService" into lmp-preview-dev 2014-06-09 01:13:29 +00:00
Robert Greenwalt
cc62d9ad6b Merge "Apply API review to android.net.Network:" 2014-06-08 23:41:27 +00:00
Dongwon Kang
ba4b432286 Merge "Make TvView keep the volume value and set later once the connecation is made." into lmp-preview-dev 2014-06-08 23:40:20 +00:00
Jinsuk Kim
3f48068d78 Remove HdmiCecService
The service is replaced with HdmiControlService. Removing all the related
classes and the initialization of the service.

Change-Id: Ic7baaddffb9873613ddd1096e874f226da983939
2014-06-09 07:55:47 +09:00
RoboErik
fb442b0384 Add a way to get the package/pid of the session
We need a package/pid to connect a session to a notification. This
adds a way to get those from the controller of a session.

Change-Id: I7700a341beebd46116dfb7dc82f1a667c718e728
2014-06-08 13:20:43 -07:00
RoboErik
0791e1713b b/15452153 Send 0 delta volume requests
The new code was dropping volume requests with a delta of 0. These
are used to trigger a beep at the end of a volume adjustment.

Change-Id: Idd85cfeaffe78f9aaafb8e6989e240cb70409c1e
2014-06-08 13:20:43 -07:00
Robert Greenwalt
df2b878ff4 Fix public API of LinkProperties.
bug:15142362
Change-Id: I1457111da7d3bd09998f7e010febb8bb4c45c8bc
2014-06-08 12:54:23 -07:00
RoboErik
2e7a9167ae Adds listeners for changes to the list of active sessions
The listeners get notified when sessions are added, removed, or
reprioritized.

Change-Id: I7f3bfc84049719c3b9c19016c6bac92e1a5c3179
2014-06-08 12:21:32 -07:00
RoboErik
5d3114b64a b/15388389 Add volume handling support to MediaRouter
This makes MediaRouter work with sessions to handle volume
requests. Should work with all existing custom volume handling.

Change-Id: I5dfde26a6203a1072b7fc700978b4ca852ebe7d0
2014-06-08 12:18:25 -07:00
Paul Jensen
6d3ff9ea3a Apply API review to android.net.Network:
- socketFactory() renamed to getSocketFactory()
- Make sure bindProcess() documentation points developers to getSocketFactory() as the preferred approach
- Move bindProcess() and unbindProcess() to ConnectivityManager.setProcessBoundNetwork() -- passing null clears it.
- Move getProcessBoundNetwork() to ConnectivityManager.getProcessBoundNetwork().

Bug:15142362
Bug:13885501

Change-Id: Ia55c59d52e1ec8bf10dd0d9d037bd04c0998bc71
2014-06-08 12:09:18 -07:00
Bryan Mawhinney
2386bd5de4 Merge "Fix issue preventing aapt from stripping all unwanted densities" into lmp-preview-dev 2014-06-08 17:03:04 +00:00
Robert Greenwalt
915c8d5841 Merge "Fix the marking of restricted network requests" 2014-06-08 16:07:40 +00:00
Jae Seo
1bfce9fb9b TIF: Address the feedback from the API review - 3/3
- Change TvView to be a generic ViewGroup with a single SurfaceView child

Bug: 15345342
Change-Id: I86ed94b7020aabb6e093e391ab9477c1f801919a
2014-06-08 21:42:39 +09:00
Dongwon Kang
336cdf20dd Make TvView keep the volume value and set later once the connecation is made.
Bug: 15483740
Change-Id: Id4272bffb556587707b641ec8296bc5a9e57807e
2014-06-08 18:20:55 +09:00
Robert Ly
5cb1805413 am e115755d: Merge "remove erroneous file" into klp-docs
* commit 'e115755d0fbd067a1996eb448cda58a14cce22d1':
  remove erroneous file
2014-06-08 08:35:23 +00:00
Robert Ly
e115755d0f Merge "remove erroneous file" into klp-docs 2014-06-08 05:39:55 +00:00
Robert Ly
6ee94e5388 remove erroneous file
Change-Id: Idb46777d80ee1b6286769fdceba7639877ab2388
2014-06-07 22:38:18 -07:00
Matthew Williams
13b0241248 Add test app for JobScheduler
Schedule either a delay/deadline task, or a task with
connectivity constraints
Change-Id: Ie7ea731d0f6673b680cef79f894cb609a61b795d
2014-06-07 20:50:54 -07:00
Deepanshu Gupta
acb119f0a2 Merge "Build LayoutLib with Java 6" into lmp-preview-dev 2014-06-07 23:32:10 +00:00
Sailesh Nepal
8b5dd8c5d4 Merge "API: Add call service handoff trigger" 2014-06-07 21:11:17 +00:00
Deepanshu Gupta
f4058c8d6b Build LayoutLib with Java 6
Add source and target flags to LayoutLib Bridge to enable compatibility
with Java 6.

Change-Id: I81266af758bb57df037541d6e82600e5020a3c0d
2014-06-07 11:19:03 -07:00
Dianne Hackborn
000cdd5fe5 Merge "[system transitions] + merge all transition work into new branch for commiting to master + new task switching animations to support doc-centric recents + new default activity transitions + new app -> home (wallpaper close) + updated fragment close" into lmp-preview-dev 2014-06-07 17:33:18 +00:00