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

88555 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Robert Ly
2dd93e22b6 Merge "docs: add correct toc for google reference" into jb-mr1-dev 2012-11-30 12:13:07 -08:00
Robert Ly
01b88d3478 docs: add correct toc for google reference 
Change-Id: I594794b8d7ed5c52acdc37d5a4eddd2fdd229bcd
 2012-11-30 11:58:19 -08:00
Robert Ly
24963e1f7b Merge "Revert "docs: gms javadocs"" into jb-mr1-dev 2012-11-30 11:52:43 -08:00
Svetoslav Ganov
438a3b35f7 Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev 2012-11-30 11:43:54 -08:00
Martijn Coenen
b1a01ab01c Merge "Allow the NFC process to call Bluetooth APIs." into jb-mr1.1-dev 2012-11-30 11:08:07 -08:00
Dianne Hackborn
675814d488 Merge "Maybe fix issue #7596986: Frequent runtime restarts; IAE at..." into jb-mr1.1-dev 2012-11-30 10:42:15 -08:00
Nick Kralevich
849f5188e3 am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev 
* commit '6643ea823bf8b0726da0518ffecfcc7a9f60f87d':
  Secure a handful of framework broadcasts
 2012-11-30 10:35:44 -08:00
Nick Kralevich
6643ea823b resolved conflicts for merge of 011132a7 to jb-mr1-dev 
Change-Id: I304ef91eef99526dec348a59b12c0934173bcfcb
 2012-11-30 10:23:56 -08:00
Robert Greenwalt
011132a7d3 am b8da0376: Secure a handful of framework broadcasts 
* commit 'b8da0376f2d50fdb2ee58deacc6d2041689e36d1':
  Secure a handful of framework broadcasts
 2012-11-30 10:05:33 -08:00
Daniel Sandler
0a6620e861 Merge "Suppress quick settings if setup has not been completed." into jb-mr1.1-dev 2012-11-30 10:05:01 -08:00
Scott Main
7311742402 am 580aa579: Merge "docs: gms and gcm javadocs" into jb-mr1-dev 
* commit '580aa579080b5f4ccddb31964bc0caa76ee73a7a':
  docs: gms and gcm javadocs
 2012-11-30 09:59:42 -08:00
Scott Main
580aa57908 Merge "docs: gms and gcm javadocs" into jb-mr1-dev 2012-11-30 09:56:48 -08:00
Scott Main
3cddba247e am b74844cd: docs: revise doc titles 
* commit 'b74844cd87160a21a77cdc1c35b3d19ce9f47249':
  docs: revise doc titles
 2012-11-30 09:49:51 -08:00
Scott Main
b74844cd87 docs: revise doc titles 
Change-Id: I7a11aabd90df758a5118730fe2d1b6c4f4e6ecfd
 2012-11-30 09:46:26 -08:00
Makoto Onuki
c50ed032c7 Merge "Remove unused IExtendedNetworkService" into jb-mr1.1-dev 2012-11-30 09:33:11 -08:00
Eric Laurent
c3eb57b22f Merge "AudioService: improve initial safe volume delay" into jb-mr1.1-dev 2012-11-30 09:26:30 -08:00
Daniel Sandler
386165a3ae Merge "Only show "charging" if the battery is really charging." into jb-mr1.1-dev 2012-11-30 07:27:36 -08:00
John Spurlock
371f3408d6 Only show camera widget to setup users. 
And remove misspelled and unused field in KeyguardHostView.

Bug:7645811
Change-Id: I3d6ceae8d25d0af7b504b4c22782611d25462a62
 2012-11-30 09:20:43 -05:00
Robert Ly
3c4b4f7c31 docs: gms and gcm javadocs 
Change-Id: I93fe06983e42cb21d05d020e84cafe31792a9c8e
 2012-11-30 04:02:04 -08:00
Robert Ly
6465381c0d docs: gms fixes 
Change-Id: I197678e85ea2d11f35ccecdd7abc9564035acad4
 2012-11-30 03:07:11 -08:00
Robert Ly
f67ca8007f Revert "docs: gms javadocs" 
This reverts commit 830b23b76676542cbcb5ef3c60c869460d4c5466

Change-Id: I75a9d4f6aa424ed4439b4415d575716a40b75343
 2012-11-30 00:18:20 -08:00
Dirk Dougherty
a4f67a88f4 am 49be1ef3: Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev 
* commit '49be1ef39cfa2c718cb56dee088338ea97019c11':
  Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved.
 2012-11-29 21:15:04 -08:00
Dirk Dougherty
49be1ef39c Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev 2012-11-29 21:11:24 -08:00