88633 Commits

Author SHA1 Message Date
Robert Ly
92e0b07fd2 am d81751fa: Merge "docs: add javadocs for gcm" into jb-mr1-dev
* commit 'd81751facb585e678ae0a85fc8a0d144d615e7e6':
  docs: add javadocs for gcm
2012-12-02 18:22:24 -08:00
Robert Ly
d81751facb Merge "docs: add javadocs for gcm" into jb-mr1-dev 2012-12-02 18:20:15 -08:00
Scott Main
223ef52aa1 am 1a9e7a61: docs: add sdk manager launch info for eclipse
* commit '1a9e7a61e4cab8a857e1184c6205c8866ccab367':
  docs: add sdk manager launch info for eclipse
2012-12-02 18:06:24 -08:00
Scott Main
1a9e7a61e4 docs: add sdk manager launch info for eclipse
Change-Id: I91f23456fd57afa3cf55cba6ed63d746fb94f2fd
2012-12-02 18:01:07 -08:00
Robert Ly
4779ffa728 docs: add javadocs for gcm
Change-Id: I6c4c0990f1a9eec51cc2bf0fd857607b90ac184e
2012-12-02 17:52:29 -08:00
Dirk Dougherty
fda0b508b0 am c7fe9fd4: Merge "Doc change: remove old version of gcm javadoc and misc files." into jb-mr1-dev
* commit 'c7fe9fd4e02bcb8a1c4eab2b61ec85b3a8e05eca':
  Doc change: remove old version of gcm javadoc and misc files.
2012-12-02 17:45:39 -08:00
Dirk Dougherty
c7fe9fd4e0 Merge "Doc change: remove old version of gcm javadoc and misc files." into jb-mr1-dev 2012-12-02 17:43:12 -08:00
Scott Main
e36276ad97 docs: update reference links and misc revisions
Change-Id: Id198d04a4feaf9a3bdee82f1093edabed1c561d2
2012-12-02 17:41:45 -08:00
Dirk Dougherty
587504a434 Doc change: remove old version of gcm javadoc and misc files.
Change-Id: Icbc0345e04432af97fb859be8787741b7e979c1b
2012-12-02 17:33:52 -08:00
Katie McCormick
361663455f am f3dda724: Merge "Doc change: updating lib links" into jb-mr1-dev
* commit 'f3dda7243c267a807d11a120219478f3a98f0275':
  Doc change: updating lib links
2012-12-02 16:50:46 -08:00
Katie McCormick
f3dda7243c Merge "Doc change: updating lib links" into jb-mr1-dev 2012-12-02 16:48:15 -08:00
Scott Main
12de574ede am 80aab876: move Setup link for play services
* commit '80aab87653aa6089e89039b74530073202f4c355':
  move Setup link for play services
2012-12-02 16:02:14 -08:00
Guang Zhu
c28a062ffd app launch test fixes and improvements
* fixed NPE when specified app name does not exist
* force stop package before starting, because some names may
  resolve into the same package
* ensure app is launched in the order as sepcified in command
  line
* fixed time recording: it should have been 'thisTime' as
  reported by ActivityManager, to be consistent with previous
  harness

Change-Id: I411a568580feef21821dcbe6ec15884f697af6fd
2012-12-01 23:40:10 -08:00
Katie McCormick
b755c27fc0 Doc change: updating lib links
Bug # 7038255

Change-Id: I702aeaed5fcbf7a9cb46b2ccd0e7baff53e48dab
2012-12-01 11:25:37 -08:00
Scott Main
80aab87653 move Setup link for play services
Change-Id: I436abf4929e2d69c5f9fadca0f79321d069618ea
2012-11-30 20:28:58 -08:00
Scott Main
76277df27c am 5f7b668c: misc changes for landing pages
* commit '5f7b668c966a886d5893ff89af59785fab9523f9':
  misc changes for landing pages
2012-11-30 20:11:04 -08:00
Scott Main
5f7b668c96 misc changes for landing pages
Change-Id: I4eff32dccbb111b419bb733035c7a145ac3944b6
2012-11-30 19:32:21 -08:00
Jeff Sharkey
6a328afbab Avoid null mobile interfaces.
Bug: 7634215
Change-Id: I6745f6a78c07ba11d98b4562a6b53386112ef652
2012-11-30 17:49:39 -08:00
Amith Yamasani
c566b43d02 Fix crosstalk between users for widgets hosted in lockscreen
This was initially about the Clock widget crashing repeatedly on some
devices with multiple users. Turned out that there were race conditions
when switching users that could result in remote views of one user calling
back to the RemoteViewsAdapter in keyguard that in turn sent an incorrect widget id
to a different user's widget, resulting in a crash.

