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

90167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
&& repo sync -j8
4233c93901 Merge "Doc Update: param name change" into jb-dev-docs 2012-11-12 14:56:58 -08:00
&& repo sync -j8
2128ec9892 Doc Update: param name change 
Change-Id: I320374f8d40ba090a561fe173bb08837abaa263a
 2012-11-12 14:45:08 -08:00
Joe Fernandez
71e862da90 am a2b43674: am 95d5be9e: am 0edd4d05: am 180200c2: am aac29f12: Merge "docs: NDK r8c Release Notes" into jb-dev-docs 
* commit 'a2b43674bcc95fd4efa2c74aa23db222cf1f83cc':
  docs: NDK r8c Release Notes
 2012-11-12 14:41:53 -08:00
Joe Fernandez
f91af1e961 am 207559a2: am fbaa232c: am dddb1e56: am 1c350fa4: am cee5dab6: Merge "docs: JOBB tool help page" into jb-dev-docs 
* commit '207559a243d78297e32e63fd6cf56ac9051a867d':
  docs: JOBB tool help page
 2012-11-12 14:41:49 -08:00
Joe Fernandez
a2b43674bc am 95d5be9e: am 0edd4d05: am 180200c2: am aac29f12: Merge "docs: NDK r8c Release Notes" into jb-dev-docs 
* commit '95d5be9ece0c41e63a95fa3c30aadbc2a96b3e9a':
  docs: NDK r8c Release Notes
 2012-11-12 14:39:33 -08:00
Joe Fernandez
207559a243 am fbaa232c: am dddb1e56: am 1c350fa4: am cee5dab6: Merge "docs: JOBB tool help page" into jb-dev-docs 
* commit 'fbaa232c1cc43aeab25a44481cbc1ab158771a16':
  docs: JOBB tool help page
 2012-11-12 14:39:30 -08:00
Joe Fernandez
95d5be9ece am 0edd4d05: am 180200c2: am aac29f12: Merge "docs: NDK r8c Release Notes" into jb-dev-docs 
* commit '0edd4d058e6bf495566961bc52a144cc8a5c21af':
  docs: NDK r8c Release Notes
 2012-11-12 14:37:24 -08:00
Joe Fernandez
fbaa232c1c am dddb1e56: am 1c350fa4: am cee5dab6: Merge "docs: JOBB tool help page" into jb-dev-docs 
* commit 'dddb1e56d1155327864938373b8b89453024bbea':
  docs: JOBB tool help page
 2012-11-12 14:37:19 -08:00
Joe Fernandez
0edd4d058e am 180200c2: am aac29f12: Merge "docs: NDK r8c Release Notes" into jb-dev-docs 
* commit '180200c2c126fc7db1a86ac49a235f40d1905731':
  docs: NDK r8c Release Notes
 2012-11-12 14:35:27 -08:00
Joe Fernandez
dddb1e56d1 am 1c350fa4: am cee5dab6: Merge "docs: JOBB tool help page" into jb-dev-docs 
* commit '1c350fa458a6894abb7d4213d65c1c2833faaa7a':
  docs: JOBB tool help page
 2012-11-12 14:33:44 -08:00
Joe Fernandez
180200c2c1 am aac29f12: Merge "docs: NDK r8c Release Notes" into jb-dev-docs 
* commit 'aac29f126ea8c42313a5481b4871828bbd40b4a6':
  docs: NDK r8c Release Notes
 2012-11-12 14:30:31 -08:00
Joe Fernandez
1c350fa458 am cee5dab6: Merge "docs: JOBB tool help page" into jb-dev-docs 
* commit 'cee5dab6752a9e793f620981014f3b7cc4f8c137':
  docs: JOBB tool help page
 2012-11-12 14:29:08 -08:00
Joe Fernandez
aac29f126e Merge "docs: NDK r8c Release Notes" into jb-dev-docs 2012-11-12 14:28:05 -08:00
Joe Fernandez
cee5dab675 Merge "docs: JOBB tool help page" into jb-dev-docs 2012-11-12 14:25:55 -08:00
Quddus Chong
94b3f8eee6 docs: Added new docs for uiautomator testing framework. 
Change-Id: I9fea9e7a711a37bb1f2492b4aa3938e147614125
 2012-11-12 14:23:13 -08:00
Scott Main
842171bd6e am 0349ae92: am b9a2a040: Merge "docs: 7 tap instructions for dev options" into jb-mr1-dev 
* commit '0349ae92a5d61bd72223878b90b00d2ebdc2485f':
  docs: 7 tap instructions for dev options
 2012-11-12 12:25:52 -08:00
