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

90945 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabrice Di Meglio
4e1b2f44e9 am 20b76b9f: am 1e761ded: Merge "Fix typos in LinearLayout comments" into jb-mr1-dev 
* commit '20b76b9fff076241fe305fc99be3be7ab7d10407':
  Fix typos in LinearLayout comments
 2012-11-30 17:18:49 -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
15ac2cfb65 am ed3d92ae: am 404eeee1: Merge "docs: gcm navtree" into jb-mr1-dev 
* commit 'ed3d92aea49422c0e5ec117a04fe573ea141962a':
  docs: gcm navtree
 2012-11-30 17:08:59 -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
f8b74a32df am 3a195029: am 51f5bcac: Merge "docs: Fixed typo in android tool syntax." into jb-mr1-dev 
* commit '3a195029066fab3bae5797003314e3fa5bbf7e29':
  docs: Fixed typo in android tool syntax.
 2012-11-30 16:44:29 -08:00
Craig Mautner
f967500eba am 46732445: Merge "Include child windows when looking for insertion point." into jb-mr1.1-dev 
* commit '46732445b4c02c225544851cb6cf848ec0583494':
  Include child windows when looking for insertion point.
 2012-11-30 16:42:56 -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
Fabrice Di Meglio
a9854ce9df am ce463847: Merge "Fix bug #7651552 resetRtlProperties() is called way too often" into jb-mr1.1-dev 
* commit 'ce463847db68afbb796377c6a55209e102774f8c':
  Fix bug #7651552 resetRtlProperties() is called way too often
 2012-11-30 16:41:12 -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
Robert Ly
697802538f am 27dcf445: am 037b7944: Merge "docs: update javadocs with gcm @value stuff" into jb-mr1-dev 
* commit '27dcf445eb66ea032992ff30b3cd36770e1ab929':
  docs: update javadocs with gcm @value stuff
 2012-11-30 16:38:12 -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
Jim Miller
f6fe244422 am e431e6a3: Merge "Add logging to try and track down bug 7643792" into jb-mr1.1-dev 
* commit 'e431e6a352125f2c51507130cc64e3405625a7ec':
  Add logging to try and track down bug 7643792
 2012-11-30 16:00:17 -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
338b3a2f96 am 0a40f2d4: am 23b4e5b1: Merge "Doc change: add SMP Primer for Android. Support a new "article" toc style in training." into jb-mr1-dev 
* commit '0a40f2d4d28d99a6cd1216f3aa47cb10d6b905cc':
  Doc change: add SMP Primer for Android. Support a new "article" toc style in training.
 2012-11-30 15:41:21 -08:00
Nicolas Klein
04f3b12f1f am 5ea914f2: am 759c1005: Merge "Fix some typos and missing @param in android.os.Bundle" into jb-mr1-dev 
* commit '5ea914f21b397ae57195decd0b5e37544d85db8c':
  Fix some typos and missing @param in android.os.Bundle
 2012-11-30 15:41:10 -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
deab6fd2e8 am b67ab7cc: am 648de548: Merge "docs: gms fixes" into jb-mr1-dev 
* commit 'b67ab7ccd6d09d30caf8a85a9ea20fc991652258':
  docs: gms fixes
 2012-11-30 14:38:18 -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
bd0e180893 am 4015c3f8: Merge "Only show camera widget to setup users." into jb-mr1.1-dev 
* commit '4015c3f815fa83e67aa72d2c474e7e6f4c2dd5d0':
  Only show camera widget to setup users.
 2012-11-30 13:24:39 -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
9e129f37b6 am 924fc3e6: Merge "Add constant for Daydream settings." into jb-mr1.1-dev 
* commit '924fc3e6ce68f7943f3fd2ced3281c3fd05f2e7f':
  Add constant for Daydream settings.
 2012-11-30 13:17:22 -08:00
Robert Ly
50246b5bc6 am 861c55ff: am 2dd93e22: Merge "docs: add correct toc for google reference" into jb-mr1-dev 
* commit '861c55ffcc854563f4adec0b094c1b6948c72036':
  docs: add correct toc for google reference
 2012-11-30 13:17:15 -08:00
Robert Ly
849cef0738 am 1c92ce10: am 24963e1f: Merge "Revert "docs: gms javadocs"" into jb-mr1-dev 
* commit '1c92ce10b5123bc374f8cba2c61c4c56f9d4f319':
  Revert "docs: gms javadocs"
 2012-11-30 13:17:11 -08:00
Svetoslav Ganov
ed734d98d0 am 0e7adaff: am 438a3b35: Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev 
* commit '0e7adaff99778c596bfd3f4c1e42710592c472a2':
  Cannot move edit text cursor to first position using character granularity.
 2012-11-30 13:17:08 -08:00
Jason Sams
43174b7d22 am 718fb9f1: Fix sample code issues 
* commit '718fb9f12e31d92e8a81b08f0f2d818dd3654b9c':
  Fix sample code issues
 2012-11-30 13:16:57 -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
Robert Ly
1c92ce10b5 am 24963e1f: Merge "Revert "docs: gms javadocs"" into jb-mr1-dev 
* commit '24963e1f7b7ba2712618b8c0ff1750c47ad1c789':
  Revert "docs: gms javadocs"
 2012-11-30 12:40:40 -08:00
Svetoslav Ganov
0e7adaff99 am 438a3b35: Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev 
* commit '438a3b35f7a6184a19919de90f733be82e21a84c':
  Cannot move edit text cursor to first position using character granularity.
 2012-11-30 12:40:37 -08:00
Jason Sams
718fb9f12e Fix sample code issues 
Correct min SDK.
Correct file extension on mandelbrot

Change-Id: I508c22c382f1a930b27d8c5f4414cac3a990a332
 2012-11-30 12:32:36 -08:00