Since KeyguardHostView is instantiated in the same process for different users,
it needs to carry a user identity to pass along to AppWidgetService so that
remote views services were bound to the correct user and callbacks were attached and
detached properly.

Added some aidl calls that take the userId to do the binding properly. A more
complete fix might be needed in the future so that all calls from Keyguard carry
the user id.

Also, there was a problem in comparing host uid for secondary users, since Settings
for a secondary user has a different uid than keyguard. Not an issue on single-user
systems. Changed the host.uid comparison to accomodate for the secondary user.

Bug: 7450247
Change-Id: Idbc36e3c60023cac74174f6cb7f2b2130dd3052c
2012-11-30 17:28:08 -08:00
Fabrice Di Meglio
20b76b9fff am 1e761ded: Merge "Fix typos in LinearLayout comments" into jb-mr1-dev
* commit '1e761ded55695a9d76a6f00ee9504625581e8d3a':
  Fix typos in LinearLayout comments
2012-11-30 17:17:03 -08:00
Fabrice Di Meglio
1e761ded55 Merge "Fix typos in LinearLayout comments" into jb-mr1-dev 2012-11-30 17:14:11 -08:00
Scott Main
ed3d92aea4 am 404eeee1: Merge "docs: gcm navtree" into jb-mr1-dev
* commit '404eeee14521e8b181a9ed28c2291e9389dcf3b1':
  docs: gcm navtree
2012-11-30 17:07:11 -08:00
Scott Main
404eeee145 Merge "docs: gcm navtree" into jb-mr1-dev 2012-11-30 17:04:31 -08:00
Robert Ly
2123523290 docs: gcm navtree
Change-Id: Ie20a0cc7caf8e0b5ff2a6f56ddc3932f25768fa3
2012-11-30 17:02:22 -08:00
Quddus Chong
3a19502906 am 51f5bcac: Merge "docs: Fixed typo in android tool syntax." into jb-mr1-dev
* commit '51f5bcac5269b44cd312d16569357416da7b3a82':
  docs: Fixed typo in android tool syntax.
2012-11-30 16:41:49 -08:00
Quddus Chong
51f5bcac52 Merge "docs: Fixed typo in android tool syntax." into jb-mr1-dev 2012-11-30 16:39:29 -08:00
Craig Mautner
46732445b4 Merge "Include child windows when looking for insertion point." into jb-mr1.1-dev 2012-11-30 16:38:37 -08:00
Fabrice Di Meglio
ce463847db Merge "Fix bug #7651552 resetRtlProperties() is called way too often" into jb-mr1.1-dev 2012-11-30 16:37:17 -08:00
Robert Ly
27dcf445eb am 037b7944: Merge "docs: update javadocs with gcm @value stuff" into jb-mr1-dev
* commit '037b7944bdd5909c503cdc959b0105ebb0ecca92':
  docs: update javadocs with gcm @value stuff
2012-11-30 16:36:05 -08:00
Robert Ly
037b7944bd Merge "docs: update javadocs with gcm @value stuff" into jb-mr1-dev 2012-11-30 16:33:51 -08:00
Quddus Chong
4e58eca788 docs: Fixed typo in android tool syntax.
Change-Id: Ic40f10e3f6b7c052dc40cb723f40956a750544e8
2012-11-30 16:26:35 -08:00
Robert Ly
672b3ad589 docs: update javadocs with gcm @value stuff
Change-Id: I837a1734e00d61f74cf8faac78f75258d66b6d05
2012-11-30 16:15:46 -08:00
Craig Mautner
7b1aa77a9b Include child windows when looking for insertion point.
After finding a window in the window list we turn around and look in
the AppWindowToken.windows list for it. If it is a child of a window
in that list we should use the parent windows index as the search
result. Instead we gave up and ended up inserting the window at the
beginning of the windows list.

Bug 7357465 fixed.

Change-Id: If77f343b8597bfbb0b7fa41dedf7972d78d03020
2012-11-30 16:14:45 -08:00
Raph Levien
f408bf847a Reorder tone mark and nikhahit in DroidSansThai.ttf
Fix for bug 6630331.