Scott Main
0349ae92a5 am b9a2a040: Merge "docs: 7 tap instructions for dev options" into jb-mr1-dev 
* commit 'b9a2a0402aa5e92926a6bd28467992deed5d5d9d':
  docs: 7 tap instructions for dev options
 2012-11-12 12:22:31 -08:00
Scott Main
b9a2a0402a Merge "docs: 7 tap instructions for dev options" into jb-mr1-dev 2012-11-12 12:19:21 -08:00
Geremy Condra
5ba8271495 am 3012b393: am e83f3072: am 8b73fc1a: (-s ours) am 2b4bc305: Merge "DO NOT MERGE Control access to tts objects" into jb-dev 
* commit '3012b393616812258cee6b4922afdc49b01a22ae':
  DO NOT MERGE Control access to tts objects
 2012-11-12 12:13:53 -08:00
Scott Main
dbfa30773a am 51e99cf9: am b50e7e0f: am 65b59f50: am 1af587b3: am 4623c0d8: docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide. 
* commit '51e99cf91e18a4f0dd5449a122f356ae10727cdf':
  docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.
 2012-11-12 12:13:49 -08:00
Geremy Condra
3012b39361 am e83f3072: am 8b73fc1a: (-s ours) am 2b4bc305: Merge "DO NOT MERGE Control access to tts objects" into jb-dev 
* commit 'e83f30726a7a7221b06d6b022427456fd7bffa9b':
  DO NOT MERGE Control access to tts objects
 2012-11-12 12:10:27 -08:00
Scott Main
51e99cf91e am b50e7e0f: am 65b59f50: am 1af587b3: am 4623c0d8: docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide. 
* commit 'b50e7e0f8a81e8a802896211c4c2448143d3325e':
  docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.
 2012-11-12 12:10:23 -08:00
Katie McCormick
9c66227406 am c1291f70: am c5b47cff: resolved conflicts for merge of 7f9a0535 to jb-mr1-dev 
* commit 'c1291f700a537a18b9123ad626ae1a4ab008a9f5':
  Doc change: GCM category & dry_run params
 2012-11-12 12:10:05 -08:00
Geremy Condra
e83f30726a am 8b73fc1a: (-s ours) am 2b4bc305: Merge "DO NOT MERGE Control access to tts objects" into jb-dev 
* commit '8b73fc1ad3c0698de1ee2a9a8672e55a66ac6f9e':
  DO NOT MERGE Control access to tts objects
 2012-11-12 12:08:04 -08:00
Scott Main
b50e7e0f8a am 65b59f50: am 1af587b3: am 4623c0d8: docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide. 
* commit '65b59f5035686f63ebc7d4f8ccc1172b30618ee6':
  docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.
 2012-11-12 12:07:47 -08:00
Katie McCormick
c1291f700a am c5b47cff: resolved conflicts for merge of 7f9a0535 to jb-mr1-dev 
* commit 'c5b47cff8891429f4f5cf9d6026cc2f8cfe8fcc5':
  Doc change: GCM category & dry_run params
 2012-11-12 12:07:44 -08:00
Scott Main
67ba5d189c docs: 7 tap instructions for dev options 
Change-Id: I42867cdf962c0c4231d6037737226381220c6ecf
 2012-11-12 11:24:01 -08:00
Jeff Sharkey
25c94e9ee3 am 282e9fc6: Merge "Avoid recycling recently removed user IDs." into jb-mr1.1-dev 
* commit '282e9fc62e571aba741ddc9523d6dfe2eca313b6':
  Avoid recycling recently removed user IDs.
 2012-11-12 10:32:11 -08:00
Jeff Sharkey
b84f21c536 am bc0edecb: Merge "Increase readability of connectivity event log." into jb-mr1.1-dev 
* commit 'bc0edecb7372a9ddf7644cb694c131b76ace8c41':
  Increase readability of connectivity event log.
 2012-11-12 10:32:08 -08:00
Jeff Sharkey
282e9fc62e Merge "Avoid recycling recently removed user IDs." into jb-mr1.1-dev 2012-11-12 10:30:12 -08:00
Jeff Sharkey
bc0edecb73 Merge "Increase readability of connectivity event log." into jb-mr1.1-dev 2012-11-12 10:28:34 -08:00
Justin Koh
446432692a Merge "Make tap events less sensitive." into jb-mr1-aah-dev 2012-11-12 10:20:43 -08:00
Ben Pietrzak
ffb5bdef63 Make tap events less sensitive. 
Change-Id: I4d6f70b56373fbc51a414510897854078eeb0c40
 2012-11-12 10:11:52 -08:00
