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

88258 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
8c4343378c am 90f7f565: am 970a494c: Merge "Attempt to fix missing transport control in keyguard" into jb-mr1-dev 
* commit '90f7f5657a67dc7a5caee42f44bcdd6d9b3da5b2':
  Attempt to fix missing transport control in keyguard
 2012-10-02 16:30:34 -07:00
Jim Miller
90f7f5657a am 970a494c: Merge "Attempt to fix missing transport control in keyguard" into jb-mr1-dev 
* commit '970a494ce18ca4b05bdb7c668161dcc3efee0bbe':
  Attempt to fix missing transport control in keyguard
 2012-10-02 16:28:24 -07:00
Scott Main
370bdbc3d9 am f4d90687: am 659d2602: am a142be8e: (-s ours) am 33b8f417: am 11f03b4b: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage 
* commit 'f4d906875e41ce5d862e015416dcafbab5c52437':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage
 2012-10-02 16:27:48 -07:00
Scott Main
f4d906875e am 659d2602: am a142be8e: (-s ours) am 33b8f417: am 11f03b4b: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage 
* commit '659d2602b0fdc582556fff28f54cf895c80143f5':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage
 2012-10-02 16:25:26 -07:00
Jim Miller
970a494ce1 Merge "Attempt to fix missing transport control in keyguard" into jb-mr1-dev 2012-10-02 16:25:15 -07:00
Craig Mautner
2ab087fab3 am dde0123e: am 60ce6d45: Merge "Call Surface.destroy when Display is removed." into jb-mr1-dev 
* commit 'dde0123e6f30251cc3592c8fa4f711ff8052be09':
  Call Surface.destroy when Display is removed.
 2012-10-02 16:25:01 -07:00
Romain Guy
f265ac2e26 am 27fa88dd: am 0e3984b7: Merge "Bring back Netflix progress bar Bug #7274157" into jb-mr1-dev 
* commit '27fa88ddf2d8633a2715be17c70a50aba68370c3':
  Bring back Netflix progress bar Bug #7274157
 2012-10-02 16:24:57 -07:00
Scott Main
659d2602b0 am a142be8e: (-s ours) am 33b8f417: am 11f03b4b: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage 
* commit 'a142be8ea9003442b486e0a0f8558361b1525c93':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage
 2012-10-02 16:23:59 -07:00
Craig Mautner
dde0123e6f am 60ce6d45: Merge "Call Surface.destroy when Display is removed." into jb-mr1-dev 
* commit '60ce6d4518b2443ff810b335dc686cda18921872':
  Call Surface.destroy when Display is removed.
 2012-10-02 16:22:35 -07:00
Romain Guy
27fa88ddf2 am 0e3984b7: Merge "Bring back Netflix progress bar Bug #7274157" into jb-mr1-dev 
* commit '0e3984b7876d4af6e0bfe483317ac0acf99ba47a':
  Bring back Netflix progress bar Bug #7274157
 2012-10-02 16:22:31 -07:00
Fabrice Di Meglio
9b3858be43 am 88bb40b2: am 4253abbc: Merge "Fix bug #7274075 Non-functional CheckedTextView on Nexus 7 Jelly Bean 4.1.1" into jb-mr1-dev 
* commit '88bb40b2cb7c330c43a9b5b4f424ee567918152a':
  Fix bug #7274075 Non-functional CheckedTextView on Nexus 7 Jelly Bean 4.1.1
 2012-10-02 16:22:02 -07:00
Scott Main
a142be8ea9 am 33b8f417: am 11f03b4b: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage 
* commit '33b8f4175719b746ee290fd95478fae4643fad42':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage
 2012-10-02 16:20:50 -07:00
Craig Mautner
60ce6d4518 Merge "Call Surface.destroy when Display is removed." into jb-mr1-dev 2012-10-02 16:20:34 -07:00
Romain Guy
0e3984b787 Merge "Bring back Netflix progress bar Bug #7274157" into jb-mr1-dev 2012-10-02 16:20:34 -07:00
Fabrice Di Meglio
88bb40b2cb am 4253abbc: Merge "Fix bug #7274075 Non-functional CheckedTextView on Nexus 7 Jelly Bean 4.1.1" into jb-mr1-dev 
* commit '4253abbcfa3165ad7d06c4de97cd780c4e96f94a':
  Fix bug #7274075 Non-functional CheckedTextView on Nexus 7 Jelly Bean 4.1.1
 2012-10-02 16:19:36 -07:00
Scott Main
33b8f41757 am 11f03b4b: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage 
* commit '11f03b4b694f506ed5dcb7c12a9984b653f93b42':
  DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage
 2012-10-02 16:18:19 -07:00
Fabrice Di Meglio
4253abbcfa Merge "Fix bug #7274075 Non-functional CheckedTextView on Nexus 7 Jelly Bean 4.1.1" into jb-mr1-dev 2012-10-02 16:16:39 -07:00
Scott Main
11f03b4b69 DO NOT MERGE 
cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429
docs: android training - Data Storage