This is a workaround for a shortcoming in the Thai shaper in Harfbuzz.
De facto (but not documented) shaping rules dictate that a tone mark
followed by a SARA AM should be rendered with the NIKHAHIT below the
tone mark, rather than above it as would be indicated by a
straightforward interpretation of the GSUB and GPOS rules. This patch
adds an additional substitution of the form MAI THO + SARA AM ->
NIKHAHIT + MAI THO + SARA AA. The three tone marks affected are MAI EK,
MAI THO, and MAI CHATTAWA, based on an usage analysis of the Thai
dictioary included in ICU.

When we upgrade to harfbuzz-ng, we can revert this workaround.

Change-Id: I209ed094e7c89ea7f6fd6e983d37e396c6da1f64
2012-11-30 15:59:18 -08:00
Jim Miller
e431e6a352 Merge "Add logging to try and track down bug 7643792" into jb-mr1.1-dev 2012-11-30 15:57:46 -08:00
Jim Miller
2b84b817e4 Add logging to try and track down bug 7643792
Fix whitespace & log message.

Change-Id: I9d241365503a6a9b02d3155dbb06ddb82065b375
2012-11-30 15:54:38 -08:00
Dirk Dougherty
0a40f2d4d2 am 23b4e5b1: Merge "Doc change: add SMP Primer for Android. Support a new "article" toc style in training." into jb-mr1-dev
* commit '23b4e5b1b5c3af565f2af87be243e7b455002ae7':
  Doc change: add SMP Primer for Android. Support a new "article" toc style in training.
2012-11-30 15:38:19 -08:00
Dirk Dougherty
23b4e5b1b5 Merge "Doc change: add SMP Primer for Android. Support a new "article" toc style in training." into jb-mr1-dev 2012-11-30 15:35:47 -08:00
Dirk Dougherty
d589421093 Doc change: add SMP Primer for Android. Support a new "article" toc style in training.
Change-Id: I75826e12bb255e1fe85822b8c51e750ada01dfc5
2012-11-30 15:33:39 -08:00
Fabrice Di Meglio
cb5f9db47a Fix bug #7651552 resetRtlProperties() is called way too often
- remove unnecessary calls to resetRtlProperties().
- now reset of RTL properties will only be done when adding a View
(and no more when removing it)

Change-Id: I0d42128c9f7df6085fb92bb5af5c9bd4d1ba88a3
2012-11-30 15:32:56 -08:00
Nicolas Klein
5ea914f21b am 759c1005: Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev
* commit '759c1005b3f96ea8bbf59192d206aacece315655':
  Fix some typos and missing @param in android.os.Bundle
2012-11-30 14:54:50 -08:00
Nicolas Klein
759c1005b3 Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev 2012-11-30 14:51:43 -08:00
Nicolas Klein
9f6cb87522 Fix some typos and missing @param in android.os.Bundle
getChar(String) and getChar(String, char) had wrong description in their
javadoc.
Also most of the get methods with default value were missing the corresponding
@param tag for the default value parameter.

Change-Id: I0f38b3caacf9cabd70e0c1ada36af3662f5566d0
2012-11-30 14:41:46 -08:00
Robert Ly
b67ab7ccd6 am 648de548: Merge "docs: gms fixes" into jb-mr1-dev
* commit '648de5483b20bd80bda267a4430daca2ae0b089a':
  docs: gms fixes
2012-11-30 14:35:48 -08:00
Robert Ly
648de5483b Merge "docs: gms fixes" into jb-mr1-dev 2012-11-30 14:31:43 -08:00
John Spurlock
4015c3f815 Merge "Only show camera widget to setup users." into jb-mr1.1-dev 2012-11-30 13:20:09 -08:00
Daniel Sandler
076324ae19 Fix rounding error when drawing panel handles.
Bug: 7649037
Change-Id: If8d9fa5f3852729207c31c95cfd68ef54ff47d7d
2012-11-30 16:14:21 -05:00
Daniel Sandler
924fc3e6ce Merge "Add constant for Daydream settings." into jb-mr1.1-dev 2012-11-30 13:03:08 -08:00
Roger Chen
0ce57a92d7 Change the text color of timer in MediaController
The color of timer and backgroud in MediaController
are too closer to distinguish.

Change-Id: Id60ecbc26233857c7ef291ef891c9d4720309dfa
Signed-off-by: Roger Chen <cxr514033970@gmail.com>

Cherrypicked from external contribution.
b/7648349
2012-11-30 12:43:41 -08:00
Robert Ly
861c55ffcc am 2dd93e22: Merge "docs: add correct toc for google reference" into jb-mr1-dev
* commit '2dd93e22b6504eda5fb35f8f9e58ddb3f4a22fea':
  docs: add correct toc for google reference
2012-11-30 12:40:43 -08:00