Katie McCormick
c5b47cff88 resolved conflicts for merge of 7f9a0535 to jb-mr1-dev 
Change-Id: I8aee63b128a833ff8c2aaf2167850815033766dd
 2012-11-12 10:07:09 -08:00
John Spurlock
b340fe4f88 am f6f47e95: Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev 
* commit 'f6f47e950ddbb91fcce30f2f3e610a4d249b9bdb':
  Disable navbar searchlight if search assist not available.
 2012-11-12 07:55:24 -08:00
John Spurlock
f6f47e950d Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev 2012-11-12 07:52:08 -08:00
Baligh Uddin
d300d3efa3 Import translations. DO NOT MERGE 
Change-Id: Ic7c196abf01d9eab7c1d32dba4eb974979b6d38a
Auto-generated-cl: translation import
 2012-11-12 07:39:10 -08:00
The Android Open Source Project
f1159e6b5e am 725a2ffe: Reconcile with jb-mr1-release - do not merge 
* commit '725a2ffe3b615515acd14b8b379078930de64249':
  When in vibrate mode, all notifications will vibrate.
 2012-11-12 07:28:38 -08:00
The Android Open Source Project
725a2ffe3b Reconcile with jb-mr1-release - do not merge 
Change-Id: I310560c329cb0d8aeb664c67ea6e67e006809637
 2012-11-12 07:26:14 -08:00
David Agnew
d625f0a147 am 7259d88c: am 4c0fc03b: When in vibrate mode, all notifications will vibrate. 
* commit '7259d88c08df220095a4aeaa752bd8e1055f4e83':
  When in vibrate mode, all notifications will vibrate.
 2012-11-10 11:52:38 -08:00
David Agnew
7259d88c08 am 4c0fc03b: When in vibrate mode, all notifications will vibrate. 
* commit '4c0fc03b5ed396d19035ee6a77a70189a0fba31a':
  When in vibrate mode, all notifications will vibrate.
 2012-11-10 11:49:51 -08:00
David Agnew
4c0fc03b5e When in vibrate mode, all notifications will vibrate. 
(Unless the notification specifies no ringtone AND no
vibration, in which case it will remain silent.)

Bug: 7516358
Change-Id: I926d0fe0165b9622cd117e6c3ef6e3637772b444
 2012-11-10 14:35:02 -05:00
Ed Heyl
5ec97f4e82 am 4f017e75: Merge "When in vibrate mode, all notifications will vibrate." into jb-mr1.1-dev 
* commit '4f017e757bdc87d603d135386c888118fc2653ba':
  When in vibrate mode, all notifications will vibrate.
 2012-11-09 22:53:24 -08:00
David Agnew
9a7debe585 When in vibrate mode, all notifications will vibrate. 
(Unless the notification specifies no ringtone AND no
vibration, in which case it will remain silent.)

Change-Id: I926d0fe0165b9622cd117e6c3ef6e3637772b444
 2012-11-09 22:51:37 -08:00
Ed Heyl
4f017e757b Merge "When in vibrate mode, all notifications will vibrate." into jb-mr1.1-dev 2012-11-09 22:49:35 -08:00
Scott Main
78f7e807df am e72e2b74: am 85abb087: Merge "docs: update Tools landing page with info for developer options" into jb-mr1-dev 
* commit 'e72e2b74bf5ae66524fc5d1872ba759b85728c65':
  docs: update Tools landing page with info for developer options
 2012-11-09 22:42:13 -08:00
Jeff Sharkey
5691474c9c am ad08e6dc: Merge "Emit event log message when switching users." into jb-mr1.1-dev 
* commit 'ad08e6dcfc54556759a876106419b4169e9caffe':
  Emit event log message when switching users.
 2012-11-09 22:42:06 -08:00
Baligh Uddin
eba39ec15c am df2670f1: am ba52aff4: Import translations. DO NOT MERGE 
* commit 'df2670f162dc7756899f4036750ba6866f5326c6':
  Import translations. DO NOT MERGE
 2012-11-09 22:41:59 -08:00
Andy McFadden
a7113f70c5 am 798de53c: Merge "Reduce emulator logspam" into jb-mr1.1-dev 
* commit '798de53cf454595a3a494d26dfa3f08518c24e55':
  Reduce emulator logspam
 2012-11-09 22:41:51 -08:00
Scott Main
e72e2b74bf am 85abb087: Merge "docs: update Tools landing page with info for developer options" into jb-mr1-dev 
* commit '85abb087b9ffd05ff8ecc25575018f4a3fcb966d':
  docs: update Tools landing page with info for developer options
 2012-11-09 21:01:49 -08:00