Change-Id: I62b6d5385355555aa3e184bfd4418a0d2e0c1719
 2012-10-02 16:14:36 -07:00
Romain Guy
41c769d9a8 Bring back Netflix progress bar 
Bug #7274157

Gradients and color filters are multiplied by the paint's color so it
needs to be set to opaque black to have an effect.

Change-Id: Ib5dd1e6185f758f55b57a0f4496dfae98f1a096b
 2012-10-02 16:04:05 -07:00
Robert Greenwalt
8bf6cbb958 am 94195fa6: am 98ec5660: Merge "Re-add default sms_short_codes." into jb-mr1-dev 
* commit '94195fa611331dd7ea771e1e24ca6d50caa0fb89':
  Re-add default sms_short_codes.
 2012-10-02 15:55:05 -07:00
Fabrice Di Meglio
5bb4e29aba Fix bug #7274075 Non-functional CheckedTextView on Nexus 7 Jelly Bean 4.1.1 
This regression has been introduced by this Change: Ia846de16bbc54f0729608259aa4b530da9404245

- in CHOICE_MODE_SINGLE you need to clear the checked states before doing anything
- rename variables for better readability too

Change-Id: I89b4390e5ebb192ca280fea2c06f991b537a2870
 2012-10-02 15:53:00 -07:00
Robert Greenwalt
94195fa611 am 98ec5660: Merge "Re-add default sms_short_codes." into jb-mr1-dev 
* commit '98ec56604dc3d150e47e1605b33a4ae40dbc7f5c':
  Re-add default sms_short_codes.
 2012-10-02 15:52:18 -07:00
Robert Greenwalt
98ec56604d Merge "Re-add default sms_short_codes." into jb-mr1-dev 2012-10-02 15:49:58 -07:00
Scott Main
b169179b82 am 328dc142: am a22f081a: am b847f0b5: am 04c63a40: docs: android training - Data Storage 
* commit '328dc142a251b2891f37453876513b968fbe1925':
  docs: android training - Data Storage
 2012-10-02 15:38:19 -07:00
Irfan Sheriff
8ddb79c4a3 am 566b259a: am de9627f9: Merge "Add operator name to network notification" into jb-mr1-dev 
* commit '566b259ac068525938d74eb880422d48e7693536':
  Add operator name to network notification
 2012-10-02 15:36:26 -07:00
Scott Main
328dc142a2 am a22f081a: am b847f0b5: am 04c63a40: docs: android training - Data Storage 
* commit 'a22f081ab41072b5aa8caa3d1179d2ad27a877f7':
  docs: android training - Data Storage
 2012-10-02 15:35:54 -07:00
Scott Main
a22f081ab4 am b847f0b5: am 04c63a40: docs: android training - Data Storage 
* commit 'b847f0b578d861647be4908fc3a8d575ba4d726b':
  docs: android training - Data Storage
 2012-10-02 15:34:12 -07:00
Irfan Sheriff
566b259ac0 am de9627f9: Merge "Add operator name to network notification" into jb-mr1-dev 
* commit 'de9627f965ca7fbd93b655d35794c52263d021b2':
  Add operator name to network notification
 2012-10-02 15:34:06 -07:00
Irfan Sheriff
de9627f965 Merge "Add operator name to network notification" into jb-mr1-dev 2012-10-02 15:31:21 -07:00
Scott Main
b847f0b578 am 04c63a40: docs: android training - Data Storage 
* commit '04c63a4098293dd00aeaf561b05a33c04a8d7853':
  docs: android training - Data Storage
 2012-10-02 15:31:18 -07:00
Craig Mautner
d5523dc7b7 Call Surface.destroy when Display is removed. 
Prevents leaked Surfaces.

Bug: 7272421.
Change-Id: I6c87eb11bb0bedcf8de451b04477c70c248f905d
 2012-10-02 15:28:09 -07:00
Scott Main
04c63a4098 docs: android training - Data Storage 
Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429
 2012-10-02 15:06:22 -07:00
The Android Open Source Project
5025f2c46a am 29915f7f: am 09f090b3: am e81e42d7: (-s ours) Reconcile with jb-release - do not merge 
* commit '29915f7f731641b08f5045092c4c7223a79436b0':
  Show plmn in emergency call allowed mode.
 2012-10-02 14:54:22 -07:00
The Android Open Source Project
29915f7f73 am 09f090b3: am e81e42d7: (-s ours) Reconcile with jb-release - do not merge 
* commit '09f090b377cbe2332340580daf4adf4d2502d004':
  Show plmn in emergency call allowed mode.
 2012-10-02 14:51:23 -07:00
The Android Open Source Project
09f090b377 am e81e42d7: (-s ours) Reconcile with jb-release - do not merge 
* commit 'e81e42d7a6bb1bc7b29d0a7d475f750b524e3fec':
  Show plmn in emergency call allowed mode.
 2012-10-02 14:49:12 -07:00
The Android Open Source Project
e81e42d7a6 Reconcile with jb-release - do not merge 
Change-Id: Ie81134aa556b0deb90dcba3d914d58558f3600a9
 2012-10-02 14:47:41 -07:00
Jim Miller
4e81bd4bcf Attempt to fix missing transport control in keyguard 
This attempts to fix a bug where the transport control would sometimes be
inoperative.  The problem is that we had two transport control layouts
on some devices because they were being declared in the layout file.

The fix is to only inflate the layout once when KeyguardHostView
is created.

Also removes redundant KeyguardStatusView.

Fixes bug 7254833

Change-Id: Iab84e8326ff745ee57be5177ab2561114c8dc6f0
 2012-10-02 14:41:34 -07:00
Romain Guy
70c68ea553 am 77bcaaad: am 8257124c: Merge "Draw stroked rectangle as meshes instead of textures Bug #7233734" into jb-mr1-dev 
* commit '77bcaaad5c04dc42d66b7f15d8f2377077c2c52c':
  Draw stroked rectangle as meshes instead of textures Bug #7233734
 2012-10-02 14:34:39 -07:00
Romain Guy
77bcaaad5c am 8257124c: Merge "Draw stroked rectangle as meshes instead of textures Bug #7233734" into jb-mr1-dev 
* commit '8257124cffe2825f123abd2b209422727c8f3053':
  Draw stroked rectangle as meshes instead of textures Bug #7233734
 2012-10-02 14:32:07 -07:00
Romain Guy
8257124cff Merge "Draw stroked rectangle as meshes instead of textures Bug #7233734" into jb-mr1-dev 2012-10-02 14:29:47 -07:00
John Spurlock
fa69c0a555 am de99afcf: am ec9b13dc: Merge "Disable quick settings for users until USER_SETUP_COMPLETE." into jb-mr1-dev 
* commit 'de99afcfdf3afcd06ce4be95ea25ca3246bfb5b7':
  Disable quick settings for users until USER_SETUP_COMPLETE.
 2012-10-02 14:18:26 -07:00
John Spurlock
de99afcfdf am ec9b13dc: Merge "Disable quick settings for users until USER_SETUP_COMPLETE." into jb-mr1-dev 
* commit 'ec9b13dc489ee3d92d985336b500afafadee0cd8':
  Disable quick settings for users until USER_SETUP_COMPLETE.
 2012-10-02 14:17:03 -07:00
John Spurlock
ec9b13dc48 Merge "Disable quick settings for users until USER_SETUP_COMPLETE." into jb-mr1-dev 2012-10-02 14:15:23 -07:00
Jim Miller
32626e0208 am fbf1d170: am c6e570db: Merge "Fix camera disambiguation in secure keyguard" into jb-mr1-dev 
* commit 'fbf1d17004f1e48c9b400980817f160cbc0904c5':
  Fix camera disambiguation in secure keyguard
 2012-10-02 14:04:25 -07:00
Jeff Sharkey
3509e37316 am f63ca02f: am c12dd973: Merge "Migrate more System and Secure settings to Global." into jb-mr1-dev 
* commit 'f63ca02f9fce6aedd7a03e9f8a95e2e2d6bf9eac':
  Migrate more System and Secure settings to Global.
 2012-10-02 14:04:22 -07:00
Chris Wren
097891f2d6 am eb3a02da: am 6ac833c9: Merge "re-use status bar DateView in QuickSettings." into jb-mr1-dev 
* commit 'eb3a02da03ac273b3f752737789b4219eed5ca63':
  re-use status bar DateView in QuickSettings.
 2012-10-02 14:04:19 -07:00
Irfan Sheriff
b8aad91f05 Add operator name to network notification 
Bug: 7087564
Change-Id: Ibe7a09fc6858dfea5f65092777bbd6ca82177043
 2012-10-02 14:01:28 -07:00
Jim Miller
fbf1d17004 am c6e570db: Merge "Fix camera disambiguation in secure keyguard" into jb-mr1-dev 
* commit 'c6e570dbadc3689bc80c0516492a3209d5f6742b':
  Fix camera disambiguation in secure keyguard
 2012-10-02 14:00:28 -07:00
Jeff Sharkey
f63ca02f9f am c12dd973: Merge "Migrate more System and Secure settings to Global." into jb-mr1-dev 
* commit 'c12dd973724f5aab44814b31650b4b47314e952b':
  Migrate more System and Secure settings to Global.
 2012-10-02 14:00:24 -07:00
Chris Wren
eb3a02da03 am 6ac833c9: Merge "re-use status bar DateView in QuickSettings." into jb-mr1-dev 
* commit '6ac833c9e3ccdf586c24ccf18560d5e223ba0734':
  re-use status bar DateView in QuickSettings.
 2012-10-02 14:00:21 -